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 001/835] 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 d02acae9..c0789874 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 430b3563..35cbcbc1 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 314903e9..41fb2e31 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 002/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0789874..d02acae9 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 003/835] 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 57ede839..00820be9 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 a216e0e3..5df7d05e 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 004/835] 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 d02acae9..996fe1b8 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 5df7d05e..ca303d49 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 005/835] 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 ca303d49..3bd92f3b 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 bc052939..7b9d6f0c 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 006/835] 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 1acf3009..80fe2ef3 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 6b2ba8d5..67833fc5 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 007/835] 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 80fe2ef3..0fccbeb3 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 008/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 996fe1b8..420ed007 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 009/835] 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 59009883..46fdd7b8 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 010/835] 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 420ed007..2bc5e23f 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 084ba54e..157add41 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 a6dd1aaa..94792112 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 011/835] 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 e6af8662..13141fc4 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 00000000..4e3426da
--- /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 00000000..aa349993
--- /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 00000000..dc621336
--- /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 698cde15..d8a6e07d 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 6d344887..a44e4143 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 012/835] 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 2bc5e23f..a29ec7f8 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 c013e4af..f527e625 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 013/835] 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 cdf8ef4f..49f36b2c 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 014/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a29ec7f8..e649c59d 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 015/835] 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 f4bc134f..ddc0d491 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 53670dd2..8c229b9f 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 fa0d7c2a..11a0920f 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 c2170e87..b3fc9489 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 940c16a3..ae087645 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 95901258..5085deec 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 606a8da9..b0176a22 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 e07eca0c..b14fb3ac 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 016/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e649c59d..c0c141fb 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 017/835] 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 b69631ba..d2c84a8d 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 31a702e5..a9fd5a49 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 9000676d..dadd94da 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 018/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0c141fb..87e6ff8c 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 019/835] 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 f527e625..ad02091d 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 3ab0afd5..e805bb46 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 421fd113..0adbb8ab 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 00000000..b3aff807
--- /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 00000000..c3e7a4fe
--- /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 00000000..b8e82108
--- /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 020/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87e6ff8c..cca0763d 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 021/835] 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 ad02091d..b913bfc7 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 e805bb46..069b657b 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 0adbb8ab..e5cc96ed 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 00000000..c1166d9e
--- /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 00000000..1c0e5690
--- /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 00000000..42e978b6
--- /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 022/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cca0763d..5fe80ddb 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 023/835] 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 d2c84a8d..b0d2e6f9 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 a9fd5a49..326def1d 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 dadd94da..e2a58340 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 024/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5fe80ddb..818cb834 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 025/835] 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 c4f66f51..7d3cb729 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 026/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 818cb834..898e9c68 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 027/835] 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 d8ca153d..c3dc3842 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 028/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 898e9c68..437d5311 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 029/835] 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 3cc2e121..5005e822 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 dfdc4bef..f94606ae 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 03baea12..0f438b3c 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 030/835] 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 12a8a6b2..fbf3c859 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 031/835] 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 9dc231a3..6c73fef8 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 032/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 437d5311..dcc05e0e 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 033/835] 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 b913bfc7..20c3c584 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 e5cc96ed..87de7b53 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 00000000..477a78c9
--- /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 00000000..02b351d7
--- /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 00000000..859d773c
--- /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 034/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dcc05e0e..43b5acc3 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 035/835] 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 87de7b53..1324e774 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 00000000..0a581418
--- /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 00000000..01f6f251
--- /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 00000000..c0722435
--- /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 036/835] 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 43b5acc3..5b7e1d69 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 20c3c584..2de05d7a 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 037/835] 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 16a0f799..72869f67 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 3f679b36..31388b4c 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 4467c69a..336de95f 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 038/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5b7e1d69..6e472fb4 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 039/835] 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 02b351d7..a3387976 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 859d773c..75a6817a 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 00000000..456df5ff
--- /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 00000000..40e0de6c
--- /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 00000000..c5c013ce
--- /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 040/835] 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 7e90dd06..8c13d6db 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 1324e774..ec66f64f 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 00000000..a1384402
--- /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 00000000..71165e9f
--- /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 00000000..2781d10b
--- /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 00000000..0178315b
--- /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 00000000..91370b81
--- /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 00000000..6a76f7b6
--- /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 041/835] 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 6e472fb4..cdb9ce8a 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 2de05d7a..65b101dc 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 042/835] Update gopsutil version to include netstat fix
 (#3513)

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

diff --git a/Godeps b/Godeps
index 8c13d6db..252e0b4b 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 043/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cdb9ce8a..694a7b7b 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 044/835] 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 de9e7d7a..771cabb4 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 f47a2cc6..cfb712df 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 045/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 694a7b7b..36b51465 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 046/835] 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 ec66f64f..aaf5b6ae 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 00000000..ed058671
--- /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 00000000..9712ee8a
--- /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 00000000..233e7259
--- /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 047/835] Update changelog

---
 CHANGELOG.md | 2 ++
 README.md    | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36b51465..8e83a49b 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 65b101dc..c2a5fb06 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 048/835] 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 c5c013ce..d9b67b16 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 049/835] 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 d79af597..83407443 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 75fe4c71..fed1edfe 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 050/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e83a49b..7a203ba4 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 051/835] 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 58396cbc..1d1c490a 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 31eff937..a09e818e 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 28a433fe..67494d71 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 d41e6bdd..02239e6e 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 052/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a203ba4..303cef3c 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 053/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 303cef3c..03005296 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 054/835] 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 069b657b..4c751d3e 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 c3e7a4fe..94a3323e 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 d8a6e07d..fa31ec49 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 055/835] 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 9e286e36..2f7b0c8e 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 056/835] Fix formatting in changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03005296..7b0f92dc 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 057/835] 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 85a73e31..be3a7d75 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 058/835] 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 5698cc7f..65869ae9 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 f5ddef5f..32e283df 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 6e487ff3..8229fd66 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 059/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b0f92dc..f635b7c0 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 060/835] 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 a81b344a..6af96279 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 a754d1ac..dda115d0 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 c8e77703..da658f5f 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 061/835] 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 67833fc5..959fc098 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 062/835] Update sarama-cluster to latest release (#3560)

---
 Godeps | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Godeps b/Godeps
index 252e0b4b..f69949c2 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 063/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f635b7c0..4b7b09c5 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 064/835] 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 dda115d0..bc130363 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 065/835] 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 508e1fa8..3c2e2729 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 1ceb4fb2..9258bc41 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 066/835] 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 8a9b0fb6..5401e1a7 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 067/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b7b09c5..bc6abb28 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 068/835] 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 0e256390..788c8eec 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 069/835] 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 f0b0a767..5b3ee218 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 070/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc6abb28..1038cd6c 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 071/835] 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 06d9f1b9..8627d02f 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 072/835] 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 c3dc3842..1e75bf6b 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 5356e7bd..1820c934 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 073/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1038cd6c..824d4e0d 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 074/835] 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 bf8b4ebf..b1ae47bf 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 075/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 824d4e0d..9f01a722 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 076/835] 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 2ade1947..09290832 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 32c391f7..980e2fa3 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 077/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f01a722..934addce 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 078/835] 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 908d92a6..5115d287 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 079/835] 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 263923d4..60f4ac5d 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 080/835] 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 b14953db..0c087ce5 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 081/835] 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 934addce..7a4e36cd 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 082/835] 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 dfb95579..9f965461 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 c5c83e5d..81783cf2 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 083/835] 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 0a581418..706a9c1c 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 084/835] 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 706a9c1c..abcf72c9 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 085/835] 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 0e3e5558..f96dfa13 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 40d65c87..4ad241e9 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 74237c0c..d2642b56 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 086/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a4e36cd..b5cd1027 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 087/835] 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 8f9a77aa..83e4bd2e 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 f51cb123..06966ab5 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 088/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5cd1027..90b323db 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 089/835] 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 a1384402..fcb62da3 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 090/835] 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 9f965461..50bd4b3d 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 091/835] 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 4c751d3e..438a3277 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 ff37fdaf..1042da9d 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 092/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90b323db..a7303ac4 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 093/835] 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 71165e9f..50d78482 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 094/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7303ac4..38ecf3e3 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 095/835] 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 4dea82a8..601e4038 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 096/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 38ecf3e3..b375c437 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 097/835] 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 477a78c9..3dab2b39 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 098/835] 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 0c087ce5..783a2141 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 099/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b375c437..32cdd831 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 100/835] 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 72869f67..8a9ff823 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 31388b4c..490c56f8 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 336de95f..5d5860a8 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 101/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32cdd831..fb9455f9 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 102/835] 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 06966ab5..b6b5a677 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 103/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb9455f9..a2c55c4d 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 104/835] 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 83e4bd2e..a1dfc879 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 b6b5a677..775ea75d 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 3be0259b..759c71c4 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 105/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2c55c4d..173ce9b8 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 106/835] 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 3215aaf3..b60711e3 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 05ca346b..8e6bec46 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 71ec7e5d..276880d7 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 c4db75ff..133d1caf 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 107/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 173ce9b8..9eb273bf 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 108/835] 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 98d68f9e..2aaa2da1 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 109/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9eb273bf..0e9dee61 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 110/835] 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 a57aabb8..e55d1650 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 111/835] Update release notes for 1.5

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e9dee61..a97e6f31 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 112/835] 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 5ce2d21f..0f28bf77 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 66cb0f76..1b3bc1df 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 398cba4c..bf090eb8 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 113/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a97e6f31..bed730f4 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 114/835] 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 820af50a..74cfe3bc 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 b93cda7d..87922b98 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 13a62061..74944890 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 9448208b..2d7bcaef 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 a6f5148c..3d45f2fa 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 115/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bed730f4..e96c8343 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 116/835] Fix link to cratedb readme

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e96c8343..232ccd94 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 117/835] 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 232ccd94..ea9b8721 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 011ae32e..00000000
--- 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 832c433e..19c9db9c 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 410b9b42..306dca3b 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 00000000..4f7b21e5
--- /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 07a782f8..056f4afc 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 4545a247..77db5feb 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 118/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea9b8721..30465895 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 119/835] 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 1aa1ad1a..50a36dd6 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 f3edc57b..bfa35752 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 120/835] 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 f69949c2..784c6044 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 c2a5fb06..917975c7 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 1b6c0b68..64097e7d 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 2aaa2da1..8488df28 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 00000000..65d15a42
--- /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 00000000..9e1770b5
--- /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 00000000..83ab1a40
--- /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 00000000..472bd268
--- /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 00000000..dc544206
--- /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 00000000..5834eb51
--- /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 1c353a31..ebbbcd28 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 af0cf3fb..c1c25f98 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 bda6aeba..fbeca17e 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 121/835] 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 ffd9751d..92acc327 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 122/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30465895..093cf286 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 123/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 093cf286..fd5deb87 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 124/835] Update release notes

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd5deb87..954f0b3d 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 125/835] 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 d8ccf2fa..a0c340ee 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 46fdd7b8..be1d889c 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 126/835] 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 34e2abce..9fafbbe8 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 127/835] 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 954f0b3d..44e1be22 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 128/835] 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 d79e9576..f4569cad 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 1331e1f4..a9161e5b 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 27ced791..1063cb5c 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 129/835] 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 9fafbbe8..4ebf0017 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 130/835] 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 faee9a57..7e990758 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 595bcc51..7178eb49 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 929119fc..8042461d 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 131/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44e1be22..c34da29b 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 132/835] 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 64097e7d..c1192e72 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 dc544206..4c07ca28 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 5834eb51..fa92f3c3 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 133/835] 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 ebbbcd28..42d617c7 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 134/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c34da29b..a18df1dc 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 135/835] 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 1df8fa4c..6421db80 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 aaaba467..cdaad57e 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 136/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a18df1dc..df2ed937 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 137/835] 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 784c6044..c659227c 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 7f614334..c809aa43 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 138/835] 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 00000000..c71b6d76
--- /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 a09e818e..b647f812 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 3cc99de0..864b2847 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 67494d71..8aeca552 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 00000000..21e70d5e
--- /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 d3fd691c..b15f7438 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 801ad328..96aed211 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 fa9121cd..0a3abb68 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 00000000..d8b908c3
--- /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 29c362c8..cefe8b78 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 139/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index df2ed937..f0c91e92 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 140/835] 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 53c4bdc1..7bad4be0 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 3984728a..485829fe 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 141/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0c91e92..b950a4e2 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 142/835] 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 af96718c..8739f941 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 91e5334e..8189a666 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 cb56dc4e..30279f0e 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 143/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b950a4e2..bf9f6786 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 144/835] 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 1e75bf6b..d15f4610 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 145/835] 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 3bcf1b7d..05978aa6 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 146/835] 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 8739f941..b1250cc9 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 147/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf9f6786..fb108176 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 148/835] 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 157add41..f88305ab 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 149/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb108176..6fcaddf1 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 150/835] 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 be3a7d75..475e2825 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 151/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6fcaddf1..2b345c88 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 152/835] 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 2b345c88..15d173ae 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 2f7b0c8e..4abfd0a3 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 153/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15d173ae..10e18616 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 154/835] 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 50f745d4..29c5e36d 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 155/835] 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 1fa9b13e..51c213a8 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 e13446ba..c3f552d9 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 b1250cc9..5ca3de88 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 156/835] 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 a1dfc879..796dfc7b 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 775ea75d..64aa6408 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 759c71c4..5e9829cc 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 157/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10e18616..06d0f628 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 158/835] 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 c659227c..8fb336d0 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 92acc327..cdf991c5 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 aaf5b6ae..fa78b3ff 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 00000000..3cd9ee7a
--- /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 00000000..5099bd9f
--- /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 00000000..7dd28006
--- /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 159/835] 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 06d0f628..0ad93f70 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 917975c7..7411c324 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 160/835] 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 3cd9ee7a..362ee17b 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 5099bd9f..34a72b73 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 161/835] 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 796dfc7b..5dae5e09 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 64aa6408..e0d12c3d 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 162/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ad93f70..2d4d79c5 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 163/835] 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 914477c5..5e4c637f 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 cae575bf..4ed36bd0 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 164/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d4d79c5..e7e9e34a 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 165/835] 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 34a72b73..ba1cc803 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 00000000..c23a6eec
--- /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 7dd28006..ef387f7e 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 166/835] 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 60f4ac5d..c68f6624 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 c809aa43..5c5238f5 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 7d2fd1b5..fd16bbdd 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 167/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7e9e34a..60d89d30 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 168/835] 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 60d89d30..33c0e0d1 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 169/835] 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 8aeca552..938ca1b0 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 02239e6e..81161ae6 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 170/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33c0e0d1..47b40966 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 171/835] 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 fa78b3ff..a13bd6cd 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 00000000..2209de91
--- /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 00000000..c459ebf4
--- /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 00000000..9438c806
--- /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 172/835] Update changelog

---
 CHANGELOG.md | 2 ++
 README.md    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47b40966..8d2acf08 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 7411c324..d52327f4 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 173/835] 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 6af96279..4826edbc 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 174/835] 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 13cd8041..d42eecfd 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 5b3ee218..bec4f413 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 175/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d2acf08..f2629c80 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 176/835] 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 634abd11..0edac316 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 af95542b..b3ff82c1 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 177/835] 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 7ff0752c..801e61a5 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 49f36b2c..8b9f19f8 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 178/835] 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 801e61a5..502d1aef 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 8b9f19f8..90aa9c83 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 179/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2629c80..ca8fba24 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 180/835] 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 00000000..d9e9a9a4
--- /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 8269337d..38fd3ec9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ tivan
 .idea
 *~
 *#
+telegraf
+telegraf.gz
diff --git a/Makefile b/Makefile
index a0c340ee..ab466257 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 35cbcbc1..1a52f8ad 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 41fb2e31..00000000
--- 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 00000000..7dd3feeb
--- /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 5be5b08d..ee1d2441 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 f9a7d95e..49746148 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 735e66cc..00000000
--- 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 00000000..968f2816
--- /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 181/835] 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 ab466257..f71e127a 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 00820be9..153b893d 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 00000000..583e56d0
--- /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 00000000..533b7333
--- /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 00000000..f9c1013c
--- /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 00000000..2f51a3f9
--- /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 bae5161e..cf0754e6 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 3470a8a9..361582c3 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 3bd92f3b..6b58953f 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 7b9d6f0c..d77391fc 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 182/835] 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 153b893d..0ff9884b 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 6b58953f..51f71f6a 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 183/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca8fba24..48c96910 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 184/835] Update gitignore

---
 .gitignore | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 38fd3ec9..459ae7d7 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 185/835] 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 6b673b12..be8fcd7d 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 475e2825..7f1f8c07 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 186/835] 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 f71e127a..3250e69e 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 1a52f8ad..99387020 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 187/835] 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 d9e9a9a4..5c1ccbdd 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 188/835] 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 21ae5738..949f7330 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 189/835] 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 d2d19520..ac740501 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 c929a5b2..2a8a6b28 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 5bf07eb3..9a2982ff 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 69509ae1..276fde00 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 190/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48c96910..9afddcec 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 191/835] Update paho mqtt to latest release

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

diff --git a/Godeps b/Godeps
index 8fb336d0..80d92d39 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 192/835] 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 e55d1650..44e751f5 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 a70cfd13..e413ecbe 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 489ef863..b33354ec 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 193/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9afddcec..6e4c27fb 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 194/835] 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 968f2816..8ac0156d 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 195/835] 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 67590c3f..46df267a 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 e37eabf5..5b0697ca 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 a7705d11..905adb6e 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 196/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e4c27fb..a80dd546 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 197/835] 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 5c1ccbdd..c95fe71f 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 198/835] 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 4ed36bd0..2fb48a20 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 862c82c5..06a7f590 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 199/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a80dd546..b8b3a2fd 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 200/835] 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 502d1aef..6a5b62d6 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 90aa9c83..e66d7972 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 201/835] 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 d52327f4..19a5afe7 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 a13bd6cd..d5800208 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 00000000..430a19b2
--- /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 00000000..6a98ab4f
--- /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 00000000..fd352829
--- /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 202/835] 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 430a19b2..85a57c99 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 6a98ab4f..beece045 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 203/835] 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 beece045..1f6a2e92 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 204/835] 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 85a57c99..2c22aaa4 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 1f6a2e92..00a13e3f 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 fd352829..84301599 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 205/835] 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 00a13e3f..5bf895ca 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 206/835] 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 2c22aaa4..2c044136 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 5bf895ca..bdbb5f6f 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 84301599..486edabc 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 207/835] 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 50a36dd6..e3ef83c8 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 208/835] 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 bdbb5f6f..16e776cd 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 209/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8b3a2fd..61d56f98 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 210/835] 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 438a3277..b09ff391 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 9562b936..648fa72a 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 9f711d91..3e5a73aa 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 211/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61d56f98..59fd4753 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 212/835] 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 5e4c637f..eadc60ab 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 2fb48a20..0609a367 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 eafe8942..ca50092a 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 213/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59fd4753..c39ef9e3 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 214/835] 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 c39ef9e3..7cf537eb 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 215/835] 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 00000000..562149b9
--- /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 216/835] 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 d42eecfd..6cb0cc59 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 bec4f413..5b416b72 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 276fde00..05bd5264 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 217/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7cf537eb..c42e1c5d 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 218/835] 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 c42e1c5d..f0f2b202 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 335fb792..713c28cc 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 219/835] 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 f0945782..5ddf4e2b 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 36eabc90..4eab5b18 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 9082061d..9a12be6a 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 2bab8242..51eb48a7 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 a2e270bb..daf5a450 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 220/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0f2b202..41ade9da 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 221/835] 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 19a5afe7..0ae1a931 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 b3aff807..b2cf3d79 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 94a3323e..6bed9ea7 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 b8e82108..b1e04230 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 222/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 41ade9da..210977aa 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 223/835] 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 65b7ab75..92d31e12 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 2d3095be..6a97bad5 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 224/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 210977aa..3a4e2d1b 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 225/835] 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 05978aa6..3e2a36e9 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 226/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a4e2d1b..3bee898b 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 227/835] 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 214ed4f7..3162cfe0 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 6421db80..36c3193f 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 cdaad57e..b79f8960 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 00000000..cc5a4960
--- /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 228/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3bee898b..fdd39cbc 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 229/835] 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 f96dfa13..f5023dfc 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 4ad241e9..8c3291bb 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 d2642b56..b35be2da 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 230/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fdd39cbc..0abab719 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 231/835] 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 27b1f757..42181d6a 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 232/835] 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 b09ff391..ab4eeaa6 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 233/835] 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 949f7330..ded08cb5 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 234/835] 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 3dd7f9ba..77aaf367 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 235/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0abab719..6747f865 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 236/835] 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 0609a367..5de67322 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 ca50092a..85f5ca07 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 237/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6747f865..08ca426b 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 238/835] 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 462298f6..1eecbfa7 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 00000000..3fb1b7c0
--- /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 00000000..347b6403
--- /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 00000000..433751af
--- /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 239/835] 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 08ca426b..ab9f4d9e 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 0ae1a931..d7d2a359 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 3fb1b7c0..174663e2 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 347b6403..46a2f84d 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 240/835] 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 ab4eeaa6..63e3cf5b 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 241/835] 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 e66d7972..7d945f79 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 242/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab9f4d9e..b022793c 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 243/835] 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 84e92cb1..f00bfc82 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 6124a968..c54239d3 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 244/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b022793c..030e707a 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 245/835] 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 4ebf0017..e8a16cc5 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 246/835] 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 924d3538..3bee4fdf 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 77aaf367..b0f1009f 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 484a06f2..c12d6c0f 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 247/835] 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 3bee4fdf..127a4530 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 248/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 030e707a..6723ca11 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 249/835] 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 6723ca11..00310c38 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 965a6a87..2ad6c426 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 b263e508..4e833569 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 250/835] 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 c95fe71f..ea5a789d 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 99387020..651478c9 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 251/835] 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 3250e69e..d41f7c04 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 252/835] 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 771cabb4..f265e244 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 cfb712df..a7ba5c63 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 5eb30fe4..83b9bd46 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 253/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00310c38..95b096c6 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 254/835] Use previous image on appveyor

---
 appveyor.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/appveyor.yml b/appveyor.yml
index 651478c9..91f86cbb 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 255/835] Remove gdm -parallel false

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

diff --git a/Makefile b/Makefile
index d41f7c04..3250e69e 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 256/835] 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 bcd1cc8e..9cb86c3c 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 257/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95b096c6..ddb04b1e 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 258/835] 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 ddb04b1e..8076d366 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 259/835] 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 65869ae9..09ae15cc 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 32e283df..1f548a0e 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 260/835] 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 7f1f8c07..563e58bb 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 261/835] Use copy of fsnotify from tail vendor

---
 Godeps | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Godeps b/Godeps
index 80d92d39..4b5dd401 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 262/835] 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 cdf991c5..91526098 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 263/835] 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 6a5b62d6..766bb95e 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 7d945f79..f17574a9 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 264/835] 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 f4569cad..1c2e77e7 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 265/835] 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 117d2429..aed41ada 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 36cd02f5..e40dae17 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 2f470c72..ba24b0f3 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 266/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8076d366..8b7660db 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 267/835] 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 822aef1b..ae5b365d 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 4c75bd0c..ea0ca055 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 268/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b7660db..c3975a1f 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 269/835] 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 63e3cf5b..8b78ed33 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 65fef036..f1ff71f0 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 c1153b14..834a0b2a 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 1c2e77e7..0b8b7a45 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 270/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3975a1f..20a8d9d0 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 271/835] 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 50d78482..c7561ee3 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 2781d10b..3b8d93e3 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 272/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20a8d9d0..1f5c9c06 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 273/835] 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 90c0a2d8..688f4e69 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 274/835] 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 fcb62da3..967c376a 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 275/835] 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 29027805..7e68a493 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 45612a92..bfd9b434 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 276/835] Update to latest gopsutil release

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

diff --git a/Godeps b/Godeps
index 4b5dd401..2a9595e2 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 277/835] 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 2a9595e2..7af083c8 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 91526098..4c9e2d61 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 278/835] 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         |   333 +-
 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, 26826 insertions(+), 6532 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 459ae7d7..66a7c7c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
-build
+/build
 /telegraf
 /telegraf.gz
-*~
-*#
diff --git a/Godeps b/Godeps
index 7af083c8..1b1b4be3 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 3250e69e..3e4b4f01 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 c3f552d9..22fa3e40 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 5ca3de88..2183ba42 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 8488df28..db1e1f82 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 19d10f58..b74e236c 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 30279f0e..cf92fe67 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 e9b757bb..9cf4f613 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 c653090e..4d016851 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",
+	expected, err := metric.New("RITest",
+		map[string]string{
+			"foo": "bar",
+		},
 		map[string]interface{}{
-			"value": int(101),
-			"inf":   inf,
-			"ninf":  ninf,
+			"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 3fb53135..97047740 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 00000000..d80f566f
--- /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 cb040b7f..00000000
--- 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 2998d4c2..00000000
--- 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 e46cfd18..06e705a6 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 9383fb0d..00000000
--- 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 062399d6..31f1729d 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 0fccbeb3..00000000
--- 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 27185224..00000000
--- 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 ef9d2977..00000000
--- 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 1f2ffd6e..00000000
--- 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 52bcd1fb..c7c181b1 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 834a0b2a..cccd3947 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 491a1374..66715ef3 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 480502d6..e5e124b9 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 30ba0d2a..a6897b71 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 4f2a8516..7b2bfeca 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 4d78a1a4..e0e0e862 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 4f0bcca7..3a763b79 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 e77eae55..4b2c1693 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 35f89652..9547292e 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 4bcaceb7..00000000
--- 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 601e4038..00000000
--- 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 2cb0182e..00000000
--- 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 786b047f..00000000
--- 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 545f142f..00000000
--- 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 00000000..852784f0
--- /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 00000000..d6463c05
--- /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 e2b20caa..04a4c698 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 50c86125..3e9824ad 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 00000000..5b3f5ce5
--- /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 00000000..552e1c0d
--- /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 e10fcbb0..7c52d312 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 abd3b055..244e8bd5 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 3e2a36e9..eea7b608 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 51d20117..c38ad353 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 563e58bb..1e015c9f 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 4c07ca28..a6130acf 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 42d617c7..fc32bd83 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 c1c25f98..9a6b462f 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 1a77886f..00000000
--- 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 7b77140f..bf47fa8c 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 00000000..27d6f942
--- /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 00000000..95858713
--- /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 00000000..2edc5b8c
--- /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 00000000..3b8bcdf8
--- /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 0abb330e..273877d3 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 959fc098..28d57cfe 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 621a3514..4d5f7f00 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 fbeca17e..177726db 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 46a2f84d..7f879880 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 a65a104e..363e9a21 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 f88305ab..ee390d17 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 00000000..2040b5ee
--- /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 459a8a74..51aed0d0 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 7ced5210..2795cfb3 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 00000000..590e2faf
--- /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 00000000..5dca2159
--- /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 452364c9..f988bf40 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 368f6f44..3389ec59 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 279/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f5c9c06..8564a3d4 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 280/835] 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 9547292e..aafe83da 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 04a4c698..5f38263b 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 281/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8564a3d4..c7add5ec 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 282/835] 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 852784f0..fdbb5bd8 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 d6463c05..e84957fc 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 5f38263b..2e6e0d9c 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 283/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7add5ec..8729d936 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 284/835] 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 ee1b9aee..c96272fa 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 285/835] 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 51aed0d0..59d7662a 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 286/835] 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 3e4b4f01..ffa3be0b 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 06e705a6..7c8ca113 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 00000000..98383fb2
--- /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 bf47fa8c..01e42a8d 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 27d6f942..8c17cf9c 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 95858713..678790b0 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 2edc5b8c..fea50af8 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 3b8bcdf8..ad51ff3a 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 273877d3..8aacb873 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 28d57cfe..b57eacfa 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 59d7662a..32138001 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 2795cfb3..eaf55a9e 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 287/835] 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 8729d936..c79f2bf7 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 80281a87..99abbc22 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 904ea7c1..1c60e368 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 288/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c79f2bf7..7e69425b 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 289/835] 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 ffa3be0b..b9832fb6 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 13678038..5716b0ae 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 db1e1f82..fe8cac5a 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 7c8ca113..23c48697 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 aafe83da..bac25cf5 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 fdbb5bd8..f32054f4 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 2e6e0d9c..3d1a895a 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 8c17cf9c..a7588379 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 b57eacfa..59d4d7f1 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 32138001..7d68ed3d 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 eaf55a9e..e3151646 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 3389ec59..431112b2 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 290/835] 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 4eab5b18..5114e0ad 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 291/835] 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 678790b0..292fada2 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 fea50af8..e5c88868 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 8aacb873..98f9cf65 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 292/835] 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 127a4530..69b477ed 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 b0f1009f..9dcf9394 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 293/835] 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 7e990758..b833ff26 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 7178eb49..de772389 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 088c9459..0bc5d33d 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 294/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e69425b..f27a03fe 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 295/835] 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 f17574a9..5196cc33 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 296/835] 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 23c48697..0af445c2 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 297/835] 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 98f9cf65..53acd5ef 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 298/835] 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 f27a03fe..51d9faaa 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 fb9a18ea..588e7c07 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 d15f4610..a2be5848 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 00000000..6f6062d1
--- /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 299/835] Update gopsutil version to v2.18.03

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

diff --git a/Godeps b/Godeps
index 1b1b4be3..495a77d4 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 300/835] 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 bc130363..46912d48 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 301/835] 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 ea5a789d..b55b2238 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 b9832fb6..8b10519a 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 c12d6c0f..7d3780ce 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 302/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51d9faaa..e6962e78 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 303/835] 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 d80f566f..c579046d 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 cccd3947..bda4ce46 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 0b8b7a45..7f6ab406 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 a7588379..af7445a5 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 59d4d7f1..594e6b76 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 304/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6962e78..7a7c1274 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 305/835] 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 8b78ed33..da826a1c 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 306/835] 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 4abfd0a3..e13683fc 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 307/835] 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 3d1a895a..12aa76ec 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 3e9824ad..c0a46995 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 308/835] 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 2febb819..6c35a685 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 309/835] 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 9cf4f613..ffe0b5f5 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 310/835] 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 2183ba42..f5f23cd0 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 311/835] 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 e13683fc..c02dce88 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 2b4d4f0e..886887d5 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 312/835] 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 8b10519a..9ca4fc45 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 33277221..47b8cf8f 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 313/835] 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 66a7c7c0..c584e6c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /build
 /telegraf
+/telegraf.exe
 /telegraf.gz
diff --git a/Makefile b/Makefile
index 9ca4fc45..d8a82050 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 314/835] 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 fbf3c859..209ced78 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 315/835] 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 f32054f4..4f3d57e6 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 316/835] 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 4f3d57e6..164261fe 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 e84957fc..30cc1f8b 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 317/835] Update gosnmp revision (#3973)

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

diff --git a/Godeps b/Godeps
index 495a77d4..7c504a0b 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 318/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a7c1274..29db21b0 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 319/835] 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 5b416b72..b82c72cf 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 05bd5264..bd2398a2 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 320/835] 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 e05fd79e..668dc549 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 321/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29db21b0..cce40fd3 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 322/835] 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 5196cc33..41a8b7ec 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 323/835] 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 aed41ada..531edae2 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 324/835] 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 5ddf4e2b..4dce129c 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 5114e0ad..2c45f7ea 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 9a12be6a..e51b4e40 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 51eb48a7..d85d4174 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 daf5a450..76b2b50d 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 325/835] 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 4dce129c..2bbf6ebf 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 8db9451b..d5316647 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 326/835] 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 2bbf6ebf..c4c308f2 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 327/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cce40fd3..8d6ecd97 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 328/835] 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 292fada2..b4fd170a 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 e5c88868..335f4f66 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 ad51ff3a..a3eec7a0 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 2040b5ee..27caa6bb 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 e3151646..655e9aaf 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 329/835] 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 c4c308f2..e831d641 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 2c45f7ea..17d49b1c 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 e51b4e40..79a9a6c5 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 330/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d6ecd97..611e973e 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 331/835] 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 29fd4dc0..85239316 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 332/835] 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 d8a82050..5dd0f517 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 c0a46995..eeef9761 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 333/835] 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 e831d641..48c01a59 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 17d49b1c..9b4aa758 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 79a9a6c5..9a5793f7 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 d85d4174..1d9db918 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 76b2b50d..92f2bb2f 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 334/835] Updated changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 611e973e..6bdd2729 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 335/835] 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 9a5793f7..21541dd9 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 336/835] 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 d7d2a359..0d64cab7 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 d5800208..e3264ef8 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 00000000..512accc7
--- /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 00000000..d532c454
--- /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 00000000..111f4c87
--- /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 337/835] 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 512accc7..e81acad8 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 338/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6bdd2729..1dedb02a 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 339/835] 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 66715ef3..47d4ecdf 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 e5e124b9..a585140f 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 340/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1dedb02a..fd85c4b0 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 341/835] 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 c02dce88..c38d88c3 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 00000000..2d36ede9
--- /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 00000000..b09435b9
--- /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 342/835] 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 fe8cac5a..4c6ed562 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 00000000..aee9abdf
--- /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 343/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd85c4b0..76fff6f5 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 344/835] 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 562149b9..21987c30 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 345/835] 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 0af445c2..2c8fdb9c 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 31f1729d..1fecf2e4 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 346/835] 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 76fff6f5..622ea0e3 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 347/835] 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 83c9d86f..00000000
--- 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 348/835] 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 b1ae47bf..39825376 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 349/835] 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 e3264ef8..440d1e9a 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 00000000..84b8527f
--- /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 00000000..0cf9bd9e
--- /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 00000000..62ddee3b
--- /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 350/835] 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 622ea0e3..67776116 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 0d64cab7..63f3373e 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 351/835] 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 490c56f8..3cb95610 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 352/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 67776116..b0239a17 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 353/835] 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 aae7aa77..3227832c 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 698f3aee..ff73b1fb 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 2ad6c426..011a1edb 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 4e833569..b647e724 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 00000000..d3b6d9a1
--- /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 00000000..285a2747
--- /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 00000000..d741e651
--- /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 00000000..4ad8e642
--- /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 00000000..96cfa0b0
--- /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 e8b5a017..8e28c5f8 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 503130c6..855df4a8 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 354/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0239a17..a0701f01 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 355/835] 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 42181d6a..dab28e9b 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 7d3cb729..9dcce12a 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 49746148..6ab28c33 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 356/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0701f01..86836b3b 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 357/835] 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 011a1edb..076e1f4b 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 855df4a8..382aad26 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 358/835] 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 ee390d17..0f7fcd8f 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 94792112..e08f4759 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 359/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86836b3b..3a394a74 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 360/835] 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 b55b2238..c4f376e0 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 91f86cbb..7b464f6e 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 a9161e5b..3fbc4564 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 02d82fac..18a63dcc 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 b14fb3ac..b71e5bf4 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 552e1c0d..fd05c690 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 361/835] Update github.com/gorilla/mux version (#4042)

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

diff --git a/Godeps b/Godeps
index 7c504a0b..16b46d79 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 362/835] 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 09290832..bea9bd2d 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 980e2fa3..fd204d6a 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 363/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a394a74..702e483b 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 364/835] 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 7d68ed3d..926bfcb3 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 590e2faf..4a755c88 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 5dca2159..642b71b1 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 365/835] 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 7dabe3b1..541edf16 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 366/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 702e483b..8f285ccf 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 367/835] 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 16b46d79..79e0c98f 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 368/835] 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 594e6b76..a885a771 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 926bfcb3..819701c2 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 655e9aaf..dca56dcf 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 369/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f285ccf..445569b3 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 370/835] 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 c4f376e0..49bac606 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 371/835] 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 2c8fdb9c..3249b56a 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 1fecf2e4..47d44f3e 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 372/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 445569b3..357010f1 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 373/835] 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 6bed9ea7..79887966 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 374/835] 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 d5316647..e6b811e5 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 375/835] 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 b4fd170a..f2931096 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 335f4f66..df65a05d 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 a3eec7a0..6aabcb69 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 376/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 357010f1..d35fd20d 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 377/835] 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 d35fd20d..e04b4625 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 63f3373e..d1691698 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 edcef08c..2f3fd928 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 541edf16..6f6f86e3 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 0ab985e5..15fbb233 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 00000000..3a419a6d
--- /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 f19a74e8..c9474871 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 378/835] 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 3a763b79..5f2bf042 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 379/835] 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 b833ff26..b93b4a03 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 a021b59c..b66ad009 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 de772389..b0b9b8cf 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 0bc5d33d..4b9d00c8 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 8042461d..42a0b888 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 cefe8b78..03e92538 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 380/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e04b4625..69a24b21 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 381/835] 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 2f3fd928..86c6a65a 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 15fbb233..283c4a5e 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 382/835] 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 49bac606..b016deae 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 383/835] 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 00000000..bd028e65
--- /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 9381eace..7e5ae25d 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 f3699b8d..f456a998 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 384/835] 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 0cf9bd9e..35e56c9b 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 385/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69a24b21..c9dd4ab4 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 386/835] 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 bac25cf5..74f33748 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 12aa76ec..d34e9e3e 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 387/835] 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 1daa8573..42ce8955 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 388/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9dd4ab4..60628d2f 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 389/835] 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 fd204d6a..ad17c56e 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 390/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60628d2f..07b15c26 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 391/835] 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 3a419a6d..b8bb6098 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 392/835] 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 6c35a685..cfa9d02b 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 393/835] 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 7e3991d1..9a9e6b41 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 394/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 07b15c26..b7c64e7a 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 395/835] 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 5de67322..f347fa3d 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 85f5ca07..9817d07c 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 396/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7c64e7a..813ac037 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 397/835] 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 440d1e9a..f4a630ec 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 00000000..05c25978
--- /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 00000000..1ae5c79e
--- /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 00000000..e17c13b6
--- /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 398/835] 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 813ac037..70c2f656 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 d1691698..90ec4857 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 399/835] 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 92d31e12..2ab3dcd5 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 6a97bad5..045bf4b4 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 400/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70c2f656..84ad2c19 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 401/835] 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 fd5a41f7..cb9e1e8b 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 402/835] 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 da826a1c..2ef4fe2e 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 403/835] 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 ecf9996a..8a3d15be 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 f2196178..c4f94636 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 404/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84ad2c19..9216cb76 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 405/835] Update gopsutil version

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

diff --git a/Godeps b/Godeps
index 79e0c98f..6f3d0ae8 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 406/835] 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 b112c09c..eec72757 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 ce88d0a4..8094d433 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 407/835] 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 eec72757..b548deaa 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 408/835] Remove -i flag from `make telegraf`

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

diff --git a/Makefile b/Makefile
index 5dd0f517..c670ee2a 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 409/835] 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 c38d88c3..2e6ee3fe 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 2d36ede9..4c00d8f8 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 b09435b9..109d309e 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 410/835] 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 209ced78..61f2b0dc 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 411/835] 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 588e7c07..a190c600 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 412/835] 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 a2be5848..6e5a89e3 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 413/835] 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 b548deaa..93182ba0 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 414/835] 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 9216cb76..d109ad09 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 2ef4fe2e..97a14727 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 3227832c..d86b32d2 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 00000000..25c0678d
--- /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 00000000..31a70d9a
--- /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 11084bed..a14e2c8b 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 c96272fa..48458a0b 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 0edac316..b8822ede 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 a3df105b..a04d1bbb 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 7e68a493..42e1a133 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 bfd9b434..fe9bde1d 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 967c376a..790590ae 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 3b8d93e3..1b563c63 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 91370b81..e37bf996 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 b93b4a03..87b5e65d 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 b0b9b8cf..a59b9f7f 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 09ae15cc..e88c3f4d 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 1f548a0e..eee8d418 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 6d4aa613..6ab4a70c 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 6dcc9b97..8e580480 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 50bd4b3d..35b59524 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 81783cf2..19087a97 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 2c044136..25d3d2b2 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 16e776cd..c9c3460b 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 bda4ce46..595c74ed 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 7f6ab406..7c6cdf72 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 69b477ed..4ccd236a 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 9dcf9394..1f1f6870 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 e3ef83c8..19fe0144 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 bfa35752..c7324dee 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 85239316..2bab123f 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 811f4ce5..0bb3ead5 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 283c4a5e..441ede22 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 aa9a8f87..9f5de15d 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 1042da9d..f1d58e68 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 c9474871..40909dcc 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 69500127..67dbb539 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 4e471561..bf74dd5a 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 ae5b365d..2ff4eab8 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 ea0ca055..f20b9877 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 9d07d6a4..870524a8 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 46df267a..b18908b8 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 5b0697ca..15e2bfcc 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 48c01a59..a78d7b95 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 e6b811e5..895667de 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 2889bde5..df7869a8 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 6903f654..58074af7 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 a190c600..564d75e6 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 6e5a89e3..063452b7 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 819501ea..7b5215dc 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 3880dd91..1a1a115d 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 44e751f5..aac60021 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 e413ecbe..8a423ba5 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 ac740501..227f3f73 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 2a8a6b28..23709790 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 5dae5e09..ae6dac6f 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 e0d12c3d..49dabe1b 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 076e1f4b..daab8495 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 b647e724..65ee0db9 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 d3b6d9a1..00000000
--- 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 285a2747..00000000
--- 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 d741e651..00000000
--- 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 4ad8e642..00000000
--- 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 96cfa0b0..00000000
--- 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 3baf6855..1399a315 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 dd3c03ce..40ae7de8 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 99abbc22..d54caae4 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 1c60e368..20e7aee0 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 83407443..ea17fe76 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 fed1edfe..f2bfb7ac 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 b0d2e6f9..11f3c138 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 326def1d..56169135 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 1b173962..216c09ca 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 7bad4be0..4346c50d 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 74f33748..aed96e46 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 d34e9e3e..f80722bc 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 eeef9761..3ec10989 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 93182ba0..196e2e91 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 8094d433..716e06c4 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 21987c30..53483d96 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 eea7b608..1c700332 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 d97c4688..a664bc1b 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 8e28c5f8..149cda2a 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 382aad26..7c4660bc 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 00000000..b0a47334
--- /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 00000000..3606c89b
--- /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 00000000..9e5b6080
--- /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 00000000..cc11e20e
--- /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 00000000..88621951
--- /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 00000000..363f5d9a
--- /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 b37d6541..55075df4 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 00000000..4f7fc012
--- /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 415/835] 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 5716b0ae..d21aca91 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 fd05c690..017ee0be 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 0f7fcd8f..c06ba67f 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 e08f4759..85e7a645 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 819701c2..f052c9c9 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 dca56dcf..74bffe5e 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 f988bf40..bfb84f9a 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 e44952b6..82990b74 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 431112b2..59050d08 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 416/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d109ad09..edb40a25 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 417/835] 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 1eecbfa7..f14014e2 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 00000000..9c9e48af
--- /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 00000000..aea2c44c
--- /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 00000000..8a52fa8d
--- /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 00000000..2f584444
--- /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 418/835] Update changelog

---
 CHANGELOG.md | 5 +++++
 README.md    | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index edb40a25..12ad65d3 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 90ec4857..6fbe8027 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 419/835] 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 00000000..b84aad76
--- /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 00000000..84d45fcd
--- /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 420/835] 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 f4190e3e..00000000
--- 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 421/835] 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 a78d7b95..96852d72 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 9b4aa758..19c15bd3 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 21541dd9..56256e06 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 92f2bb2f..bb415805 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 422/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12ad65d3..c7a73932 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 423/835] 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 8ac0156d..41b95db0 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 424/835] 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 6110f5a7..766d9811 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 04ce8328..98fcc09c 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 425/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7a73932..491b2b55 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 426/835] 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 8627d02f..242d76f3 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 427/835] 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 7dd3feeb..822d7fff 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 5a5987c7..01213011 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 be1d889c..0cd93e82 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 428/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 491b2b55..ec26d1b0 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 429/835] 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 35e56c9b..efac941b 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 62ddee3b..573a69b1 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 430/835] 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 01c681b5..50dbc9f8 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 75d0a328..75986843 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 c7bfb579..0f1ab2f7 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 431/835] 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 50dbc9f8..1982ced0 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 75986843..66511a31 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 0f1ab2f7..ef4d0714 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 432/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec26d1b0..31497c65 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 433/835] 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 6f3d0ae8..34fb3fe0 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 434/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31497c65..d3f45055 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 435/835] 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 f1d58e68..30852d62 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 40909dcc..7a921c08 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 436/835] 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 30852d62..fd2105d5 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 437/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3f45055..62f82ce0 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 438/835] 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 34fb3fe0..12cf9cb9 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 f4a630ec..bb2316c9 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 00000000..7c30aaa8
--- /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 00000000..7ddeefac
--- /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 00000000..a41e13a0
--- /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 00000000..ffd9019f
--- /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 00000000..a4cd76cc
--- /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 00000000..38ce9b42
--- /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 00000000..49a593a0
--- /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 00000000..8b0abd88
--- /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 439/835] 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 62f82ce0..9172f295 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 6fbe8027..be3d9064 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 4c9e2d61..07b7287e 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 440/835] 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 97a14727..3a7c6a79 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 441/835] 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 97047740..b8da0293 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 3249b56a..077b3a31 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 a6130acf..95ce3bff 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 fa92f3c3..8ddcf771 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 f2931096..fef7e2d3 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 df65a05d..c8cf0bee 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 6aabcb69..1c617919 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 53acd5ef..0b16a2a3 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 a885a771..05a79744 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 177726db..58fce172 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 442/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9172f295..2b738d18 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 443/835] 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 5e74eb79..94f5149b 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 00000000..b7dd7527
--- /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 00000000..e78031b8
--- /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 00000000..aa9c68eb
--- /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 444/835] 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 b7dd7527..2af3fb27 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 e78031b8..4b769a46 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 aa9c68eb..1d511d85 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 445/835] 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 2b738d18..488487fc 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 be3d9064..03754232 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 446/835] 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 244e8bd5..0603394e 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 447/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 488487fc..22d48b2f 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 448/835] 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 12cf9cb9..ff845aba 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 94f5149b..037807c2 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 00000000..c5b925c2
--- /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 00000000..895b8530
--- /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 00000000..561e6c9f
--- /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 00000000..78993191
--- /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 00000000..65747c10
--- /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 00000000..ba7007d4
--- /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 00000000..5cc56fbb
--- /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 00000000..44bc1b80
--- /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 449/835] 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 22d48b2f..7ed1d245 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 03754232..e453a4b5 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 07b7287e..0e476302 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 c5b925c2..08850a3e 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 895b8530..26f3f8dc 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 450/835] 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 ff845aba..f44100c9 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 42e1a133..f7dcdf36 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 fe9bde1d..8649184d 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 bbb43d06..e3a7f2fd 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 451/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ed1d245..193c8288 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 452/835] 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 7b464f6e..a586d92f 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 453/835] 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 c670ee2a..79adbcbb 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 454/835] 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 eee8d418..9875b68a 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 8229fd66..622abeaf 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 455/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 193c8288..21839b50 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 456/835] 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 3a7c6a79..ef0f95ca 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 53483d96..71680678 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 1c700332..5228a083 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 457/835] 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 21839b50..68893bf6 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 ef0f95ca..1e7e8bed 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 71680678..14c166f9 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 5228a083..6231045b 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 458/835] 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 a04d1bbb..1302e2d5 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 459/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68893bf6..6742c98c 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 460/835] 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 bb2316c9..80db99bf 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 00000000..cef7ac6c
--- /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 00000000..9a5cafa5
--- /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 00000000..6e2c004f
--- /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 03e92538..8784cc1d 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 461/835] 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 6742c98c..fffd1d3c 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 e453a4b5..3275a679 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 462/835] 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 fffd1d3c..7d22ec6c 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 463/835] 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 f14014e2..c15f7639 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 00000000..c9eec037
--- /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 00000000..3282406c
--- /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 00000000..e7c15e5a
--- /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 464/835] 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 7d22ec6c..a05136d8 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 3275a679..d4d19db0 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 465/835] 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      |  92 ++++-
 plugins/serializers/graphite/graphite_test.go | 345 ++++++++++++++++++
 plugins/serializers/registry.go               |  12 +-
 8 files changed, 580 insertions(+), 23 deletions(-)

diff --git a/docs/DATA_FORMATS_OUTPUT.md b/docs/DATA_FORMATS_OUTPUT.md
index d21aca91..f8d8cf46 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 216c09ca..c54f07bb 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 4346c50d..8931dbe0 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 485829fe..3857236e 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 7c52d312..117c9d43 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 c06ba67f..d02b0e26 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
-	}
+	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
+		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 85e7a645..e72ed7a3 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 59050d08..277d3320 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 466/835] 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 4c6ed562..e7a008f4 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 467/835] 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 f8d8cf46..f4e41c25 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 c54f07bb..878eb804 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 8931dbe0..c26c1587 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 468/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a05136d8..dcbea951 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 469/835] 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 62497d07..9075bda7 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 1caf6ba5..864da812 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 7e6cac95..2a24fa6f 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 470/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dcbea951..e9542118 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 471/835] 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 d4d19db0..8ae242b5 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 80db99bf..239cf6e1 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 00000000..039cff8c
--- /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 00000000..88fdb4b7
--- /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 00000000..9b3f4a0a
--- /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 00000000..f70b863e
--- /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 00000000..dfc4d044
--- /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 00000000..f1622644
--- /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 00000000..21205a66
--- /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 00000000..9bd21a14
--- /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 00000000..38a3cee0
--- /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 472/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9542118..26f0e8cd 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 473/835] 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 239cf6e1..cba156f6 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 00000000..b83a0611
--- /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 00000000..a9a89982
--- /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 00000000..317820bb
--- /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 474/835] 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 cba156f6..239cf6e1 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 b83a0611..00000000
--- 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 a9a89982..00000000
--- 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 317820bb..00000000
--- 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 475/835] 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 b2cf3d79..ff2b03af 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 79887966..21eee33a 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 b1e04230..b1d6206c 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 476/835] 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 ff2b03af..4f1f862b 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 21eee33a..31a6d500 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 477/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26f0e8cd..770db93e 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 478/835] 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 149c6aa2..56775d90 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 f77fdf10..3caee7e7 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 479/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 770db93e..9cd6710c 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 480/835] 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 c15f7639..a19e469a 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 00000000..69c2cc27
--- /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 00000000..50fd195e
--- /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 00000000..76839760
--- /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 481/835] Update changelog

---
 CHANGELOG.md | 1 +
 README.md    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9cd6710c..0ecb57c5 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 8ae242b5..3b1355a4 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 482/835] 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 cfa9d02b..7a1df8bc 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 47d4ecdf..57d8691c 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 a585140f..1008ce94 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 483/835] 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 00000000..b851cd54
--- /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 00000000..c53614ec
--- /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 00000000..0b14e0d8
--- /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 00000000..a65d2a5b
--- /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 00000000..d642d766
--- /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 00000000..c1947526
--- /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 484/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ecb57c5..aaf80274 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 485/835] 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 441ede22..1efc59f1 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 486/835] 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 242d76f3..f986a278 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 a0b69350..edf6d065 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 00000000..34f0d1a3
--- /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 9a9e6b41..97c6e50c 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 00000000..7a1e5403
--- /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 a24cedae..35fca485 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 487/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aaf80274..c3388d8e 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 488/835] 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 f44100c9..70e6e796 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 239cf6e1..dd9a7b77 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 00000000..010dab60
--- /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 00000000..cac2bf7e
--- /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 00000000..becd1c4b
--- /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 00000000..21f6a770
--- /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 00000000..8fa0d9c9
--- /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 489/835] 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 c3388d8e..cb30a56d 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 3b1355a4..bf7084a4 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 010dab60..10772794 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 490/835] 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 edf6d065..f637eb25 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 00000000..134d15c8
--- /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 00000000..ff3b3933
--- /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 491/835] 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 7c4660bc..8b0f56ac 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 492/835] 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 cb30a56d..c343130d 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 9dcce12a..50a3cb0a 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 c3c04127..c09dd004 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 2f67335d..63a8a80e 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 6ab28c33..c2e842a0 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 d3246673..7c3758d6 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 493/835] 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 2e6ee3fe..e3ab1102 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 e7a008f4..8a31c271 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 494/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c343130d..f880bdf9 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 495/835] 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 783a2141..39b13cf2 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 496/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f880bdf9..f48dca67 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 497/835] 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 1e7e8bed..12baeb98 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 ea17fe76..52a4ccbd 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 f2bfb7ac..bd3068eb 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 498/835] 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 12baeb98..41f244ec 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 a14e2c8b..c10a4410 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 48458a0b..6ed79f6c 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 499/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f48dca67..2aca563b 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 500/835] 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 2af3fb27..5005e9f0 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 4b769a46..198aefe0 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 501/835] 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 c10a4410..53d97d08 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 6ed79f6c..ad0e3ce7 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 52a4ccbd..bb66a030 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 bd3068eb..8a3bcbd6 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 502/835] 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 53d97d08..84661aec 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 ad0e3ce7..d39c995c 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 bb66a030..ebc55514 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 8a3bcbd6..dfed5713 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 503/835] 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             | 169 ++++-
 plugins/outputs/amqp/client.go                | 134 ++++
 6 files changed, 618 insertions(+), 361 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 84661aec..e7701ad7 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 d39c995c..1dde6fe2 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 ebc55514..817eea67 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 dfed5713..faaa1027 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 66a08262..32a91452 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)
+	t *testing.T
+}
 
-	// Verify that we can successfully write data to the amqp broker
-	err = q.Write(testutil.MockMetrics())
-	require.NoError(t, err)
+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 00000000..ba4e4516
--- /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 504/835] 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 e7701ad7..bc42f910 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 1dde6fe2..739ed76e 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 817eea67..6002311f 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 faaa1027..a69db1e6 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 505/835] 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 c457006a..9c144afe 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 65ee0db9..4370ac57 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 cac2bf7e..1b69e602 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 becd1c4b..cae46518 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 8fa0d9c9..66568380 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 a2f15fc0..f1e87853 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 0c5747d3..4d93469f 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 506/835] 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 039cff8c..fe0b078b 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 507/835] 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 5f2bf042..0bbff2f6 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 508/835] 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 ed058671..2e70de5b 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 9712ee8a..04b5f9d2 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 233e7259..0b90d949 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 509/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2aca563b..0d63a462 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 510/835] 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 01ab7ac2..8949fe6d 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 7ceb7d25..f1c70397 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 511/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d63a462..86a88fda 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 512/835] 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 70e6e796..4096d93a 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 513/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86a88fda..ca91ef10 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 514/835] 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 0e476302..2d215984 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 515/835] 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 41f244ec..dbf142c2 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 516/835] 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 e3ab1102..b21f223c 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 61f2b0dc..1da0122a 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 517/835] 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 ca91ef10..9ba4be71 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 518/835] 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 f5f23cd0..cfac6ab7 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 8189a666..8cb04e4f 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 519/835] 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 4096d93a..5bc29b20 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 c68f6624..da4e8b71 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 5c5238f5..766463cf 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 520/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ba4be71..1cf646da 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 521/835] 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 dbf142c2..f51e973d 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 ed5ce1fb..54b7ee0e 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 b647f812..fa84264b 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 864b2847..17226156 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 522/835] 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 f347fa3d..49247478 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 523/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1cf646da..58b090be 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 524/835] 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 5bc29b20..00fdc835 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 25c0678d..ce795834 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 aac60021..619e845c 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 8a423ba5..9e69c8a2 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 b33354ec..10835896 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 525/835] 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 dd9a7b77..b2be2be5 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 00000000..b83a0611
--- /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 00000000..a9a89982
--- /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 00000000..317820bb
--- /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 526/835] 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 b83a0611..9bc83c5d 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 a9a89982..1ee63740 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 527/835] Update changelog

---
 CHANGELOG.md | 7 +++++++
 README.md    | 1 +
 2 files changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58b090be..95aa9cb3 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 bf7084a4..aa415d1d 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 528/835] 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 00fdc835..6d258022 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 529/835] 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 34f0d1a3..3c82c1cf 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 35fca485..41345a94 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 530/835] 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 f986a278..422ef6a3 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 f637eb25..e6f7d519 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 3c82c1cf..e2e2ed86 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 97c6e50c..26f1d348 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 7a1e5403..c5136d30 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 41345a94..14aec375 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 531/835] 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 422ef6a3..dd5dede4 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 532/835] 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 69c2cc27..80c210aa 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 533/835] 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 1e015c9f..18c5a649 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 534/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95aa9cb3..9f38ccfc 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 535/835] 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 6d258022..cc80cb3b 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 a4a78169..cb3eb301 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 a664bc1b..d9fdb0e8 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 536/835] 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 84b8527f..3e8b84ba 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 efac941b..84784b76 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 573a69b1..87785fe8 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 537/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f38ccfc..012aa45a 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 538/835] 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 a6897b71..a0b84ff2 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 539/835] 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 012aa45a..06ea0690 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 540/835] 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 3162cfe0..67f4e06a 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 36c3193f..9b5ce929 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 b79f8960..27081690 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 00000000..b58b3f13
--- /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 541/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06ea0690..75571c7f 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 542/835] 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 3e8b84ba..5d0cc99c 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 543/835] 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 80c210aa..f69c8728 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 544/835] 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 b21f223c..57ff846c 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 545/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75571c7f..b1fedc33 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 546/835] Fix typo

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1fedc33..0db003bf 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 547/835] 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 dd5dede4..a89efec0 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 26f1d348..9ff5aefc 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 548/835] 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 79adbcbb..981face4 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 549/835] 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 fe0b078b..19073a6e 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 88fdb4b7..91e3ffe1 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 9b3f4a0a..5ea85798 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 21205a66..79d18cd6 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 550/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0db003bf..5c0c77d0 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 551/835] 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 8a3d15be..62d17c76 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 c4f94636..c26b209a 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 552/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c0c77d0..6457c6d7 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 553/835] 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 b016deae..d53a0ec0 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 aa415d1d..e5a6634d 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 554/835] 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 a59b9f7f..aa1de747 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 4b9d00c8..d51c61c0 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 42a0b888..1168048a 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 555/835] 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 87b5e65d..a95fb61e 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 556/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6457c6d7..9332d092 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 557/835] 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 e5a6634d..06dd74d9 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 98aecb83..ff1bbfc7 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 00000000..3d132c3b
--- /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 00000000..c43b7723
--- /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 00000000..01c68c49
--- /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 558/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9332d092..e3398cac 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 559/835] 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 d86b32d2..adc4df82 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 cf0754e6..703febaa 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 51f71f6a..01505bdd 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 d77391fc..ff4b7006 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 560/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e3398cac..bfb65f36 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 561/835] 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 d53a0ec0..122f28af 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 c584e6c1..4176a041 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /telegraf
 /telegraf.exe
 /telegraf.gz
+/vendor
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ded08cb5..cef8fa51 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 cc80cb3b..00000000
--- 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 00000000..194bb61e
--- /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 00000000..78d3749a
--- /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 981face4..4d78ab1e 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 06dd74d9..679e2847 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 a586d92f..76a5ab06 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 1820c934..b4983ba0 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 0d792f92..60bf1b51 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 781aad72..167b8ec2 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 8c229b9f..18034867 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 b3fc9489..65a9e148 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 4b239fdb..000ac628 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 281dbecb..3c6321ab 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 6231045b..18e22daa 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 1da0122a..344ee48a 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 562/835] 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 7a1df8bc..1caa3830 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 57d8691c..766d149f 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 1008ce94..6a143bb7 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 563/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfb65f36..e56c9123 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 564/835] 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 e56c9123..672470a1 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 a3387976..8700362d 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 75a6817a..5dbc91d1 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 565/835] Run windows tests with -short

---
 Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 4d78ab1e..8650df26 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 566/835] 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 86534da5..0de2a344 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 567/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 672470a1..ab8c45ea 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 568/835] 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 5d725364..27cb6418 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.

From 8bf18d6ac7043e84805047f313724279fe665ee9 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 29 Jun 2018 16:07:30 -0700
Subject: [PATCH 569/835] Fix name of hadoop example config

---
 .../jolokia2/examples/{hadooop-hdfs.conf => hadoop-hdfs.conf}     | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename plugins/inputs/jolokia2/examples/{hadooop-hdfs.conf => hadoop-hdfs.conf} (100%)

diff --git a/plugins/inputs/jolokia2/examples/hadooop-hdfs.conf b/plugins/inputs/jolokia2/examples/hadoop-hdfs.conf
similarity index 100%
rename from plugins/inputs/jolokia2/examples/hadooop-hdfs.conf
rename to plugins/inputs/jolokia2/examples/hadoop-hdfs.conf

From a10262c5d6394a90f3c48eb48a54de5f65d698c8 Mon Sep 17 00:00:00 2001
From: maxunt <max.untrecht@gmail.com>
Date: Fri, 29 Jun 2018 16:15:33 -0700
Subject: [PATCH 570/835] Add log message when tail is added or removed from a
 file (#4322)

---
 plugins/inputs/logparser/logparser.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/plugins/inputs/logparser/logparser.go b/plugins/inputs/logparser/logparser.go
index cb9e1e8b..8eb86608 100644
--- a/plugins/inputs/logparser/logparser.go
+++ b/plugins/inputs/logparser/logparser.go
@@ -203,6 +203,10 @@ func (l *LogParserPlugin) tailNewfiles(fromBeginning bool) error {
 					Poll:      poll,
 					Logger:    tail.DiscardingLogger,
 				})
+
+			//add message saying a new tailer was added for the file
+			log.Printf("D! tail added for file: %v", file)
+
 			if err != nil {
 				l.acc.AddError(err)
 				continue
@@ -287,6 +291,10 @@ func (l *LogParserPlugin) Stop() {
 
 	for _, t := range l.tailers {
 		err := t.Stop()
+
+		//message for a stopped tailer
+		log.Printf("D! tail dropped for file: %v", t.Filename)
+
 		if err != nil {
 			log.Printf("E! Error stopping tail on file %s\n", t.Filename)
 		}

From beaef8e3da7d953fa58e26ac30ba32822914b647 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 29 Jun 2018 16:20:03 -0700
Subject: [PATCH 571/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab8c45ea..6022122d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@
 - [#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.
+- [#4322](https://github.com/influxdata/telegraf/pull/4322): Add log message when tail is added or removed from a file.
 
 ## v1.7.1 [unreleased]
 

From 9bd5e10133f7999810668b5c3c4ba27b6c670bac Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Fri, 29 Jun 2018 18:05:46 -0700
Subject: [PATCH 572/835] Fix syslog timestamp parsing with single digit day of
 month (#4334)

---
 plugins/inputs/logparser/grok/grok.go      |  2 +-
 plugins/inputs/logparser/grok/grok_test.go | 43 +++++++++++++++++-----
 2 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/plugins/inputs/logparser/grok/grok.go b/plugins/inputs/logparser/grok/grok.go
index 766d149f..4e6efc2c 100644
--- a/plugins/inputs/logparser/grok/grok.go
+++ b/plugins/inputs/logparser/grok/grok.go
@@ -293,7 +293,7 @@ func (p *Parser) ParseLine(line string) (telegraf.Metric, error) {
 				timestamp = time.Unix(0, iv)
 			}
 		case SYSLOG_TIMESTAMP:
-			ts, err := time.ParseInLocation("Jan 02 15:04:05", v, p.loc)
+			ts, err := time.ParseInLocation(time.Stamp, v, p.loc)
 			if err == nil {
 				if ts.Year() == 0 {
 					ts = ts.AddDate(timestamp.Year(), 0, 0)
diff --git a/plugins/inputs/logparser/grok/grok_test.go b/plugins/inputs/logparser/grok/grok_test.go
index 6a143bb7..075c00ca 100644
--- a/plugins/inputs/logparser/grok/grok_test.go
+++ b/plugins/inputs/logparser/grok/grok_test.go
@@ -971,16 +971,41 @@ func TestNewlineInPatterns(t *testing.T) {
 	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) },
+func TestSyslogTimestamp(t *testing.T) {
+	tests := []struct {
+		name     string
+		line     string
+		expected time.Time
+	}{
+		{
+			name:     "two digit day of month",
+			line:     "Sep 25 09:01:55 value=42",
+			expected: time.Date(2018, time.September, 25, 9, 1, 55, 0, time.UTC),
+		},
+		{
+			name:     "one digit day of month single space",
+			line:     "Sep 2 09:01:55 value=42",
+			expected: time.Date(2018, time.September, 2, 9, 1, 55, 0, time.UTC),
+		},
+		{
+			name:     "one digit day of month double space",
+			line:     "Sep  2 09:01:55 value=42",
+			expected: time.Date(2018, time.September, 2, 9, 1, 55, 0, time.UTC),
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			p := &Parser{
+				Patterns: []string{`%{SYSLOGTIMESTAMP:timestamp:ts-syslog} value=%{NUMBER:value:int}`},
+				timeFunc: func() time.Time { return time.Date(2017, time.April, 1, 0, 0, 0, 0, time.UTC) },
+			}
+			require.NoError(t, p.Compile())
+			m, err := p.ParseLine(tt.line)
+			require.NoError(t, err)
+			require.NotNil(t, m)
+			require.Equal(t, tt.expected, m.Time())
+		})
 	}
-	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())
 }
 
 func TestReplaceTimestampComma(t *testing.T) {

From 5aa199e2b3e4cb93f154c40f6f06e1183821c756 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 29 Jun 2018 18:06:45 -0700
Subject: [PATCH 573/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6022122d..18c150a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,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.
+- [#4334](https://github.com/influxdata/telegraf/pull/4334): Fix syslog timestamp parsing with single digit day of month.
 
 ## v1.7 [2018-06-12]
 

From 54056f38084cacdbd2e31dfab923489361e40285 Mon Sep 17 00:00:00 2001
From: Greg <g2linton@gmail.com>
Date: Fri, 29 Jun 2018 19:16:52 -0600
Subject: [PATCH 574/835] Handle mysql input variations in the user_statistics
 collecting (#4306)

---
 plugins/inputs/mysql/mysql.go | 349 +++++++++++++++++++---------------
 1 file changed, 193 insertions(+), 156 deletions(-)

diff --git a/plugins/inputs/mysql/mysql.go b/plugins/inputs/mysql/mysql.go
index 063452b7..c17de3dc 100644
--- a/plugins/inputs/mysql/mysql.go
+++ b/plugins/inputs/mysql/mysql.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"database/sql"
 	"fmt"
-	"log"
 	"strconv"
 	"strings"
 	"sync"
@@ -80,7 +79,7 @@ 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 from INFORMATION_SCHEMA.USER_STATISTICS
   gather_user_statistics                    = true
   #
   ## gather auto_increment columns and max values from information schema
@@ -282,9 +281,8 @@ const (
         GROUP BY command,state
         ORDER BY null`
 	infoSchemaUserStatisticsQuery = `
-        SELECT *,count(*)
-        FROM information_schema.user_statistics
-	GROUP BY user`
+        SELECT *
+        FROM information_schema.user_statistics`
 	infoSchemaAutoIncQuery = `
         SELECT table_schema, table_name, column_name, auto_increment,
           CAST(pow(2, case data_type
@@ -761,103 +759,6 @@ func (m *Mysql) gatherGlobalStatuses(db *sql.DB, serv string, acc telegraf.Accum
 	if len(fields) > 0 {
 		acc.AddFields("mysql", fields, tags)
 	}
-	// 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
-
-				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)
-			}
-		}
-	}
-
-	// 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
-
-				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
 }
@@ -908,6 +809,29 @@ func (m *Mysql) GatherProcessListStatuses(db *sql.DB, serv string, acc telegraf.
 	} else {
 		acc.AddFields("mysql_process_list", fields, tags)
 	}
+
+	// get count of connections from each user
+	conn_rows, err := db.Query("SELECT user, sum(1) AS connections FROM INFORMATION_SCHEMA.PROCESSLIST GROUP BY user")
+	if err != nil {
+		return err
+	}
+
+	for conn_rows.Next() {
+		var user string
+		var connections int64
+
+		err = conn_rows.Scan(&user, &connections)
+		if err != nil {
+			return err
+		}
+
+		tags := map[string]string{"server": servtag, "user": user}
+		fields := make(map[string]interface{})
+
+		fields["connections"] = connections
+		acc.AddFields("mysql_users", fields, tags)
+	}
+
 	return nil
 }
 
@@ -917,77 +841,190 @@ func (m *Mysql) GatherUserStatisticsStatuses(db *sql.DB, serv string, acc telegr
 	// run query
 	rows, err := db.Query(infoSchemaUserStatisticsQuery)
 	if err != nil {
+		// disable collecting if table is not found (mysql specific error)
+		// (suppresses repeat errors)
+		if strings.Contains(err.Error(), "nknown table 'user_statistics'") {
+			m.GatherUserStatistics = false
+		}
 		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
-	)
+
+	cols, err := columnsToLower(rows.Columns())
+	if err != nil {
+		return err
+	}
+
+	read, err := getColSlice(len(cols))
+	if err != nil {
+		return err
+	}
 
 	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,
-			&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,
-		)
+		err = rows.Scan(read...)
 		if err != nil {
 			return err
 		}
 
-		tags := map[string]string{"server": servtag, "user": user}
-		fields := map[string]interface{}{
+		tags := map[string]string{"server": servtag, "user": *read[0].(*string)}
+		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,
+		for i := range cols {
+			if i == 0 {
+				continue // skip "user"
+			}
+			switch v := read[i].(type) {
+			case *int64:
+				fields[cols[i]] = *v
+			case *float64:
+				fields[cols[i]] = *v
+			case *string:
+				fields[cols[i]] = *v
+			default:
+				return fmt.Errorf("Unknown column type - %T", v)
+			}
 		}
 		acc.AddFields("mysql_user_stats", fields, tags)
 	}
 	return nil
 }
 
+// columnsToLower converts selected column names to lowercase.
+func columnsToLower(s []string, e error) ([]string, error) {
+	if e != nil {
+		return nil, e
+	}
+	d := make([]string, len(s))
+
+	for i := range s {
+		d[i] = strings.ToLower(s[i])
+	}
+	return d, nil
+}
+
+// getColSlice returns an in interface slice that can be used in the row.Scan().
+func getColSlice(l int) ([]interface{}, error) {
+	// list of all possible column names
+	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_read                   int64
+		rows_sent                   int64
+		rows_deleted                int64
+		rows_inserted               int64
+		rows_updated                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
+		max_statement_time_exceeded int64
+		// maria specific
+		fbusy_time float64
+		fcpu_time  float64
+		// percona specific
+		rows_fetched    int64
+		table_rows_read int64
+	)
+
+	switch l {
+	case 23: // maria5
+		return []interface{}{
+			&user,
+			&total_connections,
+			&concurrent_connections,
+			&connected_time,
+			&fbusy_time,
+			&fcpu_time,
+			&bytes_received,
+			&bytes_sent,
+			&binlog_bytes_written,
+			&rows_read,
+			&rows_sent,
+			&rows_deleted,
+			&rows_inserted,
+			&rows_updated,
+			&select_commands,
+			&update_commands,
+			&other_commands,
+			&commit_transactions,
+			&rollback_transactions,
+			&denied_connections,
+			&lost_connections,
+			&access_denied,
+			&empty_queries,
+		}, nil
+	case 25: // maria10
+		return []interface{}{
+			&user,
+			&total_connections,
+			&concurrent_connections,
+			&connected_time,
+			&fbusy_time,
+			&fcpu_time,
+			&bytes_received,
+			&bytes_sent,
+			&binlog_bytes_written,
+			&rows_read,
+			&rows_sent,
+			&rows_deleted,
+			&rows_inserted,
+			&rows_updated,
+			&select_commands,
+			&update_commands,
+			&other_commands,
+			&commit_transactions,
+			&rollback_transactions,
+			&denied_connections,
+			&lost_connections,
+			&access_denied,
+			&empty_queries,
+			&total_ssl_connections,
+			&max_statement_time_exceeded,
+		}, nil
+	case 22: // percona
+		return []interface{}{
+			&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,
+		}, nil
+	}
+
+	return nil, fmt.Errorf("Not Supported - %d columns", l)
+}
+
 // 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 b2e972cd81ecd1f6240cae5ed8a25da66164d7c4 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 29 Jun 2018 18:18:58 -0700
Subject: [PATCH 575/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18c150a2..59531502 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@
 - [#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.
 - [#4334](https://github.com/influxdata/telegraf/pull/4334): Fix syslog timestamp parsing with single digit day of month.
+- [#2910](https://github.com/influxdata/telegraf/issues/2910): Handle mysql input variations in the user_statistics collecting.
 
 ## v1.7 [2018-06-12]
 

From ed2bc1151bf5c51059307e29336afc9d0ddf168e Mon Sep 17 00:00:00 2001
From: Vlasta Hajek <vlastimil.hajek@bonitoo.io>
Date: Sat, 30 Jun 2018 04:01:28 +0200
Subject: [PATCH 576/835] Allow use of counter time in win perf counters
 (#4267)

---
 plugins/inputs/win_perf_counters/README.md    |   9 ++
 plugins/inputs/win_perf_counters/kernel32.go  |  73 ++++++++++
 plugins/inputs/win_perf_counters/pdh.go       |  40 +++++-
 .../win_perf_counters/performance_query.go    |  63 +++++----
 .../win_perf_counters/win_perf_counters.go    |  97 +++++++------
 .../win_perf_counters_integration_test.go     |  11 +-
 .../win_perf_counters_test.go                 | 131 ++++++++++++++----
 7 files changed, 330 insertions(+), 94 deletions(-)
 create mode 100644 plugins/inputs/win_perf_counters/kernel32.go

diff --git a/plugins/inputs/win_perf_counters/README.md b/plugins/inputs/win_perf_counters/README.md
index a89efec0..cf2ba4d6 100644
--- a/plugins/inputs/win_perf_counters/README.md
+++ b/plugins/inputs/win_perf_counters/README.md
@@ -72,6 +72,15 @@ It is recommended NOT to use this on OSes starting with Vista and newer because
 Example for Windows Server 2003, this would be set to true:
 `PreVistaSupport=true`
 
+#### UsePerfCounterTime
+
+Bool, if set to `true` will request a timestamp along with the PerfCounter data. 
+If se to `false`, current time will be used.
+
+Supported on Windows Vista/Windows Server 2008 and newer
+Example:
+`UsePerfCounterTime=true`
+
 ### Object
 
 See Entry below.
diff --git a/plugins/inputs/win_perf_counters/kernel32.go b/plugins/inputs/win_perf_counters/kernel32.go
new file mode 100644
index 00000000..9cdadedc
--- /dev/null
+++ b/plugins/inputs/win_perf_counters/kernel32.go
@@ -0,0 +1,73 @@
+// 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"
+)
+
+type SYSTEMTIME struct {
+	wYear         uint16
+	wMonth        uint16
+	wDayOfWeek    uint16
+	wDay          uint16
+	wHour         uint16
+	wMinute       uint16
+	wSecond       uint16
+	wMilliseconds uint16
+}
+
+type FILETIME struct {
+	dwLowDateTime  uint32
+	dwHighDateTime uint32
+}
+
+var (
+	// Library
+	libkrnDll *syscall.DLL
+
+	// Functions
+	krn_FileTimeToSystemTime    *syscall.Proc
+	krn_FileTimeToLocalFileTime *syscall.Proc
+	krn_LocalFileTimeToFileTime *syscall.Proc
+	krn_WideCharToMultiByte     *syscall.Proc
+)
+
+func init() {
+	libkrnDll = syscall.MustLoadDLL("Kernel32.dll")
+
+	krn_FileTimeToSystemTime = libkrnDll.MustFindProc("FileTimeToSystemTime")
+	krn_FileTimeToLocalFileTime = libkrnDll.MustFindProc("FileTimeToLocalFileTime")
+	krn_LocalFileTimeToFileTime = libkrnDll.MustFindProc("LocalFileTimeToFileTime")
+	krn_WideCharToMultiByte = libkrnDll.MustFindProc("WideCharToMultiByte")
+}
diff --git a/plugins/inputs/win_perf_counters/pdh.go b/plugins/inputs/win_perf_counters/pdh.go
index e6f7d519..6a8dff10 100644
--- a/plugins/inputs/win_perf_counters/pdh.go
+++ b/plugins/inputs/win_perf_counters/pdh.go
@@ -38,12 +38,15 @@ import (
 	"unsafe"
 
 	"golang.org/x/sys/windows"
+	"time"
 )
 
 // Error codes
 const (
-	ERROR_SUCCESS          = 0
-	ERROR_INVALID_FUNCTION = 1
+	ERROR_SUCCESS                 = 0
+	ERROR_FAILURE                 = 1
+	ERROR_INVALID_FUNCTION        = 1
+	EPOCH_DIFFERENCE_MICROS int64 = 11644473600000000
 )
 
 type (
@@ -170,6 +173,7 @@ var (
 	pdh_AddEnglishCounterW        *syscall.Proc
 	pdh_CloseQuery                *syscall.Proc
 	pdh_CollectQueryData          *syscall.Proc
+	pdh_CollectQueryDataWithTime  *syscall.Proc
 	pdh_GetFormattedCounterValue  *syscall.Proc
 	pdh_GetFormattedCounterArrayW *syscall.Proc
 	pdh_OpenQuery                 *syscall.Proc
@@ -187,6 +191,7 @@ func init() {
 	pdh_AddEnglishCounterW, _ = libpdhDll.FindProc("PdhAddEnglishCounterW") // XXX: only supported on versions > Vista.
 	pdh_CloseQuery = libpdhDll.MustFindProc("PdhCloseQuery")
 	pdh_CollectQueryData = libpdhDll.MustFindProc("PdhCollectQueryData")
+	pdh_CollectQueryDataWithTime, _ = libpdhDll.FindProc("PdhCollectQueryDataWithTime")
 	pdh_GetFormattedCounterValue = libpdhDll.MustFindProc("PdhGetFormattedCounterValue")
 	pdh_GetFormattedCounterArrayW = libpdhDll.MustFindProc("PdhGetFormattedCounterArrayW")
 	pdh_OpenQuery = libpdhDll.MustFindProc("PdhOpenQuery")
@@ -303,6 +308,37 @@ func PdhCollectQueryData(hQuery PDH_HQUERY) uint32 {
 	return uint32(ret)
 }
 
+// PdhCollectQueryDataWithTime queries data from perfmon, retrieving the device/windows timestamp from the node it was collected on.
+// Converts the filetime structure to a GO time class and returns the native time.
+//
+func PdhCollectQueryDataWithTime(hQuery PDH_HQUERY) (uint32, time.Time) {
+	var localFileTime FILETIME
+	ret, _, _ := pdh_CollectQueryDataWithTime.Call(uintptr(hQuery), uintptr(unsafe.Pointer(&localFileTime)))
+
+	if ret == ERROR_SUCCESS {
+		var utcFileTime FILETIME
+		ret, _, _ := krn_LocalFileTimeToFileTime.Call(
+			uintptr(unsafe.Pointer(&localFileTime)),
+			uintptr(unsafe.Pointer(&utcFileTime)))
+
+		if ret == 0 {
+			return uint32(ERROR_FAILURE), time.Now()
+		}
+
+		// First convert 100-ns intervals to microseconds, then adjust for the
+		// epoch difference
+		var totalMicroSeconds int64
+		totalMicroSeconds = ((int64(utcFileTime.dwHighDateTime) << 32) | int64(utcFileTime.dwLowDateTime)) / 10
+		totalMicroSeconds -= EPOCH_DIFFERENCE_MICROS
+
+		retTime := time.Unix(0, totalMicroSeconds*1000)
+
+		return uint32(ERROR_SUCCESS), retTime
+	}
+
+	return uint32(ret), time.Now()
+}
+
 // 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 {
diff --git a/plugins/inputs/win_perf_counters/performance_query.go b/plugins/inputs/win_perf_counters/performance_query.go
index e2e2ed86..ce247a49 100644
--- a/plugins/inputs/win_perf_counters/performance_query.go
+++ b/plugins/inputs/win_perf_counters/performance_query.go
@@ -6,6 +6,7 @@ package win_perf_counters
 import (
 	"errors"
 	"syscall"
+	"time"
 	"unsafe"
 )
 
@@ -26,7 +27,8 @@ type PerformanceQuery interface {
 	GetFormattedCounterValueDouble(hCounter PDH_HCOUNTER) (float64, error)
 	GetFormattedCounterArrayDouble(hCounter PDH_HCOUNTER) ([]CounterValue, error)
 	CollectData() error
-	AddEnglishCounterSupported() bool
+	CollectDataWithTime() (time.Time, error)
+	IsVistaOrNewer() bool
 }
 
 //PdhError represents error returned from Performance Counters API
@@ -61,8 +63,8 @@ func (m *PerformanceQueryImpl) Open() error {
 		}
 	}
 	var handle PDH_HQUERY
-	ret := PdhOpenQuery(0, 0, &handle)
-	if ret != ERROR_SUCCESS {
+
+	if ret := PdhOpenQuery(0, 0, &handle); ret != ERROR_SUCCESS {
 		return NewPdhError(ret)
 	}
 	m.query = handle
@@ -74,8 +76,8 @@ func (m *PerformanceQueryImpl) Close() error {
 	if m.query == 0 {
 		return errors.New("uninitialised query")
 	}
-	ret := PdhCloseQuery(m.query)
-	if ret != ERROR_SUCCESS {
+
+	if ret := PdhCloseQuery(m.query); ret != ERROR_SUCCESS {
 		return NewPdhError(ret)
 	}
 	m.query = 0
@@ -87,8 +89,8 @@ func (m *PerformanceQueryImpl) AddCounterToQuery(counterPath string) (PDH_HCOUNT
 	if m.query == 0 {
 		return 0, errors.New("uninitialised query")
 	}
-	ret := PdhAddCounter(m.query, counterPath, 0, &counterHandle)
-	if ret != ERROR_SUCCESS {
+
+	if ret := PdhAddCounter(m.query, counterPath, 0, &counterHandle); ret != ERROR_SUCCESS {
 		return 0, NewPdhError(ret)
 	}
 	return counterHandle, nil
@@ -99,8 +101,7 @@ func (m *PerformanceQueryImpl) AddEnglishCounterToQuery(counterPath string) (PDH
 	if m.query == 0 {
 		return 0, errors.New("uninitialised query")
 	}
-	ret := PdhAddEnglishCounter(m.query, counterPath, 0, &counterHandle)
-	if ret != ERROR_SUCCESS {
+	if ret := PdhAddEnglishCounter(m.query, counterPath, 0, &counterHandle); ret != ERROR_SUCCESS {
 		return 0, NewPdhError(ret)
 	}
 	return counterHandle, nil
@@ -110,13 +111,11 @@ func (m *PerformanceQueryImpl) AddEnglishCounterToQuery(counterPath string) (PDH
 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 {
+	var ret uint32
+	if ret = PdhGetCounterInfo(counterHandle, 0, &bufSize, nil); ret == PDH_MORE_DATA {
 		buff = make([]byte, bufSize)
 		bufSize = uint32(len(buff))
-		ret = PdhGetCounterInfo(counterHandle, 0, &bufSize, &buff[0])
-		if ret == ERROR_SUCCESS {
+		if ret = PdhGetCounterInfo(counterHandle, 0, &bufSize, &buff[0]); ret == ERROR_SUCCESS {
 			ci := (*PDH_COUNTER_INFO)(unsafe.Pointer(&buff[0]))
 			return UTF16PtrToString(ci.SzFullPath), nil
 		}
@@ -128,9 +127,9 @@ func (m *PerformanceQueryImpl) GetCounterPath(counterHandle PDH_HCOUNTER) (strin
 func (m *PerformanceQueryImpl) ExpandWildCardPath(counterPath string) ([]string, error) {
 	var bufSize uint32
 	var buff []uint16
+	var ret uint32
 
-	ret := PdhExpandWildCardPath(counterPath, nil, &bufSize)
-	if ret == PDH_MORE_DATA {
+	if ret = PdhExpandWildCardPath(counterPath, nil, &bufSize); ret == PDH_MORE_DATA {
 		buff = make([]uint16, bufSize)
 		bufSize = uint32(len(buff))
 		ret = PdhExpandWildCardPath(counterPath, &buff[0], &bufSize)
@@ -146,8 +145,9 @@ func (m *PerformanceQueryImpl) ExpandWildCardPath(counterPath string) ([]string,
 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 {
+	var ret uint32
+
+	if ret = PdhGetFormattedCounterValueDouble(hCounter, &counterType, &value); ret == ERROR_SUCCESS {
 		if value.CStatus == PDH_CSTATUS_VALID_DATA || value.CStatus == PDH_CSTATUS_NEW_DATA {
 			return value.DoubleValue, nil
 		} else {
@@ -161,11 +161,12 @@ 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 {
+	var ret uint32
+
+	if ret = PdhGetFormattedCounterArrayDouble(hCounter, &buffSize, &itemCount, nil); ret == PDH_MORE_DATA {
 		buff := make([]byte, buffSize)
-		ret = PdhGetFormattedCounterArrayDouble(hCounter, &buffSize, &itemCount, &buff[0])
-		if ret == ERROR_SUCCESS {
+
+		if ret = PdhGetFormattedCounterArrayDouble(hCounter, &buffSize, &itemCount, &buff[0]); 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 {
@@ -181,17 +182,29 @@ func (m *PerformanceQueryImpl) GetFormattedCounterArrayDouble(hCounter PDH_HCOUN
 }
 
 func (m *PerformanceQueryImpl) CollectData() error {
+	var ret uint32
 	if m.query == 0 {
 		return errors.New("uninitialised query")
 	}
-	ret := PdhCollectQueryData(m.query)
-	if ret != ERROR_SUCCESS {
+
+	if ret = PdhCollectQueryData(m.query); ret != ERROR_SUCCESS {
 		return NewPdhError(ret)
 	}
 	return nil
 }
 
-func (m *PerformanceQueryImpl) AddEnglishCounterSupported() bool {
+func (m *PerformanceQueryImpl) CollectDataWithTime() (time.Time, error) {
+	if m.query == 0 {
+		return time.Now(), errors.New("uninitialised query")
+	}
+	ret, mtime := PdhCollectQueryDataWithTime(m.query)
+	if ret != ERROR_SUCCESS {
+		return time.Now(), NewPdhError(ret)
+	}
+	return mtime, nil
+}
+
+func (m *PerformanceQueryImpl) IsVistaOrNewer() bool {
 	return PdhAddEnglishCounterSupported()
 }
 
diff --git a/plugins/inputs/win_perf_counters/win_perf_counters.go b/plugins/inputs/win_perf_counters/win_perf_counters.go
index 9ff5aefc..d2ace523 100644
--- a/plugins/inputs/win_perf_counters/win_perf_counters.go
+++ b/plugins/inputs/win_perf_counters/win_perf_counters.go
@@ -23,6 +23,8 @@ var sampleConfig = `
   ## agent, it will not be gathered.
   ## Settings:
   # PrintValid = false # Print All matching performance counters
+  # Whether request a timestamp along with the PerfCounter data or just use current time
+  # UsePerfCounterTime=true
   # 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 still be expanded, but instance indexes will not be returned in instance names.
@@ -78,6 +80,7 @@ type Win_PerfCounters struct {
 	PrintValid bool
 	//deprecated: determined dynamically
 	PreVistaSupport         bool
+	UsePerfCounterTime      bool
 	Object                  []perfobject
 	CountersRefreshInterval internal.Duration
 	UseWildcardsExpansion   bool
@@ -107,6 +110,12 @@ type counter struct {
 	counterHandle PDH_HCOUNTER
 }
 
+type instanceGrouping struct {
+	name       string
+	instance   string
+	objectname string
+}
+
 var sanitizedChars = strings.NewReplacer("/sec", "_persec", "/Sec", "_persec",
 	" ", "_", "%", "Percent", `\`, "")
 
@@ -147,7 +156,7 @@ func (m *Win_PerfCounters) SampleConfig() string {
 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() {
+	if !m.query.IsVistaOrNewer() {
 		counterHandle, err = m.query.AddCounterToQuery(counterPath)
 		if err != nil {
 			return err
@@ -249,18 +258,15 @@ func (m *Win_PerfCounters) Gather(acc telegraf.Accumulator) error {
 			m.counters = m.counters[:0]
 		}
 
-		err = m.query.Open()
-		if err != nil {
+		if err = m.query.Open(); err != nil {
 			return err
 		}
 
-		err = m.ParseConfig()
-		if err != nil {
+		if err = m.ParseConfig(); err != nil {
 			return err
 		}
 		//some counters need two data samples before computing a value
-		err = m.query.CollectData()
-		if err != nil {
+		if err = m.query.CollectData(); err != nil {
 			return err
 		}
 		m.lastRefreshed = time.Now()
@@ -268,37 +274,31 @@ func (m *Win_PerfCounters) Gather(acc telegraf.Accumulator) error {
 		time.Sleep(time.Second)
 	}
 
-	type InstanceGrouping struct {
-		name       string
-		instance   string
-		objectname string
+	var collectFields = make(map[instanceGrouping]map[string]interface{})
+
+	var timestamp time.Time
+	if m.UsePerfCounterTime && m.query.IsVistaOrNewer() {
+		timestamp, err = m.query.CollectDataWithTime()
+		if err != nil {
+			return err
+		}
+	} else {
+		timestamp = time.Now()
+		if err = m.query.CollectData(); err != nil {
+			return err
+		}
 	}
 
-	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.counters {
 		// collect
 		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{})
-				}
-				collectFields[instance][sanitizedChars.Replace(metric.counter)] = float32(value)
+				addCounterMeasurement(metric, metric.instance, value, collectFields)
 			} 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 {
+				//ignore invalid data  as some counters from process instances returns this sometimes
+				if !isKnownCounterDataError(err) {
 					return fmt.Errorf("error while getting value for counter %s: %v", metric.counterPath, err)
 				}
 			}
@@ -326,18 +326,14 @@ func (m *Win_PerfCounters) Gather(acc telegraf.Accumulator) error {
 					}
 
 					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)
+						addCounterMeasurement(metric, cValue.InstanceName, cValue.Value, collectFields)
 					}
 				}
+			} else {
+				//ignore invalid data as some counters from process instances returns this sometimes
+				if !isKnownCounterDataError(err) {
+					return fmt.Errorf("error while getting value for counter %s: %v", metric.counterPath, err)
+				}
 			}
 		}
 	}
@@ -349,12 +345,33 @@ func (m *Win_PerfCounters) Gather(acc telegraf.Accumulator) error {
 		if len(instance.instance) > 0 {
 			tags["instance"] = instance.instance
 		}
-		acc.AddFields(instance.name, fields, tags)
+		acc.AddFields(instance.name, fields, tags, timestamp)
 	}
 
 	return nil
 }
 
+func addCounterMeasurement(metric *counter, instanceName string, value float64, collectFields map[instanceGrouping]map[string]interface{}) {
+	measurement := sanitizedChars.Replace(metric.measurement)
+	if measurement == "" {
+		measurement = "win_perf_counters"
+	}
+	var instance = instanceGrouping{measurement, instanceName, metric.objectName}
+	if collectFields[instance] == nil {
+		collectFields[instance] = make(map[string]interface{})
+	}
+	collectFields[instance][sanitizedChars.Replace(metric.counter)] = float32(value)
+}
+
+func isKnownCounterDataError(err error) bool {
+	if pdhErr, ok := err.(*PdhError); ok && (pdhErr.ErrorCode == PDH_INVALID_DATA ||
+		pdhErr.ErrorCode == PDH_CALC_NEGATIVE_VALUE ||
+		pdhErr.ErrorCode == PDH_CSTATUS_INVALID_DATA) {
+		return true
+	}
+	return false
+}
+
 func init() {
 	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
index c5136d30..546dfa14 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
@@ -70,6 +70,11 @@ func TestWinPerformanceQueryImpl(t *testing.T) {
 	_, err = query.GetFormattedCounterValueDouble(hCounter)
 	require.NoError(t, err)
 
+	now := time.Now()
+	mtime, err := query.CollectDataWithTime()
+	require.NoError(t, err)
+	assert.True(t, mtime.Sub(now) < time.Second)
+
 	counterPath = "\\Process(*)\\% Processor Time"
 	paths, err := query.ExpandWildCardPath(counterPath)
 	require.NoError(t, err)
@@ -98,6 +103,10 @@ func TestWinPerformanceQueryImpl(t *testing.T) {
 	require.NoError(t, err)
 
 	arr, err := query.GetFormattedCounterArrayDouble(hCounter)
+	if phderr, ok := err.(*PdhError); ok && phderr.ErrorCode != PDH_INVALID_DATA && phderr.ErrorCode != PDH_CALC_NEGATIVE_VALUE {
+		time.Sleep(time.Second)
+		arr, err = query.GetFormattedCounterArrayDouble(hCounter)
+	}
 	require.NoError(t, err)
 	assert.True(t, len(arr) > 0, "Too")
 
@@ -596,7 +605,7 @@ func TestWinPerfcountersCollect2(t *testing.T) {
 
 	perfobjects[0] = PerfObject
 
-	m := Win_PerfCounters{PrintValid: false, Object: perfobjects, query: &PerformanceQueryImpl{}, UseWildcardsExpansion: true}
+	m := Win_PerfCounters{PrintValid: false, UsePerfCounterTime: true, 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 14aec375..07e1941a 100644
--- a/plugins/inputs/win_perf_counters/win_perf_counters_test.go
+++ b/plugins/inputs/win_perf_counters/win_perf_counters_test.go
@@ -19,12 +19,14 @@ type testCounter struct {
 	value  float64
 }
 type FakePerformanceQuery struct {
-	counters            map[string]testCounter
-	addEnglishSupported bool
-	expandPaths         map[string][]string
-	openCalled          bool
+	counters      map[string]testCounter
+	vistaAndNewer bool
+	expandPaths   map[string][]string
+	openCalled    bool
 }
 
+var MetricTime = time.Date(2018, 5, 28, 12, 0, 0, 0, time.UTC)
+
 func (m *testCounter) ToCounterValue() *CounterValue {
 	_, inst, _, _ := extractObjectInstanceCounterFromQuery(m.path)
 	if inst == "" {
@@ -102,8 +104,10 @@ func (m *FakePerformanceQuery) GetFormattedCounterValueDouble(counterHandle PDH_
 			} else {
 				if counter.value == 0 {
 					return 0, NewPdhError(PDH_INVALID_DATA)
-				} else {
+				} else if counter.value == -1 {
 					return 0, NewPdhError(PDH_CALC_NEGATIVE_VALUE)
+				} else {
+					return 0, NewPdhError(PDH_ACCESS_DENIED)
 				}
 			}
 		}
@@ -138,8 +142,18 @@ func (m *FakePerformanceQuery) GetFormattedCounterArrayDouble(hCounter PDH_HCOUN
 				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())
+					if counter != nil {
+						if counter.value > 0 {
+							counters = append(counters, *counter.ToCounterValue())
+						} else {
+							if counter.value == 0 {
+								return nil, NewPdhError(PDH_INVALID_DATA)
+							} else if counter.value == -1 {
+								return nil, NewPdhError(PDH_CALC_NEGATIVE_VALUE)
+							} else {
+								return nil, NewPdhError(PDH_ACCESS_DENIED)
+							}
+						}
 					} else {
 						return nil, fmt.Errorf("GetFormattedCounterArrayDouble: invalid counter : %s", p)
 					}
@@ -160,8 +174,15 @@ func (m *FakePerformanceQuery) CollectData() error {
 	return nil
 }
 
-func (m *FakePerformanceQuery) AddEnglishCounterSupported() bool {
-	return m.addEnglishSupported
+func (m *FakePerformanceQuery) CollectDataWithTime() (time.Time, error) {
+	if !m.openCalled {
+		return time.Now(), errors.New("CollectData: uninitialised query")
+	}
+	return MetricTime, nil
+}
+
+func (m *FakePerformanceQuery) IsVistaOrNewer() bool {
+	return m.vistaAndNewer
 }
 
 func createPerfObject(measurement string, object string, instances []string, counters []string, failOnMissing bool, includeTotal bool) []perfobject {
@@ -198,7 +219,7 @@ func TestAddItemSimple(t *testing.T) {
 		expandPaths: map[string][]string{
 			cps1[0]: cps1,
 		},
-		addEnglishSupported: true,
+		vistaAndNewer: true,
 	}}
 	err = m.query.Open()
 	require.NoError(t, err)
@@ -216,7 +237,7 @@ func TestAddItemInvalidCountPath(t *testing.T) {
 		expandPaths: map[string][]string{
 			cps1[0]: {"\\O/C"},
 		},
-		addEnglishSupported: true,
+		vistaAndNewer: true,
 	}}
 	err = m.query.Open()
 	require.NoError(t, err)
@@ -238,7 +259,7 @@ func TestParseConfigBasic(t *testing.T) {
 			cps1[2]: {cps1[2]},
 			cps1[3]: {cps1[3]},
 		},
-		addEnglishSupported: true,
+		vistaAndNewer: true,
 	}}
 	err = m.query.Open()
 	require.NoError(t, err)
@@ -270,7 +291,7 @@ func TestParseConfigNoInstance(t *testing.T) {
 			cps1[0]: {cps1[0]},
 			cps1[1]: {cps1[1]},
 		},
-		addEnglishSupported: true,
+		vistaAndNewer: true,
 	}}
 	err = m.query.Open()
 	require.NoError(t, err)
@@ -303,7 +324,7 @@ func TestParseConfigInvalidCounterError(t *testing.T) {
 			cps1[1]: {cps1[1]},
 			cps1[2]: {cps1[2]},
 		},
-		addEnglishSupported: true,
+		vistaAndNewer: true,
 	}}
 	err = m.query.Open()
 	require.NoError(t, err)
@@ -334,7 +355,7 @@ func TestParseConfigInvalidCounterNoError(t *testing.T) {
 			cps1[1]: {cps1[1]},
 			cps1[2]: {cps1[2]},
 		},
-		addEnglishSupported: true,
+		vistaAndNewer: true,
 	}}
 	err = m.query.Open()
 	require.NoError(t, err)
@@ -364,7 +385,7 @@ func TestParseConfigTotalExpansion(t *testing.T) {
 		expandPaths: map[string][]string{
 			"\\O(*)\\*": cps1,
 		},
-		addEnglishSupported: true,
+		vistaAndNewer: true,
 	}}
 	err = m.query.Open()
 	require.NoError(t, err)
@@ -381,7 +402,7 @@ func TestParseConfigTotalExpansion(t *testing.T) {
 		expandPaths: map[string][]string{
 			"\\O(*)\\*": cps1,
 		},
-		addEnglishSupported: true,
+		vistaAndNewer: true,
 	}}
 	err = m.query.Open()
 	require.NoError(t, err)
@@ -401,7 +422,7 @@ func TestParseConfigExpand(t *testing.T) {
 		expandPaths: map[string][]string{
 			"\\O(*)\\*": cps1,
 		},
-		addEnglishSupported: true,
+		vistaAndNewer: true,
 	}}
 	err = m.query.Open()
 	require.NoError(t, err)
@@ -425,7 +446,7 @@ func TestSimpleGather(t *testing.T) {
 		expandPaths: map[string][]string{
 			cp1: {cp1},
 		},
-		addEnglishSupported: false,
+		vistaAndNewer: false,
 	}}
 	var acc1 testutil.Accumulator
 	err = m.Gather(&acc1)
@@ -449,7 +470,65 @@ func TestSimpleGather(t *testing.T) {
 	err = m.Gather(&acc2)
 	require.NoError(t, err)
 	acc1.AssertContainsTaggedFields(t, measurement, fields1, tags1)
+}
 
+func TestSimpleGatherWithTimestamp(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{"C"}, false, false)
+	cp1 := "\\O(I)\\C"
+	m := Win_PerfCounters{PrintValid: false, UsePerfCounterTime: true, Object: perfObjects, query: &FakePerformanceQuery{
+		counters: createCounterMap([]string{cp1}, []float64{1.2}),
+		expandPaths: map[string][]string{
+			cp1: {cp1},
+		},
+		vistaAndNewer: true,
+	}}
+	var acc1 testutil.Accumulator
+	err = m.Gather(&acc1)
+	require.NoError(t, err)
+
+	fields1 := map[string]interface{}{
+		"C": float32(1.2),
+	}
+	tags1 := map[string]string{
+		"instance":   "I",
+		"objectname": "O",
+	}
+	acc1.AssertContainsTaggedFields(t, measurement, fields1, tags1)
+	assert.True(t, acc1.HasTimestamp(measurement, MetricTime))
+}
+
+func TestGatherError(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{"C"}, false, false)
+	cp1 := "\\O(I)\\C"
+	m := Win_PerfCounters{PrintValid: false, Object: perfObjects, query: &FakePerformanceQuery{
+		counters: createCounterMap([]string{cp1}, []float64{-2}),
+		expandPaths: map[string][]string{
+			cp1: {cp1},
+		},
+		vistaAndNewer: false,
+	}}
+	var acc1 testutil.Accumulator
+	err = m.Gather(&acc1)
+	require.Error(t, err)
+
+	m.UseWildcardsExpansion = true
+	m.counters = nil
+	m.lastRefreshed = time.Time{}
+
+	var acc2 testutil.Accumulator
+
+	err = m.Gather(&acc2)
+	require.Error(t, err)
 }
 
 func TestGatherInvalidDataIgnore(t *testing.T) {
@@ -467,7 +546,7 @@ func TestGatherInvalidDataIgnore(t *testing.T) {
 			cps1[1]: {cps1[1]},
 			cps1[2]: {cps1[2]},
 		},
-		addEnglishSupported: false,
+		vistaAndNewer: false,
 	}}
 	var acc1 testutil.Accumulator
 	err = m.Gather(&acc1)
@@ -506,7 +585,7 @@ func TestGatherRefreshingWithExpansion(t *testing.T) {
 		expandPaths: map[string][]string{
 			"\\O(*)\\*": cps1,
 		},
-		addEnglishSupported: true,
+		vistaAndNewer: true,
 	}
 	m := Win_PerfCounters{PrintValid: false, Object: perfObjects, UseWildcardsExpansion: true, query: fpm, CountersRefreshInterval: internal.Duration{Duration: time.Second * 10}}
 	var acc1 testutil.Accumulator
@@ -540,7 +619,7 @@ func TestGatherRefreshingWithExpansion(t *testing.T) {
 		expandPaths: map[string][]string{
 			"\\O(*)\\*": cps2,
 		},
-		addEnglishSupported: true,
+		vistaAndNewer: true,
 	}
 	m.query = fpm
 	fpm.Open()
@@ -592,7 +671,7 @@ func TestGatherRefreshingWithoutExpansion(t *testing.T) {
 			"\\O(*)\\C1": {cps1[0], cps1[2]},
 			"\\O(*)\\C2": {cps1[1], cps1[3]},
 		},
-		addEnglishSupported: true,
+		vistaAndNewer: true,
 	}
 	m := Win_PerfCounters{PrintValid: false, Object: perfObjects, UseWildcardsExpansion: false, query: fpm, CountersRefreshInterval: internal.Duration{Duration: time.Second * 10}}
 	var acc1 testutil.Accumulator
@@ -628,7 +707,7 @@ func TestGatherRefreshingWithoutExpansion(t *testing.T) {
 			"\\O(*)\\C1": {cps2[0], cps2[2], cps2[4]},
 			"\\O(*)\\C2": {cps2[1], cps2[3], cps2[5]},
 		},
-		addEnglishSupported: true,
+		vistaAndNewer: true,
 	}
 	m.query = fpm
 	fpm.Open()
@@ -662,7 +741,7 @@ func TestGatherRefreshingWithoutExpansion(t *testing.T) {
 			"\\O(*)\\C2": {cps3[1], cps3[4]},
 			"\\O(*)\\C3": {cps3[2], cps3[5]},
 		},
-		addEnglishSupported: true,
+		vistaAndNewer: true,
 	}
 	m.query = fpm
 	m.Object = perfObjects
@@ -710,7 +789,7 @@ func TestGatherTotalNoExpansion(t *testing.T) {
 			"\\O(*)\\C1": {cps1[0], cps1[2]},
 			"\\O(*)\\C2": {cps1[1], cps1[3]},
 		},
-		addEnglishSupported: true,
+		vistaAndNewer: true,
 	}}
 	var acc1 testutil.Accumulator
 	err = m.Gather(&acc1)

From 1a781a5851e958a5210c2b5438acccfd648e4698 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 29 Jun 2018 19:02:53 -0700
Subject: [PATCH 577/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59531502..745ed55b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@
 - [#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.
 - [#4322](https://github.com/influxdata/telegraf/pull/4322): Add log message when tail is added or removed from a file.
+- [#4267](https://github.com/influxdata/telegraf/pull/4267): Add option to use of counter time in win perf counters.
 
 ## v1.7.1 [unreleased]
 

From 85eacf268bdc5efbff68513baadf2c25bd0a860d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n=20L=C3=B3pez?= <adrianlzt+github@gmail.com>
Date: Sat, 30 Jun 2018 04:07:08 +0200
Subject: [PATCH 578/835] Fix minmax and basicstats aggregators to use uint64
 (#4294)

---
 plugins/aggregators/basicstats/basicstats.go  |  2 ++
 .../aggregators/basicstats/basicstats_test.go | 21 +++++++++++++++++++
 plugins/aggregators/minmax/minmax.go          |  2 ++
 plugins/aggregators/minmax/minmax_test.go     |  5 +++++
 4 files changed, 30 insertions(+)

diff --git a/plugins/aggregators/basicstats/basicstats.go b/plugins/aggregators/basicstats/basicstats.go
index 8c3291bb..42b795ab 100644
--- a/plugins/aggregators/basicstats/basicstats.go
+++ b/plugins/aggregators/basicstats/basicstats.go
@@ -246,6 +246,8 @@ func convert(in interface{}) (float64, bool) {
 		return v, true
 	case int64:
 		return float64(v), true
+	case uint64:
+		return float64(v), true
 	default:
 		return 0, false
 	}
diff --git a/plugins/aggregators/basicstats/basicstats_test.go b/plugins/aggregators/basicstats/basicstats_test.go
index b35be2da..5c55284d 100644
--- a/plugins/aggregators/basicstats/basicstats_test.go
+++ b/plugins/aggregators/basicstats/basicstats_test.go
@@ -28,6 +28,7 @@ var m2, _ = metric.New("m1",
 		"c":        float64(4),
 		"d":        float64(6),
 		"e":        float64(200),
+		"f":        uint64(200),
 		"ignoreme": "string",
 		"andme":    true,
 	},
@@ -81,6 +82,10 @@ func TestBasicStatsWithPeriod(t *testing.T) {
 		"e_max":   float64(200),
 		"e_min":   float64(200),
 		"e_mean":  float64(200),
+		"f_count": float64(1), //f
+		"f_max":   float64(200),
+		"f_min":   float64(200),
+		"f_mean":  float64(200),
 	}
 	expectedTags := map[string]string{
 		"foo": "bar",
@@ -144,6 +149,10 @@ func TestBasicStatsDifferentPeriods(t *testing.T) {
 		"e_max":   float64(200),
 		"e_min":   float64(200),
 		"e_mean":  float64(200),
+		"f_count": float64(1), //f
+		"f_max":   float64(200),
+		"f_min":   float64(200),
+		"f_mean":  float64(200),
 	}
 	expectedTags = map[string]string{
 		"foo": "bar",
@@ -169,6 +178,7 @@ func TestBasicStatsWithOnlyCount(t *testing.T) {
 		"c_count": float64(2),
 		"d_count": float64(2),
 		"e_count": float64(1),
+		"f_count": float64(1),
 	}
 	expectedTags := map[string]string{
 		"foo": "bar",
@@ -194,6 +204,7 @@ func TestBasicStatsWithOnlyMin(t *testing.T) {
 		"c_min": float64(2),
 		"d_min": float64(2),
 		"e_min": float64(200),
+		"f_min": float64(200),
 	}
 	expectedTags := map[string]string{
 		"foo": "bar",
@@ -219,6 +230,7 @@ func TestBasicStatsWithOnlyMax(t *testing.T) {
 		"c_max": float64(4),
 		"d_max": float64(6),
 		"e_max": float64(200),
+		"f_max": float64(200),
 	}
 	expectedTags := map[string]string{
 		"foo": "bar",
@@ -244,6 +256,7 @@ func TestBasicStatsWithOnlyMean(t *testing.T) {
 		"c_mean": float64(3),
 		"d_mean": float64(4),
 		"e_mean": float64(200),
+		"f_mean": float64(200),
 	}
 	expectedTags := map[string]string{
 		"foo": "bar",
@@ -269,6 +282,7 @@ func TestBasicStatsWithOnlySum(t *testing.T) {
 		"c_sum": float64(6),
 		"d_sum": float64(8),
 		"e_sum": float64(200),
+		"f_sum": float64(200),
 	}
 	expectedTags := map[string]string{
 		"foo": "bar",
@@ -399,6 +413,8 @@ func TestBasicStatsWithMinAndMax(t *testing.T) {
 		"d_min": float64(2),
 		"e_max": float64(200), //e
 		"e_min": float64(200),
+		"f_max": float64(200), //f
+		"f_min": float64(200),
 	}
 	expectedTags := map[string]string{
 		"foo": "bar",
@@ -450,6 +466,11 @@ func TestBasicStatsWithAllStats(t *testing.T) {
 		"e_min":   float64(200),
 		"e_mean":  float64(200),
 		"e_sum":   float64(200),
+		"f_count": float64(1), //f
+		"f_max":   float64(200),
+		"f_min":   float64(200),
+		"f_mean":  float64(200),
+		"f_sum":   float64(200),
 	}
 	expectedTags := map[string]string{
 		"foo": "bar",
diff --git a/plugins/aggregators/minmax/minmax.go b/plugins/aggregators/minmax/minmax.go
index 1c83c0cc..fb0e72f6 100644
--- a/plugins/aggregators/minmax/minmax.go
+++ b/plugins/aggregators/minmax/minmax.go
@@ -107,6 +107,8 @@ func convert(in interface{}) (float64, bool) {
 		return v, true
 	case int64:
 		return float64(v), true
+	case uint64:
+		return float64(v), true
 	default:
 		return 0, false
 	}
diff --git a/plugins/aggregators/minmax/minmax_test.go b/plugins/aggregators/minmax/minmax_test.go
index d6053a37..e7c3cf4e 100644
--- a/plugins/aggregators/minmax/minmax_test.go
+++ b/plugins/aggregators/minmax/minmax_test.go
@@ -38,6 +38,7 @@ var m2, _ = metric.New("m1",
 		"i":        float64(1),
 		"j":        float64(1),
 		"k":        float64(200),
+		"l":        uint64(200),
 		"ignoreme": "string",
 		"andme":    true,
 	},
@@ -85,6 +86,8 @@ func TestMinMaxWithPeriod(t *testing.T) {
 		"j_min": float64(1),
 		"k_max": float64(200),
 		"k_min": float64(200),
+		"l_max": float64(200),
+		"l_min": float64(200),
 	}
 	expectedTags := map[string]string{
 		"foo": "bar",
@@ -154,6 +157,8 @@ func TestMinMaxDifferentPeriods(t *testing.T) {
 		"j_min": float64(1),
 		"k_max": float64(200),
 		"k_min": float64(200),
+		"l_max": float64(200),
+		"l_min": float64(200),
 	}
 	expectedTags = map[string]string{
 		"foo": "bar",

From abfbf4f4f27cc0abcc7a57c0cad20cca380f56c7 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 29 Jun 2018 19:08:09 -0700
Subject: [PATCH 579/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 745ed55b..ae1c612c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@
 - [#4135](https://github.com/influxdata/telegraf/issues/4135): Fix postfix input handling multi-level queues.
 - [#4334](https://github.com/influxdata/telegraf/pull/4334): Fix syslog timestamp parsing with single digit day of month.
 - [#2910](https://github.com/influxdata/telegraf/issues/2910): Handle mysql input variations in the user_statistics collecting.
+- [#4293](https://github.com/influxdata/telegraf/issues/4293): Fix minmax and basicstats aggregators to use uint64.
 
 ## v1.7 [2018-06-12]
 

From b2586a7eaff655c4a0310d77a0fefb9b968aa2de Mon Sep 17 00:00:00 2001
From: Pierrick Brossin <dynek@users.noreply.github.com>
Date: Mon, 2 Jul 2018 20:57:05 +0200
Subject: [PATCH 580/835] Add energy and power field and device id tag to
 fibaro input (#4343)

---
 plugins/inputs/fibaro/README.md      | 28 ++++++++++++++++------------
 plugins/inputs/fibaro/fibaro.go      | 23 +++++++++++++++++++----
 plugins/inputs/fibaro/fibaro_test.go | 14 ++++++++------
 3 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/plugins/inputs/fibaro/README.md b/plugins/inputs/fibaro/README.md
index e81acad8..68fda058 100644
--- a/plugins/inputs/fibaro/README.md
+++ b/plugins/inputs/fibaro/README.md
@@ -24,11 +24,14 @@ Those values could be true (1) or false (0) for switches, percentage for dimmers
 
 - fibaro
   - tags:
+    - deviceId (device id)
     - section (section name)
     - room (room name)
     - name (device name)
     - type (device type)
   - fields:
+    - energy (float, when available from device)
+    - power (float, when available from device)
     - value (float)
     - value2 (float, when available from device)
 
@@ -36,16 +39,17 @@ Those values could be true (1) or false (0) for switches, percentage for dimmers
 ### 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
+fibaro,deviceId=9,host=vm1,name=Fenêtre\ haute,room=Cuisine,section=Cuisine,type=com.fibaro.FGRM222 energy=2.04,power=0.7,value=99,value2=99 1529996807000000000
+fibaro,deviceId=10,host=vm1,name=Escaliers,room=Dégagement,section=Pièces\ communes,type=com.fibaro.binarySwitch value=0 1529996807000000000
+fibaro,deviceId=13,host=vm1,name=Porte\ fenêtre,room=Salon,section=Pièces\ communes,type=com.fibaro.FGRM222 energy=4.33,power=0.7,value=99,value2=99 1529996807000000000
+fibaro,deviceId=21,host=vm1,name=LED\ îlot\ central,room=Cuisine,section=Cuisine,type=com.fibaro.binarySwitch value=0 1529996807000000000
+fibaro,deviceId=90,host=vm1,name=Détérioration,room=Entrée,section=Pièces\ communes,type=com.fibaro.heatDetector value=0 1529996807000000000
+fibaro,deviceId=163,host=vm1,name=Température,room=Cave,section=Cave,type=com.fibaro.temperatureSensor value=21.62 1529996807000000000
+fibaro,deviceId=191,host=vm1,name=Présence,room=Garde-manger,section=Cuisine,type=com.fibaro.FGMS001 value=1 1529996807000000000
+fibaro,deviceId=193,host=vm1,name=Luminosité,room=Garde-manger,section=Cuisine,type=com.fibaro.lightSensor value=195 1529996807000000000
+fibaro,deviceId=200,host=vm1,name=Etat,room=Garage,section=Extérieur,type=com.fibaro.doorSensor value=0 1529996807000000000
+fibaro,deviceId=220,host=vm1,name=CO2\ (ppm),room=Salon,section=Pièces\ communes,type=com.fibaro.multilevelSensor value=536 1529996807000000000
+fibaro,deviceId=221,host=vm1,name=Humidité\ (%),room=Salon,section=Pièces\ communes,type=com.fibaro.humiditySensor value=61 1529996807000000000
+fibaro,deviceId=222,host=vm1,name=Pression\ (mb),room=Salon,section=Pièces\ communes,type=com.fibaro.multilevelSensor value=1013.7 1529996807000000000
+fibaro,deviceId=223,host=vm1,name=Bruit\ (db),room=Salon,section=Pièces\ communes,type=com.fibaro.multilevelSensor value=44 1529996807000000000
 ```
diff --git a/plugins/inputs/fibaro/fibaro.go b/plugins/inputs/fibaro/fibaro.go
index d532c454..6eacb3ee 100644
--- a/plugins/inputs/fibaro/fibaro.go
+++ b/plugins/inputs/fibaro/fibaro.go
@@ -67,6 +67,8 @@ type Devices struct {
 	Enabled    bool   `json:"enabled"`
 	Properties struct {
 		Dead   interface{} `json:"dead"`
+		Energy interface{} `json:"energy"`
+		Power  interface{} `json:"power"`
 		Value  interface{} `json:"value"`
 		Value2 interface{} `json:"value2"`
 	} `json:"properties"`
@@ -162,13 +164,26 @@ func (f *Fibaro) Gather(acc telegraf.Accumulator) error {
 		}
 
 		tags := map[string]string{
-			"section": sections[rooms[device.RoomID].SectionID],
-			"room":    rooms[device.RoomID].Name,
-			"name":    device.Name,
-			"type":    device.Type,
+			"deviceId": strconv.FormatUint(uint64(device.ID), 10),
+			"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.Energy != nil {
+			if fValue, err := strconv.ParseFloat(device.Properties.Energy.(string), 64); err == nil {
+				fields["energy"] = fValue
+			}
+		}
+
+		if device.Properties.Power != nil {
+			if fValue, err := strconv.ParseFloat(device.Properties.Power.(string), 64); err == nil {
+				fields["power"] = fValue
+			}
+		}
+
 		if device.Properties.Value != nil {
 			value := device.Properties.Value
 			switch value {
diff --git a/plugins/inputs/fibaro/fibaro_test.go b/plugins/inputs/fibaro/fibaro_test.go
index 111f4c87..a58ad7c3 100644
--- a/plugins/inputs/fibaro/fibaro_test.go
+++ b/plugins/inputs/fibaro/fibaro_test.go
@@ -119,6 +119,8 @@ const devicesJSON = `
             "type": "com.fibaro.FGRM222",
             "enabled": true,
             "properties": {
+                "energy": "4.33",
+                "power": "0.7",
                 "dead": "false",
                 "value": "50",
                 "value2": "75"
@@ -178,27 +180,27 @@ func TestJSONSuccess(t *testing.T) {
 	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"}
+	tags := map[string]string{"deviceId": "1", "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"}
+	tags = map[string]string{"deviceId": "2", "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"}
+	tags = map[string]string{"deviceId": "3", "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"}
+	tags = map[string]string{"deviceId": "4", "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)}
+	tags = map[string]string{"deviceId": "5", "section": "Section 3", "room": "Room 4", "name": "Device 5", "type": "com.fibaro.FGRM222"}
+	fields = map[string]interface{}{"energy": float64(4.33), "power": float64(0.7), "value": float64(50), "value2": float64(75)}
 	acc.AssertContainsTaggedFields(t, "fibaro", fields, tags)
 }

From 73e2e6afc56418a5d95d81b417e4adca156e98a5 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 2 Jul 2018 11:58:14 -0700
Subject: [PATCH 581/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae1c612c..6afdf9f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@
 - [#4292](https://github.com/influxdata/telegraf/pull/4292): Add path tag to tail input plugin.
 - [#4322](https://github.com/influxdata/telegraf/pull/4322): Add log message when tail is added or removed from a file.
 - [#4267](https://github.com/influxdata/telegraf/pull/4267): Add option to use of counter time in win perf counters.
+- [#4343](https://github.com/influxdata/telegraf/pull/4343): Add energy and power field and device id tag to fibaro input.
 
 ## v1.7.1 [unreleased]
 

From b7a02c73b3b6f58260a7c43c88fe8fb0563a8806 Mon Sep 17 00:00:00 2001
From: Steve Domino <sdomino@nanobox.io>
Date: Mon, 2 Jul 2018 14:07:57 -0600
Subject: [PATCH 582/835] Document swap input plugin and move to separate file
 (#4342)

---
 plugins/inputs/system/SWAP_README.md | 30 ++++++++++++++++++
 plugins/inputs/system/memory.go      | 36 ---------------------
 plugins/inputs/system/memory_test.go | 22 -------------
 plugins/inputs/system/swap.go        | 47 ++++++++++++++++++++++++++++
 plugins/inputs/system/swap_test.go   | 38 ++++++++++++++++++++++
 5 files changed, 115 insertions(+), 58 deletions(-)
 create mode 100644 plugins/inputs/system/SWAP_README.md
 create mode 100644 plugins/inputs/system/swap.go
 create mode 100644 plugins/inputs/system/swap_test.go

diff --git a/plugins/inputs/system/SWAP_README.md b/plugins/inputs/system/SWAP_README.md
new file mode 100644
index 00000000..75eae938
--- /dev/null
+++ b/plugins/inputs/system/SWAP_README.md
@@ -0,0 +1,30 @@
+# Swap Input Plugin
+
+The swap plugin collects system swap metrics.
+
+For a more information on what swap memory is, read [All about Linux swap space](https://www.linux.com/news/all-about-linux-swap-space).
+
+### Configuration:
+
+```toml
+# Read metrics about swap memory usage
+[[inputs.swap]]
+  # no configuration
+```
+
+### Metrics:
+
+- swap
+  - fields:
+  	- free (int)
+  	- total (int)
+  	- used (int)
+  	- used_percent (float)
+    - sin (int)
+    - sout (int)
+
+### Example Output:
+
+```
+swap total=20855394304i,used_percent=45.43883523785713,used=9476448256i,free=1715331072i 1511894782000000000
+```
diff --git a/plugins/inputs/system/memory.go b/plugins/inputs/system/memory.go
index 3cb95610..b44fabc4 100644
--- a/plugins/inputs/system/memory.go
+++ b/plugins/inputs/system/memory.go
@@ -42,45 +42,9 @@ func (s *MemStats) Gather(acc telegraf.Accumulator) error {
 	return nil
 }
 
-type SwapStats struct {
-	ps PS
-}
-
-func (_ *SwapStats) Description() string {
-	return "Read metrics about swap memory usage"
-}
-
-func (_ *SwapStats) SampleConfig() string { return "" }
-
-func (s *SwapStats) Gather(acc telegraf.Accumulator) error {
-	swap, err := s.ps.SwapStat()
-	if err != nil {
-		return fmt.Errorf("error getting swap memory info: %s", err)
-	}
-
-	fieldsG := map[string]interface{}{
-		"total":        swap.Total,
-		"used":         swap.Used,
-		"free":         swap.Free,
-		"used_percent": swap.UsedPercent,
-	}
-	fieldsC := map[string]interface{}{
-		"in":  swap.Sin,
-		"out": swap.Sout,
-	}
-	acc.AddGauge("swap", fieldsG, nil)
-	acc.AddCounter("swap", fieldsC, nil)
-
-	return nil
-}
-
 func init() {
 	ps := newSystemPS()
 	inputs.Add("mem", func() telegraf.Input {
 		return &MemStats{ps: ps}
 	})
-
-	inputs.Add("swap", func() telegraf.Input {
-		return &SwapStats{ps: ps}
-	})
 }
diff --git a/plugins/inputs/system/memory_test.go b/plugins/inputs/system/memory_test.go
index 5d5860a8..34914db9 100644
--- a/plugins/inputs/system/memory_test.go
+++ b/plugins/inputs/system/memory_test.go
@@ -30,17 +30,6 @@ func TestMemStats(t *testing.T) {
 
 	mps.On("VMStat").Return(vms, nil)
 
-	sms := &mem.SwapMemoryStat{
-		Total:       8123,
-		Used:        1232,
-		Free:        6412,
-		UsedPercent: 12.2,
-		Sin:         7,
-		Sout:        830,
-	}
-
-	mps.On("SwapStat").Return(sms, nil)
-
 	err = (&MemStats{&mps}).Gather(&acc)
 	require.NoError(t, err)
 
@@ -61,15 +50,4 @@ func TestMemStats(t *testing.T) {
 	acc.AssertContainsTaggedFields(t, "mem", memfields, make(map[string]string))
 
 	acc.Metrics = nil
-
-	err = (&SwapStats{&mps}).Gather(&acc)
-	require.NoError(t, err)
-
-	swapfields := map[string]interface{}{
-		"total":        uint64(8123),
-		"used":         uint64(1232),
-		"used_percent": float64(12.2),
-		"free":         uint64(6412),
-	}
-	acc.AssertContainsTaggedFields(t, "swap", swapfields, make(map[string]string))
 }
diff --git a/plugins/inputs/system/swap.go b/plugins/inputs/system/swap.go
new file mode 100644
index 00000000..f1f7c8e2
--- /dev/null
+++ b/plugins/inputs/system/swap.go
@@ -0,0 +1,47 @@
+package system
+
+import (
+	"fmt"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+type SwapStats struct {
+	ps PS
+}
+
+func (_ *SwapStats) Description() string {
+	return "Read metrics about swap memory usage"
+}
+
+func (_ *SwapStats) SampleConfig() string { return "" }
+
+func (s *SwapStats) Gather(acc telegraf.Accumulator) error {
+	swap, err := s.ps.SwapStat()
+	if err != nil {
+		return fmt.Errorf("error getting swap memory info: %s", err)
+	}
+
+	fieldsG := map[string]interface{}{
+		"total":        swap.Total,
+		"used":         swap.Used,
+		"free":         swap.Free,
+		"used_percent": swap.UsedPercent,
+	}
+	fieldsC := map[string]interface{}{
+		"in":  swap.Sin,
+		"out": swap.Sout,
+	}
+	acc.AddGauge("swap", fieldsG, nil)
+	acc.AddCounter("swap", fieldsC, nil)
+
+	return nil
+}
+
+func init() {
+	ps := newSystemPS()
+	inputs.Add("swap", func() telegraf.Input {
+		return &SwapStats{ps: ps}
+	})
+}
diff --git a/plugins/inputs/system/swap_test.go b/plugins/inputs/system/swap_test.go
new file mode 100644
index 00000000..ec9a0fe5
--- /dev/null
+++ b/plugins/inputs/system/swap_test.go
@@ -0,0 +1,38 @@
+package system
+
+import (
+	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/shirou/gopsutil/mem"
+	"github.com/stretchr/testify/require"
+)
+
+func TestSwapStats(t *testing.T) {
+	var mps MockPS
+	var err error
+	defer mps.AssertExpectations(t)
+	var acc testutil.Accumulator
+
+	sms := &mem.SwapMemoryStat{
+		Total:       8123,
+		Used:        1232,
+		Free:        6412,
+		UsedPercent: 12.2,
+		Sin:         7,
+		Sout:        830,
+	}
+
+	mps.On("SwapStat").Return(sms, nil)
+
+	err = (&SwapStats{&mps}).Gather(&acc)
+	require.NoError(t, err)
+
+	swapfields := map[string]interface{}{
+		"total":        uint64(8123),
+		"used":         uint64(1232),
+		"used_percent": float64(12.2),
+		"free":         uint64(6412),
+	}
+	acc.AssertContainsTaggedFields(t, "swap", swapfields, make(map[string]string))
+}

From 210dfcee831a1a59d935c81459d15f9ea6f29f77 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 2 Jul 2018 13:08:43 -0700
Subject: [PATCH 583/835] Fix field name typo in swap documentation

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

diff --git a/plugins/inputs/system/SWAP_README.md b/plugins/inputs/system/SWAP_README.md
index 75eae938..2647b33d 100644
--- a/plugins/inputs/system/SWAP_README.md
+++ b/plugins/inputs/system/SWAP_README.md
@@ -16,12 +16,12 @@ For a more information on what swap memory is, read [All about Linux swap space]
 
 - swap
   - fields:
-  	- free (int)
-  	- total (int)
-  	- used (int)
-  	- used_percent (float)
-    - sin (int)
-    - sout (int)
+    - free (int)
+    - total (int)
+    - used (int)
+    - used_percent (float)
+    - in (int)
+    - out (int)
 
 ### Example Output:
 

From 56ea2eb57b8b042fffb95a942f238b1b0531ee06 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 2 Jul 2018 13:10:39 -0700
Subject: [PATCH 584/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6afdf9f8..50185c5c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@
 - [#4334](https://github.com/influxdata/telegraf/pull/4334): Fix syslog timestamp parsing with single digit day of month.
 - [#2910](https://github.com/influxdata/telegraf/issues/2910): Handle mysql input variations in the user_statistics collecting.
 - [#4293](https://github.com/influxdata/telegraf/issues/4293): Fix minmax and basicstats aggregators to use uint64.
+- [#4290](https://github.com/influxdata/telegraf/issues/4290): Document swap input plugin.
 
 ## v1.7 [2018-06-12]
 

From 9bc63c2f7a38554bd74ab4800428bf590f1fe604 Mon Sep 17 00:00:00 2001
From: Greg Linton <g2linton@gmail.com>
Date: Mon, 2 Jul 2018 14:23:29 -0600
Subject: [PATCH 585/835] Improve CircleCI dependency caching

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 122f28af..578e0bcb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -16,11 +16,11 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: vendor-{{ .Branch }}-{{ checksum "Gopkg.lock" }}
+          key: vendor-{{ checksum "Gopkg.lock" }}
       - run: 'make deps'
       - save_cache:
           name: 'vendored deps'
-          key: vendor-{{ .Branch }}-{{ checksum "Gopkg.lock" }}
+          key: vendor-{{ checksum "Gopkg.lock" }}
           paths:
             - './vendor'
       - persist_to_workspace:

From c7cfc2ec3977447d02da7ce18da7d0d4e9a8c2c8 Mon Sep 17 00:00:00 2001
From: Jacob Lisi <jacob.t.lisi@gmail.com>
Date: Mon, 2 Jul 2018 18:04:01 -0400
Subject: [PATCH 586/835] Add http path configuration for OpenTSDB output
 (#4347)

---
 etc/telegraf.conf                         | 4 ++++
 plugins/outputs/opentsdb/opentsdb.go      | 8 ++++++++
 plugins/outputs/opentsdb/opentsdb_http.go | 3 ++-
 plugins/outputs/opentsdb/opentsdb_test.go | 1 +
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index f51e973d..38942ade 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -723,6 +723,10 @@
 #   ## Not used with telnet API.
 #   httpBatchSize = 50
 #
+#   ## URI Path for Http requests to OpenTSDB.
+#   ## Used in cases where OpenTSDB is located behind a reverse proxy.
+#   httpPath = "/api/put"
+#
 #   ## Debug true - Prints OpenTSDB communication
 #   debug = false
 #
diff --git a/plugins/outputs/opentsdb/opentsdb.go b/plugins/outputs/opentsdb/opentsdb.go
index c38ad353..96d022c1 100644
--- a/plugins/outputs/opentsdb/opentsdb.go
+++ b/plugins/outputs/opentsdb/opentsdb.go
@@ -22,6 +22,7 @@ var (
 		`%`, "-",
 		"#", "-",
 		"$", "-")
+	defaultHttpPath  = "/api/put"
 	defaultSeperator = "_"
 )
 
@@ -32,6 +33,7 @@ type OpenTSDB struct {
 	Port int
 
 	HttpBatchSize int
+	HttpPath      string
 
 	Debug bool
 
@@ -54,6 +56,10 @@ var sampleConfig = `
   ## Not used with telnet API.
   httpBatchSize = 50
 
+  ## URI Path for Http requests to OpenTSDB.
+  ## Used in cases where OpenTSDB is located behind a reverse proxy.
+  httpPath = "/api/put"
+
   ## Debug true - Prints OpenTSDB communication
   debug = false
 
@@ -121,6 +127,7 @@ func (o *OpenTSDB) WriteHttp(metrics []telegraf.Metric, u *url.URL) error {
 		Scheme:    u.Scheme,
 		User:      u.User,
 		BatchSize: o.HttpBatchSize,
+		Path:      o.HttpPath,
 		Debug:     o.Debug,
 	}
 
@@ -260,6 +267,7 @@ func sanitize(value string) string {
 func init() {
 	outputs.Add("opentsdb", func() telegraf.Output {
 		return &OpenTSDB{
+			HttpPath:  defaultHttpPath,
 			Separator: defaultSeperator,
 		}
 	})
diff --git a/plugins/outputs/opentsdb/opentsdb_http.go b/plugins/outputs/opentsdb/opentsdb_http.go
index e74e74f0..4f971abb 100644
--- a/plugins/outputs/opentsdb/opentsdb_http.go
+++ b/plugins/outputs/opentsdb/opentsdb_http.go
@@ -26,6 +26,7 @@ type openTSDBHttp struct {
 	Scheme    string
 	User      *url.Userinfo
 	BatchSize int
+	Path      string
 	Debug     bool
 
 	metricCounter int
@@ -123,7 +124,7 @@ func (o *openTSDBHttp) flush() error {
 		Scheme: o.Scheme,
 		User:   o.User,
 		Host:   fmt.Sprintf("%s:%d", o.Host, o.Port),
-		Path:   "/api/put",
+		Path:   o.Path,
 	}
 
 	if o.Debug {
diff --git a/plugins/outputs/opentsdb/opentsdb_test.go b/plugins/outputs/opentsdb/opentsdb_test.go
index d5d7aa7e..096337c5 100644
--- a/plugins/outputs/opentsdb/opentsdb_test.go
+++ b/plugins/outputs/opentsdb/opentsdb_test.go
@@ -156,6 +156,7 @@ func BenchmarkHttpSend(b *testing.B) {
 		Port:          port,
 		Prefix:        "",
 		HttpBatchSize: BatchSize,
+		HttpPath:      "/api/put",
 	}
 
 	b.ResetTimer()

From 220e6c536116fe7260fc33dbc3c25cc864302a2b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 2 Jul 2018 15:06:35 -0700
Subject: [PATCH 587/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50185c5c..4cde04f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@
 - [#4322](https://github.com/influxdata/telegraf/pull/4322): Add log message when tail is added or removed from a file.
 - [#4267](https://github.com/influxdata/telegraf/pull/4267): Add option to use of counter time in win perf counters.
 - [#4343](https://github.com/influxdata/telegraf/pull/4343): Add energy and power field and device id tag to fibaro input.
+- [#4347](https://github.com/influxdata/telegraf/pull/4347): Add http path configuration for OpenTSDB output.
 
 ## v1.7.1 [unreleased]
 

From 2ee374cf501e4ee9951108a61ebd2d15bb08e7d8 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 2 Jul 2018 15:10:10 -0700
Subject: [PATCH 588/835] Deprecate camelCase config options in opentsdb output

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

diff --git a/plugins/outputs/opentsdb/opentsdb.go b/plugins/outputs/opentsdb/opentsdb.go
index 96d022c1..964b1768 100644
--- a/plugins/outputs/opentsdb/opentsdb.go
+++ b/plugins/outputs/opentsdb/opentsdb.go
@@ -32,7 +32,7 @@ type OpenTSDB struct {
 	Host string
 	Port int
 
-	HttpBatchSize int
+	HttpBatchSize int // deprecated httpBatchSize form in 1.8
 	HttpPath      string
 
 	Debug bool
@@ -54,11 +54,11 @@ var sampleConfig = `
 
   ## Number of data points to send to OpenTSDB in Http requests.
   ## Not used with telnet API.
-  httpBatchSize = 50
+  http_batch_size = 50
 
   ## URI Path for Http requests to OpenTSDB.
   ## Used in cases where OpenTSDB is located behind a reverse proxy.
-  httpPath = "/api/put"
+  http_path = "/api/put"
 
   ## Debug true - Prints OpenTSDB communication
   debug = false

From 9fe90d71f445cab609c266a8e99de0da8f6e5f9c Mon Sep 17 00:00:00 2001
From: Ayrdrie <ayrdriepalmer@gmail.com>
Date: Mon, 2 Jul 2018 17:34:40 -0600
Subject: [PATCH 589/835] Add plugin development framework (#4324)

---
 CONTRIBUTING.md                               |  7 +++
 Makefile                                      | 13 +++-
 .../inputs/logparser/dev/docker-compose.yml   | 13 ++++
 plugins/inputs/logparser/dev/telegraf.conf    | 12 ++++
 plugins/inputs/logparser/dev/test.log         |  2 +
 plugins/inputs/mongodb/dev/docker-compose.yml | 16 +++++
 plugins/inputs/mongodb/dev/telegraf.conf      |  9 +++
 plugins/inputs/mysql/dev/docker-compose.yml   | 42 +++++++++++++
 plugins/inputs/mysql/dev/telegraf.conf        | 61 +++++++++++++++++++
 9 files changed, 174 insertions(+), 1 deletion(-)
 create mode 100644 plugins/inputs/logparser/dev/docker-compose.yml
 create mode 100644 plugins/inputs/logparser/dev/telegraf.conf
 create mode 100644 plugins/inputs/logparser/dev/test.log
 create mode 100644 plugins/inputs/mongodb/dev/docker-compose.yml
 create mode 100644 plugins/inputs/mongodb/dev/telegraf.conf
 create mode 100644 plugins/inputs/mysql/dev/docker-compose.yml
 create mode 100644 plugins/inputs/mysql/dev/telegraf.conf

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index cef8fa51..9a89e3cb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -100,6 +100,13 @@ func init() {
 }
 ```
 
+### Input Plugin Development
+
+* Run `make static` followed by `make plugin-[pluginName]` to spin up a docker dev environment
+using docker-compose.
+* ***[Optional]*** When developing a plugin, add a `dev` directory with a `docker-compose.yml` and `telegraf.conf`
+as well as any other supporting files, where sensible.
+
 ## Adding Typed Metrics
 
 In addition the the `AddFields` function, the accumulator also supports an
diff --git a/Makefile b/Makefile
index 8650df26..2f3fcece 100644
--- a/Makefile
+++ b/Makefile
@@ -92,4 +92,15 @@ 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 uint64
+static:
+	@echo "Building static linux binary..."
+	@CGO_ENABLED=0 \
+	GOOS=linux \
+	GOARCH=amd64 \
+	go build -ldflags "$(LDFLAGS)" ./cmd/telegraf
+
+plugin-%:
+	@echo "Starting dev environment for $${$(@)} input plugin..."
+	@docker-compose -f plugins/inputs/$${$(@)}/dev/docker-compose.yml up
+
+.PHONY: deps telegraf install test test-windows lint vet test-all package clean docker-image fmtcheck uint64 static
diff --git a/plugins/inputs/logparser/dev/docker-compose.yml b/plugins/inputs/logparser/dev/docker-compose.yml
new file mode 100644
index 00000000..dfb8e784
--- /dev/null
+++ b/plugins/inputs/logparser/dev/docker-compose.yml
@@ -0,0 +1,13 @@
+version: '3'
+
+services:
+    telegraf:
+        image: glinton/scratch
+        volumes:
+          - ./telegraf.conf:/telegraf.conf
+          - ../../../../telegraf:/telegraf
+          - ./test.log:/var/log/test.log
+        entrypoint:
+          - /telegraf
+          - --config
+          - /telegraf.conf
diff --git a/plugins/inputs/logparser/dev/telegraf.conf b/plugins/inputs/logparser/dev/telegraf.conf
new file mode 100644
index 00000000..77e26528
--- /dev/null
+++ b/plugins/inputs/logparser/dev/telegraf.conf
@@ -0,0 +1,12 @@
+[agent]
+  interval="1s"
+  flush_interval="1s"
+
+[[inputs.logparser]]
+   files = ["/var/log/test.log"]
+   from_beginning = true
+   [inputs.logparser.grok]
+      patterns = [ "%{COMBINED_LOG_FORMAT}", "%{CLIENT:client_ip} %{NOTSPACE:ident} %{NOTSPACE:auth} \\[%{TIMESTAMP_ISO8601:timestamp}\\] \"(?:%{WORD:verb:tag} %{NOTSPACE:request}(?: HTTP/%{NUMBER:http_version:float})?|%{DATA})\" %{NUMBER:resp_code:tag} (?:%{NUMBER:resp_bytes:int}|-) %{QS:referrer} %{QS:agent}"]
+
+[[outputs.file]]
+  files = ["stdout"]
diff --git a/plugins/inputs/logparser/dev/test.log b/plugins/inputs/logparser/dev/test.log
new file mode 100644
index 00000000..2ff2e4ef
--- /dev/null
+++ b/plugins/inputs/logparser/dev/test.log
@@ -0,0 +1,2 @@
+127.0.0.1 ident auth [10/Oct/2000:13:55:36 -0700] "GET /anything HTTP/1.0" 200 2326 "http://localhost:8083/" "Chrome/51.0.2704.84"
+127.0.0.1 ident auth [2018-02-21 13:10:34,555] "GET /peter HTTP/1.0" 200 2326 "http://localhost:8083/" "Chrome/51.0.2704.84"
diff --git a/plugins/inputs/mongodb/dev/docker-compose.yml b/plugins/inputs/mongodb/dev/docker-compose.yml
new file mode 100644
index 00000000..9bf80f24
--- /dev/null
+++ b/plugins/inputs/mongodb/dev/docker-compose.yml
@@ -0,0 +1,16 @@
+version: '3'
+services:
+    mongodb:
+        image: mongo
+
+    telegraf:
+        image: glinton/scratch
+        volumes:
+          - ./telegraf.conf:/telegraf.conf
+          - ../../../../telegraf:/telegraf
+        depends_on:
+          - mongodb
+        entrypoint:
+          - /telegraf
+          - --config
+          - /telegraf.conf
diff --git a/plugins/inputs/mongodb/dev/telegraf.conf b/plugins/inputs/mongodb/dev/telegraf.conf
new file mode 100644
index 00000000..35077b16
--- /dev/null
+++ b/plugins/inputs/mongodb/dev/telegraf.conf
@@ -0,0 +1,9 @@
+[agent]
+  interval="1s"
+  flush_interval="3s"
+
+[[inputs.mongodb]]
+  servers = ["mongodb://mongodb:27017"]
+
+[[outputs.file]]
+  files = ["stdout"]
diff --git a/plugins/inputs/mysql/dev/docker-compose.yml b/plugins/inputs/mysql/dev/docker-compose.yml
new file mode 100644
index 00000000..5f1773fb
--- /dev/null
+++ b/plugins/inputs/mysql/dev/docker-compose.yml
@@ -0,0 +1,42 @@
+version: '3'
+
+services:
+  mysql:
+    image: mysql:5.7
+    restart: always
+    environment:
+      MYSQL_ROOT_PASSWORD: telegraf
+      MYSQL_DATABASE: telegraf
+      MYSQL_USER: telegraf
+      MYSQL_PASSWORD: telegraf
+  maria:
+    image: mariadb
+    restart: always
+    environment:
+      MYSQL_ROOT_PASSWORD: telegraf
+      MYSQL_DATABASE: telegraf
+      MYSQL_USER: telegraf
+      MYSQL_PASSWORD: telegraf
+    command: mysqld --userstat=1
+  percona:
+    image: percona
+    restart: always
+    environment:
+      MYSQL_ROOT_PASSWORD: telegraf
+      MYSQL_DATABASE: telegraf
+      MYSQL_USER: telegraf
+      MYSQL_PASSWORD: telegraf
+
+  telegraf:
+    image: glinton/scratch
+    depends_on:
+      - mysql
+      - maria
+      - percona
+    volumes:
+      - ./telegraf.conf:/telegraf.conf
+      - ../../../../telegraf:/telegraf
+    entrypoint:
+      - /telegraf
+      - --config
+      - /telegraf.conf
diff --git a/plugins/inputs/mysql/dev/telegraf.conf b/plugins/inputs/mysql/dev/telegraf.conf
new file mode 100644
index 00000000..9aa4801e
--- /dev/null
+++ b/plugins/inputs/mysql/dev/telegraf.conf
@@ -0,0 +1,61 @@
+# Uncomment each input as needed to test plugin
+
+## mysql
+#[[inputs.mysql]]
+#  servers = ["root:telegraf@tcp(mysql:3306)/"]
+#  gather_table_schema = true
+#  gather_process_list = true
+#  gather_user_statistics = true
+#  gather_info_schema_auto_inc = true
+#  gather_innodb_metrics = true
+#  gather_slave_status = true
+#  gather_binary_logs = false
+#  gather_table_io_waits = true
+#  gather_table_lock_waits = true
+#  gather_index_io_waits = true
+#  gather_event_waits = true
+#  gather_file_events_stats = true
+#  gather_perf_events_statements = true
+#  interval_slow = "30m"
+#  table_schema_databases = []
+#
+## mariadb
+#[[inputs.mysql]]
+#  servers = ["root:telegraf@tcp(maria:3306)/"]
+#  gather_table_schema = true
+#  gather_process_list = true
+#  gather_user_statistics = true
+#  gather_info_schema_auto_inc = true
+#  gather_innodb_metrics = true
+#  gather_slave_status = true
+#  gather_binary_logs = false
+#  gather_table_io_waits = true
+#  gather_table_lock_waits = true
+#  gather_index_io_waits = true
+#  gather_event_waits = true
+#  gather_file_events_stats = true
+#  gather_perf_events_statements = true
+#  interval_slow = "30m"
+#  table_schema_databases = []
+
+# percona
+[[inputs.mysql]]
+  servers = ["root:telegraf@tcp(percona:3306)/"]
+  gather_table_schema = true
+  gather_process_list = true
+  gather_user_statistics = true
+  gather_info_schema_auto_inc = true
+  gather_innodb_metrics = true
+  gather_slave_status = true
+  gather_binary_logs = false
+  gather_table_io_waits = true
+  gather_table_lock_waits = true
+  gather_index_io_waits = true
+  gather_event_waits = true
+  gather_file_events_stats = true
+  gather_perf_events_statements = true
+  interval_slow = "30m"
+  table_schema_databases = []
+
+[[outputs.file]]
+  files = ["stdout"]

From 2da223390ad23141dc55391242c53542be2990a1 Mon Sep 17 00:00:00 2001
From: maxunt <max.untrecht@gmail.com>
Date: Mon, 2 Jul 2018 19:05:17 -0700
Subject: [PATCH 590/835] Add procstat_lookup metric to readme (#4337)

---
 plugins/inputs/procstat/README.md | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/procstat/README.md b/plugins/inputs/procstat/README.md
index 0ff9884b..efa71489 100644
--- a/plugins/inputs/procstat/README.md
+++ b/plugins/inputs/procstat/README.md
@@ -1,6 +1,8 @@
 # Procstat Input Plugin
 
 The procstat plugin can be used to monitor the system resource usage of one or more processes.
+The procstat_lookup metric displays the query information, 
+specifically the number of PIDs returned on a search
 
 Processes can be selected for monitoring using one of several methods:
 - pidfile
@@ -127,7 +129,18 @@ implemented as a WMI query.  The pattern allows fuzzy matching using only
     - 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**)
-
+- procstat_lookup
+  - tags:
+    - exe (string)
+    - pid_finder (string)
+    - pid_file (string)
+    - pattern (string)
+    - prefix (string)
+    - user (string)
+    - systemd_unit (string)
+    - cgroup (string)
+  - fields:
+    - pid_count (int)
 *NOTE: Resource limit > 2147483647 will be reported as 2147483647.*
 
 ### Example Output:

From 4e440b36fda9642ec0a3481c4ea3224d67dcf53f Mon Sep 17 00:00:00 2001
From: Greg <g2linton@gmail.com>
Date: Mon, 2 Jul 2018 20:06:57 -0600
Subject: [PATCH 591/835] Gather IPMI metrics concurrently from list of servers
 (#4352)

---
 plugins/inputs/ipmi_sensor/ipmi.go | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/plugins/inputs/ipmi_sensor/ipmi.go b/plugins/inputs/ipmi_sensor/ipmi.go
index 2d7bcaef..ee99b0a3 100644
--- a/plugins/inputs/ipmi_sensor/ipmi.go
+++ b/plugins/inputs/ipmi_sensor/ipmi.go
@@ -5,6 +5,7 @@ import (
 	"os/exec"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/influxdata/telegraf"
@@ -61,13 +62,18 @@ func (m *Ipmi) Gather(acc telegraf.Accumulator) error {
 	}
 
 	if len(m.Servers) > 0 {
+		wg := sync.WaitGroup{}
 		for _, server := range m.Servers {
-			err := m.parse(acc, server)
-			if err != nil {
-				acc.AddError(err)
-				continue
-			}
+			wg.Add(1)
+			go func(a telegraf.Accumulator, s string) {
+				defer wg.Done()
+				err := m.parse(a, s)
+				if err != nil {
+					a.AddError(err)
+				}
+			}(acc, server)
 		}
+		wg.Wait()
 	} else {
 		err := m.parse(acc, "")
 		if err != nil {

From c5fa6729d356d3ecb19faebe7d068ccf903c1ff8 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 2 Jul 2018 19:08:14 -0700
Subject: [PATCH 592/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4cde04f7..6294d9a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@
 - [#4267](https://github.com/influxdata/telegraf/pull/4267): Add option to use of counter time in win perf counters.
 - [#4343](https://github.com/influxdata/telegraf/pull/4343): Add energy and power field and device id tag to fibaro input.
 - [#4347](https://github.com/influxdata/telegraf/pull/4347): Add http path configuration for OpenTSDB output.
+- [#4352](https://github.com/influxdata/telegraf/pull/4352): Gather IPMI metrics concurrently.
 
 ## v1.7.1 [unreleased]
 

From cba87212d39c36f791f7a8c4fc5ed38f6d83da32 Mon Sep 17 00:00:00 2001
From: Canux <canuxcheng@gmail.com>
Date: Wed, 4 Jul 2018 02:03:17 +0800
Subject: [PATCH 593/835] Use non_negative_derivative in diskio example queries
 (#4370)

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

diff --git a/plugins/inputs/system/DISKIO_README.md b/plugins/inputs/system/DISKIO_README.md
index c71b6d76..3cec5cf5 100644
--- a/plugins/inputs/system/DISKIO_README.md
+++ b/plugins/inputs/system/DISKIO_README.md
@@ -107,13 +107,13 @@ requests that are in the queue but not yet issued to the device driver.
 
 #### 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)
+SELECT non_negative_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)
+SELECT non_negative_derivative(last("weighted_io_time",1ms)) from "diskio" WHERE time > now() - 30m GROUP BY "host","name",time(60s)
 ```
 
 ### Example Output:

From 0ef12f87af5263c83e4775ff320679965ae9385b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 3 Jul 2018 11:35:39 -0700
Subject: [PATCH 594/835] Add mutex to prevent handler precision from changing
 during parse (#4373)

---
 plugins/inputs/http_listener/http_listener.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/inputs/http_listener/http_listener.go b/plugins/inputs/http_listener/http_listener.go
index 595c74ed..6415ebc9 100644
--- a/plugins/inputs/http_listener/http_listener.go
+++ b/plugins/inputs/http_listener/http_listener.go
@@ -343,6 +343,9 @@ func (h *HTTPListener) serveWrite(res http.ResponseWriter, req *http.Request) {
 }
 
 func (h *HTTPListener) parse(b []byte, t time.Time, precision string) error {
+	h.mu.Lock()
+	defer h.mu.Unlock()
+
 	h.handler.SetTimePrecision(getPrecisionMultiplier(precision))
 	h.handler.SetTimeFunc(func() time.Time { return t })
 	metrics, err := h.parser.Parse(b)

From 38c06281906813efdd2a4ef2e20b38f64786d5fd Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 3 Jul 2018 11:37:32 -0700
Subject: [PATCH 595/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6294d9a4..bd6dadd8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,7 @@
 - [#2910](https://github.com/influxdata/telegraf/issues/2910): Handle mysql input variations in the user_statistics collecting.
 - [#4293](https://github.com/influxdata/telegraf/issues/4293): Fix minmax and basicstats aggregators to use uint64.
 - [#4290](https://github.com/influxdata/telegraf/issues/4290): Document swap input plugin.
+- [#4316](https://github.com/influxdata/telegraf/issues/4316): Fix incorrect precision being applied to metric in http_listener.
 
 ## v1.7 [2018-06-12]
 

From b5abf2c57796ded2f00d5fa14fc2e0a9963a8405 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 3 Jul 2018 13:47:53 -0700
Subject: [PATCH 596/835] Set 1.7.1 release date

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd6dadd8..5637d210 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,7 +28,7 @@
 - [#4347](https://github.com/influxdata/telegraf/pull/4347): Add http path configuration for OpenTSDB output.
 - [#4352](https://github.com/influxdata/telegraf/pull/4352): Gather IPMI metrics concurrently.
 
-## v1.7.1 [unreleased]
+## v1.7.1 [2018-07-03]
 
 ### Bugfixes
 

From 9106011f5810d67744386fbaef640875605fa7d1 Mon Sep 17 00:00:00 2001
From: Ayrdrie <ayrdriepalmer@gmail.com>
Date: Tue, 3 Jul 2018 15:09:20 -0600
Subject: [PATCH 597/835] Add mongo document and connection metrics (#4362)

---
 plugins/inputs/mongodb/mongodb_data.go      | 51 ++++++------
 plugins/inputs/mongodb/mongodb_data_test.go | 88 ++++++++++++---------
 plugins/inputs/mongodb/mongostat.go         | 21 ++++-
 3 files changed, 98 insertions(+), 62 deletions(-)

diff --git a/plugins/inputs/mongodb/mongodb_data.go b/plugins/inputs/mongodb/mongodb_data.go
index 19c15bd3..0c69670d 100644
--- a/plugins/inputs/mongodb/mongodb_data.go
+++ b/plugins/inputs/mongodb/mongodb_data.go
@@ -31,28 +31,35 @@ func NewMongodbData(statLine *StatLine, tags map[string]string) *MongodbData {
 }
 
 var DefaultStats = map[string]string{
-	"inserts_per_sec":     "Insert",
-	"queries_per_sec":     "Query",
-	"updates_per_sec":     "Update",
-	"deletes_per_sec":     "Delete",
-	"getmores_per_sec":    "GetMore",
-	"commands_per_sec":    "Command",
-	"flushes_per_sec":     "Flushes",
-	"vsize_megabytes":     "Virtual",
-	"resident_megabytes":  "Resident",
-	"queued_reads":        "QueuedReaders",
-	"queued_writes":       "QueuedWriters",
-	"active_reads":        "ActiveReaders",
-	"active_writes":       "ActiveWriters",
-	"net_in_bytes":        "NetIn",
-	"net_out_bytes":       "NetOut",
-	"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",
+	"inserts_per_sec":           "Insert",
+	"queries_per_sec":           "Query",
+	"updates_per_sec":           "Update",
+	"deletes_per_sec":           "Delete",
+	"getmores_per_sec":          "GetMore",
+	"commands_per_sec":          "Command",
+	"flushes_per_sec":           "Flushes",
+	"vsize_megabytes":           "Virtual",
+	"resident_megabytes":        "Resident",
+	"queued_reads":              "QueuedReaders",
+	"queued_writes":             "QueuedWriters",
+	"active_reads":              "ActiveReaders",
+	"active_writes":             "ActiveWriters",
+	"net_in_bytes":              "NetIn",
+	"net_out_bytes":             "NetOut",
+	"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",
+	"document_deleted":          "DeletedD",
+	"document_inserted":         "InsertedD",
+	"document_returned":         "ReturnedD",
+	"document_updated":          "UpdatedD",
+	"connections_current":       "CurrentC",
+	"connections_available":     "AvailableC",
+	"connections_total_created": "TotalCreatedC",
 }
 
 var DefaultReplStats = map[string]string{
diff --git a/plugins/inputs/mongodb/mongodb_data_test.go b/plugins/inputs/mongodb/mongodb_data_test.go
index 56256e06..5f4dd4c2 100644
--- a/plugins/inputs/mongodb/mongodb_data_test.go
+++ b/plugins/inputs/mongodb/mongodb_data_test.go
@@ -38,6 +38,13 @@ func TestAddNonReplStats(t *testing.T) {
 			NoTimeoutC:       0,
 			PinnedC:          0,
 			TotalC:           0,
+			DeletedD:         0,
+			InsertedD:        0,
+			ReturnedD:        0,
+			UpdatedD:         0,
+			CurrentC:         0,
+			AvailableC:       0,
+			TotalCreatedC:    0,
 		},
 		tags,
 	)
@@ -182,43 +189,50 @@ func TestStateTag(t *testing.T) {
 	d.AddDefaultStats()
 	d.flush(&acc)
 	fields := map[string]interface{}{
-		"active_reads":          int64(0),
-		"active_writes":         int64(0),
-		"commands_per_sec":      int64(0),
-		"deletes_per_sec":       int64(0),
-		"flushes_per_sec":       int64(0),
-		"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),
-		"queries_per_sec":       int64(0),
-		"queued_reads":          int64(0),
-		"queued_writes":         int64(0),
-		"repl_commands_per_sec": int64(0),
-		"repl_deletes_per_sec":  int64(0),
-		"repl_getmores_per_sec": int64(0),
-		"repl_inserts_per_sec":  int64(0),
-		"repl_queries_per_sec":  int64(0),
-		"repl_updates_per_sec":  int64(0),
-		"repl_lag":              int64(0),
-		"repl_oplog_window_sec": int64(0),
-		"resident_megabytes":    int64(0),
-		"updates_per_sec":       int64(0),
-		"vsize_megabytes":       int64(0),
-		"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),
-		"cursor_timed_out":      int64(0),
-		"cursor_no_timeout":     int64(0),
-		"cursor_pinned":         int64(0),
-		"cursor_total":          int64(0),
+		"active_reads":              int64(0),
+		"active_writes":             int64(0),
+		"commands_per_sec":          int64(0),
+		"deletes_per_sec":           int64(0),
+		"flushes_per_sec":           int64(0),
+		"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),
+		"queries_per_sec":           int64(0),
+		"queued_reads":              int64(0),
+		"queued_writes":             int64(0),
+		"repl_commands_per_sec":     int64(0),
+		"repl_deletes_per_sec":      int64(0),
+		"repl_getmores_per_sec":     int64(0),
+		"repl_inserts_per_sec":      int64(0),
+		"repl_queries_per_sec":      int64(0),
+		"repl_updates_per_sec":      int64(0),
+		"repl_lag":                  int64(0),
+		"repl_oplog_window_sec":     int64(0),
+		"resident_megabytes":        int64(0),
+		"updates_per_sec":           int64(0),
+		"vsize_megabytes":           int64(0),
+		"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),
+		"cursor_timed_out":          int64(0),
+		"cursor_no_timeout":         int64(0),
+		"cursor_pinned":             int64(0),
+		"cursor_total":              int64(0),
+		"document_deleted":          int64(0),
+		"document_inserted":         int64(0),
+		"document_returned":         int64(0),
+		"document_updated":          int64(0),
+		"connections_current":       int64(0),
+		"connections_available":     int64(0),
+		"connections_total_created": int64(0),
 	}
 	acc.AssertContainsTaggedFields(t, "mongodb", fields, stateTags)
 }
diff --git a/plugins/inputs/mongodb/mongostat.go b/plugins/inputs/mongodb/mongostat.go
index bb415805..dcfd7f89 100644
--- a/plugins/inputs/mongodb/mongostat.go
+++ b/plugins/inputs/mongodb/mongostat.go
@@ -225,7 +225,7 @@ type FlushStats struct {
 type ConnectionStats struct {
 	Current      int64 `bson:"current"`
 	Available    int64 `bson:"available"`
-	TotalCreated int64 `bson:"totalCreated"`
+	TotalCreated int64 `bson:"total_created"`
 }
 
 // DurTiming stores information related to journaling.
@@ -289,8 +289,9 @@ type OpcountStats struct {
 
 // MetricsStats stores information related to metrics
 type MetricsStats struct {
-	TTL    *TTLStats    `bson:"ttl"`
-	Cursor *CursorStats `bson:"cursor"`
+	TTL      *TTLStats      `bson:"ttl"`
+	Cursor   *CursorStats   `bson:"cursor"`
+	Document *DocumentStats `bson:"document"`
 }
 
 // TTLStats stores information related to documents with a ttl index.
@@ -305,6 +306,14 @@ type CursorStats struct {
 	Open     *OpenCursorStats `bson:"open"`
 }
 
+// DocumentStats stores information related to document metrics.
+type DocumentStats struct {
+	Deleted  int64 `bson:"deleted"`
+	Inserted int64 `bson:"inserted"`
+	Returned int64 `bson:"returned"`
+	Updated  int64 `bson:"updated"`
+}
+
 // OpenCursorStats stores information related to open cursor metrics
 type OpenCursorStats struct {
 	NoTimeout int64 `bson:"noTimeout"`
@@ -457,6 +466,12 @@ type StatLine struct {
 	TimedOutC                   int64
 	NoTimeoutC, PinnedC, TotalC int64
 
+	// Document fields
+	DeletedD, InsertedD, ReturnedD, UpdatedD int64
+
+	// Connection fields
+	CurrentC, AvailableC, TotalCreatedC int64
+
 	// Collection locks (3.0 mmap only)
 	CollectionLocks *CollectionLockStatus
 

From d69f833917d348a5286ef67a104b5bdec390e244 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 3 Jul 2018 14:12:20 -0700
Subject: [PATCH 598/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5637d210..e8b98bfc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@
 - [#4343](https://github.com/influxdata/telegraf/pull/4343): Add energy and power field and device id tag to fibaro input.
 - [#4347](https://github.com/influxdata/telegraf/pull/4347): Add http path configuration for OpenTSDB output.
 - [#4352](https://github.com/influxdata/telegraf/pull/4352): Gather IPMI metrics concurrently.
+- [#4362](https://github.com/influxdata/telegraf/pull/4362): Add mongo document and connection metrics.
 
 ## v1.7.1 [2018-07-03]
 

From c389a68f1925b7f4295ab774cdd39fb2acc425c8 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 3 Jul 2018 15:13:17 -0700
Subject: [PATCH 599/835] Fix grammar in swap readme

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

diff --git a/plugins/inputs/system/SWAP_README.md b/plugins/inputs/system/SWAP_README.md
index 2647b33d..a5444ff2 100644
--- a/plugins/inputs/system/SWAP_README.md
+++ b/plugins/inputs/system/SWAP_README.md
@@ -2,7 +2,7 @@
 
 The swap plugin collects system swap metrics.
 
-For a more information on what swap memory is, read [All about Linux swap space](https://www.linux.com/news/all-about-linux-swap-space).
+For more information on what swap memory is, read [All about Linux swap space](https://www.linux.com/news/all-about-linux-swap-space).
 
 ### Configuration:
 

From 515ff03364c53bca34ed67d71448d97faf9622e8 Mon Sep 17 00:00:00 2001
From: Karsten Schnitter <k.schnitter@sap.com>
Date: Wed, 4 Jul 2018 00:32:52 +0200
Subject: [PATCH 600/835] Add Enum Processor (#3772)

---
 plugins/processors/all/all.go        |   1 +
 plugins/processors/enum/README.md    |  34 ++++++++
 plugins/processors/enum/enum.go      | 111 +++++++++++++++++++++++++++
 plugins/processors/enum/enum_test.go | 106 +++++++++++++++++++++++++
 4 files changed, 252 insertions(+)
 create mode 100644 plugins/processors/enum/README.md
 create mode 100644 plugins/processors/enum/enum.go
 create mode 100644 plugins/processors/enum/enum_test.go

diff --git a/plugins/processors/all/all.go b/plugins/processors/all/all.go
index a19e469a..c06bbd42 100644
--- a/plugins/processors/all/all.go
+++ b/plugins/processors/all/all.go
@@ -2,6 +2,7 @@ package all
 
 import (
 	_ "github.com/influxdata/telegraf/plugins/processors/converter"
+	_ "github.com/influxdata/telegraf/plugins/processors/enum"
 	_ "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/enum/README.md b/plugins/processors/enum/README.md
new file mode 100644
index 00000000..8ed3f132
--- /dev/null
+++ b/plugins/processors/enum/README.md
@@ -0,0 +1,34 @@
+# Enum Processor Plugin
+
+The Enum Processor allows the configuration of value mappings for metric fields.
+The main use-case for this is to rewrite status codes such as _red_, _amber_ and
+_green_ by numeric values such as 0, 1, 2. The plugin supports string and bool
+types for the field values. Multiple Fields can be configured with separate
+value mappings for each field. Default mapping values can be configured to be
+used for all values, which are not contained in the value_mappings. The
+processor supports explicit configuration of a destination field. By default the
+source field is overwritten.
+
+### Configuration
+Configuration using table syntax:
+`toml
+# Configure a status mapping for field 'status'
+[[processors.enum.fields]]
+  source = "status"
+  destination = "code"
+  default = -1
+  [processors.enum.fields.value_mappings]
+    green = 0
+    yellow = 1
+    red = 2
+`
+
+Configuration using inline syntax:
+`toml
+# Configure a status mapping for field 'status'
+[[processors.enum.fields]]
+  source = "status"
+  destination = "code"
+  default = -1
+  value_mappings = {green = 0, yellow = 1, red = 2 }
+`
diff --git a/plugins/processors/enum/enum.go b/plugins/processors/enum/enum.go
new file mode 100644
index 00000000..17706c8d
--- /dev/null
+++ b/plugins/processors/enum/enum.go
@@ -0,0 +1,111 @@
+package enum
+
+import (
+	"strconv"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/processors"
+)
+
+var sampleConfig = `
+## NOTE This processor will map metric values to different values. It is aimed
+## to map enum values to numeric values.
+
+## Fields to be considered
+# [[processors.enum.fields]]
+#
+# Name of the field source field to map
+#   source = "name"
+#
+# Optional destination field to be used for the mapped value. Source field is
+# used, when no explicit destination is configured.
+#   destination = "mapped"
+#
+# Optional default value to be used for all values not contained in the mapping
+# table. Only applied when configured.
+#   default = 0
+#
+# Value Mapping Table
+#   [processors.enum.value_mappings]
+#     value1 = 1
+#     value2 = 2
+#
+## Alternatively the mapping table can be given in inline notation
+#   value_mappings = {value1 = 1, value2 = 2}
+`
+
+type EnumMapper struct {
+	Fields []Mapping
+}
+
+type Mapping struct {
+	Source        string
+	Destination   string
+	Default       interface{}
+	ValueMappings map[string]interface{}
+}
+
+func (mapper *EnumMapper) SampleConfig() string {
+	return sampleConfig
+}
+
+func (mapper *EnumMapper) Description() string {
+	return "Map enum values according to given table."
+}
+
+func (mapper *EnumMapper) Apply(in ...telegraf.Metric) []telegraf.Metric {
+	for i := 0; i < len(in); i++ {
+		in[i] = mapper.applyMappings(in[i])
+	}
+	return in
+}
+
+func (mapper *EnumMapper) applyMappings(metric telegraf.Metric) telegraf.Metric {
+	for _, mapping := range mapper.Fields {
+		if originalValue, isPresent := metric.GetField(mapping.Source); isPresent == true {
+			if adjustedValue, isString := adjustBoolValue(originalValue).(string); isString == true {
+				if mappedValue, isMappedValuePresent := mapping.mapValue(adjustedValue); isMappedValuePresent == true {
+					writeField(metric, mapping.getDestination(), mappedValue)
+				}
+			}
+		}
+	}
+	return metric
+}
+
+func adjustBoolValue(in interface{}) interface{} {
+	if mappedBool, isBool := in.(bool); isBool == true {
+		return strconv.FormatBool(mappedBool)
+	}
+	return in
+}
+
+func (mapping *Mapping) mapValue(original string) (interface{}, bool) {
+	if mapped, found := mapping.ValueMappings[original]; found == true {
+		return mapped, true
+	}
+	if mapping.Default != nil {
+		return mapping.Default, true
+	}
+	return original, false
+}
+
+func (mapping *Mapping) getDestination() string {
+	if mapping.Destination != "" {
+		return mapping.Destination
+	}
+	return mapping.Source
+}
+
+func writeField(metric telegraf.Metric, name string, value interface{}) {
+	if metric.HasField(name) {
+		metric.RemoveField(name)
+	}
+	metric.AddField(name, value)
+}
+
+func init() {
+	processors.Add("enum", func() telegraf.Processor {
+		return &EnumMapper{}
+	})
+}
diff --git a/plugins/processors/enum/enum_test.go b/plugins/processors/enum/enum_test.go
new file mode 100644
index 00000000..2185b91b
--- /dev/null
+++ b/plugins/processors/enum/enum_test.go
@@ -0,0 +1,106 @@
+package enum
+
+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{"tag": "tag_value"},
+		map[string]interface{}{
+			"string_value": "test",
+			"int_value":    int(13),
+			"true_value":   true,
+		},
+		time.Now(),
+	)
+	return metric
+}
+
+func calculateProcessedValues(mapper EnumMapper, metric telegraf.Metric) map[string]interface{} {
+	processed := mapper.Apply(metric)
+	return processed[0].Fields()
+}
+
+func assertFieldValue(t *testing.T, expected interface{}, field string, fields map[string]interface{}) {
+	value, present := fields[field]
+	assert.True(t, present, "value of field '"+field+"' was not present")
+	assert.EqualValues(t, expected, value)
+}
+
+func TestRetainsMetric(t *testing.T) {
+	mapper := EnumMapper{}
+	source := createTestMetric()
+
+	target := mapper.Apply(source)[0]
+	fields := target.Fields()
+
+	assertFieldValue(t, "test", "string_value", fields)
+	assertFieldValue(t, 13, "int_value", fields)
+	assertFieldValue(t, true, "true_value", fields)
+	assert.Equal(t, "m1", target.Name())
+	assert.Equal(t, source.Tags(), target.Tags())
+	assert.Equal(t, source.Time(), target.Time())
+}
+
+func TestMapsSingleStringValue(t *testing.T) {
+	mapper := EnumMapper{Fields: []Mapping{{Source: "string_value", ValueMappings: map[string]interface{}{"test": int64(1)}}}}
+
+	fields := calculateProcessedValues(mapper, createTestMetric())
+
+	assertFieldValue(t, 1, "string_value", fields)
+}
+
+func TestNoFailureOnMappingsOnNonStringValuedFields(t *testing.T) {
+	mapper := EnumMapper{Fields: []Mapping{{Source: "int_value", ValueMappings: map[string]interface{}{"13i": int64(7)}}}}
+
+	fields := calculateProcessedValues(mapper, createTestMetric())
+
+	assertFieldValue(t, 13, "int_value", fields)
+}
+
+func TestMapSingleBoolValue(t *testing.T) {
+	mapper := EnumMapper{Fields: []Mapping{{Source: "true_value", ValueMappings: map[string]interface{}{"true": int64(1)}}}}
+
+	fields := calculateProcessedValues(mapper, createTestMetric())
+
+	assertFieldValue(t, 1, "true_value", fields)
+}
+
+func TestMapsToDefaultValueOnUnknownSourceValue(t *testing.T) {
+	mapper := EnumMapper{Fields: []Mapping{{Source: "string_value", Default: int64(42), ValueMappings: map[string]interface{}{"other": int64(1)}}}}
+
+	fields := calculateProcessedValues(mapper, createTestMetric())
+
+	assertFieldValue(t, 42, "string_value", fields)
+}
+
+func TestDoNotMapToDefaultValueKnownSourceValue(t *testing.T) {
+	mapper := EnumMapper{Fields: []Mapping{{Source: "string_value", Default: int64(42), ValueMappings: map[string]interface{}{"test": int64(1)}}}}
+
+	fields := calculateProcessedValues(mapper, createTestMetric())
+
+	assertFieldValue(t, 1, "string_value", fields)
+}
+
+func TestNoMappingWithoutDefaultOrDefinedMappingValue(t *testing.T) {
+	mapper := EnumMapper{Fields: []Mapping{{Source: "string_value", ValueMappings: map[string]interface{}{"other": int64(1)}}}}
+
+	fields := calculateProcessedValues(mapper, createTestMetric())
+
+	assertFieldValue(t, "test", "string_value", fields)
+}
+
+func TestWritesToDestination(t *testing.T) {
+	mapper := EnumMapper{Fields: []Mapping{{Source: "string_value", Destination: "string_code", ValueMappings: map[string]interface{}{"test": int64(1)}}}}
+
+	fields := calculateProcessedValues(mapper, createTestMetric())
+
+	assertFieldValue(t, "test", "string_value", fields)
+	assertFieldValue(t, 1, "string_code", fields)
+}

From 500e136844a1630ccc7ccae92a77eff73a9f3845 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 3 Jul 2018 15:34:29 -0700
Subject: [PATCH 601/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8b98bfc..fa8a8b4c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@
 
 - [tengine](./plugins/inputs/tengine/README.md) - Contributed by @ertaoxu
 
+### New Processors
+
+- [enum](./plugins/processors/enum/README.md) - Contributed by @KarstenSchnitter
+
 ### New Aggregators
 
 - [valuecounter](./plugins/aggregators/valuecounter/README.md) - Contributed by @piotr1212
@@ -28,6 +32,7 @@
 - [#4347](https://github.com/influxdata/telegraf/pull/4347): Add http path configuration for OpenTSDB output.
 - [#4352](https://github.com/influxdata/telegraf/pull/4352): Gather IPMI metrics concurrently.
 - [#4362](https://github.com/influxdata/telegraf/pull/4362): Add mongo document and connection metrics.
+- [#3772](https://github.com/influxdata/telegraf/pull/3772): Add Enum Processor.
 
 ## v1.7.1 [2018-07-03]
 

From bf076dab7362d6db74245210781e26b8205bc1a5 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 3 Jul 2018 16:10:55 -0700
Subject: [PATCH 602/835] Adjust enum readme and sample config style

---
 plugins/processors/enum/README.md | 43 +++++++++++++++----------------
 plugins/processors/enum/enum.go   | 39 ++++++++++++----------------
 2 files changed, 37 insertions(+), 45 deletions(-)

diff --git a/plugins/processors/enum/README.md b/plugins/processors/enum/README.md
index 8ed3f132..f0ed5856 100644
--- a/plugins/processors/enum/README.md
+++ b/plugins/processors/enum/README.md
@@ -9,26 +9,25 @@ used for all values, which are not contained in the value_mappings. The
 processor supports explicit configuration of a destination field. By default the
 source field is overwritten.
 
-### Configuration
-Configuration using table syntax:
-`toml
-# Configure a status mapping for field 'status'
-[[processors.enum.fields]]
-  source = "status"
-  destination = "code"
-  default = -1
-  [processors.enum.fields.value_mappings]
-    green = 0
-    yellow = 1
-    red = 2
-`
+### Configuration:
 
-Configuration using inline syntax:
-`toml
-# Configure a status mapping for field 'status'
-[[processors.enum.fields]]
-  source = "status"
-  destination = "code"
-  default = -1
-  value_mappings = {green = 0, yellow = 1, red = 2 }
-`
+```toml
+[[processors.enum]]
+  [[processors.enum.fields]]
+    ## Name of the field to map
+    source = "name"
+
+    ## Destination field to be used for the mapped value.  By default the source
+    ## field is used, overwriting the original value.
+    # destination = "mapped"
+
+    ## Default value to be used for all values not contained in the mapping
+    ## table.  When unset, the unmodified value for the field will be used if no
+    ## match is found.
+    # default = 0
+
+    ## Table of mappings
+    [processors.enum.fields.value_mappings]
+      value1 = 1
+      value2 = 2
+```
diff --git a/plugins/processors/enum/enum.go b/plugins/processors/enum/enum.go
index 17706c8d..134a02bb 100644
--- a/plugins/processors/enum/enum.go
+++ b/plugins/processors/enum/enum.go
@@ -8,30 +8,23 @@ import (
 )
 
 var sampleConfig = `
-## NOTE This processor will map metric values to different values. It is aimed
-## to map enum values to numeric values.
+  [[processors.enum.fields]]
+    ## Name of the field to map
+    source = "name"
 
-## Fields to be considered
-# [[processors.enum.fields]]
-#
-# Name of the field source field to map
-#   source = "name"
-#
-# Optional destination field to be used for the mapped value. Source field is
-# used, when no explicit destination is configured.
-#   destination = "mapped"
-#
-# Optional default value to be used for all values not contained in the mapping
-# table. Only applied when configured.
-#   default = 0
-#
-# Value Mapping Table
-#   [processors.enum.value_mappings]
-#     value1 = 1
-#     value2 = 2
-#
-## Alternatively the mapping table can be given in inline notation
-#   value_mappings = {value1 = 1, value2 = 2}
+    ## Destination field to be used for the mapped value.  By default the source
+    ## field is used, overwriting the original value.
+    # destination = "mapped"
+
+    ## Default value to be used for all values not contained in the mapping
+    ## table.  When unset, the unmodified value for the field will be used if no
+    ## match is found.
+    # default = 0
+
+    ## Table of mappings
+    [processors.enum.fields.value_mappings]
+      value1 = 1
+      value2 = 2
 `
 
 type EnumMapper struct {

From b5cdeeb300f711fa1767404f7127fbf9699656eb Mon Sep 17 00:00:00 2001
From: Greg <g2linton@gmail.com>
Date: Thu, 5 Jul 2018 14:56:41 -0600
Subject: [PATCH 603/835] Add user tag to procstat input (#4386)

---
 plugins/inputs/procstat/process.go       | 5 +++++
 plugins/inputs/procstat/procstat.go      | 8 ++++++++
 plugins/inputs/procstat/procstat_test.go | 4 ++++
 3 files changed, 17 insertions(+)

diff --git a/plugins/inputs/procstat/process.go b/plugins/inputs/procstat/process.go
index 361582c3..30e8f182 100644
--- a/plugins/inputs/procstat/process.go
+++ b/plugins/inputs/procstat/process.go
@@ -21,6 +21,7 @@ type Process interface {
 	Percent(interval time.Duration) (float64, error)
 	Times() (*cpu.TimesStat, error)
 	RlimitUsage(bool) ([]process.RlimitStat, error)
+	Username() (string, error)
 }
 
 type PIDFinder interface {
@@ -58,6 +59,10 @@ func (p *Proc) PID() PID {
 	return PID(p.Process.Pid)
 }
 
+func (p *Proc) Username() (string, error) {
+	return p.Process.Username()
+}
+
 func (p *Proc) Percent(interval time.Duration) (float64, error) {
 	cpu_perc, err := p.Process.Percent(time.Duration(0))
 	if !p.hasCPUTimes && err == nil {
diff --git a/plugins/inputs/procstat/procstat.go b/plugins/inputs/procstat/procstat.go
index 01505bdd..4b253fd1 100644
--- a/plugins/inputs/procstat/procstat.go
+++ b/plugins/inputs/procstat/procstat.go
@@ -128,6 +128,14 @@ func (p *Procstat) addMetrics(proc Process, acc telegraf.Accumulator) {
 		}
 	}
 
+	//If user tag is not already set, set to actual name
+	if _, ok := proc.Tags()["user"]; !ok {
+		user, err := proc.Username()
+		if err == nil {
+			proc.Tags()["user"] = user
+		}
+	}
+
 	//If pid is not present as a tag, include it as a field.
 	if _, pidInTags := proc.Tags()["pid"]; !pidInTags {
 		fields["pid"] = int32(proc.PID())
diff --git a/plugins/inputs/procstat/procstat_test.go b/plugins/inputs/procstat/procstat_test.go
index ff4b7006..7a2eaf9e 100644
--- a/plugins/inputs/procstat/procstat_test.go
+++ b/plugins/inputs/procstat/procstat_test.go
@@ -104,6 +104,10 @@ func (p *testProc) PID() PID {
 	return p.pid
 }
 
+func (p *testProc) Username() (string, error) {
+	return "testuser", nil
+}
+
 func (p *testProc) Tags() map[string]string {
 	return p.tags
 }

From f5f9fa2095363a400261c7fcff8572d4d8266308 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 5 Jul 2018 13:57:24 -0700
Subject: [PATCH 604/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa8a8b4c..417ab736 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@
 - [#4352](https://github.com/influxdata/telegraf/pull/4352): Gather IPMI metrics concurrently.
 - [#4362](https://github.com/influxdata/telegraf/pull/4362): Add mongo document and connection metrics.
 - [#3772](https://github.com/influxdata/telegraf/pull/3772): Add Enum Processor.
+- [#4386](https://github.com/influxdata/telegraf/pull/4386): Add user tag to procstat input.
 
 ## v1.7.1 [2018-07-03]
 

From a82b4fbd96b62baddb61adf1414a32578b606c31 Mon Sep 17 00:00:00 2001
From: Greg <g2linton@gmail.com>
Date: Thu, 5 Jul 2018 15:37:13 -0600
Subject: [PATCH 605/835] Use 'localhost' as default 'server' tag in zookeeper
 input (#4387)

---
 plugins/inputs/zookeeper/dev/docker-compose.yml | 17 +++++++++++++++++
 plugins/inputs/zookeeper/dev/telegraf.conf      |  9 +++++++++
 plugins/inputs/zookeeper/zookeeper.go           |  8 +++++++-
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 plugins/inputs/zookeeper/dev/docker-compose.yml
 create mode 100644 plugins/inputs/zookeeper/dev/telegraf.conf

diff --git a/plugins/inputs/zookeeper/dev/docker-compose.yml b/plugins/inputs/zookeeper/dev/docker-compose.yml
new file mode 100644
index 00000000..7a4f9bf8
--- /dev/null
+++ b/plugins/inputs/zookeeper/dev/docker-compose.yml
@@ -0,0 +1,17 @@
+version: '3'
+services:
+  zoo:
+    image: zookeeper
+
+  telegraf:
+    image: glinton/scratch
+    volumes:
+      - ./telegraf.conf:/telegraf.conf
+      - ../../../../telegraf:/telegraf
+    depends_on:
+      - zoo
+    entrypoint:
+      - /telegraf
+      - --config
+      - /telegraf.conf
+    network_mode: service:zoo
diff --git a/plugins/inputs/zookeeper/dev/telegraf.conf b/plugins/inputs/zookeeper/dev/telegraf.conf
new file mode 100644
index 00000000..ac76b2a7
--- /dev/null
+++ b/plugins/inputs/zookeeper/dev/telegraf.conf
@@ -0,0 +1,9 @@
+[agent]
+  interval="1s"
+  flush_interval="1s"
+
+[[inputs.zookeeper]]
+  servers = [":2181"]
+
+[[outputs.file]]
+  files = ["stdout"]
diff --git a/plugins/inputs/zookeeper/zookeeper.go b/plugins/inputs/zookeeper/zookeeper.go
index 20e7aee0..ad990f28 100644
--- a/plugins/inputs/zookeeper/zookeeper.go
+++ b/plugins/inputs/zookeeper/zookeeper.go
@@ -158,8 +158,14 @@ func (z *Zookeeper) gatherServer(ctx context.Context, address string, acc telegr
 			}
 		}
 	}
+
+	srv := "localhost"
+	if service[0] != "" {
+		srv = service[0]
+	}
+
 	tags := map[string]string{
-		"server": service[0],
+		"server": srv,
 		"port":   service[1],
 		"state":  zookeeper_state,
 	}

From a0ece791913970e284e5c92d71ec2649f391b63a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 5 Jul 2018 14:40:22 -0700
Subject: [PATCH 606/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 417ab736..8523cf0d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,12 @@
 - [#3772](https://github.com/influxdata/telegraf/pull/3772): Add Enum Processor.
 - [#4386](https://github.com/influxdata/telegraf/pull/4386): Add user tag to procstat input.
 
+## v1.7.2 [unreleased]
+
+### Bugfixes
+
+- [#4381](https://github.com/influxdata/telegraf/issues/4381): Use localhost as default server tag in zookeeper input.
+
 ## v1.7.1 [2018-07-03]
 
 ### Bugfixes

From 35d2f90d6c53a5adf524fa7c8a6d05e35e214e46 Mon Sep 17 00:00:00 2001
From: Alexander Shepelin <Brightcor@gmail.com>
Date: Sat, 7 Jul 2018 02:13:46 +0300
Subject: [PATCH 607/835] Don't set values when pattern doesn't match in regex
 processor (#4396)

---
 plugins/processors/regex/regex.go      | 8 ++++++--
 plugins/processors/regex/regex_test.go | 5 ++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/plugins/processors/regex/regex.go b/plugins/processors/regex/regex.go
index 3282406c..f73ed06b 100644
--- a/plugins/processors/regex/regex.go
+++ b/plugins/processors/regex/regex.go
@@ -67,7 +67,9 @@ 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))
+				if key, newValue := r.convert(converter, value); newValue != "" {
+					metric.AddTag(key, newValue)
+				}
 			}
 		}
 
@@ -75,7 +77,9 @@ func (r *Regex) Apply(in ...telegraf.Metric) []telegraf.Metric {
 			if value, ok := metric.GetField(converter.Key); ok {
 				switch value := value.(type) {
 				case string:
-					metric.AddField(r.convert(converter, value))
+					if key, newValue := r.convert(converter, value); newValue != "" {
+						metric.AddField(key, newValue)
+					}
 				}
 			}
 		}
diff --git a/plugins/processors/regex/regex_test.go b/plugins/processors/regex/regex_test.go
index e7c15e5a..f16ef7f5 100644
--- a/plugins/processors/regex/regex_test.go
+++ b/plugins/processors/regex/regex_test.go
@@ -222,7 +222,7 @@ func TestNoMatches(t *testing.T) {
 			},
 		},
 		{
-			message: "Should emit empty string when result_key given but regex doesn't match",
+			message: "Should not emit new tag/field when result_key given but regex doesn't match",
 			converter: converter{
 				Key:         "request",
 				Pattern:     "not_match",
@@ -230,8 +230,7 @@ func TestNoMatches(t *testing.T) {
 				ResultKey:   "new_field",
 			},
 			expectedFields: map[string]interface{}{
-				"request":   "/users/42/",
-				"new_field": "",
+				"request": "/users/42/",
 			},
 		},
 	}

From 25ceb7f5a7f5b0c794d5d990f558ac6a1b69e30e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 6 Jul 2018 16:16:07 -0700
Subject: [PATCH 608/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8523cf0d..bd0c262a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,7 @@
 ### Bugfixes
 
 - [#4381](https://github.com/influxdata/telegraf/issues/4381): Use localhost as default server tag in zookeeper input.
+- [#4374](https://github.com/influxdata/telegraf/issues/4374): Don't set values when pattern doesn't match in regex processor.
 
 ## v1.7.1 [2018-07-03]
 

From 6a2e2bfd7c95a05f1262ce8e81d8756e561541a6 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Sat, 7 Jul 2018 00:21:21 -0700
Subject: [PATCH 609/835] Add troubleshooting docs to cloudwatch input

---
 plugins/inputs/cloudwatch/README.md     | 18 +++++++++++++++++-
 plugins/inputs/cloudwatch/cloudwatch.go |  4 +++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/cloudwatch/README.md b/plugins/inputs/cloudwatch/README.md
index 83b4b1de..88a5b098 100644
--- a/plugins/inputs/cloudwatch/README.md
+++ b/plugins/inputs/cloudwatch/README.md
@@ -68,7 +68,9 @@ API endpoint. In the following order the plugin will attempt to authenticate.
   [[inputs.cloudwatch.metrics]]
     names = ["Latency", "RequestCount"]
 
-    ## Dimension filters for Metric (optional)
+    ## Dimension filters for Metric.  These are optional however all dimensions
+    ## defined for the metric names must be specified in order to retrieve
+    ## the metric statistics.
     [[inputs.cloudwatch.metrics.dimensions]]
       name = "LoadBalancerName"
       value = "p-example"
@@ -142,6 +144,20 @@ Tag Dimension names are represented in [snake case](https://en.wikipedia.org/wik
   - unit             (CloudWatch Metric Unit)
   - {dimension-name} (Cloudwatch Dimension value - one for each metric dimension)
 
+### Troubleshooting:
+
+You can use the aws cli to get a list of available metrics and dimensions:
+```
+aws cloudwatch list-metrics --namespace AWS/EC2 --region us-east-1
+aws cloudwatch list-metrics --namespace AWS/EC2 --region us-east-1 --metric-name CPUCreditBalance
+```
+
+If the expected metrics are not returned, you can try getting them manually
+for a short period of time:
+```
+aws cloudwatch get-metric-statistics --namespace AWS/EC2 --region us-east-1 --period 300 --start-time 2018-07-01T00:00:00Z --end-time 2018-07-01T00:15:00Z --statistics Average --metric-name CPUCreditBalance --dimensions Name=InstanceId,Value=i-deadbeef
+```
+
 ### Example Output:
 
 ```
diff --git a/plugins/inputs/cloudwatch/cloudwatch.go b/plugins/inputs/cloudwatch/cloudwatch.go
index 2fac94ad..b4f91f74 100644
--- a/plugins/inputs/cloudwatch/cloudwatch.go
+++ b/plugins/inputs/cloudwatch/cloudwatch.go
@@ -115,7 +115,9 @@ func (c *CloudWatch) SampleConfig() string {
   #[[inputs.cloudwatch.metrics]]
   #  names = ["Latency", "RequestCount"]
   #
-  #  ## Dimension filters for Metric (optional)
+  #  ## Dimension filters for Metric.  These are optional however all dimensions
+  #  ## defined for the metric names must be specified in order to retrieve
+  #  ## the metric statistics.
   #  [[inputs.cloudwatch.metrics.dimensions]]
   #    name = "LoadBalancerName"
   #    value = "p-example"

From 9491cd91cda59eb4ffaa0ca2b4821679bdc510da Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Sat, 7 Jul 2018 00:54:21 -0700
Subject: [PATCH 610/835] Fix data race with default tags (#4395)

---
 agent/agent.go | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/agent/agent.go b/agent/agent.go
index cfac6ab7..6eb9505e 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -388,21 +388,11 @@ func (a *Agent) Run(shutdown chan struct{}) error {
 		}(aggregator)
 	}
 
-	wg.Add(len(a.Config.Inputs))
-	for _, input := range a.Config.Inputs {
-		interval := a.Config.Agent.Interval.Duration
-		// overwrite global interval if this plugin has it's own.
-		if input.Config.Interval != 0 {
-			interval = input.Config.Interval
-		}
-		go func(in *models.RunningInput, interv time.Duration) {
-			defer wg.Done()
-			a.gatherer(shutdown, in, interv, metricC)
-		}(input, interval)
-	}
-
-	// Start all ServicePlugins inputs after all other
-	// plugins are loaded so that no metrics get dropped
+	// Service inputs may immediately add metrics, if metrics are added before
+	// the aggregator starts they will be dropped.  Generally this occurs
+	// only during testing but it is an outstanding issue.
+	//
+	//   https://github.com/influxdata/telegraf/issues/4394
 	for _, input := range a.Config.Inputs {
 		input.SetDefaultTags(a.Config.Tags)
 		switch p := input.Input.(type) {
@@ -420,6 +410,19 @@ func (a *Agent) Run(shutdown chan struct{}) error {
 		}
 	}
 
+	wg.Add(len(a.Config.Inputs))
+	for _, input := range a.Config.Inputs {
+		interval := a.Config.Agent.Interval.Duration
+		// overwrite global interval if this plugin has it's own.
+		if input.Config.Interval != 0 {
+			interval = input.Config.Interval
+		}
+		go func(in *models.RunningInput, interv time.Duration) {
+			defer wg.Done()
+			a.gatherer(shutdown, in, interv, metricC)
+		}(input, interval)
+	}
+
 	wg.Wait()
 	a.Close()
 	return nil

From 7591a50d526abbed2f408ebb605fc4e66d4840c7 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 9 Jul 2018 17:39:51 -0700
Subject: [PATCH 611/835] Add path tag to tail tests

---
 plugins/inputs/tail/tail_test.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/inputs/tail/tail_test.go b/plugins/inputs/tail/tail_test.go
index e8a16cc5..23df0d0b 100644
--- a/plugins/inputs/tail/tail_test.go
+++ b/plugins/inputs/tail/tail_test.go
@@ -43,6 +43,7 @@ func TestTailFromBeginning(t *testing.T) {
 		},
 		map[string]string{
 			"mytag": "foo",
+			"path":  tmpfile.Name(),
 		})
 }
 
@@ -84,6 +85,7 @@ func TestTailFromEnd(t *testing.T) {
 		},
 		map[string]string{
 			"othertag": "foo",
+			"path":     tmpfile.Name(),
 		})
 	assert.Len(t, acc.Metrics, 1)
 }

From 9a14d1f0743d025c3d0f0cfc02d8a88e547a107f Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 10 Jul 2018 20:20:44 -0700
Subject: [PATCH 612/835] Fix quoting in nvidia_smi input

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

diff --git a/plugins/inputs/nvidia_smi/README.md b/plugins/inputs/nvidia_smi/README.md
index 5d0cc99c..97fd9ff0 100644
--- a/plugins/inputs/nvidia_smi/README.md
+++ b/plugins/inputs/nvidia_smi/README.md
@@ -7,11 +7,11 @@ This plugin uses a query on the [`nvidia-smi`](https://developer.nvidia.com/nvid
 ```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: path to nvidia-smi binary, defaults to $PATH via exec.LookPath
+  # bin_path = "/usr/bin/nvidia-smi"
 
-## Optional: timeout for GPU polling
-# timeout = 5s
+  ## Optional: timeout for GPU polling
+  # timeout = "5s"
 ```
 
 ### Metrics
diff --git a/plugins/inputs/nvidia_smi/nvidia_smi.go b/plugins/inputs/nvidia_smi/nvidia_smi.go
index 84784b76..abce80dc 100644
--- a/plugins/inputs/nvidia_smi/nvidia_smi.go
+++ b/plugins/inputs/nvidia_smi/nvidia_smi.go
@@ -50,11 +50,11 @@ func (smi *NvidiaSMI) Description() string {
 // 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: path to nvidia-smi binary, defaults to $PATH via exec.LookPath
+  # bin_path = "/usr/bin/nvidia-smi"
 
-## Optional: timeout for GPU polling
-# timeout = 5s
+  ## Optional: timeout for GPU polling
+  # timeout = "5s"
 `
 }
 

From 7b73b0db3a6bb6299c6201547bc77744e2107af0 Mon Sep 17 00:00:00 2001
From: Steve Domino <sdomino@nanobox.io>
Date: Wed, 11 Jul 2018 17:43:49 -0600
Subject: [PATCH 613/835] Moved system package inputs out to top level (#4406)

---
 plugins/inputs/all/all.go                     | 10 ++++++
 .../{system/CPU_README.md => cpu/README.md}   |  0
 plugins/inputs/{system => cpu}/cpu.go         |  9 +++---
 plugins/inputs/{system => cpu}/cpu_test.go    | 17 +++++-----
 .../{system/DISK_README.md => disk/README.md} |  0
 plugins/inputs/{system => disk}/disk.go       |  7 ++--
 plugins/inputs/{system => disk}/disk_test.go  |  9 +++---
 .../DISKIO_README.md => diskio/README.md}     |  0
 plugins/inputs/{system => diskio}/diskio.go   |  7 ++--
 .../inputs/{system => diskio}/diskio_linux.go |  2 +-
 .../{system => diskio}/diskio_linux_test.go   |  2 +-
 .../inputs/{system => diskio}/diskio_other.go |  2 +-
 .../inputs/{system => diskio}/diskio_test.go  |  5 +--
 .../KERNEL_README.md => kernel/README.md}     |  0
 plugins/inputs/{system => kernel}/kernel.go   |  2 +-
 .../{system => kernel}/kernel_notlinux.go     |  2 +-
 .../inputs/{system => kernel}/kernel_test.go  |  4 +--
 .../README.md}                                |  0
 .../kernel_vmstat.go                          |  2 +-
 .../kernel_vmstat/kernel_vmstat_notlinux.go   |  3 ++
 .../kernel_vmstat_test.go                     | 10 +++---
 .../README.md}                                |  0
 .../linux_sysctl_fs.go                        |  2 +-
 .../linux_sysctl_fs_test.go                   |  2 +-
 .../{system/MEM_README.md => mem/README.md}   |  0
 plugins/inputs/{system => mem}/memory.go      |  7 ++--
 plugins/inputs/{system => mem}/memory_test.go |  5 +--
 .../inputs/{system => net}/NETSTAT_README.md  | 19 +++++++----
 plugins/inputs/{system => net}/NET_README.md  |  0
 plugins/inputs/{system => net}/net.go         |  7 ++--
 plugins/inputs/{system => net}/net_test.go    |  5 +--
 plugins/inputs/{system => net}/netstat.go     |  7 ++--
 .../README.md}                                |  0
 .../inputs/{system => processes}/processes.go |  5 +--
 .../{system => processes}/processes_test.go   |  4 ++-
 plugins/inputs/processes/processes_windows.go |  3 ++
 .../{system/SWAP_README.md => swap/README.md} |  0
 plugins/inputs/{system => swap}/swap.go       |  7 ++--
 plugins/inputs/{system => swap}/swap_test.go  |  5 +--
 .../system/{SYSTEM_README.md => README.md}    |  0
 plugins/inputs/system/mock_PS.go              | 12 +++----
 plugins/inputs/system/ps.go                   | 32 +++++++++----------
 42 files changed, 126 insertions(+), 89 deletions(-)
 rename plugins/inputs/{system/CPU_README.md => cpu/README.md} (100%)
 rename plugins/inputs/{system => cpu}/cpu.go (95%)
 rename plugins/inputs/{system => cpu}/cpu_test.go (97%)
 rename plugins/inputs/{system/DISK_README.md => disk/README.md} (100%)
 rename plugins/inputs/{system => disk}/disk.go (95%)
 rename plugins/inputs/{system => disk}/disk_test.go (96%)
 rename plugins/inputs/{system/DISKIO_README.md => diskio/README.md} (100%)
 rename plugins/inputs/{system => diskio}/diskio.go (97%)
 rename plugins/inputs/{system => diskio}/diskio_linux.go (98%)
 rename plugins/inputs/{system => diskio}/diskio_linux_test.go (99%)
 rename plugins/inputs/{system => diskio}/diskio_other.go (90%)
 rename plugins/inputs/{system => diskio}/diskio_test.go (96%)
 rename plugins/inputs/{system/KERNEL_README.md => kernel/README.md} (100%)
 rename plugins/inputs/{system => kernel}/kernel.go (99%)
 rename plugins/inputs/{system => kernel}/kernel_notlinux.go (96%)
 rename plugins/inputs/{system => kernel}/kernel_test.go (98%)
 rename plugins/inputs/{system/KERNEL_VMSTAT_README.md => kernel_vmstat/README.md} (100%)
 rename plugins/inputs/{system => kernel_vmstat}/kernel_vmstat.go (98%)
 create mode 100644 plugins/inputs/kernel_vmstat/kernel_vmstat_notlinux.go
 rename plugins/inputs/{system => kernel_vmstat}/kernel_vmstat_test.go (97%)
 rename plugins/inputs/{system/LINUX_SYSCTL_FS_README.md => linux_sysctl_fs/README.md} (100%)
 rename plugins/inputs/{system => linux_sysctl_fs}/linux_sysctl_fs.go (98%)
 rename plugins/inputs/{system => linux_sysctl_fs}/linux_sysctl_fs_test.go (98%)
 rename plugins/inputs/{system/MEM_README.md => mem/README.md} (100%)
 rename plugins/inputs/{system => mem}/memory.go (90%)
 rename plugins/inputs/{system => mem}/memory_test.go (93%)
 rename plugins/inputs/{system => net}/NETSTAT_README.md (67%)
 rename plugins/inputs/{system => net}/NET_README.md (100%)
 rename plugins/inputs/{system => net}/net.go (95%)
 rename plugins/inputs/{system => net}/net_test.go (96%)
 rename plugins/inputs/{system => net}/netstat.go (92%)
 rename plugins/inputs/{system/PROCESSES_README.md => processes/README.md} (100%)
 rename plugins/inputs/{system => processes}/processes.go (97%)
 rename plugins/inputs/{system => processes}/processes_test.go (98%)
 create mode 100644 plugins/inputs/processes/processes_windows.go
 rename plugins/inputs/{system/SWAP_README.md => swap/README.md} (100%)
 rename plugins/inputs/{system => swap}/swap.go (88%)
 rename plugins/inputs/{system => swap}/swap_test.go (89%)
 rename plugins/inputs/system/{SYSTEM_README.md => README.md} (100%)

diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index b2be2be5..594e0ea4 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -17,7 +17,10 @@ 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/cpu"
 	_ "github.com/influxdata/telegraf/plugins/inputs/dcos"
+	_ "github.com/influxdata/telegraf/plugins/inputs/disk"
+	_ "github.com/influxdata/telegraf/plugins/inputs/diskio"
 	_ "github.com/influxdata/telegraf/plugins/inputs/disque"
 	_ "github.com/influxdata/telegraf/plugins/inputs/dmcache"
 	_ "github.com/influxdata/telegraf/plugins/inputs/dns_query"
@@ -48,12 +51,16 @@ import (
 	_ "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/kernel"
+	_ "github.com/influxdata/telegraf/plugins/inputs/kernel_vmstat"
 	_ "github.com/influxdata/telegraf/plugins/inputs/kubernetes"
 	_ "github.com/influxdata/telegraf/plugins/inputs/leofs"
+	_ "github.com/influxdata/telegraf/plugins/inputs/linux_sysctl_fs"
 	_ "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/mem"
 	_ "github.com/influxdata/telegraf/plugins/inputs/memcached"
 	_ "github.com/influxdata/telegraf/plugins/inputs/mesos"
 	_ "github.com/influxdata/telegraf/plugins/inputs/minecraft"
@@ -62,6 +69,7 @@ import (
 	_ "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"
 	_ "github.com/influxdata/telegraf/plugins/inputs/net_response"
 	_ "github.com/influxdata/telegraf/plugins/inputs/nginx"
 	_ "github.com/influxdata/telegraf/plugins/inputs/nginx_plus"
@@ -80,6 +88,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/postgresql"
 	_ "github.com/influxdata/telegraf/plugins/inputs/postgresql_extensible"
 	_ "github.com/influxdata/telegraf/plugins/inputs/powerdns"
+	_ "github.com/influxdata/telegraf/plugins/inputs/processes"
 	_ "github.com/influxdata/telegraf/plugins/inputs/procstat"
 	_ "github.com/influxdata/telegraf/plugins/inputs/prometheus"
 	_ "github.com/influxdata/telegraf/plugins/inputs/puppetagent"
@@ -97,6 +106,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/swap"
 	_ "github.com/influxdata/telegraf/plugins/inputs/syslog"
 	_ "github.com/influxdata/telegraf/plugins/inputs/sysstat"
 	_ "github.com/influxdata/telegraf/plugins/inputs/system"
diff --git a/plugins/inputs/system/CPU_README.md b/plugins/inputs/cpu/README.md
similarity index 100%
rename from plugins/inputs/system/CPU_README.md
rename to plugins/inputs/cpu/README.md
diff --git a/plugins/inputs/system/cpu.go b/plugins/inputs/cpu/cpu.go
similarity index 95%
rename from plugins/inputs/system/cpu.go
rename to plugins/inputs/cpu/cpu.go
index 99fa451b..e073309e 100644
--- a/plugins/inputs/system/cpu.go
+++ b/plugins/inputs/cpu/cpu.go
@@ -1,4 +1,4 @@
-package system
+package cpu
 
 import (
 	"fmt"
@@ -6,11 +6,12 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs/system"
 	"github.com/shirou/gopsutil/cpu"
 )
 
 type CPUStats struct {
-	ps        PS
+	ps        system.PS
 	lastStats map[string]cpu.TimesStat
 
 	PerCPU         bool `toml:"percpu"`
@@ -19,7 +20,7 @@ type CPUStats struct {
 	ReportActive   bool `toml:"report_active"`
 }
 
-func NewCPUStats(ps PS) *CPUStats {
+func NewCPUStats(ps system.PS) *CPUStats {
 	return &CPUStats{
 		ps:             ps,
 		CollectCPUTime: true,
@@ -146,7 +147,7 @@ func init() {
 		return &CPUStats{
 			PerCPU:   true,
 			TotalCPU: true,
-			ps:       newSystemPS(),
+			ps:       system.NewSystemPS(),
 		}
 	})
 }
diff --git a/plugins/inputs/system/cpu_test.go b/plugins/inputs/cpu/cpu_test.go
similarity index 97%
rename from plugins/inputs/system/cpu_test.go
rename to plugins/inputs/cpu/cpu_test.go
index 43825fca..b4a6f87f 100644
--- a/plugins/inputs/system/cpu_test.go
+++ b/plugins/inputs/cpu/cpu_test.go
@@ -1,9 +1,10 @@
-package system
+package cpu
 
 import (
 	"fmt"
 	"testing"
 
+	"github.com/influxdata/telegraf/plugins/inputs/system"
 	"github.com/influxdata/telegraf/testutil"
 	"github.com/shirou/gopsutil/cpu"
 	"github.com/stretchr/testify/assert"
@@ -11,7 +12,7 @@ import (
 )
 
 func TestCPUStats(t *testing.T) {
-	var mps MockPS
+	var mps system.MockPS
 	defer mps.AssertExpectations(t)
 	var acc testutil.Accumulator
 
@@ -68,7 +69,7 @@ func TestCPUStats(t *testing.T) {
 	assertContainsTaggedFloat(t, &acc, "cpu", "time_guest", 3.1, 0, cputags)
 	assertContainsTaggedFloat(t, &acc, "cpu", "time_guest_nice", 0.324, 0, cputags)
 
-	mps2 := MockPS{}
+	mps2 := system.MockPS{}
 	mps2.On("CPUTimes").Return([]cpu.TimesStat{cts2}, nil)
 	cs.ps = &mps2
 
@@ -153,8 +154,8 @@ func assertContainsTaggedFloat(
 // 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 mps system.MockPS
+	var mps2 system.MockPS
 	var acc testutil.Accumulator
 	var err error
 
@@ -188,7 +189,7 @@ func TestCPUCountIncrease(t *testing.T) {
 // 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
+	var mps system.MockPS
 	defer mps.AssertExpectations(t)
 	var acc testutil.Accumulator
 
@@ -230,7 +231,7 @@ func TestCPUTimesDecrease(t *testing.T) {
 	assertContainsTaggedFloat(t, &acc, "cpu", "time_idle", 80, 0, cputags)
 	assertContainsTaggedFloat(t, &acc, "cpu", "time_iowait", 2, 0, cputags)
 
-	mps2 := MockPS{}
+	mps2 := system.MockPS{}
 	mps2.On("CPUTimes").Return([]cpu.TimesStat{cts2}, nil)
 	cs.ps = &mps2
 
@@ -238,7 +239,7 @@ func TestCPUTimesDecrease(t *testing.T) {
 	err = cs.Gather(&acc)
 	require.Error(t, err)
 
-	mps3 := MockPS{}
+	mps3 := system.MockPS{}
 	mps3.On("CPUTimes").Return([]cpu.TimesStat{cts3}, nil)
 	cs.ps = &mps3
 
diff --git a/plugins/inputs/system/DISK_README.md b/plugins/inputs/disk/README.md
similarity index 100%
rename from plugins/inputs/system/DISK_README.md
rename to plugins/inputs/disk/README.md
diff --git a/plugins/inputs/system/disk.go b/plugins/inputs/disk/disk.go
similarity index 95%
rename from plugins/inputs/system/disk.go
rename to plugins/inputs/disk/disk.go
index 17226156..5a30dbec 100644
--- a/plugins/inputs/system/disk.go
+++ b/plugins/inputs/disk/disk.go
@@ -1,4 +1,4 @@
-package system
+package disk
 
 import (
 	"fmt"
@@ -6,10 +6,11 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs/system"
 )
 
 type DiskStats struct {
-	ps PS
+	ps system.PS
 
 	// Legacy support
 	Mountpoints []string
@@ -105,7 +106,7 @@ func parseOptions(opts string) MountOptions {
 }
 
 func init() {
-	ps := newSystemPS()
+	ps := system.NewSystemPS()
 	inputs.Add("disk", func() telegraf.Input {
 		return &DiskStats{ps: ps}
 	})
diff --git a/plugins/inputs/system/disk_test.go b/plugins/inputs/disk/disk_test.go
similarity index 96%
rename from plugins/inputs/system/disk_test.go
rename to plugins/inputs/disk/disk_test.go
index 938ca1b0..c20df41d 100644
--- a/plugins/inputs/system/disk_test.go
+++ b/plugins/inputs/disk/disk_test.go
@@ -1,9 +1,10 @@
-package system
+package disk
 
 import (
 	"os"
 	"testing"
 
+	"github.com/influxdata/telegraf/plugins/inputs/system"
 	"github.com/influxdata/telegraf/testutil"
 	"github.com/shirou/gopsutil/disk"
 	"github.com/stretchr/testify/assert"
@@ -17,7 +18,7 @@ type MockFileInfo struct {
 
 func TestDiskUsage(t *testing.T) {
 	mck := &mock.Mock{}
-	mps := MockPSDisk{&systemPS{&mockDiskUsage{mck}}, mck}
+	mps := system.MockPSDisk{SystemPS: &system.SystemPS{PSDiskDeps: &system.MockDiskUsage{Mock: mck}}, Mock: mck}
 	defer mps.AssertExpectations(t)
 
 	var acc testutil.Accumulator
@@ -229,7 +230,7 @@ func TestDiskUsageHostMountPrefix(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			mck := &mock.Mock{}
-			mps := MockPSDisk{&systemPS{&mockDiskUsage{mck}}, mck}
+			mps := system.MockPSDisk{SystemPS: &system.SystemPS{PSDiskDeps: &system.MockDiskUsage{Mock: mck}}, Mock: mck}
 			defer mps.AssertExpectations(t)
 
 			var acc testutil.Accumulator
@@ -252,7 +253,7 @@ func TestDiskUsageHostMountPrefix(t *testing.T) {
 }
 
 func TestDiskStats(t *testing.T) {
-	var mps MockPS
+	var mps system.MockPS
 	defer mps.AssertExpectations(t)
 	var acc testutil.Accumulator
 	var err error
diff --git a/plugins/inputs/system/DISKIO_README.md b/plugins/inputs/diskio/README.md
similarity index 100%
rename from plugins/inputs/system/DISKIO_README.md
rename to plugins/inputs/diskio/README.md
diff --git a/plugins/inputs/system/diskio.go b/plugins/inputs/diskio/diskio.go
similarity index 97%
rename from plugins/inputs/system/diskio.go
rename to plugins/inputs/diskio/diskio.go
index 21e70d5e..54e74d51 100644
--- a/plugins/inputs/system/diskio.go
+++ b/plugins/inputs/diskio/diskio.go
@@ -1,4 +1,4 @@
-package system
+package diskio
 
 import (
 	"fmt"
@@ -9,6 +9,7 @@ import (
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/filter"
 	"github.com/influxdata/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs/system"
 )
 
 var (
@@ -16,7 +17,7 @@ var (
 )
 
 type DiskIO struct {
-	ps PS
+	ps system.PS
 
 	Devices          []string
 	DeviceTags       []string
@@ -189,7 +190,7 @@ func (s *DiskIO) diskTags(devName string) map[string]string {
 }
 
 func init() {
-	ps := newSystemPS()
+	ps := system.NewSystemPS()
 	inputs.Add("diskio", func() telegraf.Input {
 		return &DiskIO{ps: ps, SkipSerialNumber: true}
 	})
diff --git a/plugins/inputs/system/diskio_linux.go b/plugins/inputs/diskio/diskio_linux.go
similarity index 98%
rename from plugins/inputs/system/diskio_linux.go
rename to plugins/inputs/diskio/diskio_linux.go
index b15f7438..38240a0a 100644
--- a/plugins/inputs/system/diskio_linux.go
+++ b/plugins/inputs/diskio/diskio_linux.go
@@ -1,4 +1,4 @@
-package system
+package diskio
 
 import (
 	"bufio"
diff --git a/plugins/inputs/system/diskio_linux_test.go b/plugins/inputs/diskio/diskio_linux_test.go
similarity index 99%
rename from plugins/inputs/system/diskio_linux_test.go
rename to plugins/inputs/diskio/diskio_linux_test.go
index 96aed211..b18bb67a 100644
--- a/plugins/inputs/system/diskio_linux_test.go
+++ b/plugins/inputs/diskio/diskio_linux_test.go
@@ -1,6 +1,6 @@
 // +build linux
 
-package system
+package diskio
 
 import (
 	"io/ioutil"
diff --git a/plugins/inputs/system/diskio_other.go b/plugins/inputs/diskio/diskio_other.go
similarity index 90%
rename from plugins/inputs/system/diskio_other.go
rename to plugins/inputs/diskio/diskio_other.go
index 0a3abb68..07fb8c3b 100644
--- a/plugins/inputs/system/diskio_other.go
+++ b/plugins/inputs/diskio/diskio_other.go
@@ -1,6 +1,6 @@
 // +build !linux
 
-package system
+package diskio
 
 type diskInfoCache struct{}
 
diff --git a/plugins/inputs/system/diskio_test.go b/plugins/inputs/diskio/diskio_test.go
similarity index 96%
rename from plugins/inputs/system/diskio_test.go
rename to plugins/inputs/diskio/diskio_test.go
index d8b908c3..ac583316 100644
--- a/plugins/inputs/system/diskio_test.go
+++ b/plugins/inputs/diskio/diskio_test.go
@@ -1,8 +1,9 @@
-package system
+package diskio
 
 import (
 	"testing"
 
+	"github.com/influxdata/telegraf/plugins/inputs/system"
 	"github.com/influxdata/telegraf/testutil"
 	"github.com/shirou/gopsutil/disk"
 	"github.com/stretchr/testify/require"
@@ -96,7 +97,7 @@ func TestDiskIO(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			var mps MockPS
+			var mps system.MockPS
 			mps.On("DiskIO").Return(tt.result.stats, tt.result.err)
 
 			var acc testutil.Accumulator
diff --git a/plugins/inputs/system/KERNEL_README.md b/plugins/inputs/kernel/README.md
similarity index 100%
rename from plugins/inputs/system/KERNEL_README.md
rename to plugins/inputs/kernel/README.md
diff --git a/plugins/inputs/system/kernel.go b/plugins/inputs/kernel/kernel.go
similarity index 99%
rename from plugins/inputs/system/kernel.go
rename to plugins/inputs/kernel/kernel.go
index 1b3bc1df..461c9564 100644
--- a/plugins/inputs/system/kernel.go
+++ b/plugins/inputs/kernel/kernel.go
@@ -1,6 +1,6 @@
 // +build linux
 
-package system
+package kernel
 
 import (
 	"bytes"
diff --git a/plugins/inputs/system/kernel_notlinux.go b/plugins/inputs/kernel/kernel_notlinux.go
similarity index 96%
rename from plugins/inputs/system/kernel_notlinux.go
rename to plugins/inputs/kernel/kernel_notlinux.go
index 9053b5c0..05f6e55c 100644
--- a/plugins/inputs/system/kernel_notlinux.go
+++ b/plugins/inputs/kernel/kernel_notlinux.go
@@ -1,6 +1,6 @@
 // +build !linux
 
-package system
+package kernel
 
 import (
 	"github.com/influxdata/telegraf"
diff --git a/plugins/inputs/system/kernel_test.go b/plugins/inputs/kernel/kernel_test.go
similarity index 98%
rename from plugins/inputs/system/kernel_test.go
rename to plugins/inputs/kernel/kernel_test.go
index bf090eb8..d356f438 100644
--- a/plugins/inputs/system/kernel_test.go
+++ b/plugins/inputs/kernel/kernel_test.go
@@ -1,6 +1,6 @@
 // +build linux
 
-package system
+package kernel
 
 import (
 	"io/ioutil"
@@ -168,7 +168,7 @@ const entropyStatFile_Partial = `1024`
 const entropyStatFile_Invalid = ``
 
 func makeFakeStatFile(content []byte) string {
-	tmpfile, err := ioutil.TempFile("", "kerneltest")
+	tmpfile, err := ioutil.TempFile("", "kernel_test")
 	if err != nil {
 		panic(err)
 	}
diff --git a/plugins/inputs/system/KERNEL_VMSTAT_README.md b/plugins/inputs/kernel_vmstat/README.md
similarity index 100%
rename from plugins/inputs/system/KERNEL_VMSTAT_README.md
rename to plugins/inputs/kernel_vmstat/README.md
diff --git a/plugins/inputs/system/kernel_vmstat.go b/plugins/inputs/kernel_vmstat/kernel_vmstat.go
similarity index 98%
rename from plugins/inputs/system/kernel_vmstat.go
rename to plugins/inputs/kernel_vmstat/kernel_vmstat.go
index 197d8118..ffc56d97 100644
--- a/plugins/inputs/system/kernel_vmstat.go
+++ b/plugins/inputs/kernel_vmstat/kernel_vmstat.go
@@ -1,6 +1,6 @@
 // +build linux
 
-package system
+package kernel_vmstat
 
 import (
 	"bytes"
diff --git a/plugins/inputs/kernel_vmstat/kernel_vmstat_notlinux.go b/plugins/inputs/kernel_vmstat/kernel_vmstat_notlinux.go
new file mode 100644
index 00000000..11a5d2e5
--- /dev/null
+++ b/plugins/inputs/kernel_vmstat/kernel_vmstat_notlinux.go
@@ -0,0 +1,3 @@
+// +build !linux
+
+package kernel_vmstat
diff --git a/plugins/inputs/system/kernel_vmstat_test.go b/plugins/inputs/kernel_vmstat/kernel_vmstat_test.go
similarity index 97%
rename from plugins/inputs/system/kernel_vmstat_test.go
rename to plugins/inputs/kernel_vmstat/kernel_vmstat_test.go
index ed0c03e2..bba615a7 100644
--- a/plugins/inputs/system/kernel_vmstat_test.go
+++ b/plugins/inputs/kernel_vmstat/kernel_vmstat_test.go
@@ -1,6 +1,6 @@
 // +build linux
 
-package system
+package kernel_vmstat
 
 import (
 	"io/ioutil"
@@ -13,7 +13,7 @@ import (
 )
 
 func TestFullVmStatProcFile(t *testing.T) {
-	tmpfile := makeFakeStatFile([]byte(vmStatFile_Full))
+	tmpfile := makeFakeVmStatFile([]byte(vmStatFile_Full))
 	defer os.Remove(tmpfile)
 
 	k := KernelVmstat{
@@ -121,7 +121,7 @@ func TestFullVmStatProcFile(t *testing.T) {
 }
 
 func TestPartialVmStatProcFile(t *testing.T) {
-	tmpfile := makeFakeStatFile([]byte(vmStatFile_Partial))
+	tmpfile := makeFakeVmStatFile([]byte(vmStatFile_Partial))
 	defer os.Remove(tmpfile)
 
 	k := KernelVmstat{
@@ -151,7 +151,7 @@ func TestPartialVmStatProcFile(t *testing.T) {
 }
 
 func TestInvalidVmStatProcFile1(t *testing.T) {
-	tmpfile := makeFakeStatFile([]byte(vmStatFile_Invalid))
+	tmpfile := makeFakeVmStatFile([]byte(vmStatFile_Invalid))
 	defer os.Remove(tmpfile)
 
 	k := KernelVmstat{
@@ -164,7 +164,7 @@ func TestInvalidVmStatProcFile1(t *testing.T) {
 }
 
 func TestNoVmStatProcFile(t *testing.T) {
-	tmpfile := makeFakeStatFile([]byte(vmStatFile_Invalid))
+	tmpfile := makeFakeVmStatFile([]byte(vmStatFile_Invalid))
 	os.Remove(tmpfile)
 
 	k := KernelVmstat{
diff --git a/plugins/inputs/system/LINUX_SYSCTL_FS_README.md b/plugins/inputs/linux_sysctl_fs/README.md
similarity index 100%
rename from plugins/inputs/system/LINUX_SYSCTL_FS_README.md
rename to plugins/inputs/linux_sysctl_fs/README.md
diff --git a/plugins/inputs/system/linux_sysctl_fs.go b/plugins/inputs/linux_sysctl_fs/linux_sysctl_fs.go
similarity index 98%
rename from plugins/inputs/system/linux_sysctl_fs.go
rename to plugins/inputs/linux_sysctl_fs/linux_sysctl_fs.go
index 55ebcb66..ed249634 100644
--- a/plugins/inputs/system/linux_sysctl_fs.go
+++ b/plugins/inputs/linux_sysctl_fs/linux_sysctl_fs.go
@@ -1,4 +1,4 @@
-package system
+package linux_sysctl_fs
 
 import (
 	"bytes"
diff --git a/plugins/inputs/system/linux_sysctl_fs_test.go b/plugins/inputs/linux_sysctl_fs/linux_sysctl_fs_test.go
similarity index 98%
rename from plugins/inputs/system/linux_sysctl_fs_test.go
rename to plugins/inputs/linux_sysctl_fs/linux_sysctl_fs_test.go
index 6561465c..78011e28 100644
--- a/plugins/inputs/system/linux_sysctl_fs_test.go
+++ b/plugins/inputs/linux_sysctl_fs/linux_sysctl_fs_test.go
@@ -1,4 +1,4 @@
-package system
+package linux_sysctl_fs
 
 import (
 	"io/ioutil"
diff --git a/plugins/inputs/system/MEM_README.md b/plugins/inputs/mem/README.md
similarity index 100%
rename from plugins/inputs/system/MEM_README.md
rename to plugins/inputs/mem/README.md
diff --git a/plugins/inputs/system/memory.go b/plugins/inputs/mem/memory.go
similarity index 90%
rename from plugins/inputs/system/memory.go
rename to plugins/inputs/mem/memory.go
index b44fabc4..f664dd3f 100644
--- a/plugins/inputs/system/memory.go
+++ b/plugins/inputs/mem/memory.go
@@ -1,14 +1,15 @@
-package system
+package mem
 
 import (
 	"fmt"
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs/system"
 )
 
 type MemStats struct {
-	ps PS
+	ps system.PS
 }
 
 func (_ *MemStats) Description() string {
@@ -43,7 +44,7 @@ func (s *MemStats) Gather(acc telegraf.Accumulator) error {
 }
 
 func init() {
-	ps := newSystemPS()
+	ps := system.NewSystemPS()
 	inputs.Add("mem", func() telegraf.Input {
 		return &MemStats{ps: ps}
 	})
diff --git a/plugins/inputs/system/memory_test.go b/plugins/inputs/mem/memory_test.go
similarity index 93%
rename from plugins/inputs/system/memory_test.go
rename to plugins/inputs/mem/memory_test.go
index 34914db9..ef9af8d2 100644
--- a/plugins/inputs/system/memory_test.go
+++ b/plugins/inputs/mem/memory_test.go
@@ -1,15 +1,16 @@
-package system
+package mem
 
 import (
 	"testing"
 
+	"github.com/influxdata/telegraf/plugins/inputs/system"
 	"github.com/influxdata/telegraf/testutil"
 	"github.com/shirou/gopsutil/mem"
 	"github.com/stretchr/testify/require"
 )
 
 func TestMemStats(t *testing.T) {
-	var mps MockPS
+	var mps system.MockPS
 	var err error
 	defer mps.AssertExpectations(t)
 	var acc testutil.Accumulator
diff --git a/plugins/inputs/system/NETSTAT_README.md b/plugins/inputs/net/NETSTAT_README.md
similarity index 67%
rename from plugins/inputs/system/NETSTAT_README.md
rename to plugins/inputs/net/NETSTAT_README.md
index 636a7e3a..d0f39f5e 100644
--- a/plugins/inputs/system/NETSTAT_README.md
+++ b/plugins/inputs/net/NETSTAT_README.md
@@ -1,10 +1,18 @@
-Telegraf plugin: NETSTAT
+# Netstat Input Plugin
 
-#### Description
+This plugin collects TCP connections state and UDP socket counts by using `lsof`.
 
-The NETSTAT plugin collects TCP connections state and UDP socket counts by using `lsof`.
+### Configuration:
 
-Supported TCP Connection states are follows. 
+``` toml
+# Collect TCP connections state and UDP socket counts
+[[inputs.netstat]]
+  # no configuration
+```
+
+# Measurements:
+
+Supported TCP Connection states are follows.
 
 - established
 - syn_sent
@@ -19,8 +27,6 @@ Supported TCP Connection states are follows.
 - closing
 - none
 
-
-# Measurements:
 ### TCP Connection State measurements:
 
 Meta:
@@ -49,4 +55,3 @@ Meta:
 
 Measurement names:
 - udp_socket
-
diff --git a/plugins/inputs/system/NET_README.md b/plugins/inputs/net/NET_README.md
similarity index 100%
rename from plugins/inputs/system/NET_README.md
rename to plugins/inputs/net/NET_README.md
diff --git a/plugins/inputs/system/net.go b/plugins/inputs/net/net.go
similarity index 95%
rename from plugins/inputs/system/net.go
rename to plugins/inputs/net/net.go
index a7ba5c63..35d4a244 100644
--- a/plugins/inputs/system/net.go
+++ b/plugins/inputs/net/net.go
@@ -1,4 +1,4 @@
-package system
+package net
 
 import (
 	"fmt"
@@ -8,11 +8,12 @@ import (
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/filter"
 	"github.com/influxdata/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs/system"
 )
 
 type NetIOStats struct {
 	filter filter.Filter
-	ps     PS
+	ps     system.PS
 
 	skipChecks          bool
 	IgnoreProtocolStats bool
@@ -119,6 +120,6 @@ func (s *NetIOStats) Gather(acc telegraf.Accumulator) error {
 
 func init() {
 	inputs.Add("net", func() telegraf.Input {
-		return &NetIOStats{ps: newSystemPS()}
+		return &NetIOStats{ps: system.NewSystemPS()}
 	})
 }
diff --git a/plugins/inputs/system/net_test.go b/plugins/inputs/net/net_test.go
similarity index 96%
rename from plugins/inputs/system/net_test.go
rename to plugins/inputs/net/net_test.go
index 83b9bd46..035dbaec 100644
--- a/plugins/inputs/system/net_test.go
+++ b/plugins/inputs/net/net_test.go
@@ -1,16 +1,17 @@
-package system
+package net
 
 import (
 	"syscall"
 	"testing"
 
+	"github.com/influxdata/telegraf/plugins/inputs/system"
 	"github.com/influxdata/telegraf/testutil"
 	"github.com/shirou/gopsutil/net"
 	"github.com/stretchr/testify/require"
 )
 
 func TestNetStats(t *testing.T) {
-	var mps MockPS
+	var mps system.MockPS
 	var err error
 	defer mps.AssertExpectations(t)
 	var acc testutil.Accumulator
diff --git a/plugins/inputs/system/netstat.go b/plugins/inputs/net/netstat.go
similarity index 92%
rename from plugins/inputs/system/netstat.go
rename to plugins/inputs/net/netstat.go
index 1699e080..555b396a 100644
--- a/plugins/inputs/system/netstat.go
+++ b/plugins/inputs/net/netstat.go
@@ -1,4 +1,4 @@
-package system
+package net
 
 import (
 	"fmt"
@@ -6,10 +6,11 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs/system"
 )
 
 type NetStats struct {
-	ps PS
+	ps system.PS
 }
 
 func (_ *NetStats) Description() string {
@@ -66,6 +67,6 @@ func (s *NetStats) Gather(acc telegraf.Accumulator) error {
 
 func init() {
 	inputs.Add("netstat", func() telegraf.Input {
-		return &NetStats{ps: newSystemPS()}
+		return &NetStats{ps: system.NewSystemPS()}
 	})
 }
diff --git a/plugins/inputs/system/PROCESSES_README.md b/plugins/inputs/processes/README.md
similarity index 100%
rename from plugins/inputs/system/PROCESSES_README.md
rename to plugins/inputs/processes/README.md
diff --git a/plugins/inputs/system/processes.go b/plugins/inputs/processes/processes.go
similarity index 97%
rename from plugins/inputs/system/processes.go
rename to plugins/inputs/processes/processes.go
index 9258bc41..c71d72f5 100644
--- a/plugins/inputs/system/processes.go
+++ b/plugins/inputs/processes/processes.go
@@ -1,6 +1,6 @@
 // +build !windows
 
-package system
+package processes
 
 import (
 	"bytes"
@@ -16,6 +16,7 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs/linux_sysctl_fs"
 )
 
 type Processes struct {
@@ -133,7 +134,7 @@ 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(GetHostProc() + "/[0-9]*/stat")
+	filenames, err := filepath.Glob(linux_sysctl_fs.GetHostProc() + "/[0-9]*/stat")
 
 	if err != nil {
 		return err
diff --git a/plugins/inputs/system/processes_test.go b/plugins/inputs/processes/processes_test.go
similarity index 98%
rename from plugins/inputs/system/processes_test.go
rename to plugins/inputs/processes/processes_test.go
index 5401e1a7..27fdf76a 100644
--- a/plugins/inputs/system/processes_test.go
+++ b/plugins/inputs/processes/processes_test.go
@@ -1,4 +1,6 @@
-package system
+// +build !windows
+
+package processes
 
 import (
 	"fmt"
diff --git a/plugins/inputs/processes/processes_windows.go b/plugins/inputs/processes/processes_windows.go
new file mode 100644
index 00000000..32c73f91
--- /dev/null
+++ b/plugins/inputs/processes/processes_windows.go
@@ -0,0 +1,3 @@
+// +build windows
+
+package processes
diff --git a/plugins/inputs/system/SWAP_README.md b/plugins/inputs/swap/README.md
similarity index 100%
rename from plugins/inputs/system/SWAP_README.md
rename to plugins/inputs/swap/README.md
diff --git a/plugins/inputs/system/swap.go b/plugins/inputs/swap/swap.go
similarity index 88%
rename from plugins/inputs/system/swap.go
rename to plugins/inputs/swap/swap.go
index f1f7c8e2..eabb40a0 100644
--- a/plugins/inputs/system/swap.go
+++ b/plugins/inputs/swap/swap.go
@@ -1,14 +1,15 @@
-package system
+package swap
 
 import (
 	"fmt"
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs/system"
 )
 
 type SwapStats struct {
-	ps PS
+	ps system.PS
 }
 
 func (_ *SwapStats) Description() string {
@@ -40,7 +41,7 @@ func (s *SwapStats) Gather(acc telegraf.Accumulator) error {
 }
 
 func init() {
-	ps := newSystemPS()
+	ps := system.NewSystemPS()
 	inputs.Add("swap", func() telegraf.Input {
 		return &SwapStats{ps: ps}
 	})
diff --git a/plugins/inputs/system/swap_test.go b/plugins/inputs/swap/swap_test.go
similarity index 89%
rename from plugins/inputs/system/swap_test.go
rename to plugins/inputs/swap/swap_test.go
index ec9a0fe5..3f97b354 100644
--- a/plugins/inputs/system/swap_test.go
+++ b/plugins/inputs/swap/swap_test.go
@@ -1,15 +1,16 @@
-package system
+package swap
 
 import (
 	"testing"
 
+	"github.com/influxdata/telegraf/plugins/inputs/system"
 	"github.com/influxdata/telegraf/testutil"
 	"github.com/shirou/gopsutil/mem"
 	"github.com/stretchr/testify/require"
 )
 
 func TestSwapStats(t *testing.T) {
-	var mps MockPS
+	var mps system.MockPS
 	var err error
 	defer mps.AssertExpectations(t)
 	var acc testutil.Accumulator
diff --git a/plugins/inputs/system/SYSTEM_README.md b/plugins/inputs/system/README.md
similarity index 100%
rename from plugins/inputs/system/SYSTEM_README.md
rename to plugins/inputs/system/README.md
diff --git a/plugins/inputs/system/mock_PS.go b/plugins/inputs/system/mock_PS.go
index d5093f03..323332f3 100644
--- a/plugins/inputs/system/mock_PS.go
+++ b/plugins/inputs/system/mock_PS.go
@@ -19,11 +19,11 @@ type MockPS struct {
 }
 
 type MockPSDisk struct {
-	*systemPS
+	*SystemPS
 	*mock.Mock
 }
 
-type mockDiskUsage struct {
+type MockDiskUsage struct {
 	*mock.Mock
 }
 
@@ -109,7 +109,7 @@ func (m *MockPS) NetConnections() ([]net.ConnectionStat, error) {
 	return r0, r1
 }
 
-func (m *mockDiskUsage) Partitions(all bool) ([]disk.PartitionStat, error) {
+func (m *MockDiskUsage) Partitions(all bool) ([]disk.PartitionStat, error) {
 	ret := m.Called(all)
 
 	r0 := ret.Get(0).([]disk.PartitionStat)
@@ -118,12 +118,12 @@ func (m *mockDiskUsage) Partitions(all bool) ([]disk.PartitionStat, error) {
 	return r0, r1
 }
 
-func (m *mockDiskUsage) OSGetenv(key string) string {
+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) {
+func (m *MockDiskUsage) OSStat(name string) (os.FileInfo, error) {
 	ret := m.Called(name)
 
 	r0 := ret.Get(0).(os.FileInfo)
@@ -132,7 +132,7 @@ func (m *mockDiskUsage) OSStat(name string) (os.FileInfo, error) {
 	return r0, r1
 }
 
-func (m *mockDiskUsage) PSDiskUsage(path string) (*disk.UsageStat, error) {
+func (m *MockDiskUsage) PSDiskUsage(path string) (*disk.UsageStat, error) {
 	ret := m.Called(path)
 
 	r0 := ret.Get(0).(*disk.UsageStat)
diff --git a/plugins/inputs/system/ps.go b/plugins/inputs/system/ps.go
index 81161ae6..038e2a0a 100644
--- a/plugins/inputs/system/ps.go
+++ b/plugins/inputs/system/ps.go
@@ -39,17 +39,17 @@ func add(acc telegraf.Accumulator,
 	}
 }
 
-func newSystemPS() *systemPS {
-	return &systemPS{&systemPSDisk{}}
+func NewSystemPS() *SystemPS {
+	return &SystemPS{&SystemPSDisk{}}
 }
 
-type systemPS struct {
+type SystemPS struct {
 	PSDiskDeps
 }
 
-type systemPSDisk struct{}
+type SystemPSDisk struct{}
 
-func (s *systemPS) CPUTimes(perCPU, totalCPU bool) ([]cpu.TimesStat, error) {
+func (s *SystemPS) CPUTimes(perCPU, totalCPU bool) ([]cpu.TimesStat, error) {
 	var cpuTimes []cpu.TimesStat
 	if perCPU {
 		if perCPUTimes, err := cpu.Times(true); err == nil {
@@ -68,7 +68,7 @@ func (s *systemPS) CPUTimes(perCPU, totalCPU bool) ([]cpu.TimesStat, error) {
 	return cpuTimes, nil
 }
 
-func (s *systemPS) DiskUsage(
+func (s *SystemPS) DiskUsage(
 	mountPointFilter []string,
 	fstypeExclude []string,
 ) ([]*disk.UsageStat, []*disk.PartitionStat, error) {
@@ -139,19 +139,19 @@ func (s *systemPS) DiskUsage(
 	return usage, partitions, nil
 }
 
-func (s *systemPS) NetProto() ([]net.ProtoCountersStat, error) {
+func (s *SystemPS) NetProto() ([]net.ProtoCountersStat, error) {
 	return net.ProtoCounters(nil)
 }
 
-func (s *systemPS) NetIO() ([]net.IOCountersStat, error) {
+func (s *SystemPS) NetIO() ([]net.IOCountersStat, error) {
 	return net.IOCounters(true)
 }
 
-func (s *systemPS) NetConnections() ([]net.ConnectionStat, error) {
+func (s *SystemPS) NetConnections() ([]net.ConnectionStat, error) {
 	return net.Connections("all")
 }
 
-func (s *systemPS) DiskIO(names []string) (map[string]disk.IOCountersStat, error) {
+func (s *SystemPS) DiskIO(names []string) (map[string]disk.IOCountersStat, error) {
 	m, err := disk.IOCounters(names...)
 	if err == internal.NotImplementedError {
 		return nil, nil
@@ -160,26 +160,26 @@ func (s *systemPS) DiskIO(names []string) (map[string]disk.IOCountersStat, error
 	return m, err
 }
 
-func (s *systemPS) VMStat() (*mem.VirtualMemoryStat, error) {
+func (s *SystemPS) VMStat() (*mem.VirtualMemoryStat, error) {
 	return mem.VirtualMemory()
 }
 
-func (s *systemPS) SwapStat() (*mem.SwapMemoryStat, error) {
+func (s *SystemPS) SwapStat() (*mem.SwapMemoryStat, error) {
 	return mem.SwapMemory()
 }
 
-func (s *systemPSDisk) Partitions(all bool) ([]disk.PartitionStat, error) {
+func (s *SystemPSDisk) Partitions(all bool) ([]disk.PartitionStat, error) {
 	return disk.Partitions(all)
 }
 
-func (s *systemPSDisk) OSGetenv(key string) string {
+func (s *SystemPSDisk) OSGetenv(key string) string {
 	return os.Getenv(key)
 }
 
-func (s *systemPSDisk) OSStat(name string) (os.FileInfo, error) {
+func (s *SystemPSDisk) OSStat(name string) (os.FileInfo, error) {
 	return os.Stat(name)
 }
 
-func (s *systemPSDisk) PSDiskUsage(path string) (*disk.UsageStat, error) {
+func (s *SystemPSDisk) PSDiskUsage(path string) (*disk.UsageStat, error) {
 	return disk.Usage(path)
 }

From 9ebf16636d42a5bd26888eb284763e70c8daefaa Mon Sep 17 00:00:00 2001
From: maxunt <max.untrecht@gmail.com>
Date: Wed, 11 Jul 2018 17:29:23 -0700
Subject: [PATCH 614/835] Add parse_multivalue to collectd parser (#4403)

---
 docs/DATA_FORMATS_INPUT.md              |   6 ++
 internal/config/config.go               |   9 ++
 plugins/parsers/collectd/parser.go      | 109 +++++++++++++++++-------
 plugins/parsers/collectd/parser_test.go |  20 ++++-
 plugins/parsers/registry.go             |   8 +-
 5 files changed, 117 insertions(+), 35 deletions(-)

diff --git a/docs/DATA_FORMATS_INPUT.md b/docs/DATA_FORMATS_INPUT.md
index c1192e72..88282c84 100644
--- a/docs/DATA_FORMATS_INPUT.md
+++ b/docs/DATA_FORMATS_INPUT.md
@@ -479,6 +479,12 @@ You can also change the path to the typesdb or add additional typesdb using
   collectd_security_level = "encrypt"
   ## Path of to TypesDB specifications
   collectd_typesdb = ["/usr/share/collectd/types.db"]
+
+  # Multi-value plugins can be handled two ways.  
+  # "split" will parse and store the multi-value plugin data into separate measurements
+  # "join" will parse and store the multi-value plugin as a single multi-value measurement.  
+  # "split" is the default behavior for backward compatability with previous versions of influxdb.
+  collectd_parse_multivalue = "split"
 ```
 
 # Dropwizard:
diff --git a/internal/config/config.go b/internal/config/config.go
index 8a31c271..5b3e5345 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -1285,6 +1285,14 @@ func buildParser(name string, tbl *ast.Table) (parsers.Parser, error) {
 		}
 	}
 
+	if node, ok := tbl.Fields["collectd_parse_multivalue"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if str, ok := kv.Value.(*ast.String); ok {
+				c.CollectdSplit = 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 {
@@ -1348,6 +1356,7 @@ 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, "collectd_parse_multivalue")
 	delete(tbl.Fields, "dropwizard_metric_registry_path")
 	delete(tbl.Fields, "dropwizard_time_path")
 	delete(tbl.Fields, "dropwizard_time_format")
diff --git a/plugins/parsers/collectd/parser.go b/plugins/parsers/collectd/parser.go
index 20525610..6b7fbd75 100644
--- a/plugins/parsers/collectd/parser.go
+++ b/plugins/parsers/collectd/parser.go
@@ -21,7 +21,10 @@ type CollectdParser struct {
 	// DefaultTags will be added to every parsed metric
 	DefaultTags map[string]string
 
-	popts network.ParseOpts
+	//whether or not to split multi value metric into multiple metrics
+	//default value is split
+	ParseMultiValue string
+	popts           network.ParseOpts
 }
 
 func (p *CollectdParser) SetParseOpts(popts *network.ParseOpts) {
@@ -32,6 +35,7 @@ func NewCollectdParser(
 	authFile string,
 	securityLevel string,
 	typesDB []string,
+	split string,
 ) (*CollectdParser, error) {
 	popts := network.ParseOpts{}
 
@@ -64,7 +68,8 @@ func NewCollectdParser(
 		}
 	}
 
-	parser := CollectdParser{popts: popts}
+	parser := CollectdParser{popts: popts,
+		ParseMultiValue: split}
 	return &parser, nil
 }
 
@@ -76,7 +81,7 @@ func (p *CollectdParser) Parse(buf []byte) ([]telegraf.Metric, error) {
 
 	metrics := []telegraf.Metric{}
 	for _, valueList := range valueLists {
-		metrics = append(metrics, UnmarshalValueList(valueList)...)
+		metrics = append(metrics, UnmarshalValueList(valueList, p.ParseMultiValue)...)
 	}
 
 	if len(p.DefaultTags) > 0 {
@@ -111,47 +116,91 @@ func (p *CollectdParser) SetDefaultTags(tags map[string]string) {
 }
 
 // UnmarshalValueList translates a ValueList into a Telegraf metric.
-func UnmarshalValueList(vl *api.ValueList) []telegraf.Metric {
+func UnmarshalValueList(vl *api.ValueList, multiValue string) []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))
+
+	//set multiValue to default "split" if nothing is specified
+	if multiValue == "" {
+		multiValue = "split"
+	}
+	switch multiValue {
+	case "split":
+		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)
+		}
+	case "join":
+		name := vl.Identifier.Plugin
 		tags := make(map[string]string)
 		fields := make(map[string]interface{})
+		for i := range vl.Values {
+			switch value := vl.Values[i].(type) {
+			case api.Gauge:
+				fields[vl.DSName(i)] = float64(value)
+			case api.Derive:
+				fields[vl.DSName(i)] = float64(value)
+			case api.Counter:
+				fields[vl.DSName(i)] = float64(value)
+			}
 
-		// 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
+			}
 		}
 
-		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)
+	default:
+		log.Printf("parse-multi-value config can only be 'split' or 'join'")
 	}
 	return metrics
 }
diff --git a/plugins/parsers/collectd/parser_test.go b/plugins/parsers/collectd/parser_test.go
index 3aad0401..afd58ec7 100644
--- a/plugins/parsers/collectd/parser_test.go
+++ b/plugins/parsers/collectd/parser_test.go
@@ -6,6 +6,7 @@ import (
 
 	"collectd.org/api"
 	"collectd.org/network"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/influxdata/telegraf"
@@ -76,7 +77,7 @@ var multiMetric = testCase{
 				api.Derive(42),
 				api.Gauge(42),
 			},
-			DSNames: []string(nil),
+			DSNames: []string{"t1", "t2"},
 		},
 	},
 	[]metricData{
@@ -108,7 +109,7 @@ var multiMetric = testCase{
 }
 
 func TestNewCollectdParser(t *testing.T) {
-	parser, err := NewCollectdParser("", "", []string{})
+	parser, err := NewCollectdParser("", "", []string{}, "join")
 	require.Nil(t, err)
 	require.Equal(t, parser.popts.SecurityLevel, network.None)
 	require.NotNil(t, parser.popts.PasswordLookup)
@@ -133,6 +134,19 @@ func TestParse(t *testing.T) {
 	}
 }
 
+func TestParseMultiValueSplit(t *testing.T) {
+	buf, err := writeValueList(multiMetric.vl)
+	require.Nil(t, err)
+	bytes, err := buf.Bytes()
+	require.Nil(t, err)
+
+	parser := &CollectdParser{ParseMultiValue: "split"}
+	metrics, err := parser.Parse(bytes)
+	require.Nil(t, err)
+
+	assert.Equal(t, 2, len(metrics))
+}
+
 func TestParse_DefaultTags(t *testing.T) {
 	buf, err := writeValueList(singleMetric.vl)
 	require.Nil(t, err)
@@ -266,7 +280,7 @@ func TestParseLine(t *testing.T) {
 	bytes, err := buf.Bytes()
 	require.Nil(t, err)
 
-	parser, err := NewCollectdParser("", "", []string{})
+	parser, err := NewCollectdParser("", "", []string{}, "split")
 	require.Nil(t, err)
 	metric, err := parser.ParseLine(string(bytes))
 	require.Nil(t, err)
diff --git a/plugins/parsers/registry.go b/plugins/parsers/registry.go
index 58fce172..ac6bbbda 100644
--- a/plugins/parsers/registry.go
+++ b/plugins/parsers/registry.go
@@ -66,6 +66,9 @@ type Config struct {
 	// Dataset specification for collectd
 	CollectdTypesDB []string
 
+	// whether to split or join multivalue metrics
+	CollectdSplit string
+
 	// DataType only applies to value, this will be the type to parse value to
 	DataType string
 
@@ -109,7 +112,7 @@ func NewParser(config *Config) (Parser, error) {
 			config.Templates, config.DefaultTags)
 	case "collectd":
 		parser, err = NewCollectdParser(config.CollectdAuthFile,
-			config.CollectdSecurityLevel, config.CollectdTypesDB)
+			config.CollectdSecurityLevel, config.CollectdTypesDB, config.CollectdSplit)
 	case "dropwizard":
 		parser, err = NewDropwizardParser(
 			config.DropwizardMetricRegistryPath,
@@ -172,8 +175,9 @@ func NewCollectdParser(
 	authFile string,
 	securityLevel string,
 	typesDB []string,
+	split string,
 ) (Parser, error) {
-	return collectd.NewCollectdParser(authFile, securityLevel, typesDB)
+	return collectd.NewCollectdParser(authFile, securityLevel, typesDB, split)
 }
 
 func NewDropwizardParser(

From fb7c1d775b7e530d03f33bf1ae7fbb1ea731918c Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 11 Jul 2018 17:31:11 -0700
Subject: [PATCH 615/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd0c262a..58626e09 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@
 - [#4362](https://github.com/influxdata/telegraf/pull/4362): Add mongo document and connection metrics.
 - [#3772](https://github.com/influxdata/telegraf/pull/3772): Add Enum Processor.
 - [#4386](https://github.com/influxdata/telegraf/pull/4386): Add user tag to procstat input.
+- [#4403](https://github.com/influxdata/telegraf/pull/4403): Add support for multivalue metrics to collectd parser.
 
 ## v1.7.2 [unreleased]
 

From 9e77bfc3edcedc67bbab7b66ed978ba9d085db08 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 11 Jul 2018 17:33:27 -0700
Subject: [PATCH 616/835] Fix potential deadlock by not calling AddMetric
 concurrently (#4404)

---
 agent/agent.go | 100 +++++++++++++++++++++++++------------------------
 1 file changed, 52 insertions(+), 48 deletions(-)

diff --git a/agent/agent.go b/agent/agent.go
index 6eb9505e..6f7b540f 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -241,14 +241,12 @@ 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, 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)
-
-	// create an output metric channel and a gorouting that continuously passes
-	// each metric onto the output plugins & aggregators.
-	outMetricC := make(chan telegraf.Metric, 100)
+func (a *Agent) flusher(
+	shutdown chan struct{},
+	metricC chan telegraf.Metric,
+	aggMetricC chan telegraf.Metric,
+	outMetricC chan telegraf.Metric,
+) error {
 	var wg sync.WaitGroup
 	wg.Add(1)
 	go func() {
@@ -257,56 +255,67 @@ func (a *Agent) flusher(shutdown chan struct{}, metricC chan telegraf.Metric, ag
 			select {
 			case <-shutdown:
 				if len(outMetricC) > 0 {
-					// keep going until outMetricC is flushed
+					// keep going until channel is empty
 					continue
 				}
 				return
-			case m := <-outMetricC:
-				// if dropOriginal is set to true, then we will only send this
-				// metric to the aggregators, not the outputs.
-				var dropOriginal bool
-				for _, agg := range a.Config.Aggregators {
-					if ok := agg.Add(m.Copy()); ok {
-						dropOriginal = true
-					}
-				}
-				if !dropOriginal {
-					for i, o := range a.Config.Outputs {
-						if i == len(a.Config.Outputs)-1 {
-							o.AddMetric(m)
-						} else {
-							o.AddMetric(m.Copy())
-						}
+			case metric := <-outMetricC:
+				for i, o := range a.Config.Outputs {
+					if i == len(a.Config.Outputs)-1 {
+						o.AddMetric(metric)
+					} else {
+						o.AddMetric(metric.Copy())
 					}
 				}
 			}
 		}
 	}()
 
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
+		for metric := range aggMetricC {
+			// Apply Processors
+			metrics := []telegraf.Metric{metric}
+			for _, processor := range a.Config.Processors {
+				metrics = processor.Apply(metrics...)
+			}
+			outMetricC <- metric
+		}
+	}()
+
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
 		for {
 			select {
 			case <-shutdown:
-				if len(aggC) > 0 {
-					// keep going until aggC is flushed
+				if len(metricC) > 0 {
+					// keep going until channel is empty
 					continue
 				}
+				close(aggMetricC)
 				return
-			case metric := <-aggC:
+			case metric := <-metricC:
+				// Apply Processors
 				metrics := []telegraf.Metric{metric}
 				for _, processor := range a.Config.Processors {
 					metrics = processor.Apply(metrics...)
 				}
-				for _, m := range metrics {
-					for i, o := range a.Config.Outputs {
-						if i == len(a.Config.Outputs)-1 {
-							o.AddMetric(m)
-						} else {
-							o.AddMetric(m.Copy())
+
+				for _, metric := range metrics {
+					// Apply Aggregators
+					var dropOriginal bool
+					for _, agg := range a.Config.Aggregators {
+						if ok := agg.Add(metric.Copy()); ok {
+							dropOriginal = true
 						}
 					}
+
+					// Forward metric to Outputs
+					if !dropOriginal {
+						outMetricC <- metric
+					}
 				}
 			}
 		}
@@ -335,16 +344,6 @@ func (a *Agent) flusher(shutdown chan struct{}, metricC chan telegraf.Metric, ag
 						" already a flush ongoing.")
 				}
 			}()
-		case metric := <-metricC:
-			// NOTE potential bottleneck here as we put each metric through the
-			// processors serially.
-			mS := []telegraf.Metric{metric}
-			for _, processor := range a.Config.Processors {
-				mS = processor.Apply(mS...)
-			}
-			for _, m := range mS {
-				outMetricC <- m
-			}
 		}
 	}
 }
@@ -358,9 +357,14 @@ func (a *Agent) Run(shutdown chan struct{}) error {
 		a.Config.Agent.Interval.Duration, a.Config.Agent.Quiet,
 		a.Config.Agent.Hostname, a.Config.Agent.FlushInterval.Duration)
 
-	// channel shared between all input threads for accumulating metrics
+	// Channel shared between all input threads for accumulating metrics
 	metricC := make(chan telegraf.Metric, 100)
-	aggC := make(chan telegraf.Metric, 100)
+
+	// Channel for metrics ready to be output
+	outMetricC := make(chan telegraf.Metric, 100)
+
+	// Channel for aggregated metrics
+	aggMetricC := make(chan telegraf.Metric, 100)
 
 	// Round collection to nearest interval by sleeping
 	if a.Config.Agent.RoundInterval {
@@ -371,7 +375,7 @@ func (a *Agent) Run(shutdown chan struct{}) error {
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
-		if err := a.flusher(shutdown, metricC, aggC); err != nil {
+		if err := a.flusher(shutdown, metricC, aggMetricC, outMetricC); err != nil {
 			log.Printf("E! Flusher routine failed, exiting: %s\n", err.Error())
 			close(shutdown)
 		}
@@ -381,7 +385,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, aggC)
+			acc := NewAccumulator(agg, aggMetricC)
 			acc.SetPrecision(a.Config.Agent.Precision.Duration,
 				a.Config.Agent.Interval.Duration)
 			agg.Run(acc, shutdown)

From 5150d565d7d6bb268a49560825851cb433a65f10 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 11 Jul 2018 22:57:46 -0700
Subject: [PATCH 617/835] Fix several build issues (#4412)

---
 CONTRIBUTING.md |  2 +-
 Makefile        | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9a89e3cb..66aa92cc 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -31,7 +31,7 @@ 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 -u github.com/golang/dep/cmd/dep`
-2. `dep ensure`
+2. `dep ensure -vendor-only`
 3. `dep ensure -add github.com/[dependency]/[new-package]`
 
 ## Input Plugins
diff --git a/Makefile b/Makefile
index 2f3fcece..b4f89c79 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,14 @@
+ifeq ($(SHELL), cmd)
+	VERSION := $(shell git describe --exact-match --tags 2>nil)
+	HOME := $(HOMEPATH)
+else ifeq ($(SHELL), sh.exe)
+	VERSION := $(shell git describe --exact-match --tags 2>nil)
+	HOME := $(HOMEPATH)
+else
+	VERSION := $(shell git describe --exact-match --tags 2>/dev/null)
+endif
+
 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 git ls-files '*.go')
@@ -8,8 +17,10 @@ BUILDFLAGS ?=
 
 ifdef GOBIN
 PATH := $(GOBIN):$(PATH)
-else
+else ifdef GOPATH
 PATH := $(subst :,/bin:,$(GOPATH))/bin:$(PATH)
+else
+PATH := $(HOME)/go/bin:$(PATH)
 endif
 
 LDFLAGS := $(LDFLAGS) -X main.commit=$(COMMIT) -X main.branch=$(BRANCH)
@@ -24,7 +35,7 @@ all:
 deps:
 	go get -u github.com/golang/lint/golint
 	go get -u github.com/golang/dep/cmd/dep
-	dep ensure
+	dep ensure -vendor-only
 
 telegraf:
 	go build -ldflags "$(LDFLAGS)" ./cmd/telegraf

From 0812ffdace46c00a5d370b68001f86b9164f9460 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 12 Jul 2018 12:25:04 -0700
Subject: [PATCH 618/835] Update links to system plugins

---
 README.md | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 679e2847..414ab2da 100644
--- a/README.md
+++ b/README.md
@@ -140,7 +140,10 @@ configuration options.
 * [conntrack](./plugins/inputs/conntrack)
 * [couchbase](./plugins/inputs/couchbase)
 * [couchdb](./plugins/inputs/couchdb)
+* [cpu](./plugins/inputs/cpu)
 * [DC/OS](./plugins/inputs/dcos)
+* [diskio](./plugins/inputs/diskio)
+* [disk](./plugins/inputs/disk)
 * [disque](./plugins/inputs/disque)
 * [dmcache](./plugins/inputs/dmcache)
 * [dns query time](./plugins/inputs/dns_query)
@@ -168,18 +171,24 @@ configuration options.
 * [jolokia2](./plugins/inputs/jolokia2) (java, cassandra, kafka)
 - [jti_openconfig_telemetry](./plugins/inputs/jti_openconfig_telemetry)
 * [kapacitor](./plugins/inputs/kapacitor)
+* [kernel](./plugins/inputs/kernel)
+* [kernel_vmstat](./plugins/inputs/kernel_vmstat)
 * [kubernetes](./plugins/inputs/kubernetes)
 * [leofs](./plugins/inputs/leofs)
+* [linux_sysctl_fs](./plugins/inputs/linux_sysctl_fs)
 * [lustre2](./plugins/inputs/lustre2)
 * [mailchimp](./plugins/inputs/mailchimp)
 * [mcrouter](./plugins/inputs/mcrouter)
 * [memcached](./plugins/inputs/memcached)
+* [mem](./plugins/inputs/mem)
 * [mesos](./plugins/inputs/mesos)
 * [minecraft](./plugins/inputs/minecraft)
 * [mongodb](./plugins/inputs/mongodb)
 * [mysql](./plugins/inputs/mysql)
 * [nats](./plugins/inputs/nats)
+* [net](./plugins/inputs/net)
 * [net_response](./plugins/inputs/net_response)
+* [netstat](./plugins/inputs/netstat)
 * [nginx](./plugins/inputs/nginx)
 * [nginx_plus](./plugins/inputs/nginx_plus)
 * [nsq](./plugins/inputs/nsq)
@@ -196,6 +205,7 @@ configuration options.
 * [postgresql_extensible](./plugins/inputs/postgresql_extensible)
 * [postgresql](./plugins/inputs/postgresql)
 * [powerdns](./plugins/inputs/powerdns)
+* [processes](./plugins/inputs/processes)
 * [procstat](./plugins/inputs/procstat)
 * [prometheus](./plugins/inputs/prometheus) (can be used for [Caddy server](./plugins/inputs/prometheus/README.md#usage-for-caddy-http-server))
 * [puppetagent](./plugins/inputs/puppetagent)
@@ -211,7 +221,9 @@ configuration options.
 * [snmp_legacy](./plugins/inputs/snmp_legacy)
 * [solr](./plugins/inputs/solr)
 * [sql server](./plugins/inputs/sqlserver) (microsoft)
+* [swap](./plugins/inputs/swap)
 * [syslog](./plugins/inputs/syslog)
+* [system](./plugins/inputs/system)
 * [teamspeak](./plugins/inputs/teamspeak)
 * [tengine](./plugins/inputs/tengine)
 * [tomcat](./plugins/inputs/tomcat)
@@ -223,18 +235,6 @@ configuration options.
 * [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
-    * mem
-    * net
-    * netstat
-    * disk
-    * diskio
-    * swap
-    * processes
-    * kernel (/proc/stat)
-    * kernel (/proc/vmstat)
-    * linux_sysctl_fs (/proc/sys/fs)
 
 Telegraf can also collect metrics via the following service plugins:
 

From a5c4cac8f3ef4b9ba0c5005073c0c3ced1179bfb Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 12 Jul 2018 12:25:27 -0700
Subject: [PATCH 619/835] Fix typesetting issue in README

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

diff --git a/README.md b/README.md
index 414ab2da..0f4e5656 100644
--- a/README.md
+++ b/README.md
@@ -169,7 +169,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)
+* [jti_openconfig_telemetry](./plugins/inputs/jti_openconfig_telemetry)
 * [kapacitor](./plugins/inputs/kapacitor)
 * [kernel](./plugins/inputs/kernel)
 * [kernel_vmstat](./plugins/inputs/kernel_vmstat)

From 8ff63a4b79d84df74bb8d47cdd956f743422634a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 12 Jul 2018 12:26:46 -0700
Subject: [PATCH 620/835] Merge service inputs with main input listing

---
 README.md | 49 +++++++++++++++++++++++--------------------------
 1 file changed, 23 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index 0f4e5656..4fc4db32 100644
--- a/README.md
+++ b/README.md
@@ -131,13 +131,13 @@ configuration options.
 * [aws cloudwatch](./plugins/inputs/cloudwatch)
 * [bcache](./plugins/inputs/bcache)
 * [bond](./plugins/inputs/bond)
-* [cassandra](./plugins/inputs/cassandra) (deprecated, use [jolokia2](./plugins/inputs/jolokia2))
 * [burrow](./plugins/inputs/burrow)
+* [cassandra](./plugins/inputs/cassandra) (deprecated, use [jolokia2](./plugins/inputs/jolokia2))
 * [ceph](./plugins/inputs/ceph)
 * [cgroup](./plugins/inputs/cgroup)
 * [chrony](./plugins/inputs/chrony)
-* [consul](./plugins/inputs/consul)
 * [conntrack](./plugins/inputs/conntrack)
+* [consul](./plugins/inputs/consul)
 * [couchbase](./plugins/inputs/couchbase)
 * [couchdb](./plugins/inputs/couchdb)
 * [cpu](./plugins/inputs/cpu)
@@ -158,24 +158,27 @@ configuration options.
 * [graylog](./plugins/inputs/graylog)
 * [haproxy](./plugins/inputs/haproxy)
 * [hddtemp](./plugins/inputs/hddtemp)
+* [httpjson](./plugins/inputs/httpjson) (generic JSON-emitting http service plugin)
+* [http_listener](./plugins/inputs/http_listener)
 * [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)
 * [influxdb](./plugins/inputs/influxdb)
+* [internal](./plugins/inputs/internal)
 * [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))
+* [iptables](./plugins/inputs/iptables)
 * [jolokia2](./plugins/inputs/jolokia2) (java, cassandra, kafka)
+* [jolokia](./plugins/inputs/jolokia) (deprecated, use [jolokia2](./plugins/inputs/jolokia2))
 * [jti_openconfig_telemetry](./plugins/inputs/jti_openconfig_telemetry)
+* [kafka_consumer](./plugins/inputs/kafka_consumer)
 * [kapacitor](./plugins/inputs/kapacitor)
 * [kernel](./plugins/inputs/kernel)
 * [kernel_vmstat](./plugins/inputs/kernel_vmstat)
 * [kubernetes](./plugins/inputs/kubernetes)
 * [leofs](./plugins/inputs/leofs)
 * [linux_sysctl_fs](./plugins/inputs/linux_sysctl_fs)
+* [logparser](./plugins/inputs/logparser)
 * [lustre2](./plugins/inputs/lustre2)
 * [mailchimp](./plugins/inputs/mailchimp)
 * [mcrouter](./plugins/inputs/mcrouter)
@@ -184,13 +187,16 @@ configuration options.
 * [mesos](./plugins/inputs/mesos)
 * [minecraft](./plugins/inputs/minecraft)
 * [mongodb](./plugins/inputs/mongodb)
+* [mqtt_consumer](./plugins/inputs/mqtt_consumer)
 * [mysql](./plugins/inputs/mysql)
+* [nats_consumer](./plugins/inputs/nats_consumer)
 * [nats](./plugins/inputs/nats)
 * [net](./plugins/inputs/net)
 * [net_response](./plugins/inputs/net_response)
 * [netstat](./plugins/inputs/netstat)
 * [nginx](./plugins/inputs/nginx)
 * [nginx_plus](./plugins/inputs/nginx_plus)
+* [nsq_consumer](./plugins/inputs/nsq_consumer)
 * [nsq](./plugins/inputs/nsq)
 * [nstat](./plugins/inputs/nstat)
 * [ntpq](./plugins/inputs/ntpq)
@@ -217,38 +223,25 @@ configuration options.
 * [salesforce](./plugins/inputs/salesforce)
 * [sensors](./plugins/inputs/sensors)
 * [smart](./plugins/inputs/smart)
-* [snmp](./plugins/inputs/snmp)
 * [snmp_legacy](./plugins/inputs/snmp_legacy)
+* [snmp](./plugins/inputs/snmp)
+* [socket_listener](./plugins/inputs/socket_listener)
 * [solr](./plugins/inputs/solr)
 * [sql server](./plugins/inputs/sqlserver) (microsoft)
+* [statsd](./plugins/inputs/statsd)
 * [swap](./plugins/inputs/swap)
 * [syslog](./plugins/inputs/syslog)
+* [sysstat](./plugins/inputs/sysstat)
 * [system](./plugins/inputs/system)
+* [tail](./plugins/inputs/tail)
+* [tcp_listener](./plugins/inputs/socket_listener)
 * [teamspeak](./plugins/inputs/teamspeak)
 * [tengine](./plugins/inputs/tengine)
 * [tomcat](./plugins/inputs/tomcat)
 * [twemproxy](./plugins/inputs/twemproxy)
+* [udp_listener](./plugins/inputs/socket_listener)
 * [unbound](./plugins/inputs/unbound)
 * [varnish](./plugins/inputs/varnish)
-* [zfs](./plugins/inputs/zfs)
-* [zookeeper](./plugins/inputs/zookeeper)
-* [win_perf_counters](./plugins/inputs/win_perf_counters) (windows performance counters)
-* [win_services](./plugins/inputs/win_services)
-* [sysstat](./plugins/inputs/sysstat)
-
-Telegraf can also collect metrics via the following service plugins:
-
-* [http_listener](./plugins/inputs/http_listener)
-* [kafka_consumer](./plugins/inputs/kafka_consumer)
-* [mqtt_consumer](./plugins/inputs/mqtt_consumer)
-* [nats_consumer](./plugins/inputs/nats_consumer)
-* [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/socket_listener)
-* [udp_listener](./plugins/inputs/socket_listener)
 * [webhooks](./plugins/inputs/webhooks)
   * [filestack](./plugins/inputs/webhooks/filestack)
   * [github](./plugins/inputs/webhooks/github)
@@ -256,7 +249,11 @@ Telegraf can also collect metrics via the following service plugins:
   * [papertrail](./plugins/inputs/webhooks/papertrail)
   * [particle](./plugins/inputs/webhooks/particle)
   * [rollbar](./plugins/inputs/webhooks/rollbar)
+* [win_perf_counters](./plugins/inputs/win_perf_counters) (windows performance counters)
+* [win_services](./plugins/inputs/win_services)
+* [zfs](./plugins/inputs/zfs)
 * [zipkin](./plugins/inputs/zipkin)
+* [zookeeper](./plugins/inputs/zookeeper)
 
 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 0da94a1b3c21b92e3e50f91c3de97d8175f5a77d Mon Sep 17 00:00:00 2001
From: Greg <g2linton@gmail.com>
Date: Thu, 12 Jul 2018 19:41:49 -0600
Subject: [PATCH 621/835] Fix incorrect container name gathered in docker input
 (#4391)

---
 plugins/inputs/docker/docker.go          |  27 ++--
 plugins/inputs/docker/docker_test.go     | 173 ++++++++---------------
 plugins/inputs/docker/docker_testdata.go |  34 ++++-
 3 files changed, 107 insertions(+), 127 deletions(-)

diff --git a/plugins/inputs/docker/docker.go b/plugins/inputs/docker/docker.go
index aa1de747..5d4cb0de 100644
--- a/plugins/inputs/docker/docker.go
+++ b/plugins/inputs/docker/docker.go
@@ -365,10 +365,18 @@ func (d *Docker) gatherContainer(
 ) error {
 	var v *types.StatsJSON
 	// Parse container name
-	cname := "unknown"
-	if len(container.Names) > 0 {
-		// Not sure what to do with other names, just take the first.
-		cname = strings.TrimPrefix(container.Names[0], "/")
+	var cname string
+	for _, name := range container.Names {
+		trimmedName := strings.TrimPrefix(name, "/")
+		match := d.containerFilter.Match(trimmedName)
+		if match {
+			cname = trimmedName
+			break
+		}
+	}
+
+	if cname == "" {
+		return nil
 	}
 
 	// the image name sometimes has a version part, or a private repo
@@ -391,10 +399,6 @@ func (d *Docker) gatherContainer(
 		"container_version": imageVersion,
 	}
 
-	if !d.containerFilter.Match(cname) {
-		return nil
-	}
-
 	ctx, cancel := context.WithTimeout(context.Background(), d.Timeout.Duration)
 	defer cancel()
 	r, err := d.client.ContainerStats(ctx, container.ID, false)
@@ -411,6 +415,9 @@ func (d *Docker) gatherContainer(
 	}
 	daemonOSType := r.OSType
 
+	// use common (printed at `docker ps`) name for container
+	tags["container_name"] = strings.TrimPrefix(v.Name, "/")
+
 	// Add labels to tags
 	for k, label := range container.Labels {
 		if d.labelFilter.Match(k) {
@@ -461,12 +468,12 @@ func (d *Docker) gatherContainer(
 		acc.AddFields("docker_container_health", healthfields, tags, time.Now())
 	}
 
-	gatherContainerStats(v, acc, tags, container.ID, d.PerDevice, d.Total, daemonOSType)
+	parseContainerStats(v, acc, tags, container.ID, d.PerDevice, d.Total, daemonOSType)
 
 	return nil
 }
 
-func gatherContainerStats(
+func parseContainerStats(
 	stat *types.StatsJSON,
 	acc telegraf.Accumulator,
 	tags map[string]string,
diff --git a/plugins/inputs/docker/docker_test.go b/plugins/inputs/docker/docker_test.go
index d51c61c0..b97c34b6 100644
--- a/plugins/inputs/docker/docker_test.go
+++ b/plugins/inputs/docker/docker_test.go
@@ -77,8 +77,8 @@ var baseClient = MockClient{
 	ContainerListF: func(context.Context, types.ContainerListOptions) ([]types.Container, error) {
 		return containerList, nil
 	},
-	ContainerStatsF: func(context.Context, string, bool) (types.ContainerStats, error) {
-		return containerStats(), nil
+	ContainerStatsF: func(c context.Context, s string, b bool) (types.ContainerStats, error) {
+		return containerStats(s), nil
 	},
 	ContainerInspectF: func(context.Context, string) (types.ContainerJSON, error) {
 		return containerInspect, nil
@@ -107,7 +107,7 @@ func TestDockerGatherContainerStats(t *testing.T) {
 		"container_image": "redis/image",
 	}
 
-	gatherContainerStats(stats, &acc, tags, "123456789", true, true, "linux")
+	parseContainerStats(stats, &acc, tags, "123456789", true, true, "linux")
 
 	// test docker_container_net measurement
 	netfields := map[string]interface{}{
@@ -290,11 +290,9 @@ func TestContainerLabels(t *testing.T) {
 	}{
 		{
 			name: "Nil filters matches all",
-			container: types.Container{
-				Labels: map[string]string{
-					"a": "x",
-				},
-			},
+			container: genContainerLabeled(map[string]string{
+				"a": "x",
+			}),
 			include: nil,
 			exclude: nil,
 			expected: map[string]string{
@@ -303,11 +301,9 @@ func TestContainerLabels(t *testing.T) {
 		},
 		{
 			name: "Empty filters matches all",
-			container: types.Container{
-				Labels: map[string]string{
-					"a": "x",
-				},
-			},
+			container: genContainerLabeled(map[string]string{
+				"a": "x",
+			}),
 			include: []string{},
 			exclude: []string{},
 			expected: map[string]string{
@@ -316,12 +312,10 @@ func TestContainerLabels(t *testing.T) {
 		},
 		{
 			name: "Must match include",
-			container: types.Container{
-				Labels: map[string]string{
-					"a": "x",
-					"b": "y",
-				},
-			},
+			container: genContainerLabeled(map[string]string{
+				"a": "x",
+				"b": "y",
+			}),
 			include: []string{"a"},
 			exclude: []string{},
 			expected: map[string]string{
@@ -330,12 +324,10 @@ func TestContainerLabels(t *testing.T) {
 		},
 		{
 			name: "Must not match exclude",
-			container: types.Container{
-				Labels: map[string]string{
-					"a": "x",
-					"b": "y",
-				},
-			},
+			container: genContainerLabeled(map[string]string{
+				"a": "x",
+				"b": "y",
+			}),
 			include: []string{},
 			exclude: []string{"b"},
 			expected: map[string]string{
@@ -344,13 +336,11 @@ func TestContainerLabels(t *testing.T) {
 		},
 		{
 			name: "Include Glob",
-			container: types.Container{
-				Labels: map[string]string{
-					"aa": "x",
-					"ab": "y",
-					"bb": "z",
-				},
-			},
+			container: genContainerLabeled(map[string]string{
+				"aa": "x",
+				"ab": "y",
+				"bb": "z",
+			}),
 			include: []string{"a*"},
 			exclude: []string{},
 			expected: map[string]string{
@@ -360,13 +350,11 @@ func TestContainerLabels(t *testing.T) {
 		},
 		{
 			name: "Exclude Glob",
-			container: types.Container{
-				Labels: map[string]string{
-					"aa": "x",
-					"ab": "y",
-					"bb": "z",
-				},
-			},
+			container: genContainerLabeled(map[string]string{
+				"aa": "x",
+				"ab": "y",
+				"bb": "z",
+			}),
 			include: []string{},
 			exclude: []string{"a*"},
 			expected: map[string]string{
@@ -375,13 +363,11 @@ func TestContainerLabels(t *testing.T) {
 		},
 		{
 			name: "Excluded Includes",
-			container: types.Container{
-				Labels: map[string]string{
-					"aa": "x",
-					"ab": "y",
-					"bb": "z",
-				},
-			},
+			container: genContainerLabeled(map[string]string{
+				"aa": "x",
+				"ab": "y",
+				"bb": "z",
+			}),
 			include: []string{"a*"},
 			exclude: []string{"*b"},
 			expected: map[string]string{
@@ -425,6 +411,12 @@ func TestContainerLabels(t *testing.T) {
 	}
 }
 
+func genContainerLabeled(labels map[string]string) types.Container {
+	c := containerList[0]
+	c.Labels = labels
+	return c
+}
+
 func TestContainerNames(t *testing.T) {
 	var tests = []struct {
 		name       string
@@ -434,112 +426,67 @@ func TestContainerNames(t *testing.T) {
 		expected   []string
 	}{
 		{
-			name: "Nil filters matches all",
-			containers: [][]string{
-				{"/etcd"},
-				{"/etcd2"},
-			},
+			name:     "Nil filters matches all",
 			include:  nil,
 			exclude:  nil,
-			expected: []string{"etcd", "etcd2"},
+			expected: []string{"etcd", "etcd2", "acme", "acme-test", "foo"},
 		},
 		{
-			name: "Empty filters matches all",
-			containers: [][]string{
-				{"/etcd"},
-				{"/etcd2"},
-			},
+			name:     "Empty filters matches all",
 			include:  []string{},
 			exclude:  []string{},
-			expected: []string{"etcd", "etcd2"},
+			expected: []string{"etcd", "etcd2", "acme", "acme-test", "foo"},
 		},
 		{
-			name: "Match all containers",
-			containers: [][]string{
-				{"/etcd"},
-				{"/etcd2"},
-			},
+			name:     "Match all containers",
 			include:  []string{"*"},
 			exclude:  []string{},
-			expected: []string{"etcd", "etcd2"},
+			expected: []string{"etcd", "etcd2", "acme", "acme-test", "foo"},
 		},
 		{
-			name: "Include prefix match",
-			containers: [][]string{
-				{"/etcd"},
-				{"/etcd2"},
-			},
+			name:     "Include prefix match",
 			include:  []string{"etc*"},
 			exclude:  []string{},
 			expected: []string{"etcd", "etcd2"},
 		},
 		{
-			name: "Exact match",
-			containers: [][]string{
-				{"/etcd"},
-				{"/etcd2"},
-			},
+			name:     "Exact match",
 			include:  []string{"etcd"},
 			exclude:  []string{},
 			expected: []string{"etcd"},
 		},
 		{
-			name: "Star matches zero length",
-			containers: [][]string{
-				{"/etcd"},
-				{"/etcd2"},
-			},
+			name:     "Star matches zero length",
 			include:  []string{"etcd2*"},
 			exclude:  []string{},
 			expected: []string{"etcd2"},
 		},
 		{
-			name: "Exclude matches all",
-			containers: [][]string{
-				{"/etcd"},
-				{"/etcd2"},
-			},
+			name:     "Exclude matches all",
 			include:  []string{},
 			exclude:  []string{"etc*"},
-			expected: []string{},
+			expected: []string{"acme", "acme-test", "foo"},
 		},
 		{
-			name: "Exclude single",
-			containers: [][]string{
-				{"/etcd"},
-				{"/etcd2"},
-			},
+			name:     "Exclude single",
 			include:  []string{},
 			exclude:  []string{"etcd"},
-			expected: []string{"etcd2"},
+			expected: []string{"etcd2", "acme", "acme-test", "foo"},
 		},
 		{
-			name: "Exclude all",
-			containers: [][]string{
-				{"/etcd"},
-				{"/etcd2"},
-			},
+			name:     "Exclude all",
 			include:  []string{"*"},
 			exclude:  []string{"*"},
 			expected: []string{},
 		},
 		{
-			name: "Exclude item matching include",
-			containers: [][]string{
-				{"acme"},
-				{"foo"},
-				{"acme-test"},
-			},
+			name:     "Exclude item matching include",
 			include:  []string{"acme*"},
 			exclude:  []string{"*test*"},
 			expected: []string{"acme"},
 		},
 		{
-			name: "Exclude item no wildcards",
-			containers: [][]string{
-				{"acme"},
-				{"acme-test"},
-			},
+			name:     "Exclude item no wildcards",
 			include:  []string{"acme*"},
 			exclude:  []string{"test"},
 			expected: []string{"acme", "acme-test"},
@@ -552,14 +499,12 @@ func TestContainerNames(t *testing.T) {
 			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 containerList, nil
 				}
+				client.ContainerStatsF = func(c context.Context, s string, b bool) (types.ContainerStats, error) {
+					return containerStats(s), nil
+				}
+
 				return &client, nil
 			}
 
diff --git a/plugins/inputs/docker/docker_testdata.go b/plugins/inputs/docker/docker_testdata.go
index 1168048a..bb275a1c 100644
--- a/plugins/inputs/docker/docker_testdata.go
+++ b/plugins/inputs/docker/docker_testdata.go
@@ -1,6 +1,7 @@
 package docker
 
 import (
+	"fmt"
 	"io/ioutil"
 	"strings"
 	"time"
@@ -133,6 +134,18 @@ var containerList = []types.Container{
 		SizeRw:     0,
 		SizeRootFs: 0,
 	},
+	types.Container{
+		ID:    "e8a713dd90604f5a257b97c15945e047ab60ed5b2c4397c5a6b5bf40e1bd2791",
+		Names: []string{"/acme"},
+	},
+	types.Container{
+		ID:    "9bc6faf9ba8106fae32e8faafd38a1dd6f6d262bec172398cc10bc03c0d6841a",
+		Names: []string{"/acme-test"},
+	},
+	types.Container{
+		ID:    "d4ccced494a1d5fe8ebdb0a86335a0dab069319912221e5838a132ab18a8bc84",
+		Names: []string{"/foo"},
+	},
 }
 
 var two = uint64(2)
@@ -208,10 +221,25 @@ var NodeList = []swarm.Node{
 	},
 }
 
-func containerStats() types.ContainerStats {
+func containerStats(s string) types.ContainerStats {
 	var stat types.ContainerStats
-	jsonStat := `
+	var name string
+	switch s {
+	case "e2173b9478a6ae55e237d4d74f8bbb753f0817192b5081334dc78476296b7dfb":
+		name = "etcd"
+	case "b7dfbb9478a6ae55e237d4d74f8bbb753f0817192b5081334dc78476296e2173":
+		name = "etcd2"
+	case "e8a713dd90604f5a257b97c15945e047ab60ed5b2c4397c5a6b5bf40e1bd2791":
+		name = "/acme"
+	case "9bc6faf9ba8106fae32e8faafd38a1dd6f6d262bec172398cc10bc03c0d6841a":
+		name = "/acme-test"
+	case "d4ccced494a1d5fe8ebdb0a86335a0dab069319912221e5838a132ab18a8bc84":
+		name = "/foo"
+	}
+
+	jsonStat := fmt.Sprintf(`
 {
+    "name": "%s",
     "blkio_stats": {
         "io_service_bytes_recursive": [
             {
@@ -315,7 +343,7 @@ func containerStats() types.ContainerStats {
         "throttling_data": {}
     },
     "read": "2016-02-24T11:42:27.472459608-05:00"
-}`
+}`, name)
 	stat.Body = ioutil.NopCloser(strings.NewReader(jsonStat))
 	return stat
 }

From c8f00030dd94155e0a94c9f6684e635f2c0ec0a8 Mon Sep 17 00:00:00 2001
From: Rion <PhoenixRion@users.noreply.github.com>
Date: Fri, 13 Jul 2018 13:53:56 -0700
Subject: [PATCH 622/835] Add support for setting kafka client id (#4418)

---
 plugins/inputs/kafka_consumer/README.md         |  3 +++
 plugins/inputs/kafka_consumer/kafka_consumer.go | 10 ++++++++++
 plugins/outputs/kafka/README.md                 |  3 +++
 plugins/outputs/kafka/kafka.go                  | 11 +++++++++++
 4 files changed, 27 insertions(+)

diff --git a/plugins/inputs/kafka_consumer/README.md b/plugins/inputs/kafka_consumer/README.md
index 67dbb539..d794377f 100644
--- a/plugins/inputs/kafka_consumer/README.md
+++ b/plugins/inputs/kafka_consumer/README.md
@@ -22,6 +22,9 @@ and use the old zookeeper connection method.
   ## Offset (must be either "oldest" or "newest")
   offset = "oldest"
 
+  ## Optional client id
+  # client_id = "my_client"
+
   ## Optional TLS Config
   # tls_ca = "/etc/telegraf/ca.pem"
   # tls_cert = "/etc/telegraf/cert.pem"
diff --git a/plugins/inputs/kafka_consumer/kafka_consumer.go b/plugins/inputs/kafka_consumer/kafka_consumer.go
index bf74dd5a..72172bcb 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
+	ClientID      string `toml:"client_id"`
 	Topics        []string
 	Brokers       []string
 	MaxMessageLen int
@@ -59,6 +60,9 @@ var sampleConfig = `
   brokers = ["localhost:9092"]
   ## topic(s) to consume
   topics = ["telegraf"]
+  
+  ## Optional Client id
+  # client_id = "Telegraf"
 
   ## Optional TLS Config
   # tls_ca = "/etc/telegraf/ca.pem"
@@ -114,6 +118,12 @@ func (k *Kafka) Start(acc telegraf.Accumulator) error {
 		return err
 	}
 
+	if k.ClientID != "" {
+		config.ClientID = k.ClientID
+	} else {
+		config.ClientID = "Telegraf"
+	}
+
 	if tlsConfig != nil {
 		log.Printf("D! TLS Enabled")
 		config.Net.TLS.Config = tlsConfig
diff --git a/plugins/outputs/kafka/README.md b/plugins/outputs/kafka/README.md
index 196e2e91..00544e99 100644
--- a/plugins/outputs/kafka/README.md
+++ b/plugins/outputs/kafka/README.md
@@ -10,6 +10,9 @@ This plugin writes to a [Kafka Broker](http://kafka.apache.org/07/quickstart.htm
   ## Kafka topic for producer messages
   topic = "telegraf"
 
+  ## Optional client id
+  # client_id = "my_client"
+
   ## Optional topic suffix configuration.
   ## If the section is omitted, no suffix is used.
   ## Following topic suffix methods are supported:
diff --git a/plugins/outputs/kafka/kafka.go b/plugins/outputs/kafka/kafka.go
index 716e06c4..d61aaadd 100644
--- a/plugins/outputs/kafka/kafka.go
+++ b/plugins/outputs/kafka/kafka.go
@@ -25,6 +25,8 @@ type (
 		Brokers []string
 		// Kafka topic
 		Topic string
+		// Kafka client id
+		ClientID string `toml:"client_id"`
 		// Kafka topic suffix option
 		TopicSuffix TopicSuffix `toml:"topic_suffix"`
 		// Routing Key Tag
@@ -68,6 +70,9 @@ var sampleConfig = `
   brokers = ["localhost:9092"]
   ## Kafka topic for producer messages
   topic = "telegraf"
+  
+  ## Optional Client id
+  # client_id = "Telegraf"
 
   ## Optional topic suffix configuration.
   ## If the section is omitted, no suffix is used.
@@ -186,6 +191,12 @@ func (k *Kafka) Connect() error {
 	}
 	config := sarama.NewConfig()
 
+	if k.ClientID != "" {
+		config.ClientID = k.ClientID
+	} else {
+		config.ClientID = "Telegraf"
+	}
+
 	config.Producer.RequiredAcks = sarama.RequiredAcks(k.RequiredAcks)
 	config.Producer.Compression = sarama.CompressionCodec(k.CompressionCodec)
 	config.Producer.Retry.Max = k.MaxRetry

From 257e715b4252bbf03b485511982bd50bd6e90ed7 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 13 Jul 2018 13:58:39 -0700
Subject: [PATCH 623/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58626e09..f4a68955 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,7 @@
 - [#3772](https://github.com/influxdata/telegraf/pull/3772): Add Enum Processor.
 - [#4386](https://github.com/influxdata/telegraf/pull/4386): Add user tag to procstat input.
 - [#4403](https://github.com/influxdata/telegraf/pull/4403): Add support for multivalue metrics to collectd parser.
+- [#4418](https://github.com/influxdata/telegraf/pull/4418): Add support for setting kafka client id.
 
 ## v1.7.2 [unreleased]
 

From 49a5dea536a42b682d6d8581c20d0bc7174561d6 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 13 Jul 2018 13:59:45 -0700
Subject: [PATCH 624/835] Update client_id in kafka input and output readme

---
 plugins/inputs/kafka_consumer/README.md         | 2 +-
 plugins/inputs/kafka_consumer/kafka_consumer.go | 2 +-
 plugins/outputs/kafka/README.md                 | 2 +-
 plugins/outputs/kafka/kafka.go                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/inputs/kafka_consumer/README.md b/plugins/inputs/kafka_consumer/README.md
index d794377f..24a0efc0 100644
--- a/plugins/inputs/kafka_consumer/README.md
+++ b/plugins/inputs/kafka_consumer/README.md
@@ -23,7 +23,7 @@ and use the old zookeeper connection method.
   offset = "oldest"
 
   ## Optional client id
-  # client_id = "my_client"
+  # client_id = "Telegraf"
 
   ## Optional TLS Config
   # tls_ca = "/etc/telegraf/ca.pem"
diff --git a/plugins/inputs/kafka_consumer/kafka_consumer.go b/plugins/inputs/kafka_consumer/kafka_consumer.go
index 72172bcb..d3791b22 100644
--- a/plugins/inputs/kafka_consumer/kafka_consumer.go
+++ b/plugins/inputs/kafka_consumer/kafka_consumer.go
@@ -60,7 +60,7 @@ var sampleConfig = `
   brokers = ["localhost:9092"]
   ## topic(s) to consume
   topics = ["telegraf"]
-  
+
   ## Optional Client id
   # client_id = "Telegraf"
 
diff --git a/plugins/outputs/kafka/README.md b/plugins/outputs/kafka/README.md
index 00544e99..562f3fd5 100644
--- a/plugins/outputs/kafka/README.md
+++ b/plugins/outputs/kafka/README.md
@@ -11,7 +11,7 @@ This plugin writes to a [Kafka Broker](http://kafka.apache.org/07/quickstart.htm
   topic = "telegraf"
 
   ## Optional client id
-  # client_id = "my_client"
+  # client_id = "Telegraf"
 
   ## Optional topic suffix configuration.
   ## If the section is omitted, no suffix is used.
diff --git a/plugins/outputs/kafka/kafka.go b/plugins/outputs/kafka/kafka.go
index d61aaadd..a45e2a4e 100644
--- a/plugins/outputs/kafka/kafka.go
+++ b/plugins/outputs/kafka/kafka.go
@@ -70,7 +70,7 @@ var sampleConfig = `
   brokers = ["localhost:9092"]
   ## Kafka topic for producer messages
   topic = "telegraf"
-  
+
   ## Optional Client id
   # client_id = "Telegraf"
 

From 411b26bb1faad02b6b581689099d9587737145cc Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Fri, 13 Jul 2018 14:14:18 -0700
Subject: [PATCH 625/835] Fix output format of printer processor (#4417)

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

diff --git a/plugins/processors/printer/printer.go b/plugins/processors/printer/printer.go
index 363e9a21..ead3e8ec 100644
--- a/plugins/processors/printer/printer.go
+++ b/plugins/processors/printer/printer.go
@@ -30,7 +30,7 @@ func (p *Printer) Apply(in ...telegraf.Metric) []telegraf.Metric {
 		if err != nil {
 			continue
 		}
-		fmt.Println(octets)
+		fmt.Printf("%s", octets)
 	}
 	return in
 }

From af98d070f5ca88251fc5c7a060701f123e223647 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 13 Jul 2018 14:15:21 -0700
Subject: [PATCH 626/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4a68955..ed631a67 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@
 
 - [#4381](https://github.com/influxdata/telegraf/issues/4381): Use localhost as default server tag in zookeeper input.
 - [#4374](https://github.com/influxdata/telegraf/issues/4374): Don't set values when pattern doesn't match in regex processor.
+- [#4416](https://github.com/influxdata/telegraf/issues/4416): Fix output format of printer processor.
 
 ## v1.7.1 [2018-07-03]
 

From 6d876c18e0297689a13d31c72c82d859f89d95cd Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Fri, 13 Jul 2018 22:54:34 -0700
Subject: [PATCH 627/835] Fix metric can have duplicate field (#4422)

---
 metric/metric.go      | 1 +
 metric/metric_test.go | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/metric/metric.go b/metric/metric.go
index 077b3a31..9f1a42cc 100644
--- a/metric/metric.go
+++ b/metric/metric.go
@@ -168,6 +168,7 @@ 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)}
+			return
 		}
 	}
 	m.fields = append(m.fields, &telegraf.Field{Key: key, Value: convertField(value)})
diff --git a/metric/metric_test.go b/metric/metric_test.go
index 47d44f3e..004fa591 100644
--- a/metric/metric_test.go
+++ b/metric/metric_test.go
@@ -30,6 +30,7 @@ func TestNewMetric(t *testing.T) {
 	require.Equal(t, now, m.Time())
 }
 
+// cpu value=1
 func baseMetric() telegraf.Metric {
 	tags := map[string]string{}
 	fields := map[string]interface{}{
@@ -111,6 +112,8 @@ func TestAddFieldOverwrites(t *testing.T) {
 	m.AddField("value", 1.0)
 	m.AddField("value", 42.0)
 
+	require.Equal(t, 1, len(m.FieldList()))
+
 	value, ok := m.GetField("value")
 	require.True(t, ok)
 	require.Equal(t, 42.0, value)
@@ -122,6 +125,8 @@ func TestAddFieldChangesType(t *testing.T) {
 	m.AddField("value", 1.0)
 	m.AddField("value", "xyzzy")
 
+	require.Equal(t, 1, len(m.FieldList()))
+
 	value, ok := m.GetField("value")
 	require.True(t, ok)
 	require.Equal(t, "xyzzy", value)

From 3f87e5bf573d36ad71e9b64c1fca9094253d2100 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 13 Jul 2018 22:56:14 -0700
Subject: [PATCH 628/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed631a67..327648db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,6 +44,7 @@
 - [#4381](https://github.com/influxdata/telegraf/issues/4381): Use localhost as default server tag in zookeeper input.
 - [#4374](https://github.com/influxdata/telegraf/issues/4374): Don't set values when pattern doesn't match in regex processor.
 - [#4416](https://github.com/influxdata/telegraf/issues/4416): Fix output format of printer processor.
+- [#4422](https://github.com/influxdata/telegraf/issues/4422): Fix metric can have duplicate field.
 
 ## v1.7.1 [2018-07-03]
 

From 774a9f0492bd1611478220611883073eef8cab74 Mon Sep 17 00:00:00 2001
From: maxunt <max.untrecht@gmail.com>
Date: Fri, 13 Jul 2018 23:22:59 -0700
Subject: [PATCH 629/835] Add file input plugin and grok parser (#4332)

---
 README.md                                     |   1 +
 docs/DATA_FORMATS_INPUT.md                    | 103 ++++++++++++++++++
 internal/config/config.go                     |  58 ++++++++++
 plugins/inputs/all/all.go                     |   1 +
 plugins/inputs/file/README.md                 |  25 +++++
 plugins/inputs/file/dev/docker-compose.yml    |  13 +++
 plugins/inputs/file/dev/json_a.log            |  14 +++
 plugins/inputs/file/dev/telegraf.conf         |   7 ++
 plugins/inputs/file/file.go                   | 102 +++++++++++++++++
 plugins/inputs/file/file_test.go              |  61 +++++++++++
 plugins/inputs/file/testfiles/grok_a.log      |   2 +
 plugins/inputs/file/testfiles/json_a.log      |  14 +++
 plugins/inputs/logparser/README.md            |   7 ++
 .../inputs/logparser/grok/testdata/.DS_Store  | Bin 0 -> 6148 bytes
 plugins/inputs/logparser/logparser.go         |  83 +++++++-------
 plugins/inputs/logparser/logparser_test.go    |  43 ++++----
 .../grok/influx_patterns.go                   |   0
 .../grok/grok.go => parsers/grok/parser.go}   |  46 ++++++--
 .../grok/parser_test.go}                      |  82 ++------------
 plugins/parsers/grok/testdata/.DS_Store       | Bin 0 -> 6148 bytes
 plugins/parsers/grok/testdata/test-patterns   |  14 +++
 plugins/parsers/grok/testdata/test_a.log      |   1 +
 plugins/parsers/grok/testdata/test_b.log      |   1 +
 plugins/parsers/registry.go                   |  34 ++++++
 24 files changed, 558 insertions(+), 154 deletions(-)
 create mode 100644 plugins/inputs/file/README.md
 create mode 100644 plugins/inputs/file/dev/docker-compose.yml
 create mode 100644 plugins/inputs/file/dev/json_a.log
 create mode 100644 plugins/inputs/file/dev/telegraf.conf
 create mode 100644 plugins/inputs/file/file.go
 create mode 100644 plugins/inputs/file/file_test.go
 create mode 100644 plugins/inputs/file/testfiles/grok_a.log
 create mode 100644 plugins/inputs/file/testfiles/json_a.log
 create mode 100644 plugins/inputs/logparser/grok/testdata/.DS_Store
 rename plugins/{inputs/logparser => parsers}/grok/influx_patterns.go (100%)
 rename plugins/{inputs/logparser/grok/grok.go => parsers/grok/parser.go} (94%)
 rename plugins/{inputs/logparser/grok/grok_test.go => parsers/grok/parser_test.go} (94%)
 create mode 100644 plugins/parsers/grok/testdata/.DS_Store
 create mode 100644 plugins/parsers/grok/testdata/test-patterns
 create mode 100644 plugins/parsers/grok/testdata/test_a.log
 create mode 100644 plugins/parsers/grok/testdata/test_b.log

diff --git a/README.md b/README.md
index 4fc4db32..75ac9de1 100644
--- a/README.md
+++ b/README.md
@@ -153,6 +153,7 @@ configuration options.
 * [exec](./plugins/inputs/exec) (generic executable plugin, support JSON, influx, graphite and nagios)
 * [fail2ban](./plugins/inputs/fail2ban)
 * [fibaro](./plugins/inputs/fibaro)
+* [file](./plugins/inputs/file)
 * [filestat](./plugins/inputs/filestat)
 * [fluentd](./plugins/inputs/fluentd)
 * [graylog](./plugins/inputs/graylog)
diff --git a/docs/DATA_FORMATS_INPUT.md b/docs/DATA_FORMATS_INPUT.md
index 88282c84..24335a45 100644
--- a/docs/DATA_FORMATS_INPUT.md
+++ b/docs/DATA_FORMATS_INPUT.md
@@ -9,6 +9,7 @@ Telegraf is able to parse the following input data formats into metrics:
 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)
+1. [Grok](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#grok)
 
 Telegraf metrics, like InfluxDB
 [points](https://docs.influxdata.com/influxdb/v0.10/write_protocols/line/),
@@ -657,5 +658,107 @@ For more information about the dropwizard json format see
   # [inputs.exec.dropwizard_tag_paths]
   #   tag1 = "tags.tag1"
   #   tag2 = "tags.tag2"
+```
 
+#### Grok
+Parse logstash-style "grok" patterns. Patterns can be added to patterns, or custom patterns read from custom_pattern_files.
+
+# View logstash grok pattern docs here:
+#   https://www.elastic.co/guide/en/logstash/current/plugins-filters-grok.html
+# All default logstash patterns are supported, these can be viewed here:
+#   https://github.com/logstash-plugins/logstash-patterns-core/blob/master/patterns/grok-patterns
+
+# Available modifiers:
+#   string   (default if nothing is specified)
+#   int
+#   float
+#   duration (ie, 5.23ms gets converted to int nanoseconds)
+#   tag      (converts the field into a tag)
+#   drop     (drops the field completely)
+# Timestamp modifiers:
+#   ts-ansic         ("Mon Jan _2 15:04:05 2006")
+#   ts-unix          ("Mon Jan _2 15:04:05 MST 2006")
+#   ts-ruby          ("Mon Jan 02 15:04:05 -0700 2006")
+#   ts-rfc822        ("02 Jan 06 15:04 MST")
+#   ts-rfc822z       ("02 Jan 06 15:04 -0700")
+#   ts-rfc850        ("Monday, 02-Jan-06 15:04:05 MST")
+#   ts-rfc1123       ("Mon, 02 Jan 2006 15:04:05 MST")
+#   ts-rfc1123z      ("Mon, 02 Jan 2006 15:04:05 -0700")
+#   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-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.
+
+# Example log file pattern, example log looks like this:
+#   [04/Jun/2016:12:41:45 +0100] 1.25 200 192.168.1.1 5.432µs
+# Breakdown of the DURATION pattern below:
+#   NUMBER  is a builtin logstash grok pattern matching float & int numbers.
+#   [nuµm]? is a regex specifying 0 or 1 of the characters within brackets.
+#   s       is also regex, this pattern must end in "s".
+# so DURATION will match something like '5.324ms' or '6.1µs' or '10s'
+DURATION %{NUMBER}[nuµm]?s
+RESPONSE_CODE %{NUMBER:response_code:tag}
+RESPONSE_TIME %{DURATION:response_time_ns:duration}
+EXAMPLE_LOG \[%{HTTPDATE:ts:ts-httpd}\] %{NUMBER:myfloat:float} %{RESPONSE_CODE} %{IPORHOST:clientip} %{RESPONSE_TIME}
+
+# Wider-ranging username matching vs. logstash built-in %{USER}
+NGUSERNAME [a-zA-Z0-9\.\@\-\+_%]+
+NGUSER %{NGUSERNAME}
+# Wider-ranging client IP matching
+CLIENT (?:%{IPORHOST}|%{HOSTPORT}|::1)
+
+##
+## COMMON LOG PATTERNS
+##
+
+# apache & nginx logs, this is also known as the "common log format"
+#   see https://en.wikipedia.org/wiki/Common_Log_Format
+COMMON_LOG_FORMAT %{CLIENT:client_ip} %{NOTSPACE:ident} %{NOTSPACE:auth} \[%{HTTPDATE:ts:ts-httpd}\] "(?:%{WORD:verb:tag} %{NOTSPACE:request}(?: HTTP/%{NUMBER:http_version:float})?|%{DATA})" %{NUMBER:resp_code:tag} (?:%{NUMBER:resp_bytes:int}|-)
+
+# Combined log format is the same as the common log format but with the addition
+# of two quoted strings at the end for "referrer" and "agent"
+#   See Examples at http://httpd.apache.org/docs/current/mod/mod_log_config.html
+COMBINED_LOG_FORMAT %{COMMON_LOG_FORMAT} %{QS:referrer} %{QS:agent}
+
+# HTTPD log formats
+HTTPD20_ERRORLOG \[%{HTTPDERROR_DATE:timestamp}\] \[%{LOGLEVEL:loglevel:tag}\] (?:\[client %{IPORHOST:clientip}\] ){0,1}%{GREEDYDATA:errormsg}
+HTTPD24_ERRORLOG \[%{HTTPDERROR_DATE:timestamp}\] \[%{WORD:module}:%{LOGLEVEL:loglevel:tag}\] \[pid %{POSINT:pid:int}:tid %{NUMBER:tid:int}\]( \(%{POSINT:proxy_errorcode:int}\)%{DATA:proxy_errormessage}:)?( \[client %{IPORHOST:client}:%{POSINT:clientport}\])? %{DATA:errorcode}: %{GREEDYDATA:message}
+HTTPD_ERRORLOG %{HTTPD20_ERRORLOG}|%{HTTPD24_ERRORLOG}
+
+#### Grok Configuration:
+```toml
+[[inputs.reader]]
+  ## 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)
+  grok_patterns = ["%{COMBINED_LOG_FORMAT}"]
+
+  ## Name of the outputted measurement name.
+  grok_name_override = "apache_access_log"
+
+  ## Full path(s) to custom pattern files.
+  grok_custom_pattern_files = []
+
+  ## Custom patterns can also be defined here. Put one pattern per line.
+  grok_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
+  grok_timezone = "Canada/Eastern"
 ```
\ No newline at end of file
diff --git a/internal/config/config.go b/internal/config/config.go
index 5b3e5345..21c71d94 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -1346,6 +1346,59 @@ func buildParser(name string, tbl *ast.Table) (parsers.Parser, error) {
 		}
 	}
 
+	//for grok data_format
+	if node, ok := tbl.Fields["grok_named_patterns"]; 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.GrokNamedPatterns = append(c.GrokNamedPatterns, str.Value)
+					}
+				}
+			}
+		}
+	}
+
+	if node, ok := tbl.Fields["grok_patterns"]; 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.GrokPatterns = append(c.GrokPatterns, str.Value)
+					}
+				}
+			}
+		}
+	}
+
+	if node, ok := tbl.Fields["grok_custom_patterns"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if str, ok := kv.Value.(*ast.String); ok {
+				c.GrokCustomPatterns = str.Value
+			}
+		}
+	}
+
+	if node, ok := tbl.Fields["grok_custom_pattern_files"]; 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.GrokCustomPatternFiles = append(c.GrokCustomPatternFiles, str.Value)
+					}
+				}
+			}
+		}
+	}
+
+	if node, ok := tbl.Fields["grok_timezone"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if str, ok := kv.Value.(*ast.String); ok {
+				c.GrokTimeZone = str.Value
+			}
+		}
+	}
+
 	c.MetricName = name
 
 	delete(tbl.Fields, "data_format")
@@ -1362,6 +1415,11 @@ func buildParser(name string, tbl *ast.Table) (parsers.Parser, error) {
 	delete(tbl.Fields, "dropwizard_time_format")
 	delete(tbl.Fields, "dropwizard_tags_path")
 	delete(tbl.Fields, "dropwizard_tag_paths")
+	delete(tbl.Fields, "grok_named_patterns")
+	delete(tbl.Fields, "grok_patterns")
+	delete(tbl.Fields, "grok_custom_patterns")
+	delete(tbl.Fields, "grok_custom_pattern_files")
+	delete(tbl.Fields, "grok_timezone")
 
 	return parsers.NewParser(c)
 }
diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index 594e0ea4..8594db0a 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -30,6 +30,7 @@ import (
 	_ "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/file"
 	_ "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/file/README.md b/plugins/inputs/file/README.md
new file mode 100644
index 00000000..73a3a236
--- /dev/null
+++ b/plugins/inputs/file/README.md
@@ -0,0 +1,25 @@
+# File Input Plugin
+
+The file plugin updates a list of files every interval and parses the contents
+using the selected [input data format](/docs/DATA_FORMATS_INPUT.md).
+
+Files will always be read in their entirety, if you wish to tail/follow a file
+use the [tail input plugin](/plugins/inputs/tail) instead.
+
+### Configuration:
+```toml
+[[inputs.file]]
+  ## Files to parse each interval.
+  ## 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"]
+
+  ## 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"
+```
diff --git a/plugins/inputs/file/dev/docker-compose.yml b/plugins/inputs/file/dev/docker-compose.yml
new file mode 100644
index 00000000..3c16fca9
--- /dev/null
+++ b/plugins/inputs/file/dev/docker-compose.yml
@@ -0,0 +1,13 @@
+version: '3'
+
+services:
+  telegraf:
+      image: glinton/scratch
+      volumes:
+        - ./telegraf.conf:/telegraf.conf
+        - ../../../../telegraf:/telegraf
+        - ./json_a.log:/var/log/test.log
+      entrypoint:
+        - /telegraf
+        - --config
+        - /telegraf.conf
diff --git a/plugins/inputs/file/dev/json_a.log b/plugins/inputs/file/dev/json_a.log
new file mode 100644
index 00000000..0f52e9d1
--- /dev/null
+++ b/plugins/inputs/file/dev/json_a.log
@@ -0,0 +1,14 @@
+{
+"parent": {
+	"child": 3.0,
+	"ignored_child": "hi"
+},
+"ignored_null": null,
+"integer": 4,
+"list": [3, 4],
+"ignored_parent": {
+	"another_ignored_null": null,
+	"ignored_string": "hello, world!"
+},
+"another_list": [4]
+}
diff --git a/plugins/inputs/file/dev/telegraf.conf b/plugins/inputs/file/dev/telegraf.conf
new file mode 100644
index 00000000..8cc0fb85
--- /dev/null
+++ b/plugins/inputs/file/dev/telegraf.conf
@@ -0,0 +1,7 @@
+[[inputs.file]]
+  files = ["/var/log/test.log"]
+  data_format = "json"
+  name_override = "json_file"
+
+[[outputs.file]]
+  files = ["stdout"]
diff --git a/plugins/inputs/file/file.go b/plugins/inputs/file/file.go
new file mode 100644
index 00000000..2779561f
--- /dev/null
+++ b/plugins/inputs/file/file.go
@@ -0,0 +1,102 @@
+package file
+
+import (
+	"fmt"
+	"io/ioutil"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal/globpath"
+	"github.com/influxdata/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/parsers"
+)
+
+type File struct {
+	Files         []string `toml:"files"`
+	FromBeginning bool
+	parser        parsers.Parser
+
+	filenames []string
+}
+
+const sampleConfig = `
+  ## Files to parse each interval.
+  ## 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"]
+
+  ## The dataformat to be read from files
+  ## 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 (f *File) SampleConfig() string {
+	return sampleConfig
+}
+
+func (f *File) Description() string {
+	return "reload and gather from file[s] on telegraf's interval"
+}
+
+func (f *File) Gather(acc telegraf.Accumulator) error {
+	err := f.refreshFilePaths()
+	if err != nil {
+		return err
+	}
+	for _, k := range f.filenames {
+		metrics, err := f.readMetric(k)
+		if err != nil {
+			return err
+		}
+
+		for _, m := range metrics {
+			acc.AddFields(m.Name(), m.Fields(), m.Tags(), m.Time())
+		}
+	}
+	return nil
+}
+
+func (f *File) SetParser(p parsers.Parser) {
+	f.parser = p
+}
+
+func (f *File) refreshFilePaths() error {
+	var allFiles []string
+	for _, file := range f.Files {
+		g, err := globpath.Compile(file)
+		if err != nil {
+			return fmt.Errorf("could not compile glob %v: %v", file, err)
+		}
+		files := g.Match()
+		if len(files) <= 0 {
+			return fmt.Errorf("could not find file: %v", file)
+		}
+
+		for k := range files {
+			allFiles = append(allFiles, k)
+		}
+	}
+
+	f.filenames = allFiles
+	return nil
+}
+
+func (f *File) readMetric(filename string) ([]telegraf.Metric, error) {
+	fileContents, err := ioutil.ReadFile(filename)
+	if err != nil {
+		return nil, fmt.Errorf("E! Error file: %v could not be read, %s", filename, err)
+	}
+	return f.parser.Parse(fileContents)
+
+}
+
+func init() {
+	inputs.Add("file", func() telegraf.Input {
+		return &File{}
+	})
+}
diff --git a/plugins/inputs/file/file_test.go b/plugins/inputs/file/file_test.go
new file mode 100644
index 00000000..28105664
--- /dev/null
+++ b/plugins/inputs/file/file_test.go
@@ -0,0 +1,61 @@
+package file
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/influxdata/telegraf/plugins/parsers"
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestRefreshFilePaths(t *testing.T) {
+	wd, err := os.Getwd()
+	r := File{
+		Files: []string{filepath.Join(wd, "testfiles/**.log")},
+	}
+
+	err = r.refreshFilePaths()
+	require.NoError(t, err)
+	assert.Equal(t, len(r.filenames), 2)
+}
+func TestJSONParserCompile(t *testing.T) {
+	var acc testutil.Accumulator
+	wd, _ := os.Getwd()
+	r := File{
+		Files: []string{filepath.Join(wd, "testfiles/json_a.log")},
+	}
+	parserConfig := parsers.Config{
+		DataFormat: "json",
+		TagKeys:    []string{"parent_ignored_child"},
+	}
+	nParser, err := parsers.NewParser(&parserConfig)
+	r.parser = nParser
+	assert.NoError(t, err)
+
+	r.Gather(&acc)
+	assert.Equal(t, map[string]string{"parent_ignored_child": "hi"}, acc.Metrics[0].Tags)
+	assert.Equal(t, 5, len(acc.Metrics[0].Fields))
+}
+
+func TestGrokParser(t *testing.T) {
+	wd, _ := os.Getwd()
+	var acc testutil.Accumulator
+	r := File{
+		Files: []string{filepath.Join(wd, "testfiles/grok_a.log")},
+	}
+
+	parserConfig := parsers.Config{
+		DataFormat:   "grok",
+		GrokPatterns: []string{"%{COMMON_LOG_FORMAT}"},
+	}
+
+	nParser, err := parsers.NewParser(&parserConfig)
+	r.parser = nParser
+	assert.NoError(t, err)
+
+	err = r.Gather(&acc)
+	assert.Equal(t, 2, len(acc.Metrics))
+}
diff --git a/plugins/inputs/file/testfiles/grok_a.log b/plugins/inputs/file/testfiles/grok_a.log
new file mode 100644
index 00000000..5295fcb7
--- /dev/null
+++ b/plugins/inputs/file/testfiles/grok_a.log
@@ -0,0 +1,2 @@
+127.0.0.1 user-identifier frank [10/Oct/2000:13:55:36 -0700] "GET /apache_pb.gif HTTP/1.0" 200 2326
+128.0.0.1 user-identifier tony [10/Oct/2000:13:55:36 -0800] "GET /apache_pb.gif HTTP/1.0" 300 45
\ No newline at end of file
diff --git a/plugins/inputs/file/testfiles/json_a.log b/plugins/inputs/file/testfiles/json_a.log
new file mode 100644
index 00000000..609c40a0
--- /dev/null
+++ b/plugins/inputs/file/testfiles/json_a.log
@@ -0,0 +1,14 @@
+{
+	"parent": {
+		"child": 3.0,
+		"ignored_child": "hi"
+	},
+	"ignored_null": null,
+	"integer": 4,
+	"list": [3, 4],
+	"ignored_parent": {
+		"another_ignored_null": null,
+		"ignored_string": "hello, world!"
+	},
+	"another_list": [4]
+}
diff --git a/plugins/inputs/logparser/README.md b/plugins/inputs/logparser/README.md
index 1caa3830..69aedc4b 100644
--- a/plugins/inputs/logparser/README.md
+++ b/plugins/inputs/logparser/README.md
@@ -1,5 +1,9 @@
 # Logparser Input Plugin
 
+### **Deprecated in version 1.8**: Please use the
+[tail](/plugins/inputs/tail) plugin with the `grok`
+[data format](/docs/DATA_FORMATS_INPUT.md).
+
 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.
@@ -8,6 +12,9 @@ regex patterns.
 
 ```toml
 [[inputs.logparser]]
+  ## DEPRECATED: The `logparser` plugin is deprecated in 1.8.  Please use the
+  ## `tail` plugin with the grok data_format instead.
+
   ## Log files to parse.
   ## These accept standard unix glob matching rules, but with the addition of
   ## ** as a "super asterisk". ie:
diff --git a/plugins/inputs/logparser/grok/testdata/.DS_Store b/plugins/inputs/logparser/grok/testdata/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..15d123ef0efe733881b859864ca23e55a26587a3
GIT binary patch
literal 6148
zcmeHKyH3PF47A~j6DOqWpxlxMBx;)IbQIKl01!Yl5jk<t@9*%HFk_n&fk1^2LUy#C
z&8}x3BV{)h5nVjp9E;3FWQsymRz{4?qg`7OybV+v<4{&|C69P+M+W+fO<en~t#=Lo
ze*F(}FYB|ezizv}MHD2`J>bEMnQdlg!@R)0kED}c?uHyW`G(Ve!Fm3`vB}b<0;xbM
zkP4&%KcWEcY}$0@m_8Lq1yX^H0z4lI3b6^Sj&^jwSqcE0pxF#{<`U$Tz$UOdq6el<
z1v*tD#ZafCy+m9SSRI`%8p(&o%x}qy+Uyv=Sh#58m_8Lq1%?VR_l3=Q|DWQM8BOvn
zBwZ?y3j9|Ebh12OF0i|}TR-iScWptrM4>URvI0YW@DqR+o+JC#>HURu#5IA{k)yEP
Q=)n9DFhSC#0>7ZZD@y@41poj5

literal 0
HcmV?d00001

diff --git a/plugins/inputs/logparser/logparser.go b/plugins/inputs/logparser/logparser.go
index 8eb86608..b6ce7254 100644
--- a/plugins/inputs/logparser/logparser.go
+++ b/plugins/inputs/logparser/logparser.go
@@ -3,9 +3,7 @@
 package logparser
 
 import (
-	"fmt"
 	"log"
-	"reflect"
 	"strings"
 	"sync"
 
@@ -14,9 +12,8 @@ import (
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal/globpath"
 	"github.com/influxdata/telegraf/plugins/inputs"
-
+	"github.com/influxdata/telegraf/plugins/parsers"
 	// Parsers
-	"github.com/influxdata/telegraf/plugins/inputs/logparser/grok"
 )
 
 const (
@@ -24,9 +21,13 @@ const (
 )
 
 // LogParser in the primary interface for the plugin
-type LogParser interface {
-	ParseLine(line string) (telegraf.Metric, error)
-	Compile() error
+type GrokConfig struct {
+	MeasurementName    string `toml:"measurement"`
+	Patterns           []string
+	NamedPatterns      []string
+	CustomPatterns     string
+	CustomPatternFiles []string
+	TimeZone           string
 }
 
 type logEntry struct {
@@ -45,14 +46,17 @@ type LogParserPlugin struct {
 	done    chan struct{}
 	wg      sync.WaitGroup
 	acc     telegraf.Accumulator
-	parsers []LogParser
 
 	sync.Mutex
 
-	GrokParser *grok.Parser `toml:"grok"`
+	GrokParser parsers.Parser
+	GrokConfig GrokConfig `toml:"grok"`
 }
 
 const sampleConfig = `
+  ## DEPRECATED: The 'logparser' plugin is deprecated in 1.8.  Please use the
+  ## 'tail' plugin with the grok data_format as a replacement.
+
   ## Log files to parse.
   ## These accept standard unix glob matching rules, but with the addition of
   ## ** as a "super asterisk". ie:
@@ -122,6 +126,9 @@ func (l *LogParserPlugin) Gather(acc telegraf.Accumulator) error {
 
 // Start kicks off collection of stats for the plugin
 func (l *LogParserPlugin) Start(acc telegraf.Accumulator) error {
+	log.Println("W! DEPRECATED: The logparser plugin is deprecated in 1.8. " +
+		"Please use the tail plugin with the grok data_format as a replacement.")
+
 	l.Lock()
 	defer l.Unlock()
 
@@ -131,32 +138,19 @@ func (l *LogParserPlugin) Start(acc telegraf.Accumulator) error {
 	l.tailers = make(map[string]*tail.Tail)
 
 	// Looks for fields which implement LogParser interface
-	l.parsers = []LogParser{}
-	s := reflect.ValueOf(l).Elem()
-	for i := 0; i < s.NumField(); i++ {
-		f := s.Field(i)
-
-		if !f.CanInterface() {
-			continue
-		}
-
-		if lpPlugin, ok := f.Interface().(LogParser); ok {
-			if reflect.ValueOf(lpPlugin).IsNil() {
-				continue
-			}
-			l.parsers = append(l.parsers, lpPlugin)
-		}
+	config := &parsers.Config{
+		GrokPatterns:           l.GrokConfig.Patterns,
+		GrokNamedPatterns:      l.GrokConfig.NamedPatterns,
+		GrokCustomPatterns:     l.GrokConfig.CustomPatterns,
+		GrokCustomPatternFiles: l.GrokConfig.CustomPatternFiles,
+		GrokTimeZone:           l.GrokConfig.TimeZone,
+		DataFormat:             "grok",
 	}
 
-	if len(l.parsers) == 0 {
-		return fmt.Errorf("logparser input plugin: no parser defined")
-	}
-
-	// compile log parser patterns:
-	for _, parser := range l.parsers {
-		if err := parser.Compile(); err != nil {
-			return err
-		}
+	var err error
+	l.GrokParser, err = parsers.NewParser(config)
+	if err != nil {
+		return err
 	}
 
 	l.wg.Add(1)
@@ -251,8 +245,8 @@ func (l *LogParserPlugin) receiver(tailer *tail.Tail) {
 	}
 }
 
-// parser is launched as a goroutine to watch the l.lines channel.
-// when a line is available, parser parses it and adds the metric(s) to the
+// parse is launched as a goroutine to watch the l.lines channel.
+// when a line is available, parse parses it and adds the metric(s) to the
 // accumulator.
 func (l *LogParserPlugin) parser() {
 	defer l.wg.Done()
@@ -269,18 +263,17 @@ func (l *LogParserPlugin) parser() {
 				continue
 			}
 		}
-		for _, parser := range l.parsers {
-			m, err = parser.ParseLine(entry.line)
-			if err == nil {
-				if m != nil {
-					tags := m.Tags()
-					tags["path"] = entry.path
-					l.acc.AddFields(m.Name(), m.Fields(), tags, m.Time())
-				}
-			} else {
-				log.Println("E! Error parsing log line: " + err.Error())
+		m, err = l.GrokParser.ParseLine(entry.line)
+		if err == nil {
+			if m != nil {
+				tags := m.Tags()
+				tags["path"] = entry.path
+				l.acc.AddFields(l.GrokConfig.MeasurementName, 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 98567b4c..3f0ab4da 100644
--- a/plugins/inputs/logparser/logparser_test.go
+++ b/plugins/inputs/logparser/logparser_test.go
@@ -9,8 +9,6 @@ import (
 
 	"github.com/influxdata/telegraf/testutil"
 
-	"github.com/influxdata/telegraf/plugins/inputs/logparser/grok"
-
 	"github.com/stretchr/testify/assert"
 )
 
@@ -26,15 +24,14 @@ func TestStartNoParsers(t *testing.T) {
 
 func TestGrokParseLogFilesNonExistPattern(t *testing.T) {
 	thisdir := getCurrentDir()
-	p := &grok.Parser{
-		Patterns:           []string{"%{FOOBAR}"},
-		CustomPatternFiles: []string{thisdir + "grok/testdata/test-patterns"},
-	}
 
 	logparser := &LogParserPlugin{
 		FromBeginning: true,
 		Files:         []string{thisdir + "grok/testdata/*.log"},
-		GrokParser:    p,
+		GrokConfig: GrokConfig{
+			Patterns:           []string{"%{FOOBAR}"},
+			CustomPatternFiles: []string{thisdir + "grok/testdata/test-patterns"},
+		},
 	}
 
 	acc := testutil.Accumulator{}
@@ -44,20 +41,19 @@ func TestGrokParseLogFilesNonExistPattern(t *testing.T) {
 
 func TestGrokParseLogFiles(t *testing.T) {
 	thisdir := getCurrentDir()
-	p := &grok.Parser{
-		Patterns:           []string{"%{TEST_LOG_A}", "%{TEST_LOG_B}"},
-		CustomPatternFiles: []string{thisdir + "grok/testdata/test-patterns"},
-	}
 
 	logparser := &LogParserPlugin{
+		GrokConfig: GrokConfig{
+			MeasurementName:    "logparser_grok",
+			Patterns:           []string{"%{TEST_LOG_A}", "%{TEST_LOG_B}"},
+			CustomPatternFiles: []string{thisdir + "grok/testdata/test-patterns"},
+		},
 		FromBeginning: true,
 		Files:         []string{thisdir + "grok/testdata/*.log"},
-		GrokParser:    p,
 	}
 
 	acc := testutil.Accumulator{}
 	assert.NoError(t, logparser.Start(&acc))
-
 	acc.Wait(2)
 
 	logparser.Stop()
@@ -91,15 +87,15 @@ func TestGrokParseLogFilesAppearLater(t *testing.T) {
 	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,
+		GrokConfig: GrokConfig{
+			MeasurementName:    "logparser_grok",
+			Patterns:           []string{"%{TEST_LOG_A}", "%{TEST_LOG_B}"},
+			CustomPatternFiles: []string{thisdir + "grok/testdata/test-patterns"},
+		},
 	}
 
 	acc := testutil.Accumulator{}
@@ -130,16 +126,15 @@ func TestGrokParseLogFilesAppearLater(t *testing.T) {
 // pattern available for test_b.log
 func TestGrokParseLogFilesOneBad(t *testing.T) {
 	thisdir := getCurrentDir()
-	p := &grok.Parser{
-		Patterns:           []string{"%{TEST_LOG_A}", "%{TEST_LOG_BAD}"},
-		CustomPatternFiles: []string{thisdir + "grok/testdata/test-patterns"},
-	}
-	assert.NoError(t, p.Compile())
 
 	logparser := &LogParserPlugin{
 		FromBeginning: true,
 		Files:         []string{thisdir + "grok/testdata/test_a.log"},
-		GrokParser:    p,
+		GrokConfig: GrokConfig{
+			MeasurementName:    "logparser_grok",
+			Patterns:           []string{"%{TEST_LOG_A}", "%{TEST_LOG_BAD}"},
+			CustomPatternFiles: []string{thisdir + "grok/testdata/test-patterns"},
+		},
 	}
 
 	acc := testutil.Accumulator{}
diff --git a/plugins/inputs/logparser/grok/influx_patterns.go b/plugins/parsers/grok/influx_patterns.go
similarity index 100%
rename from plugins/inputs/logparser/grok/influx_patterns.go
rename to plugins/parsers/grok/influx_patterns.go
diff --git a/plugins/inputs/logparser/grok/grok.go b/plugins/parsers/grok/parser.go
similarity index 94%
rename from plugins/inputs/logparser/grok/grok.go
rename to plugins/parsers/grok/parser.go
index 4e6efc2c..e17f127f 100644
--- a/plugins/inputs/logparser/grok/grok.go
+++ b/plugins/parsers/grok/parser.go
@@ -68,10 +68,11 @@ type Parser struct {
 	// specified by the user in Patterns.
 	// They will look like:
 	//   GROK_INTERNAL_PATTERN_0, GROK_INTERNAL_PATTERN_1, etc.
-	namedPatterns      []string
+	NamedPatterns      []string
 	CustomPatterns     string
 	CustomPatternFiles []string
 	Measurement        string
+	DefaultTags        map[string]string
 
 	// Timezone is an optional component to help render log dates to
 	// your chosen zone.
@@ -133,7 +134,7 @@ func (p *Parser) Compile() error {
 
 	// Give Patterns fake names so that they can be treated as named
 	// "custom patterns"
-	p.namedPatterns = make([]string, 0, len(p.Patterns))
+	p.NamedPatterns = make([]string, 0, len(p.Patterns))
 	for i, pattern := range p.Patterns {
 		pattern = strings.TrimSpace(pattern)
 		if pattern == "" {
@@ -141,10 +142,10 @@ func (p *Parser) Compile() error {
 		}
 		name := fmt.Sprintf("GROK_INTERNAL_PATTERN_%d", i)
 		p.CustomPatterns += "\n" + name + " " + pattern + "\n"
-		p.namedPatterns = append(p.namedPatterns, "%{"+name+"}")
+		p.NamedPatterns = append(p.NamedPatterns, "%{"+name+"}")
 	}
 
-	if len(p.namedPatterns) == 0 {
+	if len(p.NamedPatterns) == 0 {
 		return fmt.Errorf("pattern required")
 	}
 
@@ -167,10 +168,6 @@ func (p *Parser) Compile() error {
 		p.addCustomPatterns(scanner)
 	}
 
-	if p.Measurement == "" {
-		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)
@@ -191,7 +188,7 @@ func (p *Parser) ParseLine(line string) (telegraf.Metric, error) {
 	var values map[string]string
 	// the matching pattern string
 	var patternName string
-	for _, pattern := range p.namedPatterns {
+	for _, pattern := range p.NamedPatterns {
 		if values, err = p.g.Parse(pattern, line); err != nil {
 			return nil, err
 		}
@@ -208,6 +205,12 @@ func (p *Parser) ParseLine(line string) (telegraf.Metric, error) {
 
 	fields := make(map[string]interface{})
 	tags := make(map[string]string)
+
+	//add default tags
+	for k, v := range p.DefaultTags {
+		tags[k] = v
+	}
+
 	timestamp := time.Now()
 	for k, v := range values {
 		if k == "" || v == "" {
@@ -335,9 +338,7 @@ 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
@@ -354,6 +355,29 @@ func (p *Parser) ParseLine(line string) (telegraf.Metric, error) {
 	return metric.New(p.Measurement, tags, fields, p.tsModder.tsMod(timestamp))
 }
 
+func (p *Parser) Parse(buf []byte) ([]telegraf.Metric, error) {
+	scanner := bufio.NewScanner(strings.NewReader(string(buf)))
+	var lines []string
+	for scanner.Scan() {
+		lines = append(lines, scanner.Text())
+	}
+	var metrics []telegraf.Metric
+
+	for _, line := range lines {
+		m, err := p.ParseLine(line)
+		if err != nil {
+			return nil, err
+		}
+		metrics = append(metrics, m)
+	}
+
+	return metrics, nil
+}
+
+func (p *Parser) SetDefaultTags(tags map[string]string) {
+	p.DefaultTags = tags
+}
+
 func (p *Parser) addCustomPatterns(scanner *bufio.Scanner) {
 	for scanner.Scan() {
 		line := strings.TrimSpace(scanner.Text())
diff --git a/plugins/inputs/logparser/grok/grok_test.go b/plugins/parsers/grok/parser_test.go
similarity index 94%
rename from plugins/inputs/logparser/grok/grok_test.go
rename to plugins/parsers/grok/parser_test.go
index 075c00ca..09f8fa16 100644
--- a/plugins/inputs/logparser/grok/grok_test.go
+++ b/plugins/parsers/grok/parser_test.go
@@ -4,79 +4,18 @@ import (
 	"testing"
 	"time"
 
-	"github.com/influxdata/telegraf"
-
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
-var benchM telegraf.Metric
-
-func Benchmark_ParseLine_CommonLogFormat(b *testing.B) {
-	p := &Parser{
-		Patterns: []string{"%{COMMON_LOG_FORMAT}"},
+func TestGrokParse(t *testing.T) {
+	parser := Parser{
+		Measurement: "t_met",
+		Patterns:    []string{"%{COMMON_LOG_FORMAT}"},
 	}
-	_ = p.Compile()
-
-	var m telegraf.Metric
-	for n := 0; n < b.N; n++ {
-		m, _ = p.ParseLine(`127.0.0.1 user-identifier frank [10/Oct/2000:13:55:36 -0700] "GET /apache_pb.gif HTTP/1.0" 200 2326`)
-	}
-	benchM = m
-}
-
-func Benchmark_ParseLine_CombinedLogFormat(b *testing.B) {
-	p := &Parser{
-		Patterns: []string{"%{COMBINED_LOG_FORMAT}"},
-	}
-	_ = p.Compile()
-
-	var m telegraf.Metric
-	for n := 0; n < b.N; n++ {
-		m, _ = p.ParseLine(`127.0.0.1 user-identifier frank [10/Oct/2000:13:55:36 -0700] "GET /apache_pb.gif HTTP/1.0" 200 2326 "-" "Mozilla"`)
-	}
-	benchM = m
-}
-
-func Benchmark_ParseLine_CustomPattern(b *testing.B) {
-	p := &Parser{
-		Patterns: []string{"%{TEST_LOG_A}", "%{TEST_LOG_B}"},
-		CustomPatterns: `
-			DURATION %{NUMBER}[nuµm]?s
-			RESPONSE_CODE %{NUMBER:response_code:tag}
-			RESPONSE_TIME %{DURATION:response_time:duration}
-			TEST_LOG_A %{NUMBER:myfloat:float} %{RESPONSE_CODE} %{IPORHOST:clientip} %{RESPONSE_TIME}
-		`,
-	}
-	_ = p.Compile()
-
-	var m telegraf.Metric
-	for n := 0; n < b.N; n++ {
-		m, _ = p.ParseLine(`[04/Jun/2016:12:41:45 +0100] 1.25 200 192.168.1.1 5.432µs 101`)
-	}
-	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`)
+	parser.Compile()
+	_, err := parser.Parse([]byte(`127.0.0.1 user-identifier frank [10/Oct/2000:13:55:36 -0700] "GET /apache_pb.gif HTTP/1.0" 200 2326`))
 	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.
@@ -96,8 +35,7 @@ func TestParsePatternsWithLookahead(t *testing.T) {
 
 func TestMeasurementName(t *testing.T) {
 	p := &Parser{
-		Measurement: "my_web_log",
-		Patterns:    []string{"%{COMMON_LOG_FORMAT}"},
+		Patterns: []string{"%{COMMON_LOG_FORMAT}"},
 	}
 	assert.NoError(t, p.Compile())
 
@@ -116,13 +54,11 @@ func TestMeasurementName(t *testing.T) {
 		},
 		m.Fields())
 	assert.Equal(t, map[string]string{"verb": "GET", "resp_code": "200"}, m.Tags())
-	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}"},
+		Patterns: []string{"%{COMMON_LOG_FORMAT}"},
 	}
 	assert.NoError(t, p.Compile())
 
@@ -140,7 +76,6 @@ func TestCLF_IPv6(t *testing.T) {
 		},
 		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)
@@ -156,7 +91,6 @@ func TestCLF_IPv6(t *testing.T) {
 		},
 		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) {
diff --git a/plugins/parsers/grok/testdata/.DS_Store b/plugins/parsers/grok/testdata/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..15d123ef0efe733881b859864ca23e55a26587a3
GIT binary patch
literal 6148
zcmeHKyH3PF47A~j6DOqWpxlxMBx;)IbQIKl01!Yl5jk<t@9*%HFk_n&fk1^2LUy#C
z&8}x3BV{)h5nVjp9E;3FWQsymRz{4?qg`7OybV+v<4{&|C69P+M+W+fO<en~t#=Lo
ze*F(}FYB|ezizv}MHD2`J>bEMnQdlg!@R)0kED}c?uHyW`G(Ve!Fm3`vB}b<0;xbM
zkP4&%KcWEcY}$0@m_8Lq1yX^H0z4lI3b6^Sj&^jwSqcE0pxF#{<`U$Tz$UOdq6el<
z1v*tD#ZafCy+m9SSRI`%8p(&o%x}qy+Uyv=Sh#58m_8Lq1%?VR_l3=Q|DWQM8BOvn
zBwZ?y3j9|Ebh12OF0i|}TR-iScWptrM4>URvI0YW@DqR+o+JC#>HURu#5IA{k)yEP
Q=)n9DFhSC#0>7ZZD@y@41poj5

literal 0
HcmV?d00001

diff --git a/plugins/parsers/grok/testdata/test-patterns b/plugins/parsers/grok/testdata/test-patterns
new file mode 100644
index 00000000..ba995fbd
--- /dev/null
+++ b/plugins/parsers/grok/testdata/test-patterns
@@ -0,0 +1,14 @@
+# Test A log line:
+#   [04/Jun/2016:12:41:45 +0100] 1.25 200 192.168.1.1 5.432µs 101
+DURATION %{NUMBER}[nuµm]?s
+RESPONSE_CODE %{NUMBER:response_code:tag}
+RESPONSE_TIME %{DURATION:response_time:duration}
+TEST_LOG_A \[%{HTTPDATE:timestamp:ts-httpd}\] %{NUMBER:myfloat:float} %{RESPONSE_CODE} %{IPORHOST:clientip} %{RESPONSE_TIME} %{NUMBER:myint:int}
+
+# Test B log line:
+#   [04/06/2016--12:41:45] 1.25 mystring dropme nomodifier
+TEST_TIMESTAMP %{MONTHDAY}/%{MONTHNUM}/%{YEAR}--%{TIME}
+TEST_LOG_B \[%{TEST_TIMESTAMP:timestamp:ts-"02/01/2006--15:04:05"}\] %{NUMBER:myfloat:float} %{WORD:mystring:string} %{WORD:dropme:drop} %{WORD:nomodifier}
+
+TEST_TIMESTAMP %{MONTHDAY}/%{MONTHNUM}/%{YEAR}--%{TIME}
+TEST_LOG_BAD \[%{TEST_TIMESTAMP:timestamp:ts-"02/01/2006--15:04:05"}\] %{NUMBER:myfloat:float} %{WORD:mystring:int} %{WORD:dropme:drop} %{WORD:nomodifier}
diff --git a/plugins/parsers/grok/testdata/test_a.log b/plugins/parsers/grok/testdata/test_a.log
new file mode 100644
index 00000000..a44d72fd
--- /dev/null
+++ b/plugins/parsers/grok/testdata/test_a.log
@@ -0,0 +1 @@
+[04/Jun/2016:12:41:45 +0100] 1.25 200 192.168.1.1 5.432µs 101
diff --git a/plugins/parsers/grok/testdata/test_b.log b/plugins/parsers/grok/testdata/test_b.log
new file mode 100644
index 00000000..49e2983e
--- /dev/null
+++ b/plugins/parsers/grok/testdata/test_b.log
@@ -0,0 +1 @@
+[04/06/2016--12:41:45] 1.25 mystring dropme nomodifier
diff --git a/plugins/parsers/registry.go b/plugins/parsers/registry.go
index ac6bbbda..24e73d4b 100644
--- a/plugins/parsers/registry.go
+++ b/plugins/parsers/registry.go
@@ -8,6 +8,7 @@ import (
 	"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/grok"
 	"github.com/influxdata/telegraf/plugins/parsers/influx"
 	"github.com/influxdata/telegraf/plugins/parsers/json"
 	"github.com/influxdata/telegraf/plugins/parsers/nagios"
@@ -90,6 +91,13 @@ type Config struct {
 	// 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
+
+	//grok patterns
+	GrokPatterns           []string
+	GrokNamedPatterns      []string
+	GrokCustomPatterns     string
+	GrokCustomPatternFiles []string
+	GrokTimeZone           string
 }
 
 // NewParser returns a Parser interface based on the given config.
@@ -123,12 +131,38 @@ func NewParser(config *Config) (Parser, error) {
 			config.DefaultTags,
 			config.Separator,
 			config.Templates)
+	case "grok":
+		parser, err = newGrokParser(
+			config.MetricName,
+			config.GrokPatterns,
+			config.GrokNamedPatterns,
+			config.GrokCustomPatterns,
+			config.GrokCustomPatternFiles,
+			config.GrokTimeZone)
 	default:
 		err = fmt.Errorf("Invalid data format: %s", config.DataFormat)
 	}
 	return parser, err
 }
 
+func newGrokParser(metricName string,
+	patterns []string,
+	nPatterns []string,
+	cPatterns string,
+	cPatternFiles []string, tZone string) (Parser, error) {
+	parser := grok.Parser{
+		Measurement:        metricName,
+		Patterns:           patterns,
+		NamedPatterns:      nPatterns,
+		CustomPatterns:     cPatterns,
+		CustomPatternFiles: cPatternFiles,
+		Timezone:           tZone,
+	}
+
+	err := parser.Compile()
+	return &parser, err
+}
+
 func NewJSONParser(
 	metricName string,
 	tagKeys []string,

From 14d25af4d4e49dc94fa895a05b3772b8b90ed0c7 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 13 Jul 2018 23:23:47 -0700
Subject: [PATCH 630/835] Remove DS_Store files

---
 plugins/inputs/logparser/grok/testdata/.DS_Store | Bin 6148 -> 0 bytes
 plugins/parsers/grok/testdata/.DS_Store          | Bin 6148 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 plugins/inputs/logparser/grok/testdata/.DS_Store
 delete mode 100644 plugins/parsers/grok/testdata/.DS_Store

diff --git a/plugins/inputs/logparser/grok/testdata/.DS_Store b/plugins/inputs/logparser/grok/testdata/.DS_Store
deleted file mode 100644
index 15d123ef0efe733881b859864ca23e55a26587a3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKyH3PF47A~j6DOqWpxlxMBx;)IbQIKl01!Yl5jk<t@9*%HFk_n&fk1^2LUy#C
z&8}x3BV{)h5nVjp9E;3FWQsymRz{4?qg`7OybV+v<4{&|C69P+M+W+fO<en~t#=Lo
ze*F(}FYB|ezizv}MHD2`J>bEMnQdlg!@R)0kED}c?uHyW`G(Ve!Fm3`vB}b<0;xbM
zkP4&%KcWEcY}$0@m_8Lq1yX^H0z4lI3b6^Sj&^jwSqcE0pxF#{<`U$Tz$UOdq6el<
z1v*tD#ZafCy+m9SSRI`%8p(&o%x}qy+Uyv=Sh#58m_8Lq1%?VR_l3=Q|DWQM8BOvn
zBwZ?y3j9|Ebh12OF0i|}TR-iScWptrM4>URvI0YW@DqR+o+JC#>HURu#5IA{k)yEP
Q=)n9DFhSC#0>7ZZD@y@41poj5

diff --git a/plugins/parsers/grok/testdata/.DS_Store b/plugins/parsers/grok/testdata/.DS_Store
deleted file mode 100644
index 15d123ef0efe733881b859864ca23e55a26587a3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKyH3PF47A~j6DOqWpxlxMBx;)IbQIKl01!Yl5jk<t@9*%HFk_n&fk1^2LUy#C
z&8}x3BV{)h5nVjp9E;3FWQsymRz{4?qg`7OybV+v<4{&|C69P+M+W+fO<en~t#=Lo
ze*F(}FYB|ezizv}MHD2`J>bEMnQdlg!@R)0kED}c?uHyW`G(Ve!Fm3`vB}b<0;xbM
zkP4&%KcWEcY}$0@m_8Lq1yX^H0z4lI3b6^Sj&^jwSqcE0pxF#{<`U$Tz$UOdq6el<
z1v*tD#ZafCy+m9SSRI`%8p(&o%x}qy+Uyv=Sh#58m_8Lq1%?VR_l3=Q|DWQM8BOvn
zBwZ?y3j9|Ebh12OF0i|}TR-iScWptrM4>URvI0YW@DqR+o+JC#>HURu#5IA{k)yEP
Q=)n9DFhSC#0>7ZZD@y@41poj5


From 5f8c9838acffa01d398884265c81f82c589d0747 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 13 Jul 2018 23:25:35 -0700
Subject: [PATCH 631/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 327648db..779e461e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### New Inputs
 
+- [file](./plugins/inputs/file/README.md) - Contributed by @maxunt
 - [tengine](./plugins/inputs/tengine/README.md) - Contributed by @ertaoxu
 
 ### New Processors
@@ -36,6 +37,7 @@
 - [#4386](https://github.com/influxdata/telegraf/pull/4386): Add user tag to procstat input.
 - [#4403](https://github.com/influxdata/telegraf/pull/4403): Add support for multivalue metrics to collectd parser.
 - [#4418](https://github.com/influxdata/telegraf/pull/4418): Add support for setting kafka client id.
+- [#4332](https://github.com/influxdata/telegraf/pull/4332): Add file input plugin and grok parser.
 
 ## v1.7.2 [unreleased]
 

From 3218ed7e0d2b320d6a7d8e2d9a1c7a277b49beca Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 16 Jul 2018 15:10:11 -0700
Subject: [PATCH 632/835] Add logparser deprecation notice to release notes

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 779e461e..705598c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ### Release Notes
 
+- With the addition of the standalone `grok` input data format, the
+  `logparser` input plugin has been deprecated in favor of using the `tail`
+  input plugin combined with `data_format="grok"` .
+
 ### New Inputs
 
 - [file](./plugins/inputs/file/README.md) - Contributed by @maxunt

From b75d66ff41a130f37b8e8499a51117b309e484cd Mon Sep 17 00:00:00 2001
From: Greg <g2linton@gmail.com>
Date: Tue, 17 Jul 2018 15:54:10 -0600
Subject: [PATCH 633/835] Return error if NewRequest fails in http output
 (#4429)

---
 plugins/outputs/http/http.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/outputs/http/http.go b/plugins/outputs/http/http.go
index 198aefe0..e36460ac 100644
--- a/plugins/outputs/http/http.go
+++ b/plugins/outputs/http/http.go
@@ -127,6 +127,9 @@ func (h *HTTP) Write(metrics []telegraf.Metric) error {
 
 func (h *HTTP) write(reqBody []byte) error {
 	req, err := http.NewRequest(h.Method, h.URL, bytes.NewBuffer(reqBody))
+	if err != nil {
+		return err
+	}
 
 	req.Header.Set("Content-Type", defaultContentType)
 	for k, v := range h.Headers {

From 1cc300710c6e89607db9f81faa2a762d7bf22076 Mon Sep 17 00:00:00 2001
From: Greg Linton <g2linton@gmail.com>
Date: Tue, 17 Jul 2018 16:00:47 -0600
Subject: [PATCH 634/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 705598c7..3679d394 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -51,6 +51,7 @@
 - [#4374](https://github.com/influxdata/telegraf/issues/4374): Don't set values when pattern doesn't match in regex processor.
 - [#4416](https://github.com/influxdata/telegraf/issues/4416): Fix output format of printer processor.
 - [#4422](https://github.com/influxdata/telegraf/issues/4422): Fix metric can have duplicate field.
+- [#4389](https://github.com/influxdata/telegraf/issues/4389): Return error if NewRequest fails in http output.
 
 ## v1.7.1 [2018-07-03]
 

From 69d22afcc270e148532eb8965f9db5618391d0f9 Mon Sep 17 00:00:00 2001
From: Greg <g2linton@gmail.com>
Date: Tue, 17 Jul 2018 16:47:09 -0600
Subject: [PATCH 635/835] Reset read deadline for syslog input (#4369)

---
 plugins/inputs/syslog/syslog.go | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/plugins/inputs/syslog/syslog.go b/plugins/inputs/syslog/syslog.go
index 21f6a770..6f8d959e 100644
--- a/plugins/inputs/syslog/syslog.go
+++ b/plugins/inputs/syslog/syslog.go
@@ -19,7 +19,7 @@ import (
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
-const defaultReadTimeout = time.Millisecond * 500
+const defaultReadTimeout = time.Second * 5
 const ipMaxPacketSize = 64 * 1024
 
 // Syslog is a syslog plugin
@@ -279,19 +279,23 @@ func (s *Syslog) handle(conn net.Conn, acc telegraf.Accumulator) {
 		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)
 	}
 
+	if s.ReadTimeout != nil && s.ReadTimeout.Duration > 0 {
+		conn.SetReadDeadline(time.Now().Add(s.ReadTimeout.Duration))
+	}
+
 	p.ParseExecuting(func(r *rfc5425.Result) {
 		s.store(*r, acc)
+		if s.ReadTimeout != nil && s.ReadTimeout.Duration > 0 {
+			conn.SetReadDeadline(time.Now().Add(s.ReadTimeout.Duration))
+		}
 	})
 }
 
@@ -361,7 +365,7 @@ func fields(msg rfc5424.SyslogMessage, s *Syslog) map[string]interface{} {
 	}
 
 	if msg.Message() != nil {
-		flds["message"] = *msg.Message()
+		flds["message"] = strings.TrimSpace(*msg.Message())
 	}
 
 	if msg.StructuredData() != nil {

From f363e70f33ff9bec695dfaba2600282f0c3c5fef Mon Sep 17 00:00:00 2001
From: Greg Linton <g2linton@gmail.com>
Date: Tue, 17 Jul 2018 16:48:41 -0600
Subject: [PATCH 636/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3679d394..5fb05e18 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,6 +52,7 @@
 - [#4416](https://github.com/influxdata/telegraf/issues/4416): Fix output format of printer processor.
 - [#4422](https://github.com/influxdata/telegraf/issues/4422): Fix metric can have duplicate field.
 - [#4389](https://github.com/influxdata/telegraf/issues/4389): Return error if NewRequest fails in http output.
+- [#4335](https://github.com/influxdata/telegraf/issues/4335): Reset read deadline for syslog input.
 
 ## v1.7.1 [2018-07-03]
 

From 4c2786298d02f6b35b1240f7e1816c1b3a01f36f Mon Sep 17 00:00:00 2001
From: Mathevet julien <easyrasta@gmail.com>
Date: Wed, 18 Jul 2018 01:02:03 +0200
Subject: [PATCH 637/835] Exclude cached memory on docker input plugin (#4383)

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

diff --git a/plugins/inputs/docker/docker.go b/plugins/inputs/docker/docker.go
index 5d4cb0de..c98f1f84 100644
--- a/plugins/inputs/docker/docker.go
+++ b/plugins/inputs/docker/docker.go
@@ -534,11 +534,11 @@ func parseContainerStats(
 
 	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"] = uint64(mem)
 		memfields["usage_percent"] = calculateMemPercentUnixNoCache(memLimit, mem)
 	} else {
 		memfields["commit_bytes"] = stat.MemoryStats.Commit

From eb64617e376474c815a9dc3bc954aca4ac55972d Mon Sep 17 00:00:00 2001
From: Greg Linton <g2linton@gmail.com>
Date: Tue, 17 Jul 2018 17:03:15 -0600
Subject: [PATCH 638/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5fb05e18..2b3cd1b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -53,6 +53,7 @@
 - [#4422](https://github.com/influxdata/telegraf/issues/4422): Fix metric can have duplicate field.
 - [#4389](https://github.com/influxdata/telegraf/issues/4389): Return error if NewRequest fails in http output.
 - [#4335](https://github.com/influxdata/telegraf/issues/4335): Reset read deadline for syslog input.
+- [#4375](https://github.com/influxdata/telegraf/issues/4375): Exclude cached memory on docker input plugin.
 
 ## v1.7.1 [2018-07-03]
 

From f37b503f686cbeb985c24c90c96d622da32712b3 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 18 Jul 2018 13:52:49 -0700
Subject: [PATCH 639/835] Set 1.7.2 release date

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b3cd1b4..5ba79061 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,7 +43,7 @@
 - [#4418](https://github.com/influxdata/telegraf/pull/4418): Add support for setting kafka client id.
 - [#4332](https://github.com/influxdata/telegraf/pull/4332): Add file input plugin and grok parser.
 
-## v1.7.2 [unreleased]
+## v1.7.2 [2018-07-18]
 
 ### Bugfixes
 

From 9657870258a3efb8e6ab2f77e87e2aa869927566 Mon Sep 17 00:00:00 2001
From: david7482 <david74.chou@gmail.com>
Date: Tue, 24 Jul 2018 02:00:35 +0800
Subject: [PATCH 640/835] Improve cloudwatch output performance (#4320)

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

diff --git a/plugins/outputs/cloudwatch/cloudwatch.go b/plugins/outputs/cloudwatch/cloudwatch.go
index 39b13cf2..f7ccc1fe 100644
--- a/plugins/outputs/cloudwatch/cloudwatch.go
+++ b/plugins/outputs/cloudwatch/cloudwatch.go
@@ -93,27 +93,17 @@ func (c *CloudWatch) Close() error {
 }
 
 func (c *CloudWatch) Write(metrics []telegraf.Metric) error {
+
+	var datums []*cloudwatch.MetricDatum
 	for _, m := range metrics {
-		err := c.WriteSinglePoint(m)
-		if err != nil {
-			return err
-		}
+		d := BuildMetricDatum(m)
+		datums = append(datums, d...)
 	}
 
-	return nil
-}
-
-// Write data for a single point. A point can have many fields and one field
-// is equal to one MetricDatum. There is a limit on how many MetricDatums a
-// request can have so we process one Point at a time.
-func (c *CloudWatch) WriteSinglePoint(point telegraf.Metric) error {
-	datums := BuildMetricDatum(point)
-
 	const maxDatumsPerCall = 20 // PutMetricData only supports up to 20 data metrics per call
 
 	for _, partition := range PartitionDatums(maxDatumsPerCall, datums) {
 		err := c.WriteToCloudWatch(partition)
-
 		if err != nil {
 			return err
 		}

From be2ea90503ecae992d5b080536a0b1cac36bf927 Mon Sep 17 00:00:00 2001
From: Greg Linton <g2linton@gmail.com>
Date: Mon, 23 Jul 2018 12:03:21 -0600
Subject: [PATCH 641/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ba79061..49bc3a04 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,7 @@
 - [#4403](https://github.com/influxdata/telegraf/pull/4403): Add support for multivalue metrics to collectd parser.
 - [#4418](https://github.com/influxdata/telegraf/pull/4418): Add support for setting kafka client id.
 - [#4332](https://github.com/influxdata/telegraf/pull/4332): Add file input plugin and grok parser.
+- [#4320](https://github.com/influxdata/telegraf/pull/4320): Improve cloudwatch output performance.
 
 ## v1.7.2 [2018-07-18]
 

From d95824a9c18b9824cccd8ba74a51790272b04684 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 24 Jul 2018 10:43:18 -0700
Subject: [PATCH 642/835] Downgrade max aerospike client version to 1.27.0
 (#4462)

This is currently the most recent version without the memory leak issue.
---
 Gopkg.lock | 6 +++---
 Gopkg.toml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index 194bb61e..600c7673 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -59,8 +59,8 @@
     "types/rand",
     "utils/buffer"
   ]
-  revision = "c10b5393e43bd60125aca6289c7b24879edb1787"
-  version = "v1.33.0"
+  revision = "1dc8cf203d24cd454e71ce40ab4cd0bf3112df90"
+  version = "v1.27.0"
 
 [[projects]]
   branch = "master"
@@ -968,6 +968,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "024194b983d91b9500fe97e0aa0ddb5fe725030cb51ddfb034e386cae1098370"
+  inputs-digest = "726abf0a241126b415293c203dddc516e4d8be9b0f2913fb3ab2c4eb332e3ce2"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index 78d3749a..abf1b4a0 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -4,7 +4,7 @@
 
 [[constraint]]
   name = "github.com/aerospike/aerospike-client-go"
-  version = "^1.33.0"
+  version = "<=1.27.0"
 
 [[constraint]]
   name = "github.com/amir/raidman"

From 9051ea9dc0f2c13f6e806beefea771ece29fe077 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 24 Jul 2018 14:57:24 -0700
Subject: [PATCH 643/835] Require dep to be installed before building (#4461)

---
 .circleci/config.yml                          | 75 +++++++++++++++----
 CONTRIBUTING.md                               |  5 +-
 Makefile                                      | 55 ++++++++++----
 README.md                                     | 19 +++--
 appveyor.yml                                  | 15 ++--
 .../inputs/win_services/win_services_test.go  | 24 +++++-
 scripts/build.py                              |  6 +-
 scripts/ci-1.10.docker                        | 28 +++++++
 scripts/ci-1.9.docker                         | 28 +++++++
 scripts/release.sh                            | 35 ---------
 10 files changed, 204 insertions(+), 86 deletions(-)
 create mode 100644 scripts/ci-1.10.docker
 create mode 100644 scripts/ci-1.9.docker
 delete mode 100755 scripts/release.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 578e0bcb..2ddcce1e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,10 +4,10 @@ defaults:
     working_directory: '/go/src/github.com/influxdata/telegraf'
   go-1_9: &go-1_9
     docker:
-      - image: 'circleci/golang:1.9.7'
+      - image: 'quay.io/influxdb/telegraf-ci:1.9.7'
   go-1_10: &go-1_10
     docker:
-      - image: 'circleci/golang:1.10.3'
+      - image: 'quay.io/influxdb/telegraf-ci:1.10.3'
 
 version: 2
 jobs:
@@ -27,53 +27,98 @@ jobs:
           root: '/go/src'
           paths:
             - '*'
+
   test-go-1.9:
     <<: [ *defaults, *go-1_9 ]
     steps:
       - attach_workspace:
           at: '/go/src'
-      - run: 'make test-ci'
+      - run: 'make check'
+      - run: 'make test'
   test-go-1.10:
     <<: [ *defaults, *go-1_10 ]
     steps:
       - attach_workspace:
           at: '/go/src'
-      - run: 'make test-ci'
-      - run: 'GOARCH=386 make test-ci'
+      - run: 'make check'
+      - run: 'make test'
+  test-go-1.10-386:
+    <<: [ *defaults, *go-1_10 ]
+    steps:
+      - attach_workspace:
+          at: '/go/src'
+      - run: 'GOARCH=386 make check'
+      - run: 'GOARCH=386 make test'
+
+  package:
+    <<: [ *defaults, *go-1_10 ]
+    steps:
+      - attach_workspace:
+          at: '/go/src'
+      - run: 'make package'
+      - store_artifacts:
+          path: './build'
+          destination: 'build'
   release:
     <<: [ *defaults, *go-1_10 ]
     steps:
       - attach_workspace:
           at: '/go/src'
-      - run: './scripts/release.sh'
+      - run: 'make package-release'
       - store_artifacts:
-          path: './artifacts'
-          destination: '.'
+          path: './build'
+          destination: 'build'
   nightly:
     <<: [ *defaults, *go-1_10 ]
     steps:
       - attach_workspace:
           at: '/go/src'
-      - run: './scripts/release.sh'
+      - run: 'make package-nightly'
       - store_artifacts:
-          path: './artifacts'
-          destination: '.'
+          path: './build'
+          destination: 'build'
 
 workflows:
   version: 2
-  build_and_release:
+  check:
     jobs:
-      - 'deps'
+      - 'deps':
+          filters:
+            tags:
+              only: /.*/
       - 'test-go-1.9':
           requires:
             - 'deps'
+          filters:
+            tags:
+              only: /.*/
       - 'test-go-1.10':
           requires:
             - 'deps'
+          filters:
+            tags:
+              only: /.*/
+      - 'test-go-1.10-386':
+          requires:
+            - 'deps'
+          filters:
+            tags:
+              only: /.*/
+      - 'package':
+          requires:
+            - 'test-go-1.9'
+            - 'test-go-1.10'
+            - 'test-go-1.10-386'
       - 'release':
           requires:
             - 'test-go-1.9'
             - 'test-go-1.10'
+            - 'test-go-1.10-386'
+          filters:
+            tags:
+              only: /.*/
+            branches:
+              ignore: /.*/
   nightly:
     jobs:
       - 'deps'
@@ -83,10 +128,14 @@ workflows:
       - 'test-go-1.10':
           requires:
             - 'deps'
+      - 'test-go-1.10-386':
+          requires:
+            - 'deps'
       - 'nightly':
           requires:
             - 'test-go-1.9'
             - 'test-go-1.10'
+            - 'test-go-1.10-386'
     triggers:
       - schedule:
           cron: "0 7 * * *"
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 66aa92cc..1a6ace7f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -30,9 +30,8 @@ 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 -u github.com/golang/dep/cmd/dep`
-2. `dep ensure -vendor-only`
-3. `dep ensure -add github.com/[dependency]/[new-package]`
+1. `dep ensure -vendor-only`
+2. `dep ensure -add github.com/[dependency]/[new-package]`
 
 ## Input Plugins
 
diff --git a/Makefile b/Makefile
index b4f89c79..4521c5d7 100644
--- a/Makefile
+++ b/Makefile
@@ -17,10 +17,8 @@ BUILDFLAGS ?=
 
 ifdef GOBIN
 PATH := $(GOBIN):$(PATH)
-else ifdef GOPATH
-PATH := $(subst :,/bin:,$(GOPATH))/bin:$(PATH)
 else
-PATH := $(HOME)/go/bin:$(PATH)
+PATH := $(subst :,/bin:,$(shell go env GOPATH))/bin:$(PATH)
 endif
 
 LDFLAGS := $(LDFLAGS) -X main.commit=$(COMMIT) -X main.branch=$(BRANCH)
@@ -28,33 +26,39 @@ ifdef VERSION
 	LDFLAGS += -X main.version=$(VERSION)
 endif
 
+.PHONY: all
 all:
-	$(MAKE) deps
-	$(MAKE) telegraf
+	@$(MAKE) --no-print-directory deps
+	@$(MAKE) --no-print-directory telegraf
 
+.PHONY: deps
 deps:
-	go get -u github.com/golang/lint/golint
-	go get -u github.com/golang/dep/cmd/dep
 	dep ensure -vendor-only
 
+.PHONY: telegraf
 telegraf:
 	go build -ldflags "$(LDFLAGS)" ./cmd/telegraf
 
+.PHONY: go-install
 go-install:
 	go install -ldflags "-w -s $(LDFLAGS)" ./cmd/telegraf
 
+.PHONY: install
 install: telegraf
 	mkdir -p $(DESTDIR)$(PREFIX)/bin/
 	cp telegraf $(DESTDIR)$(PREFIX)/bin/
 
+
+.PHONY: test
 test:
 	go test -short ./...
 
+.PHONY: fmt
 fmt:
 	@gofmt -w $(filter-out plugins/parsers/influx/machine.go, $(GOFILES))
 
+.PHONY: fmtcheck
 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)" ; \
@@ -62,8 +66,8 @@ fmtcheck:
 		echo "Run make fmt to fix them." ; \
 		exit 1 ;\
 	fi
-	@echo '[INFO] done.'
 
+.PHONY: test-windows
 test-windows:
 	go test -short ./plugins/inputs/ping/...
 	go test -short ./plugins/inputs/win_perf_counters/...
@@ -71,8 +75,7 @@ test-windows:
 	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.
+.PHONY: vet
 vet:
 	@echo 'go vet $$(go list ./... | grep -v ./plugins/parsers/influx)'
 	@go vet $$(go list ./... | grep -v ./plugins/parsers/influx) ; if [ $$? -ne 0 ]; then \
@@ -82,19 +85,33 @@ vet:
 		exit 1; \
 	fi
 
-test-ci: fmtcheck vet
-	go test -short ./...
+.PHONY: check
+check: fmtcheck vet
 
+.PHONY: test-all
 test-all: fmtcheck vet
 	go test ./...
 
+.PHONY: package
 package:
 	./scripts/build.py --package --platform=all --arch=all
 
+.PHONY: package-release
+package-release:
+	./scripts/build.py --release --package --platform=all --arch=all \
+		--upload --bucket=dl.influxdata.com/telegraf/releases
+
+.PHONY: package-nightly
+package-nightly:
+	./scripts/build.py --nightly --package --platform=all --arch=all \
+		--upload --bucket=dl.influxdata.com/telegraf/nightlies
+
+.PHONY: clean
 clean:
 	rm -f telegraf
 	rm -f telegraf.exe
 
+.PHONY: docker-image
 docker-image:
 	./scripts/build.py --package --platform=linux --arch=amd64
 	cp build/telegraf*$(COMMIT)*.deb .
@@ -103,6 +120,7 @@ docker-image:
 plugins/parsers/influx/machine.go: plugins/parsers/influx/machine.go.rl
 	ragel -Z -G2 $^ -o $@
 
+.PHONY: static
 static:
 	@echo "Building static linux binary..."
 	@CGO_ENABLED=0 \
@@ -110,8 +128,17 @@ static:
 	GOARCH=amd64 \
 	go build -ldflags "$(LDFLAGS)" ./cmd/telegraf
 
+.PHONY: plugin-%
 plugin-%:
 	@echo "Starting dev environment for $${$(@)} input plugin..."
 	@docker-compose -f plugins/inputs/$${$(@)}/dev/docker-compose.yml up
 
-.PHONY: deps telegraf install test test-windows lint vet test-all package clean docker-image fmtcheck uint64 static
+.PHONY: ci-1.10
+ci-1.10:
+	docker build -t quay.io/influxdb/telegraf-ci:1.10.3 - < scripts/ci-1.10.docker
+	docker push quay.io/influxdb/telegraf-ci:1.10.3
+
+.PHONY: ci-1.9
+ci-1.9:
+	docker build -t quay.io/influxdb/telegraf-ci:1.9.7 - < scripts/ci-1.9.docker
+	docker push quay.io/influxdb/telegraf-ci:1.9.7
diff --git a/README.md b/README.md
index 75ac9de1..03e3a8f5 100644
--- a/README.md
+++ b/README.md
@@ -42,14 +42,17 @@ Ansible role: https://github.com/rossmcdonald/telegraf
 
 Telegraf requires golang version 1.9 or newer, the Makefile requires GNU make.
 
-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)
-2. [Setup your GOPATH](https://golang.org/doc/code.html#GOPATH)
-3. Run `go get -d github.com/influxdata/telegraf`
-4. Run `cd $GOPATH/src/github.com/influxdata/telegraf`
-5. Run `make`
+1. [Install Go](https://golang.org/doc/install) >=1.9
+2. [Install dep](https://golang.github.io/dep/docs/installation.html) ==v0.4.1
+3. Download Telegraf source:
+   ```
+   go get -d github.com/influxdata/telegraf
+   ```
+4. Run make from the source directory
+   ```
+   cd "$HOME/go/src/github.com/influxdata/telegraf"
+   make
+   ```
 
 ### Nightly Builds
 
diff --git a/appveyor.yml b/appveyor.yml
index 76a5ab06..cd8938ff 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,22 +12,27 @@ platform: x64
 
 install:
   - IF NOT EXIST "C:\Cache" mkdir C:\Cache
-  - 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\go1.10.3.msi" curl -o "C:\Cache\go1.10.3.msi" https://storage.googleapis.com/golang/go1.10.3.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.10.1.msi" /quiet
+  - msiexec.exe /i "C:\Cache\go1.10.3.msi" /quiet
   - 7z x "C:\Cache\gnuwin32-bin.zip" -oC:\GnuWin32 -y
   - 7z x "C:\Cache\gnuwin32-dep.zip" -oC:\GnuWin32 -y
+  - go get -d github.com/golang/dep
+  - cd "%GOPATH%\src\github.com\golang\dep"
+  - git checkout -q v0.4.1
+  - go install -ldflags="-X main.version=v0.4.1" ./cmd/dep
+  - cd "%GOPATH%\src\github.com\influxdata\telegraf"
+  - git config --system core.longpaths true
   - go version
   - go env
-  - git config --system core.longpaths true
 
 build_script:
-  - cmd: C:\GnuWin32\bin\make deps
-  - cmd: C:\GnuWin32\bin\make telegraf
+  - cmd: C:\GnuWin32\bin\make
 
 test_script:
+  - cmd: C:\GnuWin32\bin\make check
   - cmd: C:\GnuWin32\bin\make test-windows
 
 artifacts:
diff --git a/plugins/inputs/win_services/win_services_test.go b/plugins/inputs/win_services/win_services_test.go
index 3c05e85c..37dc3f08 100644
--- a/plugins/inputs/win_services/win_services_test.go
+++ b/plugins/inputs/win_services/win_services_test.go
@@ -5,12 +5,13 @@ package win_services
 import (
 	"errors"
 	"fmt"
+	"testing"
+
 	"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
@@ -84,14 +85,31 @@ 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
+		return mgr.Config{
+			ServiceType:      0,
+			StartType:        uint32(m.testData.startUpMode),
+			ErrorControl:     0,
+			BinaryPathName:   "",
+			LoadOrderGroup:   "",
+			TagId:            0,
+			Dependencies:     nil,
+			ServiceStartName: m.testData.serviceName,
+			DisplayName:      m.testData.displayName,
+			Password:         "",
+			Description:      "",
+		}, 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
+		return svc.Status{
+			State:      svc.State(m.testData.state),
+			Accepts:    0,
+			CheckPoint: 0,
+			WaitHint:   0,
+		}, nil
 	}
 }
 
diff --git a/scripts/build.py b/scripts/build.py
index 344ee48a..27f47f42 100755
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -155,12 +155,8 @@ 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("dep"):
-        logging.info("Downloading `dep`...")
-        get_command = "go get -u github.com/golang/dep/cmd/dep"
-        run(get_command)
     logging.info("Retrieving dependencies with `dep`...")
-    run("{}/bin/dep ensure -v".format(os.environ.get("GOPATH",
+    run("{}/bin/dep ensure -v -vendor-only".format(os.environ.get("GOPATH",
         os.path.expanduser("~/go"))))
     return True
 
diff --git a/scripts/ci-1.10.docker b/scripts/ci-1.10.docker
new file mode 100644
index 00000000..1cfe4c27
--- /dev/null
+++ b/scripts/ci-1.10.docker
@@ -0,0 +1,28 @@
+FROM golang:1.10.3
+
+RUN chmod -R 755 "$GOPATH"
+
+RUN DEBIAN_FRONTEND=noninteractive \
+	apt update && apt install -y --no-install-recommends \
+	autoconf \
+	git \
+	libtool \
+	locales \
+	make \
+	python-boto \
+	rpm \
+	ruby \
+	ruby-dev \
+	zip && \
+	rm -rf /var/lib/apt/lists/*
+
+RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
+RUN locale-gen C.UTF-8 || true
+ENV LANG=C.UTF-8
+
+RUN gem install fpm
+
+RUN go get -d github.com/golang/dep && \
+    cd src/github.com/golang/dep && \
+    git checkout -q v0.4.1 && \
+    go install -ldflags="-X main.version=v0.4.1" ./cmd/dep
diff --git a/scripts/ci-1.9.docker b/scripts/ci-1.9.docker
new file mode 100644
index 00000000..d1ac5f83
--- /dev/null
+++ b/scripts/ci-1.9.docker
@@ -0,0 +1,28 @@
+FROM golang:1.9.7
+
+RUN chmod -R 755 "$GOPATH"
+
+RUN DEBIAN_FRONTEND=noninteractive \
+	apt update && apt install -y --no-install-recommends \
+	autoconf \
+	git \
+	libtool \
+	locales \
+	make \
+	python-boto \
+	rpm \
+	ruby \
+	ruby-dev \
+	zip && \
+	rm -rf /var/lib/apt/lists/*
+
+RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
+RUN locale-gen C.UTF-8 || true
+ENV LANG=C.UTF-8
+
+RUN gem install fpm
+
+RUN go get -d github.com/golang/dep && \
+    cd src/github.com/golang/dep && \
+    git checkout -q v0.4.1 && \
+    go install -ldflags="-X main.version=v0.4.1" ./cmd/dep
diff --git a/scripts/release.sh b/scripts/release.sh
deleted file mode 100755
index 41b95db0..00000000
--- a/scripts/release.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/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 update
-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
-    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 0a4f827f9b79fda6b240f5d3d8765027cf5638e6 Mon Sep 17 00:00:00 2001
From: Chris Goller <goller@gmail.com>
Date: Tue, 24 Jul 2018 21:29:00 -0500
Subject: [PATCH 644/835] Provide function to test metric equality (#4464)

---
 testutil/metric.go      | 16 ++++++++++++
 testutil/metric_test.go | 57 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 testutil/metric.go
 create mode 100644 testutil/metric_test.go

diff --git a/testutil/metric.go b/testutil/metric.go
new file mode 100644
index 00000000..9620fea1
--- /dev/null
+++ b/testutil/metric.go
@@ -0,0 +1,16 @@
+package testutil
+
+import (
+	"testing"
+
+	"github.com/influxdata/telegraf"
+	"github.com/stretchr/testify/require"
+)
+
+// MustEqual requires a and b to be identical.
+func MustEqual(t *testing.T, got telegraf.Metric, want Metric) {
+	require.Equal(t, want.Measurement, got.Name())
+	require.Equal(t, want.Fields, got.Fields())
+	require.Equal(t, want.Tags, got.Tags())
+	require.Equal(t, want.Time, got.Time())
+}
diff --git a/testutil/metric_test.go b/testutil/metric_test.go
new file mode 100644
index 00000000..7295227c
--- /dev/null
+++ b/testutil/metric_test.go
@@ -0,0 +1,57 @@
+package testutil
+
+import (
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/metric"
+)
+
+func TestMustEqual(t *testing.T) {
+	type args struct {
+	}
+	tests := []struct {
+		name string
+		got  telegraf.Metric
+		want Metric
+	}{
+		{
+			name: "telegraf and testutil metrics should be equal",
+			got: func() telegraf.Metric {
+				m, _ := metric.New(
+					"test",
+					map[string]string{
+						"t1": "v1",
+						"t2": "v2",
+					},
+					map[string]interface{}{
+						"f1": 1,
+						"f2": 3.14,
+						"f3": "v3",
+					},
+					time.Unix(0, 0),
+				)
+				return m
+			}(),
+			want: Metric{
+				Measurement: "test",
+				Tags: map[string]string{
+					"t1": "v1",
+					"t2": "v2",
+				},
+				Fields: map[string]interface{}{
+					"f1": int64(1),
+					"f2": 3.14,
+					"f3": "v3",
+				},
+				Time: time.Unix(0, 0),
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			MustEqual(t, tt.got, tt.want)
+		})
+	}
+}

From 6e245b5483a5a8e78fdf55607bff55483a59eceb Mon Sep 17 00:00:00 2001
From: Greg <g2linton@gmail.com>
Date: Wed, 25 Jul 2018 17:10:28 -0600
Subject: [PATCH 645/835] Update docker input plugin to use new library (#4440)

---
 Gopkg.lock                      | 418 +++++++++++++++++++++++++-------
 Gopkg.toml                      |  28 +--
 plugins/inputs/docker/client.go |  18 +-
 3 files changed, 345 insertions(+), 119 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index 600c7673..4a70b057 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -3,48 +3,61 @@
 
 [[projects]]
   branch = "master"
+  digest = "1:d7582b4af1b0b953ff2bb9573a50f787c7e1669cb148fb086a3d1c670a1ac955"
   name = "code.cloudfoundry.org/clock"
   packages = ["."]
+  pruneopts = ""
   revision = "02e53af36e6c978af692887ed449b74026d76fec"
 
 [[projects]]
+  digest = "1:ce7dc0f1ffcd9a2aacc50ae6d322eebff8f4faa2d6c5f445c874cd0b77a63de7"
   name = "collectd.org"
   packages = [
     "api",
     "cdtime",
-    "network"
+    "network",
   ]
+  pruneopts = ""
   revision = "2ce144541b8903101fb8f1483cc0497a68798122"
   version = "v0.3.0"
 
 [[projects]]
+  branch = "master"
+  digest = "1:c1269bfaddefd090935401c291ad5df6c03de605a440e941ecc568e19f0f9e3b"
   name = "github.com/Microsoft/ApplicationInsights-Go"
   packages = [
     "appinsights",
-    "appinsights/contracts"
+    "appinsights/contracts",
   ]
+  pruneopts = ""
   revision = "d2df5d440eda5372f24fcac03839a64d6cb5f7e5"
-  version = "v0.4.2"
 
 [[projects]]
+  digest = "1:ec6a42cd98d70f0916216d8f6df8ca61145edeaad041014aa9c003068de7364c"
   name = "github.com/Microsoft/go-winio"
   packages = ["."]
-  revision = "7da180ee92d8bd8bb8c37fc560e673e6557c392f"
-  version = "v0.4.7"
+  pruneopts = ""
+  revision = "a6d595ae73cf27a1b8fc32930668708f45ce1c85"
+  version = "v0.4.9"
 
 [[projects]]
+  digest = "1:14af5ba5ac88efec490fb59734df34e1bd973198caefa7b0cceed0900ef6164c"
   name = "github.com/Shopify/sarama"
   packages = ["."]
+  pruneopts = ""
   revision = "35324cf48e33d8260e1c7c18854465a904ade249"
   version = "v1.17.0"
 
 [[projects]]
+  digest = "1:f82b8ac36058904227087141017bb82f4b0fc58272990a4cdae3e2d6d222644e"
   name = "github.com/StackExchange/wmi"
   packages = ["."]
+  pruneopts = ""
   revision = "5d049714c4a64225c3c79a7cf7d02f7fb5b96338"
   version = "1.0.0"
 
 [[projects]]
+  digest = "1:855af787df6b733016849082d66ffda5e0e00856513fcac08a7cf199a23515c2"
   name = "github.com/aerospike/aerospike-client-go"
   packages = [
     ".",
@@ -57,42 +70,52 @@
     "types/atomic",
     "types/particle_type",
     "types/rand",
-    "utils/buffer"
+    "utils/buffer",
   ]
+  pruneopts = ""
   revision = "1dc8cf203d24cd454e71ce40ab4cd0bf3112df90"
   version = "v1.27.0"
 
 [[projects]]
   branch = "master"
+  digest = "1:1399282ad03ac819f0e8a747c888407c5c98bb497d33821a7047c7bae667ede0"
   name = "github.com/alecthomas/template"
   packages = [
     ".",
-    "parse"
+    "parse",
   ]
+  pruneopts = ""
   revision = "a0175ee3bccc567396460bf5acd36800cb10c49c"
 
 [[projects]]
   branch = "master"
+  digest = "1:8483994d21404c8a1d489f6be756e25bfccd3b45d65821f25695577791a08e68"
   name = "github.com/alecthomas/units"
   packages = ["."]
+  pruneopts = ""
   revision = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"
 
 [[projects]]
   branch = "master"
+  digest = "1:072692f8d76356228f31f64ca3140041a140011c7dea26e746206e8649c71b31"
   name = "github.com/amir/raidman"
   packages = [
     ".",
-    "proto"
+    "proto",
   ]
+  pruneopts = ""
   revision = "1ccc43bfb9c93cb401a4025e49c64ba71e5e668b"
 
 [[projects]]
   branch = "master"
+  digest = "1:83a67d925714169fa5121021abef0276605c6e4d51c467dd1f0c04344abad1ff"
   name = "github.com/apache/thrift"
   packages = ["lib/go/thrift"]
-  revision = "f5f430df56871bc937950274b2c86681d3db6e59"
+  pruneopts = ""
+  revision = "f2867c24984aa53edec54a138c03db934221bdea"
 
 [[projects]]
+  digest = "1:ca172b51bfe0a1ae7725dc782339fed4ba697dcd44e29a0a1c765fffdbf05ddc"
   name = "github.com/aws/aws-sdk-go"
   packages = [
     "aws",
@@ -114,6 +137,7 @@
     "aws/signer/v4",
     "internal/sdkio",
     "internal/sdkrand",
+    "internal/sdkuri",
     "internal/shareddefaults",
     "private/protocol",
     "private/protocol/json/jsonutil",
@@ -124,162 +148,209 @@
     "private/protocol/xml/xmlutil",
     "service/cloudwatch",
     "service/kinesis",
-    "service/sts"
+    "service/sts",
   ]
-  revision = "bfc1a07cf158c30c41a3eefba8aae043d0bb5bff"
-  version = "v1.14.8"
+  pruneopts = ""
+  revision = "8cf662a972fa7fba8f2c1ec57648cf840e2bb401"
+  version = "v1.14.30"
 
 [[projects]]
   branch = "master"
+  digest = "1:fca298802a2ab834d6eb0e284788ae037ebc324c0f325ff92c5eea592d189cc5"
   name = "github.com/beorn7/perks"
   packages = ["quantile"]
+  pruneopts = ""
   revision = "3a771d992973f24aa725d07868b467d1ddfceafb"
 
 [[projects]]
+  digest = "1:0edb96edcfeee9aeba92e605536fbb1542b0bf6a10cea9d0b5a2227d5a703eae"
   name = "github.com/bsm/sarama-cluster"
   packages = ["."]
+  pruneopts = ""
   revision = "cf455bc755fe41ac9bb2861e7a961833d9c2ecc3"
   version = "v2.1.13"
 
 [[projects]]
+  digest = "1:f619cb9b07aebe5416262cdd8b86082e8d5bdc5264cb3b615ff858df0b645f97"
   name = "github.com/cenkalti/backoff"
   packages = ["."]
+  pruneopts = ""
   revision = "2ea60e5f094469f9e65adb9cd103795b73ae743e"
   version = "v2.0.0"
 
 [[projects]]
   branch = "master"
+  digest = "1:65ae2d1625584ba8d16d1e15b25db1fc62334e2040f22dbbbdc7531c909843b2"
   name = "github.com/couchbase/go-couchbase"
   packages = ["."]
+  pruneopts = ""
   revision = "16db1f1fe037412f12738fa4d8448c549c4edd77"
 
 [[projects]]
   branch = "master"
+  digest = "1:5db54de7054c072f47806c91ef7625ffa00489ca2da5fbc6ca1c78e08018f6bf"
   name = "github.com/couchbase/gomemcached"
   packages = [
     ".",
-    "client"
+    "client",
   ]
+  pruneopts = ""
   revision = "0da75df145308b9a4e6704d762ca9d9b77752efc"
 
 [[projects]]
   branch = "master"
+  digest = "1:0deaa0f28c823119725c8308703f019797bc077e251d1ed3f2b8eae2cc7791d7"
   name = "github.com/couchbase/goutils"
   packages = [
     "logging",
-    "scramsha"
+    "scramsha",
   ]
+  pruneopts = ""
   revision = "e865a1461c8ac0032bd37e2d4dab3289faea3873"
 
 [[projects]]
+  branch = "master"
+  digest = "1:4c015b7445aa37becc220fde9bdbc4d4329f75af72ca1c98f9b0bd698d6068cb"
+  name = "github.com/crewjam/rfc5424"
+  packages = ["."]
+  pruneopts = ""
+  revision = "6ae4b209c3f0d5071494be6b883a1970acadda94"
+
+[[projects]]
+  digest = "1:0a39ec8bf5629610a4bc7873a92039ee509246da3cef1a0ea60f1ed7e5f9cea5"
   name = "github.com/davecgh/go-spew"
   packages = ["spew"]
+  pruneopts = ""
   revision = "346938d642f2ec3594ed81d874461961cd0faa76"
   version = "v1.1.0"
 
 [[projects]]
+  digest = "1:2426da75f49e5b8507a6ed5d4c49b06b2ff795f4aec401c106b7db8fb2625cd7"
   name = "github.com/dgrijalva/jwt-go"
   packages = ["."]
+  pruneopts = ""
   revision = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"
   version = "v3.2.0"
 
 [[projects]]
+  digest = "1:68df19ee476d93359596377b7437bbe49d233fe014becd060ded757aeed531cd"
   name = "github.com/docker/distribution"
   packages = [
-    "digest",
-    "reference"
+    "digestset",
+    "reference",
   ]
-  revision = "48294d928ced5dd9b378f7fd7c6f5da3ff3f2c89"
-  version = "v2.6.2"
+  pruneopts = ""
+  revision = "edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
 
 [[projects]]
+  digest = "1:a21509491bfd5bd1f99abe1d38430fddd16c8c8dc0092f954e224b93ad87f06b"
   name = "github.com/docker/docker"
   packages = [
+    "api",
     "api/types",
     "api/types/blkiodev",
     "api/types/container",
     "api/types/events",
     "api/types/filters",
+    "api/types/image",
     "api/types/mount",
     "api/types/network",
-    "api/types/reference",
     "api/types/registry",
     "api/types/strslice",
     "api/types/swarm",
+    "api/types/swarm/runtime",
     "api/types/time",
     "api/types/versions",
     "api/types/volume",
     "client",
-    "pkg/tlsconfig"
   ]
-  revision = "eef6495eddab52828327aade186443681ed71a4e"
-  version = "v17.03.2-ce-rc1"
+  pruneopts = ""
+  revision = "ed7b6428c133e7c59404251a09b7d6b02fa83cc2"
 
 [[projects]]
+  digest = "1:5b20afc76a36d3994194e2612e83b51bc2b12db3d4d2a722b24474b2d0e3a890"
   name = "github.com/docker/go-connections"
   packages = [
     "nat",
     "sockets",
-    "tlsconfig"
+    "tlsconfig",
   ]
+  pruneopts = ""
   revision = "3ede32e2033de7505e6500d6c868c2b9ed9f169d"
   version = "v0.3.0"
 
 [[projects]]
+  digest = "1:582d54fcb7233da8dde1dfd2210a5b9675d0685f84246a8d317b07d680c18b1b"
   name = "github.com/docker/go-units"
   packages = ["."]
+  pruneopts = ""
   revision = "47565b4f722fb6ceae66b95f853feed578a4a51c"
   version = "v0.3.3"
 
 [[projects]]
+  digest = "1:7bbb118aeef9a6b9fef3d57b6cc5378f7cd6e915cabf4dea695e318e1a1bd4e6"
   name = "github.com/eapache/go-resiliency"
   packages = ["breaker"]
+  pruneopts = ""
   revision = "ea41b0fad31007accc7f806884dcdf3da98b79ce"
   version = "v1.1.0"
 
 [[projects]]
   branch = "master"
+  digest = "1:7b28f7f7c9fb914b30dff111fb910d49bd61d275101f665aea79409bb3ba2ae2"
   name = "github.com/eapache/go-xerial-snappy"
   packages = ["."]
-  revision = "bb955e01b9346ac19dc29eb16586c90ded99a98c"
+  pruneopts = ""
+  revision = "040cc1a32f578808623071247fdbd5cc43f37f5f"
 
 [[projects]]
+  digest = "1:d8d46d21073d0f65daf1740ebf4629c65e04bf92e14ce93c2201e8624843c3d3"
   name = "github.com/eapache/queue"
   packages = ["."]
+  pruneopts = ""
   revision = "44cc805cf13205b55f69e14bcb69867d1ae92f98"
   version = "v1.1.0"
 
 [[projects]]
+  digest = "1:d2e2aebcb8e8027345e16f9d0be8cdee3bb470ba406c7a54cb7457ae3ad4ace5"
   name = "github.com/eclipse/paho.mqtt.golang"
   packages = [
     ".",
-    "packets"
+    "packets",
   ]
+  pruneopts = ""
   revision = "36d01c2b4cbeb3d2a12063e4880ce30800af9560"
   version = "v1.1.1"
 
 [[projects]]
+  digest = "1:d19c78214e03e297e9e30d2eb11892f731358b2951f2a5c7374658a156373e4c"
   name = "github.com/go-ini/ini"
   packages = ["."]
-  revision = "06f5f3d67269ccec1fe5fe4134ba6e982984f7f5"
-  version = "v1.37.0"
+  pruneopts = ""
+  revision = "358ee7663966325963d4e8b2e1fbd570c5195153"
+  version = "v1.38.1"
 
 [[projects]]
+  digest = "1:6a4a01d58b227c4b6b11111b9f172ec5c17682b82724e58e6daf3f19f4faccd8"
   name = "github.com/go-logfmt/logfmt"
   packages = ["."]
+  pruneopts = ""
   revision = "390ab7935ee28ec6b286364bba9b4dd6410cb3d5"
   version = "v0.3.0"
 
 [[projects]]
+  digest = "1:c3a5ae14424a38c244439732c31a08b5f956c46c4acdc159fc285a52dbf11de0"
   name = "github.com/go-ole/go-ole"
   packages = [
     ".",
-    "oleutil"
+    "oleutil",
   ]
+  pruneopts = ""
   revision = "a41e3c4b706f6ae8dfbff342b06e40fa4d2d0506"
   version = "v1.2.1"
 
 [[projects]]
+  digest = "1:f2f6a616a1ca8aed667d956c98f7f6178efe72bbe0a419bd33b9d99841c7de69"
   name = "github.com/go-redis/redis"
   packages = [
     ".",
@@ -289,18 +360,22 @@
     "internal/pool",
     "internal/proto",
     "internal/singleflight",
-    "internal/util"
+    "internal/util",
   ]
+  pruneopts = ""
   revision = "83fb42932f6145ce52df09860384a4653d2d332a"
   version = "v6.12.0"
 
 [[projects]]
+  digest = "1:dc876ae7727280d95f97af5320308131278b93d6c6f5cf953065e18cb8c88fd2"
   name = "github.com/go-sql-driver/mysql"
   packages = ["."]
+  pruneopts = ""
   revision = "d523deb1b23d913de5bdada721a6071e71283618"
   version = "v1.4.0"
 
 [[projects]]
+  digest = "1:b7a7e17513aeee6492d93015c7bf29c86a0c1c91210ea56b21e36c1a40958cba"
   name = "github.com/gobwas/glob"
   packages = [
     ".",
@@ -310,125 +385,157 @@
     "syntax/ast",
     "syntax/lexer",
     "util/runes",
-    "util/strings"
+    "util/strings",
   ]
+  pruneopts = ""
   revision = "5ccd90ef52e1e632236f7326478d4faa74f99438"
   version = "v0.2.3"
 
 [[projects]]
+  digest = "1:673df1d02ca0c6f51458fe94bbb6fae0b05e54084a31db2288f1c4321255c2da"
   name = "github.com/gogo/protobuf"
   packages = ["proto"]
-  revision = "1adfc126b41513cc696b209667c8656ea7aac67c"
-  version = "v1.0.0"
+  pruneopts = ""
+  revision = "636bf0302bc95575d69441b25a2603156ffdddf1"
+  version = "v1.1.1"
 
 [[projects]]
+  digest = "1:b1d3041d568e065ab4d76f7477844458e9209c0bb241eaccdc0770bf0a13b120"
   name = "github.com/golang/protobuf"
   packages = [
     "proto",
     "ptypes",
     "ptypes/any",
     "ptypes/duration",
-    "ptypes/timestamp"
+    "ptypes/timestamp",
   ]
+  pruneopts = ""
   revision = "b4deda0973fb4c70b50d226b1af49f3da59f5265"
   version = "v1.1.0"
 
 [[projects]]
   branch = "master"
+  digest = "1:075128b9fc42e6d99067da1a2e6c0a634a6043b5a60abe6909c51f5ecad37b6d"
   name = "github.com/golang/snappy"
   packages = ["."]
+  pruneopts = ""
   revision = "2e65f85255dbc3072edf28d6b5b8efc472979f5a"
 
 [[projects]]
+  digest = "1:cc082d7b9cc3f832f2aed9d06d1cbb33b6984a61d8ec403535b086415c181607"
   name = "github.com/google/go-cmp"
   packages = [
     "cmp",
     "cmp/internal/diff",
     "cmp/internal/function",
-    "cmp/internal/value"
+    "cmp/internal/value",
   ]
+  pruneopts = ""
   revision = "3af367b6b30c263d47e8895973edcca9a49cf029"
   version = "v0.2.0"
 
 [[projects]]
+  digest = "1:dbbeb8ddb0be949954c8157ee8439c2adfd8dc1c9510eb44a6e58cb68c3dce28"
   name = "github.com/gorilla/context"
   packages = ["."]
+  pruneopts = ""
   revision = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42"
   version = "v1.1.1"
 
 [[projects]]
+  digest = "1:c2c8666b4836c81a1d247bdf21c6a6fc1ab586538ab56f74437c2e0df5c375e1"
   name = "github.com/gorilla/mux"
   packages = ["."]
+  pruneopts = ""
   revision = "e3702bed27f0d39777b0b37b664b6280e8ef8fbf"
   version = "v1.6.2"
 
 [[projects]]
   branch = "master"
+  digest = "1:60b7bc5e043a11213472ae05252527287d20e0a6ccc18f6ae67fad88e41004de"
   name = "github.com/hailocab/go-hostpool"
   packages = ["."]
+  pruneopts = ""
   revision = "e80d13ce29ede4452c43dea11e79b9bc8a15b478"
 
 [[projects]]
+  digest = "1:db58383b43f583c44fb47c3331de943a11bb73ea951c2def55d29a454a57f4ee"
   name = "github.com/hashicorp/consul"
   packages = ["api"]
-  revision = "5174058f0d2bda63fa5198ab96c33d9a909c58ed"
-  version = "v1.1.0"
+  pruneopts = ""
+  revision = "39f93f011e591c842acc8053a7f5972aa6e592fd"
+  version = "v1.2.1"
 
 [[projects]]
   branch = "master"
+  digest = "1:f5d25fd7bdda08e39e01193ef94a1ebf7547b1b931bcdec785d08050598f306c"
   name = "github.com/hashicorp/go-cleanhttp"
   packages = ["."]
+  pruneopts = ""
   revision = "d5fe4b57a186c716b0e00b8c301cbd9b4182694d"
 
 [[projects]]
   branch = "master"
+  digest = "1:cd5813053beac0114f96a7da3924fc8a15e0cd2b139f079e0fcce5d3244ae304"
   name = "github.com/hashicorp/go-rootcerts"
   packages = ["."]
+  pruneopts = ""
   revision = "6bb64b370b90e7ef1fa532be9e591a81c3493e00"
 
 [[projects]]
+  digest = "1:d2b2cff454cb23a9769ef3c9075741f5985773a998584b3b3ce203fe4b1abbea"
   name = "github.com/hashicorp/serf"
   packages = ["coordinate"]
+  pruneopts = ""
   revision = "d6574a5bb1226678d7010325fb6c985db20ee458"
   version = "v0.8.1"
 
 [[projects]]
+  digest = "1:cc0cf2e12280074e5c6dc0f15a4bb3d6c43509e6091cdcdcc83eea491577257b"
   name = "github.com/influxdata/go-syslog"
   packages = [
     "rfc5424",
-    "rfc5425"
+    "rfc5425",
   ]
+  pruneopts = ""
   revision = "eecd51df3ad85464a2bab9b7d3a45bc1e299059e"
   version = "v1.0.1"
 
 [[projects]]
   branch = "master"
+  digest = "1:effc58ad45323ad15159bbca533be4870eaddb2d9a513d3488d8bfe822c83532"
   name = "github.com/influxdata/tail"
   packages = [
     ".",
     "ratelimiter",
     "util",
     "watch",
-    "winfile"
+    "winfile",
   ]
+  pruneopts = ""
   revision = "c43482518d410361b6c383d7aebce33d0471d7bc"
 
 [[projects]]
   branch = "master"
+  digest = "1:d31edcf33a3b36218de96e43f3fec18ea96deb2a28b838a3a01a4df856ded345"
   name = "github.com/influxdata/toml"
   packages = [
     ".",
-    "ast"
+    "ast",
   ]
+  pruneopts = ""
   revision = "2a2e3012f7cfbef64091cc79776311e65dfa211b"
 
 [[projects]]
   branch = "master"
+  digest = "1:a0c157916be0b4de1d4565b1f094b8d746109f94968140dff40a42780fa6ccef"
   name = "github.com/influxdata/wlog"
   packages = ["."]
+  pruneopts = ""
   revision = "7c63b0a71ef8300adc255344d275e10e5c3a71ec"
 
 [[projects]]
+  digest = "1:4197871f269749786aa2406557dba15f10cf79161cdc3998180614c62c8b6351"
   name = "github.com/jackc/pgx"
   packages = [
     ".",
@@ -437,138 +544,195 @@
     "pgio",
     "pgproto3",
     "pgtype",
-    "stdlib"
+    "stdlib",
   ]
+  pruneopts = ""
   revision = "da3231b0b66e2e74cdb779f1d46c5e958ba8be27"
   version = "v3.1.0"
 
 [[projects]]
+  digest = "1:4f767a115bc8e08576f6d38ab73c376fc1b1cd3bb5041171c9e8668cc7739b52"
   name = "github.com/jmespath/go-jmespath"
   packages = ["."]
+  pruneopts = ""
   revision = "0b12d6b5"
 
 [[projects]]
   branch = "master"
+  digest = "1:2c5ad58492804c40bdaf5d92039b0cde8b5becd2b7feeb37d7d1cc36a8aa8dbe"
   name = "github.com/kardianos/osext"
   packages = ["."]
+  pruneopts = ""
   revision = "ae77be60afb1dcacde03767a8c37337fad28ac14"
 
 [[projects]]
   branch = "master"
+  digest = "1:2df59f23f11c5c59982f737c98c5523b276bfc85a4773a04b411190402bb30fd"
   name = "github.com/kardianos/service"
   packages = ["."]
+  pruneopts = ""
   revision = "615a14ed75099c9eaac6949e22ac2341bf9d3197"
 
 [[projects]]
   branch = "master"
+  digest = "1:63e7368fcf6b54804076eaec26fd9cf0c4466166b272393db4b93102e1e962df"
   name = "github.com/kballard/go-shellquote"
   packages = ["."]
+  pruneopts = ""
   revision = "95032a82bc518f77982ea72343cc1ade730072f0"
 
 [[projects]]
   branch = "master"
+  digest = "1:1ed9eeebdf24aadfbca57eb50e6455bd1d2474525e0f0d4454de8c8e9bc7ee9a"
   name = "github.com/kr/logfmt"
   packages = ["."]
+  pruneopts = ""
   revision = "b84e30acd515aadc4b783ad4ff83aff3299bdfe0"
 
 [[projects]]
   branch = "master"
+  digest = "1:28ca57775f285ae87cbdc7280aad91c5f2ed3c2af98d9f035d75956d1ca97fe6"
   name = "github.com/mailru/easyjson"
   packages = [
     ".",
     "buffer",
     "jlexer",
-    "jwriter"
+    "jwriter",
   ]
-  revision = "3fdea8d05856a0c8df22ed4bc71b3219245e4485"
+  pruneopts = ""
+  revision = "efc7eb8984d6655c26b5c9d2e65c024e5767c37c"
 
 [[projects]]
+  digest = "1:49a8b01a6cd6558d504b65608214ca40a78000e1b343ed0da5c6a9ccd83d6d30"
   name = "github.com/matttproud/golang_protobuf_extensions"
   packages = ["pbutil"]
+  pruneopts = ""
   revision = "c12348ce28de40eed0136aa2b644d0ee0650e56c"
   version = "v1.0.1"
 
 [[projects]]
+  digest = "1:f0bad0fece0fb73c6ea249c18d8e80ffbe86be0457715b04463068f04686cf39"
   name = "github.com/miekg/dns"
   packages = ["."]
+  pruneopts = ""
   revision = "5a2b9fab83ff0f8bfc99684bd5f43a37abe560f1"
   version = "v1.0.8"
 
 [[projects]]
   branch = "master"
+  digest = "1:99651e95333755cbe5c9768c1b80031300acca64a80870b40309202b32585a5a"
   name = "github.com/mitchellh/go-homedir"
   packages = ["."]
+  pruneopts = ""
   revision = "3864e76763d94a6df2f9960b16a20a33da9f9a66"
 
 [[projects]]
   branch = "master"
+  digest = "1:f43ed2c836208c14f45158fd01577c985688a4d11cf9fd475a939819fef3b321"
   name = "github.com/mitchellh/mapstructure"
   packages = ["."]
-  revision = "bb74f1db0675b241733089d5a1faa5dd8b0ef57b"
+  pruneopts = ""
+  revision = "f15292f7a699fcc1a38a80977f80a046874ba8ac"
 
 [[projects]]
+  digest = "1:ee2e62b00a9ccc2dba1525f93396e35c847f90f87939df6f361b86315ea5f69a"
   name = "github.com/multiplay/go-ts3"
   packages = ["."]
+  pruneopts = ""
   revision = "d0d44555495c8776880a17e439399e715a4ef319"
   version = "v1.0.0"
 
 [[projects]]
+  digest = "1:ccd0def9f0b82b61c5e54fcbfccf528eabb13b489d008e46dc16b808c2e1f765"
   name = "github.com/naoina/go-stringutil"
   packages = ["."]
+  pruneopts = ""
   revision = "6b638e95a32d0c1131db0e7fe83775cbea4a0d0b"
   version = "v0.1.0"
 
 [[projects]]
+  digest = "1:e5894541d6ceec5dd283e24e3530aadf59c06449695d19189a7a27bb4c15840d"
   name = "github.com/nats-io/gnatsd"
   packages = [
     "conf",
     "logger",
     "server",
     "server/pse",
-    "util"
+    "util",
   ]
-  revision = "add6d7930ae6d4bff8823b28999ea87bf1bfd23d"
-  version = "v1.1.0"
+  pruneopts = ""
+  revision = "6608e9ac3be979dcb0614b772cc86a87b71acaa3"
+  version = "v1.2.0"
 
 [[projects]]
+  digest = "1:88f1bde4c172e27b05ed46adfbd0e79dc1663a6281e4b39fa3e39d71ead9621d"
   name = "github.com/nats-io/go-nats"
   packages = [
     ".",
     "encoders/builtin",
-    "util"
+    "util",
   ]
+  pruneopts = ""
   revision = "062418ea1c2181f52dc0f954f6204370519a868b"
   version = "v1.5.0"
 
 [[projects]]
+  digest = "1:be61e8224b84064109eaba8157cbb4bbe6ca12443e182b6624fdfa1c0dcf53d9"
   name = "github.com/nats-io/nuid"
   packages = ["."]
+  pruneopts = ""
   revision = "289cccf02c178dc782430d534e3c1f5b72af807f"
   version = "v1.0.0"
 
 [[projects]]
+  digest = "1:501cce26a54c785458b0dd54a08ddd984d4ad0c198255430d5d37cd2efe23149"
   name = "github.com/nsqio/go-nsq"
   packages = ["."]
+  pruneopts = ""
   revision = "eee57a3ac4174c55924125bb15eeeda8cffb6e6f"
   version = "v1.0.7"
 
+[[projects]]
+  digest = "1:5d9b668b0b4581a978f07e7d2e3314af18eb27b3fb5d19b70185b7c575723d11"
+  name = "github.com/opencontainers/go-digest"
+  packages = ["."]
+  pruneopts = ""
+  revision = "279bed98673dd5bef374d3b6e4b09e2af76183bf"
+  version = "v1.0.0-rc1"
+
+[[projects]]
+  digest = "1:0d08f7224705b1df80beee92ffbdc63ab13fd6f6eb80bf287735f9bc7e8b83eb"
+  name = "github.com/opencontainers/image-spec"
+  packages = [
+    "specs-go",
+    "specs-go/v1",
+  ]
+  pruneopts = ""
+  revision = "d60099175f88c47cd379c4738d158884749ed235"
+  version = "v1.0.1"
+
 [[projects]]
   branch = "master"
+  digest = "1:2da0e5077ed40453dc281b9a2428d84cf6ad14063aed189f6296ca5dd25cf13d"
   name = "github.com/opentracing-contrib/go-observer"
   packages = ["."]
+  pruneopts = ""
   revision = "a52f2342449246d5bcc273e65cbdcfa5f7d6c63c"
 
 [[projects]]
+  digest = "1:bba12aa4747b212f75db3e7fee73fe1b66d303cb3ff0c1984b7f2ad20e8bd2bc"
   name = "github.com/opentracing/opentracing-go"
   packages = [
     ".",
     "ext",
-    "log"
+    "log",
   ]
+  pruneopts = ""
   revision = "1949ddbfd147afd4d964a9f00b24eb291e0e7c38"
   version = "v1.0.2"
 
 [[projects]]
+  digest = "1:c6c0db6294924072f98a0de090d200bae4b7102b12a443ba9569c4ba7df52aa1"
   name = "github.com/openzipkin/zipkin-go-opentracing"
   packages = [
     ".",
@@ -576,88 +740,110 @@
     "thrift/gen-go/scribe",
     "thrift/gen-go/zipkincore",
     "types",
-    "wire"
+    "wire",
   ]
+  pruneopts = ""
   revision = "26cf9707480e6b90e5eff22cf0bbf05319154232"
   version = "v0.3.4"
 
 [[projects]]
+  digest = "1:41de12a4684237dd55a11260c941c2c58a055951985e9473ba1661175a13fea7"
   name = "github.com/pierrec/lz4"
   packages = [
     ".",
-    "internal/xxh32"
+    "internal/xxh32",
   ]
-  revision = "6b9367c9ff401dbc54fabce3fb8d972e799b702d"
-  version = "v2.0.2"
+  pruneopts = ""
+  revision = "1958fd8fff7f115e79725b1288e0b878b3e06b00"
+  version = "v2.0.3"
 
 [[projects]]
+  digest = "1:7365acd48986e205ccb8652cc746f09c8b7876030d53710ea6ef7d0bd0dcd7ca"
   name = "github.com/pkg/errors"
   packages = ["."]
+  pruneopts = ""
   revision = "645ef00459ed84a119197bfb8d8205042c6df63d"
   version = "v0.8.0"
 
 [[projects]]
+  digest = "1:256484dbbcd271f9ecebc6795b2df8cad4c458dd0f5fd82a8c2fa0c29f233411"
   name = "github.com/pmezard/go-difflib"
   packages = ["difflib"]
+  pruneopts = ""
   revision = "792786c7400a136282c1664665ae0a8db921c6c2"
   version = "v1.0.0"
 
 [[projects]]
+  digest = "1:981835985f655d1d380cc6aa7d9fa9ad7abfaf40c75da200fd40d864cd05a7c3"
   name = "github.com/prometheus/client_golang"
   packages = [
     "prometheus",
-    "prometheus/promhttp"
+    "prometheus/promhttp",
   ]
+  pruneopts = ""
   revision = "c5b7fccd204277076155f10851dad72b76a49317"
   version = "v0.8.0"
 
 [[projects]]
   branch = "master"
+  digest = "1:562d53e436b244a9bb5c1ff43bcaf4882e007575d34ec37717b15751c65cc63a"
   name = "github.com/prometheus/client_model"
   packages = ["go"]
-  revision = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c"
+  pruneopts = ""
+  revision = "5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f"
 
 [[projects]]
   branch = "master"
+  digest = "1:6a8420870eb2935977da1fff0f3afca9bdb3f1e66258c9e91a8a7ce0b5417c3b"
   name = "github.com/prometheus/common"
   packages = [
     "expfmt",
     "internal/bitbucket.org/ww/goautoneg",
     "log",
-    "model"
+    "model",
   ]
+  pruneopts = ""
   revision = "7600349dcfe1abd18d72d3a1770870d9800a7801"
 
 [[projects]]
   branch = "master"
+  digest = "1:00fca823dfcdd8107226f67215afd948b001525223ed955a05b33a4c885c9591"
   name = "github.com/prometheus/procfs"
   packages = [
     ".",
     "internal/util",
     "nfs",
-    "xfs"
+    "xfs",
   ]
-  revision = "7d6f385de8bea29190f15ba9931442a0eaef9af7"
+  pruneopts = ""
+  revision = "ae68e2d4c00fed4943b5f6698d504a5fe083da8a"
 
 [[projects]]
   branch = "master"
+  digest = "1:1b65925989a4dfb6d98ef1d530cda33ab1ff25945b14a22a8b8bb27cc282af70"
   name = "github.com/rcrowley/go-metrics"
   packages = ["."]
+  pruneopts = ""
   revision = "e2704e165165ec55d062f5919b4b29494e9fa790"
 
 [[projects]]
   branch = "master"
+  digest = "1:d8fe9f454582e04b5693b59cdebe3f0bd9dc29ad9651bfb1633cba4658b66c65"
   name = "github.com/samuel/go-zookeeper"
   packages = ["zk"]
+  pruneopts = ""
   revision = "c4fab1ac1bec58281ad0667dc3f0907a9476ac47"
 
 [[projects]]
+  digest = "1:7f569d906bdd20d906b606415b7d794f798f91a62fcfb6a4daa6d50690fb7a3f"
   name = "github.com/satori/go.uuid"
   packages = ["."]
+  pruneopts = ""
   revision = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"
   version = "v1.2.0"
 
 [[projects]]
+  digest = "1:987ce58e999676c2e209831390f2d56621ff98def2ecca4928e73fe1e2569954"
   name = "github.com/shirou/gopsutil"
   packages = [
     "cpu",
@@ -667,100 +853,128 @@
     "load",
     "mem",
     "net",
-    "process"
+    "process",
   ]
-  revision = "eeb1d38d69593f121e060d24d17f7b1f0936b203"
-  version = "v2.18.05"
+  pruneopts = ""
+  revision = "4a180b209f5f494e5923cfce81ea30ba23915877"
+  version = "v2.18.06"
 
 [[projects]]
   branch = "master"
+  digest = "1:99c6a6dab47067c9b898e8c8b13d130c6ab4ffbcc4b7cc6236c2cd0b1e344f5b"
   name = "github.com/shirou/w32"
   packages = ["."]
+  pruneopts = ""
   revision = "bb4de0191aa41b5507caa14b0650cdbddcd9280b"
 
 [[projects]]
+  digest = "1:f2cc92b78b2f3b76ab0f9daddddd28627bcfcc6cacf119029aa3850082d95079"
   name = "github.com/sirupsen/logrus"
   packages = ["."]
+  pruneopts = ""
   revision = "c155da19408a8799da419ed3eeb0cb5db0ad5dbc"
   version = "v1.0.5"
 
 [[projects]]
   branch = "master"
+  digest = "1:79e73b87cb07e380d1a3aaa14fbcc418e0d42eede5f971e7ee2f4a6e6d531deb"
   name = "github.com/soniah/gosnmp"
   packages = ["."]
-  revision = "bcf840db66be7d64bf96c3c0e075c92e3d98f793"
+  pruneopts = ""
+  revision = "96b86229e9b3ffb4b954144cdc7f98fe3ee1003f"
 
 [[projects]]
   branch = "master"
+  digest = "1:0a1f8d01a0191f558910bcbfd7e1dc11a53ac374473d13b68b8fe520f21efb07"
   name = "github.com/streadway/amqp"
   packages = ["."]
+  pruneopts = ""
   revision = "e5adc2ada8b8efff032bf61173a233d143e9318e"
 
 [[projects]]
+  digest = "1:34062a2274daa6ec4d2f50d6070cc51cf4674d6d553ed76b406cb3425b9528e8"
   name = "github.com/stretchr/objx"
   packages = ["."]
+  pruneopts = ""
   revision = "477a77ecc69700c7cdeb1fa9e129548e1c1c393c"
   version = "v0.1.1"
 
 [[projects]]
+  digest = "1:bc2a12c8863e1080226b7bc69192efd6c37aaa9b85cec508b0a8f54fabb9bd9f"
   name = "github.com/stretchr/testify"
   packages = [
     "assert",
     "mock",
-    "require"
+    "require",
   ]
+  pruneopts = ""
   revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686"
   version = "v1.2.2"
 
 [[projects]]
+  digest = "1:e139a0dfe24e723193005b291ed82a975041718cfcab9136aa6c9540df70a4ff"
   name = "github.com/tidwall/gjson"
   packages = ["."]
-  revision = "afaeb9562041a8018c74e006551143666aed08bf"
-  version = "v1.1.1"
+  pruneopts = ""
+  revision = "f123b340873a0084cb27267eddd8ff615115fbff"
+  version = "v1.1.2"
 
 [[projects]]
   branch = "master"
+  digest = "1:4db4f92bb9cb04cfc4fccb36aba2598b02a988008c4cc0692b241214ad8ac96e"
   name = "github.com/tidwall/match"
   packages = ["."]
+  pruneopts = ""
   revision = "1731857f09b1f38450e2c12409748407822dc6be"
 
 [[projects]]
+  digest = "1:23e2b9f3a20cd4a6427147377255ec2f6237e8606fa6ef0707ed79b7bfbe3a83"
   name = "github.com/vjeantet/grok"
   packages = ["."]
+  pruneopts = ""
   revision = "ce01e59abcf6fbc9833b7deb5e4b8ee1769bcc53"
   version = "v1.0.0"
 
 [[projects]]
   branch = "master"
+  digest = "1:5383edd40c7f6c95a7dc46a47bf0c83de4bf40a4252f12fa803f790037addffc"
   name = "github.com/wvanbergen/kafka"
   packages = ["consumergroup"]
+  pruneopts = ""
   revision = "e2edea948ddfee841ea9a263b32ccca15f7d6c2f"
 
 [[projects]]
   branch = "master"
+  digest = "1:f936b4936e1b092cc41c9b33fdc990ad78386545f1ffeca8427c72b2605bca85"
   name = "github.com/wvanbergen/kazoo-go"
   packages = ["."]
+  pruneopts = ""
   revision = "f72d8611297a7cf105da904c04198ad701a60101"
 
 [[projects]]
   branch = "master"
+  digest = "1:9946d558a909f63e31332c77b82649522da97ae7f7cfbfebc6f53549ab6b3e0f"
   name = "github.com/yuin/gopher-lua"
   packages = [
     ".",
     "ast",
     "parse",
-    "pm"
+    "pm",
   ]
-  revision = "ca850f594eaafa5468da2bd53b865e4ee55be18b"
+  pruneopts = ""
+  revision = "46796da1b0b4794e1e341883a399f12cc7574b55"
 
 [[projects]]
   branch = "master"
+  digest = "1:84e9087a94f336c204887281046891769d2ed7bf1d2b31c21ff6fb5e1743abce"
   name = "github.com/zensqlmonitor/go-mssqldb"
   packages = ["."]
+  pruneopts = ""
   revision = "e8fbf836e44e86764eba398361d1825651709547"
 
 [[projects]]
   branch = "master"
+  digest = "1:21100b2e8b6922303dd109da81b3134ed0eff05cb3402881eabde9cce8f4e5e6"
   name = "golang.org/x/crypto"
   packages = [
     "bcrypt",
@@ -769,12 +983,14 @@
     "ed25519/internal/edwards25519",
     "md4",
     "pbkdf2",
-    "ssh/terminal"
+    "ssh/terminal",
   ]
-  revision = "027cca12c2d63e3d62b670d901e8a2c95854feec"
+  pruneopts = ""
+  revision = "a2144134853fc9a27a7b1e3eb4f19f1a76df13c9"
 
 [[projects]]
   branch = "master"
+  digest = "1:58d8f8f3ad415b10d2145316519e5b7995b7cf9e663b33a1e9e0c2ddd96c1d58"
   name = "golang.org/x/net"
   packages = [
     "bpf",
@@ -795,12 +1011,14 @@
     "ipv6",
     "proxy",
     "trace",
-    "websocket"
+    "websocket",
   ]
-  revision = "db08ff08e8622530d9ed3a0e8ac279f6d4c02196"
+  pruneopts = ""
+  revision = "a680a1efc54dd51c040b3b5ce4939ea3cf2ea0d1"
 
 [[projects]]
   branch = "master"
+  digest = "1:a8944db88149e7ecbea4b760c625b9ccf455fceae21387bc8890c3589d28b623"
   name = "golang.org/x/sys"
   packages = [
     "unix",
@@ -809,11 +1027,13 @@
     "windows/svc",
     "windows/svc/debug",
     "windows/svc/eventlog",
-    "windows/svc/mgr"
+    "windows/svc/mgr",
   ]
-  revision = "6c888cc515d3ed83fc103cf1d84468aad274b0a7"
+  pruneopts = ""
+  revision = "ac767d655b305d4e9612f5f6e33120b9176c4ad4"
 
 [[projects]]
+  digest = "1:af9bfca4298ef7502c52b1459df274eed401a4f5498b900e9a92d28d3d87ac5a"
   name = "golang.org/x/text"
   packages = [
     "collate",
@@ -841,39 +1061,46 @@
     "unicode/bidi",
     "unicode/cldr",
     "unicode/norm",
-    "unicode/rangetable"
+    "unicode/rangetable",
   ]
+  pruneopts = ""
   revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"
   version = "v0.3.0"
 
 [[projects]]
+  digest = "1:eede11c81b63c8f6fd06ef24ba0a640dc077196ec9b7a58ecde03c82eee2f151"
   name = "google.golang.org/appengine"
   packages = ["cloudsql"]
+  pruneopts = ""
   revision = "b1f26356af11148e710935ed1ac8a7f5702c7612"
   version = "v1.1.0"
 
 [[projects]]
   branch = "master"
+  digest = "1:8d093c040b734e160cbe8291c7b539c36d2c6dd4581c4bb37cff56078c65bd07"
   name = "google.golang.org/genproto"
   packages = ["googleapis/rpc/status"]
-  revision = "32ee49c4dd805befd833990acba36cb75042378c"
+  pruneopts = ""
+  revision = "fedd2861243fd1a8152376292b921b394c7bef7e"
 
 [[projects]]
+  digest = "1:05f2028524c4eada11e3f46d23139f23e9e0a40b2552207a5af278e8063ce782"
   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",
+    "internal/backoff",
+    "internal/channelz",
+    "internal/grpcrand",
     "keepalive",
     "metadata",
     "naming",
@@ -884,84 +1111,105 @@
     "stats",
     "status",
     "tap",
-    "transport"
+    "transport",
   ]
-  revision = "7a6a684ca69eb4cae85ad0a484f2e531598c047b"
-  version = "v1.12.2"
+  pruneopts = ""
+  revision = "168a6198bcb0ef175f7dacec0b8691fc141dc9b8"
+  version = "v1.13.0"
 
 [[projects]]
+  digest = "1:2840683aa0e9980689f85bf48b2a56ec7a108fd089f12af8ea7d98c172819589"
   name = "gopkg.in/alecthomas/kingpin.v2"
   packages = ["."]
+  pruneopts = ""
   revision = "947dcec5ba9c011838740e680966fd7087a71d0d"
   version = "v2.2.6"
 
 [[projects]]
+  digest = "1:a8f8c1725195c4324d4350fae001524ca7489e40d9b6bb47598772e3faa103ba"
   name = "gopkg.in/asn1-ber.v1"
   packages = ["."]
+  pruneopts = ""
   revision = "379148ca0225df7a432012b8df0355c2a2063ac0"
   version = "v1.2"
 
 [[projects]]
+  digest = "1:581450ae66d7970d91ef9132459fa583e937c6e502f1b96e4ee7783a56fa0b44"
   name = "gopkg.in/fatih/pool.v2"
   packages = ["."]
+  pruneopts = ""
   revision = "010e0b745d12eaf8426c95f9c3924d81dd0b668f"
   version = "v2.0.0"
 
 [[projects]]
+  digest = "1:b2106f1668ea5efc1ecc480f7e922a093adb9563fd9ce58585292871f0d0f229"
   name = "gopkg.in/fsnotify.v1"
   packages = ["."]
+  pruneopts = ""
   revision = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"
   source = "https://github.com/fsnotify/fsnotify/archive/v1.4.7.tar.gz"
   version = "v1.4.7"
 
 [[projects]]
+  digest = "1:5fa5df18f3bd9cad28ed7f263b15da217945735110898fa2b9af25cdafb9cbf3"
   name = "gopkg.in/gorethink/gorethink.v3"
   packages = [
     ".",
     "encoding",
     "ql2",
-    "types"
+    "types",
   ]
+  pruneopts = ""
   revision = "7f5bdfd858bb064d80559b2a32b86669c5de5d3b"
   version = "v3.0.5"
 
 [[projects]]
+  digest = "1:74163d1887c0821951e6f1795a1d10338f45f09d9067cb4a8edcf7ee481724ee"
   name = "gopkg.in/ldap.v2"
   packages = ["."]
+  pruneopts = ""
   revision = "bb7a9ca6e4fbc2129e3db588a34bc970ffe811a9"
   version = "v2.5.1"
 
 [[projects]]
   branch = "v2"
+  digest = "1:f799e95918890212dcf4ce5951291061d318f689977ec9cea0417b08433c2a9d"
   name = "gopkg.in/mgo.v2"
   packages = [
     ".",
     "bson",
     "internal/json",
     "internal/sasl",
-    "internal/scram"
+    "internal/scram",
   ]
-  revision = "3f83fa5005286a7fe593b055f0d7771a7dce4655"
+  pruneopts = ""
+  revision = "9856a29383ce1c59f308dd1cf0363a79b5bef6b5"
 
 [[projects]]
+  digest = "1:427414c304a47b497759094220ce42dd2e838ab7d52de197c633b800c6ff84b5"
   name = "gopkg.in/olivere/elastic.v5"
   packages = [
     ".",
     "config",
-    "uritemplates"
+    "uritemplates",
   ]
-  revision = "b708306d715bea9b983685e94ab4602cdc9f988b"
-  version = "v5.0.69"
+  pruneopts = ""
+  revision = "52741dc2ce53629cbe1e673869040d886cba2cd5"
+  version = "v5.0.70"
 
 [[projects]]
   branch = "v1"
+  digest = "1:a96d16bd088460f2e0685d46c39bcf1208ba46e0a977be2df49864ec7da447dd"
   name = "gopkg.in/tomb.v1"
   packages = ["."]
+  pruneopts = ""
   revision = "dd632973f1e7218eb1089048e0798ec9ae7dceb8"
 
 [[projects]]
+  digest = "1:f0620375dd1f6251d9973b5f2596228cc8042e887cd7f827e4220bc1ce8c30e2"
   name = "gopkg.in/yaml.v2"
   packages = ["."]
+  pruneopts = ""
   revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183"
   version = "v2.2.1"
 
diff --git a/Gopkg.toml b/Gopkg.toml
index abf1b4a0..799b5243 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -17,12 +17,10 @@
 [[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"
@@ -31,46 +29,38 @@
 [[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"
+  revision = "ed7b6428c133e7c59404251a09b7d6b02fa83cc2" # v18.05.0-ce
 
-[[constraint]]
-  name = "github.com/docker/go-connections"
-  version = "0.3.0"
-#  version = "0.2.1"
+[[override]]
+  name = "github.com/docker/distribution"
+  revision = "edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c" # v18.05.0-ce
 
 [[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"
@@ -119,7 +109,6 @@
 [[constraint]]
   name = "github.com/miekg/dns"
   version = "1.0.8"
-#  version = "1.0.0"
 
 [[constraint]]
   name = "github.com/multiplay/go-ts3"
@@ -128,12 +117,10 @@
 [[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"
@@ -142,7 +129,6 @@
 [[constraint]]
   name = "github.com/openzipkin/zipkin-go-opentracing"
   version = "0.3.4"
-#  version = "0.3.0"
 
 [[constraint]]
   name = "github.com/prometheus/client_golang"
@@ -163,12 +149,10 @@
 [[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"
@@ -185,12 +169,10 @@
 [[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"
@@ -215,7 +197,6 @@
 [[constraint]]
   name = "google.golang.org/grpc"
   version = "1.12.2"
-#  version = "1.8.0"
 
 [[constraint]]
   name = "gopkg.in/gorethink/gorethink.v3"
@@ -232,7 +213,6 @@
 [[constraint]]
   name = "gopkg.in/olivere/elastic.v5"
   version = "^5.0.69"
-#  version = "^6.1.23"
 
 [[constraint]]
   name = "gopkg.in/yaml.v2"
diff --git a/plugins/inputs/docker/client.go b/plugins/inputs/docker/client.go
index b66ad009..3ea24ea7 100644
--- a/plugins/inputs/docker/client.go
+++ b/plugins/inputs/docker/client.go
@@ -8,11 +8,10 @@ import (
 	"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"
 )
 
 var (
-	version        = "1.24"
+	version        = "1.21" // 1.24 is when server first started returning its version
 	defaultHeaders = map[string]string{"User-Agent": "engine-api-cli-1.0"}
 )
 
@@ -27,7 +26,7 @@ type Client interface {
 }
 
 func NewEnvClient() (Client, error) {
-	client, err := docker.NewEnvClient()
+	client, err := docker.NewClientWithOpts(docker.FromEnv)
 	if err != nil {
 		return nil, err
 	}
@@ -35,21 +34,20 @@ func NewEnvClient() (Client, error) {
 }
 
 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)
+	client, err := docker.NewClientWithOpts(
+		docker.WithHTTPHeaders(defaultHeaders),
+		docker.WithHTTPClient(httpClient),
+		docker.WithVersion(version),
+		docker.WithHost(host))
 	if err != nil {
 		return nil, err
 	}
+
 	return &SocketClient{client}, nil
 }
 

From 4e1a2536334e4b11979fdc288a55c81a3d16d634 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 26 Jul 2018 15:51:21 -0700
Subject: [PATCH 646/835] Link to SampleConfig documentation in contributing
 guide.

---
 CONTRIBUTING.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1a6ace7f..55cc7f11 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -51,7 +51,9 @@ 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 config`.
+plugin can be configured. This is included in `telegraf config`.  Please
+consult the [SampleConfig](https://github.com/influxdata/telegraf/wiki/SampleConfig)
+page for the latest style guidelines.
 * 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
@@ -192,7 +194,9 @@ 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 config`.
+plugin can be configured. This is included in `telegraf config`.  Please
+consult the [SampleConfig](https://github.com/influxdata/telegraf/wiki/SampleConfig)
+page for the latest style guidelines.
 * The `Description` function should say in one line what this output does.
 
 ### Output Example

From 83c4b81abe796699f12dd66d2ffbbd87ff29b71f Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Fri, 27 Jul 2018 18:28:33 -0700
Subject: [PATCH 647/835] Copy grok documentation from logparser to data format
 doc (#4475)

---
 docs/DATA_FORMATS_INPUT.md         | 301 ++++++++++++++++++++---------
 plugins/inputs/logparser/README.md |   4 +-
 2 files changed, 214 insertions(+), 91 deletions(-)

diff --git a/docs/DATA_FORMATS_INPUT.md b/docs/DATA_FORMATS_INPUT.md
index 24335a45..5a63e9d8 100644
--- a/docs/DATA_FORMATS_INPUT.md
+++ b/docs/DATA_FORMATS_INPUT.md
@@ -2,14 +2,14 @@
 
 Telegraf is able to parse the following input data formats into metrics:
 
-1. [InfluxDB Line Protocol](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#influx)
-1. [JSON](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#json)
-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)
-1. [Dropwizard](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#dropwizard)
-1. [Grok](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#grok)
+1. [InfluxDB Line Protocol](#influx)
+1. [JSON](#json)
+1. [Graphite](#graphite)
+1. [Value](#value), ie: 45 or "booyah"
+1. [Nagios](#nagios) (exec input only)
+1. [Collectd](#collectd)
+1. [Dropwizard](#dropwizard)
+1. [Grok](#grok)
 
 Telegraf metrics, like InfluxDB
 [points](https://docs.influxdata.com/influxdb/v0.10/write_protocols/line/),
@@ -481,9 +481,9 @@ 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"]
 
-  # Multi-value plugins can be handled two ways.  
+  # Multi-value plugins can be handled two ways.
   # "split" will parse and store the multi-value plugin data into separate measurements
-  # "join" will parse and store the multi-value plugin as a single multi-value measurement.  
+  # "join" will parse and store the multi-value plugin as a single multi-value measurement.
   # "split" is the default behavior for backward compatability with previous versions of influxdb.
   collectd_parse_multivalue = "split"
 ```
@@ -566,7 +566,7 @@ measurement,metric_type=histogram count=1,max=1.0,mean=1.0,min=1.0,p50=1.0,p75=1
 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. 
+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
@@ -577,7 +577,7 @@ Eg. to parse the following JSON document:
 		"tag2" : "yellow"
 	},
 	"metrics" : {
-		"counters" : 	{ 
+		"counters" : 	{
 			"measurement" : {
 				"count" : 1
 			}
@@ -641,16 +641,16 @@ For more information about the dropwizard json format see
   ## 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) 
+  ## 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) 
+
+  ## 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) 
+
+  ## 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"
 
@@ -660,79 +660,32 @@ For more information about the dropwizard json format see
   #   tag2 = "tags.tag2"
 ```
 
-#### Grok
-Parse logstash-style "grok" patterns. Patterns can be added to patterns, or custom patterns read from custom_pattern_files.
+# Grok
 
-# View logstash grok pattern docs here:
-#   https://www.elastic.co/guide/en/logstash/current/plugins-filters-grok.html
-# All default logstash patterns are supported, these can be viewed here:
-#   https://github.com/logstash-plugins/logstash-patterns-core/blob/master/patterns/grok-patterns
+The grok data format parses line delimited data using a regular expression like
+language.
 
-# Available modifiers:
-#   string   (default if nothing is specified)
-#   int
-#   float
-#   duration (ie, 5.23ms gets converted to int nanoseconds)
-#   tag      (converts the field into a tag)
-#   drop     (drops the field completely)
-# Timestamp modifiers:
-#   ts-ansic         ("Mon Jan _2 15:04:05 2006")
-#   ts-unix          ("Mon Jan _2 15:04:05 MST 2006")
-#   ts-ruby          ("Mon Jan 02 15:04:05 -0700 2006")
-#   ts-rfc822        ("02 Jan 06 15:04 MST")
-#   ts-rfc822z       ("02 Jan 06 15:04 -0700")
-#   ts-rfc850        ("Monday, 02-Jan-06 15:04:05 MST")
-#   ts-rfc1123       ("Mon, 02 Jan 2006 15:04:05 MST")
-#   ts-rfc1123z      ("Mon, 02 Jan 2006 15:04:05 -0700")
-#   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-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.
-
-# Example log file pattern, example log looks like this:
-#   [04/Jun/2016:12:41:45 +0100] 1.25 200 192.168.1.1 5.432µs
-# Breakdown of the DURATION pattern below:
-#   NUMBER  is a builtin logstash grok pattern matching float & int numbers.
-#   [nuµm]? is a regex specifying 0 or 1 of the characters within brackets.
-#   s       is also regex, this pattern must end in "s".
-# so DURATION will match something like '5.324ms' or '6.1µs' or '10s'
-DURATION %{NUMBER}[nuµm]?s
-RESPONSE_CODE %{NUMBER:response_code:tag}
-RESPONSE_TIME %{DURATION:response_time_ns:duration}
-EXAMPLE_LOG \[%{HTTPDATE:ts:ts-httpd}\] %{NUMBER:myfloat:float} %{RESPONSE_CODE} %{IPORHOST:clientip} %{RESPONSE_TIME}
-
-# Wider-ranging username matching vs. logstash built-in %{USER}
-NGUSERNAME [a-zA-Z0-9\.\@\-\+_%]+
-NGUSER %{NGUSERNAME}
-# Wider-ranging client IP matching
-CLIENT (?:%{IPORHOST}|%{HOSTPORT}|::1)
-
-##
-## COMMON LOG PATTERNS
-##
-
-# apache & nginx logs, this is also known as the "common log format"
-#   see https://en.wikipedia.org/wiki/Common_Log_Format
-COMMON_LOG_FORMAT %{CLIENT:client_ip} %{NOTSPACE:ident} %{NOTSPACE:auth} \[%{HTTPDATE:ts:ts-httpd}\] "(?:%{WORD:verb:tag} %{NOTSPACE:request}(?: HTTP/%{NUMBER:http_version:float})?|%{DATA})" %{NUMBER:resp_code:tag} (?:%{NUMBER:resp_bytes:int}|-)
-
-# Combined log format is the same as the common log format but with the addition
-# of two quoted strings at the end for "referrer" and "agent"
-#   See Examples at http://httpd.apache.org/docs/current/mod/mod_log_config.html
-COMBINED_LOG_FORMAT %{COMMON_LOG_FORMAT} %{QS:referrer} %{QS:agent}
-
-# HTTPD log formats
-HTTPD20_ERRORLOG \[%{HTTPDERROR_DATE:timestamp}\] \[%{LOGLEVEL:loglevel:tag}\] (?:\[client %{IPORHOST:clientip}\] ){0,1}%{GREEDYDATA:errormsg}
-HTTPD24_ERRORLOG \[%{HTTPDERROR_DATE:timestamp}\] \[%{WORD:module}:%{LOGLEVEL:loglevel:tag}\] \[pid %{POSINT:pid:int}:tid %{NUMBER:tid:int}\]( \(%{POSINT:proxy_errorcode:int}\)%{DATA:proxy_errormessage}:)?( \[client %{IPORHOST:client}:%{POSINT:clientport}\])? %{DATA:errorcode}: %{GREEDYDATA:message}
-HTTPD_ERRORLOG %{HTTPD20_ERRORLOG}|%{HTTPD24_ERRORLOG}
+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
 
 #### Grok Configuration:
 ```toml
 [[inputs.reader]]
+  ## Files to parse each interval.
+  ## 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"]
+
+  ## The dataformat to be read from files
+  ## 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 = "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.
@@ -741,9 +694,6 @@ HTTPD_ERRORLOG %{HTTPD20_ERRORLOG}|%{HTTPD24_ERRORLOG}
   ##   %{COMBINED_LOG_FORMAT} (access logs + referrer & agent)
   grok_patterns = ["%{COMBINED_LOG_FORMAT}"]
 
-  ## Name of the outputted measurement name.
-  grok_name_override = "apache_access_log"
-
   ## Full path(s) to custom pattern files.
   grok_custom_pattern_files = []
 
@@ -761,4 +711,179 @@ HTTPD_ERRORLOG %{HTTPD20_ERRORLOG}|%{HTTPD24_ERRORLOG}
   ##   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
   grok_timezone = "Canada/Eastern"
-```
\ No newline at end of file
+```
+
+The Telegraf grok parser uses a slightly modified version of logstash "grok"
+patterns, with the format
+
+```
+%{<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.
+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
+  - float
+  - duration (ie, 5.23ms gets converted to int nanoseconds)
+  - tag      (converts the field into a tag)
+  - drop     (drops the field completely)
+- Timestamp modifiers:
+  - ts               (This will auto-learn the timestamp format)
+  - ts-ansic         ("Mon Jan _2 15:04:05 2006")
+  - ts-unix          ("Mon Jan _2 15:04:05 MST 2006")
+  - ts-ruby          ("Mon Jan 02 15:04:05 -0700 2006")
+  - ts-rfc822        ("02 Jan 06 15:04 MST")
+  - ts-rfc822z       ("02 Jan 06 15:04 -0700")
+  - ts-rfc850        ("Monday, 02-Jan-06 15:04:05 MST")
+  - ts-rfc1123       ("Mon, 02 Jan 2006 15:04:05 MST")
+  - ts-rfc1123z      ("Mon, 02 Jan 2006 15:04:05 -0700")
+  - 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, 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
+"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),
+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!
+
+#### 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 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:
+
+```
+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}
+    '''
+```
+
+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
+[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.
+
+
diff --git a/plugins/inputs/logparser/README.md b/plugins/inputs/logparser/README.md
index 69aedc4b..d35a94a7 100644
--- a/plugins/inputs/logparser/README.md
+++ b/plugins/inputs/logparser/README.md
@@ -1,8 +1,6 @@
 # Logparser Input Plugin
 
-### **Deprecated in version 1.8**: Please use the
-[tail](/plugins/inputs/tail) plugin with the `grok`
-[data format](/docs/DATA_FORMATS_INPUT.md).
+### **Deprecated in version 1.8**: Please use the [tail](/plugins/inputs/tail) plugin with the `grok` [data format](/docs/DATA_FORMATS_INPUT.md).
 
 The `logparser` plugin streams and parses the given logfiles. Currently it
 has the capability of parsing "grok" patterns from logfiles, which also supports

From 96cb0aaea02d4647e684c34cdeebbc72636c270c Mon Sep 17 00:00:00 2001
From: maxunt <max.untrecht@gmail.com>
Date: Fri, 27 Jul 2018 18:29:54 -0700
Subject: [PATCH 648/835] Fix unit tests on Darwin (#4458)

---
 .../http_listener/http_listener_test.go       |  2 +-
 .../http_response/http_response_test.go       |  4 +-
 plugins/inputs/ping/ping.go                   | 10 +--
 plugins/inputs/ping/ping_test.go              | 79 +++++--------------
 .../socket_listener/socket_listener_test.go   |  6 +-
 plugins/inputs/syslog/rfc5425_test.go         | 10 ++-
 plugins/inputs/syslog/rfc5426_test.go         | 12 ++-
 plugins/outputs/influxdb/udp_test.go          |  2 +-
 .../socket_writer/socket_writer_test.go       |  4 +-
 9 files changed, 50 insertions(+), 79 deletions(-)

diff --git a/plugins/inputs/http_listener/http_listener_test.go b/plugins/inputs/http_listener/http_listener_test.go
index 7c6cdf72..3277e534 100644
--- a/plugins/inputs/http_listener/http_listener_test.go
+++ b/plugins/inputs/http_listener/http_listener_test.go
@@ -336,7 +336,7 @@ 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" {
+	if runtime.GOOS == "darwin" {
 		t.Skip("Skipping due to hang on darwin")
 	}
 	listener := newTestHTTPListener()
diff --git a/plugins/inputs/http_response/http_response_test.go b/plugins/inputs/http_response/http_response_test.go
index 7d3780ce..a33805db 100644
--- a/plugins/inputs/http_response/http_response_test.go
+++ b/plugins/inputs/http_response/http_response_test.go
@@ -662,10 +662,10 @@ func TestNetworkErrors(t *testing.T) {
 
 	// Connecton failed
 	h = &HTTPResponse{
-		Address:         "https://127.127.127.127", // Any non-routable IP works here
+		Address:         "https:/nonexistent.nonexistent", // Any non-routable IP works here
 		Body:            "",
 		Method:          "GET",
-		ResponseTimeout: internal.Duration{Duration: time.Second * 20},
+		ResponseTimeout: internal.Duration{Duration: time.Second * 5},
 		FollowRedirects: false,
 	}
 
diff --git a/plugins/inputs/ping/ping.go b/plugins/inputs/ping/ping.go
index 49247478..7ddbf275 100644
--- a/plugins/inputs/ping/ping.go
+++ b/plugins/inputs/ping/ping.go
@@ -94,7 +94,7 @@ func (p *Ping) Gather(acc telegraf.Accumulator) error {
 				return
 			}
 
-			args := p.args(u)
+			args := p.args(u, runtime.GOOS)
 			totalTimeout := float64(p.Count)*p.Timeout + float64(p.Count-1)*p.PingInterval
 
 			out, err := p.pingHost(totalTimeout, args...)
@@ -167,14 +167,14 @@ func hostPinger(timeout float64, args ...string) (string, error) {
 }
 
 // args returns the arguments for the 'ping' executable
-func (p *Ping) args(url string) []string {
+func (p *Ping) args(url string, system 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))
 	}
 	if p.Timeout > 0 {
-		switch runtime.GOOS {
+		switch system {
 		case "darwin", "freebsd", "netbsd", "openbsd":
 			args = append(args, "-W", strconv.FormatFloat(p.Timeout*1000, 'f', -1, 64))
 		case "linux":
@@ -185,7 +185,7 @@ func (p *Ping) args(url string) []string {
 		}
 	}
 	if p.Deadline > 0 {
-		switch runtime.GOOS {
+		switch system {
 		case "darwin", "freebsd", "netbsd", "openbsd":
 			args = append(args, "-t", strconv.Itoa(p.Deadline))
 		case "linux":
@@ -196,7 +196,7 @@ func (p *Ping) args(url string) []string {
 		}
 	}
 	if p.Interface != "" {
-		switch runtime.GOOS {
+		switch system {
 		case "darwin", "freebsd", "netbsd", "openbsd":
 			args = append(args, "-S", p.Interface)
 		case "linux":
diff --git a/plugins/inputs/ping/ping_test.go b/plugins/inputs/ping/ping_test.go
index 9817d07c..d5b82608 100644
--- a/plugins/inputs/ping/ping_test.go
+++ b/plugins/inputs/ping/ping_test.go
@@ -5,12 +5,12 @@ package ping
 import (
 	"errors"
 	"reflect"
-	"runtime"
 	"sort"
 	"testing"
 
 	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 // BSD/Darwin ping output
@@ -99,68 +99,29 @@ func TestErrorProcessPingOutput(t *testing.T) {
 // Test that arg lists and created correctly
 func TestArgs(t *testing.T) {
 	p := Ping{
-		Count: 2,
+		Count:        2,
+		Interface:    "eth0",
+		Timeout:      12.0,
+		Deadline:     24,
+		PingInterval: 1.2,
 	}
 
-	// Actual and Expected arg lists must be sorted for reflect.DeepEqual
-
-	actual := p.args("www.google.com")
-	expected := []string{"-c", "2", "-n", "-s", "16", "www.google.com"}
-	sort.Strings(actual)
-	sort.Strings(expected)
-	assert.True(t, reflect.DeepEqual(expected, actual),
-		"Expected: %s Actual: %s", expected, actual)
-
-	p.Interface = "eth0"
-	actual = p.args("www.google.com")
-	expected = []string{"-c", "2", "-n", "-s", "16", "-I", "eth0",
-		"www.google.com"}
-	sort.Strings(actual)
-	sort.Strings(expected)
-	assert.True(t, reflect.DeepEqual(expected, actual),
-		"Expected: %s Actual: %s", expected, actual)
-
-	p.Timeout = 12.0
-	actual = p.args("www.google.com")
-	switch runtime.GOOS {
-	case "darwin":
-		expected = []string{"-c", "2", "-n", "-s", "16", "-I", "eth0", "-W",
-			"12000.0", "www.google.com"}
-	default:
-		expected = []string{"-c", "2", "-n", "-s", "16", "-I", "eth0", "-W",
-			"12", "www.google.com"}
+	var systemCases = []struct {
+		system string
+		output []string
+	}{
+		{"darwin", []string{"-c", "2", "-n", "-s", "16", "-i", "1.2", "-W", "12000", "-t", "24", "-S", "eth0", "www.google.com"}},
+		{"linux", []string{"-c", "2", "-n", "-s", "16", "-i", "1.2", "-W", "12", "-w", "24", "-I", "eth0", "www.google.com"}},
+		{"anything else", []string{"-c", "2", "-n", "-s", "16", "-i", "1.2", "-W", "12", "-w", "24", "-I", "eth0", "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", "-w", "24", "www.google.com"}
+	for i := range systemCases {
+		actual := p.args("www.google.com", systemCases[i].system)
+		expected := systemCases[i].output
+		sort.Strings(actual)
+		sort.Strings(expected)
+		require.True(t, reflect.DeepEqual(expected, actual),
+			"Expected: %s Actual: %s", expected, actual)
 	}
-
-	sort.Strings(actual)
-	sort.Strings(expected)
-	assert.True(t, reflect.DeepEqual(expected, actual),
-		"Expected: %s Actual: %s", expected, actual)
-
-	p.PingInterval = 1.2
-	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", "-i", "1.2", "www.google.com"}
-	default:
-		expected = []string{"-c", "2", "-n", "-s", "16", "-I", "eth0", "-W",
-			"12", "-w", "24", "-i", "1.2", "www.google.com"}
-	}
-	sort.Strings(actual)
-	sort.Strings(expected)
-	assert.True(t, reflect.DeepEqual(expected, actual),
-		"Expected: %s Actual: %s", expected, actual)
 }
 
 func mockHostPinger(timeout float64, args ...string) (string, error) {
diff --git a/plugins/inputs/socket_listener/socket_listener_test.go b/plugins/inputs/socket_listener/socket_listener_test.go
index 4370ac57..26691ef5 100644
--- a/plugins/inputs/socket_listener/socket_listener_test.go
+++ b/plugins/inputs/socket_listener/socket_listener_test.go
@@ -55,7 +55,7 @@ func TestSocketListener_unix_tls(t *testing.T) {
 	tmpdir, err := ioutil.TempDir("", "telegraf")
 	require.NoError(t, err)
 	defer os.RemoveAll(tmpdir)
-	sock := filepath.Join(tmpdir, "socket_listener.TestSocketListener_unix_tls.sock")
+	sock := filepath.Join(tmpdir, "sl.TestSocketListener_unix_tls.sock")
 
 	sl := newSocketListener()
 	sl.ServiceAddress = "unix://" + sock
@@ -116,7 +116,7 @@ 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")
+	sock := filepath.Join(tmpdir, "sl.TestSocketListener_unix.sock")
 
 	defer testEmptyLog(t)()
 
@@ -140,7 +140,7 @@ 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")
+	sock := filepath.Join(tmpdir, "sl.TestSocketListener_unixgram.sock")
 
 	defer testEmptyLog(t)()
 
diff --git a/plugins/inputs/syslog/rfc5425_test.go b/plugins/inputs/syslog/rfc5425_test.go
index 1b69e602..de5835e6 100644
--- a/plugins/inputs/syslog/rfc5425_test.go
+++ b/plugins/inputs/syslog/rfc5425_test.go
@@ -403,13 +403,16 @@ func testStrictRFC5425(t *testing.T, protocol string, address string, wantTLS bo
 			acc.Errors = make([]error, 0)
 
 			// Write
-			conn.Write(tc.data)
+			_, err = conn.Write(tc.data)
+			conn.Close()
+			require.NoError(t, err)
 
 			// 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)
 
@@ -452,7 +455,6 @@ func testBestEffortRFC5425(t *testing.T, protocol string, address string, wantTL
 				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)
@@ -462,7 +464,9 @@ func testBestEffortRFC5425(t *testing.T, protocol string, address string, wantTL
 			acc.Errors = make([]error, 0)
 
 			// Write
-			conn.Write(tc.data)
+			_, err = conn.Write(tc.data)
+			require.NoError(t, err)
+			conn.Close()
 
 			// Wait that the the number of data points is accumulated
 			// Since the receiver is running concurrently
diff --git a/plugins/inputs/syslog/rfc5426_test.go b/plugins/inputs/syslog/rfc5426_test.go
index cae46518..8304a540 100644
--- a/plugins/inputs/syslog/rfc5426_test.go
+++ b/plugins/inputs/syslog/rfc5426_test.go
@@ -234,12 +234,18 @@ func testRFC5426(t *testing.T, protocol string, address string, bestEffort bool)
 			// 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)
+			_, err = conn.Write(tc.data)
+			conn.Close()
+			if err != nil {
+				if err, ok := err.(*net.OpError); ok {
+					if err.Err.Error() == "write: message too long" {
+						return
+					}
+				}
+			}
 
 			// Waiting ...
 			if tc.wantStrict == nil && tc.werr || bestEffort && tc.werr {
diff --git a/plugins/outputs/influxdb/udp_test.go b/plugins/outputs/influxdb/udp_test.go
index 017ee0be..9bced426 100644
--- a/plugins/outputs/influxdb/udp_test.go
+++ b/plugins/outputs/influxdb/udp_test.go
@@ -202,7 +202,7 @@ func TestUDP_SerializeError(t *testing.T) {
 }
 
 func TestUDP_WriteWithRealConn(t *testing.T) {
-	conn, err := net.ListenPacket("udp", "127.0.0.0:0")
+	conn, err := net.ListenPacket("udp", "127.0.0.1:0")
 	require.NoError(t, err)
 
 	metrics := []telegraf.Metric{
diff --git a/plugins/outputs/socket_writer/socket_writer_test.go b/plugins/outputs/socket_writer/socket_writer_test.go
index 4d93469f..f7eb159e 100644
--- a/plugins/outputs/socket_writer/socket_writer_test.go
+++ b/plugins/outputs/socket_writer/socket_writer_test.go
@@ -49,7 +49,7 @@ func TestSocketWriter_unix(t *testing.T) {
 	tmpdir, err := ioutil.TempDir("", "telegraf")
 	require.NoError(t, err)
 	defer os.RemoveAll(tmpdir)
-	sock := filepath.Join(tmpdir, "socket_writer.TestSocketWriter_unix.sock")
+	sock := filepath.Join(tmpdir, "sw.TestSocketWriter_unix.sock")
 
 	listener, err := net.Listen("unix", sock)
 	require.NoError(t, err)
@@ -70,7 +70,7 @@ func TestSocketWriter_unixgram(t *testing.T) {
 	tmpdir, err := ioutil.TempDir("", "telegraf")
 	require.NoError(t, err)
 	defer os.RemoveAll(tmpdir)
-	sock := filepath.Join(tmpdir, "socket_writer.TestSocketWriter_unixgram.sock")
+	sock := filepath.Join(tmpdir, "sw.TSW_unixgram.sock")
 
 	listener, err := net.ListenPacket("unixgram", sock)
 	require.NoError(t, err)

From 019d265167eac47ed858766d77cc153f92129763 Mon Sep 17 00:00:00 2001
From: Greg <g2linton@gmail.com>
Date: Fri, 27 Jul 2018 19:39:37 -0600
Subject: [PATCH 649/835] Add dev/telegraf.conf for docker, exec, and procstat
 input (#4460)

---
 plugins/inputs/docker/dev/telegraf.conf   | 13 ++++++++++++
 plugins/inputs/exec/dev/telegraf.conf     | 26 +++++++++++++++++++++++
 plugins/inputs/procstat/dev/telegraf.conf |  9 ++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 plugins/inputs/docker/dev/telegraf.conf
 create mode 100644 plugins/inputs/exec/dev/telegraf.conf
 create mode 100644 plugins/inputs/procstat/dev/telegraf.conf

diff --git a/plugins/inputs/docker/dev/telegraf.conf b/plugins/inputs/docker/dev/telegraf.conf
new file mode 100644
index 00000000..06bbb46a
--- /dev/null
+++ b/plugins/inputs/docker/dev/telegraf.conf
@@ -0,0 +1,13 @@
+[agent]
+  interval="1s"
+  flush_interval="1s"
+
+[[inputs.docker]]
+  endpoint = "unix:///var/run/docker.sock"
+  timeout = "5s"
+  perdevice = true
+  total = false
+  container_names = []
+
+[[outputs.file]]
+  files = ["stdout"]
diff --git a/plugins/inputs/exec/dev/telegraf.conf b/plugins/inputs/exec/dev/telegraf.conf
new file mode 100644
index 00000000..04433410
--- /dev/null
+++ b/plugins/inputs/exec/dev/telegraf.conf
@@ -0,0 +1,26 @@
+[agent]
+  interval="1s"
+  flush_interval="1s"
+
+[[inputs.exec]]
+  timeout = "1s"
+  data_format = "influx"
+  commands = [
+    "echo 'deal,computer_name=hosta message=\"stuff\" 1530654676316265790'",
+    "echo 'deal,computer_name=hostb message=\"stuff\" 1530654676316265790'",
+  ]
+
+[[processors.regex]]
+  [[processors.regex.tags]]
+    key = "computer_name"
+    pattern = "^(.*?)a$"
+    replacement = "${1}"
+    result_key = "server_name"
+  [[processors.regex.tags]]
+    key = "computer_name"
+    pattern = "^(.*?)b$"
+    replacement = "${1}"
+    result_key = "server_name"
+
+[[outputs.file]]
+  files = ["stdout"]
diff --git a/plugins/inputs/procstat/dev/telegraf.conf b/plugins/inputs/procstat/dev/telegraf.conf
new file mode 100644
index 00000000..63b150d7
--- /dev/null
+++ b/plugins/inputs/procstat/dev/telegraf.conf
@@ -0,0 +1,9 @@
+[agent]
+  interval="1s"
+  flush_interval="1s"
+
+[[inputs.procstat]]
+  exe = "telegraf"
+
+[[outputs.file]]
+  files = ["stdout"]

From a897b84049567c6eda0dfee214e670fb700f6dd0 Mon Sep 17 00:00:00 2001
From: Jiri Tyr <jtyr@users.noreply.github.com>
Date: Mon, 30 Jul 2018 20:12:45 +0100
Subject: [PATCH 650/835] Adding x509_cert input plugin (#3768)

---
 plugins/inputs/all/all.go                  |   1 +
 plugins/inputs/x509_cert/README.md         |  45 +++++
 plugins/inputs/x509_cert/x509_cert.go      | 163 ++++++++++++++++
 plugins/inputs/x509_cert/x509_cert_test.go | 205 +++++++++++++++++++++
 4 files changed, 414 insertions(+)
 create mode 100644 plugins/inputs/x509_cert/README.md
 create mode 100644 plugins/inputs/x509_cert/x509_cert.go
 create mode 100644 plugins/inputs/x509_cert/x509_cert_test.go

diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index 8594db0a..8989684e 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -124,6 +124,7 @@ import (
 	_ "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/x509_cert"
 	_ "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/x509_cert/README.md b/plugins/inputs/x509_cert/README.md
new file mode 100644
index 00000000..6b922f0e
--- /dev/null
+++ b/plugins/inputs/x509_cert/README.md
@@ -0,0 +1,45 @@
+# X509 Cert Input Plugin
+
+This plugin provides information about X509 certificate accessible via local
+file or network connection.
+
+
+### Configuration
+
+```toml
+# Reads metrics from a SSL certificate
+[[inputs.x509_cert]]
+  ## List certificate sources
+  sources = ["/etc/ssl/certs/ssl-cert-snakeoil.pem", "https://example.org"]
+
+  ## Timeout for SSL connection
+  # 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
+```
+
+
+### Metrics
+
+- `x509_cert`
+  - tags:
+    - `source` - source of the certificate
+  - fields:
+    - `expiry` (int, seconds)
+    - `age` (int, seconds)
+    - `startdate` (int, seconds)
+    - `enddate` (int, seconds)
+
+
+### Example output
+
+```
+x509_cert,host=myhost,source=https://example.org age=1753627i,expiry=5503972i,startdate=1516092060i,enddate=1523349660i 1517845687000000000
+x509_cert,host=myhost,source=/etc/ssl/certs/ssl-cert-snakeoil.pem age=7522207i,expiry=308002732i,startdate=1510323480i,enddate=1825848420i 1517845687000000000
+```
diff --git a/plugins/inputs/x509_cert/x509_cert.go b/plugins/inputs/x509_cert/x509_cert.go
new file mode 100644
index 00000000..2e5d2699
--- /dev/null
+++ b/plugins/inputs/x509_cert/x509_cert.go
@@ -0,0 +1,163 @@
+// Package x509_cert reports metrics from an SSL certificate.
+package x509_cert
+
+import (
+	"crypto/tls"
+	"crypto/x509"
+	"encoding/pem"
+	"fmt"
+	"io/ioutil"
+	"net"
+	"net/url"
+	"strings"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	_tls "github.com/influxdata/telegraf/internal/tls"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+const sampleConfig = `
+  ## List certificate sources
+  sources = ["/etc/ssl/certs/ssl-cert-snakeoil.pem", "tcp://example.org:443"]
+
+  ## Timeout for SSL connection
+  # 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
+`
+const description = "Reads metrics from a SSL certificate"
+
+// X509Cert holds the configuration of the plugin.
+type X509Cert struct {
+	Sources []string          `toml:"sources"`
+	Timeout internal.Duration `toml:"timeout"`
+	_tls.ClientConfig
+}
+
+// Description returns description of the plugin.
+func (c *X509Cert) Description() string {
+	return description
+}
+
+// SampleConfig returns configuration sample for the plugin.
+func (c *X509Cert) SampleConfig() string {
+	return sampleConfig
+}
+
+func (c *X509Cert) getCert(location string, timeout time.Duration) ([]*x509.Certificate, error) {
+	if strings.HasPrefix(location, "/") {
+		location = "file://" + location
+	}
+
+	u, err := url.Parse(location)
+	if err != nil {
+		return nil, fmt.Errorf("failed to parse cert location - %s\n", err.Error())
+	}
+
+	switch u.Scheme {
+	case "https":
+		u.Scheme = "tcp"
+		fallthrough
+	case "udp", "udp4", "udp6":
+		fallthrough
+	case "tcp", "tcp4", "tcp6":
+		tlsCfg, err := c.ClientConfig.TLSConfig()
+		if err != nil {
+			return nil, err
+		}
+
+		ipConn, err := net.DialTimeout(u.Scheme, u.Host, timeout)
+		if err != nil {
+			return nil, err
+		}
+		defer ipConn.Close()
+
+		conn := tls.Client(ipConn, tlsCfg)
+		defer conn.Close()
+
+		hsErr := conn.Handshake()
+		if hsErr != nil {
+			return nil, hsErr
+		}
+
+		certs := conn.ConnectionState().PeerCertificates
+
+		return certs, nil
+	case "file":
+		content, err := ioutil.ReadFile(u.Path)
+		if err != nil {
+			return nil, err
+		}
+
+		block, _ := pem.Decode(content)
+		if block == nil {
+			return nil, fmt.Errorf("failed to parse certificate PEM")
+		}
+
+		cert, err := x509.ParseCertificate(block.Bytes)
+		if err != nil {
+			return nil, err
+		}
+
+		return []*x509.Certificate{cert}, nil
+	default:
+		return nil, fmt.Errorf("unsuported scheme '%s' in location %s\n", u.Scheme, location)
+	}
+}
+
+func getFields(cert *x509.Certificate, now time.Time) map[string]interface{} {
+	age := int(now.Sub(cert.NotBefore).Seconds())
+	expiry := int(cert.NotAfter.Sub(now).Seconds())
+	startdate := cert.NotBefore.Unix()
+	enddate := cert.NotAfter.Unix()
+
+	fields := map[string]interface{}{
+		"age":       age,
+		"expiry":    expiry,
+		"startdate": startdate,
+		"enddate":   enddate,
+	}
+
+	return fields
+}
+
+// Gather adds metrics into the accumulator.
+func (c *X509Cert) Gather(acc telegraf.Accumulator) error {
+	now := time.Now()
+
+	for _, location := range c.Sources {
+		certs, err := c.getCert(location, c.Timeout.Duration*time.Second)
+		if err != nil {
+			return fmt.Errorf("cannot get SSL cert '%s': %s", location, err.Error())
+		}
+
+		tags := map[string]string{
+			"source": location,
+		}
+
+		for _, cert := range certs {
+			fields := getFields(cert, now)
+
+			acc.AddFields("x509_cert", fields, tags)
+		}
+	}
+
+	return nil
+}
+
+func init() {
+	inputs.Add("x509_cert", func() telegraf.Input {
+		return &X509Cert{
+			Sources: []string{},
+			Timeout: internal.Duration{Duration: 5},
+		}
+	})
+}
diff --git a/plugins/inputs/x509_cert/x509_cert_test.go b/plugins/inputs/x509_cert/x509_cert_test.go
new file mode 100644
index 00000000..f4c6c873
--- /dev/null
+++ b/plugins/inputs/x509_cert/x509_cert_test.go
@@ -0,0 +1,205 @@
+package x509_cert
+
+import (
+	"crypto/tls"
+	"encoding/base64"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/testutil"
+)
+
+var pki = testutil.NewPKI("../../../testutil/pki")
+
+// Make sure X509Cert implements telegraf.Input
+var _ telegraf.Input = &X509Cert{}
+
+func TestGatherRemote(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping network-dependent test in short mode.")
+	}
+
+	tmpfile, err := ioutil.TempFile("", "example")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	defer os.Remove(tmpfile.Name())
+
+	if _, err := tmpfile.Write([]byte(pki.ReadServerCert())); err != nil {
+		t.Fatal(err)
+	}
+
+	tests := []struct {
+		name    string
+		server  string
+		timeout time.Duration
+		close   bool
+		unset   bool
+		noshake bool
+		error   bool
+	}{
+		{name: "wrong port", server: ":99999", error: true},
+		{name: "no server", timeout: 5},
+		{name: "successful https", server: "https://example.org:443", timeout: 5},
+		{name: "successful file", server: "file://" + tmpfile.Name(), timeout: 5},
+		{name: "unsupported scheme", server: "foo://", timeout: 5, error: true},
+		{name: "no certificate", timeout: 5, unset: true, error: true},
+		{name: "closed connection", close: true, error: true},
+		{name: "no handshake", timeout: 5, noshake: true, error: true},
+	}
+
+	pair, err := tls.X509KeyPair([]byte(pki.ReadServerCert()), []byte(pki.ReadServerKey()))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	config := &tls.Config{
+		InsecureSkipVerify: true,
+		Certificates:       []tls.Certificate{pair},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			if test.unset {
+				config.Certificates = nil
+				config.GetCertificate = func(i *tls.ClientHelloInfo) (*tls.Certificate, error) {
+					return nil, nil
+				}
+			}
+
+			ln, err := tls.Listen("tcp", ":0", config)
+			if err != nil {
+				t.Fatal(err)
+			}
+			defer ln.Close()
+
+			go func() {
+				sconn, err := ln.Accept()
+				if err != nil {
+					return
+				}
+				if test.close {
+					sconn.Close()
+				}
+
+				serverConfig := config.Clone()
+
+				srv := tls.Server(sconn, serverConfig)
+				if test.noshake {
+					srv.Close()
+				}
+				if err := srv.Handshake(); err != nil {
+					return
+				}
+			}()
+
+			if test.server == "" {
+				test.server = "tcp://" + ln.Addr().String()
+			}
+
+			sc := X509Cert{
+				Sources: []string{test.server},
+				Timeout: internal.Duration{Duration: test.timeout},
+			}
+
+			sc.InsecureSkipVerify = true
+			testErr := false
+
+			acc := testutil.Accumulator{}
+			err = sc.Gather(&acc)
+			if err != nil {
+				testErr = true
+			}
+
+			if testErr != test.error {
+				t.Errorf("%s", err)
+			}
+		})
+	}
+}
+
+func TestGatherLocal(t *testing.T) {
+	wrongCert := fmt.Sprintf("-----BEGIN CERTIFICATE-----\n%s\n-----END CERTIFICATE-----\n", base64.StdEncoding.EncodeToString([]byte("test")))
+
+	tests := []struct {
+		name    string
+		mode    os.FileMode
+		content string
+		error   bool
+	}{
+		{name: "permission denied", mode: 0001, error: true},
+		{name: "not a certificate", mode: 0640, content: "test", error: true},
+		{name: "wrong certificate", mode: 0640, content: wrongCert, error: true},
+		{name: "correct certificate", mode: 0640, content: pki.ReadServerCert()},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			f, err := ioutil.TempFile("", "x509_cert")
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			_, err = f.Write([]byte(test.content))
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			err = f.Chmod(test.mode)
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			err = f.Close()
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			defer os.Remove(f.Name())
+
+			sc := X509Cert{
+				Sources: []string{f.Name()},
+			}
+
+			error := false
+
+			acc := testutil.Accumulator{}
+			err = sc.Gather(&acc)
+			if err != nil {
+				error = true
+			}
+
+			if error != test.error {
+				t.Errorf("%s", err)
+			}
+		})
+	}
+}
+
+func TestStrings(t *testing.T) {
+	sc := X509Cert{}
+
+	tests := []struct {
+		name     string
+		method   string
+		returned string
+		expected string
+	}{
+		{name: "description", method: "Description", returned: sc.Description(), expected: description},
+		{name: "sample config", method: "SampleConfig", returned: sc.SampleConfig(), expected: sampleConfig},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			if test.returned != test.expected {
+				t.Errorf("Expected method %s to return '%s', found '%s'.", test.method, test.expected, test.returned)
+			}
+		})
+	}
+}

From 3d1c650c54b9cce279c9d7d8fc77bcab9bb34588 Mon Sep 17 00:00:00 2001
From: Greg Linton <g2linton@gmail.com>
Date: Mon, 30 Jul 2018 13:14:55 -0600
Subject: [PATCH 651/835] Update changelog

---
 CHANGELOG.md                          | 1 +
 plugins/inputs/x509_cert/README.md    | 2 +-
 plugins/inputs/x509_cert/x509_cert.go | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 49bc3a04..de1b5abc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@
 - [#4418](https://github.com/influxdata/telegraf/pull/4418): Add support for setting kafka client id.
 - [#4332](https://github.com/influxdata/telegraf/pull/4332): Add file input plugin and grok parser.
 - [#4320](https://github.com/influxdata/telegraf/pull/4320): Improve cloudwatch output performance.
+- [#3768](https://github.com/influxdata/telegraf/pull/3768): Add x509_cert input plugin.
 
 ## v1.7.2 [2018-07-18]
 
diff --git a/plugins/inputs/x509_cert/README.md b/plugins/inputs/x509_cert/README.md
index 6b922f0e..781b9332 100644
--- a/plugins/inputs/x509_cert/README.md
+++ b/plugins/inputs/x509_cert/README.md
@@ -13,7 +13,7 @@ file or network connection.
   sources = ["/etc/ssl/certs/ssl-cert-snakeoil.pem", "https://example.org"]
 
   ## Timeout for SSL connection
-  # timeout = 5s
+  # timeout = "5s"
 
   ## Optional TLS Config
   # tls_ca = "/etc/telegraf/ca.pem"
diff --git a/plugins/inputs/x509_cert/x509_cert.go b/plugins/inputs/x509_cert/x509_cert.go
index 2e5d2699..252b60e1 100644
--- a/plugins/inputs/x509_cert/x509_cert.go
+++ b/plugins/inputs/x509_cert/x509_cert.go
@@ -23,7 +23,7 @@ const sampleConfig = `
   sources = ["/etc/ssl/certs/ssl-cert-snakeoil.pem", "tcp://example.org:443"]
 
   ## Timeout for SSL connection
-  # timeout = 5s
+  # timeout = "5s"
 
   ## Optional TLS Config
   # tls_ca = "/etc/telegraf/ca.pem"

From 06d5501d928ec79c6fc40849472e52dbf799928f Mon Sep 17 00:00:00 2001
From: wegel <simon@wegel.ca>
Date: Mon, 30 Jul 2018 15:31:23 -0400
Subject: [PATCH 652/835] Add IPSIpAddress syntax to ipaddr conversion in snmp
 plugin (#4471)

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

diff --git a/plugins/inputs/snmp/snmp.go b/plugins/inputs/snmp/snmp.go
index 50a3cb0a..112e85c7 100644
--- a/plugins/inputs/snmp/snmp.go
+++ b/plugins/inputs/snmp/snmp.go
@@ -1010,7 +1010,7 @@ func snmpTranslateCall(oid string) (mibName string, oidNum string, oidText strin
 			switch tc {
 			case "MacAddress", "PhysAddress":
 				conversion = "hwaddr"
-			case "InetAddressIPv4", "InetAddressIPv6", "InetAddress":
+			case "InetAddressIPv4", "InetAddressIPv6", "InetAddress", "IPSIpAddress":
 				conversion = "ipaddr"
 			}
 		} else if strings.HasPrefix(line, "::= { ") {

From 5c1ba5e377093e69dd4c77e1063c63ec1fcc9235 Mon Sep 17 00:00:00 2001
From: Greg Linton <g2linton@gmail.com>
Date: Mon, 30 Jul 2018 13:32:16 -0600
Subject: [PATCH 653/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index de1b5abc..c9f2c375 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,6 +44,7 @@
 - [#4332](https://github.com/influxdata/telegraf/pull/4332): Add file input plugin and grok parser.
 - [#4320](https://github.com/influxdata/telegraf/pull/4320): Improve cloudwatch output performance.
 - [#3768](https://github.com/influxdata/telegraf/pull/3768): Add x509_cert input plugin.
+- [#4471](https://github.com/influxdata/telegraf/pull/4471): Add IPSIpAddress syntax to ipaddr conversion in snmp plugin.
 
 ## v1.7.2 [2018-07-18]
 

From 228efe9a1d832f4251efa864b19a53e9ecb3869d Mon Sep 17 00:00:00 2001
From: Sebastian Boehm <sebastian@sometimesfood.org>
Date: Wed, 1 Aug 2018 00:05:55 +0200
Subject: [PATCH 654/835] Add filecount input plugin (#4363)

---
 README.md                                     |   1 +
 plugins/inputs/all/all.go                     |   1 +
 plugins/inputs/filecount/README.md            |  49 ++++
 plugins/inputs/filecount/filecount.go         | 215 ++++++++++++++++++
 plugins/inputs/filecount/filecount_test.go    |  99 ++++++++
 plugins/inputs/filecount/testdata/bar         |   0
 plugins/inputs/filecount/testdata/baz         |   0
 plugins/inputs/filecount/testdata/foo         |   0
 plugins/inputs/filecount/testdata/qux         |   7 +
 plugins/inputs/filecount/testdata/subdir/quux |   0
 plugins/inputs/filecount/testdata/subdir/quuz |   0
 11 files changed, 372 insertions(+)
 create mode 100644 plugins/inputs/filecount/README.md
 create mode 100644 plugins/inputs/filecount/filecount.go
 create mode 100644 plugins/inputs/filecount/filecount_test.go
 create mode 100644 plugins/inputs/filecount/testdata/bar
 create mode 100644 plugins/inputs/filecount/testdata/baz
 create mode 100644 plugins/inputs/filecount/testdata/foo
 create mode 100644 plugins/inputs/filecount/testdata/qux
 create mode 100644 plugins/inputs/filecount/testdata/subdir/quux
 create mode 100644 plugins/inputs/filecount/testdata/subdir/quuz

diff --git a/README.md b/README.md
index 03e3a8f5..a0f396ca 100644
--- a/README.md
+++ b/README.md
@@ -158,6 +158,7 @@ configuration options.
 * [fibaro](./plugins/inputs/fibaro)
 * [file](./plugins/inputs/file)
 * [filestat](./plugins/inputs/filestat)
+* [filecount](./plugins/inputs/filecount)
 * [fluentd](./plugins/inputs/fluentd)
 * [graylog](./plugins/inputs/graylog)
 * [haproxy](./plugins/inputs/haproxy)
diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index 8989684e..4d46a549 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -31,6 +31,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/fail2ban"
 	_ "github.com/influxdata/telegraf/plugins/inputs/fibaro"
 	_ "github.com/influxdata/telegraf/plugins/inputs/file"
+	_ "github.com/influxdata/telegraf/plugins/inputs/filecount"
 	_ "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/filecount/README.md b/plugins/inputs/filecount/README.md
new file mode 100644
index 00000000..ccec532a
--- /dev/null
+++ b/plugins/inputs/filecount/README.md
@@ -0,0 +1,49 @@
+# filecount Input Plugin
+
+Counts files in directories that match certain criteria.
+
+### Configuration:
+
+```toml
+# Count files in a directory
+[[inputs.filecount]]
+  ## Directory to gather stats about.
+  directory = "/var/cache/apt/archives"
+
+  ## Only count files that match the name pattern. Defaults to "*".
+  name = "*.deb"
+
+  ## Count files in subdirectories. Defaults to true.
+  recursive = false
+
+  ## Only count regular files. Defaults to true.
+  regular_only = true
+
+  ## Only count files that are at least this size in bytes. If size is
+  ## a negative number, only count files that are smaller than the
+  ## absolute value of size. Defaults to 0.
+  size = 0
+
+  ## Only count files that have not been touched for at least this
+  ## duration. If mtime is negative, only count files that have been
+  ## touched in this duration. Defaults to "0s".
+  mtime = "0s"
+```
+
+### Measurements & Fields:
+
+- filecount
+    - count (int)
+
+### Tags:
+
+- All measurements have the following tags:
+    - directory (the directory path, as specified in the config)
+
+### Example Output:
+
+```
+$ telegraf --config /etc/telegraf/telegraf.conf --input-filter filecount --test
+> filecount,directory=/var/cache/apt,host=czernobog count=7i 1530034445000000000
+> filecount,directory=/tmp,host=czernobog count=17i 1530034445000000000
+```
diff --git a/plugins/inputs/filecount/filecount.go b/plugins/inputs/filecount/filecount.go
new file mode 100644
index 00000000..6041ec7b
--- /dev/null
+++ b/plugins/inputs/filecount/filecount.go
@@ -0,0 +1,215 @@
+package filecount
+
+import (
+	"os"
+	"path/filepath"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+const sampleConfig = `
+  ## Directory to gather stats about.
+  directory = "/var/cache/apt/archives"
+
+  ## Only count files that match the name pattern. Defaults to "*".
+  name = "*.deb"
+
+  ## Count files in subdirectories. Defaults to true.
+  recursive = false
+
+  ## Only count regular files. Defaults to true.
+  regular_only = true
+
+  ## Only count files that are at least this size in bytes. If size is
+  ## a negative number, only count files that are smaller than the
+  ## absolute value of size. Defaults to 0.
+  size = 0
+
+  ## Only count files that have not been touched for at least this
+  ## duration. If mtime is negative, only count files that have been
+  ## touched in this duration. Defaults to "0s".
+  mtime = "0s"
+`
+
+type FileCount struct {
+	Directory   string
+	Name        string
+	Recursive   bool
+	RegularOnly bool
+	Size        int64
+	MTime       internal.Duration `toml:"mtime"`
+	fileFilters []fileFilterFunc
+}
+
+type countFunc func(os.FileInfo)
+type fileFilterFunc func(os.FileInfo) (bool, error)
+
+func (_ *FileCount) Description() string {
+	return "Count files in a directory"
+}
+
+func (_ *FileCount) SampleConfig() string { return sampleConfig }
+
+func rejectNilFilters(filters []fileFilterFunc) []fileFilterFunc {
+	filtered := make([]fileFilterFunc, 0, len(filters))
+	for _, f := range filters {
+		if f != nil {
+			filtered = append(filtered, f)
+		}
+	}
+	return filtered
+}
+
+func (fc *FileCount) nameFilter() fileFilterFunc {
+	if fc.Name == "*" {
+		return nil
+	}
+
+	return func(f os.FileInfo) (bool, error) {
+		match, err := filepath.Match(fc.Name, f.Name())
+		if err != nil {
+			return false, err
+		}
+		return match, nil
+	}
+}
+
+func (fc *FileCount) regularOnlyFilter() fileFilterFunc {
+	if !fc.RegularOnly {
+		return nil
+	}
+
+	return func(f os.FileInfo) (bool, error) {
+		return f.Mode().IsRegular(), nil
+	}
+}
+
+func (fc *FileCount) sizeFilter() fileFilterFunc {
+	if fc.Size == 0 {
+		return nil
+	}
+
+	return func(f os.FileInfo) (bool, error) {
+		if !f.Mode().IsRegular() {
+			return false, nil
+		}
+		if fc.Size < 0 {
+			return f.Size() < -fc.Size, nil
+		}
+		return f.Size() >= fc.Size, nil
+	}
+}
+
+func (fc *FileCount) mtimeFilter() fileFilterFunc {
+	if fc.MTime.Duration == 0 {
+		return nil
+	}
+
+	return func(f os.FileInfo) (bool, error) {
+		age := absDuration(fc.MTime.Duration)
+		mtime := time.Now().Add(-age)
+		if fc.MTime.Duration < 0 {
+			return f.ModTime().After(mtime), nil
+		}
+		return f.ModTime().Before(mtime), nil
+	}
+}
+
+func absDuration(x time.Duration) time.Duration {
+	if x < 0 {
+		return -x
+	}
+	return x
+}
+
+func count(basedir string, recursive bool, countFn countFunc) error {
+	walkFn := func(path string, file os.FileInfo, err error) error {
+		if path == basedir {
+			return nil
+		}
+		countFn(file)
+		if !recursive && file.IsDir() {
+			return filepath.SkipDir
+		}
+		return nil
+	}
+	return filepath.Walk(basedir, walkFn)
+}
+
+func (fc *FileCount) initFileFilters() {
+	filters := []fileFilterFunc{
+		fc.nameFilter(),
+		fc.regularOnlyFilter(),
+		fc.sizeFilter(),
+		fc.mtimeFilter(),
+	}
+	fc.fileFilters = rejectNilFilters(filters)
+}
+
+func (fc *FileCount) filter(file os.FileInfo) (bool, error) {
+	if fc.fileFilters == nil {
+		fc.initFileFilters()
+	}
+
+	for _, fileFilter := range fc.fileFilters {
+		match, err := fileFilter(file)
+		if err != nil {
+			return false, err
+		}
+		if !match {
+			return false, nil
+		}
+	}
+
+	return true, nil
+}
+
+func (fc *FileCount) Gather(acc telegraf.Accumulator) error {
+	numFiles := int64(0)
+	countFn := func(f os.FileInfo) {
+		match, err := fc.filter(f)
+		if err != nil {
+			acc.AddError(err)
+			return
+		}
+		if !match {
+			return
+		}
+		numFiles++
+	}
+	err := count(fc.Directory, fc.Recursive, countFn)
+	if err != nil {
+		acc.AddError(err)
+	}
+
+	acc.AddFields("filecount",
+		map[string]interface{}{
+			"count": numFiles,
+		},
+		map[string]string{
+			"directory": fc.Directory,
+		})
+
+	return nil
+}
+
+func NewFileCount() *FileCount {
+	return &FileCount{
+		Directory:   "",
+		Name:        "*",
+		Recursive:   true,
+		RegularOnly: true,
+		Size:        0,
+		MTime:       internal.Duration{Duration: 0},
+		fileFilters: nil,
+	}
+}
+
+func init() {
+	inputs.Add("filecount", func() telegraf.Input {
+		return NewFileCount()
+	})
+}
diff --git a/plugins/inputs/filecount/filecount_test.go b/plugins/inputs/filecount/filecount_test.go
new file mode 100644
index 00000000..294a8b96
--- /dev/null
+++ b/plugins/inputs/filecount/filecount_test.go
@@ -0,0 +1,99 @@
+package filecount
+
+import (
+	"os"
+	"path/filepath"
+	"runtime"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/require"
+)
+
+func TestNoFilters(t *testing.T) {
+	fc := getNoFilterFileCount()
+	matches := []string{"foo", "bar", "baz", "qux",
+		"subdir/", "subdir/quux", "subdir/quuz"}
+	require.True(t, fileCountEquals(fc, len(matches)))
+}
+
+func TestNameFilter(t *testing.T) {
+	fc := getNoFilterFileCount()
+	fc.Name = "ba*"
+	matches := []string{"bar", "baz"}
+	require.True(t, fileCountEquals(fc, len(matches)))
+}
+
+func TestNonRecursive(t *testing.T) {
+	fc := getNoFilterFileCount()
+	fc.Recursive = false
+	matches := []string{"foo", "bar", "baz", "qux", "subdir"}
+	require.True(t, fileCountEquals(fc, len(matches)))
+}
+
+func TestRegularOnlyFilter(t *testing.T) {
+	fc := getNoFilterFileCount()
+	fc.RegularOnly = true
+	matches := []string{
+		"foo", "bar", "baz", "qux", "subdir/quux", "subdir/quuz",
+	}
+	require.True(t, fileCountEquals(fc, len(matches)))
+}
+
+func TestSizeFilter(t *testing.T) {
+	fc := getNoFilterFileCount()
+	fc.Size = -100
+	matches := []string{"foo", "bar", "baz",
+		"subdir/quux", "subdir/quuz"}
+	require.True(t, fileCountEquals(fc, len(matches)))
+
+	fc.Size = 100
+	matches = []string{"qux"}
+	require.True(t, fileCountEquals(fc, len(matches)))
+}
+
+func TestMTimeFilter(t *testing.T) {
+	oldFile := filepath.Join(getTestdataDir(), "baz")
+	mtime := time.Date(1979, time.December, 14, 18, 25, 5, 0, time.UTC)
+	if err := os.Chtimes(oldFile, mtime, mtime); err != nil {
+		t.Skip("skipping mtime filter test.")
+	}
+	fileAge := time.Since(mtime) - (60 * time.Second)
+
+	fc := getNoFilterFileCount()
+	fc.MTime = internal.Duration{Duration: -fileAge}
+	matches := []string{"foo", "bar", "qux",
+		"subdir/", "subdir/quux", "subdir/quuz"}
+	require.True(t, fileCountEquals(fc, len(matches)))
+
+	fc.MTime = internal.Duration{Duration: fileAge}
+	matches = []string{"baz"}
+	require.True(t, fileCountEquals(fc, len(matches)))
+}
+
+func getNoFilterFileCount() FileCount {
+	return FileCount{
+		Directory:   getTestdataDir(),
+		Name:        "*",
+		Recursive:   true,
+		RegularOnly: false,
+		Size:        0,
+		MTime:       internal.Duration{Duration: 0},
+		fileFilters: nil,
+	}
+}
+
+func getTestdataDir() string {
+	_, filename, _, _ := runtime.Caller(1)
+	return strings.Replace(filename, "filecount_test.go", "testdata/", 1)
+}
+
+func fileCountEquals(fc FileCount, expectedCount int) bool {
+	tags := map[string]string{"directory": getTestdataDir()}
+	acc := testutil.Accumulator{}
+	acc.GatherError(fc.Gather)
+	return acc.HasPoint("filecount", tags, "count", int64(expectedCount))
+}
diff --git a/plugins/inputs/filecount/testdata/bar b/plugins/inputs/filecount/testdata/bar
new file mode 100644
index 00000000..e69de29b
diff --git a/plugins/inputs/filecount/testdata/baz b/plugins/inputs/filecount/testdata/baz
new file mode 100644
index 00000000..e69de29b
diff --git a/plugins/inputs/filecount/testdata/foo b/plugins/inputs/filecount/testdata/foo
new file mode 100644
index 00000000..e69de29b
diff --git a/plugins/inputs/filecount/testdata/qux b/plugins/inputs/filecount/testdata/qux
new file mode 100644
index 00000000..c7288f23
--- /dev/null
+++ b/plugins/inputs/filecount/testdata/qux
@@ -0,0 +1,7 @@
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad
+minim veniam, quis nostrud exercitation ullamco laboris nisi ut
+aliquip ex ea commodo consequat. Duis aute irure dolor in
+reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
+pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
+culpa qui officia deserunt mollit anim id est laborum.
diff --git a/plugins/inputs/filecount/testdata/subdir/quux b/plugins/inputs/filecount/testdata/subdir/quux
new file mode 100644
index 00000000..e69de29b
diff --git a/plugins/inputs/filecount/testdata/subdir/quuz b/plugins/inputs/filecount/testdata/subdir/quuz
new file mode 100644
index 00000000..e69de29b

From 93ed28e7453f6b7ab00d1544e1b6eb88022570b1 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 31 Jul 2018 15:07:21 -0700
Subject: [PATCH 655/835] Add support for configuring an AWS endpoint_url
 (#4485)

---
 internal/config/aws/credentials.go       | 21 ++++++++------
 plugins/inputs/cloudwatch/README.md      |  6 ++++
 plugins/inputs/cloudwatch/cloudwatch.go  | 36 +++++++++++++++---------
 plugins/outputs/cloudwatch/cloudwatch.go | 36 +++++++++++++++---------
 plugins/outputs/kinesis/kinesis.go       | 36 +++++++++++++++---------
 5 files changed, 84 insertions(+), 51 deletions(-)

diff --git a/internal/config/aws/credentials.go b/internal/config/aws/credentials.go
index b1f57fce..1e4f91b1 100644
--- a/internal/config/aws/credentials.go
+++ b/internal/config/aws/credentials.go
@@ -9,13 +9,14 @@ import (
 )
 
 type CredentialConfig struct {
-	Region    string
-	AccessKey string
-	SecretKey string
-	RoleARN   string
-	Profile   string
-	Filename  string
-	Token     string
+	Region      string
+	AccessKey   string
+	SecretKey   string
+	RoleARN     string
+	Profile     string
+	Filename    string
+	Token       string
+	EndpointURL string
 }
 
 func (c *CredentialConfig) Credentials() client.ConfigProvider {
@@ -28,7 +29,8 @@ func (c *CredentialConfig) Credentials() client.ConfigProvider {
 
 func (c *CredentialConfig) rootCredentials() client.ConfigProvider {
 	config := &aws.Config{
-		Region: aws.String(c.Region),
+		Region:   aws.String(c.Region),
+		Endpoint: &c.EndpointURL,
 	}
 	if c.AccessKey != "" || c.SecretKey != "" {
 		config.Credentials = credentials.NewStaticCredentials(c.AccessKey, c.SecretKey, c.Token)
@@ -42,7 +44,8 @@ func (c *CredentialConfig) rootCredentials() client.ConfigProvider {
 func (c *CredentialConfig) assumeCredentials() client.ConfigProvider {
 	rootCredentials := c.rootCredentials()
 	config := &aws.Config{
-		Region: aws.String(c.Region),
+		Region:   aws.String(c.Region),
+		Endpoint: &c.EndpointURL,
 	}
 	config.Credentials = stscreds.NewCredentials(rootCredentials, c.RoleARN)
 	return session.New(config)
diff --git a/plugins/inputs/cloudwatch/README.md b/plugins/inputs/cloudwatch/README.md
index 88a5b098..dfb5bf95 100644
--- a/plugins/inputs/cloudwatch/README.md
+++ b/plugins/inputs/cloudwatch/README.md
@@ -35,6 +35,12 @@ API endpoint. In the following order the plugin will attempt to authenticate.
   #profile = ""
   #shared_credential_file = ""
 
+  ## Endpoint to make request against, the correct endpoint is automatically
+  ## determined and this option should only be set if you wish to override the
+  ## default.
+  ##   ex: endpoint_url = "http://localhost:8000"
+  # endpoint_url = ""
+
   # 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, 5 minute, or larger intervals. See https://aws.amazon.com/cloudwatch/faqs/#monitoring.
diff --git a/plugins/inputs/cloudwatch/cloudwatch.go b/plugins/inputs/cloudwatch/cloudwatch.go
index b4f91f74..9ba15b6a 100644
--- a/plugins/inputs/cloudwatch/cloudwatch.go
+++ b/plugins/inputs/cloudwatch/cloudwatch.go
@@ -19,13 +19,14 @@ import (
 
 type (
 	CloudWatch 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"`
+		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"`
+		EndpointURL string `toml:"endpoint_url"`
 
 		Period      internal.Duration `toml:"period"`
 		Delay       internal.Duration `toml:"delay"`
@@ -79,6 +80,12 @@ func (c *CloudWatch) SampleConfig() string {
   #profile = ""
   #shared_credential_file = ""
 
+  ## Endpoint to make request against, the correct endpoint is automatically
+  ## determined and this option should only be set if you wish to override the
+  ## default.
+  ##   ex: endpoint_url = "http://localhost:8000"
+  # endpoint_url = ""
+
   # 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, 5 minute, or larger intervals. See https://aws.amazon.com/cloudwatch/faqs/#monitoring.
@@ -224,13 +231,14 @@ func init() {
  */
 func (c *CloudWatch) initializeCloudWatch() error {
 	credentialConfig := &internalaws.CredentialConfig{
-		Region:    c.Region,
-		AccessKey: c.AccessKey,
-		SecretKey: c.SecretKey,
-		RoleARN:   c.RoleARN,
-		Profile:   c.Profile,
-		Filename:  c.Filename,
-		Token:     c.Token,
+		Region:      c.Region,
+		AccessKey:   c.AccessKey,
+		SecretKey:   c.SecretKey,
+		RoleARN:     c.RoleARN,
+		Profile:     c.Profile,
+		Filename:    c.Filename,
+		Token:       c.Token,
+		EndpointURL: c.EndpointURL,
 	}
 	configProvider := credentialConfig.Credentials()
 
diff --git a/plugins/outputs/cloudwatch/cloudwatch.go b/plugins/outputs/cloudwatch/cloudwatch.go
index f7ccc1fe..52ab41a2 100644
--- a/plugins/outputs/cloudwatch/cloudwatch.go
+++ b/plugins/outputs/cloudwatch/cloudwatch.go
@@ -17,13 +17,14 @@ import (
 )
 
 type CloudWatch 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"`
+	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"`
+	EndpointURL string `toml:"endpoint_url"`
 
 	Namespace string `toml:"namespace"` // CloudWatch Metrics Namespace
 	svc       *cloudwatch.CloudWatch
@@ -48,6 +49,12 @@ var sampleConfig = `
   #profile = ""
   #shared_credential_file = ""
 
+  ## Endpoint to make request against, the correct endpoint is automatically
+  ## determined and this option should only be set if you wish to override the
+  ## default.
+  ##   ex: endpoint_url = "http://localhost:8000"
+  # endpoint_url = ""
+
   ## Namespace for the CloudWatch MetricDatums
   namespace = "InfluxData/Telegraf"
 `
@@ -62,13 +69,14 @@ func (c *CloudWatch) Description() string {
 
 func (c *CloudWatch) Connect() error {
 	credentialConfig := &internalaws.CredentialConfig{
-		Region:    c.Region,
-		AccessKey: c.AccessKey,
-		SecretKey: c.SecretKey,
-		RoleARN:   c.RoleARN,
-		Profile:   c.Profile,
-		Filename:  c.Filename,
-		Token:     c.Token,
+		Region:      c.Region,
+		AccessKey:   c.AccessKey,
+		SecretKey:   c.SecretKey,
+		RoleARN:     c.RoleARN,
+		Profile:     c.Profile,
+		Filename:    c.Filename,
+		Token:       c.Token,
+		EndpointURL: c.EndpointURL,
 	}
 	configProvider := credentialConfig.Credentials()
 
diff --git a/plugins/outputs/kinesis/kinesis.go b/plugins/outputs/kinesis/kinesis.go
index d77ff08a..01437914 100644
--- a/plugins/outputs/kinesis/kinesis.go
+++ b/plugins/outputs/kinesis/kinesis.go
@@ -17,13 +17,14 @@ import (
 
 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"`
+		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"`
+		EndpointURL string `toml:"endpoint_url"`
 
 		StreamName         string     `toml:"streamname"`
 		PartitionKey       string     `toml:"partitionkey"`
@@ -60,6 +61,12 @@ var sampleConfig = `
   #profile = ""
   #shared_credential_file = ""
 
+  ## Endpoint to make request against, the correct endpoint is automatically
+  ## determined and this option should only be set if you wish to override the
+  ## default.
+  ##   ex: endpoint_url = "http://localhost:8000"
+  # endpoint_url = ""
+
   ## Kinesis StreamName must exist prior to starting telegraf.
   streamname = "StreamName"
   ## DEPRECATED: PartitionKey as used for sharding data.
@@ -126,13 +133,14 @@ func (k *KinesisOutput) Connect() error {
 	}
 
 	credentialConfig := &internalaws.CredentialConfig{
-		Region:    k.Region,
-		AccessKey: k.AccessKey,
-		SecretKey: k.SecretKey,
-		RoleARN:   k.RoleARN,
-		Profile:   k.Profile,
-		Filename:  k.Filename,
-		Token:     k.Token,
+		Region:      k.Region,
+		AccessKey:   k.AccessKey,
+		SecretKey:   k.SecretKey,
+		RoleARN:     k.RoleARN,
+		Profile:     k.Profile,
+		Filename:    k.Filename,
+		Token:       k.Token,
+		EndpointURL: k.EndpointURL,
 	}
 	configProvider := credentialConfig.Credentials()
 	svc := kinesis.New(configProvider)

From 943dcc0c49c3223e78482ce5e6c29e72957b8af1 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 31 Jul 2018 15:08:04 -0700
Subject: [PATCH 656/835] Send all messages before waiting for results in kafka
 output (#4491)

---
 plugins/outputs/kafka/kafka.go | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/plugins/outputs/kafka/kafka.go b/plugins/outputs/kafka/kafka.go
index a45e2a4e..a99c8e1c 100644
--- a/plugins/outputs/kafka/kafka.go
+++ b/plugins/outputs/kafka/kafka.go
@@ -246,32 +246,34 @@ func (k *Kafka) Description() string {
 }
 
 func (k *Kafka) Write(metrics []telegraf.Metric) error {
-	if len(metrics) == 0 {
-		return nil
-	}
-
+	msgs := make([]*sarama.ProducerMessage, 0, len(metrics))
 	for _, metric := range metrics {
 		buf, err := k.serializer.Serialize(metric)
 		if err != nil {
 			return err
 		}
 
-		topicName := k.GetTopicName(metric)
-
 		m := &sarama.ProducerMessage{
-			Topic: topicName,
+			Topic: k.GetTopicName(metric),
 			Value: sarama.ByteEncoder(buf),
 		}
-		if h, ok := metric.Tags()[k.RoutingTag]; ok {
+		if h, ok := metric.GetTag(k.RoutingTag); ok {
 			m.Key = sarama.StringEncoder(h)
 		}
-
-		_, _, err = k.producer.SendMessage(m)
-
-		if err != nil {
-			return fmt.Errorf("FAILED to send kafka message: %s\n", err)
-		}
+		msgs = append(msgs, m)
 	}
+
+	err := k.producer.SendMessages(msgs)
+	if err != nil {
+		// We could have many errors, return only the first encountered.
+		if errs, ok := err.(sarama.ProducerErrors); ok {
+			for _, prodErr := range errs {
+				return prodErr
+			}
+		}
+		return err
+	}
+
 	return nil
 }
 

From f4032fc78de27fb49e3f026f349c1e2f63f8f74b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 31 Jul 2018 15:09:30 -0700
Subject: [PATCH 657/835] Add support for lz4 compression to kafka output
 (#4492)

---
 plugins/outputs/kafka/README.md | 10 ++++++++--
 plugins/outputs/kafka/kafka.go  | 16 ++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/plugins/outputs/kafka/README.md b/plugins/outputs/kafka/README.md
index 562f3fd5..bb410a1d 100644
--- a/plugins/outputs/kafka/README.md
+++ b/plugins/outputs/kafka/README.md
@@ -10,9 +10,15 @@ This plugin writes to a [Kafka Broker](http://kafka.apache.org/07/quickstart.htm
   ## Kafka topic for producer messages
   topic = "telegraf"
 
-  ## Optional client id
+  ## Optional Client id
   # client_id = "Telegraf"
 
+  ## Set the minimal supported Kafka version.  Setting this enables the use of new
+  ## Kafka features and APIs.  Of particular interested, lz4 compression
+  ## requires at least version 0.10.0.0.
+  ##   ex: version = "1.1.0"
+  # version = ""
+
   ## Optional topic suffix configuration.
   ## If the section is omitted, no suffix is used.
   ## Following topic suffix methods are supported:
@@ -20,7 +26,7 @@ This plugin writes to a [Kafka Broker](http://kafka.apache.org/07/quickstart.htm
   ##   tags        - suffix equals to separator + specified tags' values
   ##                 interleaved with separator
 
-  ## Suffix equals to "_" + measurement's name
+  ## Suffix equals to "_" + measurement name
   # [outputs.kafka.topic_suffix]
   #   method = "measurement"
   #   separator = "_"
diff --git a/plugins/outputs/kafka/kafka.go b/plugins/outputs/kafka/kafka.go
index a99c8e1c..5fdb8d85 100644
--- a/plugins/outputs/kafka/kafka.go
+++ b/plugins/outputs/kafka/kafka.go
@@ -38,6 +38,8 @@ type (
 		// MaxRetry Tag
 		MaxRetry int
 
+		Version string `toml:"version"`
+
 		// Legacy TLS config options
 		// TLS client certificate
 		Certificate string
@@ -74,6 +76,12 @@ var sampleConfig = `
   ## Optional Client id
   # client_id = "Telegraf"
 
+  ## Set the minimal supported Kafka version.  Setting this enables the use of new
+  ## Kafka features and APIs.  Of particular interested, lz4 compression
+  ## requires at least version 0.10.0.0.
+  ##   ex: version = "1.1.0"
+  # version = ""
+
   ## Optional topic suffix configuration.
   ## If the section is omitted, no suffix is used.
   ## Following topic suffix methods are supported:
@@ -191,6 +199,14 @@ func (k *Kafka) Connect() error {
 	}
 	config := sarama.NewConfig()
 
+	if k.Version != "" {
+		version, err := sarama.ParseKafkaVersion(k.Version)
+		if err != nil {
+			return err
+		}
+		config.Version = version
+	}
+
 	if k.ClientID != "" {
 		config.ClientID = k.ClientID
 	} else {

From efe61eeb73868dbdbb29a0d3fdb0b412e8c31d55 Mon Sep 17 00:00:00 2001
From: Greg Linton <g2linton@gmail.com>
Date: Tue, 31 Jul 2018 16:10:01 -0600
Subject: [PATCH 658/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9f2c375..b3f0a628 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,6 +45,10 @@
 - [#4320](https://github.com/influxdata/telegraf/pull/4320): Improve cloudwatch output performance.
 - [#3768](https://github.com/influxdata/telegraf/pull/3768): Add x509_cert input plugin.
 - [#4471](https://github.com/influxdata/telegraf/pull/4471): Add IPSIpAddress syntax to ipaddr conversion in snmp plugin.
+- [#4363](https://github.com/influxdata/telegraf/pull/4363): Add filecount input plugin.
+- [#4485](https://github.com/influxdata/telegraf/pull/4485): Add support for configuring an AWS endpoint_url.
+- [#4491](https://github.com/influxdata/telegraf/pull/4491): Send all messages before waiting for results in kafka output.
+- [#4492](https://github.com/influxdata/telegraf/pull/4492): Add support for lz4 compression to kafka output.
 
 ## v1.7.2 [2018-07-18]
 

From b93460dd06e733f32f3c49f4f6c45c68fd4b18e3 Mon Sep 17 00:00:00 2001
From: Jonathan G <jhg03a@users.noreply.github.com>
Date: Tue, 31 Jul 2018 17:56:03 -0600
Subject: [PATCH 659/835] Split multiple sensor keys in ipmi input (#4450)

---
 etc/telegraf.conf                       |   3 +
 plugins/inputs/ipmi_sensor/README.md    |  63 ++++++--
 plugins/inputs/ipmi_sensor/ipmi.go      | 137 ++++++++++++++---
 plugins/inputs/ipmi_sensor/ipmi_test.go | 196 +++++++++++++++++++++++-
 4 files changed, 361 insertions(+), 38 deletions(-)

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 38942ade..912a93d1 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -1976,6 +1976,9 @@
 #   ## Timeout for the ipmitool command to complete
 #   timeout = "20s"
 
+#   ## Schema Version: (Optional, defaults to version 1)
+#   schemaVersion = 2
+
 
 # # Gather packets and bytes counters from Linux ipsets
 # [[inputs.ipset]]
diff --git a/plugins/inputs/ipmi_sensor/README.md b/plugins/inputs/ipmi_sensor/README.md
index 74cfe3bc..fb2e8f26 100644
--- a/plugins/inputs/ipmi_sensor/README.md
+++ b/plugins/inputs/ipmi_sensor/README.md
@@ -8,6 +8,10 @@ If no servers are specified, the plugin will query the local machine sensor stat
 ```
 ipmitool sdr
 ```
+or with the version 2 schema:
+```
+ipmitool sdr elist
+```
 
 When one or more servers are specified, the plugin will use the following command to collect remote host sensor stats:
 
@@ -41,19 +45,36 @@ ipmitool -I lan -H SERVER -U USERID -P PASSW0RD sdr
 
   ## Timeout for the ipmitool command to complete. Default is 20 seconds.
   timeout = "20s"
+
+  ## Schema Version: (Optional, defaults to version 1)
+  metric_version = 2
 ```
 
 ### Measurements
 
+Version 1 schema:
 - ipmi_sensor:
   - tags:
     - name
     - unit
+    - host
     - server (only when retrieving stats from remote servers)
   - fields:
-    - status (int)
+    - status (int, 1=ok status_code/0=anything else)
     - value (float)
 
+Version 2 schema:
+- ipmi_sensor:
+  - tags:
+    - name
+    - entity_id (can help uniquify duplicate names)
+    - status_code (two letter code from IPMI documentation)
+    - status_desc (extended status description field)
+    - unit (only on analog values)
+    - host
+    - server (only when retrieving stats from remote)
+  - fields:
+    - value (float)
 
 #### Permissions
 
@@ -68,24 +89,36 @@ KERNEL=="ipmi*", MODE="660", GROUP="telegraf"
 
 ### Example Output
 
+#### Version 1 Schema
 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,name=uid_light value=0,status=1i 1517125513000000000
+ipmi_sensor,server=10.20.2.203,name=sys._health_led status=1i,value=0 1517125513000000000
+ipmi_sensor,server=10.20.2.203,name=power_supply_1,unit=watts status=1i,value=110 1517125513000000000
+ipmi_sensor,server=10.20.2.203,name=power_supply_2,unit=watts status=1i,value=120 1517125513000000000
+ipmi_sensor,server=10.20.2.203,name=power_supplies value=0,status=1i 1517125513000000000
+ipmi_sensor,server=10.20.2.203,name=fan_1,unit=percent status=1i,value=43.12 1517125513000000000
 ```
 
+
 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,name=uid_light value=0,status=1i 1517125513000000000
+ipmi_sensor,name=sys._health_led status=1i,value=0 1517125513000000000
+ipmi_sensor,name=power_supply_1,unit=watts status=1i,value=110 1517125513000000000
+ipmi_sensor,name=power_supply_2,unit=watts status=1i,value=120 1517125513000000000
+ipmi_sensor,name=power_supplies value=0,status=1i 1517125513000000000
+ipmi_sensor,name=fan_1,unit=percent status=1i,value=43.12 1517125513000000000
+```
+
+#### Version 2 Schema
+
+When retrieving stats from the local machine (no server specified):
+```
+ipmi_sensor,name=uid_light,entity_id=23.1,status_code=ok,status_desc=ok value=0 1517125474000000000
+ipmi_sensor,name=sys._health_led,entity_id=23.2,status_code=ok,status_desc=ok value=0 1517125474000000000
+ipmi_sensor,entity_id=10.1,name=power_supply_1,status_code=ok,status_desc=presence_detected,unit=watts value=110 1517125474000000000
+ipmi_sensor,name=power_supply_2,entity_id=10.2,status_code=ok,unit=watts,status_desc=presence_detected value=125 1517125474000000000
+ipmi_sensor,name=power_supplies,entity_id=10.3,status_code=ok,status_desc=fully_redundant value=0 1517125474000000000
+ipmi_sensor,entity_id=7.1,name=fan_1,status_code=ok,status_desc=transition_to_running,unit=percent value=43.12 1517125474000000000
 ```
diff --git a/plugins/inputs/ipmi_sensor/ipmi.go b/plugins/inputs/ipmi_sensor/ipmi.go
index ee99b0a3..65506e11 100644
--- a/plugins/inputs/ipmi_sensor/ipmi.go
+++ b/plugins/inputs/ipmi_sensor/ipmi.go
@@ -1,8 +1,11 @@
 package ipmi_sensor
 
 import (
+	"bufio"
+	"bytes"
 	"fmt"
 	"os/exec"
+	"regexp"
 	"strconv"
 	"strings"
 	"sync"
@@ -14,14 +17,20 @@ import (
 )
 
 var (
-	execCommand = exec.Command // execCommand is used to mock commands in tests.
+	execCommand             = exec.Command // execCommand is used to mock commands in tests.
+	re_v1_parse_line        = regexp.MustCompile(`^(?P<name>[^|]*)\|(?P<description>[^|]*)\|(?P<status_code>.*)`)
+	re_v2_parse_line        = regexp.MustCompile(`^(?P<name>[^|]*)\|[^|]+\|(?P<status_code>[^|]*)\|(?P<entity_id>[^|]*)\|(?:(?P<description>[^|]+))?`)
+	re_v2_parse_description = regexp.MustCompile(`^(?P<analogValue>[0-9.]+)\s(?P<analogUnit>.*)|(?P<status>.+)|^$`)
+	re_v2_parse_unit        = regexp.MustCompile(`^(?P<realAnalogUnit>[^,]+)(?:,\s*(?P<statusDesc>.*))?`)
 )
 
+// Ipmi stores the configuration values for the ipmi_sensor input plugin
 type Ipmi struct {
-	Path      string
-	Privilege string
-	Servers   []string
-	Timeout   internal.Duration
+	Path          string
+	Privilege     string
+	Servers       []string
+	Timeout       internal.Duration
+	MetricVersion int
 }
 
 var sampleConfig = `
@@ -46,16 +55,22 @@ var sampleConfig = `
 
   ## Timeout for the ipmitool command to complete
   timeout = "20s"
+
+  ## Schema Version: (Optional, defaults to version 1)
+  metric_version = 2
 `
 
+// SampleConfig returns the documentation about the sample configuration
 func (m *Ipmi) SampleConfig() string {
 	return sampleConfig
 }
 
+// Description returns a basic description for the plugin functions
 func (m *Ipmi) Description() string {
 	return "Read metrics from the bare metal servers via IPMI"
 }
 
+// Gather is the main execution function for the plugin
 func (m *Ipmi) Gather(acc telegraf.Accumulator) error {
 	if len(m.Path) == 0 {
 		return fmt.Errorf("ipmitool not found: verify that ipmitool is installed and that ipmitool is in your PATH")
@@ -93,23 +108,33 @@ func (m *Ipmi) parse(acc telegraf.Accumulator, server string) error {
 		opts = conn.options()
 	}
 	opts = append(opts, "sdr")
+	if m.MetricVersion == 2 {
+		opts = append(opts, "elist")
+	}
 	cmd := execCommand(m.Path, opts...)
 	out, err := internal.CombinedOutputTimeout(cmd, m.Timeout.Duration)
+	timestamp := time.Now()
 	if err != nil {
 		return fmt.Errorf("failed to run command %s: %s - %s", strings.Join(cmd.Args, " "), err, string(out))
 	}
+	if m.MetricVersion == 2 {
+		return parseV2(acc, hostname, out, timestamp)
+	}
+	return parseV1(acc, hostname, out, timestamp)
+}
 
+func parseV1(acc telegraf.Accumulator, hostname string, cmdOut []byte, measured_at time.Time) error {
 	// each line will look something like
 	// Planar VBAT      | 3.05 Volts        | ok
-	lines := strings.Split(string(out), "\n")
-	for i := 0; i < len(lines); i++ {
-		vals := strings.Split(lines[i], "|")
-		if len(vals) != 3 {
+	scanner := bufio.NewScanner(bytes.NewReader(cmdOut))
+	for scanner.Scan() {
+		ipmiFields := extractFieldsFromRegex(re_v1_parse_line, scanner.Text())
+		if len(ipmiFields) != 3 {
 			continue
 		}
 
 		tags := map[string]string{
-			"name": transform(vals[0]),
+			"name": transform(ipmiFields["name"]),
 		}
 
 		// tag the server is we have one
@@ -118,18 +143,20 @@ func (m *Ipmi) parse(acc telegraf.Accumulator, server string) error {
 		}
 
 		fields := make(map[string]interface{})
-		if strings.EqualFold("ok", trim(vals[2])) {
+		if strings.EqualFold("ok", trim(ipmiFields["status_code"])) {
 			fields["status"] = 1
 		} else {
 			fields["status"] = 0
 		}
 
-		val1 := trim(vals[1])
-
-		if strings.Index(val1, " ") > 0 {
+		if strings.Index(ipmiFields["description"], " ") > 0 {
 			// split middle column into value and unit
-			valunit := strings.SplitN(val1, " ", 2)
-			fields["value"] = Atofloat(valunit[0])
+			valunit := strings.SplitN(ipmiFields["description"], " ", 2)
+			var err error
+			fields["value"], err = aToFloat(valunit[0])
+			if err != nil {
+				continue
+			}
 			if len(valunit) > 1 {
 				tags["unit"] = transform(valunit[1])
 			}
@@ -137,19 +164,85 @@ func (m *Ipmi) parse(acc telegraf.Accumulator, server string) error {
 			fields["value"] = 0.0
 		}
 
-		acc.AddFields("ipmi_sensor", fields, tags, time.Now())
+		acc.AddFields("ipmi_sensor", fields, tags, measured_at)
 	}
 
-	return nil
+	return scanner.Err()
 }
 
-func Atofloat(val string) float64 {
+func parseV2(acc telegraf.Accumulator, hostname string, cmdOut []byte, measured_at time.Time) error {
+	// each line will look something like
+	// CMOS Battery     | 65h | ok  |  7.1 |
+	// Temp             | 0Eh | ok  |  3.1 | 55 degrees C
+	// Drive 0          | A0h | ok  |  7.1 | Drive Present
+	scanner := bufio.NewScanner(bytes.NewReader(cmdOut))
+	for scanner.Scan() {
+		ipmiFields := extractFieldsFromRegex(re_v2_parse_line, scanner.Text())
+		if len(ipmiFields) < 3 || len(ipmiFields) > 4 {
+			continue
+		}
+
+		tags := map[string]string{
+			"name": transform(ipmiFields["name"]),
+		}
+
+		// tag the server is we have one
+		if hostname != "" {
+			tags["server"] = hostname
+		}
+		tags["entity_id"] = transform(ipmiFields["entity_id"])
+		tags["status_code"] = trim(ipmiFields["status_code"])
+		fields := make(map[string]interface{})
+		descriptionResults := extractFieldsFromRegex(re_v2_parse_description, trim(ipmiFields["description"]))
+		// This is an analog value with a unit
+		if descriptionResults["analogValue"] != "" && len(descriptionResults["analogUnit"]) >= 1 {
+			var err error
+			fields["value"], err = aToFloat(descriptionResults["analogValue"])
+			if err != nil {
+				continue
+			}
+			// Some implementations add an extra status to their analog units
+			unitResults := extractFieldsFromRegex(re_v2_parse_unit, descriptionResults["analogUnit"])
+			tags["unit"] = transform(unitResults["realAnalogUnit"])
+			if unitResults["statusDesc"] != "" {
+				tags["status_desc"] = transform(unitResults["statusDesc"])
+			}
+		} else {
+			// This is a status value
+			fields["value"] = 0.0
+			// Extended status descriptions aren't required, in which case for consistency re-use the status code
+			if descriptionResults["status"] != "" {
+				tags["status_desc"] = transform(descriptionResults["status"])
+			} else {
+				tags["status_desc"] = transform(ipmiFields["status_code"])
+			}
+		}
+
+		acc.AddFields("ipmi_sensor", fields, tags, measured_at)
+	}
+
+	return scanner.Err()
+}
+
+// extractFieldsFromRegex consumes a regex with named capture groups and returns a kvp map of strings with the results
+func extractFieldsFromRegex(re *regexp.Regexp, input string) map[string]string {
+	submatches := re.FindStringSubmatch(input)
+	results := make(map[string]string)
+	for i, name := range re.SubexpNames() {
+		if name != input && name != "" && input != "" {
+			results[name] = trim(submatches[i])
+		}
+	}
+	return results
+}
+
+// aToFloat converts string representations of numbers to float64 values
+func aToFloat(val string) (float64, error) {
 	f, err := strconv.ParseFloat(val, 64)
 	if err != nil {
-		return 0.0
-	} else {
-		return f
+		return 0.0, err
 	}
+	return f, nil
 }
 
 func trim(s string) string {
diff --git a/plugins/inputs/ipmi_sensor/ipmi_test.go b/plugins/inputs/ipmi_sensor/ipmi_test.go
index 3d45f2fa..d781ce7b 100644
--- a/plugins/inputs/ipmi_sensor/ipmi_test.go
+++ b/plugins/inputs/ipmi_sensor/ipmi_test.go
@@ -28,7 +28,7 @@ func TestGather(t *testing.T) {
 
 	require.NoError(t, err)
 
-	assert.Equal(t, acc.NFields(), 266, "non-numeric measurements should be ignored")
+	assert.Equal(t, acc.NFields(), 262, "non-numeric measurements should be ignored")
 
 	conn := NewConnection(i.Servers[0], i.Privilege)
 	assert.Equal(t, "USERID", conn.Username)
@@ -127,6 +127,7 @@ func TestGather(t *testing.T) {
 	}
 
 	err = acc.GatherError(i.Gather)
+	require.NoError(t, err)
 
 	var testsWithoutServer = []struct {
 		fields map[string]interface{}
@@ -378,3 +379,196 @@ OS RealTime Mod  | 0x00              | ok
 	}
 	os.Exit(0)
 }
+
+func TestGatherV2(t *testing.T) {
+	i := &Ipmi{
+		Servers:       []string{"USERID:PASSW0RD@lan(192.168.1.1)"},
+		Path:          "ipmitool",
+		Privilege:     "USER",
+		Timeout:       internal.Duration{Duration: time.Second * 5},
+		MetricVersion: 2,
+	}
+	// overwriting exec commands with mock commands
+	execCommand = fakeExecCommandV2
+	var acc testutil.Accumulator
+
+	err := acc.GatherError(i.Gather)
+
+	require.NoError(t, err)
+
+	conn := NewConnection(i.Servers[0], i.Privilege)
+	assert.Equal(t, "USERID", conn.Username)
+	assert.Equal(t, "lan", conn.Interface)
+
+	var testsWithServer = []struct {
+		fields map[string]interface{}
+		tags   map[string]string
+	}{
+		//SEL              | 72h | ns  |  7.1 | No Reading
+		{
+			map[string]interface{}{
+				"value": float64(0),
+			},
+			map[string]string{
+				"name":        "sel",
+				"entity_id":   "7.1",
+				"status_code": "ns",
+				"status_desc": "no_reading",
+				"server":      "192.168.1.1",
+			},
+		},
+	}
+
+	for _, test := range testsWithServer {
+		acc.AssertContainsTaggedFields(t, "ipmi_sensor", test.fields, test.tags)
+	}
+
+	i = &Ipmi{
+		Path:          "ipmitool",
+		Timeout:       internal.Duration{Duration: time.Second * 5},
+		MetricVersion: 2,
+	}
+
+	err = acc.GatherError(i.Gather)
+	require.NoError(t, err)
+
+	var testsWithoutServer = []struct {
+		fields map[string]interface{}
+		tags   map[string]string
+	}{
+		//SEL              | 72h | ns  |  7.1 | No Reading
+		{
+			map[string]interface{}{
+				"value": float64(0),
+			},
+			map[string]string{
+				"name":        "sel",
+				"entity_id":   "7.1",
+				"status_code": "ns",
+				"status_desc": "no_reading",
+			},
+		},
+		//Intrusion        | 73h | ok  |  7.1 |
+		{
+			map[string]interface{}{
+				"value": float64(0),
+			},
+			map[string]string{
+				"name":        "intrusion",
+				"entity_id":   "7.1",
+				"status_code": "ok",
+				"status_desc": "ok",
+			},
+		},
+		//Fan1             | 30h | ok  |  7.1 | 5040 RPM
+		{
+			map[string]interface{}{
+				"value": float64(5040),
+			},
+			map[string]string{
+				"name":        "fan1",
+				"entity_id":   "7.1",
+				"status_code": "ok",
+				"unit":        "rpm",
+			},
+		},
+		//Inlet Temp       | 04h | ok  |  7.1 | 25 degrees C
+		{
+			map[string]interface{}{
+				"value": float64(25),
+			},
+			map[string]string{
+				"name":        "inlet_temp",
+				"entity_id":   "7.1",
+				"status_code": "ok",
+				"unit":        "degrees_c",
+			},
+		},
+		//USB Cable Pres   | 50h | ok  |  7.1 | Connected
+		{
+			map[string]interface{}{
+				"value": float64(0),
+			},
+			map[string]string{
+				"name":        "usb_cable_pres",
+				"entity_id":   "7.1",
+				"status_code": "ok",
+				"status_desc": "connected",
+			},
+		},
+		//Current 1        | 6Ah | ok  | 10.1 | 7.20 Amps
+		{
+			map[string]interface{}{
+				"value": float64(7.2),
+			},
+			map[string]string{
+				"name":        "current_1",
+				"entity_id":   "10.1",
+				"status_code": "ok",
+				"unit":        "amps",
+			},
+		},
+		//Power Supply 1   | 03h | ok  | 10.1 | 110 Watts, Presence detected
+		{
+			map[string]interface{}{
+				"value": float64(110),
+			},
+			map[string]string{
+				"name":        "power_supply_1",
+				"entity_id":   "10.1",
+				"status_code": "ok",
+				"unit":        "watts",
+				"status_desc": "presence_detected",
+			},
+		},
+	}
+
+	for _, test := range testsWithoutServer {
+		acc.AssertContainsTaggedFields(t, "ipmi_sensor", test.fields, test.tags)
+	}
+}
+
+// fackeExecCommandV2 is a helper function that mock
+// the exec.Command call (and call the test binary)
+func fakeExecCommandV2(command string, args ...string) *exec.Cmd {
+	cs := []string{"-test.run=TestHelperProcessV2", "--", command}
+	cs = append(cs, args...)
+	cmd := exec.Command(os.Args[0], cs...)
+	cmd.Env = []string{"GO_WANT_HELPER_PROCESS=1"}
+	return cmd
+}
+
+// TestHelperProcessV2 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=TestHelperProcessV2 -- chrony tracking
+// it returns below mockData.
+func TestHelperProcessV2(t *testing.T) {
+	if os.Getenv("GO_WANT_HELPER_PROCESS") != "1" {
+		return
+	}
+
+	// Curated list of use cases instead of full dumps
+	mockData := `SEL              | 72h | ns  |  7.1 | No Reading
+Intrusion        | 73h | ok  |  7.1 |
+Fan1             | 30h | ok  |  7.1 | 5040 RPM
+Inlet Temp       | 04h | ok  |  7.1 | 25 degrees C
+USB Cable Pres   | 50h | ok  |  7.1 | Connected
+Current 1        | 6Ah | ok  | 10.1 | 7.20 Amps
+Power Supply 1   | 03h | ok  | 10.1 | 110 Watts, Presence detected
+`
+
+	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)
+
+	}
+	os.Exit(0)
+}

From ddf2d691e96c5705091c65fa55beecc7283bd27f Mon Sep 17 00:00:00 2001
From: Greg Linton <g2linton@gmail.com>
Date: Tue, 31 Jul 2018 17:57:54 -0600
Subject: [PATCH 660/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3f0a628..6af318ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,8 @@
 
 - [file](./plugins/inputs/file/README.md) - Contributed by @maxunt
 - [tengine](./plugins/inputs/tengine/README.md) - Contributed by @ertaoxu
+- [x509_cert](./plugins/inputs/x509_cert/README.md) - Contributed by @jtyr
+- [filecount](./plugins/inputs/filecount/README.md) - Contributed by @sometimesfood
 
 ### New Processors
 
@@ -49,6 +51,7 @@
 - [#4485](https://github.com/influxdata/telegraf/pull/4485): Add support for configuring an AWS endpoint_url.
 - [#4491](https://github.com/influxdata/telegraf/pull/4491): Send all messages before waiting for results in kafka output.
 - [#4492](https://github.com/influxdata/telegraf/pull/4492): Add support for lz4 compression to kafka output.
+- [#4450](https://github.com/influxdata/telegraf/pull/4450): Split multiple sensor keys in ipmi input.
 
 ## v1.7.2 [2018-07-18]
 

From 6a32a7d85b9fab3b2c628dad480dddb302282fc6 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 31 Jul 2018 17:15:42 -0700
Subject: [PATCH 661/835] Keep leading whitespace for messages in syslog input
 (#4498)

---
 plugins/inputs/syslog/README.md       |  4 ++--
 plugins/inputs/syslog/rfc5426_test.go | 32 +++++++++++++++++++++++++++
 plugins/inputs/syslog/syslog.go       |  9 +++++---
 3 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/plugins/inputs/syslog/README.md b/plugins/inputs/syslog/README.md
index 10772794..e57d28dd 100644
--- a/plugins/inputs/syslog/README.md
+++ b/plugins/inputs/syslog/README.md
@@ -33,9 +33,9 @@ Syslog messages should be formatted according to
   ## Only applies to stream sockets (e.g. TCP).
   # max_connections = 1024
 
-  ## Read timeout (default = 500ms).
+  ## Read timeout is the maximum time allowed for reading a single message (default = 5s).
   ## 0 means unlimited.
-  # read_timeout = 500ms
+  # read_timeout = "5s"
 
   ## Whether to parse in best effort mode or not (default = false).
   ## By default best effort parsing is off.
diff --git a/plugins/inputs/syslog/rfc5426_test.go b/plugins/inputs/syslog/rfc5426_test.go
index 8304a540..67966ed1 100644
--- a/plugins/inputs/syslog/rfc5426_test.go
+++ b/plugins/inputs/syslog/rfc5426_test.go
@@ -202,6 +202,38 @@ func getTestCasesForRFC5426() []testCase5426 {
 			},
 			werr: true,
 		},
+		{
+			name: "trim message",
+			data: []byte("<1>1 - - - - - - \tA\n"),
+			wantBestEffort: &testutil.Metric{
+				Measurement: "syslog",
+				Fields: map[string]interface{}{
+					"version":       uint16(1),
+					"message":       "\tA",
+					"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":       "\tA",
+					"facility_code": 0,
+					"severity_code": 1,
+				},
+				Tags: map[string]string{
+					"severity": "alert",
+					"facility": "kern",
+				},
+				Time: defaultTime,
+			},
+		},
 	}
 
 	return testCases
diff --git a/plugins/inputs/syslog/syslog.go b/plugins/inputs/syslog/syslog.go
index 6f8d959e..5b22cbca 100644
--- a/plugins/inputs/syslog/syslog.go
+++ b/plugins/inputs/syslog/syslog.go
@@ -10,6 +10,7 @@ import (
 	"strings"
 	"sync"
 	"time"
+	"unicode"
 
 	"github.com/influxdata/go-syslog/rfc5424"
 	"github.com/influxdata/go-syslog/rfc5425"
@@ -71,9 +72,9 @@ var sampleConfig = `
   ## Only applies to stream sockets (e.g. TCP).
   # max_connections = 1024
 
-  ## Read timeout (default = 500ms).
+  ## Read timeout is the maximum time allowed for reading a single message (default = 5s).
   ## 0 means unlimited.
-  # read_timeout = 500ms
+  # read_timeout = "5s"
 
   ## Whether to parse in best effort mode or not (default = false).
   ## By default best effort parsing is off.
@@ -365,7 +366,9 @@ func fields(msg rfc5424.SyslogMessage, s *Syslog) map[string]interface{} {
 	}
 
 	if msg.Message() != nil {
-		flds["message"] = strings.TrimSpace(*msg.Message())
+		flds["message"] = strings.TrimRightFunc(*msg.Message(), func(r rune) bool {
+			return unicode.IsSpace(r)
+		})
 	}
 
 	if msg.StructuredData() != nil {

From d7db4be5ef96d67615aa5f3f9a26207fe7ec8655 Mon Sep 17 00:00:00 2001
From: Greg Linton <g2linton@gmail.com>
Date: Tue, 31 Jul 2018 18:16:51 -0600
Subject: [PATCH 662/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6af318ee..f321c696 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -53,6 +53,12 @@
 - [#4492](https://github.com/influxdata/telegraf/pull/4492): Add support for lz4 compression to kafka output.
 - [#4450](https://github.com/influxdata/telegraf/pull/4450): Split multiple sensor keys in ipmi input.
 
+## v1.7.3 [unreleased]
+
+### Bugfixes
+
+- [#4498](https://github.com/influxdata/telegraf/pull/4498): Keep leading whitespace for messages in syslog input.
+
 ## v1.7.2 [2018-07-18]
 
 ### Bugfixes

From 2adfccc97527d3ab17fbc083b785ae5576e0ff2e Mon Sep 17 00:00:00 2001
From: EthanHur <ethan0311@gmail.com>
Date: Thu, 2 Aug 2018 07:37:52 +0900
Subject: [PATCH 663/835] Update netstat link in README.md (#4494)

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

diff --git a/README.md b/README.md
index a0f396ca..ae5750dd 100644
--- a/README.md
+++ b/README.md
@@ -198,7 +198,7 @@ configuration options.
 * [nats](./plugins/inputs/nats)
 * [net](./plugins/inputs/net)
 * [net_response](./plugins/inputs/net_response)
-* [netstat](./plugins/inputs/netstat)
+* [netstat](./plugins/inputs/net)
 * [nginx](./plugins/inputs/nginx)
 * [nginx_plus](./plugins/inputs/nginx_plus)
 * [nsq_consumer](./plugins/inputs/nsq_consumer)

From 4fff507ad697456aad63b83cfd32272144aa23f6 Mon Sep 17 00:00:00 2001
From: Greg <g2linton@gmail.com>
Date: Wed, 1 Aug 2018 16:39:19 -0600
Subject: [PATCH 664/835] Skip bad entries on interrupt input (#4497)

---
 plugins/inputs/interrupts/interrupts.go      |   9 +-
 plugins/inputs/interrupts/interrupts_test.go | 132 ++++++++++++++++++-
 2 files changed, 137 insertions(+), 4 deletions(-)

diff --git a/plugins/inputs/interrupts/interrupts.go b/plugins/inputs/interrupts/interrupts.go
index 75cbf3be..30b7ee18 100644
--- a/plugins/inputs/interrupts/interrupts.go
+++ b/plugins/inputs/interrupts/interrupts.go
@@ -3,12 +3,13 @@ package interrupts
 import (
 	"bufio"
 	"fmt"
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/plugins/inputs"
 	"io"
 	"os"
 	"strconv"
 	"strings"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 type Interrupts struct{}
@@ -50,6 +51,8 @@ func parseInterrupts(r io.Reader) ([]IRQ, error) {
 		}
 		cpucount = len(cpus)
 	}
+
+scan:
 	for scanner.Scan() {
 		fields := strings.Fields(scanner.Text())
 		if !strings.HasSuffix(fields[0], ":") {
@@ -62,7 +65,7 @@ func parseInterrupts(r io.Reader) ([]IRQ, error) {
 			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)
+					continue scan
 				}
 				irq.Cpus = append(irq.Cpus, irqval)
 			}
diff --git a/plugins/inputs/interrupts/interrupts_test.go b/plugins/inputs/interrupts/interrupts_test.go
index 6c76c850..cf1dc949 100644
--- a/plugins/inputs/interrupts/interrupts_test.go
+++ b/plugins/inputs/interrupts/interrupts_test.go
@@ -2,9 +2,10 @@ package interrupts
 
 import (
 	"bytes"
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"testing"
 )
 
 func TestParseInterrupts(t *testing.T) {
@@ -58,3 +59,132 @@ TASKLET:	205			0`
 		}
 	}
 }
+
+// Tests #4470
+func TestParseInterruptsBad(t *testing.T) {
+	interruptStr := `           CPU0       CPU1       CPU2       CPU3
+	16:          0          0          0          0  bcm2836-timer   0 Edge      arch_timer
+	17:  127224250  118424219  127224437  117885416  bcm2836-timer   1 Edge      arch_timer
+	21:          0          0          0          0  bcm2836-pmu   9 Edge      arm-pmu
+	23:    1549514          0          0          0  ARMCTRL-level   1 Edge      3f00b880.mailbox
+	24:          2          0          0          0  ARMCTRL-level   2 Edge      VCHIQ doorbell
+	46:          0          0          0          0  ARMCTRL-level  48 Edge      bcm2708_fb dma
+	48:          0          0          0          0  ARMCTRL-level  50 Edge      DMA IRQ
+	50:          0          0          0          0  ARMCTRL-level  52 Edge      DMA IRQ
+	51:        208          0          0          0  ARMCTRL-level  53 Edge      DMA IRQ
+	54:     883002          0          0          0  ARMCTRL-level  56 Edge      DMA IRQ
+	59:          0          0          0          0  ARMCTRL-level  61 Edge      bcm2835-auxirq
+	62:  521451447          0          0          0  ARMCTRL-level  64 Edge      dwc_otg, dwc_otg_pcd, dwc_otg_hcd:usb1
+	86:     857597          0          0          0  ARMCTRL-level  88 Edge      mmc0
+	87:       4938          0          0          0  ARMCTRL-level  89 Edge      uart-pl011
+	92:       5669          0          0          0  ARMCTRL-level  94 Edge      mmc1
+   FIQ:              usb_fiq
+   IPI0:          0          0          0          0  CPU wakeup interrupts
+   IPI1:          0          0          0          0  Timer broadcast interrupts
+   IPI2:   23564958   23464876   23531165   23040826  Rescheduling interrupts
+   IPI3:     148438     639704     644266     588150  Function call interrupts
+   IPI4:          0          0          0          0  CPU stop interrupts
+   IPI5:    4348149    1843985    3819457    1822877  IRQ work interrupts
+   IPI6:          0          0          0          0  completion interrupts`
+	f := bytes.NewBufferString(interruptStr)
+	parsed := []IRQ{
+		IRQ{
+			ID: "16", Type: "bcm2836-timer", Device: "0 Edge arch_timer",
+			Cpus: []int64{0, 0, 0, 0},
+		},
+		IRQ{
+			ID: "17", Type: "bcm2836-timer", Device: "1 Edge arch_timer",
+			Cpus: []int64{127224250, 118424219, 127224437, 117885416}, Total: 490758322,
+		},
+		IRQ{
+			ID: "21", Type: "bcm2836-pmu", Device: "9 Edge arm-pmu",
+			Cpus: []int64{0, 0, 0, 0},
+		},
+		IRQ{
+			ID: "23", Type: "ARMCTRL-level", Device: "1 Edge 3f00b880.mailbox",
+			Cpus: []int64{1549514, 0, 0, 0}, Total: 1549514,
+		},
+		IRQ{
+			ID: "24", Type: "ARMCTRL-level", Device: "2 Edge VCHIQ doorbell",
+			Cpus: []int64{2, 0, 0, 0}, Total: 2,
+		},
+		IRQ{
+			ID: "46", Type: "ARMCTRL-level", Device: "48 Edge bcm2708_fb dma",
+			Cpus: []int64{0, 0, 0, 0},
+		},
+		IRQ{
+			ID: "48", Type: "ARMCTRL-level", Device: "50 Edge DMA IRQ",
+			Cpus: []int64{0, 0, 0, 0},
+		},
+		IRQ{
+			ID: "50", Type: "ARMCTRL-level", Device: "52 Edge DMA IRQ",
+			Cpus: []int64{0, 0, 0, 0},
+		},
+		IRQ{
+			ID: "51", Type: "ARMCTRL-level", Device: "53 Edge DMA IRQ",
+			Cpus: []int64{208, 0, 0, 0}, Total: 208,
+		},
+		IRQ{
+			ID: "54", Type: "ARMCTRL-level", Device: "56 Edge DMA IRQ",
+			Cpus: []int64{883002, 0, 0, 0}, Total: 883002,
+		},
+		IRQ{
+			ID: "59", Type: "ARMCTRL-level", Device: "61 Edge bcm2835-auxirq",
+			Cpus: []int64{0, 0, 0, 0},
+		},
+		IRQ{
+			ID: "62", Type: "ARMCTRL-level", Device: "64 Edge dwc_otg, dwc_otg_pcd, dwc_otg_hcd:usb1",
+			Cpus: []int64{521451447, 0, 0, 0}, Total: 521451447,
+		},
+		IRQ{
+			ID: "86", Type: "ARMCTRL-level", Device: "88 Edge mmc0",
+			Cpus: []int64{857597, 0, 0, 0}, Total: 857597,
+		},
+		IRQ{
+			ID: "87", Type: "ARMCTRL-level", Device: "89 Edge uart-pl011",
+			Cpus: []int64{4938, 0, 0, 0}, Total: 4938,
+		},
+		IRQ{
+			ID: "92", Type: "ARMCTRL-level", Device: "94 Edge mmc1",
+			Cpus: []int64{5669, 0, 0, 0}, Total: 5669,
+		},
+		IRQ{
+			ID: "IPI0", Type: "CPU wakeup interrupts",
+			Cpus: []int64{0, 0, 0, 0},
+		},
+		IRQ{
+			ID: "IPI1", Type: "Timer broadcast interrupts",
+			Cpus: []int64{0, 0, 0, 0},
+		},
+		IRQ{
+			ID: "IPI2", Type: "Rescheduling interrupts",
+			Cpus: []int64{23564958, 23464876, 23531165, 23040826}, Total: 93601825,
+		},
+		IRQ{
+			ID: "IPI3", Type: "Function call interrupts",
+			Cpus: []int64{148438, 639704, 644266, 588150}, Total: 2020558,
+		},
+		IRQ{
+			ID: "IPI4", Type: "CPU stop interrupts",
+			Cpus: []int64{0, 0, 0, 0},
+		},
+		IRQ{
+			ID: "IPI5", Type: "IRQ work interrupts",
+			Cpus: []int64{4348149, 1843985, 3819457, 1822877}, Total: 11834468,
+		},
+		IRQ{
+			ID: "IPI6", Type: "completion interrupts",
+			Cpus: []int64{0, 0, 0, 0},
+		},
+	}
+	got, err := parseInterrupts(f)
+	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 e5384339599161e48b8d32770cbb32a2c8e9df9a Mon Sep 17 00:00:00 2001
From: Shanshi Shi <shishanshi@gmail.com>
Date: Thu, 2 Aug 2018 06:39:54 +0800
Subject: [PATCH 665/835] Preserve metric type when using filters in output
 plugins (#4481)

---
 internal/models/running_output.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/internal/models/running_output.go b/internal/models/running_output.go
index 713c28cc..a0d1f6b0 100644
--- a/internal/models/running_output.go
+++ b/internal/models/running_output.go
@@ -105,12 +105,13 @@ func (ro *RunningOutput) AddMetric(m telegraf.Metric) {
 		tags := m.Tags()
 		fields := m.Fields()
 		t := m.Time()
+		tp := m.Type()
 		if ok := ro.Config.Filter.Apply(name, fields, tags); !ok {
 			ro.MetricsFiltered.Incr(1)
 			return
 		}
 		// error is not possible if creating from another metric, so ignore.
-		m, _ = metric.New(name, tags, fields, t)
+		m, _ = metric.New(name, tags, fields, t, tp)
 	}
 
 	ro.metrics.Add(m)

From 66528354a585a2de30513c16e02bbe1e75aa1264 Mon Sep 17 00:00:00 2001
From: Greg Linton <g2linton@gmail.com>
Date: Wed, 1 Aug 2018 16:40:55 -0600
Subject: [PATCH 666/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f321c696..3431ed3c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -58,6 +58,8 @@
 ### Bugfixes
 
 - [#4498](https://github.com/influxdata/telegraf/pull/4498): Keep leading whitespace for messages in syslog input.
+- [#4497](https://github.com/influxdata/telegraf/pull/4497): Skip bad entries on interrupt input.
+- [#4481](https://github.com/influxdata/telegraf/pull/4481): Preserve metric type when using filters in output plugins.
 
 ## v1.7.2 [2018-07-18]
 

From 199841a8205c38ea8198db1902df0759eaa9f128 Mon Sep 17 00:00:00 2001
From: david7482 <david74.chou@gmail.com>
Date: Thu, 2 Aug 2018 06:43:17 +0800
Subject: [PATCH 667/835] Support StatisticValues in cloudwatch output plugin
 (#4364)

---
 plugins/outputs/cloudwatch/README.md          |  10 +
 plugins/outputs/cloudwatch/cloudwatch.go      | 293 ++++++++++++++----
 plugins/outputs/cloudwatch/cloudwatch_test.go |  38 ++-
 3 files changed, 286 insertions(+), 55 deletions(-)

diff --git a/plugins/outputs/cloudwatch/README.md b/plugins/outputs/cloudwatch/README.md
index c44ac4ea..31619263 100644
--- a/plugins/outputs/cloudwatch/README.md
+++ b/plugins/outputs/cloudwatch/README.md
@@ -36,3 +36,13 @@ Examples include but are not limited to:
 ### namespace
 
 The namespace used for AWS CloudWatch metrics.
+
+### write_statistics
+
+If you have a large amount of metrics, you should consider to send statistic 
+values instead of raw metrics which could not only improve performance but 
+also save AWS API cost. If enable this flag, this plugin would parse the required 
+[CloudWatch statistic fields](https://docs.aws.amazon.com/sdk-for-go/api/service/cloudwatch/#StatisticSet) 
+(count, min, max, and sum) and send them to CloudWatch. You could use `basicstats` 
+aggregator to calculate those fields. If not all statistic fields are available, 
+all fields would still be sent as raw metrics.
\ No newline at end of file
diff --git a/plugins/outputs/cloudwatch/cloudwatch.go b/plugins/outputs/cloudwatch/cloudwatch.go
index 52ab41a2..d3bd6630 100644
--- a/plugins/outputs/cloudwatch/cloudwatch.go
+++ b/plugins/outputs/cloudwatch/cloudwatch.go
@@ -28,6 +28,128 @@ type CloudWatch struct {
 
 	Namespace string `toml:"namespace"` // CloudWatch Metrics Namespace
 	svc       *cloudwatch.CloudWatch
+
+	WriteStatistics bool `toml:"write_statistics"`
+}
+
+type statisticType int
+
+const (
+	statisticTypeNone statisticType = iota
+	statisticTypeMax
+	statisticTypeMin
+	statisticTypeSum
+	statisticTypeCount
+)
+
+type cloudwatchField interface {
+	addValue(sType statisticType, value float64)
+	buildDatum() []*cloudwatch.MetricDatum
+}
+
+type statisticField struct {
+	metricName string
+	fieldName  string
+	tags       map[string]string
+	values     map[statisticType]float64
+	timestamp  time.Time
+}
+
+func (f *statisticField) addValue(sType statisticType, value float64) {
+	if sType != statisticTypeNone {
+		f.values[sType] = value
+	}
+}
+
+func (f *statisticField) buildDatum() []*cloudwatch.MetricDatum {
+
+	var datums []*cloudwatch.MetricDatum
+
+	if f.hasAllFields() {
+		// If we have all required fields, we build datum with StatisticValues
+		min, _ := f.values[statisticTypeMin]
+		max, _ := f.values[statisticTypeMax]
+		sum, _ := f.values[statisticTypeSum]
+		count, _ := f.values[statisticTypeCount]
+
+		datum := &cloudwatch.MetricDatum{
+			MetricName: aws.String(strings.Join([]string{f.metricName, f.fieldName}, "_")),
+			Dimensions: BuildDimensions(f.tags),
+			Timestamp:  aws.Time(f.timestamp),
+			StatisticValues: &cloudwatch.StatisticSet{
+				Minimum:     aws.Float64(min),
+				Maximum:     aws.Float64(max),
+				Sum:         aws.Float64(sum),
+				SampleCount: aws.Float64(count),
+			},
+		}
+
+		datums = append(datums, datum)
+
+	} else {
+		// If we don't have all required fields, we build each field as independent datum
+		for sType, value := range f.values {
+			datum := &cloudwatch.MetricDatum{
+				Value:      aws.Float64(value),
+				Dimensions: BuildDimensions(f.tags),
+				Timestamp:  aws.Time(f.timestamp),
+			}
+
+			switch sType {
+			case statisticTypeMin:
+				datum.MetricName = aws.String(strings.Join([]string{f.metricName, f.fieldName, "min"}, "_"))
+			case statisticTypeMax:
+				datum.MetricName = aws.String(strings.Join([]string{f.metricName, f.fieldName, "max"}, "_"))
+			case statisticTypeSum:
+				datum.MetricName = aws.String(strings.Join([]string{f.metricName, f.fieldName, "sum"}, "_"))
+			case statisticTypeCount:
+				datum.MetricName = aws.String(strings.Join([]string{f.metricName, f.fieldName, "count"}, "_"))
+			default:
+				// should not be here
+				continue
+			}
+
+			datums = append(datums, datum)
+		}
+	}
+
+	return datums
+}
+
+func (f *statisticField) hasAllFields() bool {
+
+	_, hasMin := f.values[statisticTypeMin]
+	_, hasMax := f.values[statisticTypeMax]
+	_, hasSum := f.values[statisticTypeSum]
+	_, hasCount := f.values[statisticTypeCount]
+
+	return hasMin && hasMax && hasSum && hasCount
+}
+
+type valueField struct {
+	metricName string
+	fieldName  string
+	tags       map[string]string
+	value      float64
+	timestamp  time.Time
+}
+
+func (f *valueField) addValue(sType statisticType, value float64) {
+	if sType == statisticTypeNone {
+		f.value = value
+	}
+}
+
+func (f *valueField) buildDatum() []*cloudwatch.MetricDatum {
+
+	return []*cloudwatch.MetricDatum{
+		{
+			MetricName: aws.String(strings.Join([]string{f.metricName, f.fieldName}, "_")),
+			Value:      aws.Float64(f.value),
+			Dimensions: BuildDimensions(f.tags),
+			Timestamp:  aws.Time(f.timestamp),
+		},
+	}
 }
 
 var sampleConfig = `
@@ -57,6 +179,14 @@ var sampleConfig = `
 
   ## Namespace for the CloudWatch MetricDatums
   namespace = "InfluxData/Telegraf"
+
+  ## If you have a large amount of metrics, you should consider to send statistic 
+  ## values instead of raw metrics which could not only improve performance but 
+  ## also save AWS API cost. If enable this flag, this plugin would parse the required 
+  ## CloudWatch statistic fields (count, min, max, and sum) and send them to CloudWatch. 
+  ## You could use basicstats aggregator to calculate those fields. If not all statistic 
+  ## fields are available, all fields would still be sent as raw metrics. 
+  # write_statistics = false
 `
 
 func (c *CloudWatch) SampleConfig() string {
@@ -104,7 +234,7 @@ func (c *CloudWatch) Write(metrics []telegraf.Metric) error {
 
 	var datums []*cloudwatch.MetricDatum
 	for _, m := range metrics {
-		d := BuildMetricDatum(m)
+		d := BuildMetricDatum(c.WriteStatistics, m)
 		datums = append(datums, d...)
 	}
 
@@ -159,67 +289,58 @@ func PartitionDatums(size int, datums []*cloudwatch.MetricDatum) [][]*cloudwatch
 	return partitions
 }
 
-// Make a MetricDatum for each field in a Point. Only fields with values that can be
-// converted to float64 are supported. Non-supported fields are skipped.
-func BuildMetricDatum(point telegraf.Metric) []*cloudwatch.MetricDatum {
-	datums := make([]*cloudwatch.MetricDatum, len(point.Fields()))
-	i := 0
+// Make a MetricDatum from telegraf.Metric. It would check if all required fields of
+// cloudwatch.StatisticSet are available. If so, it would build MetricDatum from statistic values.
+// Otherwise, fields would still been built independently.
+func BuildMetricDatum(buildStatistic bool, point telegraf.Metric) []*cloudwatch.MetricDatum {
 
-	var value float64
+	fields := make(map[string]cloudwatchField)
 
 	for k, v := range point.Fields() {
-		switch t := v.(type) {
-		case int:
-			value = float64(t)
-		case int32:
-			value = float64(t)
-		case int64:
-			value = float64(t)
-		case uint64:
-			value = float64(t)
-		case float64:
-			value = t
-		case bool:
-			if t {
-				value = 1
-			} else {
-				value = 0
+
+		val, ok := convert(v)
+		if !ok {
+			// Only fields with values that can be converted to float64 (and within CloudWatch boundary) are supported.
+			// Non-supported fields are skipped.
+			continue
+		}
+
+		sType, fieldName := getStatisticType(k)
+
+		// If statistic metric is not enabled or non-statistic type, just take current field as a value field.
+		if !buildStatistic || sType == statisticTypeNone {
+			fields[k] = &valueField{
+				metricName: point.Name(),
+				fieldName:  k,
+				tags:       point.Tags(),
+				timestamp:  point.Time(),
+				value:      val,
 			}
-		case time.Time:
-			value = float64(t.Unix())
-		default:
-			// Skip unsupported type.
-			datums = datums[:len(datums)-1]
 			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
+		// Otherwise, it shall be a statistic field.
+		if _, ok := fields[fieldName]; !ok {
+			// Hit an uncached field, create statisticField for first time
+			fields[fieldName] = &statisticField{
+				metricName: point.Name(),
+				fieldName:  fieldName,
+				tags:       point.Tags(),
+				timestamp:  point.Time(),
+				values: map[statisticType]float64{
+					sType: val,
+				},
+			}
+		} else {
+			// Add new statistic value to this field
+			fields[fieldName].addValue(sType, val)
 		}
+	}
 
-		datums[i] = &cloudwatch.MetricDatum{
-			MetricName: aws.String(strings.Join([]string{point.Name(), k}, "_")),
-			Value:      aws.Float64(value),
-			Dimensions: BuildDimensions(point.Tags()),
-			Timestamp:  aws.Time(point.Time()),
-		}
-
-		i += 1
+	var datums []*cloudwatch.MetricDatum
+	for _, f := range fields {
+		d := f.buildDatum()
+		datums = append(datums, d...)
 	}
 
 	return datums
@@ -268,6 +389,72 @@ func BuildDimensions(mTags map[string]string) []*cloudwatch.Dimension {
 	return dimensions
 }
 
+func getStatisticType(name string) (sType statisticType, fieldName string) {
+	switch {
+	case strings.HasSuffix(name, "_max"):
+		sType = statisticTypeMax
+		fieldName = strings.TrimSuffix(name, "_max")
+	case strings.HasSuffix(name, "_min"):
+		sType = statisticTypeMin
+		fieldName = strings.TrimSuffix(name, "_min")
+	case strings.HasSuffix(name, "_sum"):
+		sType = statisticTypeSum
+		fieldName = strings.TrimSuffix(name, "_sum")
+	case strings.HasSuffix(name, "_count"):
+		sType = statisticTypeCount
+		fieldName = strings.TrimSuffix(name, "_count")
+	default:
+		sType = statisticTypeNone
+		fieldName = name
+	}
+	return
+}
+
+func convert(v interface{}) (value float64, ok bool) {
+
+	ok = true
+
+	switch t := v.(type) {
+	case int:
+		value = float64(t)
+	case int32:
+		value = float64(t)
+	case int64:
+		value = float64(t)
+	case uint64:
+		value = float64(t)
+	case float64:
+		value = t
+	case bool:
+		if t {
+			value = 1
+		} else {
+			value = 0
+		}
+	case time.Time:
+		value = float64(t.Unix())
+	default:
+		// Skip unsupported type.
+		ok = false
+		return
+	}
+
+	// Do CloudWatch boundary checking
+	// Constraints at: http://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_MetricDatum.html
+	switch {
+	case math.IsNaN(value):
+		return 0, false
+	case math.IsInf(value, 0):
+		return 0, false
+	case value > 0 && value < float64(8.515920e-109):
+		return 0, false
+	case value > float64(1.174271e+108):
+		return 0, false
+	}
+
+	return
+}
+
 func init() {
 	outputs.Add("cloudwatch", func() telegraf.Output {
 		return &CloudWatch{}
diff --git a/plugins/outputs/cloudwatch/cloudwatch_test.go b/plugins/outputs/cloudwatch/cloudwatch_test.go
index 8ab60de2..c91c30e0 100644
--- a/plugins/outputs/cloudwatch/cloudwatch_test.go
+++ b/plugins/outputs/cloudwatch/cloudwatch_test.go
@@ -5,11 +5,13 @@ import (
 	"math"
 	"sort"
 	"testing"
+	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/cloudwatch"
 
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/metric"
 	"github.com/influxdata/telegraf/testutil"
 
 	"github.com/stretchr/testify/assert"
@@ -72,13 +74,45 @@ func TestBuildMetricDatums(t *testing.T) {
 		testutil.TestMetric(float64(1.174272e+108)), // largest should be 1.174271e+108
 	}
 	for _, point := range validMetrics {
-		datums := BuildMetricDatum(point)
+		datums := BuildMetricDatum(false, point)
 		assert.Equal(1, len(datums), fmt.Sprintf("Valid point should create a Datum {value: %v}", point))
 	}
 	for _, point := range invalidMetrics {
-		datums := BuildMetricDatum(point)
+		datums := BuildMetricDatum(false, point)
 		assert.Equal(0, len(datums), fmt.Sprintf("Valid point should not create a Datum {value: %v}", point))
 	}
+
+	statisticMetric, _ := metric.New(
+		"test1",
+		map[string]string{"tag1": "value1"},
+		map[string]interface{}{"value_max": float64(10), "value_min": float64(0), "value_sum": float64(100), "value_count": float64(20)},
+		time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC),
+	)
+	datums := BuildMetricDatum(true, statisticMetric)
+	assert.Equal(1, len(datums), fmt.Sprintf("Valid point should create a Datum {value: %v}", statisticMetric))
+
+	multiFieldsMetric, _ := metric.New(
+		"test1",
+		map[string]string{"tag1": "value1"},
+		map[string]interface{}{"valueA": float64(10), "valueB": float64(0), "valueC": float64(100), "valueD": float64(20)},
+		time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC),
+	)
+	datums = BuildMetricDatum(true, multiFieldsMetric)
+	assert.Equal(4, len(datums), fmt.Sprintf("Each field should create a Datum {value: %v}", multiFieldsMetric))
+
+	multiStatisticMetric, _ := metric.New(
+		"test1",
+		map[string]string{"tag1": "value1"},
+		map[string]interface{}{
+			"valueA_max": float64(10), "valueA_min": float64(0), "valueA_sum": float64(100), "valueA_count": float64(20),
+			"valueB_max": float64(10), "valueB_min": float64(0), "valueB_sum": float64(100), "valueB_count": float64(20),
+			"valueC_max": float64(10), "valueC_min": float64(0), "valueC_sum": float64(100),
+			"valueD": float64(10), "valueE": float64(0),
+		},
+		time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC),
+	)
+	datums = BuildMetricDatum(true, multiStatisticMetric)
+	assert.Equal(7, len(datums), fmt.Sprintf("Valid point should create a Datum {value: %v}", multiStatisticMetric))
 }
 
 func TestPartitionDatums(t *testing.T) {

From e1160c26bceab81e150a34c6f6366915ad045828 Mon Sep 17 00:00:00 2001
From: dupondje <jean-louis@dupond.be>
Date: Thu, 2 Aug 2018 00:43:34 +0200
Subject: [PATCH 668/835] Add ip restriction for the prometheus_client output
 (#4431)

---
 etc/telegraf.conf                             |  3 ++
 plugins/outputs/prometheus_client/README.md   |  3 ++
 .../prometheus_client/prometheus_client.go    | 30 +++++++++++++++++--
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 912a93d1..c3a84569 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -747,6 +747,9 @@
 #   #basic_username = "Foo"
 #   #basic_password = "Bar"
 #
+#   ## IP Ranges which are allowed to access metrics
+#   #ip_range = ["192.168.0.0/24", "192.168.1.0/30"]
+#
 #   ## 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 6cb0cc59..d68cafe9 100644
--- a/plugins/outputs/prometheus_client/README.md
+++ b/plugins/outputs/prometheus_client/README.md
@@ -18,6 +18,9 @@ This plugin starts a [Prometheus](https://prometheus.io/) Client, it exposes all
   basic_username = "Foo"
   basic_password = "Bar"
 
+  # IP Ranges which are allowed to access metrics
+  ip_range = ["192.168.0.0/24", "192.168.1.0/30"]
+
   # 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 b82c72cf..9634e922 100644
--- a/plugins/outputs/prometheus_client/prometheus_client.go
+++ b/plugins/outputs/prometheus_client/prometheus_client.go
@@ -5,6 +5,7 @@ import (
 	"crypto/subtle"
 	"fmt"
 	"log"
+	"net"
 	"net/http"
 	"os"
 	"regexp"
@@ -58,6 +59,7 @@ type PrometheusClient struct {
 	TLSKey             string            `toml:"tls_key"`
 	BasicUsername      string            `toml:"basic_username"`
 	BasicPassword      string            `toml:"basic_password"`
+	IPRange            []string          `toml:"ip_range"`
 	ExpirationInterval internal.Duration `toml:"expiration_interval"`
 	Path               string            `toml:"path"`
 	CollectorsExclude  []string          `toml:"collectors_exclude"`
@@ -84,6 +86,9 @@ var sampleConfig = `
   #basic_username = "Foo"
   #basic_password = "Bar"
 
+  ## IP Ranges which are allowed to access metrics
+  #ip_range = ["192.168.0.0/24", "192.168.1.0/30"]
+
   ## Interval to expire metrics and not deliver to prometheus, 0 == no expiration
   # expiration_interval = "60s"
 
@@ -96,7 +101,7 @@ var sampleConfig = `
   string_as_label = true
 `
 
-func (p *PrometheusClient) basicAuth(h http.Handler) http.Handler {
+func (p *PrometheusClient) auth(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"`)
@@ -110,6 +115,27 @@ func (p *PrometheusClient) basicAuth(h http.Handler) http.Handler {
 			}
 		}
 
+		if len(p.IPRange) > 0 {
+			matched := false
+			remoteIPs, _, _ := net.SplitHostPort(r.RemoteAddr)
+			remoteIP := net.ParseIP(remoteIPs)
+			for _, iprange := range p.IPRange {
+				_, ipNet, err := net.ParseCIDR(iprange)
+				if err != nil {
+					http.Error(w, "Config Error in ip_range setting", 500)
+					return
+				}
+				if ipNet.Contains(remoteIP) {
+					matched = true
+					break
+				}
+			}
+			if !matched {
+				http.Error(w, "Not authorized", 401)
+				return
+			}
+		}
+
 		h.ServeHTTP(w, r)
 	})
 }
@@ -146,7 +172,7 @@ func (p *PrometheusClient) Start() error {
 	}
 
 	mux := http.NewServeMux()
-	mux.Handle(p.Path, p.basicAuth(promhttp.HandlerFor(
+	mux.Handle(p.Path, p.auth(promhttp.HandlerFor(
 		registry, promhttp.HandlerOpts{ErrorHandling: promhttp.ContinueOnError})))
 
 	p.server = &http.Server{

From 429d14101a7310d41695bfcddc70e1559cacb521 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Blot?= <nerzhul@users.noreply.github.com>
Date: Thu, 2 Aug 2018 00:44:10 +0200
Subject: [PATCH 669/835] Add pgbouncer input plugin (#3918)

---
 README.md                                     |   1 +
 docker-compose.yml                            |   7 +
 plugins/inputs/all/all.go                     |   1 +
 plugins/inputs/pgbouncer/README.md            |  21 ++
 plugins/inputs/pgbouncer/pgbouncer.go         | 179 ++++++++++++++++++
 plugins/inputs/pgbouncer/pgbouncer_test.go    |  66 +++++++
 plugins/inputs/postgresql/postgresql.go       |   1 +
 plugins/inputs/postgresql/postgresql_test.go  |   1 +
 plugins/inputs/postgresql/service.go          |  33 +++-
 .../postgresql_extensible.go                  |   1 +
 .../postgresql_extensible_test.go             |   1 +
 11 files changed, 311 insertions(+), 1 deletion(-)
 create mode 100644 plugins/inputs/pgbouncer/README.md
 create mode 100644 plugins/inputs/pgbouncer/pgbouncer.go
 create mode 100644 plugins/inputs/pgbouncer/pgbouncer_test.go

diff --git a/README.md b/README.md
index ae5750dd..6307b535 100644
--- a/README.md
+++ b/README.md
@@ -209,6 +209,7 @@ configuration options.
 * [openldap](./plugins/inputs/openldap)
 * [opensmtpd](./plugins/inputs/opensmtpd)
 * [pf](./plugins/inputs/pf)
+* [pgbouncer](./plugins/inputs/pgbouncer)
 * [phpfpm](./plugins/inputs/phpfpm)
 * [phusion passenger](./plugins/inputs/passenger)
 * [ping](./plugins/inputs/ping)
diff --git a/docker-compose.yml b/docker-compose.yml
index 822d7fff..5ac47089 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -40,6 +40,13 @@ services:
     image: memcached
     ports: 
       - "11211:11211"
+  pgbouncer:
+    image: mbed/pgbouncer
+    environment:
+      PG_ENV_POSTGRESQL_USER: pgbouncer
+      PG_ENV_POSTGRESQL_PASS: pgbouncer
+    ports:
+      - "6432:6432"
   postgres:
     image: postgres:alpine
     ports:
diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index 4d46a549..bbca9952 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -84,6 +84,7 @@ import (
 	_ "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/pgbouncer"
 	_ "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/pgbouncer/README.md b/plugins/inputs/pgbouncer/README.md
new file mode 100644
index 00000000..2a841c45
--- /dev/null
+++ b/plugins/inputs/pgbouncer/README.md
@@ -0,0 +1,21 @@
+# PgBouncer plugin
+
+This PgBouncer plugin provides metrics for your PgBouncer load balancer.
+
+More information about the meaning of these metrics can be found in the [PgBouncer Documentation](https://pgbouncer.github.io/usage.html)
+
+## 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.
+
+### Configuration example
+```
+[[inputs.pgbouncer]]
+  address = "postgres://telegraf@localhost/pgbouncer"
+```
diff --git a/plugins/inputs/pgbouncer/pgbouncer.go b/plugins/inputs/pgbouncer/pgbouncer.go
new file mode 100644
index 00000000..722648c4
--- /dev/null
+++ b/plugins/inputs/pgbouncer/pgbouncer.go
@@ -0,0 +1,179 @@
+package pgbouncer
+
+import (
+	"bytes"
+	"github.com/influxdata/telegraf/plugins/inputs/postgresql"
+
+	// register in driver.
+	_ "github.com/jackc/pgx/stdlib"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+type PgBouncer struct {
+	postgresql.Service
+}
+
+var ignoredColumns = map[string]bool{"user": true, "database": true, "pool_mode": true,
+	"avg_req": true, "avg_recv": true, "avg_sent": true, "avg_query": true,
+}
+
+var sampleConfig = `
+  ## 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.
+  ##
+  address = "host=localhost user=pgbouncer sslmode=disable"
+`
+
+func (p *PgBouncer) SampleConfig() string {
+	return sampleConfig
+}
+
+func (p *PgBouncer) Description() string {
+	return "Read metrics from one or many pgbouncer servers"
+}
+
+func (p *PgBouncer) Gather(acc telegraf.Accumulator) error {
+	var (
+		err     error
+		query   string
+		columns []string
+	)
+
+	query = `SHOW STATS`
+
+	rows, err := p.DB.Query(query)
+	if err != nil {
+		return err
+	}
+
+	defer rows.Close()
+
+	// grab the column information from the result
+	if columns, err = rows.Columns(); err != nil {
+		return err
+	}
+
+	for rows.Next() {
+		tags, columnMap, err := p.accRow(rows, acc, columns)
+
+		if err != nil {
+			return err
+		}
+
+		fields := make(map[string]interface{})
+		for col, val := range columnMap {
+			_, ignore := ignoredColumns[col]
+			if !ignore {
+				fields[col] = *val
+			}
+		}
+		acc.AddFields("pgbouncer", fields, tags)
+	}
+
+	query = `SHOW POOLS`
+
+	poolRows, err := p.DB.Query(query)
+	if err != nil {
+		return err
+	}
+
+	defer poolRows.Close()
+
+	// grab the column information from the result
+	if columns, err = poolRows.Columns(); err != nil {
+		return err
+	}
+
+	for poolRows.Next() {
+		tags, columnMap, err := p.accRow(poolRows, acc, columns)
+		if err != nil {
+			return err
+		}
+
+		if s, ok := (*columnMap["user"]).(string); ok && s != "" {
+			tags["user"] = s
+		}
+
+		if s, ok := (*columnMap["pool_mode"]).(string); ok && s != "" {
+			tags["pool_mode"] = s
+		}
+
+		fields := make(map[string]interface{})
+		for col, val := range columnMap {
+			_, ignore := ignoredColumns[col]
+			if !ignore {
+				fields[col] = *val
+			}
+		}
+		acc.AddFields("pgbouncer_pools", fields, tags)
+	}
+
+	return poolRows.Err()
+}
+
+type scanner interface {
+	Scan(dest ...interface{}) error
+}
+
+func (p *PgBouncer) accRow(row scanner, acc telegraf.Accumulator, columns []string) (map[string]string,
+	map[string]*interface{}, 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 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[columns[i]])
+	}
+
+	// deconstruct array of variables and send to Scan
+	err := row.Scan(columnVars...)
+
+	if err != nil {
+		return nil, nil, err
+	}
+	if columnMap["database"] != nil {
+		// extract the database name from the column map
+		dbname.WriteString((*columnMap["database"]).(string))
+	} else {
+		dbname.WriteString("postgres")
+	}
+
+	var tagAddress string
+	tagAddress, err = p.SanitizedAddress()
+	if err != nil {
+		return nil, nil, err
+	}
+
+	// Return basic tags and the mapped columns
+	return map[string]string{"server": tagAddress, "db": dbname.String()}, columnMap, nil
+}
+
+func init() {
+	inputs.Add("pgbouncer", func() telegraf.Input {
+		return &PgBouncer{
+			Service: postgresql.Service{
+				MaxIdle: 1,
+				MaxOpen: 1,
+				MaxLifetime: internal.Duration{
+					Duration: 0,
+				},
+				IsPgBouncer: true,
+			},
+		}
+	})
+}
diff --git a/plugins/inputs/pgbouncer/pgbouncer_test.go b/plugins/inputs/pgbouncer/pgbouncer_test.go
new file mode 100644
index 00000000..44e28c7f
--- /dev/null
+++ b/plugins/inputs/pgbouncer/pgbouncer_test.go
@@ -0,0 +1,66 @@
+package pgbouncer
+
+import (
+	"fmt"
+	"github.com/influxdata/telegraf/plugins/inputs/postgresql"
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"testing"
+)
+
+func TestPgBouncerGeneratesMetrics(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	p := &PgBouncer{
+		Service: postgresql.Service{
+			Address: fmt.Sprintf(
+				"host=%s user=pgbouncer password=pgbouncer dbname=pgbouncer port=6432 sslmode=disable",
+				testutil.GetLocalHost(),
+			),
+			IsPgBouncer: true,
+		},
+	}
+
+	var acc testutil.Accumulator
+	require.NoError(t, p.Start(&acc))
+	require.NoError(t, p.Gather(&acc))
+
+	intMetrics := []string{
+		"total_requests",
+		"total_received",
+		"total_sent",
+		"total_query_time",
+		"avg_req",
+		"avg_recv",
+		"avg_sent",
+		"avg_query",
+		"cl_active",
+		"cl_waiting",
+		"sv_active",
+		"sv_idle",
+		"sv_used",
+		"sv_tested",
+		"sv_login",
+		"maxwait",
+	}
+
+	int32Metrics := []string{}
+
+	metricsCounted := 0
+
+	for _, metric := range intMetrics {
+		assert.True(t, acc.HasInt64Field("pgbouncer", metric))
+		metricsCounted++
+	}
+
+	for _, metric := range int32Metrics {
+		assert.True(t, acc.HasInt32Field("pgbouncer", metric))
+		metricsCounted++
+	}
+
+	assert.True(t, metricsCounted > 0)
+	assert.Equal(t, len(intMetrics)+len(int32Metrics), metricsCounted)
+}
diff --git a/plugins/inputs/postgresql/postgresql.go b/plugins/inputs/postgresql/postgresql.go
index 19c9db9c..e136098f 100644
--- a/plugins/inputs/postgresql/postgresql.go
+++ b/plugins/inputs/postgresql/postgresql.go
@@ -189,6 +189,7 @@ func init() {
 				MaxLifetime: internal.Duration{
 					Duration: 0,
 				},
+				IsPgBouncer: false,
 			},
 		}
 	})
diff --git a/plugins/inputs/postgresql/postgresql_test.go b/plugins/inputs/postgresql/postgresql_test.go
index 306dca3b..b2332101 100644
--- a/plugins/inputs/postgresql/postgresql_test.go
+++ b/plugins/inputs/postgresql/postgresql_test.go
@@ -20,6 +20,7 @@ func TestPostgresqlGeneratesMetrics(t *testing.T) {
 				"host=%s user=postgres sslmode=disable",
 				testutil.GetLocalHost(),
 			),
+			IsPgBouncer: false,
 		},
 		Databases: []string{"postgres"},
 	}
diff --git a/plugins/inputs/postgresql/service.go b/plugins/inputs/postgresql/service.go
index 4f7b21e5..9d3ab396 100644
--- a/plugins/inputs/postgresql/service.go
+++ b/plugins/inputs/postgresql/service.go
@@ -3,6 +3,9 @@ package postgresql
 import (
 	"database/sql"
 	"fmt"
+	"github.com/jackc/pgx"
+	"github.com/jackc/pgx/pgtype"
+	"github.com/jackc/pgx/stdlib"
 	"net"
 	"net/url"
 	"regexp"
@@ -90,6 +93,7 @@ type Service struct {
 	MaxOpen       int
 	MaxLifetime   internal.Duration
 	DB            *sql.DB
+	IsPgBouncer   bool
 }
 
 // Start starts the ServiceInput's service, whatever that may be
@@ -100,7 +104,34 @@ func (p *Service) Start(telegraf.Accumulator) (err error) {
 		p.Address = localhost
 	}
 
-	if p.DB, err = sql.Open("pgx", p.Address); err != nil {
+	connectionString := p.Address
+
+	// Specific support to make it work with PgBouncer too
+	// See https://github.com/influxdata/telegraf/issues/3253#issuecomment-357505343
+	if p.IsPgBouncer {
+		d := &stdlib.DriverConfig{
+			ConnConfig: pgx.ConnConfig{
+				PreferSimpleProtocol: true,
+				RuntimeParams: map[string]string{
+					"client_encoding": "UTF8",
+				},
+				CustomConnInfo: func(c *pgx.Conn) (*pgtype.ConnInfo, error) {
+					info := c.ConnInfo.DeepCopy()
+					info.RegisterDataType(pgtype.DataType{
+						Value: &pgtype.OIDValue{},
+						Name:  "int8OID",
+						OID:   pgtype.Int8OID,
+					})
+
+					return info, nil
+				},
+			},
+		}
+		stdlib.RegisterDriverConfig(d)
+		connectionString = d.ConnectionString(p.Address)
+	}
+
+	if p.DB, err = sql.Open("pgx", connectionString); err != nil {
 		return err
 	}
 
diff --git a/plugins/inputs/postgresql_extensible/postgresql_extensible.go b/plugins/inputs/postgresql_extensible/postgresql_extensible.go
index 056f4afc..a0438288 100644
--- a/plugins/inputs/postgresql_extensible/postgresql_extensible.go
+++ b/plugins/inputs/postgresql_extensible/postgresql_extensible.go
@@ -283,6 +283,7 @@ func init() {
 				MaxLifetime: internal.Duration{
 					Duration: 0,
 				},
+				IsPgBouncer: false,
 			},
 		}
 	})
diff --git a/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go b/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go
index 77db5feb..0f9358da 100644
--- a/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go
+++ b/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go
@@ -17,6 +17,7 @@ func queryRunner(t *testing.T, q query) *testutil.Accumulator {
 				"host=%s user=postgres sslmode=disable",
 				testutil.GetLocalHost(),
 			),
+			IsPgBouncer: false,
 		},
 		Databases: []string{"postgres"},
 		Query:     q,

From 0759c8b22b922226fbe5cabf19896c4796babea5 Mon Sep 17 00:00:00 2001
From: Greg Linton <g2linton@gmail.com>
Date: Wed, 1 Aug 2018 16:45:52 -0600
Subject: [PATCH 670/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3431ed3c..aab301c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 - [tengine](./plugins/inputs/tengine/README.md) - Contributed by @ertaoxu
 - [x509_cert](./plugins/inputs/x509_cert/README.md) - Contributed by @jtyr
 - [filecount](./plugins/inputs/filecount/README.md) - Contributed by @sometimesfood
+- [pgbouncer](./plugins/inputs/pgbouncer/README.md) - Contributed by @nerzhul
 
 ### New Processors
 
@@ -52,6 +53,9 @@
 - [#4491](https://github.com/influxdata/telegraf/pull/4491): Send all messages before waiting for results in kafka output.
 - [#4492](https://github.com/influxdata/telegraf/pull/4492): Add support for lz4 compression to kafka output.
 - [#4450](https://github.com/influxdata/telegraf/pull/4450): Split multiple sensor keys in ipmi input.
+- [#4364](https://github.com/influxdata/telegraf/pull/4364): Support StatisticValues in cloudwatch output plugin.
+- [#4431](https://github.com/influxdata/telegraf/pull/4431): Add ip restriction for the prometheus_client output.
+- [#3918](https://github.com/influxdata/telegraf/pull/3918): Add pgbouncer input plugin.
 
 ## v1.7.3 [unreleased]
 

From a5409d7cf227769da124bd6c93bc700d92a31fa5 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 7 Aug 2018 11:07:07 -0700
Subject: [PATCH 671/835] Use explicit zpool properties to fix parse error on
 FreeBSD 11.2 (#4510)

---
 plugins/inputs/zfs/zfs_freebsd.go      | 14 +++++++++-----
 plugins/inputs/zfs/zfs_freebsd_test.go | 14 +++++++-------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/plugins/inputs/zfs/zfs_freebsd.go b/plugins/inputs/zfs/zfs_freebsd.go
index 63bbdd6e..51c20682 100644
--- a/plugins/inputs/zfs/zfs_freebsd.go
+++ b/plugins/inputs/zfs/zfs_freebsd.go
@@ -30,7 +30,11 @@ func (z *Zfs) gatherPoolStats(acc telegraf.Accumulator) (string, error) {
 	if z.PoolMetrics {
 		for _, line := range lines {
 			col := strings.Split(line, "\t")
-			tags := map[string]string{"pool": col[0], "health": col[8]}
+			if len(col) != 8 {
+				continue
+			}
+
+			tags := map[string]string{"pool": col[0], "health": col[1]}
 			fields := map[string]interface{}{}
 
 			if tags["health"] == "UNAVAIL" {
@@ -39,19 +43,19 @@ func (z *Zfs) gatherPoolStats(acc telegraf.Accumulator) (string, error) {
 
 			} else {
 
-				size, err := strconv.ParseInt(col[1], 10, 64)
+				size, err := strconv.ParseInt(col[2], 10, 64)
 				if err != nil {
 					return "", fmt.Errorf("Error parsing size: %s", err)
 				}
 				fields["size"] = size
 
-				alloc, err := strconv.ParseInt(col[2], 10, 64)
+				alloc, err := strconv.ParseInt(col[3], 10, 64)
 				if err != nil {
 					return "", fmt.Errorf("Error parsing allocation: %s", err)
 				}
 				fields["allocated"] = alloc
 
-				free, err := strconv.ParseInt(col[3], 10, 64)
+				free, err := strconv.ParseInt(col[4], 10, 64)
 				if err != nil {
 					return "", fmt.Errorf("Error parsing free: %s", err)
 				}
@@ -130,7 +134,7 @@ func run(command string, args ...string) ([]string, error) {
 }
 
 func zpool() ([]string, error) {
-	return run("zpool", []string{"list", "-Hp"}...)
+	return run("zpool", []string{"list", "-Hp", "-o", "name,health,size,alloc,free,fragmentation,capacity,dedupratio"}...)
 }
 
 func sysctl(metric string) ([]string, error) {
diff --git a/plugins/inputs/zfs/zfs_freebsd_test.go b/plugins/inputs/zfs/zfs_freebsd_test.go
index 60b95a39..dba135cf 100644
--- a/plugins/inputs/zfs/zfs_freebsd_test.go
+++ b/plugins/inputs/zfs/zfs_freebsd_test.go
@@ -10,21 +10,21 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-// $ zpool list -Hp
+// $ zpool list -Hp -o name,health,size,alloc,free,fragmentation,capacity,dedupratio
 var zpool_output = []string{
-	"freenas-boot	30601641984	2022177280	28579464704	-	-	6	1.00x	ONLINE	-",
-	"red1	8933531975680	1126164848640	7807367127040	-	8%	12	1.83x	ONLINE	/mnt",
-	"temp1	2989297238016	1626309320704	1362987917312	-	38%	54	1.28x	ONLINE	/mnt",
-	"temp2	2989297238016	626958278656	2362338959360	-	12%	20	1.00x	ONLINE	/mnt",
+	"freenas-boot	ONLINE	30601641984	2022177280	28579464704	-	6	1.00x",
+	"red1	ONLINE	8933531975680	1126164848640	7807367127040	8%	12	1.83x",
+	"temp1	ONLINE	2989297238016	1626309320704	1362987917312	38%	54	1.28x",
+	"temp2	ONLINE	2989297238016	626958278656	2362338959360	12%	20	1.00x",
 }
 
 func mock_zpool() ([]string, error) {
 	return zpool_output, nil
 }
 
-// $ zpool list -Hp
+// $ zpool list -Hp -o name,health,size,alloc,free,fragmentation,capacity,dedupratio
 var zpool_output_unavail = []string{
-	"temp2	-	-	-	-	-	-	-	UNAVAIL	-",
+	"temp2	UNAVAIL	-	-	-	-	-	-",
 }
 
 func mock_zpool_unavail() ([]string, error) {

From 4dfb80d0fca1746d31b87c3a7398edd987b945e3 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 7 Aug 2018 11:07:46 -0700
Subject: [PATCH 672/835] Fix error message if URL is unparseable in influxdb
 output (#4511)

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

diff --git a/plugins/outputs/influxdb/influxdb.go b/plugins/outputs/influxdb/influxdb.go
index f80722bc..bd53d4ed 100644
--- a/plugins/outputs/influxdb/influxdb.go
+++ b/plugins/outputs/influxdb/influxdb.go
@@ -141,36 +141,36 @@ func (i *InfluxDB) Connect() error {
 	}
 
 	for _, u := range urls {
-		u, err := url.Parse(u)
+		parts, err := url.Parse(u)
 		if err != nil {
-			return fmt.Errorf("error parsing url [%s]: %v", u, err)
+			return fmt.Errorf("error parsing url [%q]: %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 parsing proxy_url [%s]: %v", proxy, err)
+				return fmt.Errorf("error parsing proxy_url [%s]: %v", i.HTTPProxy, err)
 			}
 		}
 
-		switch u.Scheme {
+		switch parts.Scheme {
 		case "udp", "udp4", "udp6":
-			c, err := i.udpClient(u)
+			c, err := i.udpClient(parts)
 			if err != nil {
 				return err
 			}
 
 			i.clients = append(i.clients, c)
 		case "http", "https", "unix":
-			c, err := i.httpClient(ctx, u, proxy)
+			c, err := i.httpClient(ctx, parts, proxy)
 			if err != nil {
 				return err
 			}
 
 			i.clients = append(i.clients, c)
 		default:
-			return fmt.Errorf("unsupported scheme [%s]: %q", u, u.Scheme)
+			return fmt.Errorf("unsupported scheme [%q]: %q", u, parts.Scheme)
 		}
 	}
 

From feb75d493ac8c78c41e9f2346d17f528be6f1dfd Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 7 Aug 2018 11:22:10 -0700
Subject: [PATCH 673/835] Lock buffer when adding metrics (#4514)

This function is not thread-safe but is currently used by multiple
goroutines in RunningOutput
---
 internal/buffer/buffer.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/internal/buffer/buffer.go b/internal/buffer/buffer.go
index cdc81fed..04835e04 100644
--- a/internal/buffer/buffer.go
+++ b/internal/buffer/buffer.go
@@ -40,18 +40,18 @@ func (b *Buffer) Len() int {
 
 // Add adds metrics to the buffer.
 func (b *Buffer) Add(metrics ...telegraf.Metric) {
+	b.mu.Lock()
 	for i, _ := range metrics {
 		MetricsWritten.Incr(1)
 		select {
 		case b.buf <- metrics[i]:
 		default:
-			b.mu.Lock()
 			MetricsDropped.Incr(1)
 			<-b.buf
 			b.buf <- metrics[i]
-			b.mu.Unlock()
 		}
 	}
+	b.mu.Unlock()
 }
 
 // Batch returns a batch of metrics of size batchSize.

From b0b52692e93d8d6670d4313badf0876939cc8084 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 7 Aug 2018 11:26:28 -0700
Subject: [PATCH 674/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aab301c4..e47c8c9d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -61,9 +61,13 @@
 
 ### Bugfixes
 
+- [#4434](https://github.com/influxdata/telegraf/issues/4434): Reduce required docker API version.
 - [#4498](https://github.com/influxdata/telegraf/pull/4498): Keep leading whitespace for messages in syslog input.
-- [#4497](https://github.com/influxdata/telegraf/pull/4497): Skip bad entries on interrupt input.
-- [#4481](https://github.com/influxdata/telegraf/pull/4481): Preserve metric type when using filters in output plugins.
+- [#4470](https://github.com/influxdata/telegraf/issues/4470): Skip bad entries on interrupt input.
+- [#4501](https://github.com/influxdata/telegraf/issues/4501): Preserve metric type when using filters in output plugins.
+- [#3794](https://github.com/influxdata/telegraf/issues/3794): Fix error message if URL is unparseable in influxdb output.
+- [#4059](https://github.com/influxdata/telegraf/issues/4059): Use explicit zpool properties to fix parse error on FreeBSD 11.2.
+- [#4514](https://github.com/influxdata/telegraf/pull/4514): Lock buffer when adding metrics.
 
 ## v1.7.2 [2018-07-18]
 

From 2a4267ed7273e1bfb7169259c0f13e6435dbf603 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 7 Aug 2018 17:17:09 -0700
Subject: [PATCH 675/835] Set 1.7.3 release date

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e47c8c9d..d53c2576 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,7 +57,7 @@
 - [#4431](https://github.com/influxdata/telegraf/pull/4431): Add ip restriction for the prometheus_client output.
 - [#3918](https://github.com/influxdata/telegraf/pull/3918): Add pgbouncer input plugin.
 
-## v1.7.3 [unreleased]
+## v1.7.3 [2018-08-07]
 
 ### Bugfixes
 

From 22b3bc4f8e73c1d767e82ede9d5e3df69130323d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 10 Aug 2018 18:11:12 -0700
Subject: [PATCH 676/835] Remove references to logparser from the grok
 documentation

---
 docs/DATA_FORMATS_INPUT.md | 58 +++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 32 deletions(-)

diff --git a/docs/DATA_FORMATS_INPUT.md b/docs/DATA_FORMATS_INPUT.md
index 5a63e9d8..417238ec 100644
--- a/docs/DATA_FORMATS_INPUT.md
+++ b/docs/DATA_FORMATS_INPUT.md
@@ -671,7 +671,7 @@ which are available here:
 
 #### Grok Configuration:
 ```toml
-[[inputs.reader]]
+[[inputs.file]]
   ## Files to parse each interval.
   ## These accept standard unix glob matching rules, but with the addition of
   ## ** as a "super asterisk". ie:
@@ -688,7 +688,7 @@ which are available here:
 
   ## 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.
+  ## efficient configuration is to have one pattern.
   ## Other common built-in patterns are:
   ##   %{COMMON_LOG_FORMAT}   (plain apache & nginx access logs)
   ##   %{COMBINED_LOG_FORMAT} (access logs + referrer & agent)
@@ -713,8 +713,8 @@ which are available here:
   grok_timezone = "Canada/Eastern"
 ```
 
-The Telegraf grok parser uses a slightly modified version of logstash "grok"
-patterns, with the format
+The grok parser uses a slightly modified version of logstash "grok"
+patterns, with the format:
 
 ```
 %{<capture_syntax>[:<semantic_name>][:<modifier>]}
@@ -781,9 +781,8 @@ This example input and config parses a file using a custom timestamp conversion:
 ```
 
 ```toml
-[[inputs.logparser]]
-  [inputs.logparser.grok]
-    patterns = ['%{TIMESTAMP_ISO8601:timestamp:ts-"2006-01-02 15:04:05"} value=%{NUMBER:value:int}']
+[[inputs.file]]
+  grok_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:
@@ -794,9 +793,8 @@ This example input and config parses a file using a timestamp in unix time:
 ```
 
 ```toml
-[[inputs.logparser]]
-  [inputs.logparser.grok]
-    patterns = ['%{NUMBER:timestamp:ts-epoch} value=%{NUMBER:value:int}']
+[[inputs.file]]
+  grok_patterns = ['%{NUMBER:timestamp:ts-epoch} value=%{NUMBER:value:int}']
 ```
 
 This example parses a file using a built-in conversion and a custom pattern:
@@ -806,20 +804,19 @@ 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}
-    '''
+[[inputs.file]]
+  grok_patterns = ["%{TS_UNIX:timestamp:ts-unix} value=%{NUMBER:value:int}"]
+  grok_custom_patterns = '''
+    TS_UNIX %{DAY} %{MONTH} %{MONTHDAY} %{HOUR}:%{MINUTE}:%{SECOND} %{TZ} %{YEAR}
+  '''
 ```
 
 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.
+timezone from the list of Unix [timezones](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones),
+grok will offset the timestamp accordingly.
 
 #### TOML Escaping
 
@@ -840,29 +837,26 @@ 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})+"
+[[inputs.file]]
+  grok_patterns = ["\\|%{NUMBER:value:int}\\|%{UNICODE_ESCAPE:escape}\\|'%{WORD:name}'\\|"]
+  grok_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})+'
+[[inputs.file]]
+  grok_patterns = ["\\|%{NUMBER:value:int}\\|%{UNICODE_ESCAPE:escape}\\|'%{WORD:name}'\\|"]
+  grok_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})+'
+[[inputs.file]]
+  grok_patterns = ['''
+    \|%{NUMBER:value:int}\|%{UNICODE_ESCAPE:escape}\|'%{WORD:name}'\|
+  ''']
+  grok_custom_patterns = 'UNICODE_ESCAPE (?:\\u[0-9A-F]{4})+'
 ```
 
 #### Tips for creating patterns

From 035e6a6f78c9ba222a9f44c58aea46c0a29f4d29 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 10 Aug 2018 18:11:32 -0700
Subject: [PATCH 677/835] Skip lines that do not match in grok parser

---
 plugins/parsers/grok/parser.go | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/plugins/parsers/grok/parser.go b/plugins/parsers/grok/parser.go
index e17f127f..096cb8ed 100644
--- a/plugins/parsers/grok/parser.go
+++ b/plugins/parsers/grok/parser.go
@@ -2,6 +2,7 @@ package grok
 
 import (
 	"bufio"
+	"bytes"
 	"fmt"
 	"log"
 	"os"
@@ -356,18 +357,20 @@ func (p *Parser) ParseLine(line string) (telegraf.Metric, error) {
 }
 
 func (p *Parser) Parse(buf []byte) ([]telegraf.Metric, error) {
-	scanner := bufio.NewScanner(strings.NewReader(string(buf)))
-	var lines []string
-	for scanner.Scan() {
-		lines = append(lines, scanner.Text())
-	}
-	var metrics []telegraf.Metric
 
-	for _, line := range lines {
+	metrics := make([]telegraf.Metric, 0)
+
+	scanner := bufio.NewScanner(bytes.NewReader(buf))
+	for scanner.Scan() {
+		line := scanner.Text()
 		m, err := p.ParseLine(line)
 		if err != nil {
 			return nil, err
 		}
+
+		if m == nil {
+			continue
+		}
 		metrics = append(metrics, m)
 	}
 

From 98a785b0778818ee40a79f1ca014de669f3fc0ec Mon Sep 17 00:00:00 2001
From: Lee Jaeyong <lastiverse@gmail.com>
Date: Mon, 13 Aug 2018 08:32:07 +0900
Subject: [PATCH 678/835] Remove duplicate "Network Interface" section from
 win_perf_counters config (#4547)

---
 etc/telegraf_windows.conf | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/etc/telegraf_windows.conf b/etc/telegraf_windows.conf
index 54b7ee0e..220944d4 100644
--- a/etc/telegraf_windows.conf
+++ b/etc/telegraf_windows.conf
@@ -205,20 +205,6 @@
     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

From 31e1c04ed0e344cc4876c41281aecac1d51785a0 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Sun, 12 Aug 2018 16:52:35 -0700
Subject: [PATCH 679/835] Set version to unknown if not set (#4521)

---
 cmd/telegraf/telegraf.go | 47 ++++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go
index 57ff846c..e8ac7e66 100644
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -58,22 +58,11 @@ var fService = flag.String("service", "",
 var fRunAsConsole = flag.Bool("console", false, "run as console application (windows only)")
 
 var (
-	nextVersion = "1.8.0"
-	version     string
-	commit      string
-	branch      string
+	version string
+	commit  string
+	branch  string
 )
 
-func init() {
-	// If commit or branch are not set, make that clear.
-	if commit == "" {
-		commit = "unknown"
-	}
-	if branch == "" {
-		branch = "unknown"
-	}
-}
-
 var stop chan struct{}
 
 func reloadLoop(
@@ -165,7 +154,7 @@ func reloadLoop(
 			}
 		}()
 
-		log.Printf("I! Starting Telegraf %s\n", displayVersion())
+		log.Printf("I! Starting Telegraf %s\n", version)
 		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(), " "))
@@ -225,11 +214,27 @@ func (p *program) Stop(s service.Service) error {
 	return nil
 }
 
-func displayVersion() string {
-	if version == "" {
-		return fmt.Sprintf("v%s~%s", nextVersion, commit)
+func formatFullVersion() string {
+	var parts = []string{"Telegraf"}
+
+	if version != "" {
+		parts = append(parts, version)
+	} else {
+		parts = append(parts, "unknown")
 	}
-	return "v" + version
+
+	if branch != "" || commit != "" {
+		if branch == "" {
+			branch = "unknown"
+		}
+		if commit == "" {
+			commit = "unknown"
+		}
+		git := fmt.Sprintf("(git: %s %s)", branch, commit)
+		parts = append(parts, git)
+	}
+
+	return strings.Join(parts, " ")
 }
 
 func main() {
@@ -273,7 +278,7 @@ func main() {
 	if len(args) > 0 {
 		switch args[0] {
 		case "version":
-			fmt.Printf("Telegraf %s (git: %s %s)\n", displayVersion(), branch, commit)
+			fmt.Println(formatFullVersion())
 			return
 		case "config":
 			config.PrintSampleConfig(
@@ -301,7 +306,7 @@ func main() {
 		}
 		return
 	case *fVersion:
-		fmt.Printf("Telegraf %s (git: %s %s)\n", displayVersion(), branch, commit)
+		fmt.Println(formatFullVersion())
 		return
 	case *fSampleConfig:
 		config.PrintSampleConfig(

From b9ff1d042b157d057ae574d9f04a64b8ccc2400b Mon Sep 17 00:00:00 2001
From: LABOUARDY Mohamed <mohamed.labouardy@gmail.com>
Date: Tue, 14 Aug 2018 01:34:59 +0200
Subject: [PATCH 680/835] Add ActiveMQ input plugin (#2689)

---
 README.md                                |   1 +
 plugins/inputs/activemq/README.md        |  86 ++++++++
 plugins/inputs/activemq/activemq.go      | 261 +++++++++++++++++++++++
 plugins/inputs/activemq/activemq_test.go | 139 ++++++++++++
 plugins/inputs/all/all.go                |   1 +
 5 files changed, 488 insertions(+)
 create mode 100644 plugins/inputs/activemq/README.md
 create mode 100644 plugins/inputs/activemq/activemq.go
 create mode 100644 plugins/inputs/activemq/activemq_test.go

diff --git a/README.md b/README.md
index 6307b535..700f0dd2 100644
--- a/README.md
+++ b/README.md
@@ -127,6 +127,7 @@ configuration options.
 
 ## Input Plugins
 
+* [activemq](./plugins/inputs/activemq)
 * [aerospike](./plugins/inputs/aerospike)
 * [amqp_consumer](./plugins/inputs/amqp_consumer) (rabbitmq)
 * [apache](./plugins/inputs/apache)
diff --git a/plugins/inputs/activemq/README.md b/plugins/inputs/activemq/README.md
new file mode 100644
index 00000000..b44d12d2
--- /dev/null
+++ b/plugins/inputs/activemq/README.md
@@ -0,0 +1,86 @@
+# Telegraf Input Plugin: ActiveMQ
+
+This plugin gather queues, topics & subscribers metrics using ActiveMQ Console API.
+
+### Configuration:
+
+```toml
+# Description
+[[inputs.activemq]]
+  ## Required ActiveMQ Endpoint
+  # server = "192.168.50.10"
+
+  ## Required ActiveMQ port
+  # port = 8161
+  
+  ## Credentials for basic HTTP authentication
+  # username = "admin"
+  # password = "admin"
+
+  ## Required ActiveMQ webadmin root path
+  # webadmin = "admin"
+
+  ## Maximum time to receive response.
+  # 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
+```
+
+### Measurements & Fields:
+
+Every effort was made to preserve the names based on the XML response from the ActiveMQ Console API.
+
+- activemq_queues:
+    - size
+    - consumer_count
+    - enqueue_count
+    - dequeue_count
+  - activemq_topics:
+    - size
+    - consumer_count
+    - enqueue_count
+    - dequeue_count
+  - subscribers_metrics:
+    - pending_queue_size
+    - dispatched_queue_size
+    - dispatched_counter
+    - enqueue_counter
+    - dequeue_counter
+
+### Tags:
+
+- activemq_queues:
+    - name
+    - source
+    - port
+- activemq_topics:
+    - name
+    - source
+    - port
+- activemq_subscribers:
+    - client_id
+    - subscription_name
+    - connection_id
+    - destination_name
+    - selector
+    - active
+    - source
+    - port
+
+### Example Output:
+
+```
+$ ./telegraf -config telegraf.conf -input-filter activemq -test
+activemq_queues,name=sandra,host=88284b2fe51b,source=localhost,port=8161 consumer_count=0i,enqueue_count=0i,dequeue_count=0i,size=0i 1492610703000000000
+activemq_queues,name=Test,host=88284b2fe51b,source=localhost,port=8161 dequeue_count=0i,size=0i,consumer_count=0i,enqueue_count=0i 1492610703000000000
+activemq_topics,name=ActiveMQ.Advisory.MasterBroker\ ,host=88284b2fe51b,source=localhost,port=8161 size=0i,consumer_count=0i,enqueue_count=1i,dequeue_count=0i 1492610703000000000
+activemq_topics,host=88284b2fe51b,name=AAA\,source=localhost,port=8161  size=0i,consumer_count=1i,enqueue_count=0i,dequeue_count=0i 1492610703000000000
+activemq_topics,name=ActiveMQ.Advisory.Topic\,source=localhost,port=8161 ,host=88284b2fe51b enqueue_count=1i,dequeue_count=0i,size=0i,consumer_count=0i 1492610703000000000
+activemq_topics,name=ActiveMQ.Advisory.Queue\,source=localhost,port=8161 ,host=88284b2fe51b size=0i,consumer_count=0i,enqueue_count=2i,dequeue_count=0i 1492610703000000000
+activemq_topics,name=AAAA\ ,host=88284b2fe51b,source=localhost,port=8161 consumer_count=0i,enqueue_count=0i,dequeue_count=0i,size=0i 1492610703000000000
+activemq_subscribers,connection_id=NOTSET,destination_name=AAA,,source=localhost,port=8161,selector=AA,active=no,host=88284b2fe51b,client_id=AAA,subscription_name=AAA pending_queue_size=0i,dispatched_queue_size=0i,dispatched_counter=0i,enqueue_counter=0i,dequeue_counter=0i 1492610703000000000
+```
diff --git a/plugins/inputs/activemq/activemq.go b/plugins/inputs/activemq/activemq.go
new file mode 100644
index 00000000..5b59730d
--- /dev/null
+++ b/plugins/inputs/activemq/activemq.go
@@ -0,0 +1,261 @@
+package activemq
+
+import (
+	"encoding/xml"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"strconv"
+	"time"
+
+	"strings"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+type ActiveMQ struct {
+	Server          string `json:"server"`
+	Port            int    `json:"port"`
+	Username        string `json:"username"`
+	Password        string `json:"password"`
+	Webadmin        string `json:"webadmin"`
+	ResponseTimeout internal.Duration
+	tls.ClientConfig
+
+	client *http.Client
+}
+
+type Topics struct {
+	XMLName    xml.Name `xml:"topics"`
+	TopicItems []Topic  `xml:"topic"`
+}
+
+type Topic struct {
+	XMLName xml.Name `xml:"topic"`
+	Name    string   `xml:"name,attr"`
+	Stats   Stats    `xml:"stats"`
+}
+
+type Subscribers struct {
+	XMLName         xml.Name     `xml:"subscribers"`
+	SubscriberItems []Subscriber `xml:"subscriber"`
+}
+
+type Subscriber struct {
+	XMLName          xml.Name `xml:"subscriber"`
+	ClientId         string   `xml:"clientId,attr"`
+	SubscriptionName string   `xml:"subscriptionName,attr"`
+	ConnectionId     string   `xml:"connectionId,attr"`
+	DestinationName  string   `xml:"destinationName,attr"`
+	Selector         string   `xml:"selector,attr"`
+	Active           string   `xml:"active,attr"`
+	Stats            Stats    `xml:"stats"`
+}
+
+type Queues struct {
+	XMLName    xml.Name `xml:"queues"`
+	QueueItems []Queue  `xml:"queue"`
+}
+
+type Queue struct {
+	XMLName xml.Name `xml:"queue"`
+	Name    string   `xml:"name,attr"`
+	Stats   Stats    `xml:"stats"`
+}
+
+type Stats struct {
+	XMLName             xml.Name `xml:"stats"`
+	Size                int      `xml:"size,attr"`
+	ConsumerCount       int      `xml:"consumerCount,attr"`
+	EnqueueCount        int      `xml:"enqueueCount,attr"`
+	DequeueCount        int      `xml:"dequeueCount,attr"`
+	PendingQueueSize    int      `xml:"pendingQueueSize,attr"`
+	DispatchedQueueSize int      `xml:"dispatchedQueueSize,attr"`
+	DispatchedCounter   int      `xml:"dispatchedCounter,attr"`
+	EnqueueCounter      int      `xml:"enqueueCounter,attr"`
+	DequeueCounter      int      `xml:"dequeueCounter,attr"`
+}
+
+const (
+	QUEUES_STATS      = "queues"
+	TOPICS_STATS      = "topics"
+	SUBSCRIBERS_STATS = "subscribers"
+)
+
+var sampleConfig = `
+  ## Required ActiveMQ Endpoint
+  # server = "192.168.50.10"
+
+  ## Required ActiveMQ port
+  # port = 8161
+  
+  ## Credentials for basic HTTP authentication
+  # username = "admin"
+  # password = "admin"
+
+  ## Required ActiveMQ webadmin root path
+  # webadmin = "admin"
+
+  ## Maximum time to receive response.
+  # 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
+  `
+
+func (a *ActiveMQ) Description() string {
+	return "Gather ActiveMQ metrics"
+}
+
+func (a *ActiveMQ) SampleConfig() string {
+	return sampleConfig
+}
+
+func (a *ActiveMQ) createHttpClient() (*http.Client, error) {
+	tlsCfg, err := a.ClientConfig.TLSConfig()
+	if err != nil {
+		return nil, err
+	}
+
+	client := &http.Client{
+		Transport: &http.Transport{
+			TLSClientConfig: tlsCfg,
+		},
+		Timeout: a.ResponseTimeout.Duration,
+	}
+
+	return client, nil
+}
+
+func (a *ActiveMQ) GetMetrics(keyword string) ([]byte, error) {
+	if a.ResponseTimeout.Duration < time.Second {
+		a.ResponseTimeout.Duration = time.Second * 5
+	}
+
+	if a.client == nil {
+		client, err := a.createHttpClient()
+		if err != nil {
+			return nil, err
+		}
+		a.client = client
+	}
+	url := fmt.Sprintf("http://%s:%d/%s/xml/%s.jsp", a.Server, a.Port, a.Webadmin, keyword)
+
+	req, err := http.NewRequest("GET", url, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	req.SetBasicAuth(a.Username, a.Password)
+	resp, err := a.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+
+	defer resp.Body.Close()
+	return ioutil.ReadAll(resp.Body)
+}
+
+func (a *ActiveMQ) GatherQueuesMetrics(acc telegraf.Accumulator, queues Queues) {
+	for _, queue := range queues.QueueItems {
+		records := make(map[string]interface{})
+		tags := make(map[string]string)
+
+		tags["name"] = strings.TrimSpace(queue.Name)
+		tags["source"] = a.Server
+		tags["port"] = strconv.Itoa(a.Port)
+
+		records["size"] = queue.Stats.Size
+		records["consumer_count"] = queue.Stats.ConsumerCount
+		records["enqueue_count"] = queue.Stats.EnqueueCount
+		records["dequeue_count"] = queue.Stats.DequeueCount
+
+		acc.AddFields("activemq_queues", records, tags)
+	}
+}
+
+func (a *ActiveMQ) GatherTopicsMetrics(acc telegraf.Accumulator, topics Topics) {
+	for _, topic := range topics.TopicItems {
+		records := make(map[string]interface{})
+		tags := make(map[string]string)
+
+		tags["name"] = topic.Name
+		tags["source"] = a.Server
+		tags["port"] = strconv.Itoa(a.Port)
+
+		records["size"] = topic.Stats.Size
+		records["consumer_count"] = topic.Stats.ConsumerCount
+		records["enqueue_count"] = topic.Stats.EnqueueCount
+		records["dequeue_count"] = topic.Stats.DequeueCount
+
+		acc.AddFields("activemq_topics", records, tags)
+	}
+}
+
+func (a *ActiveMQ) GatherSubscribersMetrics(acc telegraf.Accumulator, subscribers Subscribers) {
+	for _, subscriber := range subscribers.SubscriberItems {
+		records := make(map[string]interface{})
+		tags := make(map[string]string)
+
+		tags["client_id"] = subscriber.ClientId
+		tags["subscription_name"] = subscriber.SubscriptionName
+		tags["connection_id"] = subscriber.ConnectionId
+		tags["destination_name"] = subscriber.DestinationName
+		tags["selector"] = subscriber.Selector
+		tags["active"] = subscriber.Active
+		tags["source"] = a.Server
+		tags["port"] = strconv.Itoa(a.Port)
+
+		records["pending_queue_size"] = subscriber.Stats.PendingQueueSize
+		records["dispatched_queue_size"] = subscriber.Stats.DispatchedQueueSize
+		records["dispatched_counter"] = subscriber.Stats.DispatchedCounter
+		records["enqueue_counter"] = subscriber.Stats.EnqueueCounter
+		records["dequeue_counter"] = subscriber.Stats.DequeueCounter
+
+		acc.AddFields("activemq_subscribers", records, tags)
+	}
+}
+
+func (a *ActiveMQ) Gather(acc telegraf.Accumulator) error {
+	dataQueues, err := a.GetMetrics(QUEUES_STATS)
+	queues := Queues{}
+	err = xml.Unmarshal(dataQueues, &queues)
+	if err != nil {
+		return err
+	}
+
+	dataTopics, err := a.GetMetrics(TOPICS_STATS)
+	topics := Topics{}
+	err = xml.Unmarshal(dataTopics, &topics)
+	if err != nil {
+		return err
+	}
+
+	dataSubscribers, err := a.GetMetrics(SUBSCRIBERS_STATS)
+	subscribers := Subscribers{}
+	err = xml.Unmarshal(dataSubscribers, &subscribers)
+	if err != nil {
+		return err
+	}
+
+	a.GatherQueuesMetrics(acc, queues)
+	a.GatherTopicsMetrics(acc, topics)
+	a.GatherSubscribersMetrics(acc, subscribers)
+
+	return nil
+}
+
+func init() {
+	inputs.Add("activemq", func() telegraf.Input {
+		return &ActiveMQ{
+			Server: "localhost",
+			Port:   8161,
+		}
+	})
+}
diff --git a/plugins/inputs/activemq/activemq_test.go b/plugins/inputs/activemq/activemq_test.go
new file mode 100644
index 00000000..c277af3c
--- /dev/null
+++ b/plugins/inputs/activemq/activemq_test.go
@@ -0,0 +1,139 @@
+package activemq
+
+import (
+	"encoding/xml"
+	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+)
+
+func TestGatherQueuesMetrics(t *testing.T) {
+
+	s := `<queues>
+<queue name="sandra">
+<stats size="0" consumerCount="0" enqueueCount="0" dequeueCount="0"/>
+<feed>
+<atom>queueBrowse/sandra?view=rss&amp;feedType=atom_1.0</atom>
+<rss>queueBrowse/sandra?view=rss&amp;feedType=rss_2.0</rss>
+</feed>
+</queue>
+<queue name="Test">
+<stats size="0" consumerCount="0" enqueueCount="0" dequeueCount="0"/>
+<feed>
+<atom>queueBrowse/Test?view=rss&amp;feedType=atom_1.0</atom>
+<rss>queueBrowse/Test?view=rss&amp;feedType=rss_2.0</rss>
+</feed>
+</queue>
+</queues>`
+
+	queues := Queues{}
+
+	xml.Unmarshal([]byte(s), &queues)
+
+	records := make(map[string]interface{})
+	tags := make(map[string]string)
+
+	tags["name"] = "Test"
+	tags["source"] = "localhost"
+	tags["port"] = "8161"
+
+	records["size"] = 0
+	records["consumer_count"] = 0
+	records["enqueue_count"] = 0
+	records["dequeue_count"] = 0
+
+	var acc testutil.Accumulator
+
+	activeMQ := new(ActiveMQ)
+	activeMQ.Server = "localhost"
+	activeMQ.Port = 8161
+
+	activeMQ.GatherQueuesMetrics(&acc, queues)
+	acc.AssertContainsTaggedFields(t, "activemq_queues", records, tags)
+}
+
+func TestGatherTopicsMetrics(t *testing.T) {
+
+	s := `<topics>
+<topic name="ActiveMQ.Advisory.MasterBroker ">
+<stats size="0" consumerCount="0" enqueueCount="1" dequeueCount="0"/>
+</topic>
+<topic name="AAA ">
+<stats size="0" consumerCount="1" enqueueCount="0" dequeueCount="0"/>
+</topic>
+<topic name="ActiveMQ.Advisory.Topic ">
+<stats size="0" consumerCount="0" enqueueCount="1" dequeueCount="0"/>
+</topic>
+<topic name="ActiveMQ.Advisory.Queue ">
+<stats size="0" consumerCount="0" enqueueCount="2" dequeueCount="0"/>
+</topic>
+<topic name="AAAA ">
+<stats size="0" consumerCount="0" enqueueCount="0" dequeueCount="0"/>
+</topic>
+</topics>`
+
+	topics := Topics{}
+
+	xml.Unmarshal([]byte(s), &topics)
+
+	records := make(map[string]interface{})
+	tags := make(map[string]string)
+
+	tags["name"] = "ActiveMQ.Advisory.MasterBroker "
+	tags["source"] = "localhost"
+	tags["port"] = "8161"
+
+	records["size"] = 0
+	records["consumer_count"] = 0
+	records["enqueue_count"] = 1
+	records["dequeue_count"] = 0
+
+	var acc testutil.Accumulator
+
+	activeMQ := new(ActiveMQ)
+	activeMQ.Server = "localhost"
+	activeMQ.Port = 8161
+
+	activeMQ.GatherTopicsMetrics(&acc, topics)
+	acc.AssertContainsTaggedFields(t, "activemq_topics", records, tags)
+}
+
+func TestGatherSubscribersMetrics(t *testing.T) {
+
+	s := `<subscribers>
+<subscriber clientId="AAA" subscriptionName="AAA" connectionId="NOTSET" destinationName="AAA" selector="AA" active="no">
+<stats pendingQueueSize="0" dispatchedQueueSize="0" dispatchedCounter="0" enqueueCounter="0" dequeueCounter="0"/>
+</subscriber>
+</subscribers>`
+
+	subscribers := Subscribers{}
+
+	xml.Unmarshal([]byte(s), &subscribers)
+
+	records := make(map[string]interface{})
+	tags := make(map[string]string)
+
+	tags["client_id"] = "AAA"
+	tags["subscription_name"] = "AAA"
+	tags["connection_id"] = "NOTSET"
+	tags["destination_name"] = "AAA"
+	tags["selector"] = "AA"
+	tags["active"] = "no"
+	tags["source"] = "localhost"
+	tags["port"] = "8161"
+
+	records["pending_queue_size"] = 0
+	records["dispatched_queue_size"] = 0
+	records["dispatched_counter"] = 0
+	records["enqueue_counter"] = 0
+	records["dequeue_counter"] = 0
+
+	var acc testutil.Accumulator
+
+	activeMQ := new(ActiveMQ)
+	activeMQ.Server = "localhost"
+	activeMQ.Port = 8161
+
+	activeMQ.GatherSubscribersMetrics(&acc, subscribers)
+	acc.AssertContainsTaggedFields(t, "activemq_subscribers", records, tags)
+}
diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index bbca9952..ac86fb87 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -1,6 +1,7 @@
 package all
 
 import (
+	_ "github.com/influxdata/telegraf/plugins/inputs/activemq"
 	_ "github.com/influxdata/telegraf/plugins/inputs/aerospike"
 	_ "github.com/influxdata/telegraf/plugins/inputs/amqp_consumer"
 	_ "github.com/influxdata/telegraf/plugins/inputs/apache"

From 6454319062e20eaaf48370f4ccb451733f58b83d Mon Sep 17 00:00:00 2001
From: Pierre Tessier <pierre@pierretessier.com>
Date: Mon, 13 Aug 2018 19:37:06 -0400
Subject: [PATCH 681/835] Add Wavefront parser (#4402)

---
 docs/DATA_FORMATS_INPUT.md               |  27 +++
 plugins/outputs/wavefront/wavefront.go   |  32 +--
 plugins/parsers/registry.go              |   7 +
 plugins/parsers/wavefront/element.go     | 238 +++++++++++++++++++++++
 plugins/parsers/wavefront/parser.go      | 203 +++++++++++++++++++
 plugins/parsers/wavefront/parser_test.go | 204 +++++++++++++++++++
 plugins/parsers/wavefront/scanner.go     |  69 +++++++
 plugins/parsers/wavefront/token.go       |  41 ++++
 8 files changed, 808 insertions(+), 13 deletions(-)
 create mode 100644 plugins/parsers/wavefront/element.go
 create mode 100644 plugins/parsers/wavefront/parser.go
 create mode 100644 plugins/parsers/wavefront/parser_test.go
 create mode 100644 plugins/parsers/wavefront/scanner.go
 create mode 100644 plugins/parsers/wavefront/token.go

diff --git a/docs/DATA_FORMATS_INPUT.md b/docs/DATA_FORMATS_INPUT.md
index 417238ec..00ead6e3 100644
--- a/docs/DATA_FORMATS_INPUT.md
+++ b/docs/DATA_FORMATS_INPUT.md
@@ -10,6 +10,7 @@ Telegraf is able to parse the following input data formats into metrics:
 1. [Collectd](#collectd)
 1. [Dropwizard](#dropwizard)
 1. [Grok](#grok)
+1. [Wavefront](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#wavefront)
 
 Telegraf metrics, like InfluxDB
 [points](https://docs.influxdata.com/influxdb/v0.10/write_protocols/line/),
@@ -881,3 +882,29 @@ the file output will only print once per `flush_interval`.
 - Continue one token at a time until the entire line is successfully parsed.
 
 
+```
+
+# Wavefront:
+
+Wavefront Data Format is metrics are parsed directly into Telegraf metrics.
+For more information about the Wavefront Data Format see
+[here](https://docs.wavefront.com/wavefront_data_format.html).
+
+There are no additional configuration options for Wavefront Data Format line-protocol.
+
+#### Wavefront Configuration:
+
+```toml
+[[inputs.exec]]
+  ## Commands array
+  commands = ["/tmp/test.sh", "/usr/bin/mycollector --foo=bar"]
+
+  ## 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 = "wavefront"
+```
diff --git a/plugins/outputs/wavefront/wavefront.go b/plugins/outputs/wavefront/wavefront.go
index 18c5a649..ef36d180 100644
--- a/plugins/outputs/wavefront/wavefront.go
+++ b/plugins/outputs/wavefront/wavefront.go
@@ -189,26 +189,32 @@ 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)
+	if s, ok := mTags["source"]; ok {
+		source = s
+		delete(mTags, "source")
+	} else {
+		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 {
-			break
+
+		if !sourceTagFound {
+			source = mTags["host"]
 		}
 	}
 
-	if !sourceTagFound {
-		source = mTags["host"]
-	}
 	delete(mTags, "host")
 
 	return tagValueReplacer.Replace(source), mTags
diff --git a/plugins/parsers/registry.go b/plugins/parsers/registry.go
index 24e73d4b..1e395047 100644
--- a/plugins/parsers/registry.go
+++ b/plugins/parsers/registry.go
@@ -13,6 +13,7 @@ import (
 	"github.com/influxdata/telegraf/plugins/parsers/json"
 	"github.com/influxdata/telegraf/plugins/parsers/nagios"
 	"github.com/influxdata/telegraf/plugins/parsers/value"
+	"github.com/influxdata/telegraf/plugins/parsers/wavefront"
 )
 
 // ParserInput is an interface for input plugins that are able to parse
@@ -131,6 +132,8 @@ func NewParser(config *Config) (Parser, error) {
 			config.DefaultTags,
 			config.Separator,
 			config.Templates)
+	case "wavefront":
+		parser, err = NewWavefrontParser(config.DefaultTags)
 	case "grok":
 		parser, err = newGrokParser(
 			config.MetricName,
@@ -238,3 +241,7 @@ func NewDropwizardParser(
 	}
 	return parser, err
 }
+
+func NewWavefrontParser(defaultTags map[string]string) (Parser, error) {
+	return wavefront.NewWavefrontParser(defaultTags), nil
+}
diff --git a/plugins/parsers/wavefront/element.go b/plugins/parsers/wavefront/element.go
new file mode 100644
index 00000000..4e40238e
--- /dev/null
+++ b/plugins/parsers/wavefront/element.go
@@ -0,0 +1,238 @@
+package wavefront
+
+import (
+	"errors"
+	"fmt"
+	"strconv"
+	"time"
+)
+
+var (
+	ErrEOF              = errors.New("EOF")
+	ErrInvalidTimestamp = errors.New("Invalid timestamp")
+)
+
+// Interface for parsing line elements.
+type ElementParser interface {
+	parse(p *PointParser, pt *Point) error
+}
+
+type NameParser struct{}
+type ValueParser struct{}
+type TimestampParser struct {
+	optional bool
+}
+type WhiteSpaceParser struct {
+	nextOptional bool
+}
+type TagParser struct{}
+type LoopedParser struct {
+	wrappedParser ElementParser
+	wsPaser       *WhiteSpaceParser
+}
+type LiteralParser struct {
+	literal string
+}
+
+func (ep *NameParser) parse(p *PointParser, pt *Point) error {
+	//Valid characters are: a-z, A-Z, 0-9, hyphen ("-"), underscore ("_"), dot (".").
+	// Forward slash ("/") and comma (",") are allowed if metricName is enclosed in double quotes.
+	name, err := parseLiteral(p)
+	if err != nil {
+		return err
+	}
+	pt.Name = name
+	return nil
+}
+
+func (ep *ValueParser) parse(p *PointParser, pt *Point) error {
+	tok, lit := p.scan()
+	if tok == EOF {
+		return fmt.Errorf("found %q, expected number", lit)
+	}
+
+	p.writeBuf.Reset()
+	if tok == MINUS_SIGN {
+		p.writeBuf.WriteString(lit)
+		tok, lit = p.scan()
+	}
+
+	for tok != EOF && (tok == LETTER || tok == NUMBER || tok == DOT) {
+		p.writeBuf.WriteString(lit)
+		tok, lit = p.scan()
+	}
+	p.unscan()
+
+	pt.Value = p.writeBuf.String()
+	_, err := strconv.ParseFloat(pt.Value, 64)
+	if err != nil {
+		return fmt.Errorf("invalid metric value %s", pt.Value)
+	}
+	return nil
+}
+
+func (ep *TimestampParser) parse(p *PointParser, pt *Point) error {
+	tok, lit := p.scan()
+	if tok == EOF {
+		if ep.optional {
+			p.unscanTokens(2)
+			return setTimestamp(pt, 0, 1)
+		}
+		return fmt.Errorf("found %q, expected number", lit)
+	}
+
+	if tok != NUMBER {
+		if ep.optional {
+			p.unscanTokens(2)
+			return setTimestamp(pt, 0, 1)
+		}
+		return ErrInvalidTimestamp
+	}
+
+	p.writeBuf.Reset()
+	for tok != EOF && tok == NUMBER {
+		p.writeBuf.WriteString(lit)
+		tok, lit = p.scan()
+	}
+	p.unscan()
+
+	tsStr := p.writeBuf.String()
+	ts, err := strconv.ParseInt(tsStr, 10, 64)
+	if err != nil {
+		return err
+	}
+	return setTimestamp(pt, ts, len(tsStr))
+}
+
+func setTimestamp(pt *Point, ts int64, numDigits int) error {
+
+	if numDigits == 19 {
+		// nanoseconds
+		ts = ts / 1e9
+	} else if numDigits == 16 {
+		// microseconds
+		ts = ts / 1e6
+	} else if numDigits == 13 {
+		// milliseconds
+		ts = ts / 1e3
+	} else if numDigits != 10 {
+		// must be in seconds, return error if not 0
+		if ts == 0 {
+			ts = getCurrentTime()
+		} else {
+			return ErrInvalidTimestamp
+		}
+	}
+	pt.Timestamp = ts
+	return nil
+}
+
+func (ep *LoopedParser) parse(p *PointParser, pt *Point) error {
+	for {
+		err := ep.wrappedParser.parse(p, pt)
+		if err != nil {
+			return err
+		}
+		err = ep.wsPaser.parse(p, pt)
+		if err == ErrEOF {
+			break
+		}
+	}
+	return nil
+}
+
+func (ep *TagParser) parse(p *PointParser, pt *Point) error {
+	k, err := parseLiteral(p)
+	if err != nil {
+		if k == "" {
+			return nil
+		}
+		return err
+	}
+
+	next, lit := p.scan()
+	if next != EQUALS {
+		return fmt.Errorf("found %q, expected equals", lit)
+	}
+
+	v, err := parseLiteral(p)
+	if err != nil {
+		return err
+	}
+	if len(pt.Tags) == 0 {
+		pt.Tags = make(map[string]string)
+	}
+	pt.Tags[k] = v
+	return nil
+}
+
+func (ep *WhiteSpaceParser) parse(p *PointParser, pt *Point) error {
+	tok := WS
+	for tok != EOF && tok == WS {
+		tok, _ = p.scan()
+	}
+
+	if tok == EOF {
+		if !ep.nextOptional {
+			return ErrEOF
+		}
+		return nil
+	}
+	p.unscan()
+	return nil
+}
+
+func (ep *LiteralParser) parse(p *PointParser, pt *Point) error {
+	l, err := parseLiteral(p)
+	if err != nil {
+		return err
+	}
+
+	if l != ep.literal {
+		return fmt.Errorf("found %s, expected %s", l, ep.literal)
+	}
+	return nil
+}
+
+func parseQuotedLiteral(p *PointParser) (string, error) {
+	p.writeBuf.Reset()
+
+	escaped := false
+	tok, lit := p.scan()
+	for tok != EOF && (tok != QUOTES || (tok == QUOTES && escaped)) {
+		// let everything through
+		escaped = tok == BACKSLASH
+		p.writeBuf.WriteString(lit)
+		tok, lit = p.scan()
+	}
+	if tok == EOF {
+		return "", fmt.Errorf("found %q, expected quotes", lit)
+	}
+	return p.writeBuf.String(), nil
+}
+
+func parseLiteral(p *PointParser) (string, error) {
+	tok, lit := p.scan()
+	if tok == EOF {
+		return "", fmt.Errorf("found %q, expected literal", lit)
+	}
+
+	if tok == QUOTES {
+		return parseQuotedLiteral(p)
+	}
+
+	p.writeBuf.Reset()
+	for tok != EOF && tok > literal_beg && tok < literal_end {
+		p.writeBuf.WriteString(lit)
+		tok, lit = p.scan()
+	}
+	if tok == QUOTES {
+		return "", errors.New("found quote inside unquoted literal")
+	}
+	p.unscan()
+	return p.writeBuf.String(), nil
+}
+
+func getCurrentTime() int64 {
+	return time.Now().UnixNano() / 1e9
+}
diff --git a/plugins/parsers/wavefront/parser.go b/plugins/parsers/wavefront/parser.go
new file mode 100644
index 00000000..f5fc88db
--- /dev/null
+++ b/plugins/parsers/wavefront/parser.go
@@ -0,0 +1,203 @@
+package wavefront
+
+import (
+	"bufio"
+	"bytes"
+	"io"
+	"log"
+	"strconv"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/metric"
+)
+
+const MAX_BUFFER_SIZE = 2
+
+type Point struct {
+	Name      string
+	Value     string
+	Timestamp int64
+	Source    string
+	Tags      map[string]string
+}
+
+// Parser represents a parser.
+type PointParser struct {
+	s   *PointScanner
+	buf struct {
+		tok []Token  // last read n tokens
+		lit []string // last read n literals
+		n   int      // unscanned buffer size (max=2)
+	}
+	scanBuf     bytes.Buffer // buffer reused for scanning tokens
+	writeBuf    bytes.Buffer // buffer reused for parsing elements
+	Elements    []ElementParser
+	defaultTags map[string]string
+}
+
+// Returns a slice of ElementParser's for the Graphite format
+func NewWavefrontElements() []ElementParser {
+	var elements []ElementParser
+	wsParser := WhiteSpaceParser{}
+	wsParserNextOpt := WhiteSpaceParser{nextOptional: true}
+	repeatParser := LoopedParser{wrappedParser: &TagParser{}, wsPaser: &wsParser}
+	elements = append(elements, &NameParser{}, &wsParser, &ValueParser{}, &wsParserNextOpt,
+		&TimestampParser{optional: true}, &wsParserNextOpt, &repeatParser)
+	return elements
+}
+
+func NewWavefrontParser(defaultTags map[string]string) *PointParser {
+	elements := NewWavefrontElements()
+	return &PointParser{Elements: elements, defaultTags: defaultTags}
+}
+
+func (p *PointParser) Parse(buf []byte) ([]telegraf.Metric, error) {
+
+	// parse even if the buffer begins with a newline
+	buf = bytes.TrimPrefix(buf, []byte("\n"))
+	// add newline to end if not exists:
+	if len(buf) > 0 && !bytes.HasSuffix(buf, []byte("\n")) {
+		buf = append(buf, []byte("\n")...)
+	}
+
+	points := make([]Point, 0)
+
+	buffer := bytes.NewBuffer(buf)
+	reader := bufio.NewReader(buffer)
+	for {
+		// Read up to the next newline.
+		buf, err := reader.ReadBytes('\n')
+		if err == io.EOF {
+			break
+		}
+
+		p.reset(buf)
+		point := Point{}
+		for _, element := range p.Elements {
+			err := element.parse(p, &point)
+			if err != nil {
+				return nil, err
+			}
+		}
+
+		points = append(points, point)
+	}
+
+	metrics, err := p.convertPointToTelegrafMetric(points)
+	if err != nil {
+		return nil, err
+	}
+	return metrics, nil
+}
+
+func (p *PointParser) ParseLine(line string) (telegraf.Metric, error) {
+	buf := []byte(line)
+	metrics, err := p.Parse(buf)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(metrics) > 0 {
+		return metrics[0], nil
+	}
+
+	return nil, nil
+}
+
+func (p *PointParser) SetDefaultTags(tags map[string]string) {
+	p.defaultTags = tags
+}
+
+func (p *PointParser) convertPointToTelegrafMetric(points []Point) ([]telegraf.Metric, error) {
+
+	metrics := make([]telegraf.Metric, 0)
+
+	for _, point := range points {
+		tags := make(map[string]string)
+		for k, v := range point.Tags {
+			tags[k] = v
+		}
+		// apply default tags after parsed tags
+		for k, v := range p.defaultTags {
+			tags[k] = v
+		}
+
+		// single field for value
+		fields := make(map[string]interface{})
+		v, err := strconv.ParseFloat(point.Value, 64)
+		if err != nil {
+			return nil, err
+		}
+		fields["value"] = v
+
+		m, err := metric.New(point.Name, tags, fields, time.Unix(point.Timestamp, 0))
+		if err != nil {
+			return nil, err
+		}
+
+		metrics = append(metrics, m)
+	}
+
+	return metrics, nil
+}
+
+// scan returns the next token from the underlying scanner.
+// If a token has been unscanned then read that from the internal buffer instead.
+func (p *PointParser) scan() (Token, string) {
+	// If we have a token on the buffer, then return it.
+	if p.buf.n != 0 {
+		idx := p.buf.n % MAX_BUFFER_SIZE
+		tok, lit := p.buf.tok[idx], p.buf.lit[idx]
+		p.buf.n -= 1
+		return tok, lit
+	}
+
+	// Otherwise read the next token from the scanner.
+	tok, lit := p.s.Scan()
+
+	// Save it to the buffer in case we unscan later.
+	p.buffer(tok, lit)
+
+	return tok, lit
+}
+
+func (p *PointParser) buffer(tok Token, lit string) {
+	// create the buffer if it is empty
+	if len(p.buf.tok) == 0 {
+		p.buf.tok = make([]Token, MAX_BUFFER_SIZE)
+		p.buf.lit = make([]string, MAX_BUFFER_SIZE)
+	}
+
+	// for now assume a simple circular buffer of length two
+	p.buf.tok[0], p.buf.lit[0] = p.buf.tok[1], p.buf.lit[1]
+	p.buf.tok[1], p.buf.lit[1] = tok, lit
+}
+
+// unscan pushes the previously read token back onto the buffer.
+func (p *PointParser) unscan() {
+	p.unscanTokens(1)
+}
+
+func (p *PointParser) unscanTokens(n int) {
+	if n > MAX_BUFFER_SIZE {
+		// just log for now
+		log.Printf("cannot unscan more than %d tokens", MAX_BUFFER_SIZE)
+	}
+	p.buf.n += n
+}
+
+func (p *PointParser) reset(buf []byte) {
+
+	// reset the scan buffer and write new byte
+	p.scanBuf.Reset()
+	p.scanBuf.Write(buf)
+
+	if p.s == nil {
+		p.s = NewScanner(&p.scanBuf)
+	} else {
+		// reset p.s.r passing in the buffer as the reader
+		p.s.r.Reset(&p.scanBuf)
+	}
+	p.buf.n = 0
+}
diff --git a/plugins/parsers/wavefront/parser_test.go b/plugins/parsers/wavefront/parser_test.go
new file mode 100644
index 00000000..85367fa1
--- /dev/null
+++ b/plugins/parsers/wavefront/parser_test.go
@@ -0,0 +1,204 @@
+package wavefront
+
+import (
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/metric"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestParse(t *testing.T) {
+	parser := NewWavefrontParser(nil)
+
+	parsedMetrics, err := parser.Parse([]byte("test.metric 1"))
+	assert.NoError(t, err)
+	testMetric, err := metric.New("test.metric", map[string]string{}, map[string]interface{}{"value": 1.}, time.Unix(0, 0))
+	assert.NoError(t, err)
+	assert.Equal(t, parsedMetrics[0].Name(), testMetric.Name())
+	assert.Equal(t, parsedMetrics[0].Fields(), testMetric.Fields())
+
+	parsedMetrics, err = parser.Parse([]byte("test.metric 1 1530939936"))
+	assert.NoError(t, err)
+	testMetric, err = metric.New("test.metric", map[string]string{}, map[string]interface{}{"value": 1.}, time.Unix(1530939936, 0))
+	assert.NoError(t, err)
+	assert.EqualValues(t, parsedMetrics[0], testMetric)
+
+	parsedMetrics, err = parser.Parse([]byte("test.metric 1 1530939936 source=mysource"))
+	assert.NoError(t, err)
+	testMetric, err = metric.New("test.metric", map[string]string{"source": "mysource"}, map[string]interface{}{"value": 1.}, time.Unix(1530939936, 0))
+	assert.NoError(t, err)
+	assert.EqualValues(t, parsedMetrics[0], testMetric)
+
+	parsedMetrics, err = parser.Parse([]byte("\"test.metric\" 1.1234 1530939936 source=\"mysource\""))
+	assert.NoError(t, err)
+	testMetric, err = metric.New("test.metric", map[string]string{"source": "mysource"}, map[string]interface{}{"value": 1.1234}, time.Unix(1530939936, 0))
+	assert.NoError(t, err)
+	assert.EqualValues(t, parsedMetrics[0], testMetric)
+
+	parsedMetrics, err = parser.Parse([]byte("\"test.metric\" 1.1234 1530939936 \"source\"=\"mysource\" tag2=value2"))
+	assert.NoError(t, err)
+	testMetric, err = metric.New("test.metric", map[string]string{"source": "mysource", "tag2": "value2"}, map[string]interface{}{"value": 1.1234}, time.Unix(1530939936, 0))
+	assert.NoError(t, err)
+	assert.EqualValues(t, parsedMetrics[0], testMetric)
+
+	parsedMetrics, err = parser.Parse([]byte("test.metric		 1.1234      1530939936 	source=\"mysource\"    tag2=value2     "))
+	assert.NoError(t, err)
+	testMetric, err = metric.New("test.metric", map[string]string{"source": "mysource", "tag2": "value2"}, map[string]interface{}{"value": 1.1234}, time.Unix(1530939936, 0))
+	assert.NoError(t, err)
+	assert.EqualValues(t, parsedMetrics[0], testMetric)
+
+}
+
+func TestParseLine(t *testing.T) {
+	parser := NewWavefrontParser(nil)
+
+	parsedMetric, err := parser.ParseLine("test.metric 1")
+	assert.NoError(t, err)
+	testMetric, err := metric.New("test.metric", map[string]string{}, map[string]interface{}{"value": 1.}, time.Unix(0, 0))
+	assert.NoError(t, err)
+	assert.Equal(t, parsedMetric.Name(), testMetric.Name())
+	assert.Equal(t, parsedMetric.Fields(), testMetric.Fields())
+
+	parsedMetric, err = parser.ParseLine("test.metric 1 1530939936")
+	assert.NoError(t, err)
+	testMetric, err = metric.New("test.metric", map[string]string{}, map[string]interface{}{"value": 1.}, time.Unix(1530939936, 0))
+	assert.NoError(t, err)
+	assert.EqualValues(t, parsedMetric, testMetric)
+
+	parsedMetric, err = parser.ParseLine("test.metric 1 1530939936 source=mysource")
+	assert.NoError(t, err)
+	testMetric, err = metric.New("test.metric", map[string]string{"source": "mysource"}, map[string]interface{}{"value": 1.}, time.Unix(1530939936, 0))
+	assert.NoError(t, err)
+	assert.EqualValues(t, parsedMetric, testMetric)
+
+	parsedMetric, err = parser.ParseLine("\"test.metric\" 1.1234 1530939936 source=\"mysource\"")
+	assert.NoError(t, err)
+	testMetric, err = metric.New("test.metric", map[string]string{"source": "mysource"}, map[string]interface{}{"value": 1.1234}, time.Unix(1530939936, 0))
+	assert.NoError(t, err)
+	assert.EqualValues(t, parsedMetric, testMetric)
+
+	parsedMetric, err = parser.ParseLine("\"test.metric\" 1.1234 1530939936 \"source\"=\"mysource\" tag2=value2")
+	assert.NoError(t, err)
+	testMetric, err = metric.New("test.metric", map[string]string{"source": "mysource", "tag2": "value2"}, map[string]interface{}{"value": 1.1234}, time.Unix(1530939936, 0))
+	assert.NoError(t, err)
+	assert.EqualValues(t, parsedMetric, testMetric)
+
+	parsedMetric, err = parser.ParseLine("test.metric		 1.1234      1530939936 	source=\"mysource\"    tag2=value2     ")
+	assert.NoError(t, err)
+	testMetric, err = metric.New("test.metric", map[string]string{"source": "mysource", "tag2": "value2"}, map[string]interface{}{"value": 1.1234}, time.Unix(1530939936, 0))
+	assert.NoError(t, err)
+	assert.EqualValues(t, parsedMetric, testMetric)
+}
+
+func TestParseMultiple(t *testing.T) {
+	parser := NewWavefrontParser(nil)
+
+	parsedMetrics, err := parser.Parse([]byte("test.metric 1\ntest.metric2 2 1530939936"))
+	assert.NoError(t, err)
+	testMetric1, err := metric.New("test.metric", map[string]string{}, map[string]interface{}{"value": 1.}, time.Unix(0, 0))
+	assert.NoError(t, err)
+	testMetric2, err := metric.New("test.metric2", map[string]string{}, map[string]interface{}{"value": 2.}, time.Unix(1530939936, 0))
+	assert.NoError(t, err)
+	testMetrics := []telegraf.Metric{testMetric1, testMetric2}
+	assert.Equal(t, parsedMetrics[0].Name(), testMetrics[0].Name())
+	assert.Equal(t, parsedMetrics[0].Fields(), testMetrics[0].Fields())
+	assert.EqualValues(t, parsedMetrics[1], testMetrics[1])
+
+	parsedMetrics, err = parser.Parse([]byte("test.metric 1 1530939936 source=mysource\n\"test.metric\" 1.1234 1530939936 source=\"mysource\""))
+	assert.NoError(t, err)
+	testMetric1, err = metric.New("test.metric", map[string]string{"source": "mysource"}, map[string]interface{}{"value": 1.}, time.Unix(1530939936, 0))
+	assert.NoError(t, err)
+	testMetric2, err = metric.New("test.metric", map[string]string{"source": "mysource"}, map[string]interface{}{"value": 1.1234}, time.Unix(1530939936, 0))
+	assert.NoError(t, err)
+	testMetrics = []telegraf.Metric{testMetric1, testMetric2}
+	assert.EqualValues(t, parsedMetrics, testMetrics)
+
+	parsedMetrics, err = parser.Parse([]byte("\"test.metric\" 1.1234 1530939936 \"source\"=\"mysource\" tag2=value2\ntest.metric		 1.1234      1530939936 	source=\"mysource\"    tag2=value2     "))
+	assert.NoError(t, err)
+	testMetric1, err = metric.New("test.metric", map[string]string{"source": "mysource", "tag2": "value2"}, map[string]interface{}{"value": 1.1234}, time.Unix(1530939936, 0))
+	assert.NoError(t, err)
+	testMetric2, err = metric.New("test.metric", map[string]string{"source": "mysource", "tag2": "value2"}, map[string]interface{}{"value": 1.1234}, time.Unix(1530939936, 0))
+	assert.NoError(t, err)
+	testMetrics = []telegraf.Metric{testMetric1, testMetric2}
+	assert.EqualValues(t, parsedMetrics, testMetrics)
+
+	parsedMetrics, err = parser.Parse([]byte("test.metric 1 1530939936 source=mysource\n\"test.metric\" 1.1234 1530939936 source=\"mysource\"\ntest.metric3 333 1530939936 tagit=valueit"))
+	assert.NoError(t, err)
+	testMetric1, err = metric.New("test.metric", map[string]string{"source": "mysource"}, map[string]interface{}{"value": 1.}, time.Unix(1530939936, 0))
+	assert.NoError(t, err)
+	testMetric2, err = metric.New("test.metric", map[string]string{"source": "mysource"}, map[string]interface{}{"value": 1.1234}, time.Unix(1530939936, 0))
+	assert.NoError(t, err)
+	testMetric3, err := metric.New("test.metric3", map[string]string{"tagit": "valueit"}, map[string]interface{}{"value": 333.}, time.Unix(1530939936, 0))
+	assert.NoError(t, err)
+	testMetrics = []telegraf.Metric{testMetric1, testMetric2, testMetric3}
+	assert.EqualValues(t, parsedMetrics, testMetrics)
+
+}
+
+func TestParseSpecial(t *testing.T) {
+	parser := NewWavefrontParser(nil)
+
+	parsedMetric, err := parser.ParseLine("\"test.metric\" 1 1530939936")
+	assert.NoError(t, err)
+	testMetric, err := metric.New("test.metric", map[string]string{}, map[string]interface{}{"value": 1.}, time.Unix(1530939936, 0))
+	assert.NoError(t, err)
+	assert.EqualValues(t, parsedMetric, testMetric)
+
+	parsedMetric, err = parser.ParseLine("test.metric 1 1530939936 tag1=\"val\\\"ue1\"")
+	assert.NoError(t, err)
+	testMetric, err = metric.New("test.metric", map[string]string{"tag1": "val\\\"ue1"}, map[string]interface{}{"value": 1.}, time.Unix(1530939936, 0))
+	assert.NoError(t, err)
+	assert.EqualValues(t, parsedMetric, testMetric)
+
+}
+
+func TestParseInvalid(t *testing.T) {
+	parser := NewWavefrontParser(nil)
+
+	_, err := parser.Parse([]byte("test.metric"))
+	assert.Error(t, err)
+
+	_, err = parser.Parse([]byte("test.metric string"))
+	assert.Error(t, err)
+
+	_, err = parser.Parse([]byte("test.metric 1 string"))
+	assert.Error(t, err)
+
+	_, err = parser.Parse([]byte("test.metric 1 1530939936 tag_no_pair"))
+	assert.Error(t, err)
+
+	_, err = parser.Parse([]byte("test.metric 1 1530939936 tag_broken_value=\""))
+	assert.Error(t, err)
+
+	_, err = parser.Parse([]byte("\"test.metric 1 1530939936"))
+	assert.Error(t, err)
+
+	_, err = parser.Parse([]byte("test.metric 1 1530939936 tag1=val\\\"ue1"))
+	assert.Error(t, err)
+
+}
+
+func TestParseDefaultTags(t *testing.T) {
+	parser := NewWavefrontParser(map[string]string{"myDefault": "value1", "another": "test2"})
+
+	parsedMetrics, err := parser.Parse([]byte("test.metric 1 1530939936"))
+	assert.NoError(t, err)
+	testMetric, err := metric.New("test.metric", map[string]string{"myDefault": "value1", "another": "test2"}, map[string]interface{}{"value": 1.}, time.Unix(1530939936, 0))
+	assert.NoError(t, err)
+	assert.EqualValues(t, parsedMetrics[0], testMetric)
+
+	parsedMetrics, err = parser.Parse([]byte("test.metric 1 1530939936 source=mysource"))
+	assert.NoError(t, err)
+	testMetric, err = metric.New("test.metric", map[string]string{"myDefault": "value1", "another": "test2", "source": "mysource"}, map[string]interface{}{"value": 1.}, time.Unix(1530939936, 0))
+	assert.NoError(t, err)
+	assert.EqualValues(t, parsedMetrics[0], testMetric)
+
+	parsedMetrics, err = parser.Parse([]byte("\"test.metric\" 1.1234 1530939936 another=\"test3\""))
+	assert.NoError(t, err)
+	testMetric, err = metric.New("test.metric", map[string]string{"myDefault": "value1", "another": "test2"}, map[string]interface{}{"value": 1.1234}, time.Unix(1530939936, 0))
+	assert.NoError(t, err)
+	assert.EqualValues(t, parsedMetrics[0], testMetric)
+
+}
diff --git a/plugins/parsers/wavefront/scanner.go b/plugins/parsers/wavefront/scanner.go
new file mode 100644
index 00000000..e64516f5
--- /dev/null
+++ b/plugins/parsers/wavefront/scanner.go
@@ -0,0 +1,69 @@
+package wavefront
+
+import (
+	"bufio"
+	"io"
+)
+
+// Lexical Point Scanner
+type PointScanner struct {
+	r *bufio.Reader
+}
+
+func NewScanner(r io.Reader) *PointScanner {
+	return &PointScanner{r: bufio.NewReader(r)}
+}
+
+// read reads the next rune from the buffered reader.
+// Returns rune(0) if an error occurs (or io.EOF is returned).
+func (s *PointScanner) read() rune {
+	ch, _, err := s.r.ReadRune()
+	if err != nil {
+		return eof
+	}
+	return ch
+}
+
+// unread places the previously read rune back on the reader.
+func (s *PointScanner) unread() {
+	_ = s.r.UnreadRune()
+}
+
+// Scan returns the next token and literal value.
+func (s *PointScanner) Scan() (Token, string) {
+
+	// Read the next rune
+	ch := s.read()
+	if isWhitespace(ch) {
+		return WS, string(ch)
+	} else if isLetter(ch) {
+		return LETTER, string(ch)
+	} else if isNumber(ch) {
+		return NUMBER, string(ch)
+	}
+
+	// Otherwise read the individual character.
+	switch ch {
+	case eof:
+		return EOF, ""
+	case '\n':
+		return NEWLINE, string(ch)
+	case '.':
+		return DOT, string(ch)
+	case '-':
+		return MINUS_SIGN, string(ch)
+	case '_':
+		return UNDERSCORE, string(ch)
+	case '/':
+		return SLASH, string(ch)
+	case '\\':
+		return BACKSLASH, string(ch)
+	case ',':
+		return COMMA, string(ch)
+	case '"':
+		return QUOTES, string(ch)
+	case '=':
+		return EQUALS, string(ch)
+	}
+	return ILLEGAL, string(ch)
+}
diff --git a/plugins/parsers/wavefront/token.go b/plugins/parsers/wavefront/token.go
new file mode 100644
index 00000000..bbcbf4e7
--- /dev/null
+++ b/plugins/parsers/wavefront/token.go
@@ -0,0 +1,41 @@
+package wavefront
+
+type Token int
+
+const (
+	// Special tokens
+	ILLEGAL Token = iota
+	EOF
+	WS
+
+	// Literals
+	literal_beg
+	LETTER // metric name, source/point tags
+	NUMBER
+	MINUS_SIGN
+	UNDERSCORE
+	DOT
+	SLASH
+	BACKSLASH
+	COMMA
+	literal_end
+
+	// Misc characters
+	QUOTES
+	EQUALS
+	NEWLINE
+)
+
+func isWhitespace(ch rune) bool {
+	return ch == ' ' || ch == '\t' || ch == '\n'
+}
+
+func isLetter(ch rune) bool {
+	return (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z')
+}
+
+func isNumber(ch rune) bool {
+	return ch >= '0' && ch <= '9'
+}
+
+var eof = rune(0)

From 7ca7f22e500567e979f69e43b57256ead5e22026 Mon Sep 17 00:00:00 2001
From: Harry Schmidt <me@goldibex.com>
Date: Mon, 13 Aug 2018 16:38:46 -0700
Subject: [PATCH 682/835] Add rename processor (#4528)

---
 README.md                                |  1 +
 plugins/processors/all/all.go            |  1 +
 plugins/processors/rename/README.md      | 41 ++++++++++++
 plugins/processors/rename/rename.go      | 82 ++++++++++++++++++++++++
 plugins/processors/rename/rename_test.go | 58 +++++++++++++++++
 5 files changed, 183 insertions(+)
 create mode 100644 plugins/processors/rename/README.md
 create mode 100644 plugins/processors/rename/rename.go
 create mode 100644 plugins/processors/rename/rename_test.go

diff --git a/README.md b/README.md
index 700f0dd2..5f7cb31c 100644
--- a/README.md
+++ b/README.md
@@ -279,6 +279,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)
+* [rename](./plugins/processors/rename)
 * [topk](./plugins/processors/topk)
 
 ## Aggregator Plugins
diff --git a/plugins/processors/all/all.go b/plugins/processors/all/all.go
index c06bbd42..f581ea60 100644
--- a/plugins/processors/all/all.go
+++ b/plugins/processors/all/all.go
@@ -6,5 +6,6 @@ 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/rename"
 	_ "github.com/influxdata/telegraf/plugins/processors/topk"
 )
diff --git a/plugins/processors/rename/README.md b/plugins/processors/rename/README.md
new file mode 100644
index 00000000..dbd31490
--- /dev/null
+++ b/plugins/processors/rename/README.md
@@ -0,0 +1,41 @@
+# Rename Processor Plugin
+
+The `rename` processor renames measurements, fields, and tags.
+
+### Configuration:
+
+```toml
+## Measurement, tag, and field renamings are stored in separate sub-tables.
+## Specify one sub-table per rename operation.
+[[processors.rename]]
+[[processors.rename.measurement]]
+  ## measurement to change
+  from = "network_interface_throughput"
+  to = "throughput"
+
+[[processors.rename.tag]]
+  ## tag to change
+  from = "hostname"
+  to = "host"
+
+[[processors.rename.field]]
+  ## field to change
+  from = "lower"
+  to = "min"
+
+[[processors.rename.field]]
+  ## field to change
+  from = "upper"
+  to = "max"
+```
+
+### Tags:
+
+No tags are applied by this processor, though it can alter them by renaming.
+
+### Example processing:
+
+```diff
+- network_interface_throughput,hostname=backend.example.com,units=kbps lower=10i,upper=1000i,mean=500i 1502489900000000000
++ throughput,host=backend.example.com,units=kbps min=10i,max=1000i,mean=500i 1502489900000000000
+```
diff --git a/plugins/processors/rename/rename.go b/plugins/processors/rename/rename.go
new file mode 100644
index 00000000..2da787a3
--- /dev/null
+++ b/plugins/processors/rename/rename.go
@@ -0,0 +1,82 @@
+package rename
+
+import (
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/processors"
+)
+
+const sampleConfig = `
+  ## Measurement, tag, and field renamings are stored in separate sub-tables.
+  ## Specify one sub-table per rename operation.
+  # [[processors.rename.measurement]]
+  #   ## measurement to change
+  #   from = "kilobytes_per_second"
+  #   to = "kbps"
+
+  # [[processors.rename.tag]]
+  #   ## tag to change
+  #   from = "host"
+  #   to = "hostname"
+
+  # [[processors.rename.field]]
+  #   ## field to change
+  #   from = "lower"
+  #   to = "min"
+
+  # [[processors.rename.field]]
+  #   ## field to change
+  #   from = "upper"
+  #   to = "max"
+`
+
+type renamer struct {
+	From string
+	To   string
+}
+
+type Rename struct {
+	Measurement []renamer
+	Tag         []renamer
+	Field       []renamer
+}
+
+func (r *Rename) SampleConfig() string {
+	return sampleConfig
+}
+
+func (r *Rename) Description() string {
+	return "Rename measurements, tags, and fields that pass through this filter."
+}
+
+func (r *Rename) Apply(in ...telegraf.Metric) []telegraf.Metric {
+	for _, point := range in {
+		for _, measurementRenamer := range r.Measurement {
+			if point.Name() == measurementRenamer.From {
+				point.SetName(measurementRenamer.To)
+				break
+			}
+		}
+
+		for _, tagRenamer := range r.Tag {
+			if value, ok := point.GetTag(tagRenamer.From); ok {
+				point.RemoveTag(tagRenamer.From)
+				point.AddTag(tagRenamer.To, value)
+			}
+		}
+
+		for _, fieldRenamer := range r.Field {
+			if value, ok := point.GetField(fieldRenamer.From); ok {
+				point.RemoveField(fieldRenamer.From)
+				point.AddField(fieldRenamer.To, value)
+			}
+		}
+	}
+
+	return in
+}
+
+func init() {
+	processors.Add("rename", func() telegraf.Processor {
+		return &Rename{}
+	})
+}
diff --git a/plugins/processors/rename/rename_test.go b/plugins/processors/rename/rename_test.go
new file mode 100644
index 00000000..43f7fcc3
--- /dev/null
+++ b/plugins/processors/rename/rename_test.go
@@ -0,0 +1,58 @@
+package rename
+
+import (
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/metric"
+	"github.com/stretchr/testify/assert"
+)
+
+func newMetric(name string, tags map[string]string, fields map[string]interface{}) telegraf.Metric {
+	if tags == nil {
+		tags = map[string]string{}
+	}
+	if fields == nil {
+		fields = map[string]interface{}{}
+	}
+	m, _ := metric.New(name, tags, fields, time.Now())
+	return m
+}
+
+func TestMeasurementRename(t *testing.T) {
+	r := Rename{}
+	r.Measurement = []renamer{
+		{From: "foo", To: "bar"},
+		{From: "baz", To: "quux"},
+	}
+	m1 := newMetric("foo", nil, nil)
+	m2 := newMetric("bar", nil, nil)
+	m3 := newMetric("baz", nil, nil)
+	results := r.Apply(m1, m2, m3)
+	assert.Equal(t, "bar", results[0].Name(), "Should change name from 'foo' to 'bar'")
+	assert.Equal(t, "bar", results[1].Name(), "Should not name from 'bar'")
+	assert.Equal(t, "quux", results[2].Name(), "Should change name from 'baz' to 'quux'")
+}
+
+func TestTagRename(t *testing.T) {
+	r := Rename{}
+	r.Tag = []renamer{
+		{From: "hostname", To: "host"},
+	}
+	m := newMetric("foo", map[string]string{"hostname": "localhost", "region": "east-1"}, nil)
+	results := r.Apply(m)
+
+	assert.Equal(t, map[string]string{"host": "localhost", "region": "east-1"}, results[0].Tags(), "should change tag 'hostname' to 'host'")
+}
+
+func TestFieldRename(t *testing.T) {
+	r := Rename{}
+	r.Field = []renamer{
+		{From: "time_msec", To: "time"},
+	}
+	m := newMetric("foo", nil, map[string]interface{}{"time_msec": int64(1250), "snakes": true})
+	results := r.Apply(m)
+
+	assert.Equal(t, map[string]interface{}{"time": int64(1250), "snakes": true}, results[0].Fields(), "should change field 'time_msec' to 'time'")
+}

From 6ad50893612886d7c75127844461fb05b6706b2f Mon Sep 17 00:00:00 2001
From: shrug42 <40281011+shrug42@users.noreply.github.com>
Date: Mon, 13 Aug 2018 16:41:23 -0700
Subject: [PATCH 683/835] Add gopsutil meminfo fields to mem plugin (#4546)

---
 Gopkg.lock                        |  4 +--
 Gopkg.toml                        |  2 +-
 plugins/inputs/mem/memory.go      | 21 ++++++++++++++++
 plugins/inputs/mem/memory_test.go | 42 +++++++++++++++++++++++++++++++
 4 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index 4a70b057..ce842f3e 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -856,8 +856,8 @@
     "process",
   ]
   pruneopts = ""
-  revision = "4a180b209f5f494e5923cfce81ea30ba23915877"
-  version = "v2.18.06"
+  revision = "8048a2e9c5773235122027dd585cf821b2af1249"
+  version = "v2.18.07"
 
 [[projects]]
   branch = "master"
diff --git a/Gopkg.toml b/Gopkg.toml
index 799b5243..d282e1eb 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -148,7 +148,7 @@
 
 [[constraint]]
   name = "github.com/shirou/gopsutil"
-  version = "2.18.05"
+  version = "2.18.07"
 
 [[constraint]]
   name = "github.com/Shopify/sarama"
diff --git a/plugins/inputs/mem/memory.go b/plugins/inputs/mem/memory.go
index f664dd3f..a7d887cb 100644
--- a/plugins/inputs/mem/memory.go
+++ b/plugins/inputs/mem/memory.go
@@ -37,6 +37,27 @@ func (s *MemStats) Gather(acc telegraf.Accumulator) error {
 		"slab":              vm.Slab,
 		"used_percent":      100 * float64(vm.Used) / float64(vm.Total),
 		"available_percent": 100 * float64(vm.Available) / float64(vm.Total),
+		"commit_limit":      vm.CommitLimit,
+		"committed_as":      vm.CommittedAS,
+		"dirty":             vm.Dirty,
+		"high_free":         vm.HighFree,
+		"high_total":        vm.HighTotal,
+		"huge_page_size":    vm.HugePageSize,
+		"huge_pages_free":   vm.HugePagesFree,
+		"huge_pages_total":  vm.HugePagesTotal,
+		"low_free":          vm.LowFree,
+		"low_total":         vm.LowTotal,
+		"mapped":            vm.Mapped,
+		"page_tables":       vm.PageTables,
+		"shared":            vm.Shared,
+		"swap_cached":       vm.SwapCached,
+		"swap_free":         vm.SwapFree,
+		"swap_total":        vm.SwapTotal,
+		"vmalloc_chunk":     vm.VMallocChunk,
+		"vmalloc_total":     vm.VMallocTotal,
+		"vmalloc_used":      vm.VMallocUsed,
+		"write_back":        vm.Writeback,
+		"write_back_tmp":    vm.WritebackTmp,
 	}
 	acc.AddGauge("mem", fields, nil)
 
diff --git a/plugins/inputs/mem/memory_test.go b/plugins/inputs/mem/memory_test.go
index ef9af8d2..06f2f6ea 100644
--- a/plugins/inputs/mem/memory_test.go
+++ b/plugins/inputs/mem/memory_test.go
@@ -27,6 +27,27 @@ func TestMemStats(t *testing.T) {
 		// Buffers:     771,
 		// Cached:      4312,
 		// Shared:      2142,
+		CommitLimit:    1,
+		CommittedAS:    118680,
+		Dirty:          4,
+		HighFree:       0,
+		HighTotal:      0,
+		HugePageSize:   4096,
+		HugePagesFree:  0,
+		HugePagesTotal: 0,
+		LowFree:        69936,
+		LowTotal:       255908,
+		Mapped:         42236,
+		PageTables:     1236,
+		Shared:         0,
+		SwapCached:     0,
+		SwapFree:       524280,
+		SwapTotal:      524280,
+		VMallocChunk:   3872908,
+		VMallocTotal:   3874808,
+		VMallocUsed:    1416,
+		Writeback:      0,
+		WritebackTmp:   0,
 	}
 
 	mps.On("VMStat").Return(vms, nil)
@@ -47,6 +68,27 @@ func TestMemStats(t *testing.T) {
 		"inactive":          uint64(1124),
 		"wired":             uint64(134),
 		"slab":              uint64(1234),
+		"commit_limit":      uint64(1),
+		"committed_as":      uint64(118680),
+		"dirty":             uint64(4),
+		"high_free":         uint64(0),
+		"high_total":        uint64(0),
+		"huge_page_size":    uint64(4096),
+		"huge_pages_free":   uint64(0),
+		"huge_pages_total":  uint64(0),
+		"low_free":          uint64(69936),
+		"low_total":         uint64(255908),
+		"mapped":            uint64(42236),
+		"page_tables":       uint64(1236),
+		"shared":            uint64(0),
+		"swap_cached":       uint64(0),
+		"swap_free":         uint64(524280),
+		"swap_total":        uint64(524280),
+		"vmalloc_chunk":     uint64(3872908),
+		"vmalloc_total":     uint64(3874808),
+		"vmalloc_used":      uint64(1416),
+		"write_back":        uint64(0),
+		"write_back_tmp":    uint64(0),
 	}
 	acc.AssertContainsTaggedFields(t, "mem", memfields, make(map[string]string))
 

From 3268937c4743ac4d977f74f757eca0f1a46c94b8 Mon Sep 17 00:00:00 2001
From: Greg Linton <g2linton@gmail.com>
Date: Mon, 13 Aug 2018 17:47:09 -0600
Subject: [PATCH 684/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d53c2576..461f4425 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,10 +13,12 @@
 - [x509_cert](./plugins/inputs/x509_cert/README.md) - Contributed by @jtyr
 - [filecount](./plugins/inputs/filecount/README.md) - Contributed by @sometimesfood
 - [pgbouncer](./plugins/inputs/pgbouncer/README.md) - Contributed by @nerzhul
+- [activemq](./plugins/inputs/activemq/README.md) - Contributed by @mlabouardy
 
 ### New Processors
 
 - [enum](./plugins/processors/enum/README.md) - Contributed by @KarstenSchnitter
+- [rename](./plugins/processors/rename/README.md) - Contributed by @goldibex
 
 ### New Aggregators
 
@@ -56,6 +58,11 @@
 - [#4364](https://github.com/influxdata/telegraf/pull/4364): Support StatisticValues in cloudwatch output plugin.
 - [#4431](https://github.com/influxdata/telegraf/pull/4431): Add ip restriction for the prometheus_client output.
 - [#3918](https://github.com/influxdata/telegraf/pull/3918): Add pgbouncer input plugin.
+- [#2689](https://github.com/influxdata/telegraf/pull/2689): Add ActiveMQ input plugin.
+- [#4402](https://github.com/influxdata/telegraf/pull/4402): Add wavefront parser.
+- [#4528](https://github.com/influxdata/telegraf/pull/4528): Add rename processor.
+- [#4537](https://github.com/influxdata/telegraf/pull/4537): Add message 'max_bytes' configuration to kafka input.
+- [#4546](https://github.com/influxdata/telegraf/pull/4546): Add gopsutil meminfo fields to mem plugin.
 
 ## v1.7.3 [2018-08-07]
 

From 763dc6990c9a89cdd2278ef27f7933a3ac7288c3 Mon Sep 17 00:00:00 2001
From: dupondje <jean-louis@dupond.be>
Date: Tue, 14 Aug 2018 22:35:39 +0200
Subject: [PATCH 685/835] Fix powerdns input test (#4554)

---
 plugins/inputs/powerdns/powerdns_test.go | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/plugins/inputs/powerdns/powerdns_test.go b/plugins/inputs/powerdns/powerdns_test.go
index 56666a88..fe64be5d 100644
--- a/plugins/inputs/powerdns/powerdns_test.go
+++ b/plugins/inputs/powerdns/powerdns_test.go
@@ -1,8 +1,6 @@
 package powerdns
 
 import (
-	"crypto/rand"
-	"encoding/binary"
 	"fmt"
 	"net"
 	"testing"
@@ -70,10 +68,9 @@ func (s statServer) serverSocket(l net.Listener) {
 	}
 }
 
-func TestMemcachedGeneratesMetrics(t *testing.T) {
+func TestPowerdnsGeneratesMetrics(t *testing.T) {
 	// We create a fake server to return test data
-	var randomNumber int64
-	binary.Read(rand.Reader, binary.LittleEndian, &randomNumber)
+	randomNumber := int64(5239846799706671610)
 	socket, err := net.Listen("unix", fmt.Sprintf("/tmp/pdns%d.controlsocket", randomNumber))
 	if err != nil {
 		t.Fatal("Cannot initialize server on port ")

From fa30f568ecd224ee64baf4399c22fe2aa9d5d532 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 14 Aug 2018 13:36:29 -0700
Subject: [PATCH 686/835] Skip unserializable metric in influxDB UDP output
 (#4534)

---
 plugins/outputs/influxdb/udp.go           | 12 ++--
 plugins/outputs/influxdb/udp_test.go      | 88 +++++++++++++++--------
 plugins/serializers/influx/influx.go      | 73 ++++++++++---------
 plugins/serializers/influx/influx_test.go | 15 ++--
 plugins/serializers/influx/reader.go      | 13 +---
 5 files changed, 119 insertions(+), 82 deletions(-)

diff --git a/plugins/outputs/influxdb/udp.go b/plugins/outputs/influxdb/udp.go
index 5b3f5ce5..62f2a6ab 100644
--- a/plugins/outputs/influxdb/udp.go
+++ b/plugins/outputs/influxdb/udp.go
@@ -3,11 +3,11 @@ package influxdb
 import (
 	"context"
 	"fmt"
+	"log"
 	"net"
 	"net/url"
 
 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/plugins/serializers"
 	"github.com/influxdata/telegraf/plugins/serializers/influx"
 )
 
@@ -28,7 +28,7 @@ type Conn interface {
 type UDPConfig struct {
 	MaxPayloadSize int
 	URL            *url.URL
-	Serializer     serializers.Serializer
+	Serializer     *influx.Serializer
 	Dialer         Dialer
 }
 
@@ -65,7 +65,7 @@ func NewUDPClient(config *UDPConfig) (*udpClient, error) {
 type udpClient struct {
 	conn       Conn
 	dialer     Dialer
-	serializer serializers.Serializer
+	serializer *influx.Serializer
 	url        *url.URL
 }
 
@@ -89,7 +89,11 @@ func (c *udpClient) Write(ctx context.Context, metrics []telegraf.Metric) error
 	for _, metric := range metrics {
 		octets, err := c.serializer.Serialize(metric)
 		if err != nil {
-			return fmt.Errorf("could not serialize metric: %v", err)
+			// Since we are serializing multiple metrics, don't fail the
+			// entire batch just because of one unserializable metric.
+			log.Printf("E! [outputs.influxdb] when writing to [%s] could not serialize metric: %v",
+				c.URL(), err)
+			continue
 		}
 
 		_, err = c.conn.Write(octets)
diff --git a/plugins/outputs/influxdb/udp_test.go b/plugins/outputs/influxdb/udp_test.go
index 9bced426..61b3f1de 100644
--- a/plugins/outputs/influxdb/udp_test.go
+++ b/plugins/outputs/influxdb/udp_test.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"log"
 	"net"
 	"net/url"
 	"sync"
@@ -13,7 +14,6 @@ import (
 	"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"
 )
 
@@ -65,19 +65,6 @@ func (d *MockDialer) DialContext(ctx context.Context, network string, address st
 	return d.DialContextF(network, address)
 }
 
-type MockSerializer struct {
-	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)
@@ -177,28 +164,69 @@ func TestUDP_WriteError(t *testing.T) {
 	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
+func TestUDP_ErrorLogging(t *testing.T) {
+	tests := []struct {
+		name        string
+		config      *influxdb.UDPConfig
+		metrics     []telegraf.Metric
+		logContains string
+	}{
+		{
+			name: "logs need more space",
+			config: &influxdb.UDPConfig{
+				MaxPayloadSize: 1,
+				URL:            getURL(),
+				Dialer: &MockDialer{
+					DialContextF: func(network, address string) (influxdb.Conn, error) {
+						conn := &MockConn{}
+						return conn, nil
+					},
+				},
 			},
+			metrics:     []telegraf.Metric{getMetric()},
+			logContains: `could not serialize metric: "cpu": need more space`,
 		},
-		Serializer: &MockSerializer{
-			SerializeF: func(metric telegraf.Metric) ([]byte, error) {
-				return nil, influx.ErrNeedMoreSpace
+		{
+			name: "logs series name",
+			config: &influxdb.UDPConfig{
+				URL: getURL(),
+				Dialer: &MockDialer{
+					DialContextF: func(network, address string) (influxdb.Conn, error) {
+						conn := &MockConn{}
+						return conn, nil
+					},
+				},
 			},
+			metrics: []telegraf.Metric{
+				func() telegraf.Metric {
+					metric, _ := metric.New(
+						"cpu",
+						map[string]string{
+							"host": "example.org",
+						},
+						map[string]interface{}{},
+						time.Unix(0, 0),
+					)
+					return metric
+				}(),
+			},
+			logContains: `could not serialize metric: "cpu,host=example.org": no serializable fields`,
 		},
 	}
-	client, err := influxdb.NewUDPClient(config)
-	require.NoError(t, err)
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			var b bytes.Buffer
+			log.SetOutput(&b)
 
-	ctx := context.Background()
-	err = client.Write(ctx, []telegraf.Metric{getMetric()})
-	require.Error(t, err)
-	require.Contains(t, err.Error(), influx.ErrNeedMoreSpace.Error())
+			client, err := influxdb.NewUDPClient(tt.config)
+			require.NoError(t, err)
+
+			ctx := context.Background()
+			err = client.Write(ctx, tt.metrics)
+			require.NoError(t, err)
+			require.Contains(t, b.String(), tt.logContains)
+		})
+	}
 }
 
 func TestUDP_WriteWithRealConn(t *testing.T) {
diff --git a/plugins/serializers/influx/influx.go b/plugins/serializers/influx/influx.go
index f052c9c9..2989e44e 100644
--- a/plugins/serializers/influx/influx.go
+++ b/plugins/serializers/influx/influx.go
@@ -27,30 +27,34 @@ const (
 	UintSupport FieldTypeSupport = 1 << iota
 )
 
-// MetricError is an error causing a metric to be unserializable.
+var (
+	NeedMoreSpace = "need more space"
+	InvalidName   = "invalid name"
+	NoFields      = "no serializable fields"
+)
+
+// MetricError is an error causing an entire metric to be unserializable.
 type MetricError struct {
-	s string
+	series string
+	reason string
 }
 
 func (e MetricError) Error() string {
-	return e.s
+	if e.series != "" {
+		return fmt.Sprintf("%q: %s", e.series, e.reason)
+	}
+	return e.reason
 }
 
 // FieldError is an error causing a field to be unserializable.
 type FieldError struct {
-	s string
+	reason string
 }
 
 func (e FieldError) Error() string {
-	return e.s
+	return e.reason
 }
 
-var (
-	ErrNeedMoreSpace = &MetricError{"need more space"}
-	ErrInvalidName   = &MetricError{"invalid name"}
-	ErrNoFields      = &MetricError{"no serializable fields"}
-)
-
 // Serializer is a serializer for line protocol.
 type Serializer struct {
 	maxLineBytes     int
@@ -102,17 +106,20 @@ func (s *Serializer) Serialize(m telegraf.Metric) ([]byte, error) {
 	return out, nil
 }
 
+// SerializeBatch writes the slice of metrics and returns a byte slice of the
+// results.  The returned byte slice may contain multiple lines of data.
 func (s *Serializer) SerializeBatch(metrics []telegraf.Metric) ([]byte, error) {
-	var batch bytes.Buffer
+	s.buf.Reset()
 	for _, m := range metrics {
-		_, err := s.Write(&batch, m)
+		_, err := s.Write(&s.buf, m)
 		if err != nil {
 			return nil, err
 		}
 	}
-	return batch.Bytes(), nil
+	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
@@ -135,7 +142,7 @@ func (s *Serializer) buildHeader(m telegraf.Metric) error {
 
 	name := nameEscape(m.Name())
 	if name == "" {
-		return ErrInvalidName
+		return s.newMetricError(InvalidName)
 	}
 
 	s.header = append(s.header, name...)
@@ -222,9 +229,10 @@ func (s *Serializer) writeMetric(w io.Writer, m telegraf.Metric) error {
 		}
 
 		if s.maxLineBytes > 0 && bytesNeeded > s.maxLineBytes {
-			// Need at least one field per line
+			// Need at least one field per line, this metric cannot be fit
+			// into the max line bytes.
 			if firstField {
-				return ErrNeedMoreSpace
+				return s.newMetricError(NeedMoreSpace)
 			}
 
 			err = s.write(w, s.footer)
@@ -232,21 +240,12 @@ func (s *Serializer) writeMetric(w io.Writer, m telegraf.Metric) error {
 				return err
 			}
 
+			firstField = true
 			bytesNeeded = len(s.header) + len(s.pair) + len(s.footer)
 
-			if s.maxLineBytes > 0 && bytesNeeded > s.maxLineBytes {
-				return ErrNeedMoreSpace
+			if bytesNeeded > s.maxLineBytes {
+				return s.newMetricError(NeedMoreSpace)
 			}
-
-			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 {
@@ -261,18 +260,28 @@ func (s *Serializer) writeMetric(w io.Writer, m telegraf.Metric) error {
 			}
 		}
 
-		s.write(w, s.pair)
+		err = s.write(w, s.pair)
+		if err != nil {
+			return err
+		}
 
 		pairsLen += len(s.pair)
 		firstField = false
 	}
 
 	if firstField {
-		return ErrNoFields
+		return s.newMetricError(NoFields)
 	}
 
 	return s.write(w, s.footer)
+}
 
+func (s *Serializer) newMetricError(reason string) *MetricError {
+	if len(s.header) != 0 {
+		series := bytes.TrimRight(s.header, " ")
+		return &MetricError{series: string(series), reason: reason}
+	}
+	return &MetricError{reason: reason}
 }
 
 func (s *Serializer) appendFieldValue(buf []byte, value interface{}) ([]byte, error) {
diff --git a/plugins/serializers/influx/influx_test.go b/plugins/serializers/influx/influx_test.go
index 74bffe5e..2c1cbd58 100644
--- a/plugins/serializers/influx/influx_test.go
+++ b/plugins/serializers/influx/influx_test.go
@@ -23,7 +23,7 @@ var tests = []struct {
 	typeSupport FieldTypeSupport
 	input       telegraf.Metric
 	output      []byte
-	err         error
+	errReason   string
 }{
 	{
 		name: "minimal",
@@ -98,7 +98,7 @@ var tests = []struct {
 				time.Unix(0, 0),
 			),
 		),
-		err: ErrNoFields,
+		errReason: NoFields,
 	},
 	{
 		name: "float Inf",
@@ -333,8 +333,8 @@ var tests = []struct {
 				time.Unix(1519194109, 42),
 			),
 		),
-		output: nil,
-		err:    ErrNeedMoreSpace,
+		output:    nil,
+		errReason: NeedMoreSpace,
 	},
 	{
 		name: "no fields",
@@ -346,7 +346,7 @@ var tests = []struct {
 				time.Unix(0, 0),
 			),
 		),
-		err: ErrNoFields,
+		errReason: NoFields,
 	},
 	{
 		name: "procstat",
@@ -427,7 +427,10 @@ func TestSerializer(t *testing.T) {
 			serializer.SetFieldSortOrder(SortFields)
 			serializer.SetFieldTypeSupport(tt.typeSupport)
 			output, err := serializer.Serialize(tt.input)
-			require.Equal(t, tt.err, err)
+			if tt.errReason != "" {
+				require.Error(t, err)
+				require.Contains(t, err.Error(), tt.errReason)
+			}
 			require.Equal(t, string(tt.output), string(output))
 		})
 	}
diff --git a/plugins/serializers/influx/reader.go b/plugins/serializers/influx/reader.go
index 4a755c88..d0dad8ee 100644
--- a/plugins/serializers/influx/reader.go
+++ b/plugins/serializers/influx/reader.go
@@ -2,7 +2,6 @@ package influx
 
 import (
 	"bytes"
-	"fmt"
 	"io"
 	"log"
 
@@ -54,17 +53,11 @@ func (r *reader) Read(p []byte) (int, error) {
 		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
+			if err != nil {
+				// Since we are serializing multiple metrics, don't fail the
 				// 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)
+				log.Printf("E! [serializers.influx] could not serialize metric: %v; discarding metric", err)
 				continue
-			default:
-				fmt.Println(err)
-				return 0, err
 			}
 		}
 		break

From 027016aea2cd65254cdf11d70413fb74dbd763a0 Mon Sep 17 00:00:00 2001
From: Greg Linton <g2linton@gmail.com>
Date: Tue, 14 Aug 2018 14:41:24 -0600
Subject: [PATCH 687/835] Update changelog

---
 CHANGELOG.md               | 7 +++++++
 docs/DATA_FORMATS_INPUT.md | 7 ++-----
 etc/telegraf.conf          | 2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 461f4425..89bbfe90 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -64,6 +64,13 @@
 - [#4537](https://github.com/influxdata/telegraf/pull/4537): Add message 'max_bytes' configuration to kafka input.
 - [#4546](https://github.com/influxdata/telegraf/pull/4546): Add gopsutil meminfo fields to mem plugin.
 
+## v1.7.4 [unreleased]
+
+### Bugfixes
+
+- [#4534](https://github.com/influxdata/telegraf/pull/4534): Skip unserializable metric in influxDB UDP output.
+- [#4554](https://github.com/influxdata/telegraf/pull/4554): Fix powerdns input tests.
+
 ## v1.7.3 [2018-08-07]
 
 ### Bugfixes
diff --git a/docs/DATA_FORMATS_INPUT.md b/docs/DATA_FORMATS_INPUT.md
index 00ead6e3..75352384 100644
--- a/docs/DATA_FORMATS_INPUT.md
+++ b/docs/DATA_FORMATS_INPUT.md
@@ -10,7 +10,7 @@ Telegraf is able to parse the following input data formats into metrics:
 1. [Collectd](#collectd)
 1. [Dropwizard](#dropwizard)
 1. [Grok](#grok)
-1. [Wavefront](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#wavefront)
+1. [Wavefront](#wavefront)
 
 Telegraf metrics, like InfluxDB
 [points](https://docs.influxdata.com/influxdb/v0.10/write_protocols/line/),
@@ -661,7 +661,7 @@ For more information about the dropwizard json format see
   #   tag2 = "tags.tag2"
 ```
 
-# Grok
+# Grok:
 
 The grok data format parses line delimited data using a regular expression like
 language.
@@ -881,9 +881,6 @@ the file output will only print once per `flush_interval`.
 - If successful, add the next token, update the pattern and retest.
 - Continue one token at a time until the entire line is successfully parsed.
 
-
-```
-
 # Wavefront:
 
 Wavefront Data Format is metrics are parsed directly into Telegraf metrics.
diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index c3a84569..9315aa45 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -1980,7 +1980,7 @@
 #   timeout = "20s"
 
 #   ## Schema Version: (Optional, defaults to version 1)
-#   schemaVersion = 2
+#   metric_version = 2
 
 
 # # Gather packets and bytes counters from Linux ipsets

From e50b0c17adb20adf7aaae116e2fd0688d7f6f2c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n=20L=C3=B3pez?= <adrianlzt+github@gmail.com>
Date: Wed, 15 Aug 2018 04:53:25 +0800
Subject: [PATCH 688/835] Document how to parse telegraf logs (#4285)

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

diff --git a/plugins/inputs/logparser/README.md b/plugins/inputs/logparser/README.md
index d35a94a7..27cbc3cf 100644
--- a/plugins/inputs/logparser/README.md
+++ b/plugins/inputs/logparser/README.md
@@ -220,6 +220,48 @@ A multi-line literal string allows us to encode the pattern:
     custom_patterns = 'UNICODE_ESCAPE (?:\\u[0-9A-F]{4})+'
 ```
 
+#### Parsing Telegraf log file
+We can use logparser to convert the log lines generated by Telegraf in metrics.
+
+To do this we need to configure Telegraf to write logs to a file.
+This could be done using the ``agent.logfile`` parameter or configuring syslog.
+```toml
+[agent]
+  logfile = "/var/log/telegraf/telegraf.log"
+```
+
+Logparser configuration:
+```toml
+[[inputs.logparser]]
+  files = ["/var/log/telegraf/telegraf.log"]
+
+  [inputs.logparser.grok]
+    measurement = "telegraf_log"
+    patterns = ['^%{TIMESTAMP_ISO8601:timestamp:ts-rfc3339} %{TELEGRAF_LOG_LEVEL:level:tag}! %{GREEDYDATA:msg}']
+    custom_patterns = '''
+TELEGRAF_LOG_LEVEL (?:[DIWE]+)
+'''
+```
+
+Example log lines:
+```
+2018-06-14T06:41:35Z I! Starting Telegraf v1.6.4
+2018-06-14T06:41:35Z I! Agent Config: Interval:3s, Quiet:false, Hostname:"archer", Flush Interval:3s
+2018-02-20T22:39:20Z E! Error in plugin [inputs.docker]: took longer to collect than collection interval (10s)
+2018-06-01T10:34:05Z W! Skipping a scheduled flush because there is already a flush ongoing.
+2018-06-14T07:33:33Z D! Output [file] buffer fullness: 0 / 10000 metrics.
+```
+
+Generated metrics:
+```
+telegraf_log,host=somehostname,level=I msg="Starting Telegraf v1.6.4" 1528958495000000000
+telegraf_log,host=somehostname,level=I msg="Agent Config: Interval:3s, Quiet:false, Hostname:\"somehostname\", Flush Interval:3s" 1528958495001000000
+telegraf_log,host=somehostname,level=E msg="Error in plugin [inputs.docker]: took longer to collect than collection interval (10s)" 1519166360000000000
+telegraf_log,host=somehostname,level=W msg="Skipping a scheduled flush because there is already a flush ongoing." 1527849245000000000
+telegraf_log,host=somehostname,level=D msg="Output [file] buffer fullness: 0 / 10000 metrics." 1528961613000000000
+```
+
+
 ### Tips for creating patterns
 
 Writing complex patterns can be difficult, here is some advice for writing a

From b29dd260b2f23d41b75c1e92c1bc6db3defd3c09 Mon Sep 17 00:00:00 2001
From: Greg Linton <g2linton@gmail.com>
Date: Tue, 14 Aug 2018 14:54:19 -0600
Subject: [PATCH 689/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89bbfe90..520a4fb4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -63,6 +63,7 @@
 - [#4528](https://github.com/influxdata/telegraf/pull/4528): Add rename processor.
 - [#4537](https://github.com/influxdata/telegraf/pull/4537): Add message 'max_bytes' configuration to kafka input.
 - [#4546](https://github.com/influxdata/telegraf/pull/4546): Add gopsutil meminfo fields to mem plugin.
+- [#4285](https://github.com/influxdata/telegraf/pull/4285): Document how to parse telegraf logs.
 
 ## v1.7.4 [unreleased]
 

From 6e92df45e74acf563760a004e80eff5a4a6b80fa Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 14 Aug 2018 14:55:38 -0700
Subject: [PATCH 690/835] Use dep v0.5.0 (#4542)

---
 Gopkg.lock             | 265 +++++++++++++++++++++++++++--------------
 README.md              |   2 +-
 appveyor.yml           |   4 +-
 scripts/ci-1.10.docker |   4 +-
 scripts/ci-1.9.docker  |   4 +-
 5 files changed, 181 insertions(+), 98 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index ce842f3e..ef76419b 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -3,14 +3,14 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:d7582b4af1b0b953ff2bb9573a50f787c7e1669cb148fb086a3d1c670a1ac955"
+  digest = "1:fc0802104acded1f48e4860a9f2db85b82b4a754fca9eae750ff4e8b8cdf2116"
   name = "code.cloudfoundry.org/clock"
   packages = ["."]
   pruneopts = ""
   revision = "02e53af36e6c978af692887ed449b74026d76fec"
 
 [[projects]]
-  digest = "1:ce7dc0f1ffcd9a2aacc50ae6d322eebff8f4faa2d6c5f445c874cd0b77a63de7"
+  digest = "1:ca3acef20fd660d4df327accbf3ca2df9a12213d914f3113305dcd56579324b9"
   name = "collectd.org"
   packages = [
     "api",
@@ -23,7 +23,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:c1269bfaddefd090935401c291ad5df6c03de605a440e941ecc568e19f0f9e3b"
+  digest = "1:298712a3ee36b59c3ca91f4183bd75d174d5eaa8b4aed5072831f126e2e752f6"
   name = "github.com/Microsoft/ApplicationInsights-Go"
   packages = [
     "appinsights",
@@ -33,7 +33,7 @@
   revision = "d2df5d440eda5372f24fcac03839a64d6cb5f7e5"
 
 [[projects]]
-  digest = "1:ec6a42cd98d70f0916216d8f6df8ca61145edeaad041014aa9c003068de7364c"
+  digest = "1:45ec6eb579713a01991ad07f538fed3b576ee55f5ce9f248320152a9270d9258"
   name = "github.com/Microsoft/go-winio"
   packages = ["."]
   pruneopts = ""
@@ -41,7 +41,7 @@
   version = "v0.4.9"
 
 [[projects]]
-  digest = "1:14af5ba5ac88efec490fb59734df34e1bd973198caefa7b0cceed0900ef6164c"
+  digest = "1:9362b2212139b7821f73a86169bf80ce6b0264956f87d82ab3aeedb2b5c08fea"
   name = "github.com/Shopify/sarama"
   packages = ["."]
   pruneopts = ""
@@ -57,7 +57,7 @@
   version = "1.0.0"
 
 [[projects]]
-  digest = "1:855af787df6b733016849082d66ffda5e0e00856513fcac08a7cf199a23515c2"
+  digest = "1:f296e8b29c60c94efed3b8cfae08d793cb95149cdd7343e6a9834b4ac7136475"
   name = "github.com/aerospike/aerospike-client-go"
   packages = [
     ".",
@@ -78,7 +78,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:1399282ad03ac819f0e8a747c888407c5c98bb497d33821a7047c7bae667ede0"
+  digest = "1:a74730e052a45a3fab1d310fdef2ec17ae3d6af16228421e238320846f2aaec8"
   name = "github.com/alecthomas/template"
   packages = [
     ".",
@@ -97,7 +97,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:072692f8d76356228f31f64ca3140041a140011c7dea26e746206e8649c71b31"
+  digest = "1:7f21a8f175ee7f91c659f919c61032e11889fba5dc25c0cec555087cbb87435a"
   name = "github.com/amir/raidman"
   packages = [
     ".",
@@ -108,14 +108,14 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:83a67d925714169fa5121021abef0276605c6e4d51c467dd1f0c04344abad1ff"
+  digest = "1:0828d8c0f95689f832cf348fe23827feb7640cd698d612ef59e2f9d041f54c68"
   name = "github.com/apache/thrift"
   packages = ["lib/go/thrift"]
   pruneopts = ""
   revision = "f2867c24984aa53edec54a138c03db934221bdea"
 
 [[projects]]
-  digest = "1:ca172b51bfe0a1ae7725dc782339fed4ba697dcd44e29a0a1c765fffdbf05ddc"
+  digest = "1:65a05bde9b02f645c73afa61c9f6af92d94d726c81a268f45cc70218bd58de65"
   name = "github.com/aws/aws-sdk-go"
   packages = [
     "aws",
@@ -156,14 +156,14 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:fca298802a2ab834d6eb0e284788ae037ebc324c0f325ff92c5eea592d189cc5"
+  digest = "1:c0bec5f9b98d0bc872ff5e834fac186b807b656683bd29cb82fb207a1513fabb"
   name = "github.com/beorn7/perks"
   packages = ["quantile"]
   pruneopts = ""
   revision = "3a771d992973f24aa725d07868b467d1ddfceafb"
 
 [[projects]]
-  digest = "1:0edb96edcfeee9aeba92e605536fbb1542b0bf6a10cea9d0b5a2227d5a703eae"
+  digest = "1:c5978131c797af795972c27c25396c81d1bf53b7b6e8e3e0259e58375765c071"
   name = "github.com/bsm/sarama-cluster"
   packages = ["."]
   pruneopts = ""
@@ -180,7 +180,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:65ae2d1625584ba8d16d1e15b25db1fc62334e2040f22dbbbdc7531c909843b2"
+  digest = "1:298e42868718da06fc0899ae8fdb99c48a14477045234c9274d81caa79af6a8f"
   name = "github.com/couchbase/go-couchbase"
   packages = ["."]
   pruneopts = ""
@@ -188,7 +188,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:5db54de7054c072f47806c91ef7625ffa00489ca2da5fbc6ca1c78e08018f6bf"
+  digest = "1:c734658274a6be88870a36742fdea96a3fce4fc99a7b90946c9e84335ceae71a"
   name = "github.com/couchbase/gomemcached"
   packages = [
     ".",
@@ -199,7 +199,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:0deaa0f28c823119725c8308703f019797bc077e251d1ed3f2b8eae2cc7791d7"
+  digest = "1:c1195c02bc8fbf5307cfb95bc79eddaa1351ee3587cc4a7bbe6932e2fb966ff2"
   name = "github.com/couchbase/goutils"
   packages = [
     "logging",
@@ -209,15 +209,7 @@
   revision = "e865a1461c8ac0032bd37e2d4dab3289faea3873"
 
 [[projects]]
-  branch = "master"
-  digest = "1:4c015b7445aa37becc220fde9bdbc4d4329f75af72ca1c98f9b0bd698d6068cb"
-  name = "github.com/crewjam/rfc5424"
-  packages = ["."]
-  pruneopts = ""
-  revision = "6ae4b209c3f0d5071494be6b883a1970acadda94"
-
-[[projects]]
-  digest = "1:0a39ec8bf5629610a4bc7873a92039ee509246da3cef1a0ea60f1ed7e5f9cea5"
+  digest = "1:56c130d885a4aacae1dd9c7b71cfe39912c7ebc1ff7d2b46083c8812996dc43b"
   name = "github.com/davecgh/go-spew"
   packages = ["spew"]
   pruneopts = ""
@@ -225,7 +217,7 @@
   version = "v1.1.0"
 
 [[projects]]
-  digest = "1:2426da75f49e5b8507a6ed5d4c49b06b2ff795f4aec401c106b7db8fb2625cd7"
+  digest = "1:6098222470fe0172157ce9bbef5d2200df4edde17ee649c5d6e48330e4afa4c6"
   name = "github.com/dgrijalva/jwt-go"
   packages = ["."]
   pruneopts = ""
@@ -233,7 +225,7 @@
   version = "v3.2.0"
 
 [[projects]]
-  digest = "1:68df19ee476d93359596377b7437bbe49d233fe014becd060ded757aeed531cd"
+  digest = "1:522eff2a1f014a64fb403db60fc0110653e4dc5b59779894d208e697b0708ddc"
   name = "github.com/docker/distribution"
   packages = [
     "digestset",
@@ -243,7 +235,7 @@
   revision = "edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
 
 [[projects]]
-  digest = "1:a21509491bfd5bd1f99abe1d38430fddd16c8c8dc0092f954e224b93ad87f06b"
+  digest = "1:d149605f1b00713fdc48150122892d77d49d30c825f690dd92f497aeb6cf18f5"
   name = "github.com/docker/docker"
   packages = [
     "api",
@@ -268,7 +260,7 @@
   revision = "ed7b6428c133e7c59404251a09b7d6b02fa83cc2"
 
 [[projects]]
-  digest = "1:5b20afc76a36d3994194e2612e83b51bc2b12db3d4d2a722b24474b2d0e3a890"
+  digest = "1:a5ecc2e70260a87aa263811281465a5effcfae8a54bac319cee87c4625f04d63"
   name = "github.com/docker/go-connections"
   packages = [
     "nat",
@@ -288,7 +280,7 @@
   version = "v0.3.3"
 
 [[projects]]
-  digest = "1:7bbb118aeef9a6b9fef3d57b6cc5378f7cd6e915cabf4dea695e318e1a1bd4e6"
+  digest = "1:6d6672f85a84411509885eaa32f597577873de00e30729b9bb0eb1e1faa49c12"
   name = "github.com/eapache/go-resiliency"
   packages = ["breaker"]
   pruneopts = ""
@@ -297,7 +289,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:7b28f7f7c9fb914b30dff111fb910d49bd61d275101f665aea79409bb3ba2ae2"
+  digest = "1:7b12ea8b50040c6c2378ec5b5a1ab722730b2bfb46e8724ded57f2c3905431fa"
   name = "github.com/eapache/go-xerial-snappy"
   packages = ["."]
   pruneopts = ""
@@ -312,7 +304,7 @@
   version = "v1.1.0"
 
 [[projects]]
-  digest = "1:d2e2aebcb8e8027345e16f9d0be8cdee3bb470ba406c7a54cb7457ae3ad4ace5"
+  digest = "1:3fa846cb3feb4e65371fe3c347c299de9b5bc3e71e256c0d940cd19b767a6ba0"
   name = "github.com/eclipse/paho.mqtt.golang"
   packages = [
     ".",
@@ -323,7 +315,7 @@
   version = "v1.1.1"
 
 [[projects]]
-  digest = "1:d19c78214e03e297e9e30d2eb11892f731358b2951f2a5c7374658a156373e4c"
+  digest = "1:858b7fe7b0f4bc7ef9953926828f2816ea52d01a88d72d1c45bc8c108f23c356"
   name = "github.com/go-ini/ini"
   packages = ["."]
   pruneopts = ""
@@ -339,7 +331,7 @@
   version = "v0.3.0"
 
 [[projects]]
-  digest = "1:c3a5ae14424a38c244439732c31a08b5f956c46c4acdc159fc285a52dbf11de0"
+  digest = "1:96c4a6ff4206086347bfe28e96e092642882128f45ecb8dc8f15f3e6f6703af0"
   name = "github.com/go-ole/go-ole"
   packages = [
     ".",
@@ -350,7 +342,7 @@
   version = "v1.2.1"
 
 [[projects]]
-  digest = "1:f2f6a616a1ca8aed667d956c98f7f6178efe72bbe0a419bd33b9d99841c7de69"
+  digest = "1:3dfd659219b6f63dc0677a62b8d4e8f10b5cf53900aef40858db10a19407e41d"
   name = "github.com/go-redis/redis"
   packages = [
     ".",
@@ -367,7 +359,7 @@
   version = "v6.12.0"
 
 [[projects]]
-  digest = "1:dc876ae7727280d95f97af5320308131278b93d6c6f5cf953065e18cb8c88fd2"
+  digest = "1:c07de423ca37dc2765396d6971599ab652a339538084b9b58c9f7fc533b28525"
   name = "github.com/go-sql-driver/mysql"
   packages = ["."]
   pruneopts = ""
@@ -375,7 +367,7 @@
   version = "v1.4.0"
 
 [[projects]]
-  digest = "1:b7a7e17513aeee6492d93015c7bf29c86a0c1c91210ea56b21e36c1a40958cba"
+  digest = "1:9ab1b1c637d7c8f49e39d8538a650d7eb2137b076790cff69d160823b505964c"
   name = "github.com/gobwas/glob"
   packages = [
     ".",
@@ -392,7 +384,7 @@
   version = "v0.2.3"
 
 [[projects]]
-  digest = "1:673df1d02ca0c6f51458fe94bbb6fae0b05e54084a31db2288f1c4321255c2da"
+  digest = "1:6e73003ecd35f4487a5e88270d3ca0a81bc80dc88053ac7e4dcfec5fba30d918"
   name = "github.com/gogo/protobuf"
   packages = ["proto"]
   pruneopts = ""
@@ -400,7 +392,7 @@
   version = "v1.1.1"
 
 [[projects]]
-  digest = "1:b1d3041d568e065ab4d76f7477844458e9209c0bb241eaccdc0770bf0a13b120"
+  digest = "1:f958a1c137db276e52f0b50efee41a1a389dcdded59a69711f3e872757dab34b"
   name = "github.com/golang/protobuf"
   packages = [
     "proto",
@@ -415,14 +407,14 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:075128b9fc42e6d99067da1a2e6c0a634a6043b5a60abe6909c51f5ecad37b6d"
+  digest = "1:2a5888946cdbc8aa360fd43301f9fc7869d663f60d5eedae7d4e6e5e4f06f2bf"
   name = "github.com/golang/snappy"
   packages = ["."]
   pruneopts = ""
   revision = "2e65f85255dbc3072edf28d6b5b8efc472979f5a"
 
 [[projects]]
-  digest = "1:cc082d7b9cc3f832f2aed9d06d1cbb33b6984a61d8ec403535b086415c181607"
+  digest = "1:f9f45f75f332e03fc7e9fe9188ea4e1ce4d14779ef34fa1b023da67518e36327"
   name = "github.com/google/go-cmp"
   packages = [
     "cmp",
@@ -459,7 +451,7 @@
   revision = "e80d13ce29ede4452c43dea11e79b9bc8a15b478"
 
 [[projects]]
-  digest = "1:db58383b43f583c44fb47c3331de943a11bb73ea951c2def55d29a454a57f4ee"
+  digest = "1:e7224669901bab4094e6d6697c136557b7177db6ceb01b7fc8b20d08f4b5aacd"
   name = "github.com/hashicorp/consul"
   packages = ["api"]
   pruneopts = ""
@@ -476,14 +468,14 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:cd5813053beac0114f96a7da3924fc8a15e0cd2b139f079e0fcce5d3244ae304"
+  digest = "1:ff65bf6fc4d1116f94ac305342725c21b55c16819c2606adc8f527755716937f"
   name = "github.com/hashicorp/go-rootcerts"
   packages = ["."]
   pruneopts = ""
   revision = "6bb64b370b90e7ef1fa532be9e591a81c3493e00"
 
 [[projects]]
-  digest = "1:d2b2cff454cb23a9769ef3c9075741f5985773a998584b3b3ce203fe4b1abbea"
+  digest = "1:f72168ea995f398bab88e84bd1ff58a983466ba162fb8d50d47420666cd57fad"
   name = "github.com/hashicorp/serf"
   packages = ["coordinate"]
   pruneopts = ""
@@ -491,7 +483,7 @@
   version = "v0.8.1"
 
 [[projects]]
-  digest = "1:cc0cf2e12280074e5c6dc0f15a4bb3d6c43509e6091cdcdcc83eea491577257b"
+  digest = "1:a39ef049cdeee03a57b132e7d60e32711b9d949c78458da78e702d9864c54369"
   name = "github.com/influxdata/go-syslog"
   packages = [
     "rfc5424",
@@ -503,7 +495,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:effc58ad45323ad15159bbca533be4870eaddb2d9a513d3488d8bfe822c83532"
+  digest = "1:bc3eb5ddfd59781ea1183f2b3d1eb105a1495d421f09b2ccd360c7fced0b612d"
   name = "github.com/influxdata/tail"
   packages = [
     ".",
@@ -517,7 +509,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:d31edcf33a3b36218de96e43f3fec18ea96deb2a28b838a3a01a4df856ded345"
+  digest = "1:7fb6cc9607eaa6ef309edebc42b57f704244bd4b9ab23bff128829c4ad09b95d"
   name = "github.com/influxdata/toml"
   packages = [
     ".",
@@ -535,7 +527,7 @@
   revision = "7c63b0a71ef8300adc255344d275e10e5c3a71ec"
 
 [[projects]]
-  digest = "1:4197871f269749786aa2406557dba15f10cf79161cdc3998180614c62c8b6351"
+  digest = "1:2de1791b9e43f26c696e36950e42676565e7da7499a870bc02213da4b59b1d14"
   name = "github.com/jackc/pgx"
   packages = [
     ".",
@@ -551,7 +543,7 @@
   version = "v3.1.0"
 
 [[projects]]
-  digest = "1:4f767a115bc8e08576f6d38ab73c376fc1b1cd3bb5041171c9e8668cc7739b52"
+  digest = "1:6f49eae0c1e5dab1dafafee34b207aeb7a42303105960944828c2079b92fc88e"
   name = "github.com/jmespath/go-jmespath"
   packages = ["."]
   pruneopts = ""
@@ -567,7 +559,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:2df59f23f11c5c59982f737c98c5523b276bfc85a4773a04b411190402bb30fd"
+  digest = "1:fed90fa725d3b1bac0a760de64426834dfef4546474cf182f2ec94285afa74a8"
   name = "github.com/kardianos/service"
   packages = ["."]
   pruneopts = ""
@@ -591,7 +583,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:28ca57775f285ae87cbdc7280aad91c5f2ed3c2af98d9f035d75956d1ca97fe6"
+  digest = "1:7e9956922e349af0190afa0b6621befcd201072679d8e51a9047ff149f2afe93"
   name = "github.com/mailru/easyjson"
   packages = [
     ".",
@@ -603,7 +595,7 @@
   revision = "efc7eb8984d6655c26b5c9d2e65c024e5767c37c"
 
 [[projects]]
-  digest = "1:49a8b01a6cd6558d504b65608214ca40a78000e1b343ed0da5c6a9ccd83d6d30"
+  digest = "1:63722a4b1e1717be7b98fc686e0b30d5e7f734b9e93d7dee86293b6deab7ea28"
   name = "github.com/matttproud/golang_protobuf_extensions"
   packages = ["pbutil"]
   pruneopts = ""
@@ -611,7 +603,7 @@
   version = "v1.0.1"
 
 [[projects]]
-  digest = "1:f0bad0fece0fb73c6ea249c18d8e80ffbe86be0457715b04463068f04686cf39"
+  digest = "1:4c8d8358c45ba11ab7bb15df749d4df8664ff1582daead28bae58cf8cbe49890"
   name = "github.com/miekg/dns"
   packages = ["."]
   pruneopts = ""
@@ -651,7 +643,7 @@
   version = "v0.1.0"
 
 [[projects]]
-  digest = "1:e5894541d6ceec5dd283e24e3530aadf59c06449695d19189a7a27bb4c15840d"
+  digest = "1:e5ec850ce66beb0014fc40d8e64b7482172eee71d86d734d66def5e9eac16797"
   name = "github.com/nats-io/gnatsd"
   packages = [
     "conf",
@@ -665,7 +657,7 @@
   version = "v1.2.0"
 
 [[projects]]
-  digest = "1:88f1bde4c172e27b05ed46adfbd0e79dc1663a6281e4b39fa3e39d71ead9621d"
+  digest = "1:665af347df4c5d1ae4c3eacd0754f5337a301f6a3f2444c9993b996605c8c02b"
   name = "github.com/nats-io/go-nats"
   packages = [
     ".",
@@ -685,7 +677,7 @@
   version = "v1.0.0"
 
 [[projects]]
-  digest = "1:501cce26a54c785458b0dd54a08ddd984d4ad0c198255430d5d37cd2efe23149"
+  digest = "1:7a69f6a3a33929f8b66aa39c93868ad1698f06417fe627ae067559beb94504bd"
   name = "github.com/nsqio/go-nsq"
   packages = ["."]
   pruneopts = ""
@@ -701,7 +693,7 @@
   version = "v1.0.0-rc1"
 
 [[projects]]
-  digest = "1:0d08f7224705b1df80beee92ffbdc63ab13fd6f6eb80bf287735f9bc7e8b83eb"
+  digest = "1:f26c8670b11e29a49c8e45f7ec7f2d5bac62e8fd4e3c0ae1662baa4a697f984a"
   name = "github.com/opencontainers/image-spec"
   packages = [
     "specs-go",
@@ -720,7 +712,7 @@
   revision = "a52f2342449246d5bcc273e65cbdcfa5f7d6c63c"
 
 [[projects]]
-  digest = "1:bba12aa4747b212f75db3e7fee73fe1b66d303cb3ff0c1984b7f2ad20e8bd2bc"
+  digest = "1:78fb99d6011c2ae6c72f3293a83951311147b12b06a5ffa43abf750c4fab6ac5"
   name = "github.com/opentracing/opentracing-go"
   packages = [
     ".",
@@ -732,7 +724,7 @@
   version = "v1.0.2"
 
 [[projects]]
-  digest = "1:c6c0db6294924072f98a0de090d200bae4b7102b12a443ba9569c4ba7df52aa1"
+  digest = "1:fea0e67285d900e5a0a7ec19ff4b4c82865a28dddbee8454c5360ad908f7069c"
   name = "github.com/openzipkin/zipkin-go-opentracing"
   packages = [
     ".",
@@ -747,7 +739,7 @@
   version = "v0.3.4"
 
 [[projects]]
-  digest = "1:41de12a4684237dd55a11260c941c2c58a055951985e9473ba1661175a13fea7"
+  digest = "1:29e34e58f26655c4d73135cdfc0517ea2ff1483eff34e5d5ef4b6fddbb81e31b"
   name = "github.com/pierrec/lz4"
   packages = [
     ".",
@@ -774,7 +766,7 @@
   version = "v1.0.0"
 
 [[projects]]
-  digest = "1:981835985f655d1d380cc6aa7d9fa9ad7abfaf40c75da200fd40d864cd05a7c3"
+  digest = "1:4142d94383572e74b42352273652c62afec5b23f325222ed09198f46009022d1"
   name = "github.com/prometheus/client_golang"
   packages = [
     "prometheus",
@@ -786,7 +778,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:562d53e436b244a9bb5c1ff43bcaf4882e007575d34ec37717b15751c65cc63a"
+  digest = "1:185cf55b1f44a1bf243558901c3f06efa5c64ba62cfdcbb1bf7bbe8c3fb68561"
   name = "github.com/prometheus/client_model"
   packages = ["go"]
   pruneopts = ""
@@ -794,7 +786,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:6a8420870eb2935977da1fff0f3afca9bdb3f1e66258c9e91a8a7ce0b5417c3b"
+  digest = "1:bfbc121ef802d245ef67421cff206615357d9202337a3d492b8f668906b485a8"
   name = "github.com/prometheus/common"
   packages = [
     "expfmt",
@@ -807,7 +799,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:00fca823dfcdd8107226f67215afd948b001525223ed955a05b33a4c885c9591"
+  digest = "1:b694a6bdecdace488f507cff872b30f6f490fdaf988abd74d87ea56406b23b6e"
   name = "github.com/prometheus/procfs"
   packages = [
     ".",
@@ -820,7 +812,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:1b65925989a4dfb6d98ef1d530cda33ab1ff25945b14a22a8b8bb27cc282af70"
+  digest = "1:15bcdc717654ef21128e8af3a63eec39a6d08a830e297f93d65163f87c8eb523"
   name = "github.com/rcrowley/go-metrics"
   packages = ["."]
   pruneopts = ""
@@ -828,7 +820,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:d8fe9f454582e04b5693b59cdebe3f0bd9dc29ad9651bfb1633cba4658b66c65"
+  digest = "1:7fc2f428767a2521abc63f1a663d981f61610524275d6c0ea645defadd4e916f"
   name = "github.com/samuel/go-zookeeper"
   packages = ["zk"]
   pruneopts = ""
@@ -843,7 +835,7 @@
   version = "v1.2.0"
 
 [[projects]]
-  digest = "1:987ce58e999676c2e209831390f2d56621ff98def2ecca4928e73fe1e2569954"
+  digest = "1:fce9909f20bc6a6363a6d589e478bdcf8111044b41566d37d7552bf92d955540"
   name = "github.com/shirou/gopsutil"
   packages = [
     "cpu",
@@ -868,7 +860,7 @@
   revision = "bb4de0191aa41b5507caa14b0650cdbddcd9280b"
 
 [[projects]]
-  digest = "1:f2cc92b78b2f3b76ab0f9daddddd28627bcfcc6cacf119029aa3850082d95079"
+  digest = "1:8cf46b6c18a91068d446e26b67512cf16f1540b45d90b28b9533706a127f0ca6"
   name = "github.com/sirupsen/logrus"
   packages = ["."]
   pruneopts = ""
@@ -877,7 +869,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:79e73b87cb07e380d1a3aaa14fbcc418e0d42eede5f971e7ee2f4a6e6d531deb"
+  digest = "1:4b0cabe65ca903a7b2a3e6272c5304eb788ce196d35ecb901c6563e5e7582443"
   name = "github.com/soniah/gosnmp"
   packages = ["."]
   pruneopts = ""
@@ -885,14 +877,14 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:0a1f8d01a0191f558910bcbfd7e1dc11a53ac374473d13b68b8fe520f21efb07"
+  digest = "1:4e8f1cae8e6d83af9000d82566efb8823907dae77ba4f1d76ff28fdd197c3c90"
   name = "github.com/streadway/amqp"
   packages = ["."]
   pruneopts = ""
   revision = "e5adc2ada8b8efff032bf61173a233d143e9318e"
 
 [[projects]]
-  digest = "1:34062a2274daa6ec4d2f50d6070cc51cf4674d6d553ed76b406cb3425b9528e8"
+  digest = "1:711eebe744c0151a9d09af2315f0bb729b2ec7637ef4c410fa90a18ef74b65b6"
   name = "github.com/stretchr/objx"
   packages = ["."]
   pruneopts = ""
@@ -900,7 +892,7 @@
   version = "v0.1.1"
 
 [[projects]]
-  digest = "1:bc2a12c8863e1080226b7bc69192efd6c37aaa9b85cec508b0a8f54fabb9bd9f"
+  digest = "1:c587772fb8ad29ad4db67575dad25ba17a51f072ff18a22b4f0257a4d9c24f75"
   name = "github.com/stretchr/testify"
   packages = [
     "assert",
@@ -928,7 +920,7 @@
   revision = "1731857f09b1f38450e2c12409748407822dc6be"
 
 [[projects]]
-  digest = "1:23e2b9f3a20cd4a6427147377255ec2f6237e8606fa6ef0707ed79b7bfbe3a83"
+  digest = "1:343f20460c11a0d0529fe532553bfef9446918d1a1fda6d8661eb27d5b1a68b8"
   name = "github.com/vjeantet/grok"
   packages = ["."]
   pruneopts = ""
@@ -937,7 +929,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:5383edd40c7f6c95a7dc46a47bf0c83de4bf40a4252f12fa803f790037addffc"
+  digest = "1:98ed05e9796df287b90c1d96854e3913c8e349dbc546412d3cabb472ecf4b417"
   name = "github.com/wvanbergen/kafka"
   packages = ["consumergroup"]
   pruneopts = ""
@@ -945,7 +937,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:f936b4936e1b092cc41c9b33fdc990ad78386545f1ffeca8427c72b2605bca85"
+  digest = "1:12aff3cc417907bf9f683a6bf1dc78ffb08e41bc69f829491e593ea9b951a3cf"
   name = "github.com/wvanbergen/kazoo-go"
   packages = ["."]
   pruneopts = ""
@@ -953,7 +945,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:9946d558a909f63e31332c77b82649522da97ae7f7cfbfebc6f53549ab6b3e0f"
+  digest = "1:c5918689b7e187382cc1066bf0260de54ba9d1b323105f46ed2551d2fb4a17c7"
   name = "github.com/yuin/gopher-lua"
   packages = [
     ".",
@@ -966,7 +958,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:84e9087a94f336c204887281046891769d2ed7bf1d2b31c21ff6fb5e1743abce"
+  digest = "1:2fcfc6c3fb8dfe0d80d7789272230d3ac7db15022b66817113f98d9fff880225"
   name = "github.com/zensqlmonitor/go-mssqldb"
   packages = ["."]
   pruneopts = ""
@@ -974,7 +966,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:21100b2e8b6922303dd109da81b3134ed0eff05cb3402881eabde9cce8f4e5e6"
+  digest = "1:0773b5c3be42874166670a20aa177872edb450cd9fc70b1df97303d977702a50"
   name = "golang.org/x/crypto"
   packages = [
     "bcrypt",
@@ -990,7 +982,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:58d8f8f3ad415b10d2145316519e5b7995b7cf9e663b33a1e9e0c2ddd96c1d58"
+  digest = "1:00ff990baae4665bb0a8174af5ff78228574227ed96c89671247a56852a50e21"
   name = "golang.org/x/net"
   packages = [
     "bpf",
@@ -1018,7 +1010,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:a8944db88149e7ecbea4b760c625b9ccf455fceae21387bc8890c3589d28b623"
+  digest = "1:677e38cad6833ad266ec843739d167755eda1e6f2d8af1c63102b0426ad820db"
   name = "golang.org/x/sys"
   packages = [
     "unix",
@@ -1033,7 +1025,7 @@
   revision = "ac767d655b305d4e9612f5f6e33120b9176c4ad4"
 
 [[projects]]
-  digest = "1:af9bfca4298ef7502c52b1459df274eed401a4f5498b900e9a92d28d3d87ac5a"
+  digest = "1:5acd3512b047305d49e8763eef7ba423901e85d5dd2fd1e71778a0ea8de10bd4"
   name = "golang.org/x/text"
   packages = [
     "collate",
@@ -1068,7 +1060,7 @@
   version = "v0.3.0"
 
 [[projects]]
-  digest = "1:eede11c81b63c8f6fd06ef24ba0a640dc077196ec9b7a58ecde03c82eee2f151"
+  digest = "1:c1771ca6060335f9768dff6558108bc5ef6c58506821ad43377ee23ff059e472"
   name = "google.golang.org/appengine"
   packages = ["cloudsql"]
   pruneopts = ""
@@ -1077,14 +1069,14 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:8d093c040b734e160cbe8291c7b539c36d2c6dd4581c4bb37cff56078c65bd07"
+  digest = "1:b1443b4e3cc990c84d27fcdece9d3302158c67dba870e33a6937a2c0076388c2"
   name = "google.golang.org/genproto"
   packages = ["googleapis/rpc/status"]
   pruneopts = ""
   revision = "fedd2861243fd1a8152376292b921b394c7bef7e"
 
 [[projects]]
-  digest = "1:05f2028524c4eada11e3f46d23139f23e9e0a40b2552207a5af278e8063ce782"
+  digest = "1:5f31b45ee9da7a87f140bef3ed0a7ca34ea2a6d38eb888123b8e28170e8aa4f2"
   name = "google.golang.org/grpc"
   packages = [
     ".",
@@ -1118,7 +1110,7 @@
   version = "v1.13.0"
 
 [[projects]]
-  digest = "1:2840683aa0e9980689f85bf48b2a56ec7a108fd089f12af8ea7d98c172819589"
+  digest = "1:15d017551627c8bb091bde628215b2861bed128855343fdd570c62d08871f6e1"
   name = "gopkg.in/alecthomas/kingpin.v2"
   packages = ["."]
   pruneopts = ""
@@ -1126,7 +1118,7 @@
   version = "v2.2.6"
 
 [[projects]]
-  digest = "1:a8f8c1725195c4324d4350fae001524ca7489e40d9b6bb47598772e3faa103ba"
+  digest = "1:3cad99e0d1f94b8c162787c12e59d0a0b9df1ef75590eb145cdd625479091efe"
   name = "gopkg.in/asn1-ber.v1"
   packages = ["."]
   pruneopts = ""
@@ -1142,7 +1134,7 @@
   version = "v2.0.0"
 
 [[projects]]
-  digest = "1:b2106f1668ea5efc1ecc480f7e922a093adb9563fd9ce58585292871f0d0f229"
+  digest = "1:eb53021a8aa3f599d29c7102e65026242bdedce998a54837dc67f14b6a97c5fd"
   name = "gopkg.in/fsnotify.v1"
   packages = ["."]
   pruneopts = ""
@@ -1151,7 +1143,7 @@
   version = "v1.4.7"
 
 [[projects]]
-  digest = "1:5fa5df18f3bd9cad28ed7f263b15da217945735110898fa2b9af25cdafb9cbf3"
+  digest = "1:960720207d3d0992995f4576e1366fd9e9b1483473b07fb7243144f75f5b1546"
   name = "gopkg.in/gorethink/gorethink.v3"
   packages = [
     ".",
@@ -1164,7 +1156,7 @@
   version = "v3.0.5"
 
 [[projects]]
-  digest = "1:74163d1887c0821951e6f1795a1d10338f45f09d9067cb4a8edcf7ee481724ee"
+  digest = "1:367baf06b7dbd0ef0bbdd785f6a79f929c96b0c18e9d3b29c0eed1ac3f5db133"
   name = "gopkg.in/ldap.v2"
   packages = ["."]
   pruneopts = ""
@@ -1173,7 +1165,7 @@
 
 [[projects]]
   branch = "v2"
-  digest = "1:f799e95918890212dcf4ce5951291061d318f689977ec9cea0417b08433c2a9d"
+  digest = "1:f54ba71a035aac92ced3e902d2bff3734a15d1891daff73ec0f90ef236750139"
   name = "gopkg.in/mgo.v2"
   packages = [
     ".",
@@ -1186,7 +1178,7 @@
   revision = "9856a29383ce1c59f308dd1cf0363a79b5bef6b5"
 
 [[projects]]
-  digest = "1:427414c304a47b497759094220ce42dd2e838ab7d52de197c633b800c6ff84b5"
+  digest = "1:b49c4d3115800eace659c9a6a5c384a922f5b210178b24a01abb10731f404ea2"
   name = "gopkg.in/olivere/elastic.v5"
   packages = [
     ".",
@@ -1216,6 +1208,97 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "726abf0a241126b415293c203dddc516e4d8be9b0f2913fb3ab2c4eb332e3ce2"
+  input-imports = [
+    "collectd.org/api",
+    "collectd.org/network",
+    "github.com/Microsoft/ApplicationInsights-Go/appinsights",
+    "github.com/Shopify/sarama",
+    "github.com/StackExchange/wmi",
+    "github.com/aerospike/aerospike-client-go",
+    "github.com/amir/raidman",
+    "github.com/apache/thrift/lib/go/thrift",
+    "github.com/aws/aws-sdk-go/aws",
+    "github.com/aws/aws-sdk-go/aws/client",
+    "github.com/aws/aws-sdk-go/aws/credentials",
+    "github.com/aws/aws-sdk-go/aws/credentials/stscreds",
+    "github.com/aws/aws-sdk-go/aws/session",
+    "github.com/aws/aws-sdk-go/service/cloudwatch",
+    "github.com/aws/aws-sdk-go/service/kinesis",
+    "github.com/aws/aws-sdk-go/service/sts",
+    "github.com/bsm/sarama-cluster",
+    "github.com/couchbase/go-couchbase",
+    "github.com/dgrijalva/jwt-go",
+    "github.com/docker/docker/api/types",
+    "github.com/docker/docker/api/types/container",
+    "github.com/docker/docker/api/types/filters",
+    "github.com/docker/docker/api/types/registry",
+    "github.com/docker/docker/api/types/swarm",
+    "github.com/docker/docker/client",
+    "github.com/eclipse/paho.mqtt.golang",
+    "github.com/go-redis/redis",
+    "github.com/go-sql-driver/mysql",
+    "github.com/gobwas/glob",
+    "github.com/golang/protobuf/proto",
+    "github.com/google/go-cmp/cmp",
+    "github.com/gorilla/mux",
+    "github.com/hashicorp/consul/api",
+    "github.com/influxdata/go-syslog/rfc5424",
+    "github.com/influxdata/go-syslog/rfc5425",
+    "github.com/influxdata/tail",
+    "github.com/influxdata/toml",
+    "github.com/influxdata/toml/ast",
+    "github.com/influxdata/wlog",
+    "github.com/jackc/pgx",
+    "github.com/jackc/pgx/pgtype",
+    "github.com/jackc/pgx/stdlib",
+    "github.com/kardianos/service",
+    "github.com/kballard/go-shellquote",
+    "github.com/matttproud/golang_protobuf_extensions/pbutil",
+    "github.com/miekg/dns",
+    "github.com/multiplay/go-ts3",
+    "github.com/nats-io/gnatsd/server",
+    "github.com/nats-io/go-nats",
+    "github.com/nsqio/go-nsq",
+    "github.com/openzipkin/zipkin-go-opentracing",
+    "github.com/openzipkin/zipkin-go-opentracing/thrift/gen-go/zipkincore",
+    "github.com/prometheus/client_golang/prometheus",
+    "github.com/prometheus/client_golang/prometheus/promhttp",
+    "github.com/prometheus/client_model/go",
+    "github.com/prometheus/common/expfmt",
+    "github.com/prometheus/common/log",
+    "github.com/satori/go.uuid",
+    "github.com/shirou/gopsutil/cpu",
+    "github.com/shirou/gopsutil/disk",
+    "github.com/shirou/gopsutil/host",
+    "github.com/shirou/gopsutil/load",
+    "github.com/shirou/gopsutil/mem",
+    "github.com/shirou/gopsutil/net",
+    "github.com/shirou/gopsutil/process",
+    "github.com/soniah/gosnmp",
+    "github.com/streadway/amqp",
+    "github.com/stretchr/testify/assert",
+    "github.com/stretchr/testify/mock",
+    "github.com/stretchr/testify/require",
+    "github.com/tidwall/gjson",
+    "github.com/vjeantet/grok",
+    "github.com/wvanbergen/kafka/consumergroup",
+    "github.com/zensqlmonitor/go-mssqldb",
+    "golang.org/x/net/context",
+    "golang.org/x/net/html/charset",
+    "golang.org/x/sys/unix",
+    "golang.org/x/sys/windows",
+    "golang.org/x/sys/windows/svc",
+    "golang.org/x/sys/windows/svc/mgr",
+    "google.golang.org/grpc",
+    "google.golang.org/grpc/codes",
+    "google.golang.org/grpc/credentials",
+    "google.golang.org/grpc/status",
+    "gopkg.in/gorethink/gorethink.v3",
+    "gopkg.in/ldap.v2",
+    "gopkg.in/mgo.v2",
+    "gopkg.in/mgo.v2/bson",
+    "gopkg.in/olivere/elastic.v5",
+    "gopkg.in/yaml.v2",
+  ]
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/README.md b/README.md
index 5f7cb31c..e0d88e41 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ Ansible role: https://github.com/rossmcdonald/telegraf
 Telegraf requires golang version 1.9 or newer, the Makefile requires GNU make.
 
 1. [Install Go](https://golang.org/doc/install) >=1.9
-2. [Install dep](https://golang.github.io/dep/docs/installation.html) ==v0.4.1
+2. [Install dep](https://golang.github.io/dep/docs/installation.html) ==v0.5.0
 3. Download Telegraf source:
    ```
    go get -d github.com/influxdata/telegraf
diff --git a/appveyor.yml b/appveyor.yml
index cd8938ff..a1af84d6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -21,8 +21,8 @@ install:
   - 7z x "C:\Cache\gnuwin32-dep.zip" -oC:\GnuWin32 -y
   - go get -d github.com/golang/dep
   - cd "%GOPATH%\src\github.com\golang\dep"
-  - git checkout -q v0.4.1
-  - go install -ldflags="-X main.version=v0.4.1" ./cmd/dep
+  - git checkout -q v0.5.0
+  - go install -ldflags="-X main.version=v0.5.0" ./cmd/dep
   - cd "%GOPATH%\src\github.com\influxdata\telegraf"
   - git config --system core.longpaths true
   - go version
diff --git a/scripts/ci-1.10.docker b/scripts/ci-1.10.docker
index 1cfe4c27..33075adf 100644
--- a/scripts/ci-1.10.docker
+++ b/scripts/ci-1.10.docker
@@ -24,5 +24,5 @@ RUN gem install fpm
 
 RUN go get -d github.com/golang/dep && \
     cd src/github.com/golang/dep && \
-    git checkout -q v0.4.1 && \
-    go install -ldflags="-X main.version=v0.4.1" ./cmd/dep
+    git checkout -q v0.5.0 && \
+    go install -ldflags="-X main.version=v0.5.0" ./cmd/dep
diff --git a/scripts/ci-1.9.docker b/scripts/ci-1.9.docker
index d1ac5f83..0a931c81 100644
--- a/scripts/ci-1.9.docker
+++ b/scripts/ci-1.9.docker
@@ -24,5 +24,5 @@ RUN gem install fpm
 
 RUN go get -d github.com/golang/dep && \
     cd src/github.com/golang/dep && \
-    git checkout -q v0.4.1 && \
-    go install -ldflags="-X main.version=v0.4.1" ./cmd/dep
+    git checkout -q v0.5.0 && \
+    go install -ldflags="-X main.version=v0.5.0" ./cmd/dep

From 2395413cc8ec93f2d6368d636e7d46fcf3ea6f2d Mon Sep 17 00:00:00 2001
From: Greg Linton <g2linton@gmail.com>
Date: Tue, 14 Aug 2018 15:56:48 -0600
Subject: [PATCH 691/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 520a4fb4..38ddd3d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -64,6 +64,7 @@
 - [#4537](https://github.com/influxdata/telegraf/pull/4537): Add message 'max_bytes' configuration to kafka input.
 - [#4546](https://github.com/influxdata/telegraf/pull/4546): Add gopsutil meminfo fields to mem plugin.
 - [#4285](https://github.com/influxdata/telegraf/pull/4285): Document how to parse telegraf logs.
+- [#4542](https://github.com/influxdata/telegraf/pull/4542): Use dep v0.5.0.
 
 ## v1.7.4 [unreleased]
 

From 61513c64b85b2cb325a49b930f5ae6ff44af4091 Mon Sep 17 00:00:00 2001
From: Mauro Murari <mauroamurari@gmail.com>
Date: Mon, 13 Aug 2018 20:40:18 -0300
Subject: [PATCH 692/835] Add message 'max_bytes' configuration (#4537)

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

diff --git a/plugins/outputs/kafka/kafka.go b/plugins/outputs/kafka/kafka.go
index 5fdb8d85..dc8d846d 100644
--- a/plugins/outputs/kafka/kafka.go
+++ b/plugins/outputs/kafka/kafka.go
@@ -37,6 +37,8 @@ type (
 		RequiredAcks int
 		// MaxRetry Tag
 		MaxRetry int
+		// Max Message Bytes
+		MaxMessageBytes int
 
 		Version string `toml:"version"`
 
@@ -140,6 +142,9 @@ var sampleConfig = `
   ## until the next flush.
   # max_retry = 3
 
+  ## Max message bytes, should be lower than server message.max.bytes config
+  # MaxMessageBytes = 0
+
   ## Optional TLS Config
   # tls_ca = "/etc/telegraf/ca.pem"
   # tls_cert = "/etc/telegraf/cert.pem"
@@ -218,6 +223,10 @@ func (k *Kafka) Connect() error {
 	config.Producer.Retry.Max = k.MaxRetry
 	config.Producer.Return.Successes = true
 
+	if k.MaxMessageBytes > 0 {
+		config.Producer.MaxMessageBytes = k.MaxMessageBytes
+	}
+
 	// Legacy support ssl config
 	if k.Certificate != "" {
 		k.TLSCert = k.Certificate

From 34614582a7820ed59e05b64a7aef7cdfe9eb5e79 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 15 Aug 2018 14:12:22 -0700
Subject: [PATCH 693/835] Use snake case in kafka output config

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

diff --git a/plugins/outputs/kafka/kafka.go b/plugins/outputs/kafka/kafka.go
index dc8d846d..0bb5ca4a 100644
--- a/plugins/outputs/kafka/kafka.go
+++ b/plugins/outputs/kafka/kafka.go
@@ -38,7 +38,7 @@ type (
 		// MaxRetry Tag
 		MaxRetry int
 		// Max Message Bytes
-		MaxMessageBytes int
+		MaxMessageBytes int `toml:"max_message_bytes"`
 
 		Version string `toml:"version"`
 
@@ -142,8 +142,9 @@ var sampleConfig = `
   ## until the next flush.
   # max_retry = 3
 
-  ## Max message bytes, should be lower than server message.max.bytes config
-  # MaxMessageBytes = 0
+  ## The maximum permitted size of a message. Should be set equal to or
+  ## smaller than the broker's 'message.max.bytes'.
+  # max_message_bytes = 1000000
 
   ## Optional TLS Config
   # tls_ca = "/etc/telegraf/ca.pem"

From 9e0eb0c0e0cdd2a45a7629b494b914a59bf51b82 Mon Sep 17 00:00:00 2001
From: maxunt <max.untrecht@gmail.com>
Date: Fri, 17 Aug 2018 13:45:22 -0700
Subject: [PATCH 694/835] Add ability to set measurement from matched text in
 grok parser (#4433)

---
 docs/DATA_FORMATS_INPUT.md                    | 119 +++++++++---------
 plugins/inputs/file/README.md                 |   2 +-
 plugins/inputs/file/dev/docker-compose.yml    |   2 +-
 plugins/inputs/file/dev/json_a.log            |  14 ---
 .../file/{ => dev}/testfiles/grok_a.log       |   0
 .../file/{ => dev}/testfiles/json_a.log       |   0
 plugins/inputs/file/file.go                   |   9 +-
 plugins/inputs/file/file_test.go              |  12 +-
 plugins/parsers/grok/parser.go                |   6 +-
 plugins/parsers/grok/parser_test.go           |  50 ++++++++
 10 files changed, 126 insertions(+), 88 deletions(-)
 delete mode 100644 plugins/inputs/file/dev/json_a.log
 rename plugins/inputs/file/{ => dev}/testfiles/grok_a.log (100%)
 rename plugins/inputs/file/{ => dev}/testfiles/json_a.log (100%)

diff --git a/docs/DATA_FORMATS_INPUT.md b/docs/DATA_FORMATS_INPUT.md
index 75352384..ded0170e 100644
--- a/docs/DATA_FORMATS_INPUT.md
+++ b/docs/DATA_FORMATS_INPUT.md
@@ -670,6 +670,66 @@ 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 grok parser uses a slightly modified version of logstash "grok"
+patterns, with the format:
+
+```
+%{<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.
+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
+  - float
+  - duration (ie, 5.23ms gets converted to int nanoseconds)
+  - tag      (converts the field into a tag)
+  - drop     (drops the field completely)
+  - measurement (use the matched text as the measurement name)
+- Timestamp modifiers:
+  - ts               (This will auto-learn the timestamp format)
+  - ts-ansic         ("Mon Jan _2 15:04:05 2006")
+  - ts-unix          ("Mon Jan _2 15:04:05 MST 2006")
+  - ts-ruby          ("Mon Jan 02 15:04:05 -0700 2006")
+  - ts-rfc822        ("02 Jan 06 15:04 MST")
+  - ts-rfc822z       ("02 Jan 06 15:04 -0700")
+  - ts-rfc850        ("Monday, 02-Jan-06 15:04:05 MST")
+  - ts-rfc1123       ("Mon, 02 Jan 2006 15:04:05 MST")
+  - ts-rfc1123z      ("Mon, 02 Jan 2006 15:04:05 -0700")
+  - 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, 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
+"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),
+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!
+
 #### Grok Configuration:
 ```toml
 [[inputs.file]]
@@ -714,65 +774,6 @@ which are available here:
   grok_timezone = "Canada/Eastern"
 ```
 
-The grok parser uses a slightly modified version of logstash "grok"
-patterns, with the format:
-
-```
-%{<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.
-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
-  - float
-  - duration (ie, 5.23ms gets converted to int nanoseconds)
-  - tag      (converts the field into a tag)
-  - drop     (drops the field completely)
-- Timestamp modifiers:
-  - ts               (This will auto-learn the timestamp format)
-  - ts-ansic         ("Mon Jan _2 15:04:05 2006")
-  - ts-unix          ("Mon Jan _2 15:04:05 MST 2006")
-  - ts-ruby          ("Mon Jan 02 15:04:05 -0700 2006")
-  - ts-rfc822        ("02 Jan 06 15:04 MST")
-  - ts-rfc822z       ("02 Jan 06 15:04 -0700")
-  - ts-rfc850        ("Monday, 02-Jan-06 15:04:05 MST")
-  - ts-rfc1123       ("Mon, 02 Jan 2006 15:04:05 MST")
-  - ts-rfc1123z      ("Mon, 02 Jan 2006 15:04:05 -0700")
-  - 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, 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
-"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),
-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!
-
 #### Timestamp Examples
 
 This example input and config parses a file using a custom timestamp conversion:
diff --git a/plugins/inputs/file/README.md b/plugins/inputs/file/README.md
index 73a3a236..4358b67a 100644
--- a/plugins/inputs/file/README.md
+++ b/plugins/inputs/file/README.md
@@ -14,7 +14,7 @@ use the [tail input plugin](/plugins/inputs/tail) instead.
   ## ** 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
+  ##   /var/log/apache.log -> only read the apache log file
   files = ["/var/log/apache/access.log"]
 
   ## Data format to consume.
diff --git a/plugins/inputs/file/dev/docker-compose.yml b/plugins/inputs/file/dev/docker-compose.yml
index 3c16fca9..efce389f 100644
--- a/plugins/inputs/file/dev/docker-compose.yml
+++ b/plugins/inputs/file/dev/docker-compose.yml
@@ -6,7 +6,7 @@ services:
       volumes:
         - ./telegraf.conf:/telegraf.conf
         - ../../../../telegraf:/telegraf
-        - ./json_a.log:/var/log/test.log
+        - ./dev/json_a.log:/var/log/test.log
       entrypoint:
         - /telegraf
         - --config
diff --git a/plugins/inputs/file/dev/json_a.log b/plugins/inputs/file/dev/json_a.log
deleted file mode 100644
index 0f52e9d1..00000000
--- a/plugins/inputs/file/dev/json_a.log
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-"parent": {
-	"child": 3.0,
-	"ignored_child": "hi"
-},
-"ignored_null": null,
-"integer": 4,
-"list": [3, 4],
-"ignored_parent": {
-	"another_ignored_null": null,
-	"ignored_string": "hello, world!"
-},
-"another_list": [4]
-}
diff --git a/plugins/inputs/file/testfiles/grok_a.log b/plugins/inputs/file/dev/testfiles/grok_a.log
similarity index 100%
rename from plugins/inputs/file/testfiles/grok_a.log
rename to plugins/inputs/file/dev/testfiles/grok_a.log
diff --git a/plugins/inputs/file/testfiles/json_a.log b/plugins/inputs/file/dev/testfiles/json_a.log
similarity index 100%
rename from plugins/inputs/file/testfiles/json_a.log
rename to plugins/inputs/file/dev/testfiles/json_a.log
diff --git a/plugins/inputs/file/file.go b/plugins/inputs/file/file.go
index 2779561f..d6714301 100644
--- a/plugins/inputs/file/file.go
+++ b/plugins/inputs/file/file.go
@@ -11,9 +11,8 @@ import (
 )
 
 type File struct {
-	Files         []string `toml:"files"`
-	FromBeginning bool
-	parser        parsers.Parser
+	Files  []string `toml:"files"`
+	parser parsers.Parser
 
 	filenames []string
 }
@@ -24,7 +23,7 @@ const sampleConfig = `
   ## ** 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
+  ##   /var/log/apache.log -> only read the apache log file
   files = ["/var/log/apache/access.log"]
 
   ## The dataformat to be read from files
@@ -40,7 +39,7 @@ func (f *File) SampleConfig() string {
 }
 
 func (f *File) Description() string {
-	return "reload and gather from file[s] on telegraf's interval"
+	return "Reload and gather from file[s] on telegraf's interval."
 }
 
 func (f *File) Gather(acc telegraf.Accumulator) error {
diff --git a/plugins/inputs/file/file_test.go b/plugins/inputs/file/file_test.go
index 28105664..43322c2e 100644
--- a/plugins/inputs/file/file_test.go
+++ b/plugins/inputs/file/file_test.go
@@ -14,26 +14,26 @@ import (
 func TestRefreshFilePaths(t *testing.T) {
 	wd, err := os.Getwd()
 	r := File{
-		Files: []string{filepath.Join(wd, "testfiles/**.log")},
+		Files: []string{filepath.Join(wd, "dev/testfiles/**.log")},
 	}
 
 	err = r.refreshFilePaths()
 	require.NoError(t, err)
-	assert.Equal(t, len(r.filenames), 2)
+	assert.Equal(t, 2, len(r.filenames))
 }
 func TestJSONParserCompile(t *testing.T) {
 	var acc testutil.Accumulator
 	wd, _ := os.Getwd()
 	r := File{
-		Files: []string{filepath.Join(wd, "testfiles/json_a.log")},
+		Files: []string{filepath.Join(wd, "dev/testfiles/json_a.log")},
 	}
 	parserConfig := parsers.Config{
 		DataFormat: "json",
 		TagKeys:    []string{"parent_ignored_child"},
 	}
 	nParser, err := parsers.NewParser(&parserConfig)
-	r.parser = nParser
 	assert.NoError(t, err)
+	r.parser = nParser
 
 	r.Gather(&acc)
 	assert.Equal(t, map[string]string{"parent_ignored_child": "hi"}, acc.Metrics[0].Tags)
@@ -44,7 +44,7 @@ func TestGrokParser(t *testing.T) {
 	wd, _ := os.Getwd()
 	var acc testutil.Accumulator
 	r := File{
-		Files: []string{filepath.Join(wd, "testfiles/grok_a.log")},
+		Files: []string{filepath.Join(wd, "dev/testfiles/grok_a.log")},
 	}
 
 	parserConfig := parsers.Config{
@@ -57,5 +57,5 @@ func TestGrokParser(t *testing.T) {
 	assert.NoError(t, err)
 
 	err = r.Gather(&acc)
-	assert.Equal(t, 2, len(acc.Metrics))
+	assert.Equal(t, len(acc.Metrics), 2)
 }
diff --git a/plugins/parsers/grok/parser.go b/plugins/parsers/grok/parser.go
index 096cb8ed..bc65588e 100644
--- a/plugins/parsers/grok/parser.go
+++ b/plugins/parsers/grok/parser.go
@@ -38,6 +38,7 @@ var timeLayouts = map[string]string{
 }
 
 const (
+	MEASUREMENT       = "measurement"
 	INT               = "int"
 	TAG               = "tag"
 	FLOAT             = "float"
@@ -217,7 +218,6 @@ func (p *Parser) ParseLine(line string) (telegraf.Metric, error) {
 		if k == "" || v == "" {
 			continue
 		}
-
 		// t is the modifier of the field
 		var t string
 		// check if pattern has some modifiers
@@ -239,6 +239,8 @@ func (p *Parser) ParseLine(line string) (telegraf.Metric, error) {
 		}
 
 		switch t {
+		case MEASUREMENT:
+			p.Measurement = v
 		case INT:
 			iv, err := strconv.ParseInt(v, 10, 64)
 			if err != nil {
@@ -350,7 +352,7 @@ 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 nil, fmt.Errorf("grok: must have one or more fields")
 	}
 
 	return metric.New(p.Measurement, tags, fields, p.tsModder.tsMod(timestamp))
diff --git a/plugins/parsers/grok/parser_test.go b/plugins/parsers/grok/parser_test.go
index 09f8fa16..8133d302 100644
--- a/plugins/parsers/grok/parser_test.go
+++ b/plugins/parsers/grok/parser_test.go
@@ -1,6 +1,7 @@
 package grok
 
 import (
+	"log"
 	"testing"
 	"time"
 
@@ -959,3 +960,52 @@ func TestReplaceTimestampComma(t *testing.T) {
 	//Convert Nanosecond to milisecond for compare
 	require.Equal(t, 555, m.Time().Nanosecond()/1000000)
 }
+
+func TestDynamicMeasurementModifier(t *testing.T) {
+	p := &Parser{
+		Patterns:       []string{"%{TEST}"},
+		CustomPatterns: "TEST %{NUMBER:var1:tag} %{NUMBER:var2:float} %{WORD:test:measurement}",
+	}
+
+	require.NoError(t, p.Compile())
+	m, err := p.ParseLine("4 5 hello")
+	require.NoError(t, err)
+	require.Equal(t, m.Name(), "hello")
+}
+
+func TestStaticMeasurementModifier(t *testing.T) {
+	p := &Parser{
+		Patterns: []string{"%{WORD:hi:measurement} %{NUMBER:num:string}"},
+	}
+
+	require.NoError(t, p.Compile())
+	m, err := p.ParseLine("test_name 42")
+	log.Printf("%v", m)
+	require.NoError(t, err)
+	require.Equal(t, "test_name", m.Name())
+}
+
+// tests that the top level measurement name is used
+func TestTwoMeasurementModifier(t *testing.T) {
+	p := &Parser{
+		Patterns:       []string{"%{TEST:test_name:measurement}"},
+		CustomPatterns: "TEST %{NUMBER:var1:tag} %{NUMBER:var2:measurement} %{WORD:var3:measurement}",
+	}
+
+	require.NoError(t, p.Compile())
+	m, err := p.ParseLine("4 5 hello")
+	require.NoError(t, err)
+	require.Equal(t, m.Name(), "4 5 hello")
+}
+
+func TestMeasurementModifierNoName(t *testing.T) {
+	p := &Parser{
+		Patterns:       []string{"%{TEST}"},
+		CustomPatterns: "TEST %{NUMBER:var1:tag} %{NUMBER:var2:float} %{WORD:hi:measurement}",
+	}
+
+	require.NoError(t, p.Compile())
+	m, err := p.ParseLine("4 5 hello")
+	require.NoError(t, err)
+	require.Equal(t, m.Name(), "hello")
+}

From 1fafa616d74231517577defdeb61ecc4e3eb76f0 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 17 Aug 2018 13:46:35 -0700
Subject: [PATCH 695/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 38ddd3d9..f86fd031 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -65,6 +65,7 @@
 - [#4546](https://github.com/influxdata/telegraf/pull/4546): Add gopsutil meminfo fields to mem plugin.
 - [#4285](https://github.com/influxdata/telegraf/pull/4285): Document how to parse telegraf logs.
 - [#4542](https://github.com/influxdata/telegraf/pull/4542): Use dep v0.5.0.
+- [#4433](https://github.com/influxdata/telegraf/pull/4433): Add ability to set measurement from matched text in grok parser.
 
 ## v1.7.4 [unreleased]
 

From 886d8cc84030451e054d0b6f74cc7a3354d257a3 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Fri, 17 Aug 2018 13:51:21 -0700
Subject: [PATCH 696/835] Drop message batches in kafka output if too large
 (#4565)

---
 internal/models/running_output.go              |  1 +
 plugins/inputs/kafka_consumer/README.md        |  2 +-
 .../inputs/kafka_consumer/kafka_consumer.go    | 18 +++++++++++++++++-
 plugins/outputs/kafka/README.md                |  1 +
 plugins/outputs/kafka/kafka.go                 |  8 +++++++-
 5 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/internal/models/running_output.go b/internal/models/running_output.go
index a0d1f6b0..25576d74 100644
--- a/internal/models/running_output.go
+++ b/internal/models/running_output.go
@@ -120,6 +120,7 @@ func (ro *RunningOutput) AddMetric(m telegraf.Metric) {
 		err := ro.write(batch)
 		if err != nil {
 			ro.failMetrics.Add(batch...)
+			log.Printf("E! Error writing to output [%s]: %v", ro.Name, err)
 		}
 	}
 }
diff --git a/plugins/inputs/kafka_consumer/README.md b/plugins/inputs/kafka_consumer/README.md
index 24a0efc0..b6fc8fc8 100644
--- a/plugins/inputs/kafka_consumer/README.md
+++ b/plugins/inputs/kafka_consumer/README.md
@@ -44,7 +44,7 @@ and use the old zookeeper connection method.
 
   ## Maximum length of a message to consume, in bytes (default 0/unlimited);
   ## larger messages are dropped
-  max_message_len = 65536
+  max_message_len = 1000000
 ```
 
 ## Testing
diff --git a/plugins/inputs/kafka_consumer/kafka_consumer.go b/plugins/inputs/kafka_consumer/kafka_consumer.go
index d3791b22..eba9b68a 100644
--- a/plugins/inputs/kafka_consumer/kafka_consumer.go
+++ b/plugins/inputs/kafka_consumer/kafka_consumer.go
@@ -21,6 +21,7 @@ type Kafka struct {
 	Topics        []string
 	Brokers       []string
 	MaxMessageLen int
+	Version       string `toml:"version"`
 
 	Cluster *cluster.Consumer
 
@@ -64,6 +65,12 @@ var sampleConfig = `
   ## Optional Client id
   # client_id = "Telegraf"
 
+  ## Set the minimal supported Kafka version.  Setting this enables the use of new
+  ## Kafka features and APIs.  Of particular interest, lz4 compression
+  ## requires at least version 0.10.0.0.
+  ##   ex: version = "1.1.0"
+  # version = ""
+
   ## Optional TLS Config
   # tls_ca = "/etc/telegraf/ca.pem"
   # tls_cert = "/etc/telegraf/cert.pem"
@@ -88,7 +95,7 @@ var sampleConfig = `
 
   ## Maximum length of a message to consume, in bytes (default 0/unlimited);
   ## larger messages are dropped
-  max_message_len = 65536
+  max_message_len = 1000000
 `
 
 func (k *Kafka) SampleConfig() string {
@@ -111,6 +118,15 @@ func (k *Kafka) Start(acc telegraf.Accumulator) error {
 	k.acc = acc
 
 	config := cluster.NewConfig()
+
+	if k.Version != "" {
+		version, err := sarama.ParseKafkaVersion(k.Version)
+		if err != nil {
+			return err
+		}
+		config.Version = version
+	}
+
 	config.Consumer.Return.Errors = true
 
 	tlsConfig, err := k.ClientConfig.TLSConfig()
diff --git a/plugins/outputs/kafka/README.md b/plugins/outputs/kafka/README.md
index bb410a1d..5f4758ba 100644
--- a/plugins/outputs/kafka/README.md
+++ b/plugins/outputs/kafka/README.md
@@ -55,6 +55,7 @@ This plugin writes to a [Kafka Broker](http://kafka.apache.org/07/quickstart.htm
   ##  0 : No compression
   ##  1 : Gzip compression
   ##  2 : Snappy compression
+  ##  3 : LZ4 compression
   # compression_codec = 0
 
   ##  RequiredAcks is used in Produce Requests to tell the broker how many
diff --git a/plugins/outputs/kafka/kafka.go b/plugins/outputs/kafka/kafka.go
index 0bb5ca4a..b9ae3539 100644
--- a/plugins/outputs/kafka/kafka.go
+++ b/plugins/outputs/kafka/kafka.go
@@ -3,6 +3,7 @@ package kafka
 import (
 	"crypto/tls"
 	"fmt"
+	"log"
 	"strings"
 
 	"github.com/influxdata/telegraf"
@@ -79,7 +80,7 @@ var sampleConfig = `
   # client_id = "Telegraf"
 
   ## Set the minimal supported Kafka version.  Setting this enables the use of new
-  ## Kafka features and APIs.  Of particular interested, lz4 compression
+  ## Kafka features and APIs.  Of particular interest, lz4 compression
   ## requires at least version 0.10.0.0.
   ##   ex: version = "1.1.0"
   # version = ""
@@ -120,6 +121,7 @@ var sampleConfig = `
   ##  0 : No compression
   ##  1 : Gzip compression
   ##  2 : Snappy compression
+  ##  3 : LZ4 compression
   # compression_codec = 0
 
   ##  RequiredAcks is used in Produce Requests to tell the broker how many
@@ -294,6 +296,10 @@ func (k *Kafka) Write(metrics []telegraf.Metric) error {
 		// We could have many errors, return only the first encountered.
 		if errs, ok := err.(sarama.ProducerErrors); ok {
 			for _, prodErr := range errs {
+				if prodErr.Err == sarama.ErrMessageSizeTooLarge {
+					log.Printf("E! Error writing to output [kafka]: Message too large, consider increasing `max_message_bytes`; dropping batch")
+					return nil
+				}
 				return prodErr
 			}
 		}

From 036981c3b53aaa2caca3a5b16f8b8174531ad879 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 17 Aug 2018 13:52:10 -0700
Subject: [PATCH 697/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f86fd031..a4d680f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -66,6 +66,8 @@
 - [#4285](https://github.com/influxdata/telegraf/pull/4285): Document how to parse telegraf logs.
 - [#4542](https://github.com/influxdata/telegraf/pull/4542): Use dep v0.5.0.
 - [#4433](https://github.com/influxdata/telegraf/pull/4433): Add ability to set measurement from matched text in grok parser.
+- [#4565](https://github.com/influxdata/telegraf/pull/4465): Drop message batches in kafka output if too large.
+
 
 ## v1.7.4 [unreleased]
 

From edb6e1f655b9d72517dfa76ee76d6e6ab1e1db78 Mon Sep 17 00:00:00 2001
From: estk <esims89@gmail.com>
Date: Mon, 20 Aug 2018 14:47:48 -0600
Subject: [PATCH 698/835] Implement a lock based ring buffer for
 internal/buffer. (#3377)

---
 internal/buffer/buffer.go      |  98 ++++++++++++++++++++++++-------
 internal/buffer/buffer_test.go | 103 +++++++++++++++++++++++++++++++++
 2 files changed, 179 insertions(+), 22 deletions(-)

diff --git a/internal/buffer/buffer.go b/internal/buffer/buffer.go
index 04835e04..6a460ecc 100644
--- a/internal/buffer/buffer.go
+++ b/internal/buffer/buffer.go
@@ -14,9 +14,12 @@ var (
 
 // Buffer is an object for storing metrics in a circular buffer.
 type Buffer struct {
-	buf chan telegraf.Metric
-
-	mu sync.Mutex
+	sync.Mutex
+	buf   []telegraf.Metric
+	first int
+	last  int
+	size  int
+	empty bool
 }
 
 // NewBuffer returns a Buffer
@@ -24,47 +27,98 @@ type Buffer struct {
 //   called when the buffer is full, then the oldest metric(s) will be dropped.
 func NewBuffer(size int) *Buffer {
 	return &Buffer{
-		buf: make(chan telegraf.Metric, size),
+		buf:   make([]telegraf.Metric, size),
+		first: 0,
+		last:  0,
+		size:  size,
+		empty: true,
 	}
 }
 
 // IsEmpty returns true if Buffer is empty.
 func (b *Buffer) IsEmpty() bool {
-	return len(b.buf) == 0
+	return b.empty
 }
 
 // Len returns the current length of the buffer.
 func (b *Buffer) Len() int {
-	return len(b.buf)
+	if b.empty {
+		return 0
+	} else if b.first <= b.last {
+		return b.last - b.first + 1
+	}
+	// Spans the end of array.
+	// size - gap in the middle
+	return b.size - (b.first - b.last - 1) // size - gap
+}
+
+func (b *Buffer) push(m telegraf.Metric) {
+	// Empty
+	if b.empty {
+		b.last = b.first // Reset
+		b.buf[b.last] = m
+		b.empty = false
+		return
+	}
+
+	b.last++
+	b.last %= b.size
+
+	// Full
+	if b.first == b.last {
+		MetricsDropped.Incr(1)
+		b.first = (b.first + 1) % b.size
+	}
+	b.buf[b.last] = m
 }
 
 // Add adds metrics to the buffer.
 func (b *Buffer) Add(metrics ...telegraf.Metric) {
-	b.mu.Lock()
-	for i, _ := range metrics {
+	b.Lock()
+	defer b.Unlock()
+	for i := range metrics {
 		MetricsWritten.Incr(1)
-		select {
-		case b.buf <- metrics[i]:
-		default:
-			MetricsDropped.Incr(1)
-			<-b.buf
-			b.buf <- metrics[i]
-		}
+		b.push(metrics[i])
 	}
-	b.mu.Unlock()
 }
 
 // Batch returns a batch of metrics of size batchSize.
 // the batch will be of maximum length batchSize. It can be less than batchSize,
 // if the length of Buffer is less than batchSize.
 func (b *Buffer) Batch(batchSize int) []telegraf.Metric {
-	b.mu.Lock()
-	n := min(len(b.buf), batchSize)
-	out := make([]telegraf.Metric, n)
-	for i := 0; i < n; i++ {
-		out[i] = <-b.buf
+	b.Lock()
+	defer b.Unlock()
+	outLen := min(b.Len(), batchSize)
+	out := make([]telegraf.Metric, outLen)
+	if outLen == 0 {
+		return out
+	}
+
+	// We copy everything right of first up to last, count or end
+	// b.last >= rightInd || b.last < b.first
+	// therefore wont copy past b.last
+	rightInd := min(b.size, b.first+outLen) - 1
+
+	copyCount := copy(out, b.buf[b.first:rightInd+1])
+
+	// We've emptied the ring
+	if rightInd == b.last {
+		b.empty = true
+	}
+	b.first = rightInd + 1
+	b.first %= b.size
+
+	// We circle back for the rest
+	if copyCount < outLen {
+		right := min(b.last, outLen-copyCount)
+		copy(out[copyCount:], b.buf[b.first:right+1])
+		// We've emptied the ring
+		if right == b.last {
+			b.empty = true
+		}
+		b.first = right + 1
+		b.first %= b.size
 	}
-	b.mu.Unlock()
 	return out
 }
 
diff --git a/internal/buffer/buffer_test.go b/internal/buffer/buffer_test.go
index f84d8c66..b3f666fd 100644
--- a/internal/buffer/buffer_test.go
+++ b/internal/buffer/buffer_test.go
@@ -1,6 +1,8 @@
 package buffer
 
 import (
+	"sync"
+	"sync/atomic"
 	"testing"
 
 	"github.com/influxdata/telegraf"
@@ -17,6 +19,107 @@ var metricList = []telegraf.Metric{
 	testutil.TestMetric(8, "mymetric5"),
 }
 
+func makeBench5(b *testing.B, freq, batchSize int) {
+	const k = 1000
+	var wg sync.WaitGroup
+	buf := NewBuffer(10000)
+	m := testutil.TestMetric(1, "mymetric")
+
+	for i := 0; i < b.N; i++ {
+		buf.Add(m, m, m, m, m)
+		if i%(freq*k) == 0 {
+			wg.Add(1)
+			go func() {
+				buf.Batch(batchSize * k)
+				wg.Done()
+			}()
+		}
+	}
+	// Flush
+	buf.Batch(b.N)
+	wg.Wait()
+
+}
+func makeBenchStrict(b *testing.B, freq, batchSize int) {
+	const k = 1000
+	var count uint64
+	var wg sync.WaitGroup
+	buf := NewBuffer(10000)
+	m := testutil.TestMetric(1, "mymetric")
+
+	for i := 0; i < b.N; i++ {
+		buf.Add(m)
+		if i%(freq*k) == 0 {
+			wg.Add(1)
+			go func() {
+				defer wg.Done()
+				l := len(buf.Batch(batchSize * k))
+				atomic.AddUint64(&count, uint64(l))
+			}()
+		}
+	}
+	// Flush
+	wg.Add(1)
+	go func() {
+		l := len(buf.Batch(b.N))
+		atomic.AddUint64(&count, uint64(l))
+		wg.Done()
+	}()
+
+	wg.Wait()
+	if count != uint64(b.N) {
+		b.Errorf("not all metrics came out. %d of %d", count, b.N)
+	}
+}
+func makeBench(b *testing.B, freq, batchSize int) {
+	const k = 1000
+	var wg sync.WaitGroup
+	buf := NewBuffer(10000)
+	m := testutil.TestMetric(1, "mymetric")
+
+	for i := 0; i < b.N; i++ {
+		buf.Add(m)
+		if i%(freq*k) == 0 {
+			wg.Add(1)
+			go func() {
+				buf.Batch(batchSize * k)
+				wg.Done()
+			}()
+		}
+	}
+	wg.Wait()
+	// Flush
+	buf.Batch(b.N)
+}
+
+func BenchmarkBufferBatch5Add(b *testing.B) {
+	makeBench5(b, 100, 101)
+}
+func BenchmarkBufferBigInfrequentBatchCatchup(b *testing.B) {
+	makeBench(b, 100, 101)
+}
+func BenchmarkBufferOftenBatch(b *testing.B) {
+	makeBench(b, 1, 1)
+}
+func BenchmarkBufferAlmostBatch(b *testing.B) {
+	makeBench(b, 10, 9)
+}
+func BenchmarkBufferSlowBatch(b *testing.B) {
+	makeBench(b, 10, 1)
+}
+func BenchmarkBufferBatchNoDrop(b *testing.B) {
+	makeBenchStrict(b, 1, 4)
+}
+func BenchmarkBufferCatchup(b *testing.B) {
+	buf := NewBuffer(10000)
+	m := testutil.TestMetric(1, "mymetric")
+
+	for i := 0; i < b.N; i++ {
+		buf.Add(m)
+	}
+	buf.Batch(b.N)
+}
+
 func BenchmarkAddMetrics(b *testing.B) {
 	buf := NewBuffer(10000)
 	m := testutil.TestMetric(1, "mymetric")

From d2cf9a715755657b06ffde37f4509fb1f5df1262 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 21 Aug 2018 12:44:10 -0700
Subject: [PATCH 699/835] Add support for static and random routing keys in
 kafka output (#4579)

---
 plugins/outputs/kafka/README.md     |  7 ++++
 plugins/outputs/kafka/kafka.go      | 55 +++++++++++++++++----------
 plugins/outputs/kafka/kafka_test.go | 59 +++++++++++++++++++++++++++++
 3 files changed, 102 insertions(+), 19 deletions(-)

diff --git a/plugins/outputs/kafka/README.md b/plugins/outputs/kafka/README.md
index 5f4758ba..25b173a0 100644
--- a/plugins/outputs/kafka/README.md
+++ b/plugins/outputs/kafka/README.md
@@ -50,6 +50,13 @@ This plugin writes to a [Kafka Broker](http://kafka.apache.org/07/quickstart.htm
   ##  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.  If set to "random",
+  ## a random value will be generated for each message.
+  ##   ex: routing_key = "random"
+  ##       routing_key = "telegraf"
+  # routing_key = ""
+
   ## CompressionCodec represents the various compression codecs recognized by
   ## Kafka in messages.
   ##  0 : No compression
diff --git a/plugins/outputs/kafka/kafka.go b/plugins/outputs/kafka/kafka.go
index b9ae3539..f2951e6d 100644
--- a/plugins/outputs/kafka/kafka.go
+++ b/plugins/outputs/kafka/kafka.go
@@ -10,6 +10,7 @@ import (
 	tlsint "github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/outputs"
 	"github.com/influxdata/telegraf/plugins/serializers"
+	uuid "github.com/satori/go.uuid"
 
 	"github.com/Shopify/sarama"
 )
@@ -22,24 +23,16 @@ var ValidTopicSuffixMethods = []string{
 
 type (
 	Kafka struct {
-		// Kafka brokers to send metrics to
-		Brokers []string
-		// Kafka topic
-		Topic string
-		// Kafka client id
-		ClientID string `toml:"client_id"`
-		// Kafka topic suffix option
-		TopicSuffix TopicSuffix `toml:"topic_suffix"`
-		// Routing Key Tag
-		RoutingTag string `toml:"routing_tag"`
-		// Compression Codec Tag
+		Brokers          []string
+		Topic            string
+		ClientID         string      `toml:"client_id"`
+		TopicSuffix      TopicSuffix `toml:"topic_suffix"`
+		RoutingTag       string      `toml:"routing_tag"`
+		RoutingKey       string      `toml:"routing_key"`
 		CompressionCodec int
-		// RequiredAcks Tag
-		RequiredAcks int
-		// MaxRetry Tag
-		MaxRetry int
-		// Max Message Bytes
-		MaxMessageBytes int `toml:"max_message_bytes"`
+		RequiredAcks     int
+		MaxRetry         int
+		MaxMessageBytes  int `toml:"max_message_bytes"`
 
 		Version string `toml:"version"`
 
@@ -116,6 +109,13 @@ var sampleConfig = `
   ##  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.  If set to "random",
+  ## a random value will be generated for each message.
+  ##   ex: routing_key = "random"
+  ##       routing_key = "telegraf"
+  # routing_key = ""
+
   ## CompressionCodec represents the various compression codecs recognized by
   ## Kafka in messages.
   ##  0 : No compression
@@ -273,6 +273,22 @@ func (k *Kafka) Description() string {
 	return "Configuration for the Kafka server to send metrics to"
 }
 
+func (k *Kafka) routingKey(metric telegraf.Metric) string {
+	if k.RoutingTag != "" {
+		key, ok := metric.GetTag(k.RoutingTag)
+		if ok {
+			return key
+		}
+	}
+
+	if k.RoutingKey == "random" {
+		u := uuid.NewV4()
+		return u.String()
+	}
+
+	return k.RoutingKey
+}
+
 func (k *Kafka) Write(metrics []telegraf.Metric) error {
 	msgs := make([]*sarama.ProducerMessage, 0, len(metrics))
 	for _, metric := range metrics {
@@ -285,8 +301,9 @@ func (k *Kafka) Write(metrics []telegraf.Metric) error {
 			Topic: k.GetTopicName(metric),
 			Value: sarama.ByteEncoder(buf),
 		}
-		if h, ok := metric.GetTag(k.RoutingTag); ok {
-			m.Key = sarama.StringEncoder(h)
+		key := k.routingKey(metric)
+		if key != "" {
+			m.Key = sarama.StringEncoder(key)
 		}
 		msgs = append(msgs, m)
 	}
diff --git a/plugins/outputs/kafka/kafka_test.go b/plugins/outputs/kafka/kafka_test.go
index b18d9f15..ba900e32 100644
--- a/plugins/outputs/kafka/kafka_test.go
+++ b/plugins/outputs/kafka/kafka_test.go
@@ -2,7 +2,10 @@ package kafka
 
 import (
 	"testing"
+	"time"
 
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/metric"
 	"github.com/influxdata/telegraf/plugins/serializers"
 	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/require"
@@ -96,3 +99,59 @@ func TestValidateTopicSuffixMethod(t *testing.T) {
 		require.NoError(t, err, "Topic suffix method used should be valid.")
 	}
 }
+
+func TestRoutingKey(t *testing.T) {
+	tests := []struct {
+		name   string
+		kafka  *Kafka
+		metric telegraf.Metric
+		check  func(t *testing.T, routingKey string)
+	}{
+		{
+			name: "static routing key",
+			kafka: &Kafka{
+				RoutingKey: "static",
+			},
+			metric: func() telegraf.Metric {
+				m, _ := metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"value": 42.0,
+					},
+					time.Unix(0, 0),
+				)
+				return m
+			}(),
+			check: func(t *testing.T, routingKey string) {
+				require.Equal(t, "static", routingKey)
+			},
+		},
+		{
+			name: "random routing key",
+			kafka: &Kafka{
+				RoutingKey: "random",
+			},
+			metric: func() telegraf.Metric {
+				m, _ := metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"value": 42.0,
+					},
+					time.Unix(0, 0),
+				)
+				return m
+			}(),
+			check: func(t *testing.T, routingKey string) {
+				require.Equal(t, 36, len(routingKey))
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			key := tt.kafka.routingKey(tt.metric)
+			tt.check(t, key)
+		})
+	}
+}

From 430d7103da6eee0f078f786652bc51c6b9cea125 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 21 Aug 2018 12:45:13 -0700
Subject: [PATCH 700/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4d680f9..348eb145 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -67,6 +67,7 @@
 - [#4542](https://github.com/influxdata/telegraf/pull/4542): Use dep v0.5.0.
 - [#4433](https://github.com/influxdata/telegraf/pull/4433): Add ability to set measurement from matched text in grok parser.
 - [#4565](https://github.com/influxdata/telegraf/pull/4465): Drop message batches in kafka output if too large.
+- [#4579](https://github.com/influxdata/telegraf/pull/4579): Add support for static and random routing keys in kafka output.
 
 
 ## v1.7.4 [unreleased]

From e893dc38a2ecbdf1387e937fc7561612c940002b Mon Sep 17 00:00:00 2001
From: Ayrdrie <ayrdrie@influxdata.com>
Date: Wed, 22 Aug 2018 14:55:41 -0600
Subject: [PATCH 701/835] Add logfmt parser (#4539)

---
 docs/DATA_FORMATS_INPUT.md            |  17 ++
 plugins/parsers/logfmt/parser.go      | 111 +++++++++++++
 plugins/parsers/logfmt/parser_test.go | 231 ++++++++++++++++++++++++++
 plugins/parsers/registry.go           |   8 +
 4 files changed, 367 insertions(+)
 create mode 100644 plugins/parsers/logfmt/parser.go
 create mode 100644 plugins/parsers/logfmt/parser_test.go

diff --git a/docs/DATA_FORMATS_INPUT.md b/docs/DATA_FORMATS_INPUT.md
index ded0170e..7f7c9493 100644
--- a/docs/DATA_FORMATS_INPUT.md
+++ b/docs/DATA_FORMATS_INPUT.md
@@ -10,6 +10,7 @@ Telegraf is able to parse the following input data formats into metrics:
 1. [Collectd](#collectd)
 1. [Dropwizard](#dropwizard)
 1. [Grok](#grok)
+1. [Logfmt](#logfmt)
 1. [Wavefront](#wavefront)
 
 Telegraf metrics, like InfluxDB
@@ -882,6 +883,22 @@ the file output will only print once per `flush_interval`.
 - If successful, add the next token, update the pattern and retest.
 - Continue one token at a time until the entire line is successfully parsed.
 
+# Logfmt
+This parser implements the logfmt format by extracting and converting key-value pairs from log text in the form `<key>=<value>`.
+At the moment, the plugin will produce one metric per line and all keys
+are added as fields.
+A typical log
+```
+method=GET host=influxdata.org ts=2018-07-24T19:43:40.275Z
+connect=4ms service=8ms status=200 bytes=1653
+```
+will be converted into
+```
+logfmt method="GET",host="influxdata.org",ts="2018-07-24T19:43:40.275Z",connect="4ms",service="8ms",status=200i,bytes=1653i
+
+```
+Additional information about the logfmt format can be found [here](https://brandur.org/logfmt).
+
 # Wavefront:
 
 Wavefront Data Format is metrics are parsed directly into Telegraf metrics.
diff --git a/plugins/parsers/logfmt/parser.go b/plugins/parsers/logfmt/parser.go
new file mode 100644
index 00000000..603dbbae
--- /dev/null
+++ b/plugins/parsers/logfmt/parser.go
@@ -0,0 +1,111 @@
+package logfmt
+
+import (
+	"bytes"
+	"fmt"
+	"strconv"
+	"time"
+
+	"github.com/go-logfmt/logfmt"
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/metric"
+)
+
+var (
+	ErrNoMetric = fmt.Errorf("no metric in line")
+)
+
+// Parser decodes logfmt formatted messages into metrics.
+type Parser struct {
+	MetricName  string
+	DefaultTags map[string]string
+	Now         func() time.Time
+}
+
+// NewParser creates a parser.
+func NewParser(metricName string, defaultTags map[string]string) *Parser {
+	return &Parser{
+		MetricName:  metricName,
+		DefaultTags: defaultTags,
+		Now:         time.Now,
+	}
+}
+
+// Parse converts a slice of bytes in logfmt format to metrics.
+func (p *Parser) Parse(b []byte) ([]telegraf.Metric, error) {
+	reader := bytes.NewReader(b)
+	decoder := logfmt.NewDecoder(reader)
+	metrics := make([]telegraf.Metric, 0)
+	for {
+		ok := decoder.ScanRecord()
+		if !ok {
+			err := decoder.Err()
+			if err != nil {
+				return nil, err
+			}
+			break
+		}
+		fields := make(map[string]interface{})
+		for decoder.ScanKeyval() {
+			if string(decoder.Value()) == "" {
+				continue
+			}
+
+			//type conversions
+			value := string(decoder.Value())
+			if iValue, err := strconv.ParseInt(value, 10, 64); err == nil {
+				fields[string(decoder.Key())] = iValue
+			} else if fValue, err := strconv.ParseFloat(value, 64); err == nil {
+				fields[string(decoder.Key())] = fValue
+			} else if bValue, err := strconv.ParseBool(value); err == nil {
+				fields[string(decoder.Key())] = bValue
+			} else {
+				fields[string(decoder.Key())] = value
+			}
+		}
+		if len(fields) == 0 {
+			continue
+		}
+
+		m, err := metric.New(p.MetricName, map[string]string{}, fields, p.Now())
+		if err != nil {
+			return nil, err
+		}
+
+		metrics = append(metrics, m)
+	}
+	p.applyDefaultTags(metrics)
+	return metrics, nil
+}
+
+// ParseLine converts a single line of text in logfmt format to metrics.
+func (p *Parser) ParseLine(s string) (telegraf.Metric, error) {
+	metrics, err := p.Parse([]byte(s))
+	if err != nil {
+		return nil, err
+	}
+
+	if len(metrics) < 1 {
+		return nil, ErrNoMetric
+	}
+	return metrics[0], nil
+}
+
+// SetDefaultTags adds tags to the metrics outputs of Parse and ParseLine.
+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/logfmt/parser_test.go b/plugins/parsers/logfmt/parser_test.go
new file mode 100644
index 00000000..c9096468
--- /dev/null
+++ b/plugins/parsers/logfmt/parser_test.go
@@ -0,0 +1,231 @@
+package logfmt
+
+import (
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/metric"
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/require"
+)
+
+func MustMetric(t *testing.T, m *testutil.Metric) telegraf.Metric {
+	t.Helper()
+	v, err := metric.New(m.Measurement, m.Tags, m.Fields, m.Time)
+	if err != nil {
+		t.Fatal(err)
+	}
+	return v
+}
+
+func TestParse(t *testing.T) {
+	tests := []struct {
+		name        string
+		measurement string
+		now         func() time.Time
+		bytes       []byte
+		want        []testutil.Metric
+		wantErr     bool
+	}{
+		{
+			name: "no bytes returns no metrics",
+			now:  func() time.Time { return time.Unix(0, 0) },
+			want: []testutil.Metric{},
+		},
+		{
+			name:        "test without trailing end",
+			bytes:       []byte("foo=\"bar\""),
+			now:         func() time.Time { return time.Unix(0, 0) },
+			measurement: "testlog",
+			want: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "testlog",
+					Tags:        map[string]string{},
+					Fields: map[string]interface{}{
+						"foo": "bar",
+					},
+					Time: time.Unix(0, 0),
+				},
+			},
+		},
+		{
+			name:        "test with trailing end",
+			bytes:       []byte("foo=\"bar\"\n"),
+			now:         func() time.Time { return time.Unix(0, 0) },
+			measurement: "testlog",
+			want: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "testlog",
+					Tags:        map[string]string{},
+					Fields: map[string]interface{}{
+						"foo": "bar",
+					},
+					Time: time.Unix(0, 0),
+				},
+			},
+		},
+		{
+			name:        "logfmt parser returns all the fields",
+			bytes:       []byte(`ts=2018-07-24T19:43:40.275Z lvl=info msg="http request" method=POST`),
+			now:         func() time.Time { return time.Unix(0, 0) },
+			measurement: "testlog",
+			want: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "testlog",
+					Tags:        map[string]string{},
+					Fields: map[string]interface{}{
+						"lvl":    "info",
+						"msg":    "http request",
+						"method": "POST",
+						"ts":     "2018-07-24T19:43:40.275Z",
+					},
+					Time: time.Unix(0, 0),
+				},
+			},
+		},
+		{
+			name:        "logfmt parser parses every line",
+			bytes:       []byte("ts=2018-07-24T19:43:40.275Z lvl=info msg=\"http request\" method=POST\nparent_id=088876RL000 duration=7.45 log_id=09R4e4Rl000"),
+			now:         func() time.Time { return time.Unix(0, 0) },
+			measurement: "testlog",
+			want: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "testlog",
+					Tags:        map[string]string{},
+					Fields: map[string]interface{}{
+						"lvl":    "info",
+						"msg":    "http request",
+						"method": "POST",
+						"ts":     "2018-07-24T19:43:40.275Z",
+					},
+					Time: time.Unix(0, 0),
+				},
+				testutil.Metric{
+					Measurement: "testlog",
+					Tags:        map[string]string{},
+					Fields: map[string]interface{}{
+						"parent_id": "088876RL000",
+						"duration":  7.45,
+						"log_id":    "09R4e4Rl000",
+					},
+					Time: time.Unix(0, 0),
+				},
+			},
+		},
+		{
+			name:    "keys without = or values are ignored",
+			now:     func() time.Time { return time.Unix(0, 0) },
+			bytes:   []byte(`i am no data.`),
+			want:    []testutil.Metric{},
+			wantErr: false,
+		},
+		{
+			name:    "keys without values are ignored",
+			now:     func() time.Time { return time.Unix(0, 0) },
+			bytes:   []byte(`foo="" bar=`),
+			want:    []testutil.Metric{},
+			wantErr: false,
+		},
+		{
+			name:        "unterminated quote produces error",
+			now:         func() time.Time { return time.Unix(0, 0) },
+			measurement: "testlog",
+			bytes:       []byte(`bar=baz foo="bar`),
+			want:        []testutil.Metric{},
+			wantErr:     true,
+		},
+		{
+			name:        "malformed key",
+			now:         func() time.Time { return time.Unix(0, 0) },
+			measurement: "testlog",
+			bytes:       []byte(`"foo=" bar=baz`),
+			want:        []testutil.Metric{},
+			wantErr:     true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			l := Parser{
+				MetricName: tt.measurement,
+				Now:        tt.now,
+			}
+			got, err := l.Parse(tt.bytes)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("Logfmt.Parse error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			require.Equal(t, len(tt.want), len(got))
+			for i, m := range got {
+				testutil.MustEqual(t, m, tt.want[i])
+			}
+		})
+	}
+}
+
+func TestParseLine(t *testing.T) {
+	tests := []struct {
+		name        string
+		s           string
+		measurement string
+		now         func() time.Time
+		want        testutil.Metric
+		wantErr     bool
+	}{
+		{
+			name:    "No Metric In line",
+			now:     func() time.Time { return time.Unix(0, 0) },
+			want:    testutil.Metric{},
+			wantErr: true,
+		},
+		{
+			name:        "Log parser fmt returns all fields",
+			now:         func() time.Time { return time.Unix(0, 0) },
+			measurement: "testlog",
+			s:           `ts=2018-07-24T19:43:35.207268Z lvl=5 msg="Write failed" log_id=09R4e4Rl000`,
+			want: testutil.Metric{
+				Measurement: "testlog",
+				Fields: map[string]interface{}{
+					"ts":     "2018-07-24T19:43:35.207268Z",
+					"lvl":    int64(5),
+					"msg":    "Write failed",
+					"log_id": "09R4e4Rl000",
+				},
+				Tags: map[string]string{},
+				Time: time.Unix(0, 0),
+			},
+		},
+		{
+			name:        "ParseLine only returns metrics from first string",
+			now:         func() time.Time { return time.Unix(0, 0) },
+			measurement: "testlog",
+			s:           "ts=2018-07-24T19:43:35.207268Z lvl=5 msg=\"Write failed\" log_id=09R4e4Rl000\nmethod=POST parent_id=088876RL000 duration=7.45 log_id=09R4e4Rl000",
+			want: testutil.Metric{
+				Measurement: "testlog",
+				Fields: map[string]interface{}{
+					"ts":     "2018-07-24T19:43:35.207268Z",
+					"lvl":    int64(5),
+					"msg":    "Write failed",
+					"log_id": "09R4e4Rl000",
+				},
+				Tags: map[string]string{},
+				Time: time.Unix(0, 0),
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			l := Parser{
+				MetricName: tt.measurement,
+				Now:        tt.now,
+			}
+			got, err := l.ParseLine(tt.s)
+			if (err != nil) != tt.wantErr {
+				t.Fatalf("Logfmt.Parse error = %v, wantErr %v", err, tt.wantErr)
+			}
+			if got != nil {
+				testutil.MustEqual(t, got, tt.want)
+			}
+		})
+	}
+}
diff --git a/plugins/parsers/registry.go b/plugins/parsers/registry.go
index 1e395047..e198cb2c 100644
--- a/plugins/parsers/registry.go
+++ b/plugins/parsers/registry.go
@@ -11,6 +11,7 @@ import (
 	"github.com/influxdata/telegraf/plugins/parsers/grok"
 	"github.com/influxdata/telegraf/plugins/parsers/influx"
 	"github.com/influxdata/telegraf/plugins/parsers/json"
+	"github.com/influxdata/telegraf/plugins/parsers/logfmt"
 	"github.com/influxdata/telegraf/plugins/parsers/nagios"
 	"github.com/influxdata/telegraf/plugins/parsers/value"
 	"github.com/influxdata/telegraf/plugins/parsers/wavefront"
@@ -142,6 +143,8 @@ func NewParser(config *Config) (Parser, error) {
 			config.GrokCustomPatterns,
 			config.GrokCustomPatternFiles,
 			config.GrokTimeZone)
+	case "logfmt":
+		parser, err = NewLogFmtParser(config.MetricName, config.DefaultTags)
 	default:
 		err = fmt.Errorf("Invalid data format: %s", config.DataFormat)
 	}
@@ -242,6 +245,11 @@ func NewDropwizardParser(
 	return parser, err
 }
 
+// NewLogFmtParser returns a logfmt parser with the default options.
+func NewLogFmtParser(metricName string, defaultTags map[string]string) (Parser, error) {
+	return logfmt.NewParser(metricName, defaultTags), nil
+}
+
 func NewWavefrontParser(defaultTags map[string]string) (Parser, error) {
 	return wavefront.NewWavefrontParser(defaultTags), nil
 }

From 9f8de25e0ebd921dd7b0a8071b412499563900ee Mon Sep 17 00:00:00 2001
From: Ayrdrie <ayrdrie@influxdata.com>
Date: Wed, 22 Aug 2018 16:28:50 -0700
Subject: [PATCH 702/835] Add parser processor (#4551)

---
 metric/builder.go                        |   4 +-
 plugins/processors/all/all.go            |   1 +
 plugins/processors/parser/README.md      |  43 ++
 plugins/processors/parser/parser.go      | 124 +++++
 plugins/processors/parser/parser_test.go | 670 +++++++++++++++++++++++
 5 files changed, 841 insertions(+), 1 deletion(-)
 create mode 100644 plugins/processors/parser/README.md
 create mode 100644 plugins/processors/parser/parser.go
 create mode 100644 plugins/processors/parser/parser_test.go

diff --git a/metric/builder.go b/metric/builder.go
index c579046d..9a331b9a 100644
--- a/metric/builder.go
+++ b/metric/builder.go
@@ -41,7 +41,9 @@ func (b *Builder) SetTime(tm time.Time) {
 }
 
 func (b *Builder) Reset() {
-	b.metric = &metric{}
+	b.metric = &metric{
+		tp: telegraf.Untyped,
+	}
 }
 
 func (b *Builder) Metric() (telegraf.Metric, error) {
diff --git a/plugins/processors/all/all.go b/plugins/processors/all/all.go
index f581ea60..5c2e2549 100644
--- a/plugins/processors/all/all.go
+++ b/plugins/processors/all/all.go
@@ -4,6 +4,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/processors/converter"
 	_ "github.com/influxdata/telegraf/plugins/processors/enum"
 	_ "github.com/influxdata/telegraf/plugins/processors/override"
+	_ "github.com/influxdata/telegraf/plugins/processors/parser"
 	_ "github.com/influxdata/telegraf/plugins/processors/printer"
 	_ "github.com/influxdata/telegraf/plugins/processors/regex"
 	_ "github.com/influxdata/telegraf/plugins/processors/rename"
diff --git a/plugins/processors/parser/README.md b/plugins/processors/parser/README.md
new file mode 100644
index 00000000..7564a75e
--- /dev/null
+++ b/plugins/processors/parser/README.md
@@ -0,0 +1,43 @@
+# Parser Processor Plugin
+
+This plugin parses defined fields containing the specified data format and
+creates new metrics based on the contents of the field.
+
+## Configuration
+```toml
+[[processors.parser]]
+  ## The name of the fields whose value will be parsed.
+  parse_fields = ["message"]
+
+  ## If true, incoming metrics are not emitted.
+  drop_original = false
+
+  ## If set to override, emitted metrics will be merged by overriding the
+  ## original metric using the newly parsed metrics.
+  merge = "override"
+
+  ## The dataformat to be read from files
+  ## 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"
+```
+
+### Example:
+
+```toml
+[[processors.parser]]
+  parse_fields = ["message"]
+  merge = "override"
+  data_format = "logfmt"
+```
+
+**Input**:
+```
+syslog,appname=influxd,facility=daemon,hostname=http://influxdb.example.org (influxdb.example.org),severity=info version=1i,severity_code=6i,facility_code=3i,timestamp=1533848508138040000i,procid="6629",message=" ts=2018-08-09T21:01:48.137963Z lvl=info msg=\"Executing query\" log_id=09p7QbOG000 service=query query=\"SHOW DATABASES\""
+```
+
+**Output**:
+```
+syslog,appname=influxd,facility=daemon,hostname=http://influxdb.example.org (influxdb.example.org),severity=info version=1i,severity_code=6i,facility_code=3i,timestamp=1533848508138040000i,procid="6629",ts="2018-08-09T21:01:48.137963Z",lvl=info msg="Executing query",log_id="09p7QbOG000",service="query",query="SHOW DATABASES"
+```
diff --git a/plugins/processors/parser/parser.go b/plugins/processors/parser/parser.go
new file mode 100644
index 00000000..63230763
--- /dev/null
+++ b/plugins/processors/parser/parser.go
@@ -0,0 +1,124 @@
+package parser
+
+import (
+	"log"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/parsers"
+	"github.com/influxdata/telegraf/plugins/processors"
+)
+
+type Parser struct {
+	parsers.Config
+	DropOriginal bool     `toml:"drop_original"`
+	Merge        string   `toml:"merge"`
+	ParseFields  []string `toml:"parse_fields"`
+	Parser       parsers.Parser
+}
+
+var SampleConfig = `
+  ## The name of the fields whose value will be parsed.
+  parse_fields = []
+
+  ## If true, incoming metrics are not emitted.
+  drop_original = false
+
+  ## If set to override, emitted metrics will be merged by overriding the
+  ## original metric using the newly parsed metrics.
+  merge = "override"
+
+  ## The dataformat to be read from files
+  ## 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"
+`
+
+func (p *Parser) SampleConfig() string {
+	return SampleConfig
+}
+
+func (p *Parser) Description() string {
+	return "Parse a value in a specified field/tag(s) and add the result in a new metric"
+}
+
+func (p *Parser) Apply(metrics ...telegraf.Metric) []telegraf.Metric {
+	if p.Parser == nil {
+		var err error
+		p.Parser, err = parsers.NewParser(&p.Config)
+		if err != nil {
+			log.Printf("E! [processors.parser] could not create parser: %v", err)
+			return metrics
+		}
+	}
+
+	results := []telegraf.Metric{}
+
+	for _, metric := range metrics {
+		newMetrics := []telegraf.Metric{}
+		if !p.DropOriginal {
+			newMetrics = append(newMetrics, metric)
+		}
+
+		for _, key := range p.ParseFields {
+			for _, field := range metric.FieldList() {
+				if field.Key == key {
+					switch value := field.Value.(type) {
+					case string:
+						fromFieldMetric, err := p.parseField(value)
+						if err != nil {
+							log.Printf("E! [processors.parser] could not parse field %s: %v", key, err)
+						}
+
+						for _, m := range fromFieldMetric {
+							if m.Name() == "" {
+								m.SetName(metric.Name())
+							}
+						}
+
+						// multiple parsed fields shouldn't create multiple
+						// metrics so we'll merge tags/fields down into one
+						// prior to returning.
+						newMetrics = append(newMetrics, fromFieldMetric...)
+					default:
+						log.Printf("E! [processors.parser] field '%s' not a string, skipping", key)
+					}
+				}
+			}
+		}
+
+		if len(newMetrics) == 0 {
+			continue
+		}
+
+		if p.Merge == "override" {
+			results = append(results, merge(newMetrics[0], newMetrics[1:]))
+		} else {
+			results = append(results, newMetrics...)
+		}
+	}
+	return results
+}
+
+func merge(base telegraf.Metric, metrics []telegraf.Metric) telegraf.Metric {
+	for _, metric := range metrics {
+		for _, field := range metric.FieldList() {
+			base.AddField(field.Key, field.Value)
+		}
+		for _, tag := range metric.TagList() {
+			base.AddTag(tag.Key, tag.Value)
+		}
+		base.SetName(metric.Name())
+	}
+	return base
+}
+
+func (p *Parser) parseField(value string) ([]telegraf.Metric, error) {
+	return p.Parser.Parse([]byte(value))
+}
+
+func init() {
+	processors.Add("parser", func() telegraf.Processor {
+		return &Parser{DropOriginal: false}
+	})
+}
diff --git a/plugins/processors/parser/parser_test.go b/plugins/processors/parser/parser_test.go
new file mode 100644
index 00000000..ac042848
--- /dev/null
+++ b/plugins/processors/parser/parser_test.go
@@ -0,0 +1,670 @@
+package parser
+
+import (
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/metric"
+	"github.com/influxdata/telegraf/plugins/parsers"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+//compares metrics without comparing time
+func compareMetrics(t *testing.T, expected, actual []telegraf.Metric) {
+	assert.Equal(t, len(expected), len(actual))
+	for i, metric := range actual {
+		require.Equal(t, expected[i].Name(), metric.Name())
+		require.Equal(t, expected[i].Fields(), metric.Fields())
+		require.Equal(t, expected[i].Tags(), metric.Tags())
+	}
+}
+
+func Metric(v telegraf.Metric, err error) telegraf.Metric {
+	if err != nil {
+		panic(err)
+	}
+	return v
+}
+
+func TestApply(t *testing.T) {
+	tests := []struct {
+		name         string
+		parseFields  []string
+		config       parsers.Config
+		dropOriginal bool
+		merge        string
+		input        telegraf.Metric
+		expected     []telegraf.Metric
+	}{
+		{
+			name:         "parse one field drop original",
+			parseFields:  []string{"sample"},
+			dropOriginal: true,
+			config: parsers.Config{
+				DataFormat: "json",
+				TagKeys: []string{
+					"ts",
+					"lvl",
+					"msg",
+					"method",
+				},
+			},
+			input: Metric(
+				metric.New(
+					"singleField",
+					map[string]string{
+						"some": "tag",
+					},
+					map[string]interface{}{
+						"sample": `{"ts":"2018-07-24T19:43:40.275Z","lvl":"info","msg":"http request","method":"POST"}`,
+					},
+					time.Unix(0, 0))),
+			expected: []telegraf.Metric{
+				Metric(metric.New(
+					"singleField",
+					map[string]string{
+						"ts":     "2018-07-24T19:43:40.275Z",
+						"lvl":    "info",
+						"msg":    "http request",
+						"method": "POST",
+					},
+					map[string]interface{}{},
+					time.Unix(0, 0))),
+			},
+		},
+		{
+			name:         "parse one field with merge",
+			parseFields:  []string{"sample"},
+			dropOriginal: false,
+			merge:        "override",
+			config: parsers.Config{
+				DataFormat: "json",
+				TagKeys: []string{
+					"ts",
+					"lvl",
+					"msg",
+					"method",
+				},
+			},
+			input: Metric(
+				metric.New(
+					"singleField",
+					map[string]string{
+						"some": "tag",
+					},
+					map[string]interface{}{
+						"sample": `{"ts":"2018-07-24T19:43:40.275Z","lvl":"info","msg":"http request","method":"POST"}`,
+					},
+					time.Unix(0, 0))),
+			expected: []telegraf.Metric{
+				Metric(metric.New(
+					"singleField",
+					map[string]string{
+						"some":   "tag",
+						"ts":     "2018-07-24T19:43:40.275Z",
+						"lvl":    "info",
+						"msg":    "http request",
+						"method": "POST",
+					},
+					map[string]interface{}{
+						"sample": `{"ts":"2018-07-24T19:43:40.275Z","lvl":"info","msg":"http request","method":"POST"}`,
+					},
+					time.Unix(0, 0))),
+			},
+		},
+		{
+			name:         "parse one field keep",
+			parseFields:  []string{"sample"},
+			dropOriginal: false,
+			config: parsers.Config{
+				DataFormat: "json",
+				TagKeys: []string{
+					"ts",
+					"lvl",
+					"msg",
+					"method",
+				},
+			},
+			input: Metric(
+				metric.New(
+					"singleField",
+					map[string]string{
+						"some": "tag",
+					},
+					map[string]interface{}{
+						"sample": `{"ts":"2018-07-24T19:43:40.275Z","lvl":"info","msg":"http request","method":"POST"}`,
+					},
+					time.Unix(0, 0))),
+			expected: []telegraf.Metric{
+				Metric(metric.New(
+					"singleField",
+					map[string]string{
+						"some": "tag",
+					},
+					map[string]interface{}{
+						"sample": `{"ts":"2018-07-24T19:43:40.275Z","lvl":"info","msg":"http request","method":"POST"}`,
+					},
+					time.Unix(0, 0))),
+				Metric(metric.New(
+					"singleField",
+					map[string]string{
+						"ts":     "2018-07-24T19:43:40.275Z",
+						"lvl":    "info",
+						"msg":    "http request",
+						"method": "POST",
+					},
+					map[string]interface{}{},
+					time.Unix(0, 0))),
+			},
+		},
+		{
+			name:        "parse one field keep with measurement name",
+			parseFields: []string{"message"},
+			config: parsers.Config{
+				DataFormat: "influx",
+			},
+			dropOriginal: false,
+			input: Metric(
+				metric.New(
+					"influxField",
+					map[string]string{},
+					map[string]interface{}{
+						"message": "deal,computer_name=hosta message=\"stuff\" 1530654676316265790",
+					},
+					time.Unix(0, 0))),
+			expected: []telegraf.Metric{
+				Metric(metric.New(
+					"influxField",
+					map[string]string{},
+					map[string]interface{}{
+						"message": "deal,computer_name=hosta message=\"stuff\" 1530654676316265790",
+					},
+					time.Unix(0, 0))),
+				Metric(metric.New(
+					"deal",
+					map[string]string{
+						"computer_name": "hosta",
+					},
+					map[string]interface{}{
+						"message": "stuff",
+					},
+					time.Unix(0, 0))),
+			},
+		},
+		{
+			name:         "parse one field override replaces name",
+			parseFields:  []string{"message"},
+			dropOriginal: false,
+			merge:        "override",
+			config: parsers.Config{
+				DataFormat: "influx",
+			},
+			input: Metric(
+				metric.New(
+					"influxField",
+					map[string]string{
+						"some": "tag",
+					},
+					map[string]interface{}{
+						"message": "deal,computer_name=hosta message=\"stuff\" 1530654676316265790",
+					},
+					time.Unix(0, 0))),
+			expected: []telegraf.Metric{
+				Metric(metric.New(
+					"deal",
+					map[string]string{
+						"computer_name": "hosta",
+						"some":          "tag",
+					},
+					map[string]interface{}{
+						"message": "stuff",
+					},
+					time.Unix(0, 0))),
+			},
+		},
+		{
+			name:         "parse grok field",
+			parseFields:  []string{"grokSample"},
+			dropOriginal: true,
+			config: parsers.Config{
+				DataFormat:   "grok",
+				GrokPatterns: []string{"%{COMBINED_LOG_FORMAT}"},
+			},
+			input: Metric(
+				metric.New(
+					"success",
+					map[string]string{},
+					map[string]interface{}{
+						"grokSample": "127.0.0.1 - - [11/Dec/2013:00:01:45 -0800] \"GET /xampp/status.php HTTP/1.1\" 200 3891 \"http://cadenza/xampp/navi.php\" \"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9; rv:25.0) Gecko/20100101 Firefox/25.0\"",
+					},
+					time.Unix(0, 0))),
+			expected: []telegraf.Metric{
+				Metric(metric.New(
+					"success",
+					map[string]string{
+						"resp_code": "200",
+						"verb":      "GET",
+					},
+					map[string]interface{}{
+						"resp_bytes":   int64(3891),
+						"auth":         "-",
+						"request":      "/xampp/status.php",
+						"referrer":     "http://cadenza/xampp/navi.php",
+						"agent":        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9; rv:25.0) Gecko/20100101 Firefox/25.0",
+						"client_ip":    "127.0.0.1",
+						"ident":        "-",
+						"http_version": float64(1.1),
+					},
+					time.Unix(0, 0))),
+			},
+		},
+		{
+			name:         "parse two fields [replace]",
+			parseFields:  []string{"field_1", "field_2"},
+			dropOriginal: true,
+			config: parsers.Config{
+				DataFormat: "json",
+				TagKeys:    []string{"lvl", "err"},
+			},
+			input: Metric(
+				metric.New(
+					"bigMeasure",
+					map[string]string{},
+					map[string]interface{}{
+						"field_1": `{"lvl":"info","msg":"http request"}`,
+						"field_2": `{"err":"fatal","fatal":"security threat"}`,
+					},
+					time.Unix(0, 0))),
+			expected: []telegraf.Metric{
+				Metric(metric.New(
+					"bigMeasure",
+					map[string]string{
+						"lvl": "info",
+					},
+					map[string]interface{}{},
+					time.Unix(0, 0))),
+				Metric(metric.New(
+					"bigMeasure",
+					map[string]string{
+						"err": "fatal",
+					},
+					map[string]interface{}{},
+					time.Unix(0, 0))),
+			},
+		},
+		{
+			name:         "parse two fields [merge]",
+			parseFields:  []string{"field_1", "field_2"},
+			dropOriginal: false,
+			merge:        "override",
+			config: parsers.Config{
+				DataFormat: "json",
+				TagKeys:    []string{"lvl", "msg", "err", "fatal"},
+			},
+			input: Metric(
+				metric.New(
+					"bigMeasure",
+					map[string]string{},
+					map[string]interface{}{
+						"field_1": `{"lvl":"info","msg":"http request"}`,
+						"field_2": `{"err":"fatal","fatal":"security threat"}`,
+					},
+					time.Unix(0, 0))),
+			expected: []telegraf.Metric{
+				Metric(metric.New(
+					"bigMeasure",
+					map[string]string{
+						"lvl":   "info",
+						"msg":   "http request",
+						"err":   "fatal",
+						"fatal": "security threat",
+					},
+					map[string]interface{}{
+						"field_1": `{"lvl":"info","msg":"http request"}`,
+						"field_2": `{"err":"fatal","fatal":"security threat"}`,
+					},
+					time.Unix(0, 0))),
+			},
+		},
+		{
+			name:         "parse two fields [keep]",
+			parseFields:  []string{"field_1", "field_2"},
+			dropOriginal: false,
+			config: parsers.Config{
+				DataFormat: "json",
+				TagKeys:    []string{"lvl", "msg", "err", "fatal"},
+			},
+			input: Metric(
+				metric.New(
+					"bigMeasure",
+					map[string]string{},
+					map[string]interface{}{
+						"field_1": `{"lvl":"info","msg":"http request"}`,
+						"field_2": `{"err":"fatal","fatal":"security threat"}`,
+					},
+					time.Unix(0, 0))),
+			expected: []telegraf.Metric{
+				Metric(metric.New(
+					"bigMeasure",
+					map[string]string{},
+					map[string]interface{}{
+						"field_1": `{"lvl":"info","msg":"http request"}`,
+						"field_2": `{"err":"fatal","fatal":"security threat"}`,
+					},
+					time.Unix(0, 0))),
+				Metric(metric.New(
+					"bigMeasure",
+					map[string]string{
+						"lvl": "info",
+						"msg": "http request",
+					},
+					map[string]interface{}{},
+					time.Unix(0, 0))),
+				Metric(metric.New(
+					"bigMeasure",
+					map[string]string{
+						"err":   "fatal",
+						"fatal": "security threat",
+					},
+					map[string]interface{}{},
+					time.Unix(0, 0))),
+			},
+		},
+		{
+			name:         "Fail to parse one field but parses other [keep]",
+			parseFields:  []string{"good", "bad"},
+			dropOriginal: false,
+			config: parsers.Config{
+				DataFormat: "json",
+				TagKeys:    []string{"lvl"},
+			},
+			input: Metric(
+				metric.New(
+					"success",
+					map[string]string{},
+					map[string]interface{}{
+						"good": `{"lvl":"info"}`,
+						"bad":  "why",
+					},
+					time.Unix(0, 0))),
+			expected: []telegraf.Metric{
+				Metric(metric.New(
+					"success",
+					map[string]string{},
+					map[string]interface{}{
+						"good": `{"lvl":"info"}`,
+						"bad":  "why",
+					},
+					time.Unix(0, 0))),
+				Metric(metric.New(
+					"success",
+					map[string]string{
+						"lvl": "info",
+					},
+					map[string]interface{}{},
+					time.Unix(0, 0))),
+			},
+		},
+		{
+			name:         "Fail to parse one field but parses other [keep] v2",
+			parseFields:  []string{"bad", "good", "ok"},
+			dropOriginal: false,
+			config: parsers.Config{
+				DataFormat: "json",
+				TagKeys:    []string{"lvl", "thing"},
+			},
+			input: Metric(
+				metric.New(
+					"success",
+					map[string]string{},
+					map[string]interface{}{
+						"bad":  "why",
+						"good": `{"lvl":"info"}`,
+						"ok":   `{"thing":"thang"}`,
+					},
+					time.Unix(0, 0))),
+			expected: []telegraf.Metric{
+				Metric(metric.New(
+					"success",
+					map[string]string{},
+					map[string]interface{}{
+						"bad":  "why",
+						"good": `{"lvl":"info"}`,
+						"ok":   `{"thing":"thang"}`,
+					},
+					time.Unix(0, 0))),
+				Metric(metric.New(
+					"success",
+					map[string]string{
+						"lvl": "info",
+					},
+					map[string]interface{}{},
+					time.Unix(0, 0))),
+				Metric(metric.New(
+					"success",
+					map[string]string{
+						"thing": "thang",
+					},
+					map[string]interface{}{},
+					time.Unix(0, 0))),
+			},
+		},
+		{
+			name:         "Fail to parse one field but parses other [merge]",
+			parseFields:  []string{"good", "bad"},
+			dropOriginal: false,
+			merge:        "override",
+			config: parsers.Config{
+				DataFormat: "json",
+				TagKeys:    []string{"lvl"},
+			},
+			input: Metric(
+				metric.New(
+					"success",
+					map[string]string{
+						"a": "tag",
+					},
+					map[string]interface{}{
+						"good": `{"lvl":"info"}`,
+						"bad":  "why",
+					},
+					time.Unix(0, 0))),
+			expected: []telegraf.Metric{
+				Metric(metric.New(
+					"success",
+					map[string]string{
+						"a":   "tag",
+						"lvl": "info",
+					},
+					map[string]interface{}{
+						"good": `{"lvl":"info"}`,
+						"bad":  "why",
+					},
+					time.Unix(0, 0))),
+			},
+		},
+		{
+			name:         "Fail to parse one field but parses other [replace]",
+			parseFields:  []string{"good", "bad"},
+			dropOriginal: true,
+			config: parsers.Config{
+				DataFormat: "json",
+				TagKeys:    []string{"lvl"},
+			},
+			input: Metric(
+				metric.New(
+					"success",
+					map[string]string{
+						"thing": "tag",
+					},
+					map[string]interface{}{
+						"good": `{"lvl":"info"}`,
+						"bad":  "why",
+					},
+					time.Unix(0, 0))),
+			expected: []telegraf.Metric{
+				Metric(metric.New(
+					"success",
+					map[string]string{
+						"lvl": "info",
+					},
+					map[string]interface{}{},
+					time.Unix(0, 0))),
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			parser := Parser{
+				Config:       tt.config,
+				ParseFields:  tt.parseFields,
+				DropOriginal: tt.dropOriginal,
+				Merge:        tt.merge,
+			}
+
+			output := parser.Apply(tt.input)
+			t.Logf("Testing: %s", tt.name)
+			compareMetrics(t, tt.expected, output)
+		})
+	}
+}
+
+func TestBadApply(t *testing.T) {
+	tests := []struct {
+		name        string
+		parseFields []string
+		config      parsers.Config
+		input       telegraf.Metric
+		expected    []telegraf.Metric
+	}{
+		{
+			name:        "field not found",
+			parseFields: []string{"bad_field"},
+			config: parsers.Config{
+				DataFormat: "json",
+			},
+			input: Metric(
+				metric.New(
+					"bad",
+					map[string]string{},
+					map[string]interface{}{
+						"some_field": 5,
+					},
+					time.Unix(0, 0))),
+			expected: []telegraf.Metric{
+				Metric(metric.New(
+					"bad",
+					map[string]string{},
+					map[string]interface{}{
+						"some_field": 5,
+					},
+					time.Unix(0, 0))),
+			},
+		},
+		{
+			name:        "non string field",
+			parseFields: []string{"some_field"},
+			config: parsers.Config{
+				DataFormat: "json",
+			},
+			input: Metric(
+				metric.New(
+					"bad",
+					map[string]string{},
+					map[string]interface{}{
+						"some_field": 5,
+					},
+					time.Unix(0, 0))),
+			expected: []telegraf.Metric{
+				Metric(metric.New(
+					"bad",
+					map[string]string{},
+					map[string]interface{}{
+						"some_field": 5,
+					},
+					time.Unix(0, 0))),
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			parser := Parser{
+				Config:      tt.config,
+				ParseFields: tt.parseFields,
+			}
+
+			output := parser.Apply(tt.input)
+
+			compareMetrics(t, output, tt.expected)
+		})
+	}
+}
+
+// Benchmarks
+
+func getMetricFields(metric telegraf.Metric) interface{} {
+	key := "field3"
+	if value, ok := metric.Fields()[key]; ok {
+		return value
+	}
+	return nil
+}
+
+func getMetricFieldList(metric telegraf.Metric) interface{} {
+	key := "field3"
+	fields := metric.FieldList()
+	for _, field := range fields {
+		if field.Key == key {
+			return field.Value
+		}
+	}
+	return nil
+}
+
+func BenchmarkFieldListing(b *testing.B) {
+	metric := Metric(metric.New(
+		"test",
+		map[string]string{
+			"some": "tag",
+		},
+		map[string]interface{}{
+			"field0": `{"ts":"2018-07-24T19:43:40.275Z","lvl":"info","msg":"http request","method":"POST"}`,
+			"field1": `{"ts":"2018-07-24T19:43:40.275Z","lvl":"info","msg":"http request","method":"POST"}`,
+			"field2": `{"ts":"2018-07-24T19:43:40.275Z","lvl":"info","msg":"http request","method":"POST"}`,
+			"field3": `{"ts":"2018-07-24T19:43:40.275Z","lvl":"info","msg":"http request","method":"POST"}`,
+			"field4": `{"ts":"2018-07-24T19:43:40.275Z","lvl":"info","msg":"http request","method":"POST"}`,
+			"field5": `{"ts":"2018-07-24T19:43:40.275Z","lvl":"info","msg":"http request","method":"POST"}`,
+			"field6": `{"ts":"2018-07-24T19:43:40.275Z","lvl":"info","msg":"http request","method":"POST"}`,
+		},
+		time.Unix(0, 0)))
+
+	for n := 0; n < b.N; n++ {
+		getMetricFieldList(metric)
+	}
+}
+
+func BenchmarkFields(b *testing.B) {
+	metric := Metric(metric.New(
+		"test",
+		map[string]string{
+			"some": "tag",
+		},
+		map[string]interface{}{
+			"field0": `{"ts":"2018-07-24T19:43:40.275Z","lvl":"info","msg":"http request","method":"POST"}`,
+			"field1": `{"ts":"2018-07-24T19:43:40.275Z","lvl":"info","msg":"http request","method":"POST"}`,
+			"field2": `{"ts":"2018-07-24T19:43:40.275Z","lvl":"info","msg":"http request","method":"POST"}`,
+			"field3": `{"ts":"2018-07-24T19:43:40.275Z","lvl":"info","msg":"http request","method":"POST"}`,
+			"field4": `{"ts":"2018-07-24T19:43:40.275Z","lvl":"info","msg":"http request","method":"POST"}`,
+			"field5": `{"ts":"2018-07-24T19:43:40.275Z","lvl":"info","msg":"http request","method":"POST"}`,
+			"field6": `{"ts":"2018-07-24T19:43:40.275Z","lvl":"info","msg":"http request","method":"POST"}`,
+		},
+		time.Unix(0, 0)))
+
+	for n := 0; n < b.N; n++ {
+		getMetricFields(metric)
+	}
+}

From 2ac06f5df0154e684f5b16f42c788e2f61623d5c Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 22 Aug 2018 13:57:33 -0700
Subject: [PATCH 703/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 348eb145..a88358a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@
 
 - [enum](./plugins/processors/enum/README.md) - Contributed by @KarstenSchnitter
 - [rename](./plugins/processors/rename/README.md) - Contributed by @goldibex
+- [parser](./plugins/processors/parser/README.md) - Contributed by @maxunt & @Ayrdrie
 
 ### New Aggregators
 
@@ -68,7 +69,8 @@
 - [#4433](https://github.com/influxdata/telegraf/pull/4433): Add ability to set measurement from matched text in grok parser.
 - [#4565](https://github.com/influxdata/telegraf/pull/4465): Drop message batches in kafka output if too large.
 - [#4579](https://github.com/influxdata/telegraf/pull/4579): Add support for static and random routing keys in kafka output.
-
+- [#4539](https://github.com/influxdata/telegraf/pull/4539): Add logfmt parser.
+- [#4551](https://github.com/influxdata/telegraf/pull/4551): Add parser processor.
 
 ## v1.7.4 [unreleased]
 

From a8496f87b26a9afad6107592d5b676a7ea2e8019 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 22 Aug 2018 18:38:07 -0700
Subject: [PATCH 704/835] Fix example input and output in parser processor docs

---
 plugins/processors/parser/README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/processors/parser/README.md b/plugins/processors/parser/README.md
index 7564a75e..134bbb59 100644
--- a/plugins/processors/parser/README.md
+++ b/plugins/processors/parser/README.md
@@ -34,10 +34,12 @@ creates new metrics based on the contents of the field.
 
 **Input**:
 ```
-syslog,appname=influxd,facility=daemon,hostname=http://influxdb.example.org (influxdb.example.org),severity=info version=1i,severity_code=6i,facility_code=3i,timestamp=1533848508138040000i,procid="6629",message=" ts=2018-08-09T21:01:48.137963Z lvl=info msg=\"Executing query\" log_id=09p7QbOG000 service=query query=\"SHOW DATABASES\""
+syslog,appname=influxd,facility=daemon,hostname=http://influxdb.example.org\ (influxdb.example.org),severity=info facility_code=3i,message=" ts=2018-08-09T21:01:48.137963Z lvl=info msg=\"Executing query\" log_id=09p7QbOG000 service=query query=\"SHOW DATABASES\"",procid="6629",severity_code=6i,timestamp=1533848508138040000i,version=1i
 ```
 
 **Output**:
 ```
-syslog,appname=influxd,facility=daemon,hostname=http://influxdb.example.org (influxdb.example.org),severity=info version=1i,severity_code=6i,facility_code=3i,timestamp=1533848508138040000i,procid="6629",ts="2018-08-09T21:01:48.137963Z",lvl=info msg="Executing query",log_id="09p7QbOG000",service="query",query="SHOW DATABASES"
+syslog,appname=influxd,facility=daemon,hostname=http://influxdb.example.org\ (influxdb.example.org),severity=info facility_code=3i,log_id="09p7QbOG000",lvl="info",message=" ts=2018-08-09T21:01:48.137963Z lvl=info msg=\"Executing query\" log_id=09p7QbOG000 service=query query=\"SHOW DATABASES\"",msg="Executing query",procid="6629",query="SHOW DATABASES",service="query",severity_code=6i,timestamp=1533848508138040000i,ts="2018-08-09T21:01:48.137963Z",version=1i
 ```
+
+

From e72fab7cbecf24696645ccff1f0b7952d0f8d140 Mon Sep 17 00:00:00 2001
From: LABOUARDY Mohamed <mohamed.labouardy@gmail.com>
Date: Thu, 23 Aug 2018 03:10:40 +0100
Subject: [PATCH 705/835] Add Icinga2 input plugin (#4559)

---
 README.md                              |   1 +
 plugins/inputs/all/all.go              |   1 +
 plugins/inputs/icinga2/README.md       |  65 ++++++++++
 plugins/inputs/icinga2/icinga2.go      | 170 +++++++++++++++++++++++++
 plugins/inputs/icinga2/icinga2_test.go |  91 +++++++++++++
 5 files changed, 328 insertions(+)
 create mode 100644 plugins/inputs/icinga2/README.md
 create mode 100644 plugins/inputs/icinga2/icinga2.go
 create mode 100644 plugins/inputs/icinga2/icinga2_test.go

diff --git a/README.md b/README.md
index e0d88e41..867aa10f 100644
--- a/README.md
+++ b/README.md
@@ -168,6 +168,7 @@ configuration options.
 * [http_listener](./plugins/inputs/http_listener)
 * [http](./plugins/inputs/http) (generic HTTP plugin, supports using input data formats)
 * [http_response](./plugins/inputs/http_response)
+* [icinga2](./plugins/inputs/icinga2)
 * [influxdb](./plugins/inputs/influxdb)
 * [internal](./plugins/inputs/internal)
 * [interrupts](./plugins/inputs/interrupts)
diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index ac86fb87..17762d1c 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -42,6 +42,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/http_listener"
 	_ "github.com/influxdata/telegraf/plugins/inputs/http_response"
 	_ "github.com/influxdata/telegraf/plugins/inputs/httpjson"
+	_ "github.com/influxdata/telegraf/plugins/inputs/icinga2"
 	_ "github.com/influxdata/telegraf/plugins/inputs/influxdb"
 	_ "github.com/influxdata/telegraf/plugins/inputs/internal"
 	_ "github.com/influxdata/telegraf/plugins/inputs/interrupts"
diff --git a/plugins/inputs/icinga2/README.md b/plugins/inputs/icinga2/README.md
new file mode 100644
index 00000000..697c6c59
--- /dev/null
+++ b/plugins/inputs/icinga2/README.md
@@ -0,0 +1,65 @@
+# Icinga2 Input Plugin
+
+This plugin gather services & hosts status using Icinga2 Remote API.
+
+The icinga2 plugin uses the icinga2 remote API to gather status on running
+services and hosts. You can read Icinga2's documentation for their remote API
+[here](https://docs.icinga.com/icinga2/latest/doc/module/icinga2/chapter/icinga2-api)
+
+### Configuration:
+
+```toml
+# Description
+[[inputs.icinga2]]
+  ## Required Icinga2 server address (default: "https://localhost:5665")
+  # server = "https://localhost:5665"
+  
+  ## Required Icinga2 object type ("services" or "hosts, default "services")
+  # object_type = "services"
+
+  ## Credentials for basic HTTP authentication
+  # username = "admin"
+  # password = "admin"
+
+  ## Maximum time to receive response.
+  # 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 = true
+```
+
+### Measurements & Fields:
+
+- All measurements have the following fields:
+    - name (string)
+    - state_code (int)
+
+### Tags:
+
+- All measurements have the following tags:
+    - check_command
+    - display_name
+    - state
+    - source
+    - port
+    - scheme
+
+### Sample Queries:
+
+```
+SELECT * FROM "icinga2_services" WHERE state_code = 0 AND time > now() - 24h // Service with OK status
+SELECT * FROM "icinga2_services" WHERE state_code = 1 AND time > now() - 24h // Service with WARNING status
+SELECT * FROM "icinga2_services" WHERE state_code = 2 AND time > now() - 24h // Service with CRITICAL status
+SELECT * FROM "icinga2_services" WHERE state_code = 3 AND time > now() - 24h // Service with UNKNOWN status
+```
+
+### Example Output:
+
+```
+$ ./telegraf -config telegraf.conf -input-filter icinga2 -test
+icinga2_hosts,display_name=router-fr.eqx.fr,check_command=hostalive-custom,host=test-vm,source=localhost,port=5665,scheme=https,state=ok name="router-fr.eqx.fr",state=0 1492021603000000000
+```
diff --git a/plugins/inputs/icinga2/icinga2.go b/plugins/inputs/icinga2/icinga2.go
new file mode 100644
index 00000000..37590ab8
--- /dev/null
+++ b/plugins/inputs/icinga2/icinga2.go
@@ -0,0 +1,170 @@
+package icinga2
+
+import (
+	"encoding/json"
+	"fmt"
+	"log"
+	"net/http"
+	"net/url"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+type Icinga2 struct {
+	Server          string
+	ObjectType      string
+	Username        string
+	Password        string
+	ResponseTimeout internal.Duration
+	tls.ClientConfig
+
+	client *http.Client
+}
+
+type Result struct {
+	Results []Object `json:"results"`
+}
+
+type Object struct {
+	Attrs Attribute  `json:"attrs"`
+	Name  string     `json:"name"`
+	Joins struct{}   `json:"joins"`
+	Meta  struct{}   `json:"meta"`
+	Type  ObjectType `json:"type"`
+}
+
+type Attribute struct {
+	CheckCommand string `json:"check_command"`
+	DisplayName  string `json:"display_name"`
+	Name         string `json:"name"`
+	State        int    `json:"state"`
+}
+
+var levels = []string{"ok", "warning", "critical", "unknown"}
+
+type ObjectType string
+
+var sampleConfig = `
+  ## Required Icinga2 server address (default: "https://localhost:5665")
+  # server = "https://localhost:5665"
+  
+  ## Required Icinga2 object type ("services" or "hosts, default "services")
+  # object_type = "services"
+
+  ## Credentials for basic HTTP authentication
+  # username = "admin"
+  # password = "admin"
+
+  ## Maximum time to receive response.
+  # 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 = true
+  `
+
+func (i *Icinga2) Description() string {
+	return "Gather Icinga2 status"
+}
+
+func (i *Icinga2) SampleConfig() string {
+	return sampleConfig
+}
+
+func (i *Icinga2) GatherStatus(acc telegraf.Accumulator, checks []Object) {
+	for _, check := range checks {
+		fields := make(map[string]interface{})
+		tags := make(map[string]string)
+
+		url, err := url.Parse(i.Server)
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		fields["name"] = check.Attrs.Name
+		fields["state_code"] = check.Attrs.State
+
+		tags["display_name"] = check.Attrs.DisplayName
+		tags["check_command"] = check.Attrs.CheckCommand
+		tags["state"] = levels[check.Attrs.State]
+		tags["source"] = url.Hostname()
+		tags["scheme"] = url.Scheme
+		tags["port"] = url.Port()
+
+		acc.AddFields(fmt.Sprintf("icinga2_%s", i.ObjectType), fields, tags)
+	}
+}
+
+func (i *Icinga2) createHttpClient() (*http.Client, error) {
+	tlsCfg, err := i.ClientConfig.TLSConfig()
+	if err != nil {
+		return nil, err
+	}
+
+	client := &http.Client{
+		Transport: &http.Transport{
+			TLSClientConfig: tlsCfg,
+		},
+		Timeout: i.ResponseTimeout.Duration,
+	}
+
+	return client, nil
+}
+
+func (i *Icinga2) Gather(acc telegraf.Accumulator) error {
+	if i.ResponseTimeout.Duration < time.Second {
+		i.ResponseTimeout.Duration = time.Second * 5
+	}
+
+	if i.client == nil {
+		client, err := i.createHttpClient()
+		if err != nil {
+			return err
+		}
+		i.client = client
+	}
+
+	url := fmt.Sprintf("%s/v1/objects/%s?attrs=name&attrs=display_name&attrs=state&attrs=check_command", i.Server, i.ObjectType)
+
+	req, err := http.NewRequest("GET", url, nil)
+	if err != nil {
+		return err
+	}
+
+	if i.Username != "" {
+		req.SetBasicAuth(i.Username, i.Password)
+	}
+
+	resp, err := i.client.Do(req)
+	if err != nil {
+		return err
+	}
+
+	defer resp.Body.Close()
+
+	result := Result{}
+	json.NewDecoder(resp.Body).Decode(&result)
+	if err != nil {
+		return err
+	}
+
+	i.GatherStatus(acc, result.Results)
+
+	return nil
+}
+
+func init() {
+	inputs.Add("icinga2", func() telegraf.Input {
+		return &Icinga2{
+			Server:     "https://localhost:5665",
+			ObjectType: "services",
+		}
+	})
+}
diff --git a/plugins/inputs/icinga2/icinga2_test.go b/plugins/inputs/icinga2/icinga2_test.go
new file mode 100644
index 00000000..ad926834
--- /dev/null
+++ b/plugins/inputs/icinga2/icinga2_test.go
@@ -0,0 +1,91 @@
+package icinga2
+
+import (
+	"encoding/json"
+	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+)
+
+func TestGatherServicesStatus(t *testing.T) {
+
+	s := `{"results":[
+    {
+      "attrs": {
+        "check_command": "check-bgp-juniper-netconf",
+        "display_name": "eq-par.dc2.fr",
+        "name": "ef017af8-c684-4f3f-bb20-0dfe9fcd3dbe",
+        "state": 0
+      },
+      "joins": {},
+      "meta": {},
+      "name": "eq-par.dc2.fr!ef017af8-c684-4f3f-bb20-0dfe9fcd3dbe",
+      "type": "Service"
+    }
+  ]}`
+
+	checks := Result{}
+	json.Unmarshal([]byte(s), &checks)
+	fields := map[string]interface{}{
+		"name":       "ef017af8-c684-4f3f-bb20-0dfe9fcd3dbe",
+		"state_code": 0,
+	}
+	tags := map[string]string{
+		"display_name":  "eq-par.dc2.fr",
+		"check_command": "check-bgp-juniper-netconf",
+		"state":         "ok",
+		"source":        "localhost",
+		"port":          "5665",
+		"scheme":        "https",
+	}
+
+	var acc testutil.Accumulator
+
+	icinga2 := new(Icinga2)
+	icinga2.ObjectType = "services"
+	icinga2.Server = "https://localhost:5665"
+	icinga2.GatherStatus(&acc, checks.Results)
+	acc.AssertContainsTaggedFields(t, "icinga2_services", fields, tags)
+}
+
+func TestGatherHostsStatus(t *testing.T) {
+
+	s := `{"results":[
+    {
+      "attrs": {
+				"name": "webserver",
+        "address": "192.168.1.1",
+        "check_command": "ping",
+        "display_name": "apache",
+        "state": 2
+      },
+      "joins": {},
+      "meta": {},
+      "name": "webserver",
+      "type": "Host"
+    }
+  ]}`
+
+	checks := Result{}
+	json.Unmarshal([]byte(s), &checks)
+	fields := map[string]interface{}{
+		"name":       "webserver",
+		"state_code": 2,
+	}
+	tags := map[string]string{
+		"display_name":  "apache",
+		"check_command": "ping",
+		"state":         "critical",
+		"source":        "localhost",
+		"port":          "5665",
+		"scheme":        "https",
+	}
+
+	var acc testutil.Accumulator
+
+	icinga2 := new(Icinga2)
+	icinga2.ObjectType = "hosts"
+	icinga2.Server = "https://localhost:5665"
+	icinga2.GatherStatus(&acc, checks.Results)
+	acc.AssertContainsTaggedFields(t, "icinga2_hosts", fields, tags)
+}

From d6d6539e26696ac41c8c5de1fe87b18fa0f408fa Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 22 Aug 2018 19:13:46 -0700
Subject: [PATCH 706/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a88358a4..bc2998d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 - [filecount](./plugins/inputs/filecount/README.md) - Contributed by @sometimesfood
 - [pgbouncer](./plugins/inputs/pgbouncer/README.md) - Contributed by @nerzhul
 - [activemq](./plugins/inputs/activemq/README.md) - Contributed by @mlabouardy
+- [icinga2](./plugins/inputs/icinga2/README.md) - Contributed by @mlabouardy
 
 ### New Processors
 
@@ -43,7 +44,7 @@
 - [#4347](https://github.com/influxdata/telegraf/pull/4347): Add http path configuration for OpenTSDB output.
 - [#4352](https://github.com/influxdata/telegraf/pull/4352): Gather IPMI metrics concurrently.
 - [#4362](https://github.com/influxdata/telegraf/pull/4362): Add mongo document and connection metrics.
-- [#3772](https://github.com/influxdata/telegraf/pull/3772): Add Enum Processor.
+- [#3772](https://github.com/influxdata/telegraf/pull/3772): Add enum processor plugin.
 - [#4386](https://github.com/influxdata/telegraf/pull/4386): Add user tag to procstat input.
 - [#4403](https://github.com/influxdata/telegraf/pull/4403): Add support for multivalue metrics to collectd parser.
 - [#4418](https://github.com/influxdata/telegraf/pull/4418): Add support for setting kafka client id.
@@ -60,8 +61,8 @@
 - [#4431](https://github.com/influxdata/telegraf/pull/4431): Add ip restriction for the prometheus_client output.
 - [#3918](https://github.com/influxdata/telegraf/pull/3918): Add pgbouncer input plugin.
 - [#2689](https://github.com/influxdata/telegraf/pull/2689): Add ActiveMQ input plugin.
-- [#4402](https://github.com/influxdata/telegraf/pull/4402): Add wavefront parser.
-- [#4528](https://github.com/influxdata/telegraf/pull/4528): Add rename processor.
+- [#4402](https://github.com/influxdata/telegraf/pull/4402): Add wavefront parser plugin.
+- [#4528](https://github.com/influxdata/telegraf/pull/4528): Add rename processor plugin.
 - [#4537](https://github.com/influxdata/telegraf/pull/4537): Add message 'max_bytes' configuration to kafka input.
 - [#4546](https://github.com/influxdata/telegraf/pull/4546): Add gopsutil meminfo fields to mem plugin.
 - [#4285](https://github.com/influxdata/telegraf/pull/4285): Document how to parse telegraf logs.
@@ -69,8 +70,10 @@
 - [#4433](https://github.com/influxdata/telegraf/pull/4433): Add ability to set measurement from matched text in grok parser.
 - [#4565](https://github.com/influxdata/telegraf/pull/4465): Drop message batches in kafka output if too large.
 - [#4579](https://github.com/influxdata/telegraf/pull/4579): Add support for static and random routing keys in kafka output.
-- [#4539](https://github.com/influxdata/telegraf/pull/4539): Add logfmt parser.
-- [#4551](https://github.com/influxdata/telegraf/pull/4551): Add parser processor.
+- [#4539](https://github.com/influxdata/telegraf/pull/4539): Add logfmt parser plugin.
+- [#4551](https://github.com/influxdata/telegraf/pull/4551): Add parser processor plugin.
+- [#4559](https://github.com/influxdata/telegraf/pull/4559): Add Icinga2 input plugin.
+
 
 ## v1.7.4 [unreleased]
 

From 2729378b7f461a55e5e2d473e2a57ddf3977b5fe Mon Sep 17 00:00:00 2001
From: maxunt <max.untrecht@gmail.com>
Date: Wed, 22 Aug 2018 19:26:48 -0700
Subject: [PATCH 707/835] Add name, time, path and string field options to JSON
 parser (#4351)

---
 docs/DATA_FORMATS_INPUT.md                    | 137 +++++-
 internal/config/config.go                     |  49 ++
 internal/config/config_test.go                |   5 +-
 plugins/inputs/exec/exec_test.go              |  15 +-
 plugins/inputs/http/http_test.go              |  24 +-
 plugins/inputs/httpjson/httpjson.go           |   7 +-
 .../kafka_consumer/kafka_consumer_test.go     |   5 +-
 .../kafka_consumer_legacy_test.go             |   5 +-
 .../mqtt_consumer/mqtt_consumer_test.go       |   5 +-
 .../nats_consumer/nats_consumer_test.go       |   5 +-
 .../inputs/tcp_listener/tcp_listener_test.go  |   5 +-
 .../inputs/udp_listener/udp_listener_test.go  |   5 +-
 plugins/parsers/json/parser.go                |  75 ++-
 plugins/parsers/json/parser_test.go           | 449 +++++++++++++-----
 plugins/parsers/registry.go                   |  47 +-
 15 files changed, 672 insertions(+), 166 deletions(-)

diff --git a/docs/DATA_FORMATS_INPUT.md b/docs/DATA_FORMATS_INPUT.md
index 7f7c9493..6e1b6a75 100644
--- a/docs/DATA_FORMATS_INPUT.md
+++ b/docs/DATA_FORMATS_INPUT.md
@@ -107,9 +107,31 @@ but can be overridden using the `name_override` config option.
 
 #### JSON Configuration:
 
-The JSON data format supports specifying "tag keys". If specified, keys
-will be searched for in the root-level of the JSON blob. If the key(s) exist,
-they will be applied as tags to the Telegraf metrics.
+The JSON data format supports specifying "tag_keys", "string_keys", and "json_query". 
+If specified, keys in "tag_keys" and "string_keys" will be searched for in the root-level 
+and any nested lists of the JSON blob. All int and float values are added to fields by default. 
+If the key(s) exist, they will be applied as tags or fields to the Telegraf metrics.  
+If "string_keys" is specified, the string will be added as a field.
+
+The "json_query" configuration is a gjson path to an JSON object or 
+list of JSON objects. If this path leads to an array of values or 
+single data point an error will be thrown.  If this configuration 
+is specified, only the result of the query will be parsed and returned as metrics.
+
+The "json_name_key" configuration specifies the key of the field whos value will be
+added as the metric name.
+
+Object paths are specified using gjson path format, which is denoted by object keys 
+concatenated with "." to go deeper in nested JSON objects.  
+Additional information on gjson paths can be found here: https://github.com/tidwall/gjson#path-syntax
+
+The JSON data format also supports extracting time values through the 
+config "json_time_key" and "json_time_format". If "json_time_key" is set, 
+"json_time_format" must be specified.  The "json_time_key" describes the 
+name of the field containing time information.  The "json_time_format" 
+must be a recognized Go time format.
+If there is no year provided, the metrics will have the current year.
+More info on time formats can be found here: https://golang.org/pkg/time/#Parse
 
 For example, if you had this configuration:
 
@@ -127,11 +149,28 @@ For example, if you had this configuration:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
   data_format = "json"
 
-  ## List of tag names to extract from top-level of JSON server response
+  ## List of tag names to extract from JSON server response
   tag_keys = [
     "my_tag_1",
     "my_tag_2"
   ]
+
+  ## The json path specifying where to extract the metric name from
+  # json_name_key = ""
+
+  ## List of field names to extract from JSON and add as string fields
+  # json_string_fields = []
+
+  ## gjson query path to specify a specific chunk of JSON to be parsed with 
+  ## the above configuration. If not specified, the whole file will be parsed. 
+  ## gjson query paths are described here: https://github.com/tidwall/gjson#path-syntax
+  # json_query = ""
+
+  ## holds the name of the tag of timestamp
+  # json_time_key = ""
+
+  ## holds the format of timestamp to be parsed
+  # json_time_format = ""
 ```
 
 with this JSON output from a command:
@@ -152,8 +191,9 @@ Your Telegraf metrics would get tagged with "my_tag_1"
 exec_mycollector,my_tag_1=foo a=5,b_c=6
 ```
 
-If the JSON data is an array, then each element of the array is parsed with the configured settings.
-Each resulting metric will be output with the same timestamp.
+If the JSON data is an array, then each element of the array is 
+parsed with the configured settings.  Each resulting metric will 
+be output with the same timestamp.
 
 For example, if the following configuration:
 
@@ -176,6 +216,19 @@ For example, if the following configuration:
     "my_tag_1",
     "my_tag_2"
   ]
+
+  ## List of field names to extract from JSON and add as string fields
+  # string_fields = []
+
+  ## gjson query path to specify a specific chunk of JSON to be parsed with 
+  ## the above configuration. If not specified, the whole file will be parsed
+  # json_query = ""
+
+  ## holds the name of the tag of timestamp
+  json_time_key = "b_time"
+
+  ## holds the format of timestamp to be parsed
+  json_time_format = "02 Jan 06 15:04 MST"
 ```
 
 with this JSON output from a command:
@@ -185,7 +238,8 @@ with this JSON output from a command:
     {
         "a": 5,
         "b": {
-            "c": 6
+            "c": 6,
+            "time":"04 Jan 06 15:04 MST"
         },
         "my_tag_1": "foo",
         "my_tag_2": "baz"
@@ -193,7 +247,8 @@ with this JSON output from a command:
     {
         "a": 7,
         "b": {
-            "c": 8
+            "c": 8,
+            "time":"11 Jan 07 15:04 MST"
         },
         "my_tag_1": "bar",
         "my_tag_2": "baz"
@@ -201,11 +256,71 @@ with this JSON output from a command:
 ]
 ```
 
-Your Telegraf metrics would get tagged with "my_tag_1" and "my_tag_2"
+Your Telegraf metrics would get tagged with "my_tag_1" and "my_tag_2" and fielded with "b_c"
+The metric's time will be a time.Time object, as specified by "b_time"
 
 ```
-exec_mycollector,my_tag_1=foo,my_tag_2=baz a=5,b_c=6
-exec_mycollector,my_tag_1=bar,my_tag_2=baz a=7,b_c=8
+exec_mycollector,my_tag_1=foo,my_tag_2=baz b_c=6 1136387040000000000
+exec_mycollector,my_tag_1=bar,my_tag_2=baz b_c=8 1168527840000000000
+```
+
+If you want to only use a specific portion of your JSON, use the "json_query" 
+configuration to specify a path to a JSON object.
+
+For example, with the following config:
+```toml
+[[inputs.exec]]
+  ## Commands array
+  commands = ["/usr/bin/mycollector --foo=bar"]
+
+  ## 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 = "json"
+
+  ## List of tag names to extract from top-level of JSON server response
+  tag_keys = ["first"]
+
+  ## List of field names to extract from JSON and add as string fields
+  string_fields = ["last"]
+
+  ## gjson query path to specify a specific chunk of JSON to be parsed with 
+  ## the above configuration. If not specified, the whole file will be parsed
+  json_query = "obj.friends"
+
+  ## holds the name of the tag of timestamp
+  # json_time_key = ""
+
+  ## holds the format of timestamp to be parsed
+  # json_time_format = ""
+```
+
+with this JSON as input:
+```json
+{
+    "obj": {
+        "name": {"first": "Tom", "last": "Anderson"},
+        "age":37,
+        "children": ["Sara","Alex","Jack"],
+        "fav.movie": "Deer Hunter",
+        "friends": [
+            {"first": "Dale", "last": "Murphy", "age": 44},
+            {"first": "Roger", "last": "Craig", "age": 68},
+            {"first": "Jane", "last": "Murphy", "age": 47}
+        ]
+    }
+}
+```
+You would recieve 3 metrics tagged with "first", and fielded with "last" and "age"
+
+```
+exec_mycollector, "first":"Dale" "last":"Murphy","age":44
+exec_mycollector, "first":"Roger" "last":"Craig","age":68
+exec_mycollector, "first":"Jane" "last":"Murphy","age":47
 ```
 
 # Value:
diff --git a/internal/config/config.go b/internal/config/config.go
index 21c71d94..5926f613 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -1261,6 +1261,50 @@ func buildParser(name string, tbl *ast.Table) (parsers.Parser, error) {
 		}
 	}
 
+	if node, ok := tbl.Fields["json_string_fields"]; 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.JSONStringFields = append(c.JSONStringFields, str.Value)
+					}
+				}
+			}
+		}
+	}
+
+	if node, ok := tbl.Fields["json_name_key"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if str, ok := kv.Value.(*ast.String); ok {
+				c.JSONNameKey = str.Value
+			}
+		}
+	}
+
+	if node, ok := tbl.Fields["json_query"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if str, ok := kv.Value.(*ast.String); ok {
+				c.JSONQuery = str.Value
+			}
+		}
+	}
+
+	if node, ok := tbl.Fields["json_time_key"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if str, ok := kv.Value.(*ast.String); ok {
+				c.JSONTimeKey = str.Value
+			}
+		}
+	}
+
+	if node, ok := tbl.Fields["json_time_format"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if str, ok := kv.Value.(*ast.String); ok {
+				c.JSONTimeFormat = str.Value
+			}
+		}
+	}
+
 	if node, ok := tbl.Fields["data_type"]; ok {
 		if kv, ok := node.(*ast.KeyValue); ok {
 			if str, ok := kv.Value.(*ast.String); ok {
@@ -1405,6 +1449,11 @@ func buildParser(name string, tbl *ast.Table) (parsers.Parser, error) {
 	delete(tbl.Fields, "separator")
 	delete(tbl.Fields, "templates")
 	delete(tbl.Fields, "tag_keys")
+	delete(tbl.Fields, "string_fields")
+	delete(tbl.Fields, "json_query")
+	delete(tbl.Fields, "json_name_key")
+	delete(tbl.Fields, "json_time_key")
+	delete(tbl.Fields, "json_time_format")
 	delete(tbl.Fields, "data_type")
 	delete(tbl.Fields, "collectd_auth_file")
 	delete(tbl.Fields, "collectd_security_level")
diff --git a/internal/config/config_test.go b/internal/config/config_test.go
index 3498d815..b136fec8 100644
--- a/internal/config/config_test.go
+++ b/internal/config/config_test.go
@@ -143,7 +143,10 @@ func TestConfig_LoadDirectory(t *testing.T) {
 		"Testdata did not produce correct memcached metadata.")
 
 	ex := inputs.Inputs["exec"]().(*exec.Exec)
-	p, err := parsers.NewJSONParser("exec", nil, nil)
+	p, err := parsers.NewParser(&parsers.Config{
+		MetricName: "exec",
+		DataFormat: "json",
+	})
 	assert.NoError(t, err)
 	ex.SetParser(p)
 	ex.Command = "/usr/bin/myothercollector --foo=bar"
diff --git a/plugins/inputs/exec/exec_test.go b/plugins/inputs/exec/exec_test.go
index c7c181b1..0bfeece5 100644
--- a/plugins/inputs/exec/exec_test.go
+++ b/plugins/inputs/exec/exec_test.go
@@ -93,7 +93,10 @@ func (r runnerMock) Run(e *Exec, command string, acc telegraf.Accumulator) ([]by
 }
 
 func TestExec(t *testing.T) {
-	parser, _ := parsers.NewJSONParser("exec", []string{}, nil)
+	parser, _ := parsers.NewParser(&parsers.Config{
+		DataFormat: "json",
+		MetricName: "exec",
+	})
 	e := &Exec{
 		runner:   newRunnerMock([]byte(validJson), nil),
 		Commands: []string{"testcommand arg1"},
@@ -119,7 +122,10 @@ func TestExec(t *testing.T) {
 }
 
 func TestExecMalformed(t *testing.T) {
-	parser, _ := parsers.NewJSONParser("exec", []string{}, nil)
+	parser, _ := parsers.NewParser(&parsers.Config{
+		DataFormat: "json",
+		MetricName: "exec",
+	})
 	e := &Exec{
 		runner:   newRunnerMock([]byte(malformedJson), nil),
 		Commands: []string{"badcommand arg1"},
@@ -132,7 +138,10 @@ func TestExecMalformed(t *testing.T) {
 }
 
 func TestCommandError(t *testing.T) {
-	parser, _ := parsers.NewJSONParser("exec", []string{}, nil)
+	parser, _ := parsers.NewParser(&parsers.Config{
+		DataFormat: "json",
+		MetricName: "exec",
+	})
 	e := &Exec{
 		runner:   newRunnerMock(nil, fmt.Errorf("exit status code 1")),
 		Commands: []string{"badcommand"},
diff --git a/plugins/inputs/http/http_test.go b/plugins/inputs/http/http_test.go
index 486edabc..4cd465bc 100644
--- a/plugins/inputs/http/http_test.go
+++ b/plugins/inputs/http/http_test.go
@@ -26,7 +26,11 @@ func TestHTTPwithJSONFormat(t *testing.T) {
 		URLs: []string{url},
 	}
 	metricName := "metricName"
-	p, _ := parsers.NewJSONParser(metricName, nil, nil)
+
+	p, _ := parsers.NewParser(&parsers.Config{
+		DataFormat: "json",
+		MetricName: "metricName",
+	})
 	plugin.SetParser(p)
 
 	var acc testutil.Accumulator
@@ -63,8 +67,11 @@ func TestHTTPHeaders(t *testing.T) {
 		URLs:    []string{url},
 		Headers: map[string]string{header: headerValue},
 	}
-	metricName := "metricName"
-	p, _ := parsers.NewJSONParser(metricName, nil, nil)
+
+	p, _ := parsers.NewParser(&parsers.Config{
+		DataFormat: "json",
+		MetricName: "metricName",
+	})
 	plugin.SetParser(p)
 
 	var acc testutil.Accumulator
@@ -83,7 +90,10 @@ func TestInvalidStatusCode(t *testing.T) {
 	}
 
 	metricName := "metricName"
-	p, _ := parsers.NewJSONParser(metricName, nil, nil)
+	p, _ := parsers.NewParser(&parsers.Config{
+		DataFormat: "json",
+		MetricName: metricName,
+	})
 	plugin.SetParser(p)
 
 	var acc testutil.Accumulator
@@ -105,8 +115,10 @@ func TestMethod(t *testing.T) {
 		Method: "POST",
 	}
 
-	metricName := "metricName"
-	p, _ := parsers.NewJSONParser(metricName, nil, nil)
+	p, _ := parsers.NewParser(&parsers.Config{
+		DataFormat: "json",
+		MetricName: "metricName",
+	})
 	plugin.SetParser(p)
 
 	var acc testutil.Accumulator
diff --git a/plugins/inputs/httpjson/httpjson.go b/plugins/inputs/httpjson/httpjson.go
index c7324dee..e09eafc9 100644
--- a/plugins/inputs/httpjson/httpjson.go
+++ b/plugins/inputs/httpjson/httpjson.go
@@ -181,7 +181,12 @@ func (h *HttpJson) gatherServer(
 		"server": serverURL,
 	}
 
-	parser, err := parsers.NewJSONParser(msrmnt_name, h.TagKeys, tags)
+	parser, err := parsers.NewParser(&parsers.Config{
+		DataFormat:  "json",
+		MetricName:  msrmnt_name,
+		TagKeys:     h.TagKeys,
+		DefaultTags: tags,
+	})
 	if err != nil {
 		return err
 	}
diff --git a/plugins/inputs/kafka_consumer/kafka_consumer_test.go b/plugins/inputs/kafka_consumer/kafka_consumer_test.go
index 9a585d6e..18f7f80b 100644
--- a/plugins/inputs/kafka_consumer/kafka_consumer_test.go
+++ b/plugins/inputs/kafka_consumer/kafka_consumer_test.go
@@ -125,7 +125,10 @@ func TestRunParserAndGatherJSON(t *testing.T) {
 	k.acc = &acc
 	defer close(k.done)
 
-	k.parser, _ = parsers.NewJSONParser("kafka_json_test", []string{}, nil)
+	k.parser, _ = parsers.NewParser(&parsers.Config{
+		DataFormat: "json",
+		MetricName: "kafka_json_test",
+	})
 	go k.receiver()
 	in <- saramaMsg(testMsgJSON)
 	acc.Wait(1)
diff --git a/plugins/inputs/kafka_consumer_legacy/kafka_consumer_legacy_test.go b/plugins/inputs/kafka_consumer_legacy/kafka_consumer_legacy_test.go
index 630aca16..38bc4829 100644
--- a/plugins/inputs/kafka_consumer_legacy/kafka_consumer_legacy_test.go
+++ b/plugins/inputs/kafka_consumer_legacy/kafka_consumer_legacy_test.go
@@ -125,7 +125,10 @@ func TestRunParserAndGatherJSON(t *testing.T) {
 	k.acc = &acc
 	defer close(k.done)
 
-	k.parser, _ = parsers.NewJSONParser("kafka_json_test", []string{}, nil)
+	k.parser, _ = parsers.NewParser(&parsers.Config{
+		DataFormat: "json",
+		MetricName: "kafka_json_test",
+	})
 	go k.receiver()
 	in <- saramaMsg(testMsgJSON)
 	acc.Wait(1)
diff --git a/plugins/inputs/mqtt_consumer/mqtt_consumer_test.go b/plugins/inputs/mqtt_consumer/mqtt_consumer_test.go
index eb5e3048..a2e5deaa 100644
--- a/plugins/inputs/mqtt_consumer/mqtt_consumer_test.go
+++ b/plugins/inputs/mqtt_consumer/mqtt_consumer_test.go
@@ -172,7 +172,10 @@ func TestRunParserAndGatherJSON(t *testing.T) {
 	n.acc = &acc
 	defer close(n.done)
 
-	n.parser, _ = parsers.NewJSONParser("nats_json_test", []string{}, nil)
+	n.parser, _ = parsers.NewParser(&parsers.Config{
+		DataFormat: "json",
+		MetricName: "nats_json_test",
+	})
 	go n.receiver()
 	in <- mqttMsg(testMsgJSON)
 
diff --git a/plugins/inputs/nats_consumer/nats_consumer_test.go b/plugins/inputs/nats_consumer/nats_consumer_test.go
index a0b84ff2..a1f49955 100644
--- a/plugins/inputs/nats_consumer/nats_consumer_test.go
+++ b/plugins/inputs/nats_consumer/nats_consumer_test.go
@@ -108,7 +108,10 @@ func TestRunParserAndGatherJSON(t *testing.T) {
 	n.acc = &acc
 	defer close(n.done)
 
-	n.parser, _ = parsers.NewJSONParser("nats_json_test", []string{}, nil)
+	n.parser, _ = parsers.NewParser(&parsers.Config{
+		DataFormat: "json",
+		MetricName: "nats_json_test",
+	})
 	n.wg.Add(1)
 	go n.receiver()
 	in <- natsMsg(testMsgJSON)
diff --git a/plugins/inputs/tcp_listener/tcp_listener_test.go b/plugins/inputs/tcp_listener/tcp_listener_test.go
index 1063cb5c..6ff40ad8 100644
--- a/plugins/inputs/tcp_listener/tcp_listener_test.go
+++ b/plugins/inputs/tcp_listener/tcp_listener_test.go
@@ -300,7 +300,10 @@ func TestRunParserJSONMsg(t *testing.T) {
 	listener.acc = &acc
 	defer close(listener.done)
 
-	listener.parser, _ = parsers.NewJSONParser("udp_json_test", []string{}, nil)
+	listener.parser, _ = parsers.NewParser(&parsers.Config{
+		DataFormat: "json",
+		MetricName: "udp_json_test",
+	})
 	listener.wg.Add(1)
 	go listener.tcpParser()
 
diff --git a/plugins/inputs/udp_listener/udp_listener_test.go b/plugins/inputs/udp_listener/udp_listener_test.go
index e0e0e862..49115434 100644
--- a/plugins/inputs/udp_listener/udp_listener_test.go
+++ b/plugins/inputs/udp_listener/udp_listener_test.go
@@ -193,7 +193,10 @@ func TestRunParserJSONMsg(t *testing.T) {
 	listener.acc = &acc
 	defer close(listener.done)
 
-	listener.parser, _ = parsers.NewJSONParser("udp_json_test", []string{}, nil)
+	listener.parser, _ = parsers.NewParser(&parsers.Config{
+		DataFormat: "json",
+		MetricName: "udp_json_test",
+	})
 	listener.wg.Add(1)
 	go listener.udpParser()
 
diff --git a/plugins/parsers/json/parser.go b/plugins/parsers/json/parser.go
index 62d17c76..9fb0816f 100644
--- a/plugins/parsers/json/parser.go
+++ b/plugins/parsers/json/parser.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/metric"
+	"github.com/tidwall/gjson"
 )
 
 var (
@@ -18,9 +19,14 @@ var (
 )
 
 type JSONParser struct {
-	MetricName  string
-	TagKeys     []string
-	DefaultTags map[string]string
+	MetricName     string
+	TagKeys        []string
+	StringFields   []string
+	JSONNameKey    string
+	JSONQuery      string
+	JSONTimeKey    string
+	JSONTimeFormat string
+	DefaultTags    map[string]string
 }
 
 func (p *JSONParser) parseArray(buf []byte) ([]telegraf.Metric, error) {
@@ -34,6 +40,9 @@ func (p *JSONParser) parseArray(buf []byte) ([]telegraf.Metric, error) {
 	}
 	for _, item := range jsonOut {
 		metrics, err = p.parseObject(metrics, item)
+		if err != nil {
+			return nil, err
+		}
 	}
 	return metrics, nil
 }
@@ -51,10 +60,42 @@ func (p *JSONParser) parseObject(metrics []telegraf.Metric, jsonOut map[string]i
 		return nil, err
 	}
 
+	//checks if json_name_key is set
+	if p.JSONNameKey != "" {
+		p.MetricName = f.Fields[p.JSONNameKey].(string)
+	}
+
+	//if time key is specified, set it to nTime
+	nTime := time.Now().UTC()
+	if p.JSONTimeKey != "" {
+		if p.JSONTimeFormat == "" {
+			err := fmt.Errorf("use of 'json_time_key' requires 'json_time_format'")
+			return nil, err
+		}
+
+		if f.Fields[p.JSONTimeKey] == nil {
+			err := fmt.Errorf("JSON time key could not be found")
+			return nil, err
+		}
+
+		timeStr, ok := f.Fields[p.JSONTimeKey].(string)
+		if !ok {
+			err := fmt.Errorf("time: %v could not be converted to string", f.Fields[p.JSONTimeKey])
+			return nil, err
+		}
+		nTime, err = time.Parse(p.JSONTimeFormat, timeStr)
+		if err != nil {
+			return nil, err
+		}
+
+		//if the year is 0, set to current year
+		if nTime.Year() == 0 {
+			nTime = nTime.AddDate(time.Now().Year(), 0, 0)
+		}
+	}
+
 	tags, nFields := p.switchFieldToTag(tags, f.Fields)
-
-	metric, err := metric.New(p.MetricName, tags, nFields, time.Now().UTC())
-
+	metric, err := metric.New(p.MetricName, tags, nFields, nTime)
 	if err != nil {
 		return nil, err
 	}
@@ -88,6 +129,17 @@ func (p *JSONParser) switchFieldToTag(tags map[string]string, fields map[string]
 
 	//remove any additional string/bool values from fields
 	for k := range fields {
+		//check if field is in StringFields
+		sField := false
+		for _, v := range p.StringFields {
+			if v == k {
+				sField = true
+			}
+		}
+		if sField {
+			continue
+		}
+
 		switch fields[k].(type) {
 		case string:
 			delete(fields, k)
@@ -99,6 +151,15 @@ func (p *JSONParser) switchFieldToTag(tags map[string]string, fields map[string]
 }
 
 func (p *JSONParser) Parse(buf []byte) ([]telegraf.Metric, error) {
+	if p.JSONQuery != "" {
+		result := gjson.GetBytes(buf, p.JSONQuery)
+		buf = []byte(result.Raw)
+		if !result.IsArray() && !result.IsObject() {
+			err := fmt.Errorf("E! Query path must lead to a JSON object or array of objects, but lead to: %v", result.Type)
+			return nil, err
+		}
+	}
+
 	buf = bytes.TrimSpace(buf)
 	buf = bytes.TrimPrefix(buf, utf8BOM)
 	if len(buf) == 0 {
@@ -126,7 +187,7 @@ func (p *JSONParser) ParseLine(line string) (telegraf.Metric, error) {
 	}
 
 	if len(metrics) < 1 {
-		return nil, fmt.Errorf("Can not parse the line: %s, for data format: influx ", line)
+		return nil, fmt.Errorf("can not parse the line: %s, for data format: json ", line)
 	}
 
 	return metrics[0], nil
diff --git a/plugins/parsers/json/parser_test.go b/plugins/parsers/json/parser_test.go
index c26b209a..39e43bec 100644
--- a/plugins/parsers/json/parser_test.go
+++ b/plugins/parsers/json/parser_test.go
@@ -1,9 +1,10 @@
 package json
 
 import (
+	"fmt"
+	"log"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
@@ -55,46 +56,46 @@ func TestParseValidJSON(t *testing.T) {
 
 	// Most basic vanilla test
 	metrics, err := parser.Parse([]byte(validJSON))
-	assert.NoError(t, err)
-	assert.Len(t, metrics, 1)
-	assert.Equal(t, "json_test", metrics[0].Name())
-	assert.Equal(t, map[string]interface{}{
+	require.NoError(t, err)
+	require.Len(t, metrics, 1)
+	require.Equal(t, "json_test", metrics[0].Name())
+	require.Equal(t, map[string]interface{}{
 		"a":   float64(5),
 		"b_c": float64(6),
 	}, metrics[0].Fields())
-	assert.Equal(t, map[string]string{}, metrics[0].Tags())
+	require.Equal(t, map[string]string{}, metrics[0].Tags())
 
 	// Test that newlines are fine
 	metrics, err = parser.Parse([]byte(validJSONNewline))
-	assert.NoError(t, err)
-	assert.Len(t, metrics, 1)
-	assert.Equal(t, "json_test", metrics[0].Name())
-	assert.Equal(t, map[string]interface{}{
+	require.NoError(t, err)
+	require.Len(t, metrics, 1)
+	require.Equal(t, "json_test", metrics[0].Name())
+	require.Equal(t, map[string]interface{}{
 		"d":   float64(7),
 		"b_d": float64(8),
 	}, metrics[0].Fields())
-	assert.Equal(t, map[string]string{}, metrics[0].Tags())
+	require.Equal(t, map[string]string{}, metrics[0].Tags())
 
 	// Test that strings without TagKeys defined are ignored
 	metrics, err = parser.Parse([]byte(validJSONTags))
-	assert.NoError(t, err)
-	assert.Len(t, metrics, 1)
-	assert.Equal(t, "json_test", metrics[0].Name())
-	assert.Equal(t, map[string]interface{}{
+	require.NoError(t, err)
+	require.Len(t, metrics, 1)
+	require.Equal(t, "json_test", metrics[0].Name())
+	require.Equal(t, map[string]interface{}{
 		"a":   float64(5),
 		"b_c": float64(6),
 	}, metrics[0].Fields())
-	assert.Equal(t, map[string]string{}, metrics[0].Tags())
+	require.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)
+	require.NoError(t, err)
+	require.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)
+	require.NoError(t, err)
+	require.Len(t, metrics, 0)
 }
 
 func TestParseLineValidJSON(t *testing.T) {
@@ -104,33 +105,33 @@ func TestParseLineValidJSON(t *testing.T) {
 
 	// Most basic vanilla test
 	metric, err := parser.ParseLine(validJSON)
-	assert.NoError(t, err)
-	assert.Equal(t, "json_test", metric.Name())
-	assert.Equal(t, map[string]interface{}{
+	require.NoError(t, err)
+	require.Equal(t, "json_test", metric.Name())
+	require.Equal(t, map[string]interface{}{
 		"a":   float64(5),
 		"b_c": float64(6),
 	}, metric.Fields())
-	assert.Equal(t, map[string]string{}, metric.Tags())
+	require.Equal(t, map[string]string{}, metric.Tags())
 
 	// Test that newlines are fine
 	metric, err = parser.ParseLine(validJSONNewline)
-	assert.NoError(t, err)
-	assert.Equal(t, "json_test", metric.Name())
-	assert.Equal(t, map[string]interface{}{
+	require.NoError(t, err)
+	require.Equal(t, "json_test", metric.Name())
+	require.Equal(t, map[string]interface{}{
 		"d":   float64(7),
 		"b_d": float64(8),
 	}, metric.Fields())
-	assert.Equal(t, map[string]string{}, metric.Tags())
+	require.Equal(t, map[string]string{}, metric.Tags())
 
 	// Test that strings without TagKeys defined are ignored
 	metric, err = parser.ParseLine(validJSONTags)
-	assert.NoError(t, err)
-	assert.Equal(t, "json_test", metric.Name())
-	assert.Equal(t, map[string]interface{}{
+	require.NoError(t, err)
+	require.Equal(t, "json_test", metric.Name())
+	require.Equal(t, map[string]interface{}{
 		"a":   float64(5),
 		"b_c": float64(6),
 	}, metric.Fields())
-	assert.Equal(t, map[string]string{}, metric.Tags())
+	require.Equal(t, map[string]string{}, metric.Tags())
 }
 
 func TestParseInvalidJSON(t *testing.T) {
@@ -139,11 +140,11 @@ func TestParseInvalidJSON(t *testing.T) {
 	}
 
 	_, err := parser.Parse([]byte(invalidJSON))
-	assert.Error(t, err)
+	require.Error(t, err)
 	_, err = parser.Parse([]byte(invalidJSON2))
-	assert.Error(t, err)
+	require.Error(t, err)
 	_, err = parser.ParseLine(invalidJSON)
-	assert.Error(t, err)
+	require.Error(t, err)
 }
 
 func TestParseWithTagKeys(t *testing.T) {
@@ -153,14 +154,14 @@ func TestParseWithTagKeys(t *testing.T) {
 		TagKeys:    []string{"wrongtagkey"},
 	}
 	metrics, err := parser.Parse([]byte(validJSONTags))
-	assert.NoError(t, err)
-	assert.Len(t, metrics, 1)
-	assert.Equal(t, "json_test", metrics[0].Name())
-	assert.Equal(t, map[string]interface{}{
+	require.NoError(t, err)
+	require.Len(t, metrics, 1)
+	require.Equal(t, "json_test", metrics[0].Name())
+	require.Equal(t, map[string]interface{}{
 		"a":   float64(5),
 		"b_c": float64(6),
 	}, metrics[0].Fields())
-	assert.Equal(t, map[string]string{}, metrics[0].Tags())
+	require.Equal(t, map[string]string{}, metrics[0].Tags())
 
 	// Test that single tag key is found and applied
 	parser = JSONParser{
@@ -168,14 +169,14 @@ func TestParseWithTagKeys(t *testing.T) {
 		TagKeys:    []string{"mytag"},
 	}
 	metrics, err = parser.Parse([]byte(validJSONTags))
-	assert.NoError(t, err)
-	assert.Len(t, metrics, 1)
-	assert.Equal(t, "json_test", metrics[0].Name())
-	assert.Equal(t, map[string]interface{}{
+	require.NoError(t, err)
+	require.Len(t, metrics, 1)
+	require.Equal(t, "json_test", metrics[0].Name())
+	require.Equal(t, map[string]interface{}{
 		"a":   float64(5),
 		"b_c": float64(6),
 	}, metrics[0].Fields())
-	assert.Equal(t, map[string]string{
+	require.Equal(t, map[string]string{
 		"mytag": "foobar",
 	}, metrics[0].Tags())
 
@@ -185,14 +186,14 @@ func TestParseWithTagKeys(t *testing.T) {
 		TagKeys:    []string{"mytag", "othertag"},
 	}
 	metrics, err = parser.Parse([]byte(validJSONTags))
-	assert.NoError(t, err)
-	assert.Len(t, metrics, 1)
-	assert.Equal(t, "json_test", metrics[0].Name())
-	assert.Equal(t, map[string]interface{}{
+	require.NoError(t, err)
+	require.Len(t, metrics, 1)
+	require.Equal(t, "json_test", metrics[0].Name())
+	require.Equal(t, map[string]interface{}{
 		"a":   float64(5),
 		"b_c": float64(6),
 	}, metrics[0].Fields())
-	assert.Equal(t, map[string]string{
+	require.Equal(t, map[string]string{
 		"mytag":    "foobar",
 		"othertag": "baz",
 	}, metrics[0].Tags())
@@ -205,13 +206,13 @@ func TestParseLineWithTagKeys(t *testing.T) {
 		TagKeys:    []string{"wrongtagkey"},
 	}
 	metric, err := parser.ParseLine(validJSONTags)
-	assert.NoError(t, err)
-	assert.Equal(t, "json_test", metric.Name())
-	assert.Equal(t, map[string]interface{}{
+	require.NoError(t, err)
+	require.Equal(t, "json_test", metric.Name())
+	require.Equal(t, map[string]interface{}{
 		"a":   float64(5),
 		"b_c": float64(6),
 	}, metric.Fields())
-	assert.Equal(t, map[string]string{}, metric.Tags())
+	require.Equal(t, map[string]string{}, metric.Tags())
 
 	// Test that single tag key is found and applied
 	parser = JSONParser{
@@ -219,13 +220,13 @@ func TestParseLineWithTagKeys(t *testing.T) {
 		TagKeys:    []string{"mytag"},
 	}
 	metric, err = parser.ParseLine(validJSONTags)
-	assert.NoError(t, err)
-	assert.Equal(t, "json_test", metric.Name())
-	assert.Equal(t, map[string]interface{}{
+	require.NoError(t, err)
+	require.Equal(t, "json_test", metric.Name())
+	require.Equal(t, map[string]interface{}{
 		"a":   float64(5),
 		"b_c": float64(6),
 	}, metric.Fields())
-	assert.Equal(t, map[string]string{
+	require.Equal(t, map[string]string{
 		"mytag": "foobar",
 	}, metric.Tags())
 
@@ -235,13 +236,13 @@ func TestParseLineWithTagKeys(t *testing.T) {
 		TagKeys:    []string{"mytag", "othertag"},
 	}
 	metric, err = parser.ParseLine(validJSONTags)
-	assert.NoError(t, err)
-	assert.Equal(t, "json_test", metric.Name())
-	assert.Equal(t, map[string]interface{}{
+	require.NoError(t, err)
+	require.Equal(t, "json_test", metric.Name())
+	require.Equal(t, map[string]interface{}{
 		"a":   float64(5),
 		"b_c": float64(6),
 	}, metric.Fields())
-	assert.Equal(t, map[string]string{
+	require.Equal(t, map[string]string{
 		"mytag":    "foobar",
 		"othertag": "baz",
 	}, metric.Tags())
@@ -258,25 +259,25 @@ func TestParseValidJSONDefaultTags(t *testing.T) {
 
 	// Most basic vanilla test
 	metrics, err := parser.Parse([]byte(validJSON))
-	assert.NoError(t, err)
-	assert.Len(t, metrics, 1)
-	assert.Equal(t, "json_test", metrics[0].Name())
-	assert.Equal(t, map[string]interface{}{
+	require.NoError(t, err)
+	require.Len(t, metrics, 1)
+	require.Equal(t, "json_test", metrics[0].Name())
+	require.Equal(t, map[string]interface{}{
 		"a":   float64(5),
 		"b_c": float64(6),
 	}, metrics[0].Fields())
-	assert.Equal(t, map[string]string{"t4g": "default"}, metrics[0].Tags())
+	require.Equal(t, map[string]string{"t4g": "default"}, metrics[0].Tags())
 
 	// Test that tagkeys and default tags are applied
 	metrics, err = parser.Parse([]byte(validJSONTags))
-	assert.NoError(t, err)
-	assert.Len(t, metrics, 1)
-	assert.Equal(t, "json_test", metrics[0].Name())
-	assert.Equal(t, map[string]interface{}{
+	require.NoError(t, err)
+	require.Len(t, metrics, 1)
+	require.Equal(t, "json_test", metrics[0].Name())
+	require.Equal(t, map[string]interface{}{
 		"a":   float64(5),
 		"b_c": float64(6),
 	}, metrics[0].Fields())
-	assert.Equal(t, map[string]string{
+	require.Equal(t, map[string]string{
 		"t4g":   "default",
 		"mytag": "foobar",
 	}, metrics[0].Tags())
@@ -294,25 +295,25 @@ func TestParseValidJSONDefaultTagsOverride(t *testing.T) {
 
 	// Most basic vanilla test
 	metrics, err := parser.Parse([]byte(validJSON))
-	assert.NoError(t, err)
-	assert.Len(t, metrics, 1)
-	assert.Equal(t, "json_test", metrics[0].Name())
-	assert.Equal(t, map[string]interface{}{
+	require.NoError(t, err)
+	require.Len(t, metrics, 1)
+	require.Equal(t, "json_test", metrics[0].Name())
+	require.Equal(t, map[string]interface{}{
 		"a":   float64(5),
 		"b_c": float64(6),
 	}, metrics[0].Fields())
-	assert.Equal(t, map[string]string{"mytag": "default"}, metrics[0].Tags())
+	require.Equal(t, map[string]string{"mytag": "default"}, metrics[0].Tags())
 
 	// Test that tagkeys override default tags
 	metrics, err = parser.Parse([]byte(validJSONTags))
-	assert.NoError(t, err)
-	assert.Len(t, metrics, 1)
-	assert.Equal(t, "json_test", metrics[0].Name())
-	assert.Equal(t, map[string]interface{}{
+	require.NoError(t, err)
+	require.Len(t, metrics, 1)
+	require.Equal(t, "json_test", metrics[0].Name())
+	require.Equal(t, map[string]interface{}{
 		"a":   float64(5),
 		"b_c": float64(6),
 	}, metrics[0].Fields())
-	assert.Equal(t, map[string]string{
+	require.Equal(t, map[string]string{
 		"mytag": "foobar",
 	}, metrics[0].Tags())
 }
@@ -325,31 +326,31 @@ func TestParseValidJSONArray(t *testing.T) {
 
 	// Most basic vanilla test
 	metrics, err := parser.Parse([]byte(validJSONArray))
-	assert.NoError(t, err)
-	assert.Len(t, metrics, 1)
-	assert.Equal(t, "json_array_test", metrics[0].Name())
-	assert.Equal(t, map[string]interface{}{
+	require.NoError(t, err)
+	require.Len(t, metrics, 1)
+	require.Equal(t, "json_array_test", metrics[0].Name())
+	require.Equal(t, map[string]interface{}{
 		"a":   float64(5),
 		"b_c": float64(6),
 	}, metrics[0].Fields())
-	assert.Equal(t, map[string]string{}, metrics[0].Tags())
+	require.Equal(t, map[string]string{}, metrics[0].Tags())
 
 	// Basic multiple datapoints
 	metrics, err = parser.Parse([]byte(validJSONArrayMultiple))
-	assert.NoError(t, err)
-	assert.Len(t, metrics, 2)
-	assert.Equal(t, "json_array_test", metrics[0].Name())
-	assert.Equal(t, map[string]interface{}{
+	require.NoError(t, err)
+	require.Len(t, metrics, 2)
+	require.Equal(t, "json_array_test", metrics[0].Name())
+	require.Equal(t, map[string]interface{}{
 		"a":   float64(5),
 		"b_c": float64(6),
 	}, metrics[0].Fields())
-	assert.Equal(t, map[string]string{}, metrics[1].Tags())
-	assert.Equal(t, "json_array_test", metrics[1].Name())
-	assert.Equal(t, map[string]interface{}{
+	require.Equal(t, map[string]string{}, metrics[1].Tags())
+	require.Equal(t, "json_array_test", metrics[1].Name())
+	require.Equal(t, map[string]interface{}{
 		"a":   float64(7),
 		"b_c": float64(8),
 	}, metrics[1].Fields())
-	assert.Equal(t, map[string]string{}, metrics[1].Tags())
+	require.Equal(t, map[string]string{}, metrics[1].Tags())
 }
 
 func TestParseArrayWithTagKeys(t *testing.T) {
@@ -359,21 +360,21 @@ func TestParseArrayWithTagKeys(t *testing.T) {
 		TagKeys:    []string{"wrongtagkey"},
 	}
 	metrics, err := parser.Parse([]byte(validJSONArrayTags))
-	assert.NoError(t, err)
-	assert.Len(t, metrics, 2)
-	assert.Equal(t, "json_array_test", metrics[0].Name())
-	assert.Equal(t, map[string]interface{}{
+	require.NoError(t, err)
+	require.Len(t, metrics, 2)
+	require.Equal(t, "json_array_test", metrics[0].Name())
+	require.Equal(t, map[string]interface{}{
 		"a":   float64(5),
 		"b_c": float64(6),
 	}, metrics[0].Fields())
-	assert.Equal(t, map[string]string{}, metrics[0].Tags())
+	require.Equal(t, map[string]string{}, metrics[0].Tags())
 
-	assert.Equal(t, "json_array_test", metrics[1].Name())
-	assert.Equal(t, map[string]interface{}{
+	require.Equal(t, "json_array_test", metrics[1].Name())
+	require.Equal(t, map[string]interface{}{
 		"a":   float64(7),
 		"b_c": float64(8),
 	}, metrics[1].Fields())
-	assert.Equal(t, map[string]string{}, metrics[1].Tags())
+	require.Equal(t, map[string]string{}, metrics[1].Tags())
 
 	// Test that single tag key is found and applied
 	parser = JSONParser{
@@ -381,23 +382,23 @@ func TestParseArrayWithTagKeys(t *testing.T) {
 		TagKeys:    []string{"mytag"},
 	}
 	metrics, err = parser.Parse([]byte(validJSONArrayTags))
-	assert.NoError(t, err)
-	assert.Len(t, metrics, 2)
-	assert.Equal(t, "json_array_test", metrics[0].Name())
-	assert.Equal(t, map[string]interface{}{
+	require.NoError(t, err)
+	require.Len(t, metrics, 2)
+	require.Equal(t, "json_array_test", metrics[0].Name())
+	require.Equal(t, map[string]interface{}{
 		"a":   float64(5),
 		"b_c": float64(6),
 	}, metrics[0].Fields())
-	assert.Equal(t, map[string]string{
+	require.Equal(t, map[string]string{
 		"mytag": "foo",
 	}, metrics[0].Tags())
 
-	assert.Equal(t, "json_array_test", metrics[1].Name())
-	assert.Equal(t, map[string]interface{}{
+	require.Equal(t, "json_array_test", metrics[1].Name())
+	require.Equal(t, map[string]interface{}{
 		"a":   float64(7),
 		"b_c": float64(8),
 	}, metrics[1].Fields())
-	assert.Equal(t, map[string]string{
+	require.Equal(t, map[string]string{
 		"mytag": "bar",
 	}, metrics[1].Tags())
 
@@ -407,24 +408,24 @@ func TestParseArrayWithTagKeys(t *testing.T) {
 		TagKeys:    []string{"mytag", "othertag"},
 	}
 	metrics, err = parser.Parse([]byte(validJSONArrayTags))
-	assert.NoError(t, err)
-	assert.Len(t, metrics, 2)
-	assert.Equal(t, "json_array_test", metrics[0].Name())
-	assert.Equal(t, map[string]interface{}{
+	require.NoError(t, err)
+	require.Len(t, metrics, 2)
+	require.Equal(t, "json_array_test", metrics[0].Name())
+	require.Equal(t, map[string]interface{}{
 		"a":   float64(5),
 		"b_c": float64(6),
 	}, metrics[0].Fields())
-	assert.Equal(t, map[string]string{
+	require.Equal(t, map[string]string{
 		"mytag":    "foo",
 		"othertag": "baz",
 	}, metrics[0].Tags())
 
-	assert.Equal(t, "json_array_test", metrics[1].Name())
-	assert.Equal(t, map[string]interface{}{
+	require.Equal(t, "json_array_test", metrics[1].Name())
+	require.Equal(t, map[string]interface{}{
 		"a":   float64(7),
 		"b_c": float64(8),
 	}, metrics[1].Fields())
-	assert.Equal(t, map[string]string{
+	require.Equal(t, map[string]string{
 		"mytag":    "bar",
 		"othertag": "baz",
 	}, metrics[1].Tags())
@@ -439,7 +440,7 @@ func TestHttpJsonBOM(t *testing.T) {
 
 	// Most basic vanilla test
 	_, err := parser.Parse(jsonBOM)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 }
 
 //for testing issue #4260
@@ -448,22 +449,212 @@ func TestJSONParseNestedArray(t *testing.T) {
 	"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
+		"total": 5,
+		"accepted": 5,
+		"rejected": 0,
+		"avg_find_time": 4,
+		"tester": "work",
+		"tester2": "don't want this",
+		"tester3": {
+			"hello":"sup",
+			"fun":"money",
+			"break":9
+		}
 	}
 	}`
 
 	parser := JSONParser{
 		MetricName: "json_test",
-		TagKeys:    []string{"total_devices", "total_threads", "shares_tester", "shares_tester3"},
+		TagKeys:    []string{"total_devices", "total_threads", "shares_tester3_fun"},
+	}
+
+	metrics, err := parser.Parse([]byte(testString))
+	log.Printf("m[0] name: %v, tags: %v, fields: %v", metrics[0].Name(), metrics[0].Tags(), metrics[0].Fields())
+	require.NoError(t, err)
+	require.Equal(t, len(parser.TagKeys), len(metrics[0].Tags()))
+}
+
+func TestJSONQueryErrorOnArray(t *testing.T) {
+	testString := `{
+		"total_devices": 5,
+		"total_threads": 10,
+		"shares": {
+			"total": 5,
+			"accepted": 6,
+			"test_string": "don't want this",
+			"test_obj": {
+				"hello":"sup",
+				"fun":"money",
+				"break":9
+			},
+			"myArr":[4,5,6]
+		}
+	}`
+
+	parser := JSONParser{
+		MetricName: "json_test",
+		TagKeys:    []string{},
+		JSONQuery:  "shares.myArr",
+	}
+
+	_, err := parser.Parse([]byte(testString))
+	require.Error(t, err)
+}
+
+func TestArrayOfObjects(t *testing.T) {
+	testString := `{
+		"meta": {
+			"info":9,
+			"shares": [{
+				"channel": 6,
+				"time": 1130,
+				"ice":"man"
+			},
+			{
+				"channel": 5,
+				"time": 1030,
+				"ice":"bucket"
+			},
+			{
+				"channel": 10,
+				"time": 330,
+				"ice":"cream"
+			}]
+		},
+		"more_stuff":"junk"
+	}`
+
+	parser := JSONParser{
+		MetricName: "json_test",
+		TagKeys:    []string{"ice"},
+		JSONQuery:  "meta.shares",
 	}
 
 	metrics, err := parser.Parse([]byte(testString))
 	require.NoError(t, err)
-	require.Equal(t, len(parser.TagKeys), len(metrics[0].Tags()))
+	require.Equal(t, 3, len(metrics))
+}
+
+func TestUseCaseJSONQuery(t *testing.T) {
+	testString := `{
+		"obj": {
+			"name": {"first": "Tom", "last": "Anderson"},
+			"age":37,
+			"children": ["Sara","Alex","Jack"],
+			"fav.movie": "Deer Hunter",
+			"friends": [
+				{"first": "Dale", "last": "Murphy", "age": 44},
+				{"first": "Roger", "last": "Craig", "age": 68},
+				{"first": "Jane", "last": "Murphy", "age": 47}
+			]
+		}
+	}`
+
+	parser := JSONParser{
+		MetricName:   "json_test",
+		StringFields: []string{"last"},
+		TagKeys:      []string{"first"},
+		JSONQuery:    "obj.friends",
+	}
+
+	metrics, err := parser.Parse([]byte(testString))
+	require.NoError(t, err)
+	require.Equal(t, 3, len(metrics))
+	require.Equal(t, metrics[0].Fields()["last"], "Murphy")
+}
+
+func TestTimeParser(t *testing.T) {
+	testString := `[
+		{
+			"a": 5,
+			"b": {
+				"c": 6,
+				"time":"04 Jan 06 15:04 MST"
+			},
+			"my_tag_1": "foo",
+			"my_tag_2": "baz"
+		},
+		{
+			"a": 7,
+			"b": {
+				"c": 8,
+				"time":"11 Jan 07 15:04 MST"
+			},
+			"my_tag_1": "bar",
+			"my_tag_2": "baz"
+		}
+	]`
+
+	parser := JSONParser{
+		MetricName:     "json_test",
+		JSONTimeKey:    "b_time",
+		JSONTimeFormat: "02 Jan 06 15:04 MST",
+	}
+	metrics, err := parser.Parse([]byte(testString))
+	require.NoError(t, err)
+	require.Equal(t, 2, len(metrics))
+	require.Equal(t, false, metrics[0].Time() == metrics[1].Time())
+}
+
+func TestTimeErrors(t *testing.T) {
+	testString := `{
+		"a": 5,
+		"b": {
+			"c": 6,
+			"time":"04 Jan 06 15:04 MST"
+		},
+		"my_tag_1": "foo",
+		"my_tag_2": "baz"
+	}`
+
+	parser := JSONParser{
+		MetricName:     "json_test",
+		JSONTimeKey:    "b_time",
+		JSONTimeFormat: "02 January 06 15:04 MST",
+	}
+
+	metrics, err := parser.Parse([]byte(testString))
+	require.Error(t, err)
+	require.Equal(t, 0, len(metrics))
+
+	testString2 := `{
+		"a": 5,
+		"b": {
+			"c": 6
+		},
+		"my_tag_1": "foo",
+		"my_tag_2": "baz"
+	}`
+
+	parser = JSONParser{
+		MetricName:     "json_test",
+		JSONTimeKey:    "b_time",
+		JSONTimeFormat: "02 January 06 15:04 MST",
+	}
+
+	metrics, err = parser.Parse([]byte(testString2))
+	log.Printf("err: %v", err)
+	require.Error(t, err)
+	require.Equal(t, 0, len(metrics))
+	require.Equal(t, fmt.Errorf("JSON time key could not be found"), err)
+}
+
+func TestNameKey(t *testing.T) {
+	testString := `{
+		"a": 5,
+		"b": {
+			"c": "this is my name",
+			"time":"04 Jan 06 15:04 MST"
+		},
+		"my_tag_1": "foo",
+		"my_tag_2": "baz"
+	}`
+
+	parser := JSONParser{
+		JSONNameKey: "b_c",
+	}
+
+	metrics, err := parser.Parse([]byte(testString))
+	require.NoError(t, err)
+	require.Equal(t, "this is my name", metrics[0].Name())
 }
diff --git a/plugins/parsers/registry.go b/plugins/parsers/registry.go
index e198cb2c..89fdc9a1 100644
--- a/plugins/parsers/registry.go
+++ b/plugins/parsers/registry.go
@@ -59,9 +59,22 @@ type Config struct {
 
 	// TagKeys only apply to JSON data
 	TagKeys []string
+	// FieldKeys only apply to JSON
+	JSONStringFields []string
+
+	JSONNameKey string
 	// MetricName applies to JSON & value. This will be the name of the measurement.
 	MetricName string
 
+	// holds a gjson path for json parser
+	JSONQuery string
+
+	// key of time
+	JSONTimeKey string
+
+	// time format
+	JSONTimeFormat string
+
 	// Authentication file for collectd
 	CollectdAuthFile string
 	// One of none (default), sign, or encrypt
@@ -108,8 +121,14 @@ func NewParser(config *Config) (Parser, error) {
 	var parser Parser
 	switch config.DataFormat {
 	case "json":
-		parser, err = NewJSONParser(config.MetricName,
-			config.TagKeys, config.DefaultTags)
+		parser = newJSONParser(config.MetricName,
+			config.TagKeys,
+			config.JSONNameKey,
+			config.JSONStringFields,
+			config.JSONQuery,
+			config.JSONTimeKey,
+			config.JSONTimeFormat,
+			config.DefaultTags)
 	case "value":
 		parser, err = NewValueParser(config.MetricName,
 			config.DataType, config.DefaultTags)
@@ -151,6 +170,30 @@ func NewParser(config *Config) (Parser, error) {
 	return parser, err
 }
 
+func newJSONParser(
+	metricName string,
+	tagKeys []string,
+	jsonNameKey string,
+	stringFields []string,
+	jsonQuery string,
+	timeKey string,
+	timeFormat string,
+	defaultTags map[string]string,
+) Parser {
+	parser := &json.JSONParser{
+		MetricName:     metricName,
+		TagKeys:        tagKeys,
+		StringFields:   stringFields,
+		JSONNameKey:    jsonNameKey,
+		JSONQuery:      jsonQuery,
+		JSONTimeKey:    timeKey,
+		JSONTimeFormat: timeFormat,
+		DefaultTags:    defaultTags,
+	}
+	return parser
+}
+
+//Deprecated: Use NewParser to get a JSONParser object
 func newGrokParser(metricName string,
 	patterns []string,
 	nPatterns []string,

From 545b59f12e90cf0d936581b8869529d5896d0cbc Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 22 Aug 2018 19:28:47 -0700
Subject: [PATCH 708/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc2998d4..b03ba6a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -73,7 +73,7 @@
 - [#4539](https://github.com/influxdata/telegraf/pull/4539): Add logfmt parser plugin.
 - [#4551](https://github.com/influxdata/telegraf/pull/4551): Add parser processor plugin.
 - [#4559](https://github.com/influxdata/telegraf/pull/4559): Add Icinga2 input plugin.
-
+- [#4351](https://github.com/influxdata/telegraf/pull/4351): Add name, time, path and string field options to JSON parser.
 
 ## v1.7.4 [unreleased]
 

From 2b026374ec474eea4ecc87cbd67e1ff095fa381e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 23 Aug 2018 11:46:41 -0700
Subject: [PATCH 709/835] Update kafka_consumer sample config in README

---
 plugins/inputs/kafka_consumer/README.md | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/plugins/inputs/kafka_consumer/README.md b/plugins/inputs/kafka_consumer/README.md
index b6fc8fc8..2bc290c6 100644
--- a/plugins/inputs/kafka_consumer/README.md
+++ b/plugins/inputs/kafka_consumer/README.md
@@ -14,17 +14,20 @@ and use the old zookeeper connection method.
 ```toml
 # Read metrics from Kafka topic(s)
 [[inputs.kafka_consumer]]
+  ## kafka servers
+  brokers = ["localhost:9092"]
   ## topic(s) to consume
   topics = ["telegraf"]
-  brokers = ["localhost:9092"]
-  ## the name of the consumer group
-  consumer_group = "telegraf_metrics_consumers"
-  ## Offset (must be either "oldest" or "newest")
-  offset = "oldest"
 
-  ## Optional client id
+  ## Optional Client id
   # client_id = "Telegraf"
 
+  ## Set the minimal supported Kafka version.  Setting this enables the use of new
+  ## Kafka features and APIs.  Of particular interest, lz4 compression
+  ## requires at least version 0.10.0.0.
+  ##   ex: version = "1.1.0"
+  # version = ""
+
   ## Optional TLS Config
   # tls_ca = "/etc/telegraf/ca.pem"
   # tls_cert = "/etc/telegraf/cert.pem"
@@ -36,6 +39,11 @@ and use the old zookeeper connection method.
   # 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:

From 36959abce9b2874dfd32c87376260d26419f6eb8 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 23 Aug 2018 13:11:39 -0700
Subject: [PATCH 710/835] Fix toml error in converter processor README

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

diff --git a/plugins/processors/converter/README.md b/plugins/processors/converter/README.md
index f69c8728..939b44ce 100644
--- a/plugins/processors/converter/README.md
+++ b/plugins/processors/converter/README.md
@@ -12,7 +12,7 @@ will overwrite one another.
 ### Configuration:
 ```toml
 # Convert values to another metric value type
-[processors.converter]
+[[processors.converter]]
   ## Tags to convert
   ##
   ## The table key determines the target type, and the array of key-values
@@ -42,7 +42,7 @@ will overwrite one another.
 ### Examples:
 
 ```toml
-[processors.converter]
+[[processors.converter]]
   [processors.converter.tags]
     string = ["port"]
 

From 16a6feda4ab55672efe6709ab707c04eb47f176a Mon Sep 17 00:00:00 2001
From: rbrendler <41023594+rbrendler@users.noreply.github.com>
Date: Thu, 23 Aug 2018 15:30:59 -0500
Subject: [PATCH 711/835] Fix burrow_group.offset calculation for Burrow plugin
 (#4584)

---
 plugins/inputs/burrow/README.md      | 6 ++++--
 plugins/inputs/burrow/burrow.go      | 6 ++----
 plugins/inputs/burrow/burrow_test.go | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/inputs/burrow/README.md b/plugins/inputs/burrow/README.md
index 19073a6e..d30a054d 100644
--- a/plugins/inputs/burrow/README.md
+++ b/plugins/inputs/burrow/README.md
@@ -50,7 +50,7 @@ Supported Burrow version: `1.x`
   # insecure_skip_verify = false
 ```
 
-### Partition Status mappings
+### Group/Partition Status mappings
 
 * `OK` = 1
 * `NOT_FOUND` = 2
@@ -66,9 +66,11 @@ Supported Burrow version: `1.x`
 * `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`)
+  - partition_count (int, `number of partitions`)
+  - offset (int64, `total offset of all partitions`)
   - total_lag (int64, `totallag`)
   - lag (int64, `maxlag.current_lag || 0`)
+  - timestamp (int64, `end.timestamp`)
 
 * `burrow_partition` (one event per each topic partition)
   - status (string, see Partition Status mappings)
diff --git a/plugins/inputs/burrow/burrow.go b/plugins/inputs/burrow/burrow.go
index 91e3ffe1..9c532e3b 100644
--- a/plugins/inputs/burrow/burrow.go
+++ b/plugins/inputs/burrow/burrow.go
@@ -397,13 +397,11 @@ func (b *burrow) genGroupStatusMetrics(r *apiResponse, cluster, group string, ac
 		partitionCount = len(r.Status.Partitions)
 	}
 
-	// get max timestamp and offset from partitions list
+	// get max timestamp and total 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
-		}
+		offset += partition.End.Offset
 		if partition.End.Timestamp > timestamp {
 			timestamp = partition.End.Timestamp
 		}
diff --git a/plugins/inputs/burrow/burrow_test.go b/plugins/inputs/burrow/burrow_test.go
index 5ea85798..3847a5d7 100644
--- a/plugins/inputs/burrow/burrow_test.go
+++ b/plugins/inputs/burrow/burrow_test.go
@@ -160,7 +160,7 @@ func TestBurrowGroup(t *testing.T) {
 			"partition_count": 3,
 			"total_lag":       int64(0),
 			"lag":             int64(0),
-			"offset":          int64(431323195),
+			"offset":          int64(431323195 + 431322962 + 428636563),
 			"timestamp":       int64(1515609490008),
 		},
 	}

From d676381a0493533ca6855374e4ec9a45fedde44b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 23 Aug 2018 13:32:18 -0700
Subject: [PATCH 712/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b03ba6a9..c385146e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -81,6 +81,7 @@
 
 - [#4534](https://github.com/influxdata/telegraf/pull/4534): Skip unserializable metric in influxDB UDP output.
 - [#4554](https://github.com/influxdata/telegraf/pull/4554): Fix powerdns input tests.
+- [#4584](https://github.com/influxdata/telegraf/pull/4584): Fix burrow_group offset calculation for burrow input.
 
 ## v1.7.3 [2018-08-07]
 

From 14d9ef4f0c677387e08739254b670a970689487e Mon Sep 17 00:00:00 2001
From: prashanthjbabu <prashanthjbabu@gmail.com>
Date: Fri, 24 Aug 2018 02:20:19 +0530
Subject: [PATCH 713/835] Add result_code value for errors running ping command
 (#4550)

---
 plugins/inputs/ping/README.md | 1 +
 plugins/inputs/ping/ping.go   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/plugins/inputs/ping/README.md b/plugins/inputs/ping/README.md
index eadc60ab..846430a4 100644
--- a/plugins/inputs/ping/README.md
+++ b/plugins/inputs/ping/README.md
@@ -39,6 +39,7 @@ urls = ["www.google.com"] # required
 - result_code
     - 0: success
     - 1: no such host
+    - 2: ping error
 
 ### Tags:
 
diff --git a/plugins/inputs/ping/ping.go b/plugins/inputs/ping/ping.go
index 7ddbf275..46afb206 100644
--- a/plugins/inputs/ping/ping.go
+++ b/plugins/inputs/ping/ping.go
@@ -117,6 +117,7 @@ func (p *Ping) Gather(acc telegraf.Accumulator) error {
 					} else {
 						acc.AddError(fmt.Errorf("host %s: %s", u, err))
 					}
+					fields["result_code"] = 2
 					acc.AddFields("ping", fields, tags)
 					return
 				}
@@ -126,6 +127,7 @@ func (p *Ping) Gather(acc telegraf.Accumulator) error {
 			if err != nil {
 				// fatal error
 				acc.AddError(fmt.Errorf("%s: %s", err, u))
+				fields["result_code"] = 2
 				acc.AddFields("ping", fields, tags)
 				return
 			}

From c82701771151a1489376d7421be932f086398bf6 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 23 Aug 2018 13:52:55 -0700
Subject: [PATCH 714/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c385146e..6ee8d88c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -82,6 +82,7 @@
 - [#4534](https://github.com/influxdata/telegraf/pull/4534): Skip unserializable metric in influxDB UDP output.
 - [#4554](https://github.com/influxdata/telegraf/pull/4554): Fix powerdns input tests.
 - [#4584](https://github.com/influxdata/telegraf/pull/4584): Fix burrow_group offset calculation for burrow input.
+- [#4550](https://github.com/influxdata/telegraf/pull/4550): Add result_code value for errors running ping command.
 
 ## v1.7.3 [2018-08-07]
 

From 0785821a802d801519e47a4774c473553f76967d Mon Sep 17 00:00:00 2001
From: Tracy Boggiano <tracy@tracyboggiano.com>
Date: Thu, 23 Aug 2018 19:59:21 -0400
Subject: [PATCH 715/835] Add forwarded records to sqlserver input (#4571)

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

diff --git a/plugins/inputs/sqlserver/sqlserver.go b/plugins/inputs/sqlserver/sqlserver.go
index 41a8b7ec..1ca29eca 100644
--- a/plugins/inputs/sqlserver/sqlserver.go
+++ b/plugins/inputs/sqlserver/sqlserver.go
@@ -451,7 +451,8 @@ WHERE	(
 			'Buffer cache hit ratio base',
 			'Backup/Restore Throughput/sec',
 			'Total Server Memory (KB)',
-			'Target Server Memory (KB)'
+			'Target Server Memory (KB)',
+			'Forwarded Recs/sec'
 		)
 		) OR (
 			instance_name IN ('_Total','Column store object pool')

From 1beb3e73e68b99098583d13e911fcd5d206d134c Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 24 Aug 2018 10:23:15 -0700
Subject: [PATCH 716/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ee8d88c..8d061b6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -74,6 +74,7 @@
 - [#4551](https://github.com/influxdata/telegraf/pull/4551): Add parser processor plugin.
 - [#4559](https://github.com/influxdata/telegraf/pull/4559): Add Icinga2 input plugin.
 - [#4351](https://github.com/influxdata/telegraf/pull/4351): Add name, time, path and string field options to JSON parser.
+- [#4571](https://github.com/influxdata/telegraf/pull/4571): Add forwarded records to sqlserver input.
 
 ## v1.7.4 [unreleased]
 

From 3d84cee872aafb4267907d0281039dfd27ef5297 Mon Sep 17 00:00:00 2001
From: Leandro Piccilli <lpic10@users.noreply.github.com>
Date: Fri, 24 Aug 2018 23:58:41 +0200
Subject: [PATCH 717/835] Add Kibana input plugin  (#4585)

---
 plugins/inputs/all/all.go              |   1 +
 plugins/inputs/kibana/README.md        |  63 +++++++
 plugins/inputs/kibana/kibana.go        | 230 +++++++++++++++++++++++++
 plugins/inputs/kibana/kibana_test.go   |  66 +++++++
 plugins/inputs/kibana/testdata_test.go | 199 +++++++++++++++++++++
 5 files changed, 559 insertions(+)
 create mode 100644 plugins/inputs/kibana/README.md
 create mode 100644 plugins/inputs/kibana/kibana.go
 create mode 100644 plugins/inputs/kibana/kibana_test.go
 create mode 100644 plugins/inputs/kibana/testdata_test.go

diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index 17762d1c..feb46236 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -57,6 +57,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/kapacitor"
 	_ "github.com/influxdata/telegraf/plugins/inputs/kernel"
 	_ "github.com/influxdata/telegraf/plugins/inputs/kernel_vmstat"
+	_ "github.com/influxdata/telegraf/plugins/inputs/kibana"
 	_ "github.com/influxdata/telegraf/plugins/inputs/kubernetes"
 	_ "github.com/influxdata/telegraf/plugins/inputs/leofs"
 	_ "github.com/influxdata/telegraf/plugins/inputs/linux_sysctl_fs"
diff --git a/plugins/inputs/kibana/README.md b/plugins/inputs/kibana/README.md
new file mode 100644
index 00000000..7d885aed
--- /dev/null
+++ b/plugins/inputs/kibana/README.md
@@ -0,0 +1,63 @@
+# Kibana input plugin
+
+The [kibana](https://www.elastic.co/) plugin queries Kibana status API to
+obtain the health status of Kibana and some useful metrics.
+
+This plugin has been tested and works on Kibana 6.x versions.
+
+### Configuration
+
+```toml
+[[inputs.kibana]]
+  ## specify a list of one or more Kibana servers
+  servers = ["http://localhost:5601"]
+
+  ## Timeout for HTTP requests
+  timeout = "5s"
+
+  ## HTTP Basic Auth credentials
+  # 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
+```
+
+### 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
+
+- kibana
+  - status_code: integer (1, 2, 3, 0)
+  - heap_max_bytes: integer
+  - heap_used_bytes: integer
+  - uptime_ms: integer
+  - response_time_avg_ms: float
+  - response_time_max_ms: integer
+  - concurrent_connections: integer
+  - requests_per_sec: float
+
+### Tags
+
+- status (Kibana health: green, yellow, red)
+- name (Kibana reported name)
+- uuid (Kibana reported UUID)
+- version (Kibana version)
+- source (Kibana server hostname or IP)
+
+### Example Output
+
+kibana,host=myhost,name=my-kibana,source=localhost:5601,version=6.3.2 concurrent_connections=0i,heap_max_bytes=136478720i,heap_used_bytes=119231088i,response_time_avg_ms=0i,response_time_max_ms=0i,status="green",status_code=1i,uptime_ms=2187428019i 1534864502000000000
diff --git a/plugins/inputs/kibana/kibana.go b/plugins/inputs/kibana/kibana.go
new file mode 100644
index 00000000..0e21ad80
--- /dev/null
+++ b/plugins/inputs/kibana/kibana.go
@@ -0,0 +1,230 @@
+package kibana
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+const statusPath = "/api/status"
+
+type kibanaStatus struct {
+	Name    string  `json:"name"`
+	Version version `json:"version"`
+	Status  status  `json:"status"`
+	Metrics metrics `json:"metrics"`
+}
+
+type version struct {
+	Number        string `json:"number"`
+	BuildHash     string `json:"build_hash"`
+	BuildNumber   int    `json:"build_number"`
+	BuildSnapshot bool   `json:"build_snapshot"`
+}
+
+type status struct {
+	Overall  overallStatus `json:"overall"`
+	Statuses interface{}   `json:"statuses"`
+}
+
+type overallStatus struct {
+	State string `json:"state"`
+}
+
+type metrics struct {
+	UptimeInMillis             int64         `json:"uptime_in_millis"`
+	ConcurrentConnections      int64         `json:"concurrent_connections"`
+	CollectionIntervalInMilles int64         `json:"collection_interval_in_millis"`
+	ResponseTimes              responseTimes `json:"response_times"`
+	Process                    process       `json:"process"`
+	Requests                   requests      `json:"requests"`
+}
+
+type responseTimes struct {
+	AvgInMillis float64 `json:"avg_in_millis"`
+	MaxInMillis int64   `json:"max_in_millis"`
+}
+
+type process struct {
+	Mem mem `json:"mem"`
+}
+
+type requests struct {
+	Total int64 `json:"total"`
+}
+
+type mem struct {
+	HeapMaxInBytes  int64 `json:"heap_max_in_bytes"`
+	HeapUsedInBytes int64 `json:"heap_used_in_bytes"`
+}
+
+const sampleConfig = `
+  ## specify a list of one or more Kibana servers
+  servers = ["http://localhost:5601"]
+
+  ## Timeout for HTTP requests
+  timeout = "5s"
+
+  ## HTTP Basic Auth credentials
+  # 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
+`
+
+type Kibana struct {
+	Local    bool
+	Servers  []string
+	Username string
+	Password string
+	Timeout  internal.Duration
+	tls.ClientConfig
+
+	client *http.Client
+}
+
+func NewKibana() *Kibana {
+	return &Kibana{
+		Timeout: internal.Duration{Duration: time.Second * 5},
+	}
+}
+
+// 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 (k *Kibana) SampleConfig() string {
+	return sampleConfig
+}
+
+// Description returns the plugin description.
+func (k *Kibana) Description() string {
+	return "Read status information from one or more Kibana servers"
+}
+
+func (k *Kibana) Gather(acc telegraf.Accumulator) error {
+	if k.client == nil {
+		client, err := k.createHttpClient()
+
+		if err != nil {
+			return err
+		}
+		k.client = client
+	}
+
+	var wg sync.WaitGroup
+	wg.Add(len(k.Servers))
+
+	for _, serv := range k.Servers {
+		go func(baseUrl string, acc telegraf.Accumulator) {
+			defer wg.Done()
+			if err := k.gatherKibanaStatus(baseUrl, acc); err != nil {
+				acc.AddError(fmt.Errorf("[url=%s]: %s", baseUrl, err))
+				return
+			}
+		}(serv, acc)
+	}
+
+	wg.Wait()
+	return nil
+}
+
+func (k *Kibana) createHttpClient() (*http.Client, error) {
+	tlsCfg, err := k.ClientConfig.TLSConfig()
+	if err != nil {
+		return nil, err
+	}
+
+	client := &http.Client{
+		Transport: &http.Transport{
+			TLSClientConfig: tlsCfg,
+		},
+		Timeout: k.Timeout.Duration,
+	}
+
+	return client, nil
+}
+
+func (k *Kibana) gatherKibanaStatus(baseUrl string, acc telegraf.Accumulator) error {
+
+	kibanaStatus := &kibanaStatus{}
+	url := baseUrl + statusPath
+
+	host, err := k.gatherJsonData(url, kibanaStatus)
+	if err != nil {
+		return err
+	}
+
+	fields := make(map[string]interface{})
+	tags := make(map[string]string)
+
+	tags["name"] = kibanaStatus.Name
+	tags["source"] = host
+	tags["version"] = kibanaStatus.Version.Number
+	tags["status"] = kibanaStatus.Status.Overall.State
+
+	fields["status_code"] = mapHealthStatusToCode(kibanaStatus.Status.Overall.State)
+
+	fields["uptime_ms"] = kibanaStatus.Metrics.UptimeInMillis
+	fields["concurrent_connections"] = kibanaStatus.Metrics.ConcurrentConnections
+	fields["heap_max_bytes"] = kibanaStatus.Metrics.Process.Mem.HeapMaxInBytes
+	fields["heap_used_bytes"] = kibanaStatus.Metrics.Process.Mem.HeapUsedInBytes
+	fields["response_time_avg_ms"] = kibanaStatus.Metrics.ResponseTimes.AvgInMillis
+	fields["response_time_max_ms"] = kibanaStatus.Metrics.ResponseTimes.MaxInMillis
+	fields["requests_per_sec"] = float64(kibanaStatus.Metrics.Requests.Total) / float64(kibanaStatus.Metrics.CollectionIntervalInMilles) * 1000
+
+	acc.AddFields("kibana", fields, tags)
+
+	return nil
+}
+
+func (k *Kibana) gatherJsonData(url string, v interface{}) (host string, err error) {
+
+	request, err := http.NewRequest("GET", url, nil)
+
+	if (k.Username != "") || (k.Password != "") {
+		request.SetBasicAuth(k.Username, k.Password)
+	}
+
+	response, err := k.client.Do(request)
+	if err != nil {
+		return "", err
+	}
+
+	defer response.Body.Close()
+
+	if err = json.NewDecoder(response.Body).Decode(v); err != nil {
+		return request.Host, err
+	}
+
+	return request.Host, nil
+}
+
+func init() {
+	inputs.Add("kibana", func() telegraf.Input {
+		return NewKibana()
+	})
+}
diff --git a/plugins/inputs/kibana/kibana_test.go b/plugins/inputs/kibana/kibana_test.go
new file mode 100644
index 00000000..ad5e32d2
--- /dev/null
+++ b/plugins/inputs/kibana/kibana_test.go
@@ -0,0 +1,66 @@
+package kibana
+
+import (
+	"io/ioutil"
+	"net/http"
+	"strings"
+	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+)
+
+func defaultTags() map[string]string {
+	return map[string]string{
+		"name":    "my-kibana",
+		"source":  "example.com:5601",
+		"version": "6.3.2",
+		"status":  "green",
+	}
+}
+
+type transportMock struct {
+	statusCode int
+	body       string
+}
+
+func newTransportMock(statusCode int, body string) http.RoundTripper {
+	return &transportMock{
+		statusCode: statusCode,
+		body:       body,
+	}
+}
+
+func (t *transportMock) RoundTrip(r *http.Request) (*http.Response, error) {
+	res := &http.Response{
+		Header:     make(http.Header),
+		Request:    r,
+		StatusCode: t.statusCode,
+	}
+	res.Header.Set("Content-Type", "application/json")
+	res.Body = ioutil.NopCloser(strings.NewReader(t.body))
+	return res, nil
+}
+
+func checkKibanaStatusResult(t *testing.T, acc *testutil.Accumulator) {
+	tags := defaultTags()
+	acc.AssertContainsTaggedFields(t, "kibana", kibanaStatusExpected, tags)
+}
+
+func TestGather(t *testing.T) {
+	ks := newKibanahWithClient()
+	ks.Servers = []string{"http://example.com:5601"}
+	ks.client.Transport = newTransportMock(http.StatusOK, kibanaStatusResponse)
+
+	var acc testutil.Accumulator
+	if err := acc.GatherError(ks.Gather); err != nil {
+		t.Fatal(err)
+	}
+
+	checkKibanaStatusResult(t, &acc)
+}
+
+func newKibanahWithClient() *Kibana {
+	ks := NewKibana()
+	ks.client = &http.Client{}
+	return ks
+}
diff --git a/plugins/inputs/kibana/testdata_test.go b/plugins/inputs/kibana/testdata_test.go
new file mode 100644
index 00000000..ec393bb1
--- /dev/null
+++ b/plugins/inputs/kibana/testdata_test.go
@@ -0,0 +1,199 @@
+package kibana
+
+const kibanaStatusResponse = `
+{
+	"name": "my-kibana",
+	"uuid": "00000000-0000-0000-0000-000000000000",
+	"version": {
+		"number": "6.3.2",
+		"build_hash": "53d0c6758ac3fb38a3a1df198c1d4c87765e63f7",
+		"build_number": 17307,
+		"build_snapshot": false
+	},
+	"status": {
+		"overall": {
+			"state": "green",
+			"title": "Green",
+			"nickname": "Looking good",
+			"icon": "success",
+			"since": "2018-07-27T07:37:42.567Z"
+		},
+		"statuses": [{
+			"id": "plugin:kibana@6.3.2",
+			"state": "green",
+			"icon": "success",
+			"message": "Ready",
+			"since": "2018-07-27T07:37:42.567Z"
+		},
+		{
+			"id": "plugin:elasticsearch@6.3.2",
+			"state": "green",
+			"icon": "success",
+			"message": "Ready",
+			"since": "2018-07-28T10:07:04.920Z"
+		},
+		{
+			"id": "plugin:xpack_main@6.3.2",
+			"state": "green",
+			"icon": "success",
+			"message": "Ready",
+			"since": "2018-07-28T10:07:02.393Z"
+		},
+		{
+			"id": "plugin:searchprofiler@6.3.2",
+			"state": "green",
+			"icon": "success",
+			"message": "Ready",
+			"since": "2018-07-28T10:07:02.395Z"
+		},
+		{
+			"id": "plugin:tilemap@6.3.2",
+			"state": "green",
+			"icon": "success",
+			"message": "Ready",
+			"since": "2018-07-28T10:07:02.396Z"
+		},
+		{
+			"id": "plugin:watcher@6.3.2",
+			"state": "green",
+			"icon": "success",
+			"message": "Ready",
+			"since": "2018-07-28T10:07:02.397Z"
+		},
+		{
+			"id": "plugin:license_management@6.3.2",
+			"state": "green",
+			"icon": "success",
+			"message": "Ready",
+			"since": "2018-07-27T07:37:42.668Z"
+		},
+		{
+			"id": "plugin:index_management@6.3.2",
+			"state": "green",
+			"icon": "success",
+			"message": "Ready",
+			"since": "2018-07-28T10:07:02.399Z"
+		},
+		{
+			"id": "plugin:timelion@6.3.2",
+			"state": "green",
+			"icon": "success",
+			"message": "Ready",
+			"since": "2018-07-27T07:37:42.912Z"
+		},
+		{
+			"id": "plugin:logtrail@0.1.29",
+			"state": "green",
+			"icon": "success",
+			"message": "Ready",
+			"since": "2018-07-27T07:37:42.919Z"
+		},
+		{
+			"id": "plugin:monitoring@6.3.2",
+			"state": "green",
+			"icon": "success",
+			"message": "Ready",
+			"since": "2018-07-27T07:37:42.922Z"
+		},
+		{
+			"id": "plugin:grokdebugger@6.3.2",
+			"state": "green",
+			"icon": "success",
+			"message": "Ready",
+			"since": "2018-07-28T10:07:02.400Z"
+		},
+		{
+			"id": "plugin:dashboard_mode@6.3.2",
+			"state": "green",
+			"icon": "success",
+			"message": "Ready",
+			"since": "2018-07-27T07:37:42.928Z"
+		},
+		{
+			"id": "plugin:logstash@6.3.2",
+			"state": "green",
+			"icon": "success",
+			"message": "Ready",
+			"since": "2018-07-28T10:07:02.401Z"
+		},
+		{
+			"id": "plugin:apm@6.3.2",
+			"state": "green",
+			"icon": "success",
+			"message": "Ready",
+			"since": "2018-07-27T07:37:42.950Z"
+		},
+		{
+			"id": "plugin:console@6.3.2",
+			"state": "green",
+			"icon": "success",
+			"message": "Ready",
+			"since": "2018-07-27T07:37:42.958Z"
+		},
+		{
+			"id": "plugin:console_extensions@6.3.2",
+			"state": "green",
+			"icon": "success",
+			"message": "Ready",
+			"since": "2018-07-27T07:37:42.961Z"
+		},
+		{
+			"id": "plugin:metrics@6.3.2",
+			"state": "green",
+			"icon": "success",
+			"message": "Ready",
+			"since": "2018-07-27T07:37:42.965Z"
+		},
+		{
+			"id": "plugin:reporting@6.3.2",
+			"state": "green",
+			"icon": "success",
+			"message": "Ready",
+			"since": "2018-07-28T10:07:02.402Z"
+		}]
+	},
+	"metrics": {
+		"last_updated": "2018-08-21T11:24:25.823Z",
+		"collection_interval_in_millis": 5000,
+		"uptime_in_millis": 2173595336,
+		"process": {
+			"mem": {
+				"heap_max_in_bytes": 149954560,
+				"heap_used_in_bytes": 126274392
+			}
+		},
+		"os": {
+			"cpu": {
+				"load_average": {
+					"1m": 0.1806640625,
+					"5m": 0.49658203125,
+					"15m": 0.458984375
+				}
+			}
+		},
+		"response_times": {
+			"avg_in_millis": 12.5,
+			"max_in_millis": 123
+		},
+		"requests": {
+			"total": 2,
+			"disconnects": 0,
+			"status_codes": {
+				"200": 2
+			}
+		},
+		"concurrent_connections": 10
+	}
+}
+`
+
+var kibanaStatusExpected = map[string]interface{}{
+	"status_code":            1,
+	"heap_max_bytes":         int64(149954560),
+	"heap_used_bytes":        int64(126274392),
+	"uptime_ms":              int64(2173595336),
+	"response_time_avg_ms":   float64(12.5),
+	"response_time_max_ms":   int64(123),
+	"concurrent_connections": int64(10),
+	"requests_per_sec":       float64(0.4),
+}

From ff66a9de69ef689cc1316b1510d29cbf6f2c057e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 24 Aug 2018 14:59:51 -0700
Subject: [PATCH 718/835] Update changelog

---
 CHANGELOG.md | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d061b6d..dd8cf460 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,19 +8,20 @@
 
 ### New Inputs
 
+- [activemq](./plugins/inputs/activemq/README.md) - Contributed by @mlabouardy
+- [filecount](./plugins/inputs/filecount/README.md) - Contributed by @sometimesfood
 - [file](./plugins/inputs/file/README.md) - Contributed by @maxunt
+- [icinga2](./plugins/inputs/icinga2/README.md) - Contributed by @mlabouardy
+- [kibana](./plugins/inputs/icinga2/README.md) - Contributed by @lpic10
+- [pgbouncer](./plugins/inputs/pgbouncer/README.md) - Contributed by @nerzhul
 - [tengine](./plugins/inputs/tengine/README.md) - Contributed by @ertaoxu
 - [x509_cert](./plugins/inputs/x509_cert/README.md) - Contributed by @jtyr
-- [filecount](./plugins/inputs/filecount/README.md) - Contributed by @sometimesfood
-- [pgbouncer](./plugins/inputs/pgbouncer/README.md) - Contributed by @nerzhul
-- [activemq](./plugins/inputs/activemq/README.md) - Contributed by @mlabouardy
-- [icinga2](./plugins/inputs/icinga2/README.md) - Contributed by @mlabouardy
 
 ### New Processors
 
 - [enum](./plugins/processors/enum/README.md) - Contributed by @KarstenSchnitter
-- [rename](./plugins/processors/rename/README.md) - Contributed by @goldibex
 - [parser](./plugins/processors/parser/README.md) - Contributed by @maxunt & @Ayrdrie
+- [rename](./plugins/processors/rename/README.md) - Contributed by @goldibex
 
 ### New Aggregators
 
@@ -75,6 +76,7 @@
 - [#4559](https://github.com/influxdata/telegraf/pull/4559): Add Icinga2 input plugin.
 - [#4351](https://github.com/influxdata/telegraf/pull/4351): Add name, time, path and string field options to JSON parser.
 - [#4571](https://github.com/influxdata/telegraf/pull/4571): Add forwarded records to sqlserver input.
+- [#4585](https://github.com/influxdata/telegraf/pull/4585): Add Kibana input plugin.
 
 ## v1.7.4 [unreleased]
 

From 80346b2e932af94f93ea8f10a3ad76d248e3fb29 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 24 Aug 2018 16:37:11 -0700
Subject: [PATCH 719/835] Update prometheus output sample config and README

---
 plugins/outputs/prometheus_client/README.md   | 39 +++++++++++--------
 .../prometheus_client/prometheus_client.go    | 32 ++++++++-------
 2 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/plugins/outputs/prometheus_client/README.md b/plugins/outputs/prometheus_client/README.md
index d68cafe9..d4de4894 100644
--- a/plugins/outputs/prometheus_client/README.md
+++ b/plugins/outputs/prometheus_client/README.md
@@ -4,30 +4,35 @@ This plugin starts a [Prometheus](https://prometheus.io/) Client, it exposes all
 
 ## Configuration
 
-```
+```toml
 # Publish all metrics to /metrics for Prometheus to scrape
 [[outputs.prometheus_client]]
-  # Address to listen on
+  ## 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"
 
-  # Use http basic authentication
-  basic_username = "Foo"
-  basic_password = "Bar"
+  ## If set, the IP Ranges which are allowed to access metrics.
+  ##   ex: ip_range = ["192.168.0.0/24", "192.168.1.0/30"]
+  # ip_range = []
 
-  # IP Ranges which are allowed to access metrics
-  ip_range = ["192.168.0.0/24", "192.168.1.0/30"]
+  ## Path to publish the metrics on.
+  # path = "/metrics"
 
-  # Path to publish the metrics on, defaults to /metrics
-  path = "/metrics"   
+  ## Expiration interval for each metric. 0 == no expiration
+  # expiration_interval = "60s"
 
-  # Expiration interval for each metric. 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
+  ## Send string metrics as Prometheus labels.
+  ## Unless set to false all string metrics will be sent as labels.
+  # string_as_label = true
+
+  ## If set, enable TLS with the given certificate.
+  # tls_cert = "/etc/ssl/telegraf.crt"
+  # tls_key = "/etc/ssl/telegraf.key"
 ```
diff --git a/plugins/outputs/prometheus_client/prometheus_client.go b/plugins/outputs/prometheus_client/prometheus_client.go
index 9634e922..c038eba6 100644
--- a/plugins/outputs/prometheus_client/prometheus_client.go
+++ b/plugins/outputs/prometheus_client/prometheus_client.go
@@ -76,29 +76,33 @@ type PrometheusClient struct {
 
 var sampleConfig = `
   ## Address to listen on
-  # listen = ":9273"
+  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"
 
-  ## Use http basic authentication
-  #basic_username = "Foo"
-  #basic_password = "Bar"
+  ## If set, the IP Ranges which are allowed to access metrics.
+  ##   ex: ip_range = ["192.168.0.0/24", "192.168.1.0/30"]
+  # ip_range = []
 
-  ## IP Ranges which are allowed to access metrics
-  #ip_range = ["192.168.0.0/24", "192.168.1.0/30"]
+  ## Path to publish the metrics on.
+  # path = "/metrics"
 
-  ## Interval to expire metrics and not deliver to prometheus, 0 == no expiration
+  ## Expiration interval for each metric. 0 == no expiration
   # expiration_interval = "60s"
 
   ## Collectors to enable, valid entries are "gocollector" and "process".
   ## If unset, both are enabled.
-  collectors_exclude = ["gocollector", "process"]
+  # 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
+  ## Send string metrics as Prometheus labels.
+  ## Unless set to false all string metrics will be sent as labels.
+  # string_as_label = true
+
+  ## If set, enable TLS with the given certificate.
+  # tls_cert = "/etc/ssl/telegraf.crt"
+  # tls_key = "/etc/ssl/telegraf.key"
 `
 
 func (p *PrometheusClient) auth(h http.Handler) http.Handler {

From 889745a1120f49da32abd574ab3b5ec841797798 Mon Sep 17 00:00:00 2001
From: maxunt <max.untrecht@gmail.com>
Date: Fri, 24 Aug 2018 16:40:41 -0700
Subject: [PATCH 720/835] Add csv parser (#4439)

---
 docs/DATA_FORMATS_INPUT.md         | 122 ++++++++++++---
 internal/config/config.go          | 122 +++++++++++++++
 plugins/parsers/csv/parser.go      | 196 ++++++++++++++++++++++++
 plugins/parsers/csv/parser_test.go | 231 +++++++++++++++++++++++++++++
 plugins/parsers/registry.go        |  82 ++++++++++
 5 files changed, 733 insertions(+), 20 deletions(-)
 create mode 100644 plugins/parsers/csv/parser.go
 create mode 100644 plugins/parsers/csv/parser_test.go

diff --git a/docs/DATA_FORMATS_INPUT.md b/docs/DATA_FORMATS_INPUT.md
index 6e1b6a75..7e57d965 100644
--- a/docs/DATA_FORMATS_INPUT.md
+++ b/docs/DATA_FORMATS_INPUT.md
@@ -12,6 +12,7 @@ Telegraf is able to parse the following input data formats into metrics:
 1. [Grok](#grok)
 1. [Logfmt](#logfmt)
 1. [Wavefront](#wavefront)
+1. [CSV](#csv)
 
 Telegraf metrics, like InfluxDB
 [points](https://docs.influxdata.com/influxdb/v0.10/write_protocols/line/),
@@ -107,28 +108,28 @@ but can be overridden using the `name_override` config option.
 
 #### JSON Configuration:
 
-The JSON data format supports specifying "tag_keys", "string_keys", and "json_query". 
-If specified, keys in "tag_keys" and "string_keys" will be searched for in the root-level 
-and any nested lists of the JSON blob. All int and float values are added to fields by default. 
-If the key(s) exist, they will be applied as tags or fields to the Telegraf metrics.  
+The JSON data format supports specifying "tag_keys", "string_keys", and "json_query".
+If specified, keys in "tag_keys" and "string_keys" will be searched for in the root-level
+and any nested lists of the JSON blob. All int and float values are added to fields by default.
+If the key(s) exist, they will be applied as tags or fields to the Telegraf metrics.
 If "string_keys" is specified, the string will be added as a field.
 
-The "json_query" configuration is a gjson path to an JSON object or 
-list of JSON objects. If this path leads to an array of values or 
-single data point an error will be thrown.  If this configuration 
+The "json_query" configuration is a gjson path to an JSON object or
+list of JSON objects. If this path leads to an array of values or
+single data point an error will be thrown.  If this configuration
 is specified, only the result of the query will be parsed and returned as metrics.
 
 The "json_name_key" configuration specifies the key of the field whos value will be
 added as the metric name.
 
-Object paths are specified using gjson path format, which is denoted by object keys 
-concatenated with "." to go deeper in nested JSON objects.  
+Object paths are specified using gjson path format, which is denoted by object keys
+concatenated with "." to go deeper in nested JSON objects.
 Additional information on gjson paths can be found here: https://github.com/tidwall/gjson#path-syntax
 
-The JSON data format also supports extracting time values through the 
-config "json_time_key" and "json_time_format". If "json_time_key" is set, 
-"json_time_format" must be specified.  The "json_time_key" describes the 
-name of the field containing time information.  The "json_time_format" 
+The JSON data format also supports extracting time values through the
+config "json_time_key" and "json_time_format". If "json_time_key" is set,
+"json_time_format" must be specified.  The "json_time_key" describes the
+name of the field containing time information.  The "json_time_format"
 must be a recognized Go time format.
 If there is no year provided, the metrics will have the current year.
 More info on time formats can be found here: https://golang.org/pkg/time/#Parse
@@ -161,8 +162,8 @@ For example, if you had this configuration:
   ## List of field names to extract from JSON and add as string fields
   # json_string_fields = []
 
-  ## gjson query path to specify a specific chunk of JSON to be parsed with 
-  ## the above configuration. If not specified, the whole file will be parsed. 
+  ## gjson query path to specify a specific chunk of JSON to be parsed with
+  ## the above configuration. If not specified, the whole file will be parsed.
   ## gjson query paths are described here: https://github.com/tidwall/gjson#path-syntax
   # json_query = ""
 
@@ -191,8 +192,8 @@ Your Telegraf metrics would get tagged with "my_tag_1"
 exec_mycollector,my_tag_1=foo a=5,b_c=6
 ```
 
-If the JSON data is an array, then each element of the array is 
-parsed with the configured settings.  Each resulting metric will 
+If the JSON data is an array, then each element of the array is
+parsed with the configured settings.  Each resulting metric will
 be output with the same timestamp.
 
 For example, if the following configuration:
@@ -220,7 +221,7 @@ For example, if the following configuration:
   ## List of field names to extract from JSON and add as string fields
   # string_fields = []
 
-  ## gjson query path to specify a specific chunk of JSON to be parsed with 
+  ## gjson query path to specify a specific chunk of JSON to be parsed with
   ## the above configuration. If not specified, the whole file will be parsed
   # json_query = ""
 
@@ -264,7 +265,7 @@ exec_mycollector,my_tag_1=foo,my_tag_2=baz b_c=6 1136387040000000000
 exec_mycollector,my_tag_1=bar,my_tag_2=baz b_c=8 1168527840000000000
 ```
 
-If you want to only use a specific portion of your JSON, use the "json_query" 
+If you want to only use a specific portion of your JSON, use the "json_query"
 configuration to specify a path to a JSON object.
 
 For example, with the following config:
@@ -288,7 +289,7 @@ For example, with the following config:
   ## List of field names to extract from JSON and add as string fields
   string_fields = ["last"]
 
-  ## gjson query path to specify a specific chunk of JSON to be parsed with 
+  ## gjson query path to specify a specific chunk of JSON to be parsed with
   ## the above configuration. If not specified, the whole file will be parsed
   json_query = "obj.friends"
 
@@ -1038,3 +1039,84 @@ There are no additional configuration options for Wavefront Data Format line-pro
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
   data_format = "wavefront"
 ```
+
+# CSV
+Parse out metrics from a CSV formatted table. By default, the parser assumes there is no header and
+will read data from the first line. If `csv_header_row_count` is set to anything besides 0, the parser
+will extract column names from the first number of rows. Headers of more than 1 row will have their
+names concatenated together.  Any unnamed columns will be ignored by the parser.
+
+The `csv_skip_rows` config indicates the number of rows to skip before looking for header information or data
+to parse. By default, no rows will be skipped.
+
+The `csv_skip_columns` config indicates the number of columns to be skipped before parsing data. These
+columns will not be read out of the header.  Naming with the `csv_column_names` will begin at the first
+parsed column after skipping the indicated columns.  By default, no columns are skipped.
+
+To assign custom column names, the `csv_column_names` config is available. If the `csv_column_names`
+config is used, all columns must be named as additional columns will be ignored. If `csv_header_row_count`
+is set to 0, `csv_column_names` must be specified.  Names listed in `csv_column_names` will override names extracted
+from the header.
+
+The `csv_tag_columns` and `csv_field_columns` configs are available to add the column data to the metric.
+The name used to specify the column is the name in the header, or if specified, the corresponding
+name assigned in `csv_column_names`. If neither config is specified, no data will be added to the metric.
+
+Additional configs are available to dynamically name metrics and set custom timestamps.  If the
+`csv_column_names` config is specified, the parser will assign the metric name to the value found
+in that column. If the `csv_timestamp_column` is specified, the parser will extract the timestamp from
+that column. If `csv_timestamp_column` is specified, the `csv_timestamp_format` must also be specified
+or an error will be thrown.
+
+#### CSV Configuration
+```toml
+  data_format = "csv"
+
+  ## Indicates how many rows to treat as a header. By default, the parser assumes
+  ## there is no header and will parse the first row as data. If set to anything more
+  ## than 1, column names will be concatenated with the name listed in the next header row.
+  ## If `csv_column_names` is specified, the column names in header will be overridden.
+  # csv_header_row_count = 0
+
+  ## Indicates the number of rows to skip before looking for header information.
+  # csv_skip_rows = 0
+
+  ## Indicates the number of columns to skip before looking for data to parse.
+  ## These columns will be skipped in the header as well.
+  # csv_skip_columns = 0
+
+  ## The seperator between csv fields
+  ## By default, the parser assumes a comma (",")
+  # csv_delimiter = ","
+
+  ## The character reserved for marking a row as a comment row
+  ## Commented rows are skipped and not parsed
+  # csv_comment = ""
+
+  ## If set to true, the parser will remove leading whitespace from fields
+  ## By default, this is false
+  # csv_trim_space = false
+
+  ## For assigning custom names to columns
+  ## If this is specified, all columns should have a name
+  ## Unnamed columns will be ignored by the parser.
+  ## If `csv_header_row_count` is set to 0, this config must be used
+  csv_column_names = []
+
+  ## Columns listed here will be added as tags. Any other columns
+  ## will be added as fields.
+  csv_tag_columns = []
+
+  ## The column to extract the name of the metric from
+  ## By default, this is the name of the plugin
+  ## the `name_override` config overrides this
+  # csv_measurement_column = ""
+
+  ## The column to extract time information for the metric
+  ## `csv_timestamp_format` must be specified if this is used
+  # csv_timestamp_column = ""
+
+  ## The format of time data extracted from `csv_timestamp_column`
+  ## this must be specified if `csv_timestamp_column` is specified
+  # csv_timestamp_format = ""
+  ```
diff --git a/internal/config/config.go b/internal/config/config.go
index 5926f613..c712af85 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -1443,6 +1443,120 @@ func buildParser(name string, tbl *ast.Table) (parsers.Parser, error) {
 		}
 	}
 
+	//for csv parser
+	if node, ok := tbl.Fields["csv_column_names"]; 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.CSVColumnNames = append(c.CSVColumnNames, str.Value)
+					}
+				}
+			}
+		}
+	}
+
+	if node, ok := tbl.Fields["csv_tag_columns"]; 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.CSVTagColumns = append(c.CSVTagColumns, str.Value)
+					}
+				}
+			}
+		}
+	}
+
+	if node, ok := tbl.Fields["csv_delimiter"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if str, ok := kv.Value.(*ast.String); ok {
+				c.CSVDelimiter = str.Value
+			}
+		}
+	}
+
+	if node, ok := tbl.Fields["csv_comment"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if str, ok := kv.Value.(*ast.String); ok {
+				c.CSVComment = str.Value
+			}
+		}
+	}
+
+	if node, ok := tbl.Fields["csv_measurement_column"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if str, ok := kv.Value.(*ast.String); ok {
+				c.CSVMeasurementColumn = str.Value
+			}
+		}
+	}
+
+	if node, ok := tbl.Fields["csv_timestamp_column"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if str, ok := kv.Value.(*ast.String); ok {
+				c.CSVTimestampColumn = str.Value
+			}
+		}
+	}
+
+	if node, ok := tbl.Fields["csv_timestamp_format"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if str, ok := kv.Value.(*ast.String); ok {
+				c.CSVTimestampFormat = str.Value
+			}
+		}
+	}
+
+	if node, ok := tbl.Fields["csv_header_row_count"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if str, ok := kv.Value.(*ast.String); ok {
+				iVal, err := strconv.Atoi(str.Value)
+				c.CSVHeaderRowCount = iVal
+				if err != nil {
+					return nil, fmt.Errorf("E! parsing to int: %v", err)
+				}
+			}
+		}
+	}
+
+	if node, ok := tbl.Fields["csv_skip_rows"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if str, ok := kv.Value.(*ast.String); ok {
+				iVal, err := strconv.Atoi(str.Value)
+				c.CSVSkipRows = iVal
+				if err != nil {
+					return nil, fmt.Errorf("E! parsing to int: %v", err)
+				}
+			}
+		}
+	}
+
+	if node, ok := tbl.Fields["csv_skip_columns"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if str, ok := kv.Value.(*ast.String); ok {
+				iVal, err := strconv.Atoi(str.Value)
+				c.CSVSkipColumns = iVal
+				if err != nil {
+					return nil, fmt.Errorf("E! parsing to int: %v", err)
+				}
+			}
+		}
+	}
+
+	if node, ok := tbl.Fields["csv_trim_space"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if str, ok := kv.Value.(*ast.Boolean); ok {
+				//for config with no quotes
+				val, err := strconv.ParseBool(str.Value)
+				c.CSVTrimSpace = val
+				if err != nil {
+					return nil, fmt.Errorf("E! parsing to bool: %v", err)
+				}
+			}
+		}
+	}
+
 	c.MetricName = name
 
 	delete(tbl.Fields, "data_format")
@@ -1469,6 +1583,14 @@ func buildParser(name string, tbl *ast.Table) (parsers.Parser, error) {
 	delete(tbl.Fields, "grok_custom_patterns")
 	delete(tbl.Fields, "grok_custom_pattern_files")
 	delete(tbl.Fields, "grok_timezone")
+	delete(tbl.Fields, "csv_data_columns")
+	delete(tbl.Fields, "csv_tag_columns")
+	delete(tbl.Fields, "csv_field_columns")
+	delete(tbl.Fields, "csv_name_column")
+	delete(tbl.Fields, "csv_timestamp_column")
+	delete(tbl.Fields, "csv_timestamp_format")
+	delete(tbl.Fields, "csv_delimiter")
+	delete(tbl.Fields, "csv_header")
 
 	return parsers.NewParser(c)
 }
diff --git a/plugins/parsers/csv/parser.go b/plugins/parsers/csv/parser.go
new file mode 100644
index 00000000..9193fbf5
--- /dev/null
+++ b/plugins/parsers/csv/parser.go
@@ -0,0 +1,196 @@
+package csv
+
+import (
+	"bytes"
+	"encoding/csv"
+	"fmt"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/metric"
+)
+
+type Parser struct {
+	MetricName        string
+	HeaderRowCount    int
+	SkipRows          int
+	SkipColumns       int
+	Delimiter         string
+	Comment           string
+	TrimSpace         bool
+	ColumnNames       []string
+	TagColumns        []string
+	MeasurementColumn string
+	TimestampColumn   string
+	TimestampFormat   string
+	DefaultTags       map[string]string
+}
+
+func (p *Parser) compile(r *bytes.Reader) (*csv.Reader, error) {
+	csvReader := csv.NewReader(r)
+	// ensures that the reader reads records of different lengths without an error
+	csvReader.FieldsPerRecord = -1
+	if p.Delimiter != "" {
+		csvReader.Comma = []rune(p.Delimiter)[0]
+	}
+	if p.Comment != "" {
+		csvReader.Comment = []rune(p.Comment)[0]
+	}
+	return csvReader, nil
+}
+
+func (p *Parser) Parse(buf []byte) ([]telegraf.Metric, error) {
+	r := bytes.NewReader(buf)
+	csvReader, err := p.compile(r)
+	if err != nil {
+		return nil, err
+	}
+	// skip first rows
+	for i := 0; i < p.SkipRows; i++ {
+		csvReader.Read()
+	}
+	// if there is a header and nothing in DataColumns
+	// set DataColumns to names extracted from the header
+	headerNames := make([]string, 0)
+	if len(p.ColumnNames) == 0 {
+		for i := 0; i < p.HeaderRowCount; i++ {
+			header, err := csvReader.Read()
+			if err != nil {
+				return nil, err
+			}
+			//concatenate header names
+			for i := range header {
+				name := header[i]
+				if p.TrimSpace {
+					name = strings.Trim(name, " ")
+				}
+				if len(headerNames) <= i {
+					headerNames = append(headerNames, name)
+				} else {
+					headerNames[i] = headerNames[i] + name
+				}
+			}
+		}
+		p.ColumnNames = headerNames[p.SkipColumns:]
+	} else {
+		// if columns are named, just skip header rows
+		for i := 0; i < p.HeaderRowCount; i++ {
+			csvReader.Read()
+		}
+	}
+
+	table, err := csvReader.ReadAll()
+	if err != nil {
+		return nil, err
+	}
+
+	metrics := make([]telegraf.Metric, 0)
+	for _, record := range table {
+		m, err := p.parseRecord(record)
+		if err != nil {
+			return metrics, err
+		}
+		metrics = append(metrics, m)
+	}
+	return metrics, nil
+}
+
+// ParseLine does not use any information in header and assumes DataColumns is set
+// it will also not skip any rows
+func (p *Parser) ParseLine(line string) (telegraf.Metric, error) {
+	r := bytes.NewReader([]byte(line))
+	csvReader, err := p.compile(r)
+	if err != nil {
+		return nil, err
+	}
+
+	// if there is nothing in DataColumns, ParseLine will fail
+	if len(p.ColumnNames) == 0 {
+		return nil, fmt.Errorf("[parsers.csv] data columns must be specified")
+	}
+
+	record, err := csvReader.Read()
+	if err != nil {
+		return nil, err
+	}
+	m, err := p.parseRecord(record)
+	if err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
+func (p *Parser) parseRecord(record []string) (telegraf.Metric, error) {
+	recordFields := make(map[string]interface{})
+	tags := make(map[string]string)
+
+	// skip columns in record
+	record = record[p.SkipColumns:]
+outer:
+	for i, fieldName := range p.ColumnNames {
+		if i < len(record) {
+			value := record[i]
+			if p.TrimSpace {
+				value = strings.Trim(value, " ")
+			}
+
+			for _, tagName := range p.TagColumns {
+				if tagName == fieldName {
+					tags[tagName] = value
+					continue outer
+				}
+			}
+
+			// attempt type conversions
+			if iValue, err := strconv.ParseInt(value, 10, 64); err == nil {
+				recordFields[fieldName] = iValue
+			} else if fValue, err := strconv.ParseFloat(value, 64); err == nil {
+				recordFields[fieldName] = fValue
+			} else if bValue, err := strconv.ParseBool(value); err == nil {
+				recordFields[fieldName] = bValue
+			} else {
+				recordFields[fieldName] = value
+			}
+		}
+	}
+
+	// add default tags
+	for k, v := range p.DefaultTags {
+		tags[k] = v
+	}
+
+	// will default to plugin name
+	measurementName := p.MetricName
+	if recordFields[p.MeasurementColumn] != nil {
+		measurementName = fmt.Sprintf("%v", recordFields[p.MeasurementColumn])
+	}
+
+	metricTime := time.Now()
+	if p.TimestampColumn != "" {
+		if recordFields[p.TimestampColumn] == nil {
+			return nil, fmt.Errorf("timestamp column: %v could not be found", p.TimestampColumn)
+		}
+		tStr := fmt.Sprintf("%v", recordFields[p.TimestampColumn])
+		if p.TimestampFormat == "" {
+			return nil, fmt.Errorf("timestamp format must be specified")
+		}
+
+		var err error
+		metricTime, err = time.Parse(p.TimestampFormat, tStr)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	m, err := metric.New(measurementName, tags, recordFields, metricTime)
+	if err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
+func (p *Parser) SetDefaultTags(tags map[string]string) {
+	p.DefaultTags = tags
+}
diff --git a/plugins/parsers/csv/parser_test.go b/plugins/parsers/csv/parser_test.go
new file mode 100644
index 00000000..b488a1f1
--- /dev/null
+++ b/plugins/parsers/csv/parser_test.go
@@ -0,0 +1,231 @@
+package csv
+
+import (
+	"fmt"
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf/metric"
+	"github.com/stretchr/testify/require"
+)
+
+func TestBasicCSV(t *testing.T) {
+	p := Parser{
+		ColumnNames: []string{"first", "second", "third"},
+		TagColumns:  []string{"third"},
+	}
+
+	_, err := p.ParseLine("1.4,true,hi")
+	require.NoError(t, err)
+}
+
+func TestHeaderConcatenationCSV(t *testing.T) {
+	p := Parser{
+		HeaderRowCount:    2,
+		MeasurementColumn: "3",
+	}
+	testCSV := `first,second
+1,2,3
+3.4,70,test_name`
+
+	metrics, err := p.Parse([]byte(testCSV))
+	require.NoError(t, err)
+	require.Equal(t, "test_name", metrics[0].Name())
+}
+
+func TestHeaderOverride(t *testing.T) {
+	p := Parser{
+		HeaderRowCount:    1,
+		ColumnNames:       []string{"first", "second", "third"},
+		MeasurementColumn: "third",
+	}
+	testCSV := `line1,line2,line3
+3.4,70,test_name`
+	metrics, err := p.Parse([]byte(testCSV))
+	require.NoError(t, err)
+	require.Equal(t, "test_name", metrics[0].Name())
+}
+
+func TestTimestamp(t *testing.T) {
+	p := Parser{
+		HeaderRowCount:    1,
+		ColumnNames:       []string{"first", "second", "third"},
+		MeasurementColumn: "third",
+		TimestampColumn:   "first",
+		TimestampFormat:   "02/01/06 03:04:05 PM",
+	}
+	testCSV := `line1,line2,line3
+23/05/09 04:05:06 PM,70,test_name
+07/11/09 04:05:06 PM,80,test_name2`
+	metrics, err := p.Parse([]byte(testCSV))
+
+	require.NoError(t, err)
+	require.Equal(t, metrics[0].Time().UnixNano(), int64(1243094706000000000))
+	require.Equal(t, metrics[1].Time().UnixNano(), int64(1257609906000000000))
+}
+
+func TestTimestampError(t *testing.T) {
+	p := Parser{
+		HeaderRowCount:    1,
+		ColumnNames:       []string{"first", "second", "third"},
+		MeasurementColumn: "third",
+		TimestampColumn:   "first",
+	}
+	testCSV := `line1,line2,line3
+23/05/09 04:05:06 PM,70,test_name
+07/11/09 04:05:06 PM,80,test_name2`
+	_, err := p.Parse([]byte(testCSV))
+	require.Equal(t, fmt.Errorf("timestamp format must be specified"), err)
+}
+
+func TestQuotedCharacter(t *testing.T) {
+	p := Parser{
+		HeaderRowCount:    1,
+		ColumnNames:       []string{"first", "second", "third"},
+		MeasurementColumn: "third",
+	}
+
+	testCSV := `line1,line2,line3
+"3,4",70,test_name`
+	metrics, err := p.Parse([]byte(testCSV))
+	require.NoError(t, err)
+	require.Equal(t, "3,4", metrics[0].Fields()["first"])
+}
+
+func TestDelimiter(t *testing.T) {
+	p := Parser{
+		HeaderRowCount:    1,
+		Delimiter:         "%",
+		ColumnNames:       []string{"first", "second", "third"},
+		MeasurementColumn: "third",
+	}
+
+	testCSV := `line1%line2%line3
+3,4%70%test_name`
+	metrics, err := p.Parse([]byte(testCSV))
+	require.NoError(t, err)
+	require.Equal(t, "3,4", metrics[0].Fields()["first"])
+}
+
+func TestValueConversion(t *testing.T) {
+	p := Parser{
+		HeaderRowCount: 0,
+		Delimiter:      ",",
+		ColumnNames:    []string{"first", "second", "third", "fourth"},
+		MetricName:     "test_value",
+	}
+	testCSV := `3.3,4,true,hello`
+
+	expectedTags := make(map[string]string)
+	expectedFields := map[string]interface{}{
+		"first":  3.3,
+		"second": 4,
+		"third":  true,
+		"fourth": "hello",
+	}
+
+	metrics, err := p.Parse([]byte(testCSV))
+	require.NoError(t, err)
+
+	expectedMetric, err1 := metric.New("test_value", expectedTags, expectedFields, time.Unix(0, 0))
+	returnedMetric, err2 := metric.New(metrics[0].Name(), metrics[0].Tags(), metrics[0].Fields(), time.Unix(0, 0))
+	require.NoError(t, err1)
+	require.NoError(t, err2)
+
+	//deep equal fields
+	require.Equal(t, expectedMetric.Fields(), returnedMetric.Fields())
+}
+
+func TestSkipComment(t *testing.T) {
+	p := Parser{
+		HeaderRowCount: 0,
+		Comment:        "#",
+		ColumnNames:    []string{"first", "second", "third", "fourth"},
+		MetricName:     "test_value",
+	}
+	testCSV := `#3.3,4,true,hello
+4,9.9,true,name_this`
+
+	expectedFields := map[string]interface{}{
+		"first":  int64(4),
+		"second": 9.9,
+		"third":  true,
+		"fourth": "name_this",
+	}
+
+	metrics, err := p.Parse([]byte(testCSV))
+	require.NoError(t, err)
+	require.Equal(t, expectedFields, metrics[0].Fields())
+}
+
+func TestTrimSpace(t *testing.T) {
+	p := Parser{
+		HeaderRowCount: 0,
+		TrimSpace:      true,
+		ColumnNames:    []string{"first", "second", "third", "fourth"},
+		MetricName:     "test_value",
+	}
+	testCSV := ` 3.3, 4,    true,hello`
+
+	expectedFields := map[string]interface{}{
+		"first":  3.3,
+		"second": int64(4),
+		"third":  true,
+		"fourth": "hello",
+	}
+
+	metrics, err := p.Parse([]byte(testCSV))
+	require.NoError(t, err)
+	require.Equal(t, expectedFields, metrics[0].Fields())
+}
+
+func TestSkipRows(t *testing.T) {
+	p := Parser{
+		HeaderRowCount:    1,
+		SkipRows:          1,
+		TagColumns:        []string{"line1"},
+		MeasurementColumn: "line3",
+	}
+	testCSV := `garbage nonsense
+line1,line2,line3
+hello,80,test_name2`
+
+	expectedFields := map[string]interface{}{
+		"line2": int64(80),
+		"line3": "test_name2",
+	}
+	metrics, err := p.Parse([]byte(testCSV))
+	require.NoError(t, err)
+	require.Equal(t, expectedFields, metrics[0].Fields())
+}
+
+func TestSkipColumns(t *testing.T) {
+	p := Parser{
+		SkipColumns: 1,
+		ColumnNames: []string{"line1", "line2"},
+	}
+	testCSV := `hello,80,test_name`
+
+	expectedFields := map[string]interface{}{
+		"line1": int64(80),
+		"line2": "test_name",
+	}
+	metrics, err := p.Parse([]byte(testCSV))
+	require.NoError(t, err)
+	require.Equal(t, expectedFields, metrics[0].Fields())
+}
+
+func TestSkipColumnsWithHeader(t *testing.T) {
+	p := Parser{
+		SkipColumns:    1,
+		HeaderRowCount: 2,
+	}
+	testCSV := `col,col,col
+	1,2,3
+	trash,80,test_name`
+
+	// we should expect an error if we try to get col1
+	metrics, err := p.Parse([]byte(testCSV))
+	require.NoError(t, err)
+	require.Equal(t, map[string]interface{}{"col2": int64(80), "col3": "test_name"}, metrics[0].Fields())
+}
diff --git a/plugins/parsers/registry.go b/plugins/parsers/registry.go
index 89fdc9a1..32027e41 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/csv"
 	"github.com/influxdata/telegraf/plugins/parsers/dropwizard"
 	"github.com/influxdata/telegraf/plugins/parsers/graphite"
 	"github.com/influxdata/telegraf/plugins/parsers/grok"
@@ -113,6 +114,19 @@ type Config struct {
 	GrokCustomPatterns     string
 	GrokCustomPatternFiles []string
 	GrokTimeZone           string
+
+	//csv configuration
+	CSVDelimiter         string
+	CSVComment           string
+	CSVTrimSpace         bool
+	CSVColumnNames       []string
+	CSVTagColumns        []string
+	CSVMeasurementColumn string
+	CSVTimestampColumn   string
+	CSVTimestampFormat   string
+	CSVHeaderRowCount    int
+	CSVSkipRows          int
+	CSVSkipColumns       int
 }
 
 // NewParser returns a Parser interface based on the given config.
@@ -162,6 +176,20 @@ func NewParser(config *Config) (Parser, error) {
 			config.GrokCustomPatterns,
 			config.GrokCustomPatternFiles,
 			config.GrokTimeZone)
+	case "csv":
+		parser, err = newCSVParser(config.MetricName,
+			config.CSVHeaderRowCount,
+			config.CSVSkipRows,
+			config.CSVSkipColumns,
+			config.CSVDelimiter,
+			config.CSVComment,
+			config.CSVTrimSpace,
+			config.CSVColumnNames,
+			config.CSVTagColumns,
+			config.CSVMeasurementColumn,
+			config.CSVTimestampColumn,
+			config.CSVTimestampFormat,
+			config.DefaultTags)
 	case "logfmt":
 		parser, err = NewLogFmtParser(config.MetricName, config.DefaultTags)
 	default:
@@ -170,6 +198,60 @@ func NewParser(config *Config) (Parser, error) {
 	return parser, err
 }
 
+func newCSVParser(metricName string,
+	header int,
+	skipRows int,
+	skipColumns int,
+	delimiter string,
+	comment string,
+	trimSpace bool,
+	dataColumns []string,
+	tagColumns []string,
+	nameColumn string,
+	timestampColumn string,
+	timestampFormat string,
+	defaultTags map[string]string) (Parser, error) {
+
+	if header == 0 && len(dataColumns) == 0 {
+		// if there is no header and no DataColumns, that's an error
+		return nil, fmt.Errorf("there must be a header if `csv_data_columns` is not specified")
+	}
+
+	if delimiter != "" {
+		runeStr := []rune(delimiter)
+		if len(runeStr) > 1 {
+			return nil, fmt.Errorf("delimiter must be a single character, got: %s", delimiter)
+		}
+		delimiter = fmt.Sprintf("%v", runeStr[0])
+	}
+
+	if comment != "" {
+		runeStr := []rune(comment)
+		if len(runeStr) > 1 {
+			return nil, fmt.Errorf("delimiter must be a single character, got: %s", comment)
+		}
+		comment = fmt.Sprintf("%v", runeStr[0])
+	}
+
+	parser := &csv.Parser{
+		MetricName:        metricName,
+		HeaderRowCount:    header,
+		SkipRows:          skipRows,
+		SkipColumns:       skipColumns,
+		Delimiter:         delimiter,
+		Comment:           comment,
+		TrimSpace:         trimSpace,
+		ColumnNames:       dataColumns,
+		TagColumns:        tagColumns,
+		MeasurementColumn: nameColumn,
+		TimestampColumn:   timestampColumn,
+		TimestampFormat:   timestampFormat,
+		DefaultTags:       defaultTags,
+	}
+
+	return parser, nil
+}
+
 func newJSONParser(
 	metricName string,
 	tagKeys []string,

From d3061520f4f94cdd74d979305fa5de76731cdd03 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 24 Aug 2018 16:41:51 -0700
Subject: [PATCH 721/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd8cf460..a7b7743e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -77,6 +77,7 @@
 - [#4351](https://github.com/influxdata/telegraf/pull/4351): Add name, time, path and string field options to JSON parser.
 - [#4571](https://github.com/influxdata/telegraf/pull/4571): Add forwarded records to sqlserver input.
 - [#4585](https://github.com/influxdata/telegraf/pull/4585): Add Kibana input plugin.
+- [#4439](https://github.com/influxdata/telegraf/pull/4439): Add csv parser plugin.
 
 ## v1.7.4 [unreleased]
 

From 61e5d500baeefc32c51e449969584d6581ee4e1e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 27 Aug 2018 13:05:41 -0700
Subject: [PATCH 722/835] Add metric requirements to docker README

---
 plugins/inputs/docker/README.md | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/plugins/inputs/docker/README.md b/plugins/inputs/docker/README.md
index a95fb61e..b7e64af3 100644
--- a/plugins/inputs/docker/README.md
+++ b/plugins/inputs/docker/README.md
@@ -77,9 +77,6 @@ may prefer to exclude them:
 
 ### Metrics:
 
-Every effort was made to preserve the names based on the JSON response from the
-docker API.
-
 - docker
   - tags:
     - unit
@@ -96,7 +93,10 @@ docker API.
     - n_goroutines
     - n_listener_events
     - memory_total
-    - pool_blocksize
+    - pool_blocksize (requires devicemapper storage driver)
+
+The `docker_data` and `docker_metadata` measurements are available only for
+some storage drivers such as devicemapper.
 
 - docker_data
   - tags:
@@ -224,7 +224,11 @@ docker API.
     - io_serviced_recursive_write
     - container_id
 
-- docker_container_health
+The `docker_container_health` measurements report on a containers
+[HEALTHCHECK](https://docs.docker.com/engine/reference/builder/#healthcheck)
+status if configured.
+
+- docker_container_health (container must use the HEALTHCHECK)
   - tags:
     - engine_host
     - server_version

From e2b1a6bc891bb32431091b8c9f6407d5ba437b92 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 27 Aug 2018 14:47:04 -0700
Subject: [PATCH 723/835] Add read_buffer_size option to statsd input (#4598)

---
 plugins/inputs/statsd/README.md | 4 ++++
 plugins/inputs/statsd/statsd.go | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/plugins/inputs/statsd/README.md b/plugins/inputs/statsd/README.md
index 648fa72a..85cb4a46 100644
--- a/plugins/inputs/statsd/README.md
+++ b/plugins/inputs/statsd/README.md
@@ -58,6 +58,10 @@
   ## calculation of percentiles. Raising this limit increases the accuracy
   ## of percentiles but also increases the memory usage and cpu time.
   percentile_limit = 1000
+
+  ## Maximum socket buffer size in bytes, once the buffer fills up, metrics
+  ## will start dropping.  Defaults to the OS default.
+  # read_buffer_size = 65535
 ```
 
 ### Description
diff --git a/plugins/inputs/statsd/statsd.go b/plugins/inputs/statsd/statsd.go
index 3e5a73aa..60b55887 100644
--- a/plugins/inputs/statsd/statsd.go
+++ b/plugins/inputs/statsd/statsd.go
@@ -76,6 +76,8 @@ type Statsd struct {
 	// see https://github.com/influxdata/telegraf/pull/992
 	UDPPacketSize int `toml:"udp_packet_size"`
 
+	ReadBufferSize int `toml:"read_buffer_size"`
+
 	sync.Mutex
 	// Lock for preventing a data race during resource cleanup
 	cleanup sync.Mutex
@@ -411,6 +413,10 @@ func (s *Statsd) udpListen() error {
 	}
 	log.Println("I! Statsd UDP listener listening on: ", s.UDPlistener.LocalAddr().String())
 
+	if s.ReadBufferSize > 0 {
+		s.UDPlistener.SetReadBuffer(s.ReadBufferSize)
+	}
+
 	buf := make([]byte, UDP_MAX_PACKET_SIZE)
 	for {
 		select {

From 3adcc3a93d9a7cd27f07dfb5b5e4c2b6476533ba Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 27 Aug 2018 14:48:09 -0700
Subject: [PATCH 724/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7b7743e..5f5e1898 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -78,6 +78,7 @@
 - [#4571](https://github.com/influxdata/telegraf/pull/4571): Add forwarded records to sqlserver input.
 - [#4585](https://github.com/influxdata/telegraf/pull/4585): Add Kibana input plugin.
 - [#4439](https://github.com/influxdata/telegraf/pull/4439): Add csv parser plugin.
+- [#4598](https://github.com/influxdata/telegraf/pull/4598): Add read_buffer_size option to statsd input.
 
 ## v1.7.4 [unreleased]
 

From 1e3edbc55dc1fab5f7530f078384cfbdf72236d8 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 29 Aug 2018 11:38:40 -0700
Subject: [PATCH 725/835] Ensure channel closed if an error occurs in cgroup
 input (#4606)

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

diff --git a/plugins/inputs/cgroup/cgroup_linux.go b/plugins/inputs/cgroup/cgroup_linux.go
index 0765416a..80c15c96 100644
--- a/plugins/inputs/cgroup/cgroup_linux.go
+++ b/plugins/inputs/cgroup/cgroup_linux.go
@@ -81,6 +81,7 @@ func isDir(path string) (bool, error) {
 }
 
 func (g *CGroup) generateDirs(list chan<- pathInfo) {
+	defer close(list)
 	for _, dir := range g.Paths {
 		// getting all dirs that match the pattern 'dir'
 		items, err := filepath.Glob(dir)
@@ -101,10 +102,10 @@ func (g *CGroup) generateDirs(list chan<- pathInfo) {
 			}
 		}
 	}
-	close(list)
 }
 
 func (g *CGroup) generateFiles(dir string, list chan<- pathInfo) {
+	defer close(list)
 	for _, file := range g.Files {
 		// getting all file paths that match the pattern 'dir + file'
 		// path.Base make sure that file variable does not contains part of path
@@ -126,7 +127,6 @@ func (g *CGroup) generateFiles(dir string, list chan<- pathInfo) {
 			}
 		}
 	}
-	close(list)
 }
 
 // ======================================================================

From fed959531ce74a12299b65c7abaec082e7769136 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 29 Aug 2018 11:39:10 -0700
Subject: [PATCH 726/835] Remove timeout deadline for udp syslog input. (#4605)

---
 plugins/inputs/syslog/syslog.go | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/plugins/inputs/syslog/syslog.go b/plugins/inputs/syslog/syslog.go
index 5b22cbca..034e03df 100644
--- a/plugins/inputs/syslog/syslog.go
+++ b/plugins/inputs/syslog/syslog.go
@@ -213,10 +213,6 @@ func (s *Syslog) listenPacket(acc telegraf.Accumulator) {
 			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())

From 59a64651f1d5c1f02d4b2e618d8fd8b2a40a2340 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 29 Aug 2018 11:43:14 -0700
Subject: [PATCH 727/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f5e1898..552be802 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -88,6 +88,8 @@
 - [#4554](https://github.com/influxdata/telegraf/pull/4554): Fix powerdns input tests.
 - [#4584](https://github.com/influxdata/telegraf/pull/4584): Fix burrow_group offset calculation for burrow input.
 - [#4550](https://github.com/influxdata/telegraf/pull/4550): Add result_code value for errors running ping command.
+- [#4605](https://github.com/influxdata/telegraf/pull/4605): Remove timeout deadline for udp syslog input.
+- [#4601](https://github.com/influxdata/telegraf/pull/4601): Ensure channel closed if an error occurs in cgroup input.
 
 ## v1.7.3 [2018-08-07]
 

From 8b2d64585d8a39d9c18c659d73f959870b6952f0 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 29 Aug 2018 12:28:00 -0700
Subject: [PATCH 728/835] Use the correct GOARM value in the armel package
 (#4608)

---
 scripts/build.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/build.py b/scripts/build.py
index 27f47f42..bfaba5a8 100755
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -448,13 +448,14 @@ def build(version=None,
             build_command += "CGO_ENABLED=0 "
 
         # Handle variations in architecture output
+        goarch = arch
         if arch == "i386" or arch == "i686":
-            arch = "386"
+            goarch = "386"
         elif "arm64" in arch:
-            arch = "arm64"
+            goarch = "arm64"
         elif "arm" in arch:
-            arch = "arm"
-        build_command += "GOOS={} GOARCH={} ".format(platform, arch)
+            goarch = "arm"
+        build_command += "GOOS={} GOARCH={} ".format(platform, goarch)
 
         if "arm" in arch:
             if arch == "armel":

From 7b05993a6e522e3761d7cbceb57387211a1ca73d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 29 Aug 2018 12:28:29 -0700
Subject: [PATCH 729/835] Fix sending of basic auth credentials in http output
 (#4609)

---
 plugins/outputs/http/http.go      |  4 ++++
 plugins/outputs/http/http_test.go | 10 ++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/plugins/outputs/http/http.go b/plugins/outputs/http/http.go
index e36460ac..91c2954c 100644
--- a/plugins/outputs/http/http.go
+++ b/plugins/outputs/http/http.go
@@ -131,6 +131,10 @@ func (h *HTTP) write(reqBody []byte) error {
 		return err
 	}
 
+	if h.Username != "" || h.Password != "" {
+		req.SetBasicAuth(h.Username, h.Password)
+	}
+
 	req.Header.Set("Content-Type", defaultContentType)
 	for k, v := range h.Headers {
 		req.Header.Set(k, v)
diff --git a/plugins/outputs/http/http_test.go b/plugins/outputs/http/http_test.go
index 1d511d85..daec176b 100644
--- a/plugins/outputs/http/http_test.go
+++ b/plugins/outputs/http/http_test.go
@@ -235,10 +235,8 @@ func TestBasicAuth(t *testing.T) {
 	require.NoError(t, err)
 
 	tests := []struct {
-		name     string
-		plugin   *HTTP
-		username string
-		password string
+		name   string
+		plugin *HTTP
 	}{
 		{
 			name: "default",
@@ -274,8 +272,8 @@ func TestBasicAuth(t *testing.T) {
 		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)
+				require.Equal(t, tt.plugin.Username, username)
+				require.Equal(t, tt.plugin.Password, password)
 				w.WriteHeader(http.StatusOK)
 			})
 

From 687ef23596a9a9c62a7ea1732743cb19c7df3a32 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 29 Aug 2018 12:31:43 -0700
Subject: [PATCH 730/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 552be802..fcb1e3c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -89,7 +89,9 @@
 - [#4584](https://github.com/influxdata/telegraf/pull/4584): Fix burrow_group offset calculation for burrow input.
 - [#4550](https://github.com/influxdata/telegraf/pull/4550): Add result_code value for errors running ping command.
 - [#4605](https://github.com/influxdata/telegraf/pull/4605): Remove timeout deadline for udp syslog input.
-- [#4601](https://github.com/influxdata/telegraf/pull/4601): Ensure channel closed if an error occurs in cgroup input.
+- [#4601](https://github.com/influxdata/telegraf/issues/4601): Ensure channel closed if an error occurs in cgroup input.
+- [#4544](https://github.com/influxdata/telegraf/issues/4544): Fix sending of basic auth credentials in http output.
+- [#4526](https://github.com/influxdata/telegraf/issues/4526): Use the correct GOARM value in the armel package.
 
 ## v1.7.3 [2018-08-07]
 

From f6b08df163ad833dea8281c72b3c5a2e68d216b0 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 29 Aug 2018 13:20:49 -0700
Subject: [PATCH 731/835] Set 1.7.4 release date

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fcb1e3c6..5d27b826 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -80,7 +80,7 @@
 - [#4439](https://github.com/influxdata/telegraf/pull/4439): Add csv parser plugin.
 - [#4598](https://github.com/influxdata/telegraf/pull/4598): Add read_buffer_size option to statsd input.
 
-## v1.7.4 [unreleased]
+## v1.7.4 [2018-08-29]
 
 ### Bugfixes
 

From 5420e13f1417634d30ee4cfa044eb82301d9dfc5 Mon Sep 17 00:00:00 2001
From: Ayrdrie <ayrdrie@influxdata.com>
Date: Wed, 29 Aug 2018 19:11:13 -0700
Subject: [PATCH 732/835] Fix divide by zero in logparser input (#4338)

---
 plugins/parsers/grok/parser.go      |  7 ++++++-
 plugins/parsers/grok/parser_test.go | 16 ++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/plugins/parsers/grok/parser.go b/plugins/parsers/grok/parser.go
index bc65588e..c1ebf900 100644
--- a/plugins/parsers/grok/parser.go
+++ b/plugins/parsers/grok/parser.go
@@ -344,6 +344,9 @@ func (p *Parser) ParseLine(line string) (telegraf.Metric, error) {
 			v = strings.Replace(v, ",", ".", -1)
 			ts, err := time.ParseInLocation(t, 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)
@@ -485,6 +488,9 @@ type tsModder struct {
 // most significant time unit of ts.
 //   ie, if the input is at ms precision, it will increment it 1µs.
 func (t *tsModder) tsMod(ts time.Time) time.Time {
+	if ts.IsZero() {
+		return ts
+	}
 	defer func() { t.last = ts }()
 	// don't mod the time if we don't need to
 	if t.last.IsZero() || ts.IsZero() {
@@ -498,7 +504,6 @@ func (t *tsModder) tsMod(ts time.Time) time.Time {
 		t.rollover = 0
 		return ts
 	}
-
 	if ts.Equal(t.last) {
 		t.dupe = ts
 	}
diff --git a/plugins/parsers/grok/parser_test.go b/plugins/parsers/grok/parser_test.go
index 8133d302..60348fc6 100644
--- a/plugins/parsers/grok/parser_test.go
+++ b/plugins/parsers/grok/parser_test.go
@@ -1009,3 +1009,19 @@ func TestMeasurementModifierNoName(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, m.Name(), "hello")
 }
+
+func TestEmptyYearInTimestamp(t *testing.T) {
+	p := &Parser{
+		Patterns: []string{`%{APPLE_SYSLOG_TIME_SHORT:timestamp:ts-"Jan 2 15:04:05"} %{HOSTNAME} %{APP_NAME:app_name}\[%{NUMBER:pid:int}\]%{GREEDYDATA:message}`},
+		CustomPatterns: `
+		APPLE_SYSLOG_TIME_SHORT %{MONTH} +%{MONTHDAY} %{TIME}
+		APP_NAME [a-zA-Z0-9\.]+
+		`,
+	}
+	require.NoError(t, p.Compile())
+	p.ParseLine("Nov  6 13:57:03 generic iTunes[6504]: info> Scale factor of main display = 2.0")
+	m, err := p.ParseLine("Nov  6 13:57:03 generic iTunes[6504]: objc[6504]: Object descriptor was null.")
+	require.NoError(t, err)
+	require.NotNil(t, m)
+	require.Equal(t, 2018, m.Time().Year())
+}

From e7b50384cf13781ca2e0c332b08f656d23ed2bda Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 29 Aug 2018 19:12:38 -0700
Subject: [PATCH 733/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5d27b826..42ee8fd6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -80,6 +80,10 @@
 - [#4439](https://github.com/influxdata/telegraf/pull/4439): Add csv parser plugin.
 - [#4598](https://github.com/influxdata/telegraf/pull/4598): Add read_buffer_size option to statsd input.
 
+### Bugfixes
+
+- [#3438](https://github.com/influxdata/telegraf/issues/3438): Fix divide by zero in logparser input.
+
 ## v1.7.4 [2018-08-29]
 
 ### Bugfixes

From ca9505a3b19220e8685a4ee0bf985ba194b7e11b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 31 Aug 2018 13:59:30 -0700
Subject: [PATCH 734/835] Update ping input readme

---
 plugins/inputs/ping/README.md | 93 ++++++++++++++++++++---------------
 plugins/inputs/ping/ping.go   | 21 ++++----
 2 files changed, 65 insertions(+), 49 deletions(-)

diff --git a/plugins/inputs/ping/README.md b/plugins/inputs/ping/README.md
index 846430a4..4996fdc3 100644
--- a/plugins/inputs/ping/README.md
+++ b/plugins/inputs/ping/README.md
@@ -1,55 +1,68 @@
-# Ping Input plugin
+# Ping Input Plugin
 
-This input plugin will measures the round-trip
+Sends a ping message by executing the system ping command and reports the results.
+
+Currently there is no support for GNU Inetutils, use with iputils-ping
+instead:
+```
+apt-get install iputils-ping
+```
 
 ### Configuration:
 
-```
-# NOTE: this plugin forks the ping command. You may need to set capabilities
-# via setcap cap_net_raw+p /bin/ping
+```toml
 [[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>)
-## Not available in Windows.
-# 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 = ""
+  ## List of urls to ping
+  urls = ["example.org"]
+
+  ## 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
+
+  ## 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 = ""
 ```
 
-### Measurements & Fields:
+### Metrics:
 
-- 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 )
-- 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 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
-    - 2: ping error
+- ping
+  - tags:
+    - url
+  - fields:
+    - packets_transmitted (integer)
+    - packets_received (integer)
+    - percent_packets_loss (float)
+    - average_response_ms (integer)
+    - minimum_response_ms (integer)
+    - maximum_response_ms (integer)
+    - standard_deviation_ms (integer, Not available on Windows)
+    - errors (float, Windows only)
+    - reply_received (integer, Windows only)
+    - percent_reply_loss (float, Windows only)
+    - result_code (int, success = 0, no such host = 1, ping error = 2)
 
-### Tags:
+##### reply_received vs packets_received
 
-- host
-- url
+On Windows systems, "Destination net unreachable" reply will increment `packets_received` but not `reply_received`.
 
 ### Example Output:
 
+**Windows:**
 ```
-$ ./telegraf --config telegraf.conf --input-filter ping --test
-* Plugin: ping, Collection 1
-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
+ping,url=example.org 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
+```
+
+**Linux:**
+```
+ping,url=example.org average_response_ms=23.066,maximum_response_ms=24.64,minimum_response_ms=22.451,packets_received=5i,packets_transmitted=5i,percent_packet_loss=0,result_code=0i,standard_deviation_ms=0.809 1535747258000000000
 ```
diff --git a/plugins/inputs/ping/ping.go b/plugins/inputs/ping/ping.go
index 46afb206..430cbe6d 100644
--- a/plugins/inputs/ping/ping.go
+++ b/plugins/inputs/ping/ping.go
@@ -52,20 +52,23 @@ func (_ *Ping) Description() string {
 }
 
 const sampleConfig = `
-  ## 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>)
+  urls = ["example.org"]
+
+  ## 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>)
+
+  ## 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>)
+
+  ## 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>)
+
+  ## 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>)
+
+  ## 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 = ""
 `

From 90b4a1e4358fc82af4aec10b795f49690e223179 Mon Sep 17 00:00:00 2001
From: Vlasta Hajek <vlastimil.hajek@bonitoo.io>
Date: Sun, 2 Sep 2018 03:59:03 +0200
Subject: [PATCH 735/835] Fix instance and object name in performance counters
 with backslashes  (#4572)

---
 .../win_perf_counters/win_perf_counters.go    | 66 +++++++++++++------
 .../win_perf_counters_test.go                 | 46 ++++++++++++-
 2 files changed, 92 insertions(+), 20 deletions(-)

diff --git a/plugins/inputs/win_perf_counters/win_perf_counters.go b/plugins/inputs/win_perf_counters/win_perf_counters.go
index d2ace523..06a1a333 100644
--- a/plugins/inputs/win_perf_counters/win_perf_counters.go
+++ b/plugins/inputs/win_perf_counters/win_perf_counters.go
@@ -6,7 +6,6 @@ import (
 	"errors"
 	"fmt"
 	"log"
-	"regexp"
 	"strings"
 	"time"
 
@@ -119,28 +118,57 @@ type instanceGrouping struct {
 var sanitizedChars = strings.NewReplacer("/sec", "_persec", "/Sec", "_persec",
 	" ", "_", "%", "Percent", `\`, "")
 
-//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
+// extractCounterInfoFromCounterPath gets object name, instance name (if available) and counter name from counter path
+// 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
+func extractCounterInfoFromCounterPath(counterPath string) (object string, instance string, counter string, err error) {
 
-var counterPathRE = regexp.MustCompile(`.*\\(.*)\\(.*)`)
-var objectInstanceRE = regexp.MustCompile(`(.*)\((.*)\)`)
+	rightObjectBorderIndex := -1
+	leftObjectBorderIndex := -1
+	leftCounterBorderIndex := -1
+	rightInstanceBorderIndex := -1
+	leftInstanceBorderIndex := -1
+	bracketLevel := 0
 
-//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)
+	for i := len(counterPath) - 1; i >= 0; i-- {
+		switch counterPath[i] {
+		case '\\':
+			if bracketLevel == 0 {
+				if leftCounterBorderIndex == -1 {
+					leftCounterBorderIndex = i
+				} else if leftObjectBorderIndex == -1 {
+					leftObjectBorderIndex = i
+				}
+			}
+		case '(':
+			bracketLevel--
+			if leftInstanceBorderIndex == -1 && bracketLevel == 0 && leftObjectBorderIndex == -1 && leftCounterBorderIndex > -1 {
+				leftInstanceBorderIndex = i
+				rightObjectBorderIndex = i
+			}
+		case ')':
+			if rightInstanceBorderIndex == -1 && bracketLevel == 0 && leftCounterBorderIndex > -1 {
+				rightInstanceBorderIndex = i
+			}
+			bracketLevel++
+		}
+	}
+	if rightObjectBorderIndex == -1 {
+		rightObjectBorderIndex = leftCounterBorderIndex
+	}
+	if rightObjectBorderIndex == -1 || leftObjectBorderIndex == -1 {
+		err = errors.New("cannot parse object from: " + counterPath)
 		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 {
-		object = objectInstanceParts[0][1]
-		instance = objectInstanceParts[0][2]
+
+	if leftInstanceBorderIndex > -1 && rightInstanceBorderIndex > -1 {
+		instance = counterPath[leftInstanceBorderIndex+1 : rightInstanceBorderIndex]
+	} else if (leftInstanceBorderIndex == -1 && rightInstanceBorderIndex > -1) || (leftInstanceBorderIndex > -1 && rightInstanceBorderIndex == -1) {
+		err = errors.New("cannot parse instance from: " + counterPath)
+		return
 	}
+	object = counterPath[leftObjectBorderIndex+1 : rightObjectBorderIndex]
+	counter = counterPath[leftCounterBorderIndex+1:]
 	return
 }
 
@@ -184,7 +212,7 @@ func (m *Win_PerfCounters) AddItem(counterPath string, objectName string, instan
 			var err error
 			counterHandle, err := m.query.AddCounterToQuery(counterPath)
 
-			objectName, instance, counterName, err = extractObjectInstanceCounterFromQuery(counterPath)
+			objectName, instance, counterName, err = extractCounterInfoFromCounterPath(counterPath)
 			if err != nil {
 				return 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 07e1941a..81959ef8 100644
--- a/plugins/inputs/win_perf_counters/win_perf_counters_test.go
+++ b/plugins/inputs/win_perf_counters/win_perf_counters_test.go
@@ -28,7 +28,7 @@ type FakePerformanceQuery struct {
 var MetricTime = time.Date(2018, 5, 28, 12, 0, 0, 0, time.UTC)
 
 func (m *testCounter) ToCounterValue() *CounterValue {
-	_, inst, _, _ := extractObjectInstanceCounterFromQuery(m.path)
+	_, inst, _, _ := extractCounterInfoFromCounterPath(m.path)
 	if inst == "" {
 		inst = "--"
 	}
@@ -211,6 +211,50 @@ func createCounterMap(counterPaths []string, values []float64) map[string]testCo
 	return counters
 }
 
+var counterPathsAndRes = map[string][]string{
+	"\\O\\CT":                           {"O", "", "CT"},
+	"\\O\\CT(i)":                        {"O", "", "CT(i)"},
+	"\\O\\CT(d:\\f\\i)":                 {"O", "", "CT(d:\\f\\i)"},
+	"\\\\CM\\O\\CT":                     {"O", "", "CT"},
+	"\\O(I)\\CT":                        {"O", "I", "CT"},
+	"\\O(I)\\CT(i)":                     {"O", "I", "CT(i)"},
+	"\\O(I)\\CT(i)x":                    {"O", "I", "CT(i)x"},
+	"\\O(I)\\CT(d:\\f\\i)":              {"O", "I", "CT(d:\\f\\i)"},
+	"\\\\CM\\O(I)\\CT":                  {"O", "I", "CT"},
+	"\\O(d:\\f\\I)\\CT":                 {"O", "d:\\f\\I", "CT"},
+	"\\O(d:\\f\\I(d))\\CT":              {"O", "d:\\f\\I(d)", "CT"},
+	"\\O(d:\\f\\I(d)x)\\CT":             {"O", "d:\\f\\I(d)x", "CT"},
+	"\\O(d:\\f\\I)\\CT(i)":              {"O", "d:\\f\\I", "CT(i)"},
+	"\\O(d:\\f\\I)\\CT(d:\\f\\i)":       {"O", "d:\\f\\I", "CT(d:\\f\\i)"},
+	"\\\\CM\\O(d:\\f\\I)\\CT":           {"O", "d:\\f\\I", "CT"},
+	"\\\\CM\\O(d:\\f\\I)\\CT(d:\\f\\i)": {"O", "d:\\f\\I", "CT(d:\\f\\i)"},
+	"\\O(I(info))\\CT":                  {"O", "I(info)", "CT"},
+	"\\\\CM\\O(I(info))\\CT":            {"O", "I(info)", "CT"},
+}
+
+var invalidCounterPaths = []string{
+	"\\O(I\\C",
+	"\\OI)\\C",
+	"\\O(I\\C",
+	"\\O/C",
+	"\\O(I/C",
+	"\\O(I/C)",
+	"\\O(I\\)C",
+	"\\O(I\\C)",
+}
+
+func TestCounterPathParsing(t *testing.T) {
+	for path, vals := range counterPathsAndRes {
+		o, i, c, err := extractCounterInfoFromCounterPath(path)
+		require.NoError(t, err)
+		require.True(t, assert.ObjectsAreEqual(vals, []string{o, i, c}), "arrays: %#v and %#v are not equal", vals, []string{o, i, c})
+	}
+	for _, path := range invalidCounterPaths {
+		_, _, _, err := extractCounterInfoFromCounterPath(path)
+		require.Error(t, err)
+	}
+}
+
 func TestAddItemSimple(t *testing.T) {
 	var err error
 	cps1 := []string{"\\O(I)\\C"}

From ab058b396f19279f63a7bfa0fb7a724eb501065d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Sat, 1 Sep 2018 19:01:02 -0700
Subject: [PATCH 736/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42ee8fd6..fbe42f2d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -83,6 +83,7 @@
 ### Bugfixes
 
 - [#3438](https://github.com/influxdata/telegraf/issues/3438): Fix divide by zero in logparser input.
+- [#4499](https://github.com/influxdata/telegraf/issues/4499): Fix instance and object name in performance counters with backslashes.
 
 ## v1.7.4 [2018-08-29]
 

From 87b8141d1376ce2c90cbaf8e5520b0b8bcfcf1f9 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 4 Sep 2018 13:19:54 -0700
Subject: [PATCH 737/835] Make influxdb output log message style more
 consistent

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

diff --git a/plugins/outputs/influxdb/influxdb.go b/plugins/outputs/influxdb/influxdb.go
index bd53d4ed..06079dfc 100644
--- a/plugins/outputs/influxdb/influxdb.go
+++ b/plugins/outputs/influxdb/influxdb.go
@@ -216,7 +216,7 @@ func (i *InfluxDB) Write(metrics []telegraf.Metric) error {
 			}
 		}
 
-		log.Printf("E! [outputs.influxdb]: when writing to [%s]: %v", client.URL(), err)
+		log.Printf("E! [outputs.influxdb] when writing to [%s]: %v", client.URL(), err)
 	}
 
 	return errors.New("could not write any address")

From c7e2945a468230e21de8448aff5313bf6a4a8d46 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 4 Sep 2018 13:21:58 -0700
Subject: [PATCH 738/835] Fix exchange_durability sample config in amqp output

---
 plugins/outputs/amqp/README.md | 4 ++--
 plugins/outputs/amqp/amqp.go   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/outputs/amqp/README.md b/plugins/outputs/amqp/README.md
index 6002311f..fe44ea4e 100644
--- a/plugins/outputs/amqp/README.md
+++ b/plugins/outputs/amqp/README.md
@@ -35,8 +35,8 @@ For an introduction to AMQP see:
   ## If true, exchange will be passively declared.
   # exchange_declare_passive = false
 
-  ## If true, exchange will be created as a durable exchange.
-  # exchange_durable = true
+  ## Exchange durability can be either "transient" or "durable".
+  # exchange_durability = "durable"
 
   ## Additional exchange arguments.
   # exchange_arguments = { }
diff --git a/plugins/outputs/amqp/amqp.go b/plugins/outputs/amqp/amqp.go
index a69db1e6..a41f0a1f 100644
--- a/plugins/outputs/amqp/amqp.go
+++ b/plugins/outputs/amqp/amqp.go
@@ -93,8 +93,8 @@ var sampleConfig = `
   ## If true, exchange will be passively declared.
   # exchange_declare_passive = false
 
-  ## If true, exchange will be created as a durable exchange.
-  # exchange_durable = true
+  ## Exchange durability can be either "transient" or "durable".
+  # exchange_durability = "durable"
 
   ## Additional exchange arguments.
   # exchange_arguments = { }

From 13029a1fa4c5220bf9f5778bdadb9a4bd3c85974 Mon Sep 17 00:00:00 2001
From: Olli Janatuinen <olljanat@users.noreply.github.com>
Date: Thu, 6 Sep 2018 00:19:56 +0300
Subject: [PATCH 739/835] Corrected application insights example config (#4635)

---
 plugins/outputs/application_insights/README.md               | 4 ++--
 plugins/outputs/application_insights/application_insights.go | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/outputs/application_insights/README.md b/plugins/outputs/application_insights/README.md
index 08850a3e..c64e8448 100644
--- a/plugins/outputs/application_insights/README.md
+++ b/plugins/outputs/application_insights/README.md
@@ -12,7 +12,7 @@ This plugin writes telegraf metrics to [Azure Application Insights](https://azur
   # timeout = "5s"
 
   ## Enable additional diagnostic logging.
-  # enable_diagnosic_logging = false
+  # enable_diagnostic_logging = false
 
   ## Context Tag Sources add Application Insights context tags to a tag value.
   ##
@@ -37,7 +37,7 @@ 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`:
+**Example:** Create a telemetry record `bar`:
 ```
 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 26f3f8dc..3da42021 100644
--- a/plugins/outputs/application_insights/application_insights.go
+++ b/plugins/outputs/application_insights/application_insights.go
@@ -48,7 +48,7 @@ var (
   # timeout = "5s"
 
   ## Enable additional diagnostic logging.
-  # enable_diagnosic_logging = false
+  # enable_diagnostic_logging = false
 
   ## Context Tag Sources add Application Insights context tags to a tag value.
   ##

From a47149765eb10de681d6ee640f8a44936b73210c Mon Sep 17 00:00:00 2001
From: Andrew <petelin78@gmail.com>
Date: Wed, 5 Sep 2018 23:27:52 +0200
Subject: [PATCH 740/835] Add queue_durability parameter to amqp_consumer input
 (#4628)

---
 plugins/inputs/amqp_consumer/README.md        |  4 +++
 plugins/inputs/amqp_consumer/amqp_consumer.go | 34 ++++++++++++++-----
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/plugins/inputs/amqp_consumer/README.md b/plugins/inputs/amqp_consumer/README.md
index bc42f910..13353142 100644
--- a/plugins/inputs/amqp_consumer/README.md
+++ b/plugins/inputs/amqp_consumer/README.md
@@ -46,6 +46,10 @@ The following defaults are known to work with RabbitMQ:
 
   ## AMQP queue name
   queue = "telegraf"
+  
+  ## AMQP queue durability can be "transient" or "durable".
+  queue_durability = "durable"
+  
   ## Binding Key
   binding_key = "#"
 
diff --git a/plugins/inputs/amqp_consumer/amqp_consumer.go b/plugins/inputs/amqp_consumer/amqp_consumer.go
index 739ed76e..33cd9971 100644
--- a/plugins/inputs/amqp_consumer/amqp_consumer.go
+++ b/plugins/inputs/amqp_consumer/amqp_consumer.go
@@ -30,7 +30,9 @@ type AMQPConsumer struct {
 	ExchangeArguments  map[string]string `toml:"exchange_arguments"`
 
 	// Queue Name
-	Queue string
+	Queue           string `toml:"queue"`
+	QueueDurability string `toml:"queue_durability"`
+
 	// Binding Key
 	BindingKey string `toml:"binding_key"`
 
@@ -64,6 +66,8 @@ const (
 	DefaultExchangeType       = "topic"
 	DefaultExchangeDurability = "durable"
 
+	DefaultQueueDurability = "durable"
+
 	DefaultPrefetchCount = 50
 )
 
@@ -98,10 +102,13 @@ func (a *AMQPConsumer) SampleConfig() string {
   # exchange_arguments = { }
   # exchange_arguments = {"hash_propery" = "timestamp"}
 
-  ## AMQP queue name
+  ## AMQP queue name.
   queue = "telegraf"
 
-  ## Binding Key
+  ## AMQP queue durability can be "transient" or "durable".
+  queue_durability = "durable"
+
+  ## Binding Key.
   binding_key = "#"
 
   ## Maximum number of messages server should give to the worker.
@@ -260,13 +267,21 @@ func (a *AMQPConsumer) connect(amqpConf *amqp.Config) (<-chan amqp.Delivery, err
 		return nil, err
 	}
 
+	var queueDurable = true
+	switch a.QueueDurability {
+	case "transient":
+		queueDurable = false
+	default:
+		queueDurable = true
+	}
+
 	q, err := ch.QueueDeclare(
-		a.Queue, // queue
-		true,    // durable
-		false,   // delete when unused
-		false,   // exclusive
-		false,   // no-wait
-		nil,     // arguments
+		a.Queue,      // queue
+		queueDurable, // 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)
@@ -380,6 +395,7 @@ func init() {
 			AuthMethod:         DefaultAuthMethod,
 			ExchangeType:       DefaultExchangeType,
 			ExchangeDurability: DefaultExchangeDurability,
+			QueueDurability:    DefaultQueueDurability,
 			PrefetchCount:      DefaultPrefetchCount,
 		}
 	})

From f70d6519e77d71c761262391a1418277cfa3d600 Mon Sep 17 00:00:00 2001
From: Gunnar <628831+gunnaraasen@users.noreply.github.com>
Date: Wed, 5 Sep 2018 14:50:32 -0700
Subject: [PATCH 741/835] Add Azure Monitor output plugin (#4089)

---
 Gopkg.lock                                    |  22 +-
 Gopkg.toml                                    |   4 +
 docs/LICENSE_OF_DEPENDENCIES.md               |   2 +
 internal/models/running_output.go             |  13 +
 output.go                                     |   6 +
 plugins/outputs/all/all.go                    |   1 +
 plugins/outputs/azure_monitor/README.md       | 139 ++++
 .../outputs/azure_monitor/azure_monitor.go    | 615 ++++++++++++++++++
 .../azure_monitor/azure_monitor_test.go       | 361 ++++++++++
 plugins/parsers/logfmt/parser_test.go         | 119 ++--
 testutil/metric.go                            |  87 ++-
 testutil/metric_test.go                       |  37 +-
 12 files changed, 1318 insertions(+), 88 deletions(-)
 create mode 100644 plugins/outputs/azure_monitor/README.md
 create mode 100644 plugins/outputs/azure_monitor/azure_monitor.go
 create mode 100644 plugins/outputs/azure_monitor/azure_monitor_test.go

diff --git a/Gopkg.lock b/Gopkg.lock
index ef76419b..0f29ab59 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -21,6 +21,18 @@
   revision = "2ce144541b8903101fb8f1483cc0497a68798122"
   version = "v0.3.0"
 
+[[projects]]
+  name = "github.com/Azure/go-autorest"
+  packages = [
+    "autorest",
+    "autorest/adal",
+    "autorest/azure",
+    "autorest/azure/auth",
+    "autorest/date"
+  ]
+  revision = "1f7cd6cfe0adea687ad44a512dfe76140f804318"
+  version = "v10.12.0"
+
 [[projects]]
   branch = "master"
   digest = "1:298712a3ee36b59c3ca91f4183bd75d174d5eaa8b4aed5072831f126e2e752f6"
@@ -224,6 +236,12 @@
   revision = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"
   version = "v3.2.0"
 
+[[projects]]
+  branch = "master"
+  name = "github.com/dimchansky/utfbom"
+  packages = ["."]
+  revision = "6c6132ff69f0f6c088739067407b5d32c52e1d0f"
+
 [[projects]]
   digest = "1:522eff2a1f014a64fb403db60fc0110653e4dc5b59779894d208e697b0708ddc"
   name = "github.com/docker/distribution"
@@ -975,7 +993,9 @@
     "ed25519/internal/edwards25519",
     "md4",
     "pbkdf2",
-    "ssh/terminal",
+    "pkcs12",
+    "pkcs12/internal/rc2",
+    "ssh/terminal"
   ]
   pruneopts = ""
   revision = "a2144134853fc9a27a7b1e3eb4f19f1a76df13c9"
diff --git a/Gopkg.toml b/Gopkg.toml
index d282e1eb..f942f340 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -221,3 +221,7 @@
 [[override]]
   source = "https://github.com/fsnotify/fsnotify/archive/v1.4.7.tar.gz"
   name = "gopkg.in/fsnotify.v1"
+
+[[constraint]]
+  name = "github.com/Azure/go-autorest"
+  version = "10.12.0"
diff --git a/docs/LICENSE_OF_DEPENDENCIES.md b/docs/LICENSE_OF_DEPENDENCIES.md
index 2d215984..36f03899 100644
--- a/docs/LICENSE_OF_DEPENDENCIES.md
+++ b/docs/LICENSE_OF_DEPENDENCIES.md
@@ -8,6 +8,7 @@ following works:
 - 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/Azure/go-autorest [APACHE](https://github.com/Azure/go-autorest/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)
@@ -19,6 +20,7 @@ following works:
 - 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/dimchansky/utfbom [APACHE](https://github.com/dimchansky/utfbom/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)
diff --git a/internal/models/running_output.go b/internal/models/running_output.go
index 25576d74..c926917d 100644
--- a/internal/models/running_output.go
+++ b/internal/models/running_output.go
@@ -114,6 +114,13 @@ func (ro *RunningOutput) AddMetric(m telegraf.Metric) {
 		m, _ = metric.New(name, tags, fields, t, tp)
 	}
 
+	if output, ok := ro.Output.(telegraf.AggregatingOutput); ok {
+		ro.Lock()
+		defer ro.Unlock()
+		output.Add(m)
+		return
+	}
+
 	ro.metrics.Add(m)
 	if ro.metrics.Len() == ro.MetricBatchSize {
 		batch := ro.metrics.Batch(ro.MetricBatchSize)
@@ -127,6 +134,12 @@ func (ro *RunningOutput) AddMetric(m telegraf.Metric) {
 
 // Write writes all cached points to this output.
 func (ro *RunningOutput) Write() error {
+	if output, ok := ro.Output.(telegraf.AggregatingOutput); ok {
+		metrics := output.Push()
+		ro.metrics.Add(metrics...)
+		output.Reset()
+	}
+
 	nFails, nMetrics := ro.failMetrics.Len(), ro.metrics.Len()
 	ro.BufferSize.Set(int64(nFails + nMetrics))
 	log.Printf("D! Output [%s] buffer fullness: %d / %d metrics. ",
diff --git a/output.go b/output.go
index d66ea455..39b371ac 100644
--- a/output.go
+++ b/output.go
@@ -13,6 +13,12 @@ type Output interface {
 	Write(metrics []Metric) error
 }
 
+type AggregatingOutput interface {
+	Add(in Metric)
+	Push() []Metric
+	Reset()
+}
+
 type ServiceOutput interface {
 	// Connect to the Output
 	Connect() error
diff --git a/plugins/outputs/all/all.go b/plugins/outputs/all/all.go
index 037807c2..4d49c0c6 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/application_insights"
+	_ "github.com/influxdata/telegraf/plugins/outputs/azure_monitor"
 	_ "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/azure_monitor/README.md b/plugins/outputs/azure_monitor/README.md
new file mode 100644
index 00000000..cd138613
--- /dev/null
+++ b/plugins/outputs/azure_monitor/README.md
@@ -0,0 +1,139 @@
+# Azure Monitor
+
+This plugin will send custom metrics to Azure Monitor. Azure Monitor has a
+metric resolution of one minute. To handle this in Telegraf, the Azure Monitor
+output plugin will automatically aggregates metrics into one minute buckets,
+which are then sent to Azure Monitor on every flush interval.
+
+The metrics from each input plugin will be written to a separate Azure Monitor
+namespace, prefixed with `Telegraf/` by default. The field name for each
+metric is written as the Azure Monitor metric name. All field values are
+written as a summarized set that includes: min, max, sum, count. Tags are
+written as a dimension on each Azure Monitor metric.
+
+Since Azure Monitor only accepts numeric values, string-typed fields are
+dropped by default. There is a configuration option (`strings_as_dimensions`)
+to retain fields that contain strings as extra dimensions. Azure Monitor
+allows a maximum of 10 dimensions per metric so any dimensions over that
+amount will be deterministically dropped.
+
+### Configuration:
+
+```toml
+[[outputs.azure_monitor]]
+  ## Timeout for HTTP writes.
+  # timeout = "20s"
+
+  ## Set the namespace prefix, defaults to "Telegraf/<input-name>".
+  # namespace_prefix = "Telegraf/"
+
+  ## Azure Monitor doesn't have a string value type, so convert string
+  ## fields to dimensions (a.k.a. tags) if enabled. Azure Monitor allows
+  ## a maximum of 10 dimensions so Telegraf will only send the first 10
+  ## alphanumeric dimensions.
+  # strings_as_dimensions = false
+
+  ## Both region and resource_id must be set or be available via the
+  ## Instance Metadata service on Azure Virtual Machines.
+  #
+  ## Azure Region to publish metrics against.
+  ##   ex: region = "southcentralus"
+  # region = ""
+  #
+  ## The Azure Resource ID against which metric will be logged, e.g.
+  ##   ex: resource_id = "/subscriptions/<subscription_id>/resourceGroups/<resource_group>/providers/Microsoft.Compute/virtualMachines/<vm_name>"
+  # resource_id = ""
+```
+
+### Setup
+
+1. [Register the `microsoft.insights` resource provider in your Azure subscription][resource provider].
+2. If using Managed Service Identities to authenticate an Azure VM,
+   [enable system-assigned managed identity][enable msi].
+2. Use a region that supports Azure Monitor Custom Metrics,
+   For regions with Custom Metrics support, an endpoint will be available with
+   the format `https://<region>.monitoring.azure.com`. The following regions
+   are currently known to be supported:
+    - East US (eastus)
+    - West US 2 (westus2)
+    - South Central US (southcentralus)
+    - West Central US (westcentralus)
+    - North Europe (northeurope)
+    - West Europe (westeurope)
+    - Southeast Asia (southeastasia)
+
+[resource provider]: https://docs.microsoft.com/en-us/azure/azure-resource-manager/resource-manager-supported-services
+[enable msi]: https://docs.microsoft.com/en-us/azure/active-directory/managed-service-identity/qs-configure-portal-windows-vm
+
+### Region and Resource ID
+
+The plugin will attempt to discover the region and resource ID using the Azure
+VM Instance Metadata service. If Telegraf is not running on a virtual machine
+or the VM Instance Metadata service is not available, the following variables
+are required for the output to function.
+
+* region
+* resource_id
+
+### Authentication
+
+This plugin uses one of several different types of authenticate methods. The
+preferred authentication methods are different from the *order* in which each
+authentication is checked. Here are the preferred authentication methods:
+
+1. Managed Service Identity (MSI) token
+    - This is the prefered authentication method. Telegraf will automatically
+      authenticate using this method when running on Azure VMs.
+2. AAD Application Tokens (Service Principals)
+    - Primarily useful if Telegraf is writing metrics for other resources.
+      [More information][principal].
+    - A Service Principal or User Principal needs to be assigned the `Monitoring
+      Contributor` roles.
+3. AAD User Tokens (User Principals)
+    - Allows Telegraf to authenticate like a user. It is best to use this method
+      for development.
+
+[principal]: https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-application-objects
+
+The plugin will authenticate using the first available of the
+following configurations:
+
+1. **Client Credentials**: Azure AD Application ID and Secret.
+
+    Set the following Telegraf configuration variables:
+
+    - `azure_tenant_id`: Specifies the Tenant to which to authenticate.
+    - `azure_client_id`: Specifies the app client ID to use.
+    - `azure_client_secret`: Specifies the app secret to use.
+
+    Or set the following environment variables:
+
+    - `AZURE_TENANT_ID`: Specifies the Tenant to which to authenticate.
+    - `AZURE_CLIENT_ID`: Specifies the app client ID to use.
+    - `AZURE_CLIENT_SECRET`: Specifies the app secret to use.
+
+2. **Client Certificate**: Azure AD Application ID and X.509 Certificate.
+
+    - `AZURE_TENANT_ID`: Specifies the Tenant to which to authenticate.
+    - `AZURE_CLIENT_ID`: Specifies the app client ID to use.
+    - `AZURE_CERTIFICATE_PATH`: Specifies the certificate Path to use.
+    - `AZURE_CERTIFICATE_PASSWORD`: Specifies the certificate password to use.
+
+3. **Resource Owner Password**: Azure AD User and Password. This grant type is
+   *not recommended*, use device login instead if you need interactive login.
+
+    - `AZURE_TENANT_ID`: Specifies the Tenant to which to authenticate.
+    - `AZURE_CLIENT_ID`: Specifies the app client ID to use.
+    - `AZURE_USERNAME`: Specifies the username to use.
+    - `AZURE_PASSWORD`: Specifies the password to use.
+
+4. **Azure Managed Service Identity**: Delegate credential management to the
+   platform. Requires that code is running in Azure, e.g. on a VM. All
+   configuration is handled by Azure. See [Azure Managed Service Identity][msi]
+   for more details. Only available when using the [Azure Resource Manager][arm].
+
+[msi]: https://docs.microsoft.com/en-us/azure/active-directory/msi-overview
+[arm]: https://docs.microsoft.com/en-us/azure/azure-resource-manager/resource-group-overview
+
+**Note: As shown above, the last option (#4) is the preferred way to
+authenticate when running Telegraf on Azure VMs.
diff --git a/plugins/outputs/azure_monitor/azure_monitor.go b/plugins/outputs/azure_monitor/azure_monitor.go
new file mode 100644
index 00000000..afc3a20e
--- /dev/null
+++ b/plugins/outputs/azure_monitor/azure_monitor.go
@@ -0,0 +1,615 @@
+package azure_monitor
+
+import (
+	"bytes"
+	"compress/gzip"
+	"encoding/binary"
+	"encoding/json"
+	"fmt"
+	"hash/fnv"
+	"io/ioutil"
+	"log"
+	"net/http"
+	"regexp"
+	"strings"
+	"time"
+
+	"github.com/Azure/go-autorest/autorest"
+	"github.com/Azure/go-autorest/autorest/azure/auth"
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/metric"
+	"github.com/influxdata/telegraf/plugins/outputs"
+	"github.com/influxdata/telegraf/selfstat"
+)
+
+// AzureMonitor allows publishing of metrics to the Azure Monitor custom metrics
+// service
+type AzureMonitor struct {
+	Timeout             internal.Duration
+	NamespacePrefix     string `toml:"namespace_prefix"`
+	StringsAsDimensions bool   `toml:"strings_as_dimensions"`
+	Region              string
+	ResourceID          string `toml:"resource_id"`
+
+	url    string
+	auth   autorest.Authorizer
+	client *http.Client
+
+	cache    map[time.Time]map[uint64]*aggregate
+	timeFunc func() time.Time
+
+	MetricOutsideWindow selfstat.Stat
+}
+
+type dimension struct {
+	name  string
+	value string
+}
+
+type aggregate struct {
+	name       string
+	min        float64
+	max        float64
+	sum        float64
+	count      int64
+	dimensions []dimension
+	updated    bool
+}
+
+const (
+	defaultRequestTimeout  = time.Second * 5
+	defaultNamespacePrefix = "Telegraf/"
+	defaultAuthResource    = "https://monitoring.azure.com/"
+
+	vmInstanceMetadataURL = "http://169.254.169.254/metadata/instance?api-version=2017-12-01"
+	resourceIDTemplate    = "/subscriptions/%s/resourceGroups/%s/providers/Microsoft.Compute/virtualMachines/%s"
+	urlTemplate           = "https://%s.monitoring.azure.com%s/metrics"
+	maxRequestBodySize    = 4000000
+)
+
+var sampleConfig = `
+  ## Timeout for HTTP writes.
+  # timeout = "20s"
+
+  ## Set the namespace prefix, defaults to "Telegraf/<input-name>".
+  # namespace_prefix = "Telegraf/"
+
+  ## Azure Monitor doesn't have a string value type, so convert string
+  ## fields to dimensions (a.k.a. tags) if enabled. Azure Monitor allows
+  ## a maximum of 10 dimensions so Telegraf will only send the first 10
+  ## alphanumeric dimensions.
+  # strings_as_dimensions = false
+
+  ## Both region and resource_id must be set or be available via the
+  ## Instance Metadata service on Azure Virtual Machines.
+  #
+  ## Azure Region to publish metrics against.
+  ##   ex: region = "southcentralus"
+  # region = ""
+  #
+  ## The Azure Resource ID against which metric will be logged, e.g.
+  ##   ex: resource_id = "/subscriptions/<subscription_id>/resourceGroups/<resource_group>/providers/Microsoft.Compute/virtualMachines/<vm_name>"
+  # resource_id = ""
+`
+
+// Description provides a description of the plugin
+func (a *AzureMonitor) Description() string {
+	return "Send aggregate metrics to Azure Monitor"
+}
+
+// SampleConfig provides a sample configuration for the plugin
+func (a *AzureMonitor) SampleConfig() string {
+	return sampleConfig
+}
+
+// Connect initializes the plugin and validates connectivity
+func (a *AzureMonitor) Connect() error {
+	a.cache = make(map[time.Time]map[uint64]*aggregate, 36)
+
+	if a.Timeout.Duration == 0 {
+		a.Timeout.Duration = defaultRequestTimeout
+	}
+
+	a.client = &http.Client{
+		Transport: &http.Transport{
+			Proxy: http.ProxyFromEnvironment,
+		},
+		Timeout: a.Timeout.Duration,
+	}
+
+	if a.NamespacePrefix == "" {
+		a.NamespacePrefix = defaultNamespacePrefix
+	}
+
+	var err error
+	var region string
+	var resourceID string
+	if a.Region == "" || a.ResourceID == "" {
+		// Pull region and resource identifier
+		region, resourceID, err = vmInstanceMetadata(a.client)
+		if err != nil {
+			return err
+		}
+	}
+	if a.Region != "" {
+		region = a.Region
+	}
+	if a.ResourceID != "" {
+		resourceID = a.ResourceID
+	}
+
+	if resourceID == "" {
+		return fmt.Errorf("no resource ID configured or available via VM instance metadata")
+	} else if region == "" {
+		return fmt.Errorf("no region configured or available via VM instance metadata")
+	}
+	a.url = fmt.Sprintf(urlTemplate, region, resourceID)
+
+	log.Printf("D! Writing to Azure Monitor URL: %s", a.url)
+
+	a.auth, err = auth.NewAuthorizerFromEnvironmentWithResource(defaultAuthResource)
+	if err != nil {
+		return nil
+	}
+
+	a.Reset()
+
+	tags := map[string]string{
+		"region":      region,
+		"resource_id": resourceID,
+	}
+	a.MetricOutsideWindow = selfstat.Register("azure_monitor", "metric_outside_window", tags)
+
+	return nil
+}
+
+// vmMetadata retrieves metadata about the current Azure VM
+func vmInstanceMetadata(c *http.Client) (string, string, error) {
+	req, err := http.NewRequest("GET", vmInstanceMetadataURL, nil)
+	if err != nil {
+		return "", "", fmt.Errorf("error creating request: %v", err)
+	}
+	req.Header.Set("Metadata", "true")
+
+	resp, err := c.Do(req)
+	if err != nil {
+		return "", "", err
+	}
+	defer resp.Body.Close()
+
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return "", "", err
+	}
+	if resp.StatusCode >= 300 || resp.StatusCode < 200 {
+		return "", "", fmt.Errorf("unable to fetch instance metadata: [%v] %s", resp.StatusCode, body)
+	}
+
+	// VirtualMachineMetadata contains information about a VM from the metadata service
+	type VirtualMachineMetadata struct {
+		Compute struct {
+			Location          string `json:"location"`
+			Name              string `json:"name"`
+			ResourceGroupName string `json:"resourceGroupName"`
+			SubscriptionID    string `json:"subscriptionId"`
+		} `json:"compute"`
+	}
+
+	var metadata VirtualMachineMetadata
+	if err := json.Unmarshal(body, &metadata); err != nil {
+		return "", "", err
+	}
+
+	region := metadata.Compute.Location
+	resourceID := fmt.Sprintf(
+		resourceIDTemplate,
+		metadata.Compute.SubscriptionID,
+		metadata.Compute.ResourceGroupName,
+		metadata.Compute.Name,
+	)
+
+	return region, resourceID, nil
+}
+
+// Close shuts down an any active connections
+func (a *AzureMonitor) Close() error {
+	a.client = nil
+	return nil
+}
+
+type azureMonitorMetric struct {
+	Time time.Time         `json:"time"`
+	Data *azureMonitorData `json:"data"`
+}
+
+type azureMonitorData struct {
+	BaseData *azureMonitorBaseData `json:"baseData"`
+}
+
+type azureMonitorBaseData struct {
+	Metric         string                `json:"metric"`
+	Namespace      string                `json:"namespace"`
+	DimensionNames []string              `json:"dimNames"`
+	Series         []*azureMonitorSeries `json:"series"`
+}
+
+type azureMonitorSeries struct {
+	DimensionValues []string `json:"dimValues"`
+	Min             float64  `json:"min"`
+	Max             float64  `json:"max"`
+	Sum             float64  `json:"sum"`
+	Count           int64    `json:"count"`
+}
+
+// Write writes metrics to the remote endpoint
+func (a *AzureMonitor) Write(metrics []telegraf.Metric) error {
+	azmetrics := make(map[uint64]*azureMonitorMetric, len(metrics))
+	for _, m := range metrics {
+		id := hashIDWithTagKeysOnly(m)
+		if azm, ok := azmetrics[id]; !ok {
+			amm, err := translate(m, a.NamespacePrefix)
+			if err != nil {
+				log.Printf("E! [outputs.azure_monitor]: could not create azure metric for %q; discarding point", m.Name())
+				continue
+			}
+			azmetrics[id] = amm
+		} else {
+			amm, err := translate(m, a.NamespacePrefix)
+			if err != nil {
+				log.Printf("E! [outputs.azure_monitor]: could not create azure metric for %q; discarding point", m.Name())
+				continue
+			}
+
+			azmetrics[id].Data.BaseData.Series = append(
+				azm.Data.BaseData.Series,
+				amm.Data.BaseData.Series...,
+			)
+		}
+	}
+
+	if len(azmetrics) == 0 {
+		return nil
+	}
+
+	var body []byte
+	for _, m := range azmetrics {
+		// Azure Monitor accepts new batches of points in new-line delimited
+		// JSON, following RFC 4288 (see https://github.com/ndjson/ndjson-spec).
+		jsonBytes, err := json.Marshal(&m)
+		if err != nil {
+			return err
+		}
+		// Azure Monitor's maximum request body size of 4MB. Send batches that
+		// exceed this size via separate write requests.
+		if (len(body) + len(jsonBytes) + 1) > maxRequestBodySize {
+			err := a.send(body)
+			if err != nil {
+				return err
+			}
+			body = nil
+		}
+		body = append(body, jsonBytes...)
+		body = append(body, '\n')
+	}
+
+	return a.send(body)
+}
+
+func (a *AzureMonitor) send(body []byte) error {
+	var buf bytes.Buffer
+	g := gzip.NewWriter(&buf)
+	if _, err := g.Write(body); err != nil {
+		return err
+	}
+	if err := g.Close(); err != nil {
+		return err
+	}
+
+	req, err := http.NewRequest("POST", a.url, &buf)
+	if err != nil {
+		return err
+	}
+
+	req.Header.Set("Content-Encoding", "gzip")
+	req.Header.Set("Content-Type", "application/x-ndjson")
+
+	// Add the authorization header. WithAuthorization will automatically
+	// refresh the token if needed.
+	req, err = autorest.CreatePreparer(a.auth.WithAuthorization()).Prepare(req)
+	if err != nil {
+		return fmt.Errorf("unable to fetch authentication credentials: %v", err)
+	}
+
+	resp, err := a.client.Do(req)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+
+	_, err = ioutil.ReadAll(resp.Body)
+	if err != nil || resp.StatusCode < 200 || resp.StatusCode > 299 {
+		return fmt.Errorf("failed to write batch: [%v] %s", resp.StatusCode, resp.Status)
+	}
+
+	return nil
+}
+
+func hashIDWithTagKeysOnly(m telegraf.Metric) uint64 {
+	h := fnv.New64a()
+	h.Write([]byte(m.Name()))
+	h.Write([]byte("\n"))
+	for _, tag := range m.TagList() {
+		h.Write([]byte(tag.Key))
+		h.Write([]byte("\n"))
+	}
+	b := make([]byte, binary.MaxVarintLen64)
+	n := binary.PutUvarint(b, uint64(m.Time().UnixNano()))
+	h.Write(b[:n])
+	h.Write([]byte("\n"))
+	return h.Sum64()
+}
+
+func translate(m telegraf.Metric, prefix string) (*azureMonitorMetric, error) {
+	var dimensionNames []string
+	var dimensionValues []string
+	for _, tag := range m.TagList() {
+		// Azure custom metrics service supports up to 10 dimensions
+		if len(dimensionNames) > 10 {
+			continue
+		}
+
+		if tag.Key == "" || tag.Value == "" {
+			continue
+		}
+
+		dimensionNames = append(dimensionNames, tag.Key)
+		dimensionValues = append(dimensionValues, tag.Value)
+	}
+
+	min, err := getFloatField(m, "min")
+	if err != nil {
+		return nil, err
+	}
+	max, err := getFloatField(m, "max")
+	if err != nil {
+		return nil, err
+	}
+	sum, err := getFloatField(m, "sum")
+	if err != nil {
+		return nil, err
+	}
+	count, err := getIntField(m, "count")
+	if err != nil {
+		return nil, err
+	}
+
+	mn, ns := "Missing", "Missing"
+	names := strings.SplitN(m.Name(), "-", 2)
+	if len(names) > 1 {
+		mn = names[1]
+	}
+	if len(names) > 0 {
+		ns = names[0]
+	}
+	ns = prefix + ns
+
+	return &azureMonitorMetric{
+		Time: m.Time(),
+		Data: &azureMonitorData{
+			BaseData: &azureMonitorBaseData{
+				Metric:         mn,
+				Namespace:      ns,
+				DimensionNames: dimensionNames,
+				Series: []*azureMonitorSeries{
+					&azureMonitorSeries{
+						DimensionValues: dimensionValues,
+						Min:             min,
+						Max:             max,
+						Sum:             sum,
+						Count:           count,
+					},
+				},
+			},
+		},
+	}, nil
+}
+
+func getFloatField(m telegraf.Metric, key string) (float64, error) {
+	fv, ok := m.GetField(key)
+	if !ok {
+		return 0, fmt.Errorf("missing field: %s", key)
+	}
+
+	if value, ok := fv.(float64); ok {
+		return value, nil
+	}
+	return 0, fmt.Errorf("unexpected type: %s: %T", key, fv)
+}
+
+func getIntField(m telegraf.Metric, key string) (int64, error) {
+	fv, ok := m.GetField(key)
+	if !ok {
+		return 0, fmt.Errorf("missing field: %s", key)
+	}
+
+	if value, ok := fv.(int64); ok {
+		return value, nil
+	}
+	return 0, fmt.Errorf("unexpected type: %s: %T", key, fv)
+}
+
+// Add will append a metric to the output aggregate
+func (a *AzureMonitor) Add(m telegraf.Metric) {
+	// Azure Monitor only supports aggregates 30 minutes into the past and 4
+	// minutes into the future. Future metrics are dropped when pushed.
+	t := m.Time()
+	tbucket := time.Date(t.Year(), t.Month(), t.Day(), t.Hour(), t.Minute(), 0, 0, t.Location())
+	if tbucket.Before(a.timeFunc().Add(-time.Minute * 30)) {
+		a.MetricOutsideWindow.Incr(1)
+		return
+	}
+
+	// Azure Monitor doesn't have a string value type, so convert string fields
+	// to dimensions (a.k.a. tags) if enabled.
+	if a.StringsAsDimensions {
+		for _, f := range m.FieldList() {
+			if v, ok := f.Value.(string); ok {
+				m.AddTag(f.Key, v)
+			}
+		}
+	}
+
+	for _, f := range m.FieldList() {
+		fv, ok := convert(f.Value)
+		if !ok {
+			continue
+		}
+
+		// Azure Monitor does not support fields so the field name is appended
+		// to the metric name.
+		name := m.Name() + "-" + sanitize(f.Key)
+		id := hashIDWithField(m.HashID(), f.Key)
+
+		_, ok = a.cache[tbucket]
+		if !ok {
+			// Time bucket does not exist and needs to be created.
+			a.cache[tbucket] = make(map[uint64]*aggregate)
+		}
+
+		// Fetch existing aggregate
+		var agg *aggregate
+		agg, ok = a.cache[tbucket][id]
+		if !ok {
+			agg := &aggregate{
+				name:  name,
+				min:   fv,
+				max:   fv,
+				sum:   fv,
+				count: 1,
+			}
+			for _, tag := range m.TagList() {
+				dim := dimension{
+					name:  tag.Key,
+					value: tag.Value,
+				}
+				agg.dimensions = append(agg.dimensions, dim)
+			}
+			agg.updated = true
+			a.cache[tbucket][id] = agg
+			continue
+		}
+
+		if fv < agg.min {
+			agg.min = fv
+		}
+		if fv > agg.max {
+			agg.max = fv
+		}
+		agg.sum += fv
+		agg.count++
+		agg.updated = true
+	}
+}
+
+func convert(in interface{}) (float64, bool) {
+	switch v := in.(type) {
+	case int64:
+		return float64(v), true
+	case uint64:
+		return float64(v), true
+	case float64:
+		return v, true
+	case bool:
+		if v {
+			return 1, true
+		}
+		return 0, true
+	default:
+		return 0, false
+	}
+}
+
+var invalidNameCharRE = regexp.MustCompile(`[^a-zA-Z0-9_]`)
+
+func sanitize(value string) string {
+	return invalidNameCharRE.ReplaceAllString(value, "_")
+}
+
+func hashIDWithField(id uint64, fk string) uint64 {
+	h := fnv.New64a()
+	b := make([]byte, binary.MaxVarintLen64)
+	n := binary.PutUvarint(b, id)
+	h.Write(b[:n])
+	h.Write([]byte("\n"))
+	h.Write([]byte(fk))
+	h.Write([]byte("\n"))
+	return h.Sum64()
+}
+
+// Push sends metrics to the output metric buffer
+func (a *AzureMonitor) Push() []telegraf.Metric {
+	var metrics []telegraf.Metric
+	for tbucket, aggs := range a.cache {
+		// Do not send metrics early
+		if tbucket.After(a.timeFunc().Add(-time.Minute)) {
+			continue
+		}
+		for _, agg := range aggs {
+			// Only send aggregates that have had an update since the last push.
+			if !agg.updated {
+				continue
+			}
+
+			tags := make(map[string]string, len(agg.dimensions))
+			for _, tag := range agg.dimensions {
+				tags[tag.name] = tag.value
+			}
+
+			m, err := metric.New(agg.name,
+				tags,
+				map[string]interface{}{
+					"min":   agg.min,
+					"max":   agg.max,
+					"sum":   agg.sum,
+					"count": agg.count,
+				},
+				tbucket,
+			)
+
+			if err != nil {
+				log.Printf("E! [outputs.azure_monitor]: could not create metric for aggregation %q; discarding point", agg.name)
+			}
+
+			metrics = append(metrics, m)
+		}
+	}
+	return metrics
+}
+
+// Reset clears the cache of aggregate metrics
+func (a *AzureMonitor) Reset() {
+	for tbucket := range a.cache {
+		// Remove aggregates older than 30 minutes
+		if tbucket.Before(a.timeFunc().Add(-time.Minute * 30)) {
+			delete(a.cache, tbucket)
+			continue
+		}
+		// Metrics updated within the latest 1m have not been pushed and should
+		// not be cleared.
+		if tbucket.After(a.timeFunc().Add(-time.Minute)) {
+			continue
+		}
+		for id := range a.cache[tbucket] {
+			a.cache[tbucket][id].updated = false
+		}
+	}
+}
+
+func init() {
+	outputs.Add("azure_monitor", func() telegraf.Output {
+		return &AzureMonitor{
+			timeFunc: time.Now,
+		}
+	})
+}
diff --git a/plugins/outputs/azure_monitor/azure_monitor_test.go b/plugins/outputs/azure_monitor/azure_monitor_test.go
new file mode 100644
index 00000000..6fb40805
--- /dev/null
+++ b/plugins/outputs/azure_monitor/azure_monitor_test.go
@@ -0,0 +1,361 @@
+package azure_monitor
+
+import (
+	"bufio"
+	"compress/gzip"
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+	"time"
+
+	"github.com/Azure/go-autorest/autorest"
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/require"
+)
+
+func TestAggregate(t *testing.T) {
+	tests := []struct {
+		name     string
+		plugin   *AzureMonitor
+		metrics  []telegraf.Metric
+		addTime  time.Time
+		pushTime time.Time
+		check    func(t *testing.T, plugin *AzureMonitor, metrics []telegraf.Metric)
+	}{
+		{
+			name: "add metric outside window is dropped",
+			plugin: &AzureMonitor{
+				Region:     "test",
+				ResourceID: "/test",
+			},
+			metrics: []telegraf.Metric{
+				testutil.MustMetric(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"value": 42,
+					},
+					time.Unix(0, 0),
+				),
+			},
+			addTime:  time.Unix(3600, 0),
+			pushTime: time.Unix(3600, 0),
+			check: func(t *testing.T, plugin *AzureMonitor, metrics []telegraf.Metric) {
+				require.Equal(t, int64(1), plugin.MetricOutsideWindow.Get())
+				require.Len(t, metrics, 0)
+			},
+		},
+		{
+			name: "metric not sent until period expires",
+			plugin: &AzureMonitor{
+				Region:     "test",
+				ResourceID: "/test",
+			},
+			metrics: []telegraf.Metric{
+				testutil.MustMetric(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"value": 42,
+					},
+					time.Unix(0, 0),
+				),
+			},
+			addTime:  time.Unix(0, 0),
+			pushTime: time.Unix(0, 0),
+			check: func(t *testing.T, plugin *AzureMonitor, metrics []telegraf.Metric) {
+				require.Len(t, metrics, 0)
+			},
+		},
+		{
+			name: "add strings as dimensions",
+			plugin: &AzureMonitor{
+				Region:              "test",
+				ResourceID:          "/test",
+				StringsAsDimensions: true,
+			},
+			metrics: []telegraf.Metric{
+				testutil.MustMetric(
+					"cpu",
+					map[string]string{
+						"host": "localhost",
+					},
+					map[string]interface{}{
+						"value":   42,
+						"message": "howdy",
+					},
+					time.Unix(0, 0),
+				),
+			},
+			addTime:  time.Unix(0, 0),
+			pushTime: time.Unix(3600, 0),
+			check: func(t *testing.T, plugin *AzureMonitor, metrics []telegraf.Metric) {
+				expected := []telegraf.Metric{
+					testutil.MustMetric(
+						"cpu-value",
+						map[string]string{
+							"host":    "localhost",
+							"message": "howdy",
+						},
+						map[string]interface{}{
+							"min":   42.0,
+							"max":   42.0,
+							"sum":   42.0,
+							"count": 1,
+						},
+						time.Unix(0, 0),
+					),
+				}
+				testutil.RequireMetricsEqual(t, expected, metrics)
+			},
+		},
+		{
+			name: "add metric to cache and push",
+			plugin: &AzureMonitor{
+				Region:     "test",
+				ResourceID: "/test",
+				cache:      make(map[time.Time]map[uint64]*aggregate, 36),
+			},
+			metrics: []telegraf.Metric{
+				testutil.MustMetric(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"value": 42,
+					},
+					time.Unix(0, 0),
+				),
+			},
+			addTime:  time.Unix(0, 0),
+			pushTime: time.Unix(3600, 0),
+			check: func(t *testing.T, plugin *AzureMonitor, metrics []telegraf.Metric) {
+				expected := []telegraf.Metric{
+					testutil.MustMetric(
+						"cpu-value",
+						map[string]string{},
+						map[string]interface{}{
+							"min":   42.0,
+							"max":   42.0,
+							"sum":   42.0,
+							"count": 1,
+						},
+						time.Unix(0, 0),
+					),
+				}
+
+				testutil.RequireMetricsEqual(t, expected, metrics)
+			},
+		},
+		{
+			name: "added metric are aggregated",
+			plugin: &AzureMonitor{
+				Region:     "test",
+				ResourceID: "/test",
+				cache:      make(map[time.Time]map[uint64]*aggregate, 36),
+			},
+			metrics: []telegraf.Metric{
+				testutil.MustMetric(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"value": 42,
+					},
+					time.Unix(0, 0),
+				),
+				testutil.MustMetric(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"value": 84,
+					},
+					time.Unix(0, 0),
+				),
+				testutil.MustMetric(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"value": 2,
+					},
+					time.Unix(0, 0),
+				),
+			},
+			addTime:  time.Unix(0, 0),
+			pushTime: time.Unix(3600, 0),
+			check: func(t *testing.T, plugin *AzureMonitor, metrics []telegraf.Metric) {
+				expected := []telegraf.Metric{
+					testutil.MustMetric(
+						"cpu-value",
+						map[string]string{},
+						map[string]interface{}{
+							"min":   2.0,
+							"max":   84.0,
+							"sum":   128.0,
+							"count": 3,
+						},
+						time.Unix(0, 0),
+					),
+				}
+
+				testutil.RequireMetricsEqual(t, expected, metrics)
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			err := tt.plugin.Connect()
+			require.NoError(t, err)
+
+			// Reset globals
+			tt.plugin.MetricOutsideWindow.Set(0)
+
+			tt.plugin.timeFunc = func() time.Time { return tt.addTime }
+			for _, m := range tt.metrics {
+				tt.plugin.Add(m)
+			}
+
+			tt.plugin.timeFunc = func() time.Time { return tt.pushTime }
+			metrics := tt.plugin.Push()
+			tt.plugin.Reset()
+
+			tt.check(t, tt.plugin, metrics)
+		})
+	}
+}
+
+func TestWrite(t *testing.T) {
+	readBody := func(r *http.Request) ([]*azureMonitorMetric, error) {
+		gz, err := gzip.NewReader(r.Body)
+		if err != nil {
+			return nil, err
+		}
+		scanner := bufio.NewScanner(gz)
+
+		azmetrics := make([]*azureMonitorMetric, 0)
+		for scanner.Scan() {
+			line := scanner.Text()
+			var amm azureMonitorMetric
+			err = json.Unmarshal([]byte(line), &amm)
+			if err != nil {
+				return nil, err
+			}
+			azmetrics = append(azmetrics, &amm)
+		}
+
+		return azmetrics, nil
+	}
+
+	ts := httptest.NewServer(http.NotFoundHandler())
+	defer ts.Close()
+
+	url := "http://" + ts.Listener.Addr().String() + "/metrics"
+
+	tests := []struct {
+		name    string
+		plugin  *AzureMonitor
+		metrics []telegraf.Metric
+		handler func(t *testing.T, w http.ResponseWriter, r *http.Request)
+	}{
+		{
+			name: "if not an azure metric nothing is sent",
+			plugin: &AzureMonitor{
+				Region:     "test",
+				ResourceID: "/test",
+			},
+			metrics: []telegraf.Metric{
+				testutil.MustMetric(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"value": 42,
+					},
+					time.Unix(0, 0),
+				),
+			},
+			handler: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				t.Fatal("should not call")
+			},
+		},
+		{
+			name: "single azure metric",
+			plugin: &AzureMonitor{
+				Region:     "test",
+				ResourceID: "/test",
+			},
+			metrics: []telegraf.Metric{
+				testutil.MustMetric(
+					"cpu-value",
+					map[string]string{},
+					map[string]interface{}{
+						"min":   float64(42),
+						"max":   float64(42),
+						"sum":   float64(42),
+						"count": int64(1),
+					},
+					time.Unix(0, 0),
+				),
+			},
+			handler: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				azmetrics, err := readBody(r)
+				require.NoError(t, err)
+				require.Len(t, azmetrics, 1)
+				w.WriteHeader(http.StatusOK)
+			},
+		},
+		{
+			name: "multiple azure metric",
+			plugin: &AzureMonitor{
+				Region:     "test",
+				ResourceID: "/test",
+			},
+			metrics: []telegraf.Metric{
+				testutil.MustMetric(
+					"cpu-value",
+					map[string]string{},
+					map[string]interface{}{
+						"min":   float64(42),
+						"max":   float64(42),
+						"sum":   float64(42),
+						"count": int64(1),
+					},
+					time.Unix(0, 0),
+				),
+				testutil.MustMetric(
+					"cpu-value",
+					map[string]string{},
+					map[string]interface{}{
+						"min":   float64(42),
+						"max":   float64(42),
+						"sum":   float64(42),
+						"count": int64(1),
+					},
+					time.Unix(60, 0),
+				),
+			},
+			handler: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				azmetrics, err := readBody(r)
+				require.NoError(t, err)
+				require.Len(t, azmetrics, 2)
+				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) {
+				tt.handler(t, w, r)
+			})
+
+			err := tt.plugin.Connect()
+			require.NoError(t, err)
+
+			// override real authorizer and write url
+			tt.plugin.auth = autorest.NullAuthorizer{}
+			tt.plugin.url = url
+
+			err = tt.plugin.Write(tt.metrics)
+			require.NoError(t, err)
+		})
+	}
+}
diff --git a/plugins/parsers/logfmt/parser_test.go b/plugins/parsers/logfmt/parser_test.go
index c9096468..dfacd8c8 100644
--- a/plugins/parsers/logfmt/parser_test.go
+++ b/plugins/parsers/logfmt/parser_test.go
@@ -7,7 +7,6 @@ import (
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/metric"
 	"github.com/influxdata/telegraf/testutil"
-	"github.com/stretchr/testify/require"
 )
 
 func MustMetric(t *testing.T, m *testutil.Metric) telegraf.Metric {
@@ -25,28 +24,28 @@ func TestParse(t *testing.T) {
 		measurement string
 		now         func() time.Time
 		bytes       []byte
-		want        []testutil.Metric
+		want        []telegraf.Metric
 		wantErr     bool
 	}{
 		{
 			name: "no bytes returns no metrics",
 			now:  func() time.Time { return time.Unix(0, 0) },
-			want: []testutil.Metric{},
+			want: []telegraf.Metric{},
 		},
 		{
 			name:        "test without trailing end",
 			bytes:       []byte("foo=\"bar\""),
 			now:         func() time.Time { return time.Unix(0, 0) },
 			measurement: "testlog",
-			want: []testutil.Metric{
-				testutil.Metric{
-					Measurement: "testlog",
-					Tags:        map[string]string{},
-					Fields: map[string]interface{}{
+			want: []telegraf.Metric{
+				testutil.MustMetric(
+					"testlog",
+					map[string]string{},
+					map[string]interface{}{
 						"foo": "bar",
 					},
-					Time: time.Unix(0, 0),
-				},
+					time.Unix(0, 0),
+				),
 			},
 		},
 		{
@@ -54,15 +53,15 @@ func TestParse(t *testing.T) {
 			bytes:       []byte("foo=\"bar\"\n"),
 			now:         func() time.Time { return time.Unix(0, 0) },
 			measurement: "testlog",
-			want: []testutil.Metric{
-				testutil.Metric{
-					Measurement: "testlog",
-					Tags:        map[string]string{},
-					Fields: map[string]interface{}{
+			want: []telegraf.Metric{
+				testutil.MustMetric(
+					"testlog",
+					map[string]string{},
+					map[string]interface{}{
 						"foo": "bar",
 					},
-					Time: time.Unix(0, 0),
-				},
+					time.Unix(0, 0),
+				),
 			},
 		},
 		{
@@ -70,18 +69,18 @@ func TestParse(t *testing.T) {
 			bytes:       []byte(`ts=2018-07-24T19:43:40.275Z lvl=info msg="http request" method=POST`),
 			now:         func() time.Time { return time.Unix(0, 0) },
 			measurement: "testlog",
-			want: []testutil.Metric{
-				testutil.Metric{
-					Measurement: "testlog",
-					Tags:        map[string]string{},
-					Fields: map[string]interface{}{
+			want: []telegraf.Metric{
+				testutil.MustMetric(
+					"testlog",
+					map[string]string{},
+					map[string]interface{}{
 						"lvl":    "info",
 						"msg":    "http request",
 						"method": "POST",
 						"ts":     "2018-07-24T19:43:40.275Z",
 					},
-					Time: time.Unix(0, 0),
-				},
+					time.Unix(0, 0),
+				),
 			},
 		},
 		{
@@ -89,42 +88,42 @@ func TestParse(t *testing.T) {
 			bytes:       []byte("ts=2018-07-24T19:43:40.275Z lvl=info msg=\"http request\" method=POST\nparent_id=088876RL000 duration=7.45 log_id=09R4e4Rl000"),
 			now:         func() time.Time { return time.Unix(0, 0) },
 			measurement: "testlog",
-			want: []testutil.Metric{
-				testutil.Metric{
-					Measurement: "testlog",
-					Tags:        map[string]string{},
-					Fields: map[string]interface{}{
+			want: []telegraf.Metric{
+				testutil.MustMetric(
+					"testlog",
+					map[string]string{},
+					map[string]interface{}{
 						"lvl":    "info",
 						"msg":    "http request",
 						"method": "POST",
 						"ts":     "2018-07-24T19:43:40.275Z",
 					},
-					Time: time.Unix(0, 0),
-				},
-				testutil.Metric{
-					Measurement: "testlog",
-					Tags:        map[string]string{},
-					Fields: map[string]interface{}{
+					time.Unix(0, 0),
+				),
+				testutil.MustMetric(
+					"testlog",
+					map[string]string{},
+					map[string]interface{}{
 						"parent_id": "088876RL000",
 						"duration":  7.45,
 						"log_id":    "09R4e4Rl000",
 					},
-					Time: time.Unix(0, 0),
-				},
+					time.Unix(0, 0),
+				),
 			},
 		},
 		{
 			name:    "keys without = or values are ignored",
 			now:     func() time.Time { return time.Unix(0, 0) },
 			bytes:   []byte(`i am no data.`),
-			want:    []testutil.Metric{},
+			want:    []telegraf.Metric{},
 			wantErr: false,
 		},
 		{
 			name:    "keys without values are ignored",
 			now:     func() time.Time { return time.Unix(0, 0) },
 			bytes:   []byte(`foo="" bar=`),
-			want:    []testutil.Metric{},
+			want:    []telegraf.Metric{},
 			wantErr: false,
 		},
 		{
@@ -132,7 +131,7 @@ func TestParse(t *testing.T) {
 			now:         func() time.Time { return time.Unix(0, 0) },
 			measurement: "testlog",
 			bytes:       []byte(`bar=baz foo="bar`),
-			want:        []testutil.Metric{},
+			want:        []telegraf.Metric{},
 			wantErr:     true,
 		},
 		{
@@ -140,7 +139,7 @@ func TestParse(t *testing.T) {
 			now:         func() time.Time { return time.Unix(0, 0) },
 			measurement: "testlog",
 			bytes:       []byte(`"foo=" bar=baz`),
-			want:        []testutil.Metric{},
+			want:        []telegraf.Metric{},
 			wantErr:     true,
 		},
 	}
@@ -155,10 +154,8 @@ func TestParse(t *testing.T) {
 				t.Errorf("Logfmt.Parse error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
-			require.Equal(t, len(tt.want), len(got))
-			for i, m := range got {
-				testutil.MustEqual(t, m, tt.want[i])
-			}
+
+			testutil.RequireMetricsEqual(t, tt.want, got)
 		})
 	}
 }
@@ -169,13 +166,13 @@ func TestParseLine(t *testing.T) {
 		s           string
 		measurement string
 		now         func() time.Time
-		want        testutil.Metric
+		want        telegraf.Metric
 		wantErr     bool
 	}{
 		{
 			name:    "No Metric In line",
 			now:     func() time.Time { return time.Unix(0, 0) },
-			want:    testutil.Metric{},
+			want:    nil,
 			wantErr: true,
 		},
 		{
@@ -183,34 +180,34 @@ func TestParseLine(t *testing.T) {
 			now:         func() time.Time { return time.Unix(0, 0) },
 			measurement: "testlog",
 			s:           `ts=2018-07-24T19:43:35.207268Z lvl=5 msg="Write failed" log_id=09R4e4Rl000`,
-			want: testutil.Metric{
-				Measurement: "testlog",
-				Fields: map[string]interface{}{
+			want: testutil.MustMetric(
+				"testlog",
+				map[string]string{},
+				map[string]interface{}{
 					"ts":     "2018-07-24T19:43:35.207268Z",
 					"lvl":    int64(5),
 					"msg":    "Write failed",
 					"log_id": "09R4e4Rl000",
 				},
-				Tags: map[string]string{},
-				Time: time.Unix(0, 0),
-			},
+				time.Unix(0, 0),
+			),
 		},
 		{
 			name:        "ParseLine only returns metrics from first string",
 			now:         func() time.Time { return time.Unix(0, 0) },
 			measurement: "testlog",
 			s:           "ts=2018-07-24T19:43:35.207268Z lvl=5 msg=\"Write failed\" log_id=09R4e4Rl000\nmethod=POST parent_id=088876RL000 duration=7.45 log_id=09R4e4Rl000",
-			want: testutil.Metric{
-				Measurement: "testlog",
-				Fields: map[string]interface{}{
+			want: testutil.MustMetric(
+				"testlog",
+				map[string]string{},
+				map[string]interface{}{
 					"ts":     "2018-07-24T19:43:35.207268Z",
 					"lvl":    int64(5),
 					"msg":    "Write failed",
 					"log_id": "09R4e4Rl000",
 				},
-				Tags: map[string]string{},
-				Time: time.Unix(0, 0),
-			},
+				time.Unix(0, 0),
+			),
 		},
 	}
 	for _, tt := range tests {
@@ -223,9 +220,7 @@ func TestParseLine(t *testing.T) {
 			if (err != nil) != tt.wantErr {
 				t.Fatalf("Logfmt.Parse error = %v, wantErr %v", err, tt.wantErr)
 			}
-			if got != nil {
-				testutil.MustEqual(t, got, tt.want)
-			}
+			testutil.RequireMetricEqual(t, tt.want, got)
 		})
 	}
 }
diff --git a/testutil/metric.go b/testutil/metric.go
index 9620fea1..56debd09 100644
--- a/testutil/metric.go
+++ b/testutil/metric.go
@@ -1,16 +1,89 @@
 package testutil
 
 import (
+	"sort"
 	"testing"
+	"time"
 
+	"github.com/google/go-cmp/cmp"
 	"github.com/influxdata/telegraf"
-	"github.com/stretchr/testify/require"
+	"github.com/influxdata/telegraf/metric"
 )
 
-// MustEqual requires a and b to be identical.
-func MustEqual(t *testing.T, got telegraf.Metric, want Metric) {
-	require.Equal(t, want.Measurement, got.Name())
-	require.Equal(t, want.Fields, got.Fields())
-	require.Equal(t, want.Tags, got.Tags())
-	require.Equal(t, want.Time, got.Time())
+type metricDiff struct {
+	Measurement string
+	Tags        []*telegraf.Tag
+	Fields      []*telegraf.Field
+	Type        telegraf.ValueType
+	Time        time.Time
+}
+
+func newMetricDiff(metric telegraf.Metric) *metricDiff {
+	m := &metricDiff{}
+	m.Measurement = metric.Name()
+
+	for _, tag := range metric.TagList() {
+		m.Tags = append(m.Tags, tag)
+	}
+	sort.Slice(m.Tags, func(i, j int) bool {
+		return m.Tags[i].Key < m.Tags[j].Key
+	})
+
+	for _, field := range metric.FieldList() {
+		m.Fields = append(m.Fields, field)
+	}
+	sort.Slice(m.Fields, func(i, j int) bool {
+		return m.Fields[i].Key < m.Fields[j].Key
+	})
+
+	m.Type = metric.Type()
+	m.Time = metric.Time()
+	return m
+}
+
+func RequireMetricEqual(t *testing.T, expected, actual telegraf.Metric) {
+	t.Helper()
+
+	var lhs, rhs *metricDiff
+	if expected != nil {
+		lhs = newMetricDiff(expected)
+	}
+	if actual != nil {
+		rhs = newMetricDiff(actual)
+	}
+
+	if diff := cmp.Diff(lhs, rhs); diff != "" {
+		t.Fatalf("telegraf.Metric\n--- expected\n+++ actual\n%s", diff)
+	}
+}
+
+func RequireMetricsEqual(t *testing.T, expected, actual []telegraf.Metric) {
+	t.Helper()
+
+	lhs := make([]*metricDiff, len(expected))
+	for _, m := range expected {
+		lhs = append(lhs, newMetricDiff(m))
+	}
+	rhs := make([]*metricDiff, len(actual))
+	for _, m := range actual {
+		rhs = append(rhs, newMetricDiff(m))
+	}
+	if diff := cmp.Diff(lhs, rhs); diff != "" {
+		t.Fatalf("[]telegraf.Metric\n--- expected\n+++ actual\n%s", diff)
+	}
+}
+
+// Metric creates a new metric or panics on error.
+func MustMetric(
+	name string,
+	tags map[string]string,
+	fields map[string]interface{},
+	tm time.Time,
+	tp ...telegraf.ValueType,
+) telegraf.Metric {
+	m, err := metric.New(name, tags, fields, tm, tp...)
+	if err != nil {
+		panic("MustMetric")
+	}
+	return m
 }
diff --git a/testutil/metric_test.go b/testutil/metric_test.go
index 7295227c..5b5ef01f 100644
--- a/testutil/metric_test.go
+++ b/testutil/metric_test.go
@@ -8,13 +8,11 @@ import (
 	"github.com/influxdata/telegraf/metric"
 )
 
-func TestMustEqual(t *testing.T) {
-	type args struct {
-	}
+func TestRequireMetricsEqual(t *testing.T) {
 	tests := []struct {
 		name string
 		got  telegraf.Metric
-		want Metric
+		want telegraf.Metric
 	}{
 		{
 			name: "telegraf and testutil metrics should be equal",
@@ -34,24 +32,27 @@ func TestMustEqual(t *testing.T) {
 				)
 				return m
 			}(),
-			want: Metric{
-				Measurement: "test",
-				Tags: map[string]string{
-					"t1": "v1",
-					"t2": "v2",
-				},
-				Fields: map[string]interface{}{
-					"f1": int64(1),
-					"f2": 3.14,
-					"f3": "v3",
-				},
-				Time: time.Unix(0, 0),
-			},
+			want: func() telegraf.Metric {
+				m, _ := metric.New(
+					"test",
+					map[string]string{
+						"t1": "v1",
+						"t2": "v2",
+					},
+					map[string]interface{}{
+						"f1": int64(1),
+						"f2": 3.14,
+						"f3": "v3",
+					},
+					time.Unix(0, 0),
+				)
+				return m
+			}(),
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			MustEqual(t, tt.got, tt.want)
+			RequireMetricEqual(t, tt.want, tt.got)
 		})
 	}
 }

From 9ec7f749aa9cf24899464662cc20407aea85f373 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 5 Sep 2018 14:57:20 -0700
Subject: [PATCH 742/835] Update changelog and readme

---
 CHANGELOG.md | 6 ++++++
 README.md    | 1 +
 2 files changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbe42f2d..f7a3ccd6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,10 @@
 
 - [valuecounter](./plugins/aggregators/valuecounter/README.md) - Contributed by @piotr1212
 
+### New Outputs
+
+- [azure_monitor](./plugins/outputs/azure_monitor/README.md) - Contributed by @influxdata
+
 ### Features
 
 - [#4236](https://github.com/influxdata/telegraf/pull/4236): Add SSL/TLS support to redis input.
@@ -79,6 +83,8 @@
 - [#4585](https://github.com/influxdata/telegraf/pull/4585): Add Kibana input plugin.
 - [#4439](https://github.com/influxdata/telegraf/pull/4439): Add csv parser plugin.
 - [#4598](https://github.com/influxdata/telegraf/pull/4598): Add read_buffer_size option to statsd input.
+- [#4089](https://github.com/influxdata/telegraf/pull/4089): Add azure_monitor output plugin.
+- [#4628](https://github.com/influxdata/telegraf/pull/4628): Add queue_durability parameter to amqp_consumer input.
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index 867aa10f..22d31556 100644
--- a/README.md
+++ b/README.md
@@ -298,6 +298,7 @@ formats may be used with input plugins supporting the `data_format` option:
 * [application_insights](./plugins/outputs/application_insights)
 * [aws kinesis](./plugins/outputs/kinesis)
 * [aws cloudwatch](./plugins/outputs/cloudwatch)
+* [azure_monitor](./plugins/inputs/azure_monitor)
 * [cratedb](./plugins/outputs/cratedb)
 * [datadog](./plugins/outputs/datadog)
 * [discard](./plugins/outputs/discard)

From 12ff8bb5e031d44bfcb1c79bfa20b35f207c6a3e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 5 Sep 2018 14:58:13 -0700
Subject: [PATCH 743/835] Fix link in readme

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

diff --git a/README.md b/README.md
index 22d31556..00dc8ecf 100644
--- a/README.md
+++ b/README.md
@@ -298,7 +298,7 @@ formats may be used with input plugins supporting the `data_format` option:
 * [application_insights](./plugins/outputs/application_insights)
 * [aws kinesis](./plugins/outputs/kinesis)
 * [aws cloudwatch](./plugins/outputs/cloudwatch)
-* [azure_monitor](./plugins/inputs/azure_monitor)
+* [azure_monitor](./plugins/outputs/azure_monitor)
 * [cratedb](./plugins/outputs/cratedb)
 * [datadog](./plugins/outputs/datadog)
 * [discard](./plugins/outputs/discard)

From d6467e966f4ef84f25f08ec694adb4dffe06e593 Mon Sep 17 00:00:00 2001
From: bsmaldon <noodels555@gmail.com>
Date: Wed, 5 Sep 2018 23:13:29 +0100
Subject: [PATCH 744/835] Add strings processor (#4476)

---
 plugins/processors/all/all.go              |   1 +
 plugins/processors/strings/README.md       |  83 ++++
 plugins/processors/strings/strings.go      | 199 +++++++++
 plugins/processors/strings/strings_test.go | 483 +++++++++++++++++++++
 4 files changed, 766 insertions(+)
 create mode 100644 plugins/processors/strings/README.md
 create mode 100644 plugins/processors/strings/strings.go
 create mode 100644 plugins/processors/strings/strings_test.go

diff --git a/plugins/processors/all/all.go b/plugins/processors/all/all.go
index 5c2e2549..a8386a60 100644
--- a/plugins/processors/all/all.go
+++ b/plugins/processors/all/all.go
@@ -7,6 +7,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/processors/parser"
 	_ "github.com/influxdata/telegraf/plugins/processors/printer"
 	_ "github.com/influxdata/telegraf/plugins/processors/regex"
+	_ "github.com/influxdata/telegraf/plugins/processors/strings"
 	_ "github.com/influxdata/telegraf/plugins/processors/rename"
 	_ "github.com/influxdata/telegraf/plugins/processors/topk"
 )
diff --git a/plugins/processors/strings/README.md b/plugins/processors/strings/README.md
new file mode 100644
index 00000000..f1e7361f
--- /dev/null
+++ b/plugins/processors/strings/README.md
@@ -0,0 +1,83 @@
+# Strings Processor Plugin
+
+The `strings` plugin maps certain go string functions onto measurement, tag, and field values.  Values can be modified in place or stored in another key.
+
+Implemented functions are:
+- lowercase
+- uppercase
+- trim
+- trim_left
+- trim_right
+- trim_prefix
+- trim_suffix
+
+Please note that in this implementation these are processed in the order that they appear above.
+
+Specify the `measurement`, `tag` or `field` that you want processed in each section and optionally a `dest` if you want the result stored in a new tag or field. You can specify lots of transformations on data with a single strings processor.
+
+### Configuration:
+
+```toml
+[[processors.strings]]
+  # [[processors.strings.uppercase]]
+  #   tag = "method"
+
+  # [[processors.strings.lowercase]]
+  #   field = "uri_stem"
+  #   dest = "uri_stem_normalised"
+
+  ## Convert a tag value to lowercase
+  # [[processors.strings.trim]]
+  #   field = "message"
+
+  # [[processors.strings.trim_left]]
+  #   field = "message"
+  #   cutset = "\t"
+
+  # [[processors.strings.trim_right]]
+  #   field = "message"
+  #   cutset = "\r\n"
+
+  # [[processors.strings.trim_prefix]]
+  #   field = "my_value"
+  #   prefix = "my_"
+
+  # [[processors.strings.trim_suffix]]
+  #   field = "read_count"
+  #   suffix = "_count"
+```
+
+#### Trim, TrimLeft, TrimRight
+
+The `trim`, `trim_left`, and `trim_right` functions take an optional parameter: `cutset`.  This value is a string containing the characters to remove from the value.
+
+#### TrimPrefix, TrimSuffix
+
+The `trim_prefix` and `trim_suffix` functions remote the given `prefix` or `suffix`
+respectively from the string.
+
+### Example
+**Config**
+```toml
+[[processors.strings]]
+  [[processors.strings.lowercase]]
+    field = "uri-stem"
+
+  [[processors.strings.trim_prefix]]
+    field = "uri_stem"
+    prefix = "/api/"
+
+  [[processors.strings.uppercase]]
+    field = "cs-host"
+    dest = "cs-host_normalised"
+```
+
+**Input**
+```
+iis_log,method=get,uri_stem=/API/HealthCheck cs-host="MIXEDCASE_host",referrer="-",ident="-",http_version=1.1,agent="UserAgent",resp_bytes=270i 1519652321000000000
+```
+
+**Output**
+```
+iis_log,method=get,uri_stem=healthcheck cs-host="MIXEDCASE_host",cs-host_normalised="MIXEDCASE_HOST",referrer="-",ident="-",http_version=1.1,agent="UserAgent",resp_bytes=270i 1519652321000000000
+```
diff --git a/plugins/processors/strings/strings.go b/plugins/processors/strings/strings.go
new file mode 100644
index 00000000..8e68dbc5
--- /dev/null
+++ b/plugins/processors/strings/strings.go
@@ -0,0 +1,199 @@
+package strings
+
+import (
+	"strings"
+	"unicode"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/processors"
+)
+
+type Strings struct {
+	Lowercase  []converter `toml:"lowercase"`
+	Uppercase  []converter `toml:"uppercase"`
+	Trim       []converter `toml:"trim"`
+	TrimLeft   []converter `toml:"trim_left"`
+	TrimRight  []converter `toml:"trim_right"`
+	TrimPrefix []converter `toml:"trim_prefix"`
+	TrimSuffix []converter `toml:"trim_suffix"`
+
+	converters []converter
+	init       bool
+}
+
+type ConvertFunc func(s string) string
+
+type converter struct {
+	Field       string
+	Tag         string
+	Measurement string
+	Dest        string
+	Cutset      string
+	Suffix      string
+	Prefix      string
+
+	fn ConvertFunc
+}
+
+const sampleConfig = `
+  ## Convert a tag value to uppercase
+  # [[processors.strings.uppercase]]
+  #   tag = "method"
+
+  ## Convert a field value to lowercase and store in a new field
+  # [[processors.strings.lowercase]]
+  #   field = "uri_stem"
+  #   dest = "uri_stem_normalised"
+
+  ## Trim leading and trailing whitespace using the default cutset
+  # [[processors.strings.trim]]
+  #   field = "message"
+
+  ## Trim leading characters in cutset
+  # [[processors.strings.trim_left]]
+  #   field = "message"
+  #   cutset = "\t"
+
+  ## Trim trailing characters in cutset
+  # [[processors.strings.trim_right]]
+  #   field = "message"
+  #   cutset = "\r\n"
+
+  ## Trim the given prefix from the field
+  # [[processors.strings.trim_prefix]]
+  #   field = "my_value"
+  #   prefix = "my_"
+
+  ## Trim the given suffix from the field
+  # [[processors.strings.trim_suffix]]
+  #   field = "read_count"
+  #   suffix = "_count"
+`
+
+func (s *Strings) SampleConfig() string {
+	return sampleConfig
+}
+
+func (s *Strings) Description() string {
+	return "Perform string processing on tags, fields, and measurements"
+}
+
+func (c *converter) convertTag(metric telegraf.Metric) {
+	tv, ok := metric.GetTag(c.Tag)
+	if !ok {
+		return
+	}
+
+	dest := c.Tag
+	if c.Dest != "" {
+		dest = c.Dest
+	}
+
+	metric.AddTag(dest, c.fn(tv))
+}
+
+func (c *converter) convertField(metric telegraf.Metric) {
+	fv, ok := metric.GetField(c.Field)
+	if !ok {
+		return
+	}
+
+	dest := c.Field
+	if c.Dest != "" {
+		dest = c.Dest
+	}
+
+	if fv, ok := fv.(string); ok {
+		metric.AddField(dest, c.fn(fv))
+	}
+}
+
+func (c *converter) convertMeasurement(metric telegraf.Metric) {
+	if metric.Name() != c.Measurement {
+		return
+	}
+
+	metric.SetName(c.fn(metric.Name()))
+}
+
+func (c *converter) convert(metric telegraf.Metric) {
+	if c.Field != "" {
+		c.convertField(metric)
+	}
+
+	if c.Tag != "" {
+		c.convertTag(metric)
+	}
+
+	if c.Measurement != "" {
+		c.convertMeasurement(metric)
+	}
+}
+
+func (s *Strings) initOnce() {
+	if s.init {
+		return
+	}
+
+	s.converters = make([]converter, 0)
+	for _, c := range s.Lowercase {
+		c.fn = strings.ToLower
+		s.converters = append(s.converters, c)
+	}
+	for _, c := range s.Uppercase {
+		c.fn = strings.ToUpper
+		s.converters = append(s.converters, c)
+	}
+	for _, c := range s.Trim {
+		if c.Cutset != "" {
+			c.fn = func(s string) string { return strings.Trim(s, c.Cutset) }
+		} else {
+			c.fn = func(s string) string { return strings.TrimFunc(s, unicode.IsSpace) }
+		}
+		s.converters = append(s.converters, c)
+	}
+	for _, c := range s.TrimLeft {
+		if c.Cutset != "" {
+			c.fn = func(s string) string { return strings.TrimLeft(s, c.Cutset) }
+		} else {
+			c.fn = func(s string) string { return strings.TrimLeftFunc(s, unicode.IsSpace) }
+		}
+		s.converters = append(s.converters, c)
+	}
+	for _, c := range s.TrimRight {
+		if c.Cutset != "" {
+			c.fn = func(s string) string { return strings.TrimRight(s, c.Cutset) }
+		} else {
+			c.fn = func(s string) string { return strings.TrimRightFunc(s, unicode.IsSpace) }
+		}
+		s.converters = append(s.converters, c)
+	}
+	for _, c := range s.TrimPrefix {
+		c.fn = func(s string) string { return strings.TrimPrefix(s, c.Prefix) }
+		s.converters = append(s.converters, c)
+	}
+	for _, c := range s.TrimSuffix {
+		c.fn = func(s string) string { return strings.TrimSuffix(s, c.Suffix) }
+		s.converters = append(s.converters, c)
+	}
+
+	s.init = true
+}
+
+func (s *Strings) Apply(in ...telegraf.Metric) []telegraf.Metric {
+	s.initOnce()
+
+	for _, metric := range in {
+		for _, converter := range s.converters {
+			converter.convert(metric)
+		}
+	}
+
+	return in
+}
+
+func init() {
+	processors.Add("strings", func() telegraf.Processor {
+		return &Strings{}
+	})
+}
diff --git a/plugins/processors/strings/strings_test.go b/plugins/processors/strings/strings_test.go
new file mode 100644
index 00000000..2097ac5a
--- /dev/null
+++ b/plugins/processors/strings/strings_test.go
@@ -0,0 +1,483 @@
+package strings
+
+import (
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/metric"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func newM1() telegraf.Metric {
+	m1, _ := metric.New("IIS_log",
+		map[string]string{
+			"verb":           "GET",
+			"s-computername": "MIXEDCASE_hostname",
+		},
+		map[string]interface{}{
+			"request":    "/mixed/CASE/paTH/?from=-1D&to=now",
+			"whitespace": "  whitespace\t",
+		},
+		time.Now(),
+	)
+	return m1
+}
+
+func newM2() telegraf.Metric {
+	m2, _ := metric.New("IIS_log",
+		map[string]string{
+			"verb":           "GET",
+			"resp_code":      "200",
+			"s-computername": "MIXEDCASE_hostname",
+		},
+		map[string]interface{}{
+			"request":       "/mixed/CASE/paTH/?from=-1D&to=now",
+			"cs-host":       "AAAbbb",
+			"ignore_number": int64(200),
+			"ignore_bool":   true,
+		},
+		time.Now(),
+	)
+	return m2
+}
+
+func TestFieldConversions(t *testing.T) {
+	tests := []struct {
+		name   string
+		plugin *Strings
+		check  func(t *testing.T, actual telegraf.Metric)
+	}{
+		{
+			name: "Should change existing field to lowercase",
+			plugin: &Strings{
+				Lowercase: []converter{
+					converter{
+						Field: "request",
+					},
+				},
+			},
+			check: func(t *testing.T, actual telegraf.Metric) {
+				fv, ok := actual.GetField("request")
+				require.True(t, ok)
+				require.Equal(t, "/mixed/case/path/?from=-1d&to=now", fv)
+			},
+		},
+		{
+			name: "Should change existing field to uppercase",
+			plugin: &Strings{
+				Uppercase: []converter{
+					converter{
+						Field: "request",
+					},
+				},
+			},
+			check: func(t *testing.T, actual telegraf.Metric) {
+				fv, ok := actual.GetField("request")
+				require.True(t, ok)
+				require.Equal(t, "/MIXED/CASE/PATH/?FROM=-1D&TO=NOW", fv)
+			},
+		},
+		{
+			name: "Should add new lowercase field",
+			plugin: &Strings{
+				Lowercase: []converter{
+					converter{
+						Field: "request",
+						Dest:  "lowercase_request",
+					},
+				},
+			},
+			check: func(t *testing.T, actual telegraf.Metric) {
+				fv, ok := actual.GetField("request")
+				require.True(t, ok)
+				require.Equal(t, "/mixed/CASE/paTH/?from=-1D&to=now", fv)
+
+				fv, ok = actual.GetField("lowercase_request")
+				require.True(t, ok)
+				require.Equal(t, "/mixed/case/path/?from=-1d&to=now", fv)
+			},
+		},
+		{
+			name: "Should trim from both sides",
+			plugin: &Strings{
+				Trim: []converter{
+					converter{
+						Field:  "request",
+						Cutset: "/w",
+					},
+				},
+			},
+			check: func(t *testing.T, actual telegraf.Metric) {
+				fv, ok := actual.GetField("request")
+				require.True(t, ok)
+				require.Equal(t, "mixed/CASE/paTH/?from=-1D&to=no", fv)
+			},
+		},
+		{
+			name: "Should trim from both sides and make lowercase",
+			plugin: &Strings{
+				Trim: []converter{
+					converter{
+						Field:  "request",
+						Cutset: "/w",
+					},
+				},
+				Lowercase: []converter{
+					converter{
+						Field: "request",
+					},
+				},
+			},
+			check: func(t *testing.T, actual telegraf.Metric) {
+				fv, ok := actual.GetField("request")
+				require.True(t, ok)
+				require.Equal(t, "mixed/case/path/?from=-1d&to=no", fv)
+			},
+		},
+		{
+			name: "Should trim from left side",
+			plugin: &Strings{
+				TrimLeft: []converter{
+					converter{
+						Field:  "request",
+						Cutset: "/w",
+					},
+				},
+			},
+			check: func(t *testing.T, actual telegraf.Metric) {
+				fv, ok := actual.GetField("request")
+				require.True(t, ok)
+				require.Equal(t, "mixed/CASE/paTH/?from=-1D&to=now", fv)
+			},
+		},
+		{
+			name: "Should trim from right side",
+			plugin: &Strings{
+				TrimRight: []converter{
+					converter{
+						Field:  "request",
+						Cutset: "/w",
+					},
+				},
+			},
+			check: func(t *testing.T, actual telegraf.Metric) {
+				fv, ok := actual.GetField("request")
+				require.True(t, ok)
+				require.Equal(t, "/mixed/CASE/paTH/?from=-1D&to=no", fv)
+			},
+		},
+		{
+			name: "Should trim prefix '/mixed'",
+			plugin: &Strings{
+				TrimPrefix: []converter{
+					converter{
+						Field:  "request",
+						Prefix: "/mixed",
+					},
+				},
+			},
+			check: func(t *testing.T, actual telegraf.Metric) {
+				fv, ok := actual.GetField("request")
+				require.True(t, ok)
+				require.Equal(t, "/CASE/paTH/?from=-1D&to=now", fv)
+			},
+		},
+		{
+			name: "Should trim suffix '-1D&to=now'",
+			plugin: &Strings{
+				TrimSuffix: []converter{
+					converter{
+						Field:  "request",
+						Suffix: "-1D&to=now",
+					},
+				},
+			},
+			check: func(t *testing.T, actual telegraf.Metric) {
+				fv, ok := actual.GetField("request")
+				require.True(t, ok)
+				require.Equal(t, "/mixed/CASE/paTH/?from=", fv)
+			},
+		},
+		{
+			name: "Trim without cutset removes whitespace",
+			plugin: &Strings{
+				Trim: []converter{
+					converter{
+						Field: "whitespace",
+					},
+				},
+			},
+			check: func(t *testing.T, actual telegraf.Metric) {
+				fv, ok := actual.GetField("whitespace")
+				require.True(t, ok)
+				require.Equal(t, "whitespace", fv)
+			},
+		},
+		{
+			name: "Trim left without cutset removes whitespace",
+			plugin: &Strings{
+				TrimLeft: []converter{
+					converter{
+						Field: "whitespace",
+					},
+				},
+			},
+			check: func(t *testing.T, actual telegraf.Metric) {
+				fv, ok := actual.GetField("whitespace")
+				require.True(t, ok)
+				require.Equal(t, "whitespace\t", fv)
+			},
+		},
+		{
+			name: "Trim right without cutset removes whitespace",
+			plugin: &Strings{
+				TrimRight: []converter{
+					converter{
+						Field: "whitespace",
+					},
+				},
+			},
+			check: func(t *testing.T, actual telegraf.Metric) {
+				fv, ok := actual.GetField("whitespace")
+				require.True(t, ok)
+				require.Equal(t, "  whitespace", fv)
+			},
+		},
+		{
+			name: "No change if field missing",
+			plugin: &Strings{
+				Lowercase: []converter{
+					converter{
+						Field:  "xyzzy",
+						Suffix: "-1D&to=now",
+					},
+				},
+			},
+			check: func(t *testing.T, actual telegraf.Metric) {
+				fv, ok := actual.GetField("request")
+				require.True(t, ok)
+				require.Equal(t, "/mixed/CASE/paTH/?from=-1D&to=now", fv)
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			metrics := tt.plugin.Apply(newM1())
+			require.Len(t, metrics, 1)
+			tt.check(t, metrics[0])
+		})
+	}
+}
+
+func TestTagConversions(t *testing.T) {
+	tests := []struct {
+		name   string
+		plugin *Strings
+		check  func(t *testing.T, actual telegraf.Metric)
+	}{
+		{
+			name: "Should change existing tag to lowercase",
+			plugin: &Strings{
+				Lowercase: []converter{
+					converter{
+						Tag: "s-computername",
+					},
+				},
+			},
+			check: func(t *testing.T, actual telegraf.Metric) {
+				tv, ok := actual.GetTag("verb")
+				require.True(t, ok)
+				require.Equal(t, "GET", tv)
+
+				tv, ok = actual.GetTag("s-computername")
+				require.True(t, ok)
+				require.Equal(t, "mixedcase_hostname", tv)
+			},
+		},
+		{
+			name: "Should add new lowercase tag",
+			plugin: &Strings{
+				Lowercase: []converter{
+					converter{
+						Tag:  "s-computername",
+						Dest: "s-computername_lowercase",
+					},
+				},
+			},
+			check: func(t *testing.T, actual telegraf.Metric) {
+				tv, ok := actual.GetTag("verb")
+				require.True(t, ok)
+				require.Equal(t, "GET", tv)
+
+				tv, ok = actual.GetTag("s-computername")
+				require.True(t, ok)
+				require.Equal(t, "MIXEDCASE_hostname", tv)
+
+				tv, ok = actual.GetTag("s-computername_lowercase")
+				require.True(t, ok)
+				require.Equal(t, "mixedcase_hostname", tv)
+			},
+		},
+		{
+			name: "Should add new uppercase tag",
+			plugin: &Strings{
+				Uppercase: []converter{
+					converter{
+						Tag:  "s-computername",
+						Dest: "s-computername_uppercase",
+					},
+				},
+			},
+			check: func(t *testing.T, actual telegraf.Metric) {
+				tv, ok := actual.GetTag("verb")
+				require.True(t, ok)
+				require.Equal(t, "GET", tv)
+
+				tv, ok = actual.GetTag("s-computername")
+				require.True(t, ok)
+				require.Equal(t, "MIXEDCASE_hostname", tv)
+
+				tv, ok = actual.GetTag("s-computername_uppercase")
+				require.True(t, ok)
+				require.Equal(t, "MIXEDCASE_HOSTNAME", tv)
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			metrics := tt.plugin.Apply(newM1())
+			require.Len(t, metrics, 1)
+			tt.check(t, metrics[0])
+		})
+	}
+}
+
+func TestMeasurementConversions(t *testing.T) {
+	tests := []struct {
+		name   string
+		plugin *Strings
+		check  func(t *testing.T, actual telegraf.Metric)
+	}{
+		{
+			name: "lowercase measurement",
+			plugin: &Strings{
+				Lowercase: []converter{
+					converter{
+						Measurement: "IIS_log",
+					},
+				},
+			},
+			check: func(t *testing.T, actual telegraf.Metric) {
+				name := actual.Name()
+				require.Equal(t, "iis_log", name)
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			metrics := tt.plugin.Apply(newM1())
+			require.Len(t, metrics, 1)
+			tt.check(t, metrics[0])
+		})
+	}
+}
+
+func TestMultipleConversions(t *testing.T) {
+	plugin := &Strings{
+		Lowercase: []converter{
+			converter{
+				Tag: "s-computername",
+			},
+			converter{
+				Field: "request",
+			},
+			converter{
+				Field: "cs-host",
+				Dest:  "cs-host_lowercase",
+			},
+		},
+		Uppercase: []converter{
+			converter{
+				Tag: "verb",
+			},
+		},
+	}
+
+	processed := plugin.Apply(newM2())
+
+	expectedFields := map[string]interface{}{
+		"request":           "/mixed/case/path/?from=-1d&to=now",
+		"ignore_number":     int64(200),
+		"ignore_bool":       true,
+		"cs-host":           "AAAbbb",
+		"cs-host_lowercase": "aaabbb",
+	}
+	expectedTags := map[string]string{
+		"verb":           "GET",
+		"resp_code":      "200",
+		"s-computername": "mixedcase_hostname",
+	}
+
+	assert.Equal(t, expectedFields, processed[0].Fields())
+	assert.Equal(t, expectedTags, processed[0].Tags())
+}
+
+func TestReadmeExample(t *testing.T) {
+	plugin := &Strings{
+		Lowercase: []converter{
+			converter{
+				Tag: "uri_stem",
+			},
+		},
+		TrimPrefix: []converter{
+			converter{
+				Tag:    "uri_stem",
+				Prefix: "/api/",
+			},
+		},
+		Uppercase: []converter{
+			converter{
+				Field: "cs-host",
+				Dest:  "cs-host_normalised",
+			},
+		},
+	}
+
+	m, _ := metric.New("iis_log",
+		map[string]string{
+			"verb":     "get",
+			"uri_stem": "/API/HealthCheck",
+		},
+		map[string]interface{}{
+			"cs-host":      "MIXEDCASE_host",
+			"referrer":     "-",
+			"ident":        "-",
+			"http_version": "1.1",
+			"agent":        "UserAgent",
+			"resp_bytes":   int64(270),
+		},
+		time.Now(),
+	)
+
+	processed := plugin.Apply(m)
+
+	expectedTags := map[string]string{
+		"verb":     "get",
+		"uri_stem": "healthcheck",
+	}
+	expectedFields := map[string]interface{}{
+		"cs-host":            "MIXEDCASE_host",
+		"cs-host_normalised": "MIXEDCASE_HOST",
+		"referrer":           "-",
+		"ident":              "-",
+		"http_version":       "1.1",
+		"agent":              "UserAgent",
+		"resp_bytes":         int64(270),
+	}
+
+	assert.Equal(t, expectedFields, processed[0].Fields())
+	assert.Equal(t, expectedTags, processed[0].Tags())
+}

From 433454aa3ca16e2c2c789aa36f50fc1a1591b4c0 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 5 Sep 2018 15:15:54 -0700
Subject: [PATCH 745/835] Fix go fmt issue

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

diff --git a/plugins/processors/all/all.go b/plugins/processors/all/all.go
index a8386a60..41e2707d 100644
--- a/plugins/processors/all/all.go
+++ b/plugins/processors/all/all.go
@@ -7,7 +7,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/processors/parser"
 	_ "github.com/influxdata/telegraf/plugins/processors/printer"
 	_ "github.com/influxdata/telegraf/plugins/processors/regex"
-	_ "github.com/influxdata/telegraf/plugins/processors/strings"
 	_ "github.com/influxdata/telegraf/plugins/processors/rename"
+	_ "github.com/influxdata/telegraf/plugins/processors/strings"
 	_ "github.com/influxdata/telegraf/plugins/processors/topk"
 )

From d73fe7bcedcac2ca01a9e19d4ce9502549339f4b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 5 Sep 2018 15:17:50 -0700
Subject: [PATCH 746/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7a3ccd6..43579ee8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@
 - [enum](./plugins/processors/enum/README.md) - Contributed by @KarstenSchnitter
 - [parser](./plugins/processors/parser/README.md) - Contributed by @maxunt & @Ayrdrie
 - [rename](./plugins/processors/rename/README.md) - Contributed by @goldibex
+- [strings](./plugins/processors/strings/README.md) - Contributed by @bsmaldon
 
 ### New Aggregators
 
@@ -85,6 +86,7 @@
 - [#4598](https://github.com/influxdata/telegraf/pull/4598): Add read_buffer_size option to statsd input.
 - [#4089](https://github.com/influxdata/telegraf/pull/4089): Add azure_monitor output plugin.
 - [#4628](https://github.com/influxdata/telegraf/pull/4628): Add queue_durability parameter to amqp_consumer input.
+- [#4476](https://github.com/influxdata/telegraf/pull/4476): Add strings processor.
 
 ### Bugfixes
 

From 54f28eefa941d063620fe23c1dd46db4d185ade4 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 5 Sep 2018 18:47:13 -0700
Subject: [PATCH 747/835] Make dep check happy

---
 Gopkg.lock | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index 0f29ab59..76c273c5 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -22,14 +22,16 @@
   version = "v0.3.0"
 
 [[projects]]
+  digest = "1:5923e22a060ab818a015593422f9e8a35b9d881d4cfcfed0669a82959b11c7ee"
   name = "github.com/Azure/go-autorest"
   packages = [
     "autorest",
     "autorest/adal",
     "autorest/azure",
     "autorest/azure/auth",
-    "autorest/date"
+    "autorest/date",
   ]
+  pruneopts = ""
   revision = "1f7cd6cfe0adea687ad44a512dfe76140f804318"
   version = "v10.12.0"
 
@@ -238,8 +240,10 @@
 
 [[projects]]
   branch = "master"
+  digest = "1:654ac9799e7a8a586d8690bb2229a4f3408bbfe2c5494bf4dfe043053eeb5496"
   name = "github.com/dimchansky/utfbom"
   packages = ["."]
+  pruneopts = ""
   revision = "6c6132ff69f0f6c088739067407b5d32c52e1d0f"
 
 [[projects]]
@@ -853,7 +857,7 @@
   version = "v1.2.0"
 
 [[projects]]
-  digest = "1:fce9909f20bc6a6363a6d589e478bdcf8111044b41566d37d7552bf92d955540"
+  digest = "1:02715a2fb4b9279af36651a59a51dd4164eb689bd6785874811899f43eeb2a54"
   name = "github.com/shirou/gopsutil"
   packages = [
     "cpu",
@@ -995,7 +999,7 @@
     "pbkdf2",
     "pkcs12",
     "pkcs12/internal/rc2",
-    "ssh/terminal"
+    "ssh/terminal",
   ]
   pruneopts = ""
   revision = "a2144134853fc9a27a7b1e3eb4f19f1a76df13c9"
@@ -1231,6 +1235,8 @@
   input-imports = [
     "collectd.org/api",
     "collectd.org/network",
+    "github.com/Azure/go-autorest/autorest",
+    "github.com/Azure/go-autorest/autorest/azure/auth",
     "github.com/Microsoft/ApplicationInsights-Go/appinsights",
     "github.com/Shopify/sarama",
     "github.com/StackExchange/wmi",
@@ -1255,6 +1261,7 @@
     "github.com/docker/docker/api/types/swarm",
     "github.com/docker/docker/client",
     "github.com/eclipse/paho.mqtt.golang",
+    "github.com/go-logfmt/logfmt",
     "github.com/go-redis/redis",
     "github.com/go-sql-driver/mysql",
     "github.com/gobwas/glob",

From 091af7e645e45a1d12f32da1f95fb99ad4165a66 Mon Sep 17 00:00:00 2001
From: Vikrant <vikrant.dessai@gmail.com>
Date: Thu, 6 Sep 2018 10:54:05 -0700
Subject: [PATCH 748/835] Add OAuth2 support to HTTP output plugin (#4536)

---
 Gopkg.lock                        | 25 ++++++++++-
 Gopkg.toml                        |  4 ++
 docs/LICENSE_OF_DEPENDENCIES.md   |  1 +
 plugins/outputs/http/README.md    |  8 +++-
 plugins/outputs/http/http.go      | 66 +++++++++++++++++++++-------
 plugins/outputs/http/http_test.go | 73 +++++++++++++++++++++++++++++++
 6 files changed, 160 insertions(+), 17 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index 76c273c5..b592346a 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -1032,6 +1032,18 @@
   pruneopts = ""
   revision = "a680a1efc54dd51c040b3b5ce4939ea3cf2ea0d1"
 
+[[projects]]
+  branch = "master"
+  digest = "1:b697592485cb412be4188c08ca0beed9aab87f36b86418e21acc4a3998f63734"
+  name = "golang.org/x/oauth2"
+  packages = [
+    ".",
+    "clientcredentials",
+    "internal",
+  ]
+  pruneopts = ""
+  revision = "d2e6202438beef2727060aa7cabdd924d92ebfd9"
+
 [[projects]]
   branch = "master"
   digest = "1:677e38cad6833ad266ec843739d167755eda1e6f2d8af1c63102b0426ad820db"
@@ -1086,7 +1098,16 @@
 [[projects]]
   digest = "1:c1771ca6060335f9768dff6558108bc5ef6c58506821ad43377ee23ff059e472"
   name = "google.golang.org/appengine"
-  packages = ["cloudsql"]
+  packages = [
+    "cloudsql",
+    "internal",
+    "internal/base",
+    "internal/datastore",
+    "internal/log",
+    "internal/remote_api",
+    "internal/urlfetch",
+    "urlfetch",
+  ]
   pruneopts = ""
   revision = "b1f26356af11148e710935ed1ac8a7f5702c7612"
   version = "v1.1.0"
@@ -1312,6 +1333,8 @@
     "github.com/zensqlmonitor/go-mssqldb",
     "golang.org/x/net/context",
     "golang.org/x/net/html/charset",
+    "golang.org/x/oauth2",
+    "golang.org/x/oauth2/clientcredentials",
     "golang.org/x/sys/unix",
     "golang.org/x/sys/windows",
     "golang.org/x/sys/windows/svc",
diff --git a/Gopkg.toml b/Gopkg.toml
index f942f340..b4576ed6 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -225,3 +225,7 @@
 [[constraint]]
   name = "github.com/Azure/go-autorest"
   version = "10.12.0"
+
+[[constraint]]
+  branch = "master"
+  name = "golang.org/x/oauth2"
diff --git a/docs/LICENSE_OF_DEPENDENCIES.md b/docs/LICENSE_OF_DEPENDENCIES.md
index 36f03899..f5496fc2 100644
--- a/docs/LICENSE_OF_DEPENDENCIES.md
+++ b/docs/LICENSE_OF_DEPENDENCIES.md
@@ -100,6 +100,7 @@ following works:
 - 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/oauth2 [BSD](https://go.googlesource.com/oauth2/+/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)
diff --git a/plugins/outputs/http/README.md b/plugins/outputs/http/README.md
index 5005e9f0..0c11896f 100644
--- a/plugins/outputs/http/README.md
+++ b/plugins/outputs/http/README.md
@@ -21,6 +21,12 @@ data formats.  For data_formats that support batching, metrics are sent in batch
   # username = "username"
   # password = "pa$$word"
 
+  ## OAuth2 Client Credentials Grant
+  # client_id = "clientid"
+  # client_secret = "secret"
+  # token_url = "https://indentityprovider/oauth2/v1/token"
+  # scopes = ["urn:opc:idm:__myscopes__"]
+
   ## Optional TLS Config
   # tls_ca = "/etc/telegraf/ca.pem"
   # tls_cert = "/etc/telegraf/cert.pem"
@@ -33,7 +39,7 @@ 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
diff --git a/plugins/outputs/http/http.go b/plugins/outputs/http/http.go
index 91c2954c..ccb8f894 100644
--- a/plugins/outputs/http/http.go
+++ b/plugins/outputs/http/http.go
@@ -2,6 +2,7 @@ package http
 
 import (
 	"bytes"
+	"context"
 	"fmt"
 	"io/ioutil"
 	"net/http"
@@ -13,6 +14,8 @@ import (
 	"github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/outputs"
 	"github.com/influxdata/telegraf/plugins/serializers"
+	"golang.org/x/oauth2"
+	"golang.org/x/oauth2/clientcredentials"
 )
 
 var sampleConfig = `
@@ -29,6 +32,12 @@ var sampleConfig = `
   # username = "username"
   # password = "pa$$word"
 
+  ## OAuth2 Client Credentials Grant
+  # client_id = "clientid"
+  # client_secret = "secret"
+  # token_url = "https://indentityprovider/oauth2/v1/token"
+  # scopes = ["urn:opc:idm:__myscopes__"]
+
   ## Optional TLS Config
   # tls_ca = "/etc/telegraf/ca.pem"
   # tls_cert = "/etc/telegraf/cert.pem"
@@ -41,7 +50,7 @@ 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
@@ -55,12 +64,16 @@ const (
 )
 
 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"`
+	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"`
+	ClientID     string            `toml:"client_id"`
+	ClientSecret string            `toml:"client_secret"`
+	TokenURL     string            `toml:"token_url"`
+	Scopes       []string          `toml:"scopes"`
 	tls.ClientConfig
 
 	client     *http.Client
@@ -71,6 +84,34 @@ func (h *HTTP) SetSerializer(serializer serializers.Serializer) {
 	h.serializer = serializer
 }
 
+func (h *HTTP) createClient(ctx context.Context) (*http.Client, error) {
+	tlsCfg, err := h.ClientConfig.TLSConfig()
+	if err != nil {
+		return nil, err
+	}
+
+	client := &http.Client{
+		Transport: &http.Transport{
+			TLSClientConfig: tlsCfg,
+			Proxy:           http.ProxyFromEnvironment,
+		},
+		Timeout: h.Timeout.Duration,
+	}
+
+	if h.ClientID != "" && h.ClientSecret != "" && h.TokenURL != "" {
+		oauthConfig := clientcredentials.Config{
+			ClientID:     h.ClientID,
+			ClientSecret: h.ClientSecret,
+			TokenURL:     h.TokenURL,
+			Scopes:       h.Scopes,
+		}
+		ctx = context.WithValue(ctx, oauth2.HTTPClient, client)
+		client = oauthConfig.Client(ctx)
+	}
+
+	return client, nil
+}
+
 func (h *HTTP) Connect() error {
 	if h.Method == "" {
 		h.Method = http.MethodPost
@@ -84,18 +125,13 @@ func (h *HTTP) Connect() error {
 		h.Timeout.Duration = defaultClientTimeout
 	}
 
-	tlsCfg, err := h.ClientConfig.TLSConfig()
+	ctx := context.Background()
+	client, err := h.createClient(ctx)
 	if err != nil {
 		return err
 	}
 
-	h.client = &http.Client{
-		Transport: &http.Transport{
-			TLSClientConfig: tlsCfg,
-			Proxy:           http.ProxyFromEnvironment,
-		},
-		Timeout: h.Timeout.Duration,
-	}
+	h.client = client
 
 	return nil
 }
diff --git a/plugins/outputs/http/http_test.go b/plugins/outputs/http/http_test.go
index daec176b..0b6c7845 100644
--- a/plugins/outputs/http/http_test.go
+++ b/plugins/outputs/http/http_test.go
@@ -287,3 +287,76 @@ func TestBasicAuth(t *testing.T) {
 		})
 	}
 }
+
+type TestHandlerFunc func(t *testing.T, w http.ResponseWriter, r *http.Request)
+
+func TestOAuthClientCredentialsGrant(t *testing.T) {
+	ts := httptest.NewServer(http.NotFoundHandler())
+	defer ts.Close()
+
+	var token = "2YotnFZFEjr1zCsicMWpAA"
+
+	u, err := url.Parse(fmt.Sprintf("http://%s", ts.Listener.Addr().String()))
+	require.NoError(t, err)
+
+	tests := []struct {
+		name         string
+		plugin       *HTTP
+		tokenHandler TestHandlerFunc
+		handler      TestHandlerFunc
+	}{
+		{
+			name: "no credentials",
+			plugin: &HTTP{
+				URL: u.String(),
+			},
+			handler: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				require.Len(t, r.Header["Authorization"], 0)
+				w.WriteHeader(http.StatusOK)
+			},
+		},
+		{
+			name: "success",
+			plugin: &HTTP{
+				URL:          u.String() + "/write",
+				ClientID:     "howdy",
+				ClientSecret: "secret",
+				TokenURL:     u.String() + "/token",
+				Scopes:       []string{"urn:opc:idm:__myscopes__"},
+			},
+			tokenHandler: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				w.WriteHeader(http.StatusOK)
+				values := url.Values{}
+				values.Add("access_token", token)
+				values.Add("token_type", "bearer")
+				values.Add("expires_in", "3600")
+				w.Write([]byte(values.Encode()))
+			},
+			handler: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				require.Equal(t, []string{"Bearer " + token}, r.Header["Authorization"])
+				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 "/write":
+					tt.handler(t, w, r)
+				case "/token":
+					tt.tokenHandler(t, w, r)
+				}
+			})
+
+			serializer := influx.NewSerializer()
+			tt.plugin.SetSerializer(serializer)
+			err = tt.plugin.Connect()
+			require.NoError(t, err)
+
+			err = tt.plugin.Write([]telegraf.Metric{getMetric()})
+			require.NoError(t, err)
+		})
+	}
+}

From 50a82c695722e624ffde42d7068f04064470a544 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 6 Sep 2018 10:55:05 -0700
Subject: [PATCH 749/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 43579ee8..e206f707 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -87,6 +87,8 @@
 - [#4089](https://github.com/influxdata/telegraf/pull/4089): Add azure_monitor output plugin.
 - [#4628](https://github.com/influxdata/telegraf/pull/4628): Add queue_durability parameter to amqp_consumer input.
 - [#4476](https://github.com/influxdata/telegraf/pull/4476): Add strings processor.
+- [#4536](https://github.com/influxdata/telegraf/pull/4536): Add OAuth2 support to HTTP output plugin.
+
 
 ### Bugfixes
 

From cd4c4e7fbda1bca1812f92d248daf6dc0718278f Mon Sep 17 00:00:00 2001
From: David Reniz <drenizg@gmail.com>
Date: Thu, 6 Sep 2018 19:44:33 -0500
Subject: [PATCH 750/835] Added Unix epoch timestamp support for JSON parser
 (#4633)

---
 docs/DATA_FORMATS_INPUT.md          |  6 +++
 plugins/parsers/json/parser.go      | 69 +++++++++++++++++++++++++----
 plugins/parsers/json/parser_test.go | 66 +++++++++++++++++++++++++++
 3 files changed, 133 insertions(+), 8 deletions(-)

diff --git a/docs/DATA_FORMATS_INPUT.md b/docs/DATA_FORMATS_INPUT.md
index 7e57d965..235e3b30 100644
--- a/docs/DATA_FORMATS_INPUT.md
+++ b/docs/DATA_FORMATS_INPUT.md
@@ -131,6 +131,12 @@ config "json_time_key" and "json_time_format". If "json_time_key" is set,
 "json_time_format" must be specified.  The "json_time_key" describes the
 name of the field containing time information.  The "json_time_format"
 must be a recognized Go time format.
+If parsing a Unix epoch timestamp in seconds, e.g. 1536092344.1, this config must be set to "unix" (case insensitive);
+corresponding JSON value can have a decimal part and can be a string or a number JSON representation.
+If value is in number representation, it'll be treated as a double precision float, and could have some precision loss.
+If value is in string representation, there'll be no precision loss up to nanosecond precision. Decimal positions beyond that will be dropped.
+If parsing a Unix epoch timestamp in milliseconds, e.g. 1536092344100, this config must be set to "unix_ms" (case insensitive);
+corresponding JSON value must be a (long) integer and be in number JSON representation.
 If there is no year provided, the metrics will have the current year.
 More info on time formats can be found here: https://golang.org/pkg/time/#Parse
 
diff --git a/plugins/parsers/json/parser.go b/plugins/parsers/json/parser.go
index 9fb0816f..697296a1 100644
--- a/plugins/parsers/json/parser.go
+++ b/plugins/parsers/json/parser.go
@@ -11,7 +11,10 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/metric"
+	"github.com/pkg/errors"
 	"github.com/tidwall/gjson"
+	"math"
+	"regexp"
 )
 
 var (
@@ -47,6 +50,49 @@ func (p *JSONParser) parseArray(buf []byte) ([]telegraf.Metric, error) {
 	return metrics, nil
 }
 
+// format = "unix": epoch is assumed to be in seconds and can come as number or string. Can have a decimal part.
+// format = "unix_ms": epoch is assumed to be in milliseconds and can come as number or string. Cannot have a decimal part.
+func parseUnixTimestamp(jsonValue interface{}, format string) (time.Time, error) {
+	timeInt, timeFractional := int64(0), int64(0)
+	timeEpochStr, ok := jsonValue.(string)
+	var err error
+
+	if !ok {
+		timeEpochFloat, ok := jsonValue.(float64)
+		if !ok {
+			err := fmt.Errorf("time: %v could not be converted to string nor float64", jsonValue)
+			return time.Time{}, err
+		}
+		intPart, frac := math.Modf(timeEpochFloat)
+		timeInt, timeFractional = int64(intPart), int64(frac*1e9)
+	} else {
+		splitted := regexp.MustCompile("[.,]").Split(timeEpochStr, 2)
+		timeInt, err = strconv.ParseInt(splitted[0], 10, 64)
+		if err != nil {
+			return time.Time{}, err
+		}
+
+		if len(splitted) == 2 {
+			if len(splitted[1]) > 9 {
+				splitted[1] = splitted[1][:9] //truncates decimal part to nanoseconds precision
+			}
+			nanosecStr := splitted[1] + strings.Repeat("0", 9-len(splitted[1])) //adds 0's to the right to obtain a valid number of nanoseconds
+
+			timeFractional, err = strconv.ParseInt(nanosecStr, 10, 64)
+			if err != nil {
+				return time.Time{}, err
+			}
+		}
+	}
+	if strings.EqualFold(format, "unix") {
+		return time.Unix(timeInt, timeFractional).UTC(), nil
+	} else if strings.EqualFold(format, "unix_ms") {
+		return time.Unix(timeInt/1000, (timeInt%1000)*1e6).UTC(), nil
+	} else {
+		return time.Time{}, errors.New("Invalid unix format")
+	}
+}
+
 func (p *JSONParser) parseObject(metrics []telegraf.Metric, jsonOut map[string]interface{}) ([]telegraf.Metric, error) {
 
 	tags := make(map[string]string)
@@ -78,14 +124,21 @@ func (p *JSONParser) parseObject(metrics []telegraf.Metric, jsonOut map[string]i
 			return nil, err
 		}
 
-		timeStr, ok := f.Fields[p.JSONTimeKey].(string)
-		if !ok {
-			err := fmt.Errorf("time: %v could not be converted to string", f.Fields[p.JSONTimeKey])
-			return nil, err
-		}
-		nTime, err = time.Parse(p.JSONTimeFormat, timeStr)
-		if err != nil {
-			return nil, err
+		if strings.EqualFold(p.JSONTimeFormat, "unix") || strings.EqualFold(p.JSONTimeFormat, "unix_ms") {
+			nTime, err = parseUnixTimestamp(f.Fields[p.JSONTimeKey], p.JSONTimeFormat)
+			if err != nil {
+				return nil, err
+			}
+		} else {
+			timeStr, ok := f.Fields[p.JSONTimeKey].(string)
+			if !ok {
+				err := fmt.Errorf("time: %v could not be converted to string", f.Fields[p.JSONTimeKey])
+				return nil, err
+			}
+			nTime, err = time.Parse(p.JSONTimeFormat, timeStr)
+			if err != nil {
+				return nil, err
+			}
 		}
 
 		//if the year is 0, set to current year
diff --git a/plugins/parsers/json/parser_test.go b/plugins/parsers/json/parser_test.go
index 39e43bec..ec9ade25 100644
--- a/plugins/parsers/json/parser_test.go
+++ b/plugins/parsers/json/parser_test.go
@@ -596,6 +596,72 @@ func TestTimeParser(t *testing.T) {
 	require.Equal(t, false, metrics[0].Time() == metrics[1].Time())
 }
 
+func TestUnixTimeParser(t *testing.T) {
+	testString := `[
+		{
+			"a": 5,
+			"b": {
+				"c": 6,
+				"time": "1536001411.1234567890"
+			},
+			"my_tag_1": "foo",
+			"my_tag_2": "baz"
+		},
+		{
+			"a": 7,
+			"b": {
+				"c": 8,
+				"time": 1536002769.123
+			},
+			"my_tag_1": "bar",
+			"my_tag_2": "baz"
+		}
+	]`
+
+	parser := JSONParser{
+		MetricName:     "json_test",
+		JSONTimeKey:    "b_time",
+		JSONTimeFormat: "unix",
+	}
+	metrics, err := parser.Parse([]byte(testString))
+	require.NoError(t, err)
+	require.Equal(t, 2, len(metrics))
+	require.Equal(t, false, metrics[0].Time() == metrics[1].Time())
+}
+
+func TestUnixMsTimeParser(t *testing.T) {
+	testString := `[
+		{
+			"a": 5,
+			"b": {
+				"c": 6,
+				"time": "1536001411100"
+			},
+			"my_tag_1": "foo",
+			"my_tag_2": "baz"
+		},
+		{
+			"a": 7,
+			"b": {
+				"c": 8,
+				"time": 1536002769123
+			},
+			"my_tag_1": "bar",
+			"my_tag_2": "baz"
+		}
+	]`
+
+	parser := JSONParser{
+		MetricName:     "json_test",
+		JSONTimeKey:    "b_time",
+		JSONTimeFormat: "unix_ms",
+	}
+	metrics, err := parser.Parse([]byte(testString))
+	require.NoError(t, err)
+	require.Equal(t, 2, len(metrics))
+	require.Equal(t, false, metrics[0].Time() == metrics[1].Time())
+}
+
 func TestTimeErrors(t *testing.T) {
 	testString := `{
 		"a": 5,

From e9eeda555ec1a0ade90d953dd4f5dd599e8541d7 Mon Sep 17 00:00:00 2001
From: Greg <g2linton@gmail.com>
Date: Thu, 6 Sep 2018 18:45:40 -0600
Subject: [PATCH 751/835] Reset/flush saved contents from bad metric (#4646)

---
 plugins/parsers/influx/parser.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/parsers/influx/parser.go b/plugins/parsers/influx/parser.go
index 0b16a2a3..b236a6f1 100644
--- a/plugins/parsers/influx/parser.go
+++ b/plugins/parsers/influx/parser.go
@@ -63,6 +63,7 @@ func (p *Parser) Parse(input []byte) ([]telegraf.Metric, error) {
 	for p.machine.ParseLine() {
 		err := p.machine.Err()
 		if err != nil {
+			p.handler.Reset()
 			return nil, &ParseError{
 				Offset: p.machine.Position(),
 				msg:    err.Error(),

From 5b5b2e3b39c66498573ada11f8d69021e9a08e2b Mon Sep 17 00:00:00 2001
From: Greg Linton <g2linton@gmail.com>
Date: Thu, 6 Sep 2018 18:47:07 -0600
Subject: [PATCH 752/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e206f707..d672e671 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -88,12 +88,13 @@
 - [#4628](https://github.com/influxdata/telegraf/pull/4628): Add queue_durability parameter to amqp_consumer input.
 - [#4476](https://github.com/influxdata/telegraf/pull/4476): Add strings processor.
 - [#4536](https://github.com/influxdata/telegraf/pull/4536): Add OAuth2 support to HTTP output plugin.
-
+- [#4633](https://github.com/influxdata/telegraf/pull/4633): Add Unix epoch timestamp support for JSON parser.
 
 ### Bugfixes
 
 - [#3438](https://github.com/influxdata/telegraf/issues/3438): Fix divide by zero in logparser input.
 - [#4499](https://github.com/influxdata/telegraf/issues/4499): Fix instance and object name in performance counters with backslashes.
+- [#4646](https://github.com/influxdata/telegraf/issues/4646): Reset/flush saved contents from bad metric.
 
 ## v1.7.4 [2018-08-29]
 

From 710c101fe0c76856347474a8c74cba0134e792ba Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 7 Sep 2018 16:13:46 -0700
Subject: [PATCH 753/835] Undeprecate logparser

Until dynamic file tailing can be added to the tail plugin.
---
 CHANGELOG.md                          | 6 ------
 plugins/inputs/logparser/README.md    | 5 -----
 plugins/inputs/logparser/logparser.go | 6 ------
 3 files changed, 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d672e671..247ca4a5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,5 @@
 ## v1.8 [unreleased]
 
-### Release Notes
-
-- With the addition of the standalone `grok` input data format, the
-  `logparser` input plugin has been deprecated in favor of using the `tail`
-  input plugin combined with `data_format="grok"` .
-
 ### New Inputs
 
 - [activemq](./plugins/inputs/activemq/README.md) - Contributed by @mlabouardy
diff --git a/plugins/inputs/logparser/README.md b/plugins/inputs/logparser/README.md
index 27cbc3cf..94e37f4c 100644
--- a/plugins/inputs/logparser/README.md
+++ b/plugins/inputs/logparser/README.md
@@ -1,7 +1,5 @@
 # Logparser Input Plugin
 
-### **Deprecated in version 1.8**: Please use the [tail](/plugins/inputs/tail) plugin with the `grok` [data format](/docs/DATA_FORMATS_INPUT.md).
-
 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.
@@ -10,9 +8,6 @@ regex patterns.
 
 ```toml
 [[inputs.logparser]]
-  ## DEPRECATED: The `logparser` plugin is deprecated in 1.8.  Please use the
-  ## `tail` plugin with the grok data_format instead.
-
   ## Log files to parse.
   ## These accept standard unix glob matching rules, but with the addition of
   ## ** as a "super asterisk". ie:
diff --git a/plugins/inputs/logparser/logparser.go b/plugins/inputs/logparser/logparser.go
index b6ce7254..bdfa4bac 100644
--- a/plugins/inputs/logparser/logparser.go
+++ b/plugins/inputs/logparser/logparser.go
@@ -54,9 +54,6 @@ type LogParserPlugin struct {
 }
 
 const sampleConfig = `
-  ## DEPRECATED: The 'logparser' plugin is deprecated in 1.8.  Please use the
-  ## 'tail' plugin with the grok data_format as a replacement.
-
   ## Log files to parse.
   ## These accept standard unix glob matching rules, but with the addition of
   ## ** as a "super asterisk". ie:
@@ -126,9 +123,6 @@ func (l *LogParserPlugin) Gather(acc telegraf.Accumulator) error {
 
 // Start kicks off collection of stats for the plugin
 func (l *LogParserPlugin) Start(acc telegraf.Accumulator) error {
-	log.Println("W! DEPRECATED: The logparser plugin is deprecated in 1.8. " +
-		"Please use the tail plugin with the grok data_format as a replacement.")
-
 	l.Lock()
 	defer l.Unlock()
 

From 69100f60b8676048e30572cac00db16aaf1c27b3 Mon Sep 17 00:00:00 2001
From: Alexander Shepelin <Brightcor@gmail.com>
Date: Mon, 10 Sep 2018 21:51:03 +0300
Subject: [PATCH 754/835] Add Beanstalkd input plugin (#4272)

---
 plugins/inputs/all/all.go                    |   1 +
 plugins/inputs/beanstalkd/README.md          |  98 ++++++
 plugins/inputs/beanstalkd/beanstalkd.go      | 270 +++++++++++++++
 plugins/inputs/beanstalkd/beanstalkd_test.go | 332 +++++++++++++++++++
 4 files changed, 701 insertions(+)
 create mode 100644 plugins/inputs/beanstalkd/README.md
 create mode 100644 plugins/inputs/beanstalkd/beanstalkd.go
 create mode 100644 plugins/inputs/beanstalkd/beanstalkd_test.go

diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index feb46236..ef49f653 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -7,6 +7,7 @@ import (
 	_ "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/beanstalkd"
 	_ "github.com/influxdata/telegraf/plugins/inputs/bond"
 	_ "github.com/influxdata/telegraf/plugins/inputs/burrow"
 	_ "github.com/influxdata/telegraf/plugins/inputs/cassandra"
diff --git a/plugins/inputs/beanstalkd/README.md b/plugins/inputs/beanstalkd/README.md
new file mode 100644
index 00000000..e4fe2203
--- /dev/null
+++ b/plugins/inputs/beanstalkd/README.md
@@ -0,0 +1,98 @@
+# Beanstalkd Input Plugin
+
+The `beanstalkd` plugin collects server stats as well as tube stats (reported by `stats` and `stats-tube` commands respectively).
+
+### Configuration:
+
+```toml
+[[inputs.beanstalkd]]
+  ## Server to collect data from
+  server = "localhost:11300"
+
+  ## List of tubes to gather stats about.
+  ## If no tubes specified then data gathered for each tube on server reported by list-tubes command
+  tubes = ["notifications"]
+```
+
+### Metrics:
+
+Please see the [Beanstalk Protocol doc](https://raw.githubusercontent.com/kr/beanstalkd/master/doc/protocol.txt) for detailed explanation of `stats` and `stats-tube` commands output.
+
+`beanstalkd_overview` – statistical information about the system as a whole
+- fields
+  - cmd_delete
+  - cmd_pause_tube
+  - current_jobs_buried
+  - current_jobs_delayed
+  - current_jobs_ready
+  - current_jobs_reserved
+  - current_jobs_urgent
+  - current_using
+  - current_waiting
+  - current_watching
+  - pause
+  - pause_time_left
+  - total_jobs
+- tags
+  - name
+  - server (address taken from config)
+
+`beanstalkd_tube` – statistical information about the specified tube
+- fields
+  - binlog_current_index
+  - binlog_max_size
+  - binlog_oldest_index
+  - binlog_records_migrated
+  - binlog_records_written
+  - cmd_bury
+  - cmd_delete
+  - cmd_ignore
+  - cmd_kick
+  - cmd_list_tube_used
+  - cmd_list_tubes
+  - cmd_list_tubes_watched
+  - cmd_pause_tube
+  - cmd_peek
+  - cmd_peek_buried
+  - cmd_peek_delayed
+  - cmd_peek_ready
+  - cmd_put
+  - cmd_release
+  - cmd_reserve
+  - cmd_reserve_with_timeout
+  - cmd_stats
+  - cmd_stats_job
+  - cmd_stats_tube
+  - cmd_touch
+  - cmd_use
+  - cmd_watch
+  - current_connections
+  - current_jobs_buried
+  - current_jobs_delayed
+  - current_jobs_ready
+  - current_jobs_reserved
+  - current_jobs_urgent
+  - current_producers
+  - current_tubes
+  - current_waiting
+  - current_workers
+  - job_timeouts
+  - max_job_size
+  - pid
+  - rusage_stime
+  - rusage_utime
+  - total_connections
+  - total_jobs
+  - uptime
+- tags
+  - hostname
+  - id
+  - server (address taken from config)
+  - version
+
+### Example Output:
+```
+beanstalkd_overview,host=server.local,hostname=a2ab22ed12e0,id=232485800aa11b24,server=localhost:11300,version=1.10 cmd_stats_tube=29482i,current_jobs_delayed=0i,current_jobs_urgent=6i,cmd_kick=0i,cmd_stats=7378i,cmd_stats_job=0i,current_waiting=0i,max_job_size=65535i,pid=6i,cmd_bury=0i,cmd_reserve_with_timeout=0i,cmd_touch=0i,current_connections=1i,current_jobs_ready=6i,current_producers=0i,cmd_delete=0i,cmd_list_tubes=7369i,cmd_peek_ready=0i,cmd_put=6i,cmd_use=3i,cmd_watch=0i,current_jobs_reserved=0i,rusage_stime=6.07,cmd_list_tubes_watched=0i,cmd_pause_tube=0i,total_jobs=6i,binlog_records_migrated=0i,cmd_list_tube_used=0i,cmd_peek_delayed=0i,cmd_release=0i,current_jobs_buried=0i,job_timeouts=0i,binlog_current_index=0i,binlog_max_size=10485760i,total_connections=7378i,cmd_peek_buried=0i,cmd_reserve=0i,current_tubes=4i,binlog_records_written=0i,cmd_peek=0i,rusage_utime=1.13,uptime=7099i,binlog_oldest_index=0i,current_workers=0i,cmd_ignore=0i 1528801650000000000
+
+beanstalkd_tube,host=server.local,name=notifications,server=localhost:11300 pause_time_left=0i,current_jobs_buried=0i,current_jobs_delayed=0i,current_jobs_reserved=0i,current_using=0i,current_waiting=0i,pause=0i,total_jobs=3i,cmd_delete=0i,cmd_pause_tube=0i,current_jobs_ready=3i,current_jobs_urgent=3i,current_watching=0i 1528801650000000000
+```
diff --git a/plugins/inputs/beanstalkd/beanstalkd.go b/plugins/inputs/beanstalkd/beanstalkd.go
new file mode 100644
index 00000000..932edd30
--- /dev/null
+++ b/plugins/inputs/beanstalkd/beanstalkd.go
@@ -0,0 +1,270 @@
+package beanstalkd
+
+import (
+	"fmt"
+	"io"
+	"net/textproto"
+	"sync"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
+	"gopkg.in/yaml.v2"
+)
+
+const sampleConfig = `
+  ## Server to collect data from
+  server = "localhost:11300"
+
+  ## List of tubes to gather stats about.
+  ## If no tubes specified then data gathered for each tube on server reported by list-tubes command
+  tubes = ["notifications"]
+`
+
+type Beanstalkd struct {
+	Server string   `toml:"server"`
+	Tubes  []string `toml:"tubes"`
+}
+
+func (b *Beanstalkd) Description() string {
+	return "Collects Beanstalkd server and tubes stats"
+}
+
+func (b *Beanstalkd) SampleConfig() string {
+	return sampleConfig
+}
+
+func (b *Beanstalkd) Gather(acc telegraf.Accumulator) error {
+	connection, err := textproto.Dial("tcp", b.Server)
+	if err != nil {
+		return err
+	}
+	defer connection.Close()
+
+	tubes := b.Tubes
+	if len(tubes) == 0 {
+		err = runQuery(connection, "list-tubes", &tubes)
+		if err != nil {
+			acc.AddError(err)
+		}
+	}
+
+	var wg sync.WaitGroup
+
+	wg.Add(1)
+	go func() {
+		err := b.gatherServerStats(connection, acc)
+		if err != nil {
+			acc.AddError(err)
+		}
+		wg.Done()
+	}()
+
+	for _, tube := range tubes {
+		wg.Add(1)
+		go func(tube string) {
+			b.gatherTubeStats(connection, tube, acc)
+			wg.Done()
+		}(tube)
+	}
+
+	wg.Wait()
+
+	return nil
+}
+
+func (b *Beanstalkd) gatherServerStats(connection *textproto.Conn, acc telegraf.Accumulator) error {
+	stats := new(statsResponse)
+	if err := runQuery(connection, "stats", stats); err != nil {
+		return err
+	}
+
+	acc.AddFields("beanstalkd_overview",
+		map[string]interface{}{
+			"binlog_current_index":     stats.BinlogCurrentIndex,
+			"binlog_max_size":          stats.BinlogMaxSize,
+			"binlog_oldest_index":      stats.BinlogOldestIndex,
+			"binlog_records_migrated":  stats.BinlogRecordsMigrated,
+			"binlog_records_written":   stats.BinlogRecordsWritten,
+			"cmd_bury":                 stats.CmdBury,
+			"cmd_delete":               stats.CmdDelete,
+			"cmd_ignore":               stats.CmdIgnore,
+			"cmd_kick":                 stats.CmdKick,
+			"cmd_list_tube_used":       stats.CmdListTubeUsed,
+			"cmd_list_tubes":           stats.CmdListTubes,
+			"cmd_list_tubes_watched":   stats.CmdListTubesWatched,
+			"cmd_pause_tube":           stats.CmdPauseTube,
+			"cmd_peek":                 stats.CmdPeek,
+			"cmd_peek_buried":          stats.CmdPeekBuried,
+			"cmd_peek_delayed":         stats.CmdPeekDelayed,
+			"cmd_peek_ready":           stats.CmdPeekReady,
+			"cmd_put":                  stats.CmdPut,
+			"cmd_release":              stats.CmdRelease,
+			"cmd_reserve":              stats.CmdReserve,
+			"cmd_reserve_with_timeout": stats.CmdReserveWithTimeout,
+			"cmd_stats":                stats.CmdStats,
+			"cmd_stats_job":            stats.CmdStatsJob,
+			"cmd_stats_tube":           stats.CmdStatsTube,
+			"cmd_touch":                stats.CmdTouch,
+			"cmd_use":                  stats.CmdUse,
+			"cmd_watch":                stats.CmdWatch,
+			"current_connections":      stats.CurrentConnections,
+			"current_jobs_buried":      stats.CurrentJobsBuried,
+			"current_jobs_delayed":     stats.CurrentJobsDelayed,
+			"current_jobs_ready":       stats.CurrentJobsReady,
+			"current_jobs_reserved":    stats.CurrentJobsReserved,
+			"current_jobs_urgent":      stats.CurrentJobsUrgent,
+			"current_producers":        stats.CurrentProducers,
+			"current_tubes":            stats.CurrentTubes,
+			"current_waiting":          stats.CurrentWaiting,
+			"current_workers":          stats.CurrentWorkers,
+			"job_timeouts":             stats.JobTimeouts,
+			"max_job_size":             stats.MaxJobSize,
+			"pid":                      stats.Pid,
+			"rusage_stime":             stats.RusageStime,
+			"rusage_utime":             stats.RusageUtime,
+			"total_connections":        stats.TotalConnections,
+			"total_jobs":               stats.TotalJobs,
+			"uptime":                   stats.Uptime,
+		},
+		map[string]string{
+			"hostname": stats.Hostname,
+			"id":       stats.Id,
+			"server":   b.Server,
+			"version":  stats.Version,
+		},
+	)
+
+	return nil
+}
+
+func (b *Beanstalkd) gatherTubeStats(connection *textproto.Conn, tube string, acc telegraf.Accumulator) error {
+	stats := new(statsTubeResponse)
+	if err := runQuery(connection, "stats-tube "+tube, stats); err != nil {
+		return err
+	}
+
+	acc.AddFields("beanstalkd_tube",
+		map[string]interface{}{
+			"cmd_delete":            stats.CmdDelete,
+			"cmd_pause_tube":        stats.CmdPauseTube,
+			"current_jobs_buried":   stats.CurrentJobsBuried,
+			"current_jobs_delayed":  stats.CurrentJobsDelayed,
+			"current_jobs_ready":    stats.CurrentJobsReady,
+			"current_jobs_reserved": stats.CurrentJobsReserved,
+			"current_jobs_urgent":   stats.CurrentJobsUrgent,
+			"current_using":         stats.CurrentUsing,
+			"current_waiting":       stats.CurrentWaiting,
+			"current_watching":      stats.CurrentWatching,
+			"pause":                 stats.Pause,
+			"pause_time_left":       stats.PauseTimeLeft,
+			"total_jobs":            stats.TotalJobs,
+		},
+		map[string]string{
+			"name":   stats.Name,
+			"server": b.Server,
+		},
+	)
+
+	return nil
+}
+
+func runQuery(connection *textproto.Conn, cmd string, result interface{}) error {
+	requestId, err := connection.Cmd(cmd)
+	if err != nil {
+		return err
+	}
+
+	connection.StartResponse(requestId)
+	defer connection.EndResponse(requestId)
+
+	status, err := connection.ReadLine()
+	if err != nil {
+		return err
+	}
+
+	size := 0
+	if _, err = fmt.Sscanf(status, "OK %d", &size); err != nil {
+		return err
+	}
+
+	body := make([]byte, size+2)
+	if _, err = io.ReadFull(connection.R, body); err != nil {
+		return err
+	}
+
+	return yaml.Unmarshal(body, result)
+}
+
+func init() {
+	inputs.Add("beanstalkd", func() telegraf.Input {
+		return &Beanstalkd{}
+	})
+}
+
+type statsResponse struct {
+	BinlogCurrentIndex    int     `yaml:"binlog-current-index"`
+	BinlogMaxSize         int     `yaml:"binlog-max-size"`
+	BinlogOldestIndex     int     `yaml:"binlog-oldest-index"`
+	BinlogRecordsMigrated int     `yaml:"binlog-records-migrated"`
+	BinlogRecordsWritten  int     `yaml:"binlog-records-written"`
+	CmdBury               int     `yaml:"cmd-bury"`
+	CmdDelete             int     `yaml:"cmd-delete"`
+	CmdIgnore             int     `yaml:"cmd-ignore"`
+	CmdKick               int     `yaml:"cmd-kick"`
+	CmdListTubeUsed       int     `yaml:"cmd-list-tube-used"`
+	CmdListTubes          int     `yaml:"cmd-list-tubes"`
+	CmdListTubesWatched   int     `yaml:"cmd-list-tubes-watched"`
+	CmdPauseTube          int     `yaml:"cmd-pause-tube"`
+	CmdPeek               int     `yaml:"cmd-peek"`
+	CmdPeekBuried         int     `yaml:"cmd-peek-buried"`
+	CmdPeekDelayed        int     `yaml:"cmd-peek-delayed"`
+	CmdPeekReady          int     `yaml:"cmd-peek-ready"`
+	CmdPut                int     `yaml:"cmd-put"`
+	CmdRelease            int     `yaml:"cmd-release"`
+	CmdReserve            int     `yaml:"cmd-reserve"`
+	CmdReserveWithTimeout int     `yaml:"cmd-reserve-with-timeout"`
+	CmdStats              int     `yaml:"cmd-stats"`
+	CmdStatsJob           int     `yaml:"cmd-stats-job"`
+	CmdStatsTube          int     `yaml:"cmd-stats-tube"`
+	CmdTouch              int     `yaml:"cmd-touch"`
+	CmdUse                int     `yaml:"cmd-use"`
+	CmdWatch              int     `yaml:"cmd-watch"`
+	CurrentConnections    int     `yaml:"current-connections"`
+	CurrentJobsBuried     int     `yaml:"current-jobs-buried"`
+	CurrentJobsDelayed    int     `yaml:"current-jobs-delayed"`
+	CurrentJobsReady      int     `yaml:"current-jobs-ready"`
+	CurrentJobsReserved   int     `yaml:"current-jobs-reserved"`
+	CurrentJobsUrgent     int     `yaml:"current-jobs-urgent"`
+	CurrentProducers      int     `yaml:"current-producers"`
+	CurrentTubes          int     `yaml:"current-tubes"`
+	CurrentWaiting        int     `yaml:"current-waiting"`
+	CurrentWorkers        int     `yaml:"current-workers"`
+	Hostname              string  `yaml:"hostname"`
+	Id                    string  `yaml:"id"`
+	JobTimeouts           int     `yaml:"job-timeouts"`
+	MaxJobSize            int     `yaml:"max-job-size"`
+	Pid                   int     `yaml:"pid"`
+	RusageStime           float64 `yaml:"rusage-stime"`
+	RusageUtime           float64 `yaml:"rusage-utime"`
+	TotalConnections      int     `yaml:"total-connections"`
+	TotalJobs             int     `yaml:"total-jobs"`
+	Uptime                int     `yaml:"uptime"`
+	Version               string  `yaml:"version"`
+}
+
+type statsTubeResponse struct {
+	CmdDelete           int    `yaml:"cmd-delete"`
+	CmdPauseTube        int    `yaml:"cmd-pause-tube"`
+	CurrentJobsBuried   int    `yaml:"current-jobs-buried"`
+	CurrentJobsDelayed  int    `yaml:"current-jobs-delayed"`
+	CurrentJobsReady    int    `yaml:"current-jobs-ready"`
+	CurrentJobsReserved int    `yaml:"current-jobs-reserved"`
+	CurrentJobsUrgent   int    `yaml:"current-jobs-urgent"`
+	CurrentUsing        int    `yaml:"current-using"`
+	CurrentWaiting      int    `yaml:"current-waiting"`
+	CurrentWatching     int    `yaml:"current-watching"`
+	Name                string `yaml:"name"`
+	Pause               int    `yaml:"pause"`
+	PauseTimeLeft       int    `yaml:"pause-time-left"`
+	TotalJobs           int    `yaml:"total-jobs"`
+}
diff --git a/plugins/inputs/beanstalkd/beanstalkd_test.go b/plugins/inputs/beanstalkd/beanstalkd_test.go
new file mode 100644
index 00000000..92c108e0
--- /dev/null
+++ b/plugins/inputs/beanstalkd/beanstalkd_test.go
@@ -0,0 +1,332 @@
+package beanstalkd_test
+
+import (
+	"io"
+	"net"
+	"net/textproto"
+	"testing"
+
+	"github.com/influxdata/telegraf/plugins/inputs/beanstalkd"
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/require"
+)
+
+func TestBeanstalkd(t *testing.T) {
+	type tubeStats struct {
+		name   string
+		fields map[string]interface{}
+	}
+
+	tests := []struct {
+		name             string
+		tubesConfig      []string
+		expectedTubes    []tubeStats
+		notExpectedTubes []tubeStats
+	}{
+		{
+			name:        "All tubes stats",
+			tubesConfig: []string{},
+			expectedTubes: []tubeStats{
+				{name: "default", fields: defaultTubeFields},
+				{name: "test", fields: testTubeFields},
+			},
+			notExpectedTubes: []tubeStats{},
+		},
+		{
+			name:        "Specified tubes stats",
+			tubesConfig: []string{"test"},
+			expectedTubes: []tubeStats{
+				{name: "test", fields: testTubeFields},
+			},
+			notExpectedTubes: []tubeStats{
+				{name: "default", fields: defaultTubeFields},
+			},
+		},
+		{
+			name:          "Unknown tube stats",
+			tubesConfig:   []string{"unknown"},
+			expectedTubes: []tubeStats{},
+			notExpectedTubes: []tubeStats{
+				{name: "default", fields: defaultTubeFields},
+				{name: "test", fields: testTubeFields},
+			},
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			server, err := startTestServer(t)
+			if err != nil {
+				t.Fatalf("Unable to create test server")
+			}
+			defer server.Close()
+
+			serverAddress := server.Addr().String()
+			plugin := beanstalkd.Beanstalkd{
+				Server: serverAddress,
+				Tubes:  test.tubesConfig,
+			}
+
+			var acc testutil.Accumulator
+			require.NoError(t, acc.GatherError(plugin.Gather))
+
+			acc.AssertContainsTaggedFields(t, "beanstalkd_overview",
+				overviewFields,
+				getOverviewTags(serverAddress),
+			)
+
+			for _, expectedTube := range test.expectedTubes {
+				acc.AssertContainsTaggedFields(t, "beanstalkd_tube",
+					expectedTube.fields,
+					getTubeTags(serverAddress, expectedTube.name),
+				)
+			}
+
+			for _, notExpectedTube := range test.notExpectedTubes {
+				acc.AssertDoesNotContainsTaggedFields(t, "beanstalkd_tube",
+					notExpectedTube.fields,
+					getTubeTags(serverAddress, notExpectedTube.name),
+				)
+			}
+		})
+	}
+}
+
+func startTestServer(t *testing.T) (net.Listener, error) {
+	server, err := net.Listen("tcp", "localhost:0")
+	if err != nil {
+		return nil, err
+	}
+
+	go func() {
+		defer server.Close()
+
+		connection, err := server.Accept()
+		if err != nil {
+			t.Log("Test server: failed to accept connection. Error: ", err)
+			return
+		}
+
+		tp := textproto.NewConn(connection)
+		defer tp.Close()
+
+		sendSuccessResponse := func(body string) {
+			tp.PrintfLine("OK %d\r\n%s", len(body), body)
+		}
+
+		for {
+			cmd, err := tp.ReadLine()
+			if err == io.EOF {
+				return
+			} else if err != nil {
+				t.Log("Test server: failed read command. Error: ", err)
+				return
+			}
+
+			switch cmd {
+			case "list-tubes":
+				sendSuccessResponse(listTubesResponse)
+			case "stats":
+				sendSuccessResponse(statsResponse)
+			case "stats-tube default":
+				sendSuccessResponse(statsTubeDefaultResponse)
+			case "stats-tube test":
+				sendSuccessResponse(statsTubeTestResponse)
+			case "stats-tube unknown":
+				tp.PrintfLine("NOT_FOUND")
+			default:
+				t.Log("Test server: unknown command")
+			}
+		}
+	}()
+
+	return server, nil
+}
+
+const (
+	listTubesResponse = `---
+- default
+- test
+`
+	statsResponse = `---
+current-jobs-urgent: 5
+current-jobs-ready: 5
+current-jobs-reserved: 0
+current-jobs-delayed: 1
+current-jobs-buried: 0
+cmd-put: 6
+cmd-peek: 0
+cmd-peek-ready: 1
+cmd-peek-delayed: 0
+cmd-peek-buried: 0
+cmd-reserve: 0
+cmd-reserve-with-timeout: 1
+cmd-delete: 1
+cmd-release: 0
+cmd-use: 2
+cmd-watch: 0
+cmd-ignore: 0
+cmd-bury: 1
+cmd-kick: 1
+cmd-touch: 0
+cmd-stats: 1
+cmd-stats-job: 0
+cmd-stats-tube: 2
+cmd-list-tubes: 1
+cmd-list-tube-used: 0
+cmd-list-tubes-watched: 0
+cmd-pause-tube: 0
+job-timeouts: 0
+total-jobs: 6
+max-job-size: 65535
+current-tubes: 2
+current-connections: 2
+current-producers: 1
+current-workers: 1
+current-waiting: 0
+total-connections: 2
+pid: 6
+version: 1.10
+rusage-utime: 0.000000
+rusage-stime: 0.000000
+uptime: 20
+binlog-oldest-index: 0
+binlog-current-index: 0
+binlog-records-migrated: 0
+binlog-records-written: 0
+binlog-max-size: 10485760
+id: bba7546657efdd4c
+hostname: 2873efd3e88c
+`
+	statsTubeDefaultResponse = `---
+name: default
+current-jobs-urgent: 0
+current-jobs-ready: 0
+current-jobs-reserved: 0
+current-jobs-delayed: 0
+current-jobs-buried: 0
+total-jobs: 0
+current-using: 2
+current-watching: 2
+current-waiting: 0
+cmd-delete: 0
+cmd-pause-tube: 0
+pause: 0
+pause-time-left: 0
+`
+	statsTubeTestResponse = `---
+name: test
+current-jobs-urgent: 5
+current-jobs-ready: 5
+current-jobs-reserved: 0
+current-jobs-delayed: 1
+current-jobs-buried: 0
+total-jobs: 6
+current-using: 0
+current-watching: 0
+current-waiting: 0
+cmd-delete: 0
+cmd-pause-tube: 0
+pause: 0
+pause-time-left: 0
+`
+)
+
+var (
+	// Default tube without stats
+	defaultTubeFields = map[string]interface{}{
+		"cmd_delete":            0,
+		"cmd_pause_tube":        0,
+		"current_jobs_buried":   0,
+		"current_jobs_delayed":  0,
+		"current_jobs_ready":    0,
+		"current_jobs_reserved": 0,
+		"current_jobs_urgent":   0,
+		"current_using":         2,
+		"current_waiting":       0,
+		"current_watching":      2,
+		"pause":                 0,
+		"pause_time_left":       0,
+		"total_jobs":            0,
+	}
+	// Test tube with stats
+	testTubeFields = map[string]interface{}{
+		"cmd_delete":            0,
+		"cmd_pause_tube":        0,
+		"current_jobs_buried":   0,
+		"current_jobs_delayed":  1,
+		"current_jobs_ready":    5,
+		"current_jobs_reserved": 0,
+		"current_jobs_urgent":   5,
+		"current_using":         0,
+		"current_waiting":       0,
+		"current_watching":      0,
+		"pause":                 0,
+		"pause_time_left":       0,
+		"total_jobs":            6,
+	}
+	// Server stats
+	overviewFields = map[string]interface{}{
+		"binlog_current_index":     0,
+		"binlog_max_size":          10485760,
+		"binlog_oldest_index":      0,
+		"binlog_records_migrated":  0,
+		"binlog_records_written":   0,
+		"cmd_bury":                 1,
+		"cmd_delete":               1,
+		"cmd_ignore":               0,
+		"cmd_kick":                 1,
+		"cmd_list_tube_used":       0,
+		"cmd_list_tubes":           1,
+		"cmd_list_tubes_watched":   0,
+		"cmd_pause_tube":           0,
+		"cmd_peek":                 0,
+		"cmd_peek_buried":          0,
+		"cmd_peek_delayed":         0,
+		"cmd_peek_ready":           1,
+		"cmd_put":                  6,
+		"cmd_release":              0,
+		"cmd_reserve":              0,
+		"cmd_reserve_with_timeout": 1,
+		"cmd_stats":                1,
+		"cmd_stats_job":            0,
+		"cmd_stats_tube":           2,
+		"cmd_touch":                0,
+		"cmd_use":                  2,
+		"cmd_watch":                0,
+		"current_connections":      2,
+		"current_jobs_buried":      0,
+		"current_jobs_delayed":     1,
+		"current_jobs_ready":       5,
+		"current_jobs_reserved":    0,
+		"current_jobs_urgent":      5,
+		"current_producers":        1,
+		"current_tubes":            2,
+		"current_waiting":          0,
+		"current_workers":          1,
+		"job_timeouts":             0,
+		"max_job_size":             65535,
+		"pid":                      6,
+		"rusage_stime":             0.0,
+		"rusage_utime":             0.0,
+		"total_connections":        2,
+		"total_jobs":               6,
+		"uptime":                   20,
+	}
+)
+
+func getOverviewTags(server string) map[string]string {
+	return map[string]string{
+		"hostname": "2873efd3e88c",
+		"id":       "bba7546657efdd4c",
+		"server":   server,
+		"version":  "1.10",
+	}
+}
+
+func getTubeTags(server string, tube string) map[string]string {
+	return map[string]string{
+		"name":   tube,
+		"server": server,
+	}
+}

From 25f9cc0b8dedac6a6acd89fdc4188c345536343d Mon Sep 17 00:00:00 2001
From: pytimer <lixin20101023@gmail.com>
Date: Tue, 11 Sep 2018 02:52:15 +0800
Subject: [PATCH 755/835] Add temp input plugin (#4411)

---
 plugins/inputs/all/all.go        |  1 +
 plugins/inputs/system/mock_PS.go | 10 +++++++
 plugins/inputs/system/ps.go      |  6 +++++
 plugins/inputs/temp/README.md    | 32 ++++++++++++++++++++++
 plugins/inputs/temp/temp.go      | 46 ++++++++++++++++++++++++++++++++
 plugins/inputs/temp/temp_test.go | 38 ++++++++++++++++++++++++++
 6 files changed, 133 insertions(+)
 create mode 100644 plugins/inputs/temp/README.md
 create mode 100644 plugins/inputs/temp/temp.go
 create mode 100644 plugins/inputs/temp/temp_test.go

diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index ef49f653..9dcb0dbd 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -120,6 +120,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/temp"
 	_ "github.com/influxdata/telegraf/plugins/inputs/tengine"
 	_ "github.com/influxdata/telegraf/plugins/inputs/tomcat"
 	_ "github.com/influxdata/telegraf/plugins/inputs/trig"
diff --git a/plugins/inputs/system/mock_PS.go b/plugins/inputs/system/mock_PS.go
index 323332f3..b3cf2c17 100644
--- a/plugins/inputs/system/mock_PS.go
+++ b/plugins/inputs/system/mock_PS.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/shirou/gopsutil/cpu"
 	"github.com/shirou/gopsutil/disk"
+	"github.com/shirou/gopsutil/host"
 
 	"github.com/shirou/gopsutil/load"
 	"github.com/shirou/gopsutil/mem"
@@ -100,6 +101,15 @@ func (m *MockPS) SwapStat() (*mem.SwapMemoryStat, error) {
 	return r0, r1
 }
 
+func (m *MockPS) Temperature() ([]host.TemperatureStat, error) {
+	ret := m.Called()
+
+	r0 := ret.Get(0).([]host.TemperatureStat)
+	r1 := ret.Error(1)
+
+	return r0, r1
+}
+
 func (m *MockPS) NetConnections() ([]net.ConnectionStat, error) {
 	ret := m.Called()
 
diff --git a/plugins/inputs/system/ps.go b/plugins/inputs/system/ps.go
index 038e2a0a..256aca05 100644
--- a/plugins/inputs/system/ps.go
+++ b/plugins/inputs/system/ps.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/shirou/gopsutil/cpu"
 	"github.com/shirou/gopsutil/disk"
+	"github.com/shirou/gopsutil/host"
 	"github.com/shirou/gopsutil/mem"
 	"github.com/shirou/gopsutil/net"
 )
@@ -23,6 +24,7 @@ type PS interface {
 	VMStat() (*mem.VirtualMemoryStat, error)
 	SwapStat() (*mem.SwapMemoryStat, error)
 	NetConnections() ([]net.ConnectionStat, error)
+	Temperature() ([]host.TemperatureStat, error)
 }
 
 type PSDiskDeps interface {
@@ -168,6 +170,10 @@ func (s *SystemPS) SwapStat() (*mem.SwapMemoryStat, error) {
 	return mem.SwapMemory()
 }
 
+func (s *SystemPS) Temperature() ([]host.TemperatureStat, error) {
+	return host.SensorsTemperatures()
+}
+
 func (s *SystemPSDisk) Partitions(all bool) ([]disk.PartitionStat, error) {
 	return disk.Partitions(all)
 }
diff --git a/plugins/inputs/temp/README.md b/plugins/inputs/temp/README.md
new file mode 100644
index 00000000..87f365ca
--- /dev/null
+++ b/plugins/inputs/temp/README.md
@@ -0,0 +1,32 @@
+# Temp Input plugin
+
+This input plugin collect temperature.
+
+### Configuration:
+
+```
+[[inputs.temp]]
+```
+
+### Measurements & Fields:
+
+All fields are float64.
+
+- temp ( unit: °Celsius)
+
+### Tags:
+
+- All measurements have the following tags:
+    - host
+    - sensor
+
+### Example Output:
+
+```
+$ ./telegraf --config telegraf.conf --input-filter temp --test
+* Plugin: temp, Collection 1
+> temp,host=localhost,sensor=coretemp_physicalid0_crit temp=100 1531298763000000000
+> temp,host=localhost,sensor=coretemp_physicalid0_critalarm temp=0 1531298763000000000
+> temp,host=localhost,sensor=coretemp_physicalid0_input temp=100 1531298763000000000
+> temp,host=localhost,sensor=coretemp_physicalid0_max temp=100 1531298763000000000
+```
diff --git a/plugins/inputs/temp/temp.go b/plugins/inputs/temp/temp.go
new file mode 100644
index 00000000..10e61673
--- /dev/null
+++ b/plugins/inputs/temp/temp.go
@@ -0,0 +1,46 @@
+package temp
+
+import (
+	"fmt"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs/system"
+)
+
+type Temperature struct {
+	ps system.PS
+}
+
+func (t *Temperature) Description() string {
+	return "Read metrics about temperature"
+}
+
+const sampleConfig = ""
+
+func (t *Temperature) SampleConfig() string {
+	return sampleConfig
+}
+
+func (t *Temperature) Gather(acc telegraf.Accumulator) error {
+	temps, err := t.ps.Temperature()
+	if err != nil {
+		return fmt.Errorf("error getting temperatures info: %s", err)
+	}
+	for _, temp := range temps {
+		tags := map[string]string{
+			"sensor": temp.SensorKey,
+		}
+		fields := map[string]interface{}{
+			"temp": temp.Temperature,
+		}
+		acc.AddFields("temp", fields, tags)
+	}
+	return nil
+}
+
+func init() {
+	inputs.Add("temp", func() telegraf.Input {
+		return &Temperature{ps: system.NewSystemPS()}
+	})
+}
diff --git a/plugins/inputs/temp/temp_test.go b/plugins/inputs/temp/temp_test.go
new file mode 100644
index 00000000..080ff66a
--- /dev/null
+++ b/plugins/inputs/temp/temp_test.go
@@ -0,0 +1,38 @@
+package temp
+
+import (
+	"testing"
+
+	"github.com/shirou/gopsutil/host"
+	"github.com/stretchr/testify/require"
+
+	"github.com/influxdata/telegraf/plugins/inputs/system"
+	"github.com/influxdata/telegraf/testutil"
+)
+
+func TestTemperature(t *testing.T) {
+	var mps system.MockPS
+	var err error
+	defer mps.AssertExpectations(t)
+	var acc testutil.Accumulator
+
+	ts := host.TemperatureStat{
+		SensorKey:   "coretemp_sensor1_crit",
+		Temperature: 60.5,
+	}
+
+	mps.On("Temperature").Return([]host.TemperatureStat{ts}, nil)
+
+	err = (&Temperature{ps: &mps}).Gather(&acc)
+	require.NoError(t, err)
+
+	expectedFields := map[string]interface{}{
+		"temp": float64(60.5),
+	}
+
+	expectedTags := map[string]string{
+		"sensor": "coretemp_sensor1_crit",
+	}
+	acc.AssertContainsTaggedFields(t, "temp", expectedFields, expectedTags)
+
+}

From 4ef058c1202e7099d88eb16cb0587c0c7f04f7d5 Mon Sep 17 00:00:00 2001
From: Greg <g2linton@gmail.com>
Date: Mon, 10 Sep 2018 12:53:04 -0600
Subject: [PATCH 756/835] Document all supported cli arguments (#4655)

---
 cmd/telegraf/telegraf.go  |  4 ++--
 internal/usage.go         | 25 ++++++++++++++++---------
 internal/usage_windows.go | 29 ++++++++++++++++++-----------
 3 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go
index e8ac7e66..5b7295d6 100644
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -35,7 +35,7 @@ var fTest = flag.Bool("test", false, "gather metrics, print them out, and exit")
 var fConfig = flag.String("config", "", "configuration file to load")
 var fConfigDirectory = flag.String("config-directory", "",
 	"directory containing additional *.conf files")
-var fVersion = flag.Bool("version", false, "display the version")
+var fVersion = flag.Bool("version", false, "display the version and exit")
 var fSampleConfig = flag.Bool("sample-config", false,
 	"print out full sample configuration")
 var fPidfile = flag.String("pidfile", "", "file to write our pid to")
@@ -54,7 +54,7 @@ var fProcessorFilters = flag.String("processor-filter", "",
 var fUsage = flag.String("usage", "",
 	"print usage for a plugin, ie, 'telegraf --usage mysql'")
 var fService = flag.String("service", "",
-	"operate on the service")
+	"operate on the service (windows only)")
 var fRunAsConsole = flag.Bool("console", false, "run as console application (windows only)")
 
 var (
diff --git a/internal/usage.go b/internal/usage.go
index 4c00d8f8..99db5aeb 100644
--- a/internal/usage.go
+++ b/internal/usage.go
@@ -13,15 +13,22 @@ 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
+  --aggregator-filter <filter>   filter the aggregators to enable, separator is :
+  --config <file>                configuration file to load
+  --config-directory <directory> directory containing additional *.conf files
+  --debug                        turn on debug logging
+  --input-filter <filter>        filter the inputs to enable, separator is :
+  --input-list                   print available input plugins.
+  --output-filter <filter>       filter the outputs to enable, separator is :
+  --output-list                  print available output plugins.
+  --pidfile <file>               file to write our pid to
+  --pprof-addr <address>         pprof address to listen on, don't activate pprof if empty
+  --processor-filter <filter>    filter the processors to enable, separator is :
+  --quiet                        run in quiet mode
+  --sample-config                print out full sample configuration
+  --test                         gather metrics, print them out, and exit
+  --usage <plugin>               print usage for a plugin, ie, 'telegraf --usage mysql'
+  --version                      display the version and exit
 
 Examples:
 
diff --git a/internal/usage_windows.go b/internal/usage_windows.go
index 109d309e..585c2996 100644
--- a/internal/usage_windows.go
+++ b/internal/usage_windows.go
@@ -13,18 +13,25 @@ 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
+  --aggregator-filter <filter>   filter the aggregators to enable, separator is :
+  --config <file>                configuration file to load
+  --config-directory <directory> directory containing additional *.conf files
+  --debug                        turn on debug logging
+  --input-filter <filter>        filter the inputs to enable, separator is :
+  --input-list                   print available input plugins.
+  --output-filter <filter>       filter the outputs to enable, separator is :
+  --output-list                  print available output plugins.
+  --pidfile <file>               file to write our pid to
+  --pprof-addr <address>         pprof address to listen on, don't activate pprof if empty
+  --processor-filter <filter>    filter the processors to enable, separator is :
+  --quiet                        run in quiet mode
+  --sample-config                print out full sample configuration
+  --test                         gather metrics, print them out, and exit
+  --usage <plugin>               print usage for a plugin, ie, 'telegraf --usage mysql'
+  --version                      display the version and exit
 
-  --console           run as console application
-  --service           operate on service, one of: install, uninstall, start, stop
+  --console                      run as console application (windows only)
+  --service <service>            operate on the service (windows only)
 
 Examples:
 

From 1ca17652cda94b731473e52315a311653f3a200b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 10 Sep 2018 11:55:08 -0700
Subject: [PATCH 757/835] Fix parsing and documentation for json_string_fields
 (#4656)

---
 docs/DATA_FORMATS_INPUT.md | 10 +++++-----
 internal/config/config.go  |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/DATA_FORMATS_INPUT.md b/docs/DATA_FORMATS_INPUT.md
index 235e3b30..e0358e95 100644
--- a/docs/DATA_FORMATS_INPUT.md
+++ b/docs/DATA_FORMATS_INPUT.md
@@ -108,11 +108,11 @@ but can be overridden using the `name_override` config option.
 
 #### JSON Configuration:
 
-The JSON data format supports specifying "tag_keys", "string_keys", and "json_query".
-If specified, keys in "tag_keys" and "string_keys" will be searched for in the root-level
+The JSON data format supports specifying "tag_keys", "json_string_fields", and "json_query".
+If specified, keys in "tag_keys" and "json_string_fields" will be searched for in the root-level
 and any nested lists of the JSON blob. All int and float values are added to fields by default.
 If the key(s) exist, they will be applied as tags or fields to the Telegraf metrics.
-If "string_keys" is specified, the string will be added as a field.
+If "json_string_fields" is specified, the string will be added as a field.
 
 The "json_query" configuration is a gjson path to an JSON object or
 list of JSON objects. If this path leads to an array of values or
@@ -225,7 +225,7 @@ For example, if the following configuration:
   ]
 
   ## List of field names to extract from JSON and add as string fields
-  # string_fields = []
+  # json_string_fields = []
 
   ## gjson query path to specify a specific chunk of JSON to be parsed with
   ## the above configuration. If not specified, the whole file will be parsed
@@ -293,7 +293,7 @@ For example, with the following config:
   tag_keys = ["first"]
 
   ## List of field names to extract from JSON and add as string fields
-  string_fields = ["last"]
+  json_string_fields = ["last"]
 
   ## gjson query path to specify a specific chunk of JSON to be parsed with
   ## the above configuration. If not specified, the whole file will be parsed
diff --git a/internal/config/config.go b/internal/config/config.go
index c712af85..e10a5fc4 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -1563,11 +1563,11 @@ func buildParser(name string, tbl *ast.Table) (parsers.Parser, error) {
 	delete(tbl.Fields, "separator")
 	delete(tbl.Fields, "templates")
 	delete(tbl.Fields, "tag_keys")
-	delete(tbl.Fields, "string_fields")
-	delete(tbl.Fields, "json_query")
 	delete(tbl.Fields, "json_name_key")
-	delete(tbl.Fields, "json_time_key")
+	delete(tbl.Fields, "json_query")
+	delete(tbl.Fields, "json_string_fields")
 	delete(tbl.Fields, "json_time_format")
+	delete(tbl.Fields, "json_time_key")
 	delete(tbl.Fields, "data_type")
 	delete(tbl.Fields, "collectd_auth_file")
 	delete(tbl.Fields, "collectd_security_level")

From eb36e8f4964b68859f420503232bcab4f65eb76f Mon Sep 17 00:00:00 2001
From: Greg <g2linton@gmail.com>
Date: Mon, 10 Sep 2018 12:56:42 -0600
Subject: [PATCH 758/835] Add options for basic auth to haproxy input (#4657)

---
 plugins/inputs/haproxy/haproxy.go | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/plugins/inputs/haproxy/haproxy.go b/plugins/inputs/haproxy/haproxy.go
index 19087a97..9c22acad 100644
--- a/plugins/inputs/haproxy/haproxy.go
+++ b/plugins/inputs/haproxy/haproxy.go
@@ -23,6 +23,8 @@ import (
 type haproxy struct {
 	Servers        []string
 	KeepFieldNames bool
+	Username       string
+	Password       string
 	tls.ClientConfig
 
 	client *http.Client
@@ -37,6 +39,10 @@ var sampleConfig = `
   ## If no servers are specified, then default to 127.0.0.1:1936/haproxy?stats
   servers = ["http://myhaproxy.com:1936/haproxy?stats"]
 
+  ## Credentials for basic HTTP authentication
+  # username = "admin"
+  # password = "admin"
+
   ## 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.
@@ -163,6 +169,12 @@ func (g *haproxy) gatherServer(addr string, acc telegraf.Accumulator) error {
 	if u.User != nil {
 		p, _ := u.User.Password()
 		req.SetBasicAuth(u.User.Username(), p)
+		u.User = &url.Userinfo{}
+		addr = u.String()
+	}
+
+	if g.Username != "" || g.Password != "" {
+		req.SetBasicAuth(g.Username, g.Password)
 	}
 
 	res, err := g.client.Do(req)

From 3618f5dc984e65e79e14851fdc17620377159aa4 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 10 Sep 2018 12:34:05 -0700
Subject: [PATCH 759/835] Update changelog

---
 CHANGELOG.md | 6 ++++++
 README.md    | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 247ca4a5..d30531eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,11 +3,13 @@
 ### New Inputs
 
 - [activemq](./plugins/inputs/activemq/README.md) - Contributed by @mlabouardy
+- [beanstalkd](./plugins/inputs/beanstalkd/README.md) - Contributed by @44px
 - [filecount](./plugins/inputs/filecount/README.md) - Contributed by @sometimesfood
 - [file](./plugins/inputs/file/README.md) - Contributed by @maxunt
 - [icinga2](./plugins/inputs/icinga2/README.md) - Contributed by @mlabouardy
 - [kibana](./plugins/inputs/icinga2/README.md) - Contributed by @lpic10
 - [pgbouncer](./plugins/inputs/pgbouncer/README.md) - Contributed by @nerzhul
+- [temp](./plugins/inputs/temp/README.md) - Contributed by @pytimer
 - [tengine](./plugins/inputs/tengine/README.md) - Contributed by @ertaoxu
 - [x509_cert](./plugins/inputs/x509_cert/README.md) - Contributed by @jtyr
 
@@ -83,12 +85,16 @@
 - [#4476](https://github.com/influxdata/telegraf/pull/4476): Add strings processor.
 - [#4536](https://github.com/influxdata/telegraf/pull/4536): Add OAuth2 support to HTTP output plugin.
 - [#4633](https://github.com/influxdata/telegraf/pull/4633): Add Unix epoch timestamp support for JSON parser.
+- [#4657](https://github.com/influxdata/telegraf/pull/4657): Add options for basic auth to haproxy input.
+- [#4411](https://github.com/influxdata/telegraf/pull/4411): Add temp input plugin.
+- [#4272](https://github.com/influxdata/telegraf/pull/4272): Add Beanstalkd input plugin.
 
 ### Bugfixes
 
 - [#3438](https://github.com/influxdata/telegraf/issues/3438): Fix divide by zero in logparser input.
 - [#4499](https://github.com/influxdata/telegraf/issues/4499): Fix instance and object name in performance counters with backslashes.
 - [#4646](https://github.com/influxdata/telegraf/issues/4646): Reset/flush saved contents from bad metric.
+- [#4520](https://github.com/influxdata/telegraf/issues/4520): Document all supported cli arguments.
 
 ## v1.7.4 [2018-08-29]
 
diff --git a/README.md b/README.md
index 00dc8ecf..7ac997ff 100644
--- a/README.md
+++ b/README.md
@@ -134,6 +134,7 @@ configuration options.
 * [aurora](./plugins/inputs/aurora)
 * [aws cloudwatch](./plugins/inputs/cloudwatch)
 * [bcache](./plugins/inputs/bcache)
+* [beanstalkd](./plugins/inputs/beanstalkd)
 * [bond](./plugins/inputs/bond)
 * [burrow](./plugins/inputs/burrow)
 * [cassandra](./plugins/inputs/cassandra) (deprecated, use [jolokia2](./plugins/inputs/jolokia2))
@@ -242,6 +243,7 @@ configuration options.
 * [sysstat](./plugins/inputs/sysstat)
 * [system](./plugins/inputs/system)
 * [tail](./plugins/inputs/tail)
+* [temp](./plugins/inputs/temp)
 * [tcp_listener](./plugins/inputs/socket_listener)
 * [teamspeak](./plugins/inputs/teamspeak)
 * [tengine](./plugins/inputs/tengine)

From 23a8498963f7c06afb2ed6fd9389e882d70ee8a3 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 10 Sep 2018 15:14:14 -0700
Subject: [PATCH 760/835] Fix locking if output is an AggregatingOutput

---
 internal/models/running_output.go | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/internal/models/running_output.go b/internal/models/running_output.go
index c926917d..01420245 100644
--- a/internal/models/running_output.go
+++ b/internal/models/running_output.go
@@ -94,6 +94,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) {
+	ro.Lock()
+	defer ro.Unlock()
+
 	if m == nil {
 		return
 	}
@@ -115,8 +118,6 @@ func (ro *RunningOutput) AddMetric(m telegraf.Metric) {
 	}
 
 	if output, ok := ro.Output.(telegraf.AggregatingOutput); ok {
-		ro.Lock()
-		defer ro.Unlock()
 		output.Add(m)
 		return
 	}
@@ -134,6 +135,9 @@ func (ro *RunningOutput) AddMetric(m telegraf.Metric) {
 
 // Write writes all cached points to this output.
 func (ro *RunningOutput) Write() error {
+	ro.Lock()
+	defer ro.Unlock()
+
 	if output, ok := ro.Output.(telegraf.AggregatingOutput); ok {
 		metrics := output.Push()
 		ro.metrics.Add(metrics...)
@@ -188,8 +192,6 @@ 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 ed28cfb9f6baddbeaa53a52dce75be099fb6e1ef Mon Sep 17 00:00:00 2001
From: Greg <g2linton@gmail.com>
Date: Mon, 10 Sep 2018 17:45:36 -0600
Subject: [PATCH 761/835] Add means to specify server password for redis input
 (#4669)

---
 plugins/inputs/redis/redis.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/redis/redis.go b/plugins/inputs/redis/redis.go
index 766463cf..cd438397 100644
--- a/plugins/inputs/redis/redis.go
+++ b/plugins/inputs/redis/redis.go
@@ -18,7 +18,8 @@ import (
 )
 
 type Redis struct {
-	Servers []string
+	Servers  []string
+	Password string
 	tls.ClientConfig
 
 	clients     []Client
@@ -59,6 +60,9 @@ var sampleConfig = `
   ## If no port is specified, 6379 is used
   servers = ["tcp://localhost:6379"]
 
+  ## specify server password
+  # password = "s#cr@t%"
+
   ## Optional TLS Config
   # tls_ca = "/etc/telegraf/ca.pem"
   # tls_cert = "/etc/telegraf/cert.pem"
@@ -110,6 +114,9 @@ func (r *Redis) init(acc telegraf.Accumulator) error {
 				password = pw
 			}
 		}
+		if len(r.Password) > 0 {
+			password = r.Password
+		}
 
 		var address string
 		if u.Scheme == "unix" {

From c0485a50eedfc7c5b6af94bdd4a83c48fc5697c0 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 10 Sep 2018 16:46:39 -0700
Subject: [PATCH 762/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d30531eb..a49c22db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -88,6 +88,7 @@
 - [#4657](https://github.com/influxdata/telegraf/pull/4657): Add options for basic auth to haproxy input.
 - [#4411](https://github.com/influxdata/telegraf/pull/4411): Add temp input plugin.
 - [#4272](https://github.com/influxdata/telegraf/pull/4272): Add Beanstalkd input plugin.
+- [#4669](https://github.com/influxdata/telegraf/pull/4669): Add means to specify server password for redis input.
 
 ### Bugfixes
 

From e85a9e09565949c204ef522b4dc3f9a27bfc7a6d Mon Sep 17 00:00:00 2001
From: Jesse <jessec.cameron@gmail.com>
Date: Tue, 11 Sep 2018 12:32:12 +1000
Subject: [PATCH 763/835] Add Zookeeper Jolokia2 example config (#4659)

---
 plugins/inputs/jolokia2/README.md              |  1 +
 .../inputs/jolokia2/examples/zookeeper.conf    | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 plugins/inputs/jolokia2/examples/zookeeper.conf

diff --git a/plugins/inputs/jolokia2/README.md b/plugins/inputs/jolokia2/README.md
index 1efc59f1..190e6627 100644
--- a/plugins/inputs/jolokia2/README.md
+++ b/plugins/inputs/jolokia2/README.md
@@ -181,5 +181,6 @@ Both `jolokia2_agent` and `jolokia2_proxy` plugins support default configuration
 - [Kafka](/plugins/inputs/jolokia2/examples/kafka.conf)
 - [Tomcat](/plugins/inputs/jolokia2/examples/tomcat.conf)
 - [Weblogic](/plugins/inputs/jolokia2/examples/weblogic.conf)
+- [ZooKeeper](/plugins/inputs/jolokia2/examples/zookeeper.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/zookeeper.conf b/plugins/inputs/jolokia2/examples/zookeeper.conf
new file mode 100644
index 00000000..eac29c28
--- /dev/null
+++ b/plugins/inputs/jolokia2/examples/zookeeper.conf
@@ -0,0 +1,18 @@
+[[inputs.jolokia2_agent]]
+  urls = ["http://localhost:8080/jolokia"]
+  name_prefix = "zk_"
+
+  [[inputs.jolokia2_agent.metrics]]
+    name  = "quorum"
+    mbean = "org.apache.ZooKeeperService:name0=*"
+    tag_keys = ["name0"]
+
+  [[inputs.jolokia2_agent.metrics]]
+    name = "leader"
+    mbean = "org.apache.ZooKeeperService:name0=*,name1=*,name2=Leader"
+    tag_keys = ["name1"]
+
+  [[inputs.jolokia2_agent.metrics]]
+    name = "follower"
+    mbean = "org.apache.ZooKeeperService:name0=*,name1=*,name2=Follower"
+    tag_keys = ["name1"]

From c80aab0445446ea9b7791e15abab8b6c863e4c1d Mon Sep 17 00:00:00 2001
From: Lance O'Connor <lance@ronnoco.net>
Date: Tue, 11 Sep 2018 13:01:08 -0700
Subject: [PATCH 764/835] Add Splunk Metrics serializer (#4339)

---
 docs/DATA_FORMATS_OUTPUT.md                   |   1 +
 internal/config/config.go                     |  13 ++
 plugins/serializers/registry.go               |  10 +
 plugins/serializers/splunkmetric/README.md    | 139 +++++++++++++
 .../serializers/splunkmetric/splunkmetric.go  | 126 ++++++++++++
 .../splunkmetric/splunkmetric_test.go         | 182 ++++++++++++++++++
 6 files changed, 471 insertions(+)
 create mode 100644 plugins/serializers/splunkmetric/README.md
 create mode 100644 plugins/serializers/splunkmetric/splunkmetric.go
 create mode 100644 plugins/serializers/splunkmetric/splunkmetric_test.go

diff --git a/docs/DATA_FORMATS_OUTPUT.md b/docs/DATA_FORMATS_OUTPUT.md
index f4e41c25..60902165 100644
--- a/docs/DATA_FORMATS_OUTPUT.md
+++ b/docs/DATA_FORMATS_OUTPUT.md
@@ -7,6 +7,7 @@ plugins.
 1. [InfluxDB Line Protocol](#influx)
 1. [JSON](#json)
 1. [Graphite](#graphite)
+1. [SplunkMetric](../plugins/serializers/splunkmetric/README.md)
 
 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:
diff --git a/internal/config/config.go b/internal/config/config.go
index e10a5fc4..2208268d 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -1693,6 +1693,18 @@ func buildSerializer(name string, tbl *ast.Table) (serializers.Serializer, error
 		}
 	}
 
+	if node, ok := tbl.Fields["splunkmetric_hec_routing"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if b, ok := kv.Value.(*ast.Boolean); ok {
+				var err error
+				c.HecRouting, err = b.Boolean()
+				if err != nil {
+					return nil, err
+				}
+			}
+		}
+	}
+
 	delete(tbl.Fields, "influx_max_line_bytes")
 	delete(tbl.Fields, "influx_sort_fields")
 	delete(tbl.Fields, "influx_uint_support")
@@ -1701,6 +1713,7 @@ func buildSerializer(name string, tbl *ast.Table) (serializers.Serializer, error
 	delete(tbl.Fields, "prefix")
 	delete(tbl.Fields, "template")
 	delete(tbl.Fields, "json_timestamp_units")
+	delete(tbl.Fields, "splunkmetric_hec_routing")
 	return serializers.NewSerializer(c)
 }
 
diff --git a/plugins/serializers/registry.go b/plugins/serializers/registry.go
index 277d3320..b8a0aef0 100644
--- a/plugins/serializers/registry.go
+++ b/plugins/serializers/registry.go
@@ -9,6 +9,7 @@ import (
 	"github.com/influxdata/telegraf/plugins/serializers/graphite"
 	"github.com/influxdata/telegraf/plugins/serializers/influx"
 	"github.com/influxdata/telegraf/plugins/serializers/json"
+	"github.com/influxdata/telegraf/plugins/serializers/splunkmetric"
 )
 
 // SerializerOutput is an interface for output plugins that are able to
@@ -60,6 +61,9 @@ type Config struct {
 
 	// Timestamp units to use for JSON formatted output
 	TimestampUnits time.Duration
+
+	// Include HEC routing fields for splunkmetric output
+	HecRouting bool
 }
 
 // NewSerializer a Serializer interface based on the given config.
@@ -73,6 +77,8 @@ func NewSerializer(config *Config) (Serializer, error) {
 		serializer, err = NewGraphiteSerializer(config.Prefix, config.Template, config.GraphiteTagSupport)
 	case "json":
 		serializer, err = NewJsonSerializer(config.TimestampUnits)
+	case "splunkmetric":
+		serializer, err = NewSplunkmetricSerializer(config.HecRouting)
 	default:
 		err = fmt.Errorf("Invalid data format: %s", config.DataFormat)
 	}
@@ -83,6 +89,10 @@ func NewJsonSerializer(timestampUnits time.Duration) (Serializer, error) {
 	return json.NewSerializer(timestampUnits)
 }
 
+func NewSplunkmetricSerializer(splunkmetric_hec_routing bool) (Serializer, error) {
+	return splunkmetric.NewSerializer(splunkmetric_hec_routing)
+}
+
 func NewInfluxSerializerConfig(config *Config) (Serializer, error) {
 	var sort influx.FieldSortOrder
 	if config.InfluxSortFields {
diff --git a/plugins/serializers/splunkmetric/README.md b/plugins/serializers/splunkmetric/README.md
new file mode 100644
index 00000000..02d69db6
--- /dev/null
+++ b/plugins/serializers/splunkmetric/README.md
@@ -0,0 +1,139 @@
+# Splunk Metrics serializer
+
+This serializer formats and outputs the metric data in a format that can be consumed by a Splunk metrics index.
+It can be used to write to a file using the file output, or for sending metrics to a HEC using the standard telegraf HTTP output.
+
+If you're using the HTTP output, this serializer knows how to batch the metrics so you don't end up with an HTTP POST per metric.
+
+Th data is output in a format that conforms to the specified Splunk HEC JSON format as found here:
+[Send metrics in JSON format](http://dev.splunk.com/view/event-collector/SP-CAAAFDN).
+
+An example event looks like:
+```javascript
+{
+  "time": 1529708430,
+  "event": "metric",
+  "host": "patas-mbp",
+  "fields": {
+    "_value": 0.6,
+    "cpu": "cpu0",
+    "dc": "mobile",
+    "metric_name": "cpu.usage_user",
+    "user": "ronnocol"
+  }
+}
+```
+In the above snippet, the following keys are dimensions:
+* cpu
+* dc
+* user
+
+## Using with the HTTP output
+
+To send this data to a Splunk HEC, you can use the HTTP output, there are some custom headers that you need to add
+to manage the HEC authorization, here's a sample config for an HTTP output:
+
+```toml
+[[outputs.http]]
+   ## URL is the address to send metrics to
+   url = "https://localhost:8088/services/collector"
+
+   ## Timeout for HTTP message
+   # timeout = "5s"
+
+   ## HTTP method, one of: "POST" or "PUT"
+   # method = "POST"
+
+   ## HTTP Basic Auth credentials
+   # 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
+
+   ## 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 = "splunkmetric"
+    ## Provides time, index, source overrides for the HEC
+   splunkmetric_hec_routing = true
+
+   ## Additional HTTP headers
+    [outputs.http.headers]
+   # Should be set manually to "application/json" for json data_format
+      Content-Type = "application/json"
+      Authorization = "Splunk xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+      X-Splunk-Request-Channel = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+```
+
+## Overrides
+You can override the default values for the HEC token you are using by adding additional tags to the config file.
+
+The following aspects of the token can be overriden with tags:
+* index
+* source
+
+You can either use `[global_tags]` or using a more advanced configuration as documented [here](https://github.com/influxdata/telegraf/blob/master/docs/CONFIGURATION.md).
+ 
+Such as this example which overrides the index just on the cpu metric:
+```toml
+[[inputs.cpu]]
+  percpu = false
+  totalcpu = true
+  [inputs.cpu.tags]
+    index = "cpu_metrics"
+```
+
+## Using with the File output
+
+You can use the file output when running telegraf on a machine with a Splunk forwarder.
+
+A sample event when `hec_routing` is false (or unset) looks like:
+```javascript
+{
+    "_value": 0.6,
+    "cpu": "cpu0",
+    "dc": "mobile",
+    "metric_name": "cpu.usage_user",
+    "user": "ronnocol",
+    "time": 1529708430
+}
+```
+Data formatted in this manner can be ingested with a simple `props.conf` file that
+looks like this:
+
+```ini
+[telegraf]
+category = Metrics
+description = Telegraf Metrics
+pulldown_type = 1
+DATETIME_CONFIG =
+NO_BINARY_CHECK = true
+SHOULD_LINEMERGE = true
+disabled = false
+INDEXED_EXTRACTIONS = json
+KV_MODE = none
+TIMESTAMP_FIELDS = time
+TIME_FORMAT = %s.%3N
+```
+
+An example configuration of a file based output is: 
+
+```toml
+ # Send telegraf metrics to file(s)
+[[outputs.file]]
+   ## Files to write to, "stdout" is a specially handled file.
+   files = ["/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 = "splunkmetric"
+   hec_routing = false
+```
diff --git a/plugins/serializers/splunkmetric/splunkmetric.go b/plugins/serializers/splunkmetric/splunkmetric.go
new file mode 100644
index 00000000..77de49ee
--- /dev/null
+++ b/plugins/serializers/splunkmetric/splunkmetric.go
@@ -0,0 +1,126 @@
+package splunkmetric
+
+import (
+	"encoding/json"
+	"fmt"
+	"log"
+
+	"github.com/influxdata/telegraf"
+)
+
+type serializer struct {
+	HecRouting bool
+}
+
+func NewSerializer(splunkmetric_hec_routing bool) (*serializer, error) {
+	s := &serializer{
+		HecRouting: splunkmetric_hec_routing,
+	}
+	return s, nil
+}
+
+func (s *serializer) Serialize(metric telegraf.Metric) ([]byte, error) {
+
+	m, err := s.createObject(metric)
+	if err != nil {
+		return nil, fmt.Errorf("D! [serializer.splunkmetric] Dropping invalid metric: %s", metric.Name())
+	}
+
+	return m, nil
+}
+
+func (s *serializer) SerializeBatch(metrics []telegraf.Metric) ([]byte, error) {
+
+	var serialized []byte
+
+	for _, metric := range metrics {
+		m, err := s.createObject(metric)
+		if err != nil {
+			return nil, fmt.Errorf("D! [serializer.splunkmetric] Dropping invalid metric: %s", metric.Name())
+		} else if m != nil {
+			serialized = append(serialized, m...)
+		}
+	}
+
+	return serialized, nil
+}
+
+func (s *serializer) createObject(metric telegraf.Metric) (metricGroup []byte, err error) {
+
+	/*  Splunk supports one metric json object, and does _not_ support an array of JSON objects.
+	     ** Splunk has the following required names for the metric store:
+		 ** metric_name: The name of the metric
+		 ** _value:      The value for the metric
+		 ** time:       The timestamp for the metric
+		 ** All other index fields become deminsions.
+	*/
+	type HECTimeSeries struct {
+		Time   float64                `json:"time"`
+		Event  string                 `json:"event"`
+		Host   string                 `json:"host,omitempty"`
+		Index  string                 `json:"index,omitempty"`
+		Source string                 `json:"source,omitempty"`
+		Fields map[string]interface{} `json:"fields"`
+	}
+
+	dataGroup := HECTimeSeries{}
+	var metricJson []byte
+
+	for _, field := range metric.FieldList() {
+
+		if !verifyValue(field.Value) {
+			log.Printf("D! Can not parse value: %v for key: %v", field.Value, field.Key)
+			continue
+		}
+
+		obj := map[string]interface{}{}
+		obj["metric_name"] = metric.Name() + "." + field.Key
+		obj["_value"] = field.Value
+
+		dataGroup.Event = "metric"
+		// Convert ns to float seconds since epoch.
+		dataGroup.Time = float64(metric.Time().UnixNano()) / float64(1000000000)
+		dataGroup.Fields = obj
+
+		// Break tags out into key(n)=value(t) pairs
+		for n, t := range metric.Tags() {
+			if n == "host" {
+				dataGroup.Host = t
+			} else if n == "index" {
+				dataGroup.Index = t
+			} else if n == "source" {
+				dataGroup.Source = t
+			} else {
+				dataGroup.Fields[n] = t
+			}
+		}
+		dataGroup.Fields["metric_name"] = metric.Name() + "." + field.Key
+		dataGroup.Fields["_value"] = field.Value
+
+		switch s.HecRouting {
+		case true:
+			// Output the data as a fields array and host,index,time,source overrides for the HEC.
+			metricJson, err = json.Marshal(dataGroup)
+		default:
+			// Just output the data and the time, useful for file based outuputs
+			dataGroup.Fields["time"] = dataGroup.Time
+			metricJson, err = json.Marshal(dataGroup.Fields)
+		}
+
+		metricGroup = append(metricGroup, metricJson...)
+
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return metricGroup, nil
+}
+
+func verifyValue(v interface{}) bool {
+	switch v.(type) {
+	case string:
+		return false
+	}
+	return true
+}
diff --git a/plugins/serializers/splunkmetric/splunkmetric_test.go b/plugins/serializers/splunkmetric/splunkmetric_test.go
new file mode 100644
index 00000000..f3825d80
--- /dev/null
+++ b/plugins/serializers/splunkmetric/splunkmetric_test.go
@@ -0,0 +1,182 @@
+package splunkmetric
+
+import (
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+
+	"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) {
+	// Test sub-second time
+	now := time.Unix(1529875740, 819000000)
+	tags := map[string]string{
+		"cpu": "cpu0",
+	}
+	fields := map[string]interface{}{
+		"usage_idle": float64(91.5),
+	}
+	m, err := metric.New("cpu", tags, fields, now)
+	assert.NoError(t, err)
+
+	s, _ := NewSerializer(false)
+	var buf []byte
+	buf, err = s.Serialize(m)
+	assert.NoError(t, err)
+	expS := `{"_value":91.5,"cpu":"cpu0","metric_name":"cpu.usage_idle","time":1529875740.819}`
+	assert.Equal(t, string(expS), string(buf))
+}
+
+func TestSerializeMetricFloatHec(t *testing.T) {
+	// Test sub-second time
+	now := time.Unix(1529875740, 819000000)
+	tags := map[string]string{
+		"cpu": "cpu0",
+	}
+	fields := map[string]interface{}{
+		"usage_idle": float64(91.5),
+	}
+	m, err := metric.New("cpu", tags, fields, now)
+	assert.NoError(t, err)
+
+	s, _ := NewSerializer(true)
+	var buf []byte
+	buf, err = s.Serialize(m)
+	assert.NoError(t, err)
+	expS := `{"time":1529875740.819,"event":"metric","fields":{"_value":91.5,"cpu":"cpu0","metric_name":"cpu.usage_idle"}}`
+	assert.Equal(t, string(expS), string(buf))
+}
+
+func TestSerializeMetricInt(t *testing.T) {
+	now := time.Unix(0, 0)
+	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, _ := NewSerializer(false)
+	var buf []byte
+	buf, err = s.Serialize(m)
+	assert.NoError(t, err)
+
+	expS := `{"_value":90,"cpu":"cpu0","metric_name":"cpu.usage_idle","time":0}`
+	assert.Equal(t, string(expS), string(buf))
+}
+
+func TestSerializeMetricIntHec(t *testing.T) {
+	now := time.Unix(0, 0)
+	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, _ := NewSerializer(true)
+	var buf []byte
+	buf, err = s.Serialize(m)
+	assert.NoError(t, err)
+
+	expS := `{"time":0,"event":"metric","fields":{"_value":90,"cpu":"cpu0","metric_name":"cpu.usage_idle"}}`
+	assert.Equal(t, string(expS), string(buf))
+}
+
+func TestSerializeMetricString(t *testing.T) {
+	now := time.Unix(0, 0)
+	tags := map[string]string{
+		"cpu": "cpu0",
+	}
+	fields := map[string]interface{}{
+		"processorType": "ARMv7 Processor rev 4 (v7l)",
+		"usage_idle":    int64(5),
+	}
+	m, err := metric.New("cpu", tags, fields, now)
+	assert.NoError(t, err)
+
+	s, _ := NewSerializer(false)
+	var buf []byte
+	buf, err = s.Serialize(m)
+	assert.NoError(t, err)
+
+	expS := `{"_value":5,"cpu":"cpu0","metric_name":"cpu.usage_idle","time":0}`
+	assert.Equal(t, string(expS), string(buf))
+	assert.NoError(t, err)
+}
+
+func TestSerializeBatch(t *testing.T) {
+	m := MustMetric(
+		metric.New(
+			"cpu",
+			map[string]string{},
+			map[string]interface{}{
+				"value": 42.0,
+			},
+			time.Unix(0, 0),
+		),
+	)
+	n := MustMetric(
+		metric.New(
+			"cpu",
+			map[string]string{},
+			map[string]interface{}{
+				"value": 92.0,
+			},
+			time.Unix(0, 0),
+		),
+	)
+
+	metrics := []telegraf.Metric{m, n}
+	s, _ := NewSerializer(false)
+	buf, err := s.SerializeBatch(metrics)
+	assert.NoError(t, err)
+
+	expS := `{"_value":42,"metric_name":"cpu.value","time":0}` + `{"_value":92,"metric_name":"cpu.value","time":0}`
+	assert.Equal(t, string(expS), string(buf))
+}
+
+func TestSerializeBatchHec(t *testing.T) {
+	m := MustMetric(
+		metric.New(
+			"cpu",
+			map[string]string{},
+			map[string]interface{}{
+				"value": 42.0,
+			},
+			time.Unix(0, 0),
+		),
+	)
+	n := MustMetric(
+		metric.New(
+			"cpu",
+			map[string]string{},
+			map[string]interface{}{
+				"value": 92.0,
+			},
+			time.Unix(0, 0),
+		),
+	)
+
+	metrics := []telegraf.Metric{m, n}
+	s, _ := NewSerializer(true)
+	buf, err := s.SerializeBatch(metrics)
+	assert.NoError(t, err)
+
+	expS := `{"time":0,"event":"metric","fields":{"_value":42,"metric_name":"cpu.value"}}` + `{"time":0,"event":"metric","fields":{"_value":92,"metric_name":"cpu.value"}}`
+	assert.Equal(t, string(expS), string(buf))
+}

From 54446132288182b561697714178963b7e5fab3cc Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 11 Sep 2018 13:22:07 -0700
Subject: [PATCH 765/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a49c22db..37885ec0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,7 @@
 ### New Processors
 
 - [enum](./plugins/processors/enum/README.md) - Contributed by @KarstenSchnitter
-- [parser](./plugins/processors/parser/README.md) - Contributed by @maxunt & @Ayrdrie
+- [parser](./plugins/processors/parser/README.md) - Contributed by @Ayrdrie & @maxunt
 - [rename](./plugins/processors/rename/README.md) - Contributed by @goldibex
 - [strings](./plugins/processors/strings/README.md) - Contributed by @bsmaldon
 
@@ -28,6 +28,16 @@
 
 - [azure_monitor](./plugins/outputs/azure_monitor/README.md) - Contributed by @influxdata
 
+### New Parsers
+
+- [csv](/docs/DATA_FORMATS_INPUT.md#csv) - Contributed by @maxunt
+- [grok](/docs/DATA_FORMATS_INPUT.md#grok) - Contributed by @maxunt
+- [logfmt](/docs/DATA_FORMATS_INPUT.md#logfmt) - Contributed by @Ayrdrie & @maxunt
+
+### New Serializers
+
+- [splunkmetric](/plugins/serializer/splunkmetric/README.md) - Contributed by @ronnocol
+
 ### Features
 
 - [#4236](https://github.com/influxdata/telegraf/pull/4236): Add SSL/TLS support to redis input.
@@ -89,6 +99,7 @@
 - [#4411](https://github.com/influxdata/telegraf/pull/4411): Add temp input plugin.
 - [#4272](https://github.com/influxdata/telegraf/pull/4272): Add Beanstalkd input plugin.
 - [#4669](https://github.com/influxdata/telegraf/pull/4669): Add means to specify server password for redis input.
+- [#4339](https://github.com/influxdata/telegraf/pull/4339): Add Splunk Metrics serializer
 
 ### Bugfixes
 

From 85c004bb056c078ab1216163488fed5d967159a7 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 11 Sep 2018 13:38:57 -0700
Subject: [PATCH 766/835] Fix documentation link

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37885ec0..cf05e931 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,7 +36,7 @@
 
 ### New Serializers
 
-- [splunkmetric](/plugins/serializer/splunkmetric/README.md) - Contributed by @ronnocol
+- [splunkmetric](/plugins/serializers/splunkmetric/README.md) - Contributed by @ronnocol
 
 ### Features
 

From fa1c572096376727ca46b7ae5620ee890af93c01 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 11 Sep 2018 13:52:13 -0700
Subject: [PATCH 767/835] Add link to line protocol in data fromat docs

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

diff --git a/docs/DATA_FORMATS_INPUT.md b/docs/DATA_FORMATS_INPUT.md
index e0358e95..ff916081 100644
--- a/docs/DATA_FORMATS_INPUT.md
+++ b/docs/DATA_FORMATS_INPUT.md
@@ -14,9 +14,10 @@ Telegraf is able to parse the following input data formats into metrics:
 1. [Wavefront](#wavefront)
 1. [CSV](#csv)
 
-Telegraf metrics, like InfluxDB
-[points](https://docs.influxdata.com/influxdb/v0.10/write_protocols/line/),
-are a combination of four basic parts:
+Telegraf metrics, similar to InfluxDB's [points][influxdb key concepts], are a
+combination of four basic parts:
+
+[influxdb key concepts]: https://docs.influxdata.com/influxdb/v1.6/concepts/key_concepts/
 
 1. Measurement Name
 1. Tags
@@ -59,9 +60,11 @@ I'll go over below.
 
 # Influx:
 
-There are no additional configuration options for InfluxDB line-protocol. The
+There are no additional configuration options for InfluxDB [line protocol][]. The
 metrics are parsed directly into Telegraf metrics.
 
+[line protocol]: https://docs.influxdata.com/influxdb/latest/write_protocols/line/
+
 #### Influx Configuration:
 
 ```toml

From 5f3c331f79924514ad83f6f8ed4f44250c38b877 Mon Sep 17 00:00:00 2001
From: Pontus Rydin <prydin@vmware.com>
Date: Tue, 11 Sep 2018 17:53:46 -0400
Subject: [PATCH 768/835] Add input plugin for VMware vSphere (#4141)

---
 Gopkg.lock                             |  45 ++
 Gopkg.toml                             |   4 +
 plugins/inputs/all/all.go              |   1 +
 plugins/inputs/vsphere/METRICS.MD      | 287 +++++++++
 plugins/inputs/vsphere/README.MD       | 354 ++++++++++
 plugins/inputs/vsphere/client.go       | 175 +++++
 plugins/inputs/vsphere/endpoint.go     | 852 +++++++++++++++++++++++++
 plugins/inputs/vsphere/selfhealth.go   |  53 ++
 plugins/inputs/vsphere/vsphere.go      | 312 +++++++++
 plugins/inputs/vsphere/vsphere_test.go | 246 +++++++
 plugins/inputs/vsphere/workerpool.go   | 119 ++++
 11 files changed, 2448 insertions(+)
 create mode 100644 plugins/inputs/vsphere/METRICS.MD
 create mode 100644 plugins/inputs/vsphere/README.MD
 create mode 100644 plugins/inputs/vsphere/client.go
 create mode 100644 plugins/inputs/vsphere/endpoint.go
 create mode 100644 plugins/inputs/vsphere/selfhealth.go
 create mode 100644 plugins/inputs/vsphere/vsphere.go
 create mode 100644 plugins/inputs/vsphere/vsphere_test.go
 create mode 100644 plugins/inputs/vsphere/workerpool.go

diff --git a/Gopkg.lock b/Gopkg.lock
index b592346a..ed161e69 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -448,6 +448,14 @@
   revision = "3af367b6b30c263d47e8895973edcca9a49cf029"
   version = "v0.2.0"
 
+[[projects]]
+  digest = "1:c1d7e883c50a26ea34019320d8ae40fad86c9e5d56e63a1ba2cb618cef43e986"
+  name = "github.com/google/uuid"
+  packages = ["."]
+  pruneopts = ""
+  revision = "064e2069ce9c359c118179501254f67d7d37ba24"
+  version = "0.2"
+
 [[projects]]
   digest = "1:dbbeb8ddb0be949954c8157ee8439c2adfd8dc1c9510eb44a6e58cb68c3dce28"
   name = "github.com/gorilla/context"
@@ -949,6 +957,36 @@
   revision = "ce01e59abcf6fbc9833b7deb5e4b8ee1769bcc53"
   version = "v1.0.0"
 
+[[projects]]
+  digest = "1:f9fe29bf856d49f9a51d6001588cb5ee5d65c8a7ff5e8b0dd5423c3a510f0833"
+  name = "github.com/vmware/govmomi"
+  packages = [
+    ".",
+    "find",
+    "list",
+    "nfc",
+    "object",
+    "performance",
+    "property",
+    "session",
+    "simulator",
+    "simulator/esx",
+    "simulator/vpx",
+    "task",
+    "view",
+    "vim25",
+    "vim25/debug",
+    "vim25/methods",
+    "vim25/mo",
+    "vim25/progress",
+    "vim25/soap",
+    "vim25/types",
+    "vim25/xml",
+  ]
+  pruneopts = ""
+  revision = "e3a01f9611c32b2362366434bcd671516e78955d"
+  version = "v0.18.0"
+
 [[projects]]
   branch = "master"
   digest = "1:98ed05e9796df287b90c1d96854e3913c8e349dbc546412d3cabb472ecf4b417"
@@ -1329,6 +1367,13 @@
     "github.com/stretchr/testify/require",
     "github.com/tidwall/gjson",
     "github.com/vjeantet/grok",
+    "github.com/vmware/govmomi",
+    "github.com/vmware/govmomi/performance",
+    "github.com/vmware/govmomi/simulator",
+    "github.com/vmware/govmomi/view",
+    "github.com/vmware/govmomi/vim25/mo",
+    "github.com/vmware/govmomi/vim25/soap",
+    "github.com/vmware/govmomi/vim25/types",
     "github.com/wvanbergen/kafka/consumergroup",
     "github.com/zensqlmonitor/go-mssqldb",
     "golang.org/x/net/context",
diff --git a/Gopkg.toml b/Gopkg.toml
index b4576ed6..c8957839 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -223,6 +223,10 @@
   name = "gopkg.in/fsnotify.v1"
 
 [[constraint]]
+  name = "github.com/vmware/govmomi"
+  version = "0.18.0"
+
+ [[constraint]] 
   name = "github.com/Azure/go-autorest"
   version = "10.12.0"
 
diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index 9dcb0dbd..02008ffd 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -128,6 +128,7 @@ import (
 	_ "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/vsphere"
 	_ "github.com/influxdata/telegraf/plugins/inputs/webhooks"
 	_ "github.com/influxdata/telegraf/plugins/inputs/win_perf_counters"
 	_ "github.com/influxdata/telegraf/plugins/inputs/win_services"
diff --git a/plugins/inputs/vsphere/METRICS.MD b/plugins/inputs/vsphere/METRICS.MD
new file mode 100644
index 00000000..0b9e0482
--- /dev/null
+++ b/plugins/inputs/vsphere/METRICS.MD
@@ -0,0 +1,287 @@
+# Common vSphere Performance Metrics
+The set of performance metrics in vSphere is open ended. Metrics may be added or removed in new releases 
+and the set of available metrics may vary depending hardware, as well as what plugins and add-on products 
+are installed. Therefore, providing a definitive list of available metrics is difficult. The metrics listed 
+below are the most commonly available as of vSphere 6.5.
+
+To list the exact set in your environment, please use the govc tool available [here](https://github.com/vmware/govmomi/tree/master/govc)
+
+To obtain the set of metrics for e.g. a VM, you may use the following command:
+```
+govc metric.ls vm/*
+```
+
+## Virtual Machine Metrics
+```
+cpu.demandEntitlementRatio.latest
+cpu.usage.average
+cpu.ready.summation
+cpu.run.summation
+cpu.system.summation
+cpu.swapwait.summation
+cpu.costop.summation
+cpu.demand.average
+cpu.readiness.average
+cpu.maxlimited.summation
+cpu.wait.summation
+cpu.usagemhz.average
+cpu.latency.average
+cpu.used.summation
+cpu.overlap.summation
+cpu.idle.summation
+cpu.entitlement.latest
+datastore.maxTotalLatency.latest
+disk.usage.average
+disk.read.average
+disk.write.average
+disk.maxTotalLatency.latest
+mem.llSwapUsed.average
+mem.swapin.average
+mem.vmmemctltarget.average
+mem.activewrite.average
+mem.overhead.average
+mem.vmmemctl.average
+mem.zero.average
+mem.swapoutRate.average
+mem.active.average
+mem.llSwapOutRate.average
+mem.swapout.average
+mem.llSwapInRate.average
+mem.swapinRate.average
+mem.granted.average
+mem.latency.average
+mem.overheadMax.average
+mem.swapped.average
+mem.compressionRate.average
+mem.swaptarget.average
+mem.shared.average
+mem.zipSaved.latest
+mem.overheadTouched.average
+mem.zipped.latest
+mem.consumed.average
+mem.entitlement.average
+mem.usage.average
+mem.decompressionRate.average
+mem.compressed.average
+net.multicastRx.summation
+net.transmitted.average
+net.received.average
+net.usage.average
+net.broadcastTx.summation
+net.broadcastRx.summation
+net.packetsRx.summation
+net.pnicBytesRx.average
+net.multicastTx.summation
+net.bytesTx.average
+net.bytesRx.average
+net.droppedRx.summation
+net.pnicBytesTx.average
+net.droppedTx.summation
+net.packetsTx.summation
+power.power.average
+power.energy.summation
+rescpu.runpk1.latest
+rescpu.runpk15.latest
+rescpu.maxLimited5.latest
+rescpu.actpk5.latest
+rescpu.samplePeriod.latest
+rescpu.runav1.latest
+rescpu.runav15.latest
+rescpu.sampleCount.latest
+rescpu.actpk1.latest
+rescpu.runpk5.latest
+rescpu.runav5.latest
+rescpu.actav15.latest
+rescpu.actav1.latest
+rescpu.actpk15.latest
+rescpu.actav5.latest
+rescpu.maxLimited1.latest
+rescpu.maxLimited15.latest
+sys.osUptime.latest
+sys.uptime.latest
+sys.heartbeat.latest
+virtualDisk.write.average
+virtualDisk.read.average
+```
+
+## Host System Metrics
+```
+cpu.corecount.contention.average
+cpu.usage.average
+cpu.reservedCapacity.average
+cpu.usagemhz.minimum
+cpu.usagemhz.maximum
+cpu.usage.minimum
+cpu.usage.maximum
+cpu.capacity.provisioned.average
+cpu.capacity.usage.average
+cpu.capacity.demand.average
+cpu.capacity.contention.average
+cpu.corecount.provisioned.average
+cpu.corecount.usage.average
+cpu.usagemhz.average
+disk.throughput.contention.average
+disk.throughput.usage.average
+mem.decompressionRate.average
+mem.granted.average
+mem.active.average
+mem.shared.average
+mem.zero.average
+mem.swapused.average
+mem.vmmemctl.average
+mem.compressed.average
+mem.compressionRate.average
+mem.reservedCapacity.average
+mem.capacity.provisioned.average
+mem.capacity.usable.average
+mem.capacity.usage.average
+mem.capacity.entitlement.average
+mem.capacity.contention.average
+mem.usage.minimum
+mem.overhead.minimum
+mem.consumed.minimum
+mem.granted.minimum
+mem.active.minimum
+mem.shared.minimum
+mem.zero.minimum
+mem.swapused.minimum
+mem.consumed.average
+mem.usage.maximum
+mem.overhead.maximum
+mem.consumed.maximum
+mem.granted.maximum
+mem.overhead.average
+mem.shared.maximum
+mem.zero.maximum
+mem.swapused.maximum
+mem.vmmemctl.maximum
+mem.usage.average
+mem.active.maximum
+mem.vmmemctl.minimum
+net.throughput.contention.summation
+net.throughput.usage.average
+net.throughput.usable.average
+net.throughput.provisioned.average
+power.power.average
+power.powerCap.average
+power.energy.summation
+vmop.numShutdownGuest.latest
+vmop.numPoweroff.latest
+vmop.numSuspend.latest
+vmop.numReset.latest
+vmop.numRebootGuest.latest
+vmop.numStandbyGuest.latest
+vmop.numPoweron.latest
+vmop.numCreate.latest
+vmop.numDestroy.latest
+vmop.numRegister.latest
+vmop.numUnregister.latest
+vmop.numReconfigure.latest
+vmop.numClone.latest
+vmop.numDeploy.latest
+vmop.numChangeHost.latest
+vmop.numChangeDS.latest
+vmop.numChangeHostDS.latest
+vmop.numVMotion.latest
+vmop.numSVMotion.latest
+vmop.numXVMotion.latest
+```
+
+## Cluster Metrics
+```
+cpu.corecount.contention.average
+cpu.usage.average
+cpu.reservedCapacity.average
+cpu.usagemhz.minimum
+cpu.usagemhz.maximum
+cpu.usage.minimum
+cpu.usage.maximum
+cpu.capacity.provisioned.average
+cpu.capacity.usage.average
+cpu.capacity.demand.average
+cpu.capacity.contention.average
+cpu.corecount.provisioned.average
+cpu.corecount.usage.average
+cpu.usagemhz.average
+disk.throughput.contention.average
+disk.throughput.usage.average
+mem.decompressionRate.average
+mem.granted.average
+mem.active.average
+mem.shared.average
+mem.zero.average
+mem.swapused.average
+mem.vmmemctl.average
+mem.compressed.average
+mem.compressionRate.average
+mem.reservedCapacity.average
+mem.capacity.provisioned.average
+mem.capacity.usable.average
+mem.capacity.usage.average
+mem.capacity.entitlement.average
+mem.capacity.contention.average
+mem.usage.minimum
+mem.overhead.minimum
+mem.consumed.minimum
+mem.granted.minimum
+mem.active.minimum
+mem.shared.minimum
+mem.zero.minimum
+mem.swapused.minimum
+mem.consumed.average
+mem.usage.maximum
+mem.overhead.maximum
+mem.consumed.maximum
+mem.granted.maximum
+mem.overhead.average
+mem.shared.maximum
+mem.zero.maximum
+mem.swapused.maximum
+mem.vmmemctl.maximum
+mem.usage.average
+mem.active.maximum
+mem.vmmemctl.minimum
+net.throughput.contention.summation
+net.throughput.usage.average
+net.throughput.usable.average
+net.throughput.provisioned.average
+power.power.average
+power.powerCap.average
+power.energy.summation
+vmop.numShutdownGuest.latest
+vmop.numPoweroff.latest
+vmop.numSuspend.latest
+vmop.numReset.latest
+vmop.numRebootGuest.latest
+vmop.numStandbyGuest.latest
+vmop.numPoweron.latest
+vmop.numCreate.latest
+vmop.numDestroy.latest
+vmop.numRegister.latest
+vmop.numUnregister.latest
+vmop.numReconfigure.latest
+vmop.numClone.latest
+vmop.numDeploy.latest
+vmop.numChangeHost.latest
+vmop.numChangeDS.latest
+vmop.numChangeHostDS.latest
+vmop.numVMotion.latest
+vmop.numSVMotion.latest
+vmop.numXVMotion.latest
+```
+
+## Datastore Metrics
+```
+datastore.numberReadAveraged.average
+datastore.throughput.contention.average
+datastore.throughput.usage.average
+datastore.write.average
+datastore.read.average
+datastore.numberWriteAveraged.average
+disk.used.latest
+disk.provisioned.latest
+disk.capacity.latest
+disk.capacity.contention.average
+disk.capacity.provisioned.average
+disk.capacity.usage.average
+```
\ No newline at end of file
diff --git a/plugins/inputs/vsphere/README.MD b/plugins/inputs/vsphere/README.MD
new file mode 100644
index 00000000..12332ea6
--- /dev/null
+++ b/plugins/inputs/vsphere/README.MD
@@ -0,0 +1,354 @@
+# VMware vSphere Input Plugin
+
+The VMware vSphere plugin uses the vSphere API to gather metrics from multiple vCenter servers.
+ 
+* Clusters
+* Hosts
+* VMs
+* Data stores
+
+## Configuration
+
+NOTE: To disable collection of a specific resource type, simply exclude all metrics using the XX_metric_exclude. 
+For example, to disable collection of VMs, add this:
+```vm_metric_exclude = [ "*" ]```
+
+```
+# Read metrics from one or many vCenters
+[[inputs.vsphere]]
+    ## List of vCenter URLs to be monitored. These three lines must be uncommented
+  ## and edited for the plugin to work.
+  vcenters = [ "https://vcenter.local/sdk" ]
+  username = "user@corp.local"
+  password = "secret"
+
+  ## VMs
+  ## Typical VM metrics (if omitted or empty, all metrics are collected)
+  vm_metric_include = [
+    "cpu.demand.average",
+    "cpu.idle.summation",
+    "cpu.latency.average",
+    "cpu.readiness.average",
+    "cpu.ready.summation",
+    "cpu.run.summation",
+    "cpu.usagemhz.average",
+    "cpu.used.summation",
+    "cpu.wait.summation",
+    "mem.active.average",
+    "mem.granted.average",
+    "mem.latency.average",
+    "mem.swapin.average",
+    "mem.swapinRate.average",
+    "mem.swapout.average",
+    "mem.swapoutRate.average",
+    "mem.usage.average",
+    "mem.vmmemctl.average",
+    "net.bytesRx.average",
+    "net.bytesTx.average",
+    "net.droppedRx.summation",
+    "net.droppedTx.summation",
+    "net.usage.average",
+    "power.power.average",    
+    "virtualDisk.numberReadAveraged.average",
+    "virtualDisk.numberWriteAveraged.average",
+    "virtualDisk.read.average",
+    "virtualDisk.readOIO.latest",
+    "virtualDisk.throughput.usage.average",
+    "virtualDisk.totalReadLatency.average",
+    "virtualDisk.totalWriteLatency.average",
+    "virtualDisk.write.average",
+    "virtualDisk.writeOIO.latest",
+    "sys.uptime.latest",
+  ]
+  # vm_metric_exclude = [] ## Nothing is excluded by default
+  # vm_instances = true ## true by default
+
+  ## Hosts 
+  ## Typical host metrics (if omitted or empty, all metrics are collected)
+  host_metric_include = [
+    "cpu.coreUtilization.average",
+    "cpu.costop.summation",
+    "cpu.demand.average",
+    "cpu.idle.summation",
+    "cpu.latency.average",
+    "cpu.readiness.average",
+    "cpu.ready.summation",
+    "cpu.swapwait.summation",
+    "cpu.usage.average",
+    "cpu.usagemhz.average",
+    "cpu.used.summation",
+    "cpu.utilization.average",
+    "cpu.wait.summation",
+    "disk.deviceReadLatency.average",
+    "disk.deviceWriteLatency.average",
+    "disk.kernelReadLatency.average",
+    "disk.kernelWriteLatency.average",
+    "disk.numberReadAveraged.average",
+    "disk.numberWriteAveraged.average",
+    "disk.read.average",
+    "disk.totalReadLatency.average",
+    "disk.totalWriteLatency.average",
+    "disk.write.average",
+    "mem.active.average",
+    "mem.latency.average",
+    "mem.state.latest",
+    "mem.swapin.average",
+    "mem.swapinRate.average",
+    "mem.swapout.average",
+    "mem.swapoutRate.average",
+    "mem.totalCapacity.average",
+    "mem.usage.average",
+    "mem.vmmemctl.average",
+    "net.bytesRx.average",
+    "net.bytesTx.average",
+    "net.droppedRx.summation",
+    "net.droppedTx.summation",
+    "net.errorsRx.summation",
+    "net.errorsTx.summation",
+    "net.usage.average",
+    "power.power.average",
+    "storageAdapter.numberReadAveraged.average",
+    "storageAdapter.numberWriteAveraged.average",
+    "storageAdapter.read.average",
+    "storageAdapter.write.average",
+    "sys.uptime.latest",
+  ]
+  # host_metric_exclude = [] ## Nothing excluded by default
+  # host_instances = true ## true by default
+
+  ## Clusters 
+  # cluster_metric_include = [] ## if omitted or empty, all metrics are collected
+  # cluster_metric_exclude = [] ## Nothing excluded by default
+  # cluster_instances = true ## true by default
+
+  ## Datastores 
+  # datastore_metric_include = [] ## if omitted or empty, all metrics are collected
+  # datastore_metric_exclude = [] ## Nothing excluded by default
+  # datastore_instances = false ## false by default for Datastores only
+
+  ## Datacenters
+  datacenter_metric_include = [] ## if omitted or empty, all metrics are collected
+  datacenter_metric_exclude = [ "*" ] ## Datacenters are not collected by default.
+  # datacenter_instances = false ## false by default for Datastores only
+
+  ## Plugin Settings  
+  ## separator character to use for measurement and field names (default: "_")
+  # separator = "_"
+
+  ## number of objects to retreive per query for realtime resources (vms and hosts)
+  ## set to 64 for vCenter 5.5 and 6.0 (default: 256)
+  # max_query_objects = 256
+
+  ## number of metrics to retreive per query for non-realtime resources (clusters and datastores)
+  ## set to 64 for vCenter 5.5 and 6.0 (default: 256)
+  # max_query_metrics = 256
+
+  ## number of go routines to use for collection and discovery of objects and metrics
+  # collect_concurrency = 1
+  # discover_concurrency = 1
+
+  ## whether or not to force discovery of new objects on initial gather call before collecting metrics
+  ## when true for large environments this may cause errors for time elapsed while collecting metrics
+  ## when false (default) the first collection cycle may result in no or limited metrics while objects are discovered
+  # force_discover_on_init = false
+
+  ## the interval before (re)discovering objects subject to metrics collection (default: 300s)
+  # object_discovery_interval = "300s"
+
+  ## timeout applies to any of the api request made to vcenter
+  # timeout = "20s"
+
+  ## 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
+``` 
+
+### Objects and Metrics Per Query
+
+Default settings for vCenter 6.5 and above is 256. Prior versions of vCenter have this set to 64. A vCenter administrator
+can change this setting, which should be reflected in this plugin. See this [VMware KB article](https://kb.vmware.com/s/article/2107096)
+for more information.
+
+### Collection and Discovery concurrency
+
+On large vCenter setups it may be prudent to have multiple concurrent go routines collect performance metrics
+in order to avoid potential errors for time elapsed during a collection cycle. This should never be greater than 8,
+though the default of 1 (no concurrency) should be sufficient for most configurations. 
+
+## Measurements &amp; Fields
+
+- Cluster Stats
+	- Cluster services: CPU, memory, failover
+	- CPU: total, usage
+	- Memory: consumed, total, vmmemctl
+	- VM operations: # changes, clone, create, deploy, destroy, power, reboot, reconfigure, register, reset, shutdown, standby, vmotion
+- Host Stats:
+	- CPU: total, usage, cost, mhz
+	- Datastore: iops, latency, read/write bytes, # reads/writes
+	- Disk: commands, latency, kernel reads/writes, # reads/writes, queues
+	- Memory: total, usage, active, latency, swap, shared, vmmemctl
+	- Network: broadcast, bytes, dropped, errors, multicast, packets, usage
+	- Power: energy, usage, capacity
+	- Res CPU: active, max, running
+	- Storage Adapter: commands, latency, # reads/writes
+	- Storage Path: commands, latency, # reads/writes
+	- System Resources: cpu active, cpu max, cpu running, cpu usage, mem allocated, mem consumed, mem shared, swap
+	- System: uptime
+	- Flash Module: active VMDKs 
+- VM Stats:
+	- CPU: demand, usage, readiness, cost, mhz
+	- Datastore: latency, # reads/writes
+	- Disk: commands, latency, # reads/writes, provisioned, usage
+	- Memory: granted, usage, active, swap, vmmemctl
+	- Network: broadcast, bytes, dropped, multicast, packets, usage
+	- Power: energy, usage
+	- Res CPU: active, max, running
+	- System: operating system uptime, uptime
+	- Virtual Disk: seeks, # reads/writes, latency, load 
+- Datastore stats:
+	- Disk: Capacity, provisioned, used  
+
+For a detailed list of commonly available metrics, please refer to [METRICS.MD](METRICS.MD)
+	
+## Tags
+
+- all metrics
+	- vcenter (vcenter url)
+- all host metrics
+	- cluster (vcenter cluster)
+- all vm metrics
+	- cluster (vcenter cluster)
+	- esxhost (name of ESXi host)
+	- guest (guest operating system id)
+- cpu stats for Host and VM
+	- cpu (cpu core - not all CPU fields will have this tag)
+- datastore stats for Host and VM
+	- datastore (id of datastore)
+- disk stats for Host and VM
+	- disk (name of disk)
+- disk.used.capacity for Datastore
+	- disk (type of disk)
+- net stats for Host and VM
+	- interface (name of network interface)
+- storageAdapter stats for Host
+	- adapter (name of storage adapter)
+- storagePath stats for Host 
+	- path (id of storage path)
+- sys.resource* stats for Host
+	- resource (resource type)
+- vflashModule stats for Host
+	- module (name of flash module)
+- virtualDisk stats for VM
+	- disk (name of virtual disk)
+
+## Sample output
+
+```
+vsphere_vm_cpu,esxhostname=DC0_H0,guest=other,host=host.example.com,moid=vm-35,os=Mac,source=DC0_H0_VM0,vcenter=localhost:8989,vmname=DC0_H0_VM0 run_summation=2608i,ready_summation=129i,usage_average=5.01,used_summation=2134i,demand_average=326i 1535660299000000000
+vsphere_vm_net,esxhostname=DC0_H0,guest=other,host=host.example.com,moid=vm-35,os=Mac,source=DC0_H0_VM0,vcenter=localhost:8989,vmname=DC0_H0_VM0 bytesRx_average=321i,bytesTx_average=335i 1535660299000000000
+vsphere_vm_virtualDisk,esxhostname=DC0_H0,guest=other,host=host.example.com,moid=vm-35,os=Mac,source=DC0_H0_VM0,vcenter=localhost:8989,vmname=DC0_H0_VM0 write_average=144i,read_average=4i 1535660299000000000
+vsphere_vm_net,esxhostname=DC0_H0,guest=other,host=host.example.com,moid=vm-38,os=Mac,source=DC0_H0_VM1,vcenter=localhost:8989,vmname=DC0_H0_VM1 bytesRx_average=242i,bytesTx_average=308i 1535660299000000000
+vsphere_vm_virtualDisk,esxhostname=DC0_H0,guest=other,host=host.example.com,moid=vm-38,os=Mac,source=DC0_H0_VM1,vcenter=localhost:8989,vmname=DC0_H0_VM1 write_average=232i,read_average=4i 1535660299000000000
+vsphere_vm_cpu,esxhostname=DC0_H0,guest=other,host=host.example.com,moid=vm-38,os=Mac,source=DC0_H0_VM1,vcenter=localhost:8989,vmname=DC0_H0_VM1 usage_average=5.49,used_summation=1804i,demand_average=308i,run_summation=2001i,ready_summation=120i 1535660299000000000
+vsphere_vm_cpu,clustername=DC0_C0,esxhostname=DC0_C0_H0,guest=other,host=host.example.com,moid=vm-41,os=Mac,source=DC0_C0_RP0_VM0,vcenter=localhost:8989,vmname=DC0_C0_RP0_VM0 usage_average=4.19,used_summation=2108i,demand_average=285i,run_summation=1793i,ready_summation=93i 1535660299000000000
+vsphere_vm_net,clustername=DC0_C0,esxhostname=DC0_C0_H0,guest=other,host=host.example.com,moid=vm-41,os=Mac,source=DC0_C0_RP0_VM0,vcenter=localhost:8989,vmname=DC0_C0_RP0_VM0 bytesRx_average=272i,bytesTx_average=419i 1535660299000000000
+vsphere_vm_virtualDisk,clustername=DC0_C0,esxhostname=DC0_C0_H0,guest=other,host=host.example.com,moid=vm-41,os=Mac,source=DC0_C0_RP0_VM0,vcenter=localhost:8989,vmname=DC0_C0_RP0_VM0 write_average=229i,read_average=4i 1535660299000000000
+vsphere_vm_cpu,clustername=DC0_C0,esxhostname=DC0_C0_H0,guest=other,host=host.example.com,moid=vm-44,os=Mac,source=DC0_C0_RP0_VM1,vcenter=localhost:8989,vmname=DC0_C0_RP0_VM1 run_summation=2277i,ready_summation=118i,usage_average=4.67,used_summation=2546i,demand_average=289i 1535660299000000000
+vsphere_vm_net,clustername=DC0_C0,esxhostname=DC0_C0_H0,guest=other,host=host.example.com,moid=vm-44,os=Mac,source=DC0_C0_RP0_VM1,vcenter=localhost:8989,vmname=DC0_C0_RP0_VM1 bytesRx_average=243i,bytesTx_average=296i 1535660299000000000
+vsphere_vm_virtualDisk,clustername=DC0_C0,esxhostname=DC0_C0_H0,guest=other,host=host.example.com,moid=vm-44,os=Mac,source=DC0_C0_RP0_VM1,vcenter=localhost:8989,vmname=DC0_C0_RP0_VM1 write_average=158i,read_average=4i 1535660299000000000
+vsphere_host_net,esxhostname=DC0_H0,host=host.example.com,interface=vmnic0,moid=host-19,os=Mac,source=DC0_H0,vcenter=localhost:8989 usage_average=1042i,bytesTx_average=753i,bytesRx_average=660i 1535660299000000000
+vsphere_host_cpu,esxhostname=DC0_H0,host=host.example.com,moid=host-19,os=Mac,source=DC0_H0,vcenter=localhost:8989 utilization_average=10.46,usage_average=22.4,readiness_average=0.4,costop_summation=2i,coreUtilization_average=19.61,wait_summation=5148518i,idle_summation=58581i,latency_average=0.6,ready_summation=13370i,used_summation=19219i 1535660299000000000
+vsphere_host_cpu,cpu=0,esxhostname=DC0_H0,host=host.example.com,moid=host-19,os=Mac,source=DC0_H0,vcenter=localhost:8989 coreUtilization_average=25.6,utilization_average=11.58,used_summation=24306i,usage_average=24.26,idle_summation=86688i 1535660299000000000
+vsphere_host_cpu,cpu=1,esxhostname=DC0_H0,host=host.example.com,moid=host-19,os=Mac,source=DC0_H0,vcenter=localhost:8989 coreUtilization_average=12.29,utilization_average=8.32,used_summation=31312i,usage_average=22.47,idle_summation=94934i 1535660299000000000
+vsphere_host_disk,esxhostname=DC0_H0,host=host.example.com,moid=host-19,os=Mac,source=DC0_H0,vcenter=localhost:8989 read_average=331i,write_average=2800i 1535660299000000000
+vsphere_host_disk,disk=/var/folders/rf/txwdm4pj409f70wnkdlp7sz80000gq/T/govcsim-DC0-LocalDS_0-367088371@folder-5,esxhostname=DC0_H0,host=host.example.com,moid=host-19,os=Mac,source=DC0_H0,vcenter=localhost:8989 write_average=2701i,read_average=258i 1535660299000000000
+vsphere_host_mem,esxhostname=DC0_H0,host=host.example.com,moid=host-19,os=Mac,source=DC0_H0,vcenter=localhost:8989 usage_average=93.27 1535660299000000000
+vsphere_host_net,esxhostname=DC0_H0,host=host.example.com,moid=host-19,os=Mac,source=DC0_H0,vcenter=localhost:8989 bytesTx_average=650i,usage_average=1414i,bytesRx_average=569i 1535660299000000000
+vsphere_host_cpu,clustername=DC0_C0,cpu=1,esxhostname=DC0_C0_H0,host=host.example.com,moid=host-30,os=Mac,source=DC0_C0_H0,vcenter=localhost:8989 utilization_average=12.6,used_summation=25775i,usage_average=24.44,idle_summation=68886i,coreUtilization_average=17.59 1535660299000000000
+vsphere_host_disk,clustername=DC0_C0,esxhostname=DC0_C0_H0,host=host.example.com,moid=host-30,os=Mac,source=DC0_C0_H0,vcenter=localhost:8989 read_average=340i,write_average=2340i 1535660299000000000
+vsphere_host_disk,clustername=DC0_C0,disk=/var/folders/rf/txwdm4pj409f70wnkdlp7sz80000gq/T/govcsim-DC0-LocalDS_0-367088371@folder-5,esxhostname=DC0_C0_H0,host=host.example.com,moid=host-30,os=Mac,source=DC0_C0_H0,vcenter=localhost:8989 write_average=2277i,read_average=282i 1535660299000000000
+vsphere_host_mem,clustername=DC0_C0,esxhostname=DC0_C0_H0,host=host.example.com,moid=host-30,os=Mac,source=DC0_C0_H0,vcenter=localhost:8989 usage_average=104.78 1535660299000000000
+vsphere_host_net,clustername=DC0_C0,esxhostname=DC0_C0_H0,host=host.example.com,moid=host-30,os=Mac,source=DC0_C0_H0,vcenter=localhost:8989 bytesTx_average=463i,usage_average=1131i,bytesRx_average=719i 1535660299000000000
+vsphere_host_net,clustername=DC0_C0,esxhostname=DC0_C0_H0,host=host.example.com,interface=vmnic0,moid=host-30,os=Mac,source=DC0_C0_H0,vcenter=localhost:8989 usage_average=1668i,bytesTx_average=838i,bytesRx_average=921i 1535660299000000000
+vsphere_host_cpu,clustername=DC0_C0,esxhostname=DC0_C0_H0,host=host.example.com,moid=host-30,os=Mac,source=DC0_C0_H0,vcenter=localhost:8989 used_summation=28952i,utilization_average=11.36,idle_summation=93261i,latency_average=0.46,ready_summation=12837i,usage_average=21.56,readiness_average=0.39,costop_summation=2i,coreUtilization_average=27.19,wait_summation=3820829i 1535660299000000000
+vsphere_host_cpu,clustername=DC0_C0,cpu=0,esxhostname=DC0_C0_H0,host=host.example.com,moid=host-30,os=Mac,source=DC0_C0_H0,vcenter=localhost:8989 coreUtilization_average=24.12,utilization_average=13.83,used_summation=22462i,usage_average=24.69,idle_summation=96993i 1535660299000000000
+internal_vsphere,host=host.example.com,os=Mac,vcenter=localhost:8989 connect_ns=4727607i,discover_ns=65389011i,discovered_objects=8i 1535660309000000000
+internal_vsphere,host=host.example.com,os=Mac,resourcetype=datastore,vcenter=localhost:8989 gather_duration_ns=296223i,gather_count=0i 1535660309000000000
+internal_vsphere,host=host.example.com,os=Mac,resourcetype=vm,vcenter=192.168.1.151 gather_duration_ns=136050i,gather_count=0i 1535660309000000000
+internal_vsphere,host=host.example.com,os=Mac,resourcetype=host,vcenter=localhost:8989 gather_count=62i,gather_duration_ns=8788033i 1535660309000000000
+internal_vsphere,host=host.example.com,os=Mac,resourcetype=host,vcenter=192.168.1.151 gather_count=0i,gather_duration_ns=162002i 1535660309000000000
+internal_gather,host=host.example.com,input=vsphere,os=Mac gather_time_ns=17483653i,metrics_gathered=28i 1535660309000000000
+internal_vsphere,host=host.example.com,os=Mac,vcenter=192.168.1.151 connect_ns=0i 1535660309000000000
+internal_vsphere,host=host.example.com,os=Mac,resourcetype=vm,vcenter=localhost:8989 gather_duration_ns=7291897i,gather_count=36i 1535660309000000000
+internal_vsphere,host=host.example.com,os=Mac,resourcetype=datastore,vcenter=192.168.1.151 gather_duration_ns=958474i,gather_count=0i 1535660309000000000
+vsphere_vm_cpu,esxhostname=DC0_H0,guest=other,host=host.example.com,moid=vm-38,os=Mac,source=DC0_H0_VM1,vcenter=localhost:8989,vmname=DC0_H0_VM1 usage_average=8.82,used_summation=3192i,demand_average=283i,run_summation=2419i,ready_summation=115i 1535660319000000000
+vsphere_vm_net,esxhostname=DC0_H0,guest=other,host=host.example.com,moid=vm-38,os=Mac,source=DC0_H0_VM1,vcenter=localhost:8989,vmname=DC0_H0_VM1 bytesRx_average=277i,bytesTx_average=343i 1535660319000000000
+vsphere_vm_virtualDisk,esxhostname=DC0_H0,guest=other,host=host.example.com,moid=vm-38,os=Mac,source=DC0_H0_VM1,vcenter=localhost:8989,vmname=DC0_H0_VM1 read_average=1i,write_average=741i 1535660319000000000
+vsphere_vm_net,clustername=DC0_C0,esxhostname=DC0_C0_H0,guest=other,host=host.example.com,moid=vm-41,os=Mac,source=DC0_C0_RP0_VM0,vcenter=localhost:8989,vmname=DC0_C0_RP0_VM0 bytesRx_average=386i,bytesTx_average=369i 1535660319000000000
+vsphere_vm_virtualDisk,clustername=DC0_C0,esxhostname=DC0_C0_H0,guest=other,host=host.example.com,moid=vm-41,os=Mac,source=DC0_C0_RP0_VM0,vcenter=localhost:8989,vmname=DC0_C0_RP0_VM0 write_average=814i,read_average=1i 1535660319000000000
+vsphere_vm_cpu,clustername=DC0_C0,esxhostname=DC0_C0_H0,guest=other,host=host.example.com,moid=vm-41,os=Mac,source=DC0_C0_RP0_VM0,vcenter=localhost:8989,vmname=DC0_C0_RP0_VM0 run_summation=1778i,ready_summation=111i,usage_average=7.54,used_summation=2339i,demand_average=297i 1535660319000000000
+vsphere_vm_cpu,clustername=DC0_C0,esxhostname=DC0_C0_H0,guest=other,host=host.example.com,moid=vm-44,os=Mac,source=DC0_C0_RP0_VM1,vcenter=localhost:8989,vmname=DC0_C0_RP0_VM1 usage_average=6.98,used_summation=2125i,demand_average=211i,run_summation=2990i,ready_summation=141i 1535660319000000000
+vsphere_vm_net,clustername=DC0_C0,esxhostname=DC0_C0_H0,guest=other,host=host.example.com,moid=vm-44,os=Mac,source=DC0_C0_RP0_VM1,vcenter=localhost:8989,vmname=DC0_C0_RP0_VM1 bytesRx_average=357i,bytesTx_average=268i 1535660319000000000
+vsphere_vm_virtualDisk,clustername=DC0_C0,esxhostname=DC0_C0_H0,guest=other,host=host.example.com,moid=vm-44,os=Mac,source=DC0_C0_RP0_VM1,vcenter=localhost:8989,vmname=DC0_C0_RP0_VM1 write_average=528i,read_average=1i 1535660319000000000
+vsphere_vm_cpu,esxhostname=DC0_H0,guest=other,host=host.example.com,moid=vm-35,os=Mac,source=DC0_H0_VM0,vcenter=localhost:8989,vmname=DC0_H0_VM0 used_summation=2374i,demand_average=195i,run_summation=3454i,ready_summation=110i,usage_average=7.34 1535660319000000000
+vsphere_vm_net,esxhostname=DC0_H0,guest=other,host=host.example.com,moid=vm-35,os=Mac,source=DC0_H0_VM0,vcenter=localhost:8989,vmname=DC0_H0_VM0 bytesRx_average=308i,bytesTx_average=246i 1535660319000000000
+vsphere_vm_virtualDisk,esxhostname=DC0_H0,guest=other,host=host.example.com,moid=vm-35,os=Mac,source=DC0_H0_VM0,vcenter=localhost:8989,vmname=DC0_H0_VM0 write_average=1178i,read_average=1i 1535660319000000000
+vsphere_host_net,esxhostname=DC0_H0,host=host.example.com,interface=vmnic0,moid=host-19,os=Mac,source=DC0_H0,vcenter=localhost:8989 bytesRx_average=773i,usage_average=1521i,bytesTx_average=890i 1535660319000000000
+vsphere_host_cpu,esxhostname=DC0_H0,host=host.example.com,moid=host-19,os=Mac,source=DC0_H0,vcenter=localhost:8989 wait_summation=3421258i,idle_summation=67994i,latency_average=0.36,usage_average=29.86,readiness_average=0.37,used_summation=25244i,costop_summation=2i,coreUtilization_average=21.94,utilization_average=17.19,ready_summation=15897i 1535660319000000000
+vsphere_host_cpu,cpu=0,esxhostname=DC0_H0,host=host.example.com,moid=host-19,os=Mac,source=DC0_H0,vcenter=localhost:8989 utilization_average=11.32,used_summation=19333i,usage_average=14.29,idle_summation=92708i,coreUtilization_average=27.68 1535660319000000000
+vsphere_host_cpu,cpu=1,esxhostname=DC0_H0,host=host.example.com,moid=host-19,os=Mac,source=DC0_H0,vcenter=localhost:8989 used_summation=28596i,usage_average=25.32,idle_summation=79553i,coreUtilization_average=28.01,utilization_average=11.33 1535660319000000000
+vsphere_host_disk,esxhostname=DC0_H0,host=host.example.com,moid=host-19,os=Mac,source=DC0_H0,vcenter=localhost:8989 read_average=86i,write_average=1659i 1535660319000000000
+vsphere_host_disk,disk=/var/folders/rf/txwdm4pj409f70wnkdlp7sz80000gq/T/govcsim-DC0-LocalDS_0-367088371@folder-5,esxhostname=DC0_H0,host=host.example.com,moid=host-19,os=Mac,source=DC0_H0,vcenter=localhost:8989 write_average=1997i,read_average=58i 1535660319000000000
+vsphere_host_mem,esxhostname=DC0_H0,host=host.example.com,moid=host-19,os=Mac,source=DC0_H0,vcenter=localhost:8989 usage_average=68.45 1535660319000000000
+vsphere_host_net,esxhostname=DC0_H0,host=host.example.com,moid=host-19,os=Mac,source=DC0_H0,vcenter=localhost:8989 bytesTx_average=679i,usage_average=2286i,bytesRx_average=719i 1535660319000000000
+vsphere_host_cpu,clustername=DC0_C0,cpu=1,esxhostname=DC0_C0_H0,host=host.example.com,moid=host-30,os=Mac,source=DC0_C0_H0,vcenter=localhost:8989 utilization_average=10.52,used_summation=21693i,usage_average=23.09,idle_summation=84590i,coreUtilization_average=29.92 1535660319000000000
+vsphere_host_disk,clustername=DC0_C0,esxhostname=DC0_C0_H0,host=host.example.com,moid=host-30,os=Mac,source=DC0_C0_H0,vcenter=localhost:8989 read_average=113i,write_average=1236i 1535660319000000000
+vsphere_host_disk,clustername=DC0_C0,disk=/var/folders/rf/txwdm4pj409f70wnkdlp7sz80000gq/T/govcsim-DC0-LocalDS_0-367088371@folder-5,esxhostname=DC0_C0_H0,host=host.example.com,moid=host-30,os=Mac,source=DC0_C0_H0,vcenter=localhost:8989 write_average=1708i,read_average=110i 1535660319000000000
+vsphere_host_mem,clustername=DC0_C0,esxhostname=DC0_C0_H0,host=host.example.com,moid=host-30,os=Mac,source=DC0_C0_H0,vcenter=localhost:8989 usage_average=111.46 1535660319000000000
+vsphere_host_net,clustername=DC0_C0,esxhostname=DC0_C0_H0,host=host.example.com,moid=host-30,os=Mac,source=DC0_C0_H0,vcenter=localhost:8989 bytesTx_average=998i,usage_average=2000i,bytesRx_average=881i 1535660319000000000
+vsphere_host_net,clustername=DC0_C0,esxhostname=DC0_C0_H0,host=host.example.com,interface=vmnic0,moid=host-30,os=Mac,source=DC0_C0_H0,vcenter=localhost:8989 usage_average=1683i,bytesTx_average=675i,bytesRx_average=1078i 1535660319000000000
+vsphere_host_cpu,clustername=DC0_C0,esxhostname=DC0_C0_H0,host=host.example.com,moid=host-30,os=Mac,source=DC0_C0_H0,vcenter=localhost:8989 used_summation=28531i,wait_summation=3139129i,utilization_average=9.99,idle_summation=98579i,latency_average=0.51,costop_summation=2i,coreUtilization_average=14.35,ready_summation=16121i,usage_average=34.19,readiness_average=0.4 1535660319000000000
+vsphere_host_cpu,clustername=DC0_C0,cpu=0,esxhostname=DC0_C0_H0,host=host.example.com,moid=host-30,os=Mac,source=DC0_C0_H0,vcenter=localhost:8989 utilization_average=12.2,used_summation=22750i,usage_average=18.84,idle_summation=99539i,coreUtilization_average=23.05 1535660319000000000
+internal_vsphere,host=host.example.com,os=Mac,resourcetype=host,vcenter=localhost:8989 gather_duration_ns=7076543i,gather_count=62i 1535660339000000000
+internal_vsphere,host=host.example.com,os=Mac,resourcetype=host,vcenter=192.168.1.151 gather_duration_ns=4051303i,gather_count=0i 1535660339000000000
+internal_gather,host=host.example.com,input=vsphere,os=Mac metrics_gathered=56i,gather_time_ns=13555029i 1535660339000000000
+internal_vsphere,host=host.example.com,os=Mac,vcenter=192.168.1.151 connect_ns=0i 1535660339000000000
+internal_vsphere,host=host.example.com,os=Mac,resourcetype=vm,vcenter=localhost:8989 gather_duration_ns=6335467i,gather_count=36i 1535660339000000000
+internal_vsphere,host=host.example.com,os=Mac,resourcetype=datastore,vcenter=192.168.1.151 gather_duration_ns=958474i,gather_count=0i 1535660339000000000
+internal_vsphere,host=host.example.com,os=Mac,vcenter=localhost:8989 discover_ns=65389011i,discovered_objects=8i,connect_ns=4727607i 1535660339000000000
+internal_vsphere,host=host.example.com,os=Mac,resourcetype=datastore,vcenter=localhost:8989 gather_duration_ns=296223i,gather_count=0i 1535660339000000000
+internal_vsphere,host=host.example.com,os=Mac,resourcetype=vm,vcenter=192.168.1.151 gather_count=0i,gather_duration_ns=1540920i 1535660339000000000
+vsphere_vm_virtualDisk,esxhostname=DC0_H0,guest=other,host=host.example.com,moid=vm-35,os=Mac,source=DC0_H0_VM0,vcenter=localhost:8989,vmname=DC0_H0_VM0 write_average=302i,read_average=11i 1535660339000000000
+vsphere_vm_cpu,esxhostname=DC0_H0,guest=other,host=host.example.com,moid=vm-35,os=Mac,source=DC0_H0_VM0,vcenter=localhost:8989,vmname=DC0_H0_VM0 usage_average=5.58,used_summation=2941i,demand_average=298i,run_summation=3255i,ready_summation=96i 1535660339000000000
+vsphere_vm_net,esxhostname=DC0_H0,guest=other,host=host.example.com,moid=vm-35,os=Mac,source=DC0_H0_VM0,vcenter=localhost:8989,vmname=DC0_H0_VM0 bytesRx_average=155i,bytesTx_average=241i 1535660339000000000
+vsphere_vm_cpu,esxhostname=DC0_H0,guest=other,host=host.example.com,moid=vm-38,os=Mac,source=DC0_H0_VM1,vcenter=localhost:8989,vmname=DC0_H0_VM1 usage_average=10.3,used_summation=3053i,demand_average=346i,run_summation=3289i,ready_summation=122i 1535660339000000000
+vsphere_vm_net,esxhostname=DC0_H0,guest=other,host=host.example.com,moid=vm-38,os=Mac,source=DC0_H0_VM1,vcenter=localhost:8989,vmname=DC0_H0_VM1 bytesRx_average=215i,bytesTx_average=275i 1535660339000000000
+vsphere_vm_virtualDisk,esxhostname=DC0_H0,guest=other,host=host.example.com,moid=vm-38,os=Mac,source=DC0_H0_VM1,vcenter=localhost:8989,vmname=DC0_H0_VM1 write_average=252i,read_average=14i 1535660339000000000
+vsphere_vm_cpu,clustername=DC0_C0,esxhostname=DC0_C0_H0,guest=other,host=host.example.com,moid=vm-41,os=Mac,source=DC0_C0_RP0_VM0,vcenter=localhost:8989,vmname=DC0_C0_RP0_VM0 usage_average=8,used_summation=2183i,demand_average=354i,run_summation=3542i,ready_summation=128i 1535660339000000000
+vsphere_vm_net,clustername=DC0_C0,esxhostname=DC0_C0_H0,guest=other,host=host.example.com,moid=vm-41,os=Mac,source=DC0_C0_RP0_VM0,vcenter=localhost:8989,vmname=DC0_C0_RP0_VM0 bytesRx_average=178i,bytesTx_average=200i 1535660339000000000
+vsphere_vm_virtualDisk,clustername=DC0_C0,esxhostname=DC0_C0_H0,guest=other,host=host.example.com,moid=vm-41,os=Mac,source=DC0_C0_RP0_VM0,vcenter=localhost:8989,vmname=DC0_C0_RP0_VM0 write_average=283i,read_average=12i 1535660339000000000
+vsphere_vm_cpu,clustername=DC0_C0,esxhostname=DC0_C0_H0,guest=other,host=host.example.com,moid=vm-44,os=Mac,source=DC0_C0_RP0_VM1,vcenter=localhost:8989,vmname=DC0_C0_RP0_VM1 demand_average=328i,run_summation=3481i,ready_summation=122i,usage_average=7.95,used_summation=2167i 1535660339000000000
+vsphere_vm_net,clustername=DC0_C0,esxhostname=DC0_C0_H0,guest=other,host=host.example.com,moid=vm-44,os=Mac,source=DC0_C0_RP0_VM1,vcenter=localhost:8989,vmname=DC0_C0_RP0_VM1 bytesTx_average=282i,bytesRx_average=196i 1535660339000000000
+vsphere_vm_virtualDisk,clustername=DC0_C0,esxhostname=DC0_C0_H0,guest=other,host=host.example.com,moid=vm-44,os=Mac,source=DC0_C0_RP0_VM1,vcenter=localhost:8989,vmname=DC0_C0_RP0_VM1 write_average=321i,read_average=13i 1535660339000000000
+vsphere_host_disk,esxhostname=DC0_H0,host=host.example.com,moid=host-19,os=Mac,source=DC0_H0,vcenter=localhost:8989 read_average=39i,write_average=2635i 1535660339000000000
+vsphere_host_disk,disk=/var/folders/rf/txwdm4pj409f70wnkdlp7sz80000gq/T/govcsim-DC0-LocalDS_0-367088371@folder-5,esxhostname=DC0_H0,host=host.example.com,moid=host-19,os=Mac,source=DC0_H0,vcenter=localhost:8989 write_average=2635i,read_average=30i 1535660339000000000
+vsphere_host_mem,esxhostname=DC0_H0,host=host.example.com,moid=host-19,os=Mac,source=DC0_H0,vcenter=localhost:8989 usage_average=98.5 1535660339000000000
+vsphere_host_net,esxhostname=DC0_H0,host=host.example.com,moid=host-19,os=Mac,source=DC0_H0,vcenter=localhost:8989 usage_average=1887i,bytesRx_average=662i,bytesTx_average=251i 1535660339000000000
+vsphere_host_net,esxhostname=DC0_H0,host=host.example.com,interface=vmnic0,moid=host-19,os=Mac,source=DC0_H0,vcenter=localhost:8989 usage_average=1481i,bytesTx_average=899i,bytesRx_average=992i 1535660339000000000
+vsphere_host_cpu,esxhostname=DC0_H0,host=host.example.com,moid=host-19,os=Mac,source=DC0_H0,vcenter=localhost:8989 used_summation=50405i,costop_summation=2i,utilization_average=17.32,latency_average=0.61,ready_summation=14843i,usage_average=27.94,coreUtilization_average=32.12,wait_summation=3058787i,idle_summation=56600i,readiness_average=0.36 1535660339000000000
+vsphere_host_cpu,cpu=0,esxhostname=DC0_H0,host=host.example.com,moid=host-19,os=Mac,source=DC0_H0,vcenter=localhost:8989 coreUtilization_average=37.61,utilization_average=17.05,used_summation=38013i,usage_average=32.66,idle_summation=89575i 1535660339000000000
+vsphere_host_cpu,cpu=1,esxhostname=DC0_H0,host=host.example.com,moid=host-19,os=Mac,source=DC0_H0,vcenter=localhost:8989 coreUtilization_average=25.92,utilization_average=18.72,used_summation=39790i,usage_average=40.42,idle_summation=69457i 1535660339000000000
+vsphere_host_net,clustername=DC0_C0,esxhostname=DC0_C0_H0,host=host.example.com,interface=vmnic0,moid=host-30,os=Mac,source=DC0_C0_H0,vcenter=localhost:8989 usage_average=1246i,bytesTx_average=673i,bytesRx_average=781i 1535660339000000000
+vsphere_host_cpu,clustername=DC0_C0,esxhostname=DC0_C0_H0,host=host.example.com,moid=host-30,os=Mac,source=DC0_C0_H0,vcenter=localhost:8989 coreUtilization_average=33.8,idle_summation=77121i,ready_summation=15857i,readiness_average=0.39,used_summation=29554i,costop_summation=2i,wait_summation=4338417i,utilization_average=17.87,latency_average=0.44,usage_average=28.78 1535660339000000000
+vsphere_host_cpu,clustername=DC0_C0,cpu=0,esxhostname=DC0_C0_H0,host=host.example.com,moid=host-30,os=Mac,source=DC0_C0_H0,vcenter=localhost:8989 idle_summation=86610i,coreUtilization_average=34.36,utilization_average=19.03,used_summation=28766i,usage_average=23.72 1535660339000000000
+vsphere_host_cpu,clustername=DC0_C0,cpu=1,esxhostname=DC0_C0_H0,host=host.example.com,moid=host-30,os=Mac,source=DC0_C0_H0,vcenter=localhost:8989 coreUtilization_average=33.15,utilization_average=16.8,used_summation=44282i,usage_average=30.08,idle_summation=93490i 1535660339000000000
+vsphere_host_disk,clustername=DC0_C0,esxhostname=DC0_C0_H0,host=host.example.com,moid=host-30,os=Mac,source=DC0_C0_H0,vcenter=localhost:8989 read_average=56i,write_average=1672i 1535660339000000000
+vsphere_host_disk,clustername=DC0_C0,disk=/var/folders/rf/txwdm4pj409f70wnkdlp7sz80000gq/T/govcsim-DC0-LocalDS_0-367088371@folder-5,esxhostname=DC0_C0_H0,host=host.example.com,moid=host-30,os=Mac,source=DC0_C0_H0,vcenter=localhost:8989 write_average=2110i,read_average=48i 1535660339000000000
+vsphere_host_mem,clustername=DC0_C0,esxhostname=DC0_C0_H0,host=host.example.com,moid=host-30,os=Mac,source=DC0_C0_H0,vcenter=localhost:8989 usage_average=116.21 1535660339000000000
+vsphere_host_net,clustername=DC0_C0,esxhostname=DC0_C0_H0,host=host.example.com,moid=host-30,os=Mac,source=DC0_C0_H0,vcenter=localhost:8989 bytesRx_average=726i,bytesTx_average=643i,usage_average=1504i 1535660339000000000
+vsphere_host_mem,clustername=DC0_C0,esxhostname=DC0_C0_H0,host=host.example.com,moid=host-30,os=Mac,source=DC0_C0_H0,vcenter=localhost:8989 usage_average=116.21 1535660339000000000
+vsphere_host_net,clustername=DC0_C0,esxhostname=DC0_C0_H0,host=host.example.com,moid=host-30,os=Mac,source=DC0_C0_H0,vcenter=localhost:8989 bytesRx_average=726i,bytesTx_average=643i,usage_average=1504i 1535660339000000000
+```
diff --git a/plugins/inputs/vsphere/client.go b/plugins/inputs/vsphere/client.go
new file mode 100644
index 00000000..b9547b17
--- /dev/null
+++ b/plugins/inputs/vsphere/client.go
@@ -0,0 +1,175 @@
+package vsphere
+
+import (
+	"context"
+	"crypto/tls"
+	"log"
+	"net/url"
+	"sync"
+
+	"github.com/vmware/govmomi"
+	"github.com/vmware/govmomi/performance"
+	"github.com/vmware/govmomi/session"
+	"github.com/vmware/govmomi/view"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/soap"
+)
+
+// ClientFactory is used to obtain Clients to be used throughout the plugin. Typically,
+// a single Client is reused across all functions and goroutines, but the client
+// is periodically recycled to avoid authentication expiration issues.
+type ClientFactory struct {
+	client *Client
+	mux    sync.Mutex
+	url    *url.URL
+	parent *VSphere
+}
+
+// Client represents a connection to vSphere and is backed by a govmoni connection
+type Client struct {
+	Client    *govmomi.Client
+	Views     *view.Manager
+	Root      *view.ContainerView
+	Perf      *performance.Manager
+	Valid     bool
+	closeGate sync.Once
+}
+
+// NewClientFactory creates a new ClientFactory and prepares it for use.
+func NewClientFactory(ctx context.Context, url *url.URL, parent *VSphere) *ClientFactory {
+	return &ClientFactory{
+		client: nil,
+		parent: parent,
+		url:    url,
+	}
+}
+
+// GetClient returns a client. The caller is responsible for calling Release()
+// on the client once it's done using it.
+func (cf *ClientFactory) GetClient(ctx context.Context) (*Client, error) {
+	cf.mux.Lock()
+	defer cf.mux.Unlock()
+	if cf.client == nil {
+		var err error
+		if cf.client, err = NewClient(cf.url, cf.parent); err != nil {
+			return nil, err
+		}
+	}
+
+	// Execute a dummy call against the server to make sure the client is
+	// still functional. If not, try to log back in. If that doesn't work,
+	// we give up.
+	if _, err := methods.GetCurrentTime(ctx, cf.client.Client); err != nil {
+		log.Printf("I! [input.vsphere]: Client session seems to have time out. Reauthenticating!")
+		if cf.client.Client.SessionManager.Login(ctx, url.UserPassword(cf.parent.Username, cf.parent.Password)) != nil {
+			return nil, err
+		}
+	}
+
+	return cf.client, nil
+}
+
+// NewClient creates a new vSphere client based on the url and setting passed as parameters.
+func NewClient(u *url.URL, vs *VSphere) (*Client, error) {
+	sw := NewStopwatch("connect", u.Host)
+	tlsCfg, err := vs.ClientConfig.TLSConfig()
+	if err != nil {
+		return nil, err
+	}
+	// Use a default TLS config if it's missing
+	if tlsCfg == nil {
+		tlsCfg = &tls.Config{}
+	}
+	if vs.Username != "" {
+		u.User = url.UserPassword(vs.Username, vs.Password)
+	}
+	ctx := context.Background()
+
+	log.Printf("D! [input.vsphere]: Creating client: %s", u.Host)
+	soapClient := soap.NewClient(u, tlsCfg.InsecureSkipVerify)
+
+	// Add certificate if we have it. Use it to log us in.
+	if tlsCfg != nil && len(tlsCfg.Certificates) > 0 {
+		soapClient.SetCertificate(tlsCfg.Certificates[0])
+	}
+
+	// Set up custom CA chain if specified.  We need to do this before we create the vim25 client,
+	// since it might fail on missing CA chains otherwise.
+	if vs.TLSCA != "" {
+		if err := soapClient.SetRootCAs(vs.TLSCA); err != nil {
+			return nil, err
+		}
+	}
+
+	vimClient, err := vim25.NewClient(ctx, soapClient)
+	if err != nil {
+		return nil, err
+	}
+	sm := session.NewManager(vimClient)
+
+	// If TSLKey is specified, try to log in as an extension using a cert.
+	if vs.TLSKey != "" {
+		if err := sm.LoginExtensionByCertificate(ctx, vs.TLSKey); err != nil {
+			return nil, err
+		}
+	}
+
+	// Create the govmomi client.
+	c := &govmomi.Client{
+		Client:         vimClient,
+		SessionManager: sm,
+	}
+
+	// Only login if the URL contains user information.
+	if u.User != nil {
+		if err := c.Login(ctx, u.User); err != nil {
+			return nil, err
+		}
+	}
+
+	c.Timeout = vs.Timeout.Duration
+	m := view.NewManager(c.Client)
+
+	v, err := m.CreateContainerView(ctx, c.ServiceContent.RootFolder, []string{}, true)
+	if err != nil {
+		return nil, err
+	}
+
+	p := performance.NewManager(c.Client)
+
+	sw.Stop()
+
+	return &Client{
+		Client: c,
+		Views:  m,
+		Root:   v,
+		Perf:   p,
+		Valid:  true,
+	}, nil
+}
+
+// Close shuts down a ClientFactory and releases any resources associated with it.
+func (cf *ClientFactory) Close() {
+	cf.mux.Lock()
+	defer cf.mux.Unlock()
+	if cf.client != nil {
+		cf.client.close()
+	}
+}
+
+func (c *Client) close() {
+
+	// Use a Once to prevent us from panics stemming from trying
+	// to close it multiple times.
+	c.closeGate.Do(func() {
+		ctx := context.Background()
+		if c.Views != nil {
+			c.Views.Destroy(ctx)
+
+		}
+		if c.Client != nil {
+			c.Client.Logout(ctx)
+		}
+	})
+}
diff --git a/plugins/inputs/vsphere/endpoint.go b/plugins/inputs/vsphere/endpoint.go
new file mode 100644
index 00000000..cad4dec0
--- /dev/null
+++ b/plugins/inputs/vsphere/endpoint.go
@@ -0,0 +1,852 @@
+package vsphere
+
+import (
+	"context"
+	"fmt"
+	"log"
+	"net/url"
+	"strconv"
+	"strings"
+	"sync"
+	"sync/atomic"
+	"time"
+
+	"github.com/influxdata/telegraf/filter"
+
+	"github.com/influxdata/telegraf"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/performance"
+	"github.com/vmware/govmomi/view"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+// Endpoint is a high-level representation of a connected vCenter endpoint. It is backed by the lower
+// level Client type.
+type Endpoint struct {
+	Parent          *VSphere
+	URL             *url.URL
+	lastColls       map[string]time.Time
+	instanceInfo    map[string]resourceInfo
+	resourceKinds   map[string]resourceKind
+	discoveryTicker *time.Ticker
+	collectMux      sync.RWMutex
+	initialized     bool
+	clientFactory   *ClientFactory
+	busy            sync.Mutex
+}
+
+type resourceKind struct {
+	name             string
+	pKey             string
+	parentTag        string
+	enabled          bool
+	realTime         bool
+	sampling         int32
+	objects          objectMap
+	filters          filter.Filter
+	collectInstances bool
+	getObjects       func(context.Context, *view.ContainerView) (objectMap, error)
+}
+
+type metricEntry struct {
+	tags   map[string]string
+	name   string
+	ts     time.Time
+	fields map[string]interface{}
+}
+
+type objectMap map[string]objectRef
+
+type objectRef struct {
+	name      string
+	ref       types.ManagedObjectReference
+	parentRef *types.ManagedObjectReference //Pointer because it must be nillable
+	guest     string
+	dcname    string
+}
+
+type resourceInfo struct {
+	name      string
+	metrics   performance.MetricList
+	parentRef *types.ManagedObjectReference
+}
+
+type metricQRequest struct {
+	res *resourceKind
+	obj objectRef
+}
+
+type metricQResponse struct {
+	obj     objectRef
+	metrics *performance.MetricList
+}
+
+type multiError []error
+
+// NewEndpoint returns a new connection to a vCenter based on the URL and configuration passed
+// as parameters.
+func NewEndpoint(ctx context.Context, parent *VSphere, url *url.URL) (*Endpoint, error) {
+	e := Endpoint{
+		URL:           url,
+		Parent:        parent,
+		lastColls:     make(map[string]time.Time),
+		instanceInfo:  make(map[string]resourceInfo),
+		initialized:   false,
+		clientFactory: NewClientFactory(ctx, url, parent),
+	}
+
+	e.resourceKinds = map[string]resourceKind{
+		"datacenter": {
+			name:             "datacenter",
+			pKey:             "dcname",
+			parentTag:        "",
+			enabled:          anythingEnabled(parent.DatacenterMetricExclude),
+			realTime:         false,
+			sampling:         300,
+			objects:          make(objectMap),
+			filters:          newFilterOrPanic(parent.DatacenterMetricInclude, parent.DatacenterMetricExclude),
+			collectInstances: parent.DatacenterInstances,
+			getObjects:       getDatacenters,
+		},
+		"cluster": {
+			name:             "cluster",
+			pKey:             "clustername",
+			parentTag:        "dcname",
+			enabled:          anythingEnabled(parent.ClusterMetricExclude),
+			realTime:         false,
+			sampling:         300,
+			objects:          make(objectMap),
+			filters:          newFilterOrPanic(parent.ClusterMetricInclude, parent.ClusterMetricExclude),
+			collectInstances: parent.ClusterInstances,
+			getObjects:       getClusters,
+		},
+		"host": {
+			name:             "host",
+			pKey:             "esxhostname",
+			parentTag:        "clustername",
+			enabled:          anythingEnabled(parent.HostMetricExclude),
+			realTime:         true,
+			sampling:         20,
+			objects:          make(objectMap),
+			filters:          newFilterOrPanic(parent.HostMetricInclude, parent.HostMetricExclude),
+			collectInstances: parent.HostInstances,
+			getObjects:       getHosts,
+		},
+		"vm": {
+			name:             "vm",
+			pKey:             "vmname",
+			parentTag:        "esxhostname",
+			enabled:          anythingEnabled(parent.VMMetricExclude),
+			realTime:         true,
+			sampling:         20,
+			objects:          make(objectMap),
+			filters:          newFilterOrPanic(parent.VMMetricInclude, parent.VMMetricExclude),
+			collectInstances: parent.VMInstances,
+			getObjects:       getVMs,
+		},
+		"datastore": {
+			name:             "datastore",
+			pKey:             "dsname",
+			enabled:          anythingEnabled(parent.DatastoreMetricExclude),
+			realTime:         false,
+			sampling:         300,
+			objects:          make(objectMap),
+			filters:          newFilterOrPanic(parent.DatastoreMetricInclude, parent.DatastoreMetricExclude),
+			collectInstances: parent.DatastoreInstances,
+			getObjects:       getDatastores,
+		},
+	}
+
+	// Start discover and other goodness
+	err := e.init(ctx)
+
+	return &e, err
+}
+
+func (m multiError) Error() string {
+	switch len(m) {
+	case 0:
+		return "No error recorded. Something is wrong!"
+	case 1:
+		return m[0].Error()
+	default:
+		s := "Multiple errors detected concurrently: "
+		for i, e := range m {
+			if i != 0 {
+				s += ", "
+			}
+			s += e.Error()
+		}
+		return s
+	}
+}
+
+func anythingEnabled(ex []string) bool {
+	for _, s := range ex {
+		if s == "*" {
+			return false
+		}
+	}
+	return true
+}
+
+func newFilterOrPanic(include []string, exclude []string) filter.Filter {
+	f, err := filter.NewIncludeExcludeFilter(include, exclude)
+	if err != nil {
+		panic(fmt.Sprintf("Include/exclude filters are invalid: %s", err))
+	}
+	return f
+}
+
+func (e *Endpoint) startDiscovery(ctx context.Context) {
+	e.discoveryTicker = time.NewTicker(e.Parent.ObjectDiscoveryInterval.Duration)
+	go func() {
+		for {
+			select {
+			case <-e.discoveryTicker.C:
+				err := e.discover(ctx)
+				if err != nil && err != context.Canceled {
+					log.Printf("E! [input.vsphere]: Error in discovery for %s: %v", e.URL.Host, err)
+				}
+			case <-ctx.Done():
+				log.Printf("D! [input.vsphere]: Exiting discovery goroutine for %s", e.URL.Host)
+				e.discoveryTicker.Stop()
+				return
+			}
+		}
+	}()
+}
+
+func (e *Endpoint) initalDiscovery(ctx context.Context) {
+	err := e.discover(ctx)
+	if err != nil && err != context.Canceled {
+		log.Printf("E! [input.vsphere]: Error in discovery for %s: %v", e.URL.Host, err)
+	}
+	e.startDiscovery(ctx)
+}
+
+func (e *Endpoint) init(ctx context.Context) error {
+
+	if e.Parent.ObjectDiscoveryInterval.Duration > 0 {
+
+		// Run an initial discovery. If force_discovery_on_init isn't set, we kick it off as a
+		// goroutine without waiting for it. This will probably cause us to report an empty
+		// dataset on the first collection, but it solves the issue of the first collection timing out.
+		if e.Parent.ForceDiscoverOnInit {
+			log.Printf("D! [input.vsphere]: Running initial discovery and waiting for it to finish")
+			e.initalDiscovery(ctx)
+		} else {
+			// Otherwise, just run it in the background. We'll probably have an incomplete first metric
+			// collection this way.
+			go e.initalDiscovery(ctx)
+		}
+	}
+	e.initialized = true
+	return nil
+}
+
+func (e *Endpoint) getMetricNameMap(ctx context.Context) (map[int32]string, error) {
+	client, err := e.clientFactory.GetClient(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	mn, err := client.Perf.CounterInfoByName(ctx)
+
+	if err != nil {
+		return nil, err
+	}
+	names := make(map[int32]string)
+	for name, m := range mn {
+		names[m.Key] = name
+	}
+	return names, nil
+}
+
+func (e *Endpoint) getMetadata(ctx context.Context, in interface{}) interface{} {
+	client, err := e.clientFactory.GetClient(ctx)
+	if err != nil {
+		return err
+	}
+
+	rq := in.(*metricQRequest)
+	metrics, err := client.Perf.AvailableMetric(ctx, rq.obj.ref.Reference(), rq.res.sampling)
+	if err != nil && err != context.Canceled {
+		log.Printf("E! [input.vsphere]: Error while getting metric metadata. Discovery will be incomplete. Error: %s", err)
+	}
+	return &metricQResponse{metrics: &metrics, obj: rq.obj}
+}
+
+func (e *Endpoint) getDatacenterName(ctx context.Context, client *Client, cache map[string]string, r types.ManagedObjectReference) string {
+	path := make([]string, 0)
+	returnVal := ""
+	here := r
+	for {
+		if name, ok := cache[here.Reference().String()]; ok {
+			// Populate cache for the entire chain of objects leading here.
+			returnVal = name
+			break
+		}
+		path = append(path, here.Reference().String())
+		o := object.NewCommon(client.Client.Client, r)
+		var result mo.ManagedEntity
+		err := o.Properties(ctx, here, []string{"parent", "name"}, &result)
+		if err != nil {
+			log.Printf("W! [input.vsphere]: Error while resolving parent. Assuming no parent exists. Error: %s", err)
+			break
+		}
+		if result.Reference().Type == "Datacenter" {
+			// Populate cache for the entire chain of objects leading here.
+			returnVal = result.Name
+			break
+		}
+		if result.Parent == nil {
+			log.Printf("D! [input.vsphere]: No parent found for %s (ascending from %s)", here.Reference(), r.Reference())
+			break
+		}
+		here = result.Parent.Reference()
+	}
+	for _, s := range path {
+		cache[s] = returnVal
+	}
+	return returnVal
+}
+
+func (e *Endpoint) discover(ctx context.Context) error {
+	e.busy.Lock()
+	defer e.busy.Unlock()
+	if ctx.Err() != nil {
+		return ctx.Err()
+	}
+
+	metricNames, err := e.getMetricNameMap(ctx)
+	if err != nil {
+		return err
+	}
+
+	sw := NewStopwatch("discover", e.URL.Host)
+
+	client, err := e.clientFactory.GetClient(ctx)
+	if err != nil {
+		return err
+	}
+
+	log.Printf("D! [input.vsphere]: Discover new objects for %s", e.URL.Host)
+
+	instInfo := make(map[string]resourceInfo)
+	resourceKinds := make(map[string]resourceKind)
+	dcNameCache := make(map[string]string)
+
+	// Populate resource objects, and endpoint instance info.
+	for k, res := range e.resourceKinds {
+		log.Printf("D! [input.vsphere] Discovering resources for %s", res.name)
+		// Need to do this for all resource types even if they are not enabled (but datastore)
+		if res.enabled || (k != "datastore" && k != "vm") {
+			objects, err := res.getObjects(ctx, client.Root)
+			if err != nil {
+				return err
+			}
+
+			// Fill in datacenter names where available (no need to do it for Datacenters)
+			if res.name != "Datacenter" {
+				for k, obj := range objects {
+					if obj.parentRef != nil {
+						obj.dcname = e.getDatacenterName(ctx, client, dcNameCache, *obj.parentRef)
+						objects[k] = obj
+					}
+				}
+			}
+
+			// Set up a worker pool for processing metadata queries concurrently
+			wp := NewWorkerPool(10)
+			wp.Run(ctx, e.getMetadata, e.Parent.DiscoverConcurrency)
+
+			// Fill the input channels with resources that need to be queried
+			// for metadata.
+			wp.Fill(ctx, func(ctx context.Context, f PushFunc) {
+				for _, obj := range objects {
+					f(ctx, &metricQRequest{obj: obj, res: &res})
+				}
+			})
+
+			// Drain the resulting metadata and build instance infos.
+			wp.Drain(ctx, func(ctx context.Context, in interface{}) bool {
+				switch resp := in.(type) {
+				case *metricQResponse:
+					mList := make(performance.MetricList, 0)
+					if res.enabled {
+						for _, m := range *resp.metrics {
+							if m.Instance != "" && !res.collectInstances {
+								continue
+							}
+							if res.filters.Match(metricNames[m.CounterId]) {
+								mList = append(mList, m)
+							}
+						}
+					}
+					instInfo[resp.obj.ref.Value] = resourceInfo{name: resp.obj.name, metrics: mList, parentRef: resp.obj.parentRef}
+				case error:
+					log.Printf("W! [input.vsphere]: Error while discovering resources: %s", resp)
+					return false
+				}
+				return true
+			})
+			res.objects = objects
+			resourceKinds[k] = res
+		}
+	}
+
+	// Atomically swap maps
+	//
+	e.collectMux.Lock()
+	defer e.collectMux.Unlock()
+
+	e.instanceInfo = instInfo
+	e.resourceKinds = resourceKinds
+
+	sw.Stop()
+	SendInternalCounter("discovered_objects", e.URL.Host, int64(len(instInfo)))
+	return nil
+}
+
+func getDatacenters(ctx context.Context, root *view.ContainerView) (objectMap, error) {
+	var resources []mo.Datacenter
+	err := root.Retrieve(ctx, []string{"Datacenter"}, []string{"name", "parent"}, &resources)
+	if err != nil {
+		return nil, err
+	}
+	m := make(objectMap, len(resources))
+	for _, r := range resources {
+		m[r.ExtensibleManagedObject.Reference().Value] = objectRef{
+			name: r.Name, ref: r.ExtensibleManagedObject.Reference(), parentRef: r.Parent, dcname: r.Name}
+	}
+	return m, nil
+}
+
+func getClusters(ctx context.Context, root *view.ContainerView) (objectMap, error) {
+	var resources []mo.ClusterComputeResource
+	err := root.Retrieve(ctx, []string{"ClusterComputeResource"}, []string{"name", "parent"}, &resources)
+	if err != nil {
+		return nil, err
+	}
+	cache := make(map[string]*types.ManagedObjectReference)
+	m := make(objectMap, len(resources))
+	for _, r := range resources {
+		// We're not interested in the immediate parent (a folder), but the data center.
+		p, ok := cache[r.Parent.Value]
+		if !ok {
+			o := object.NewFolder(root.Client(), *r.Parent)
+			var folder mo.Folder
+			err := o.Properties(ctx, *r.Parent, []string{"parent"}, &folder)
+			if err != nil {
+				log.Printf("W! [input.vsphere] Error while getting folder parent: %e", err)
+				p = nil
+			} else {
+				pp := folder.Parent.Reference()
+				p = &pp
+				cache[r.Parent.Value] = p
+			}
+		}
+		m[r.ExtensibleManagedObject.Reference().Value] = objectRef{
+			name: r.Name, ref: r.ExtensibleManagedObject.Reference(), parentRef: p}
+	}
+	return m, nil
+}
+
+func getHosts(ctx context.Context, root *view.ContainerView) (objectMap, error) {
+	var resources []mo.HostSystem
+	err := root.Retrieve(ctx, []string{"HostSystem"}, []string{"name", "parent"}, &resources)
+	if err != nil {
+		return nil, err
+	}
+	m := make(objectMap)
+	for _, r := range resources {
+		m[r.ExtensibleManagedObject.Reference().Value] = objectRef{
+			name: r.Name, ref: r.ExtensibleManagedObject.Reference(), parentRef: r.Parent}
+	}
+	return m, nil
+}
+
+func getVMs(ctx context.Context, root *view.ContainerView) (objectMap, error) {
+	var resources []mo.VirtualMachine
+	err := root.Retrieve(ctx, []string{"VirtualMachine"}, []string{"name", "runtime.host", "config.guestId"}, &resources)
+	if err != nil {
+		return nil, err
+	}
+	m := make(objectMap)
+	for _, r := range resources {
+		var guest string
+		// Sometimes Config is unknown and returns a nil pointer
+		//
+		if r.Config != nil {
+			guest = cleanGuestID(r.Config.GuestId)
+		} else {
+			guest = "unknown"
+		}
+		m[r.ExtensibleManagedObject.Reference().Value] = objectRef{
+			name: r.Name, ref: r.ExtensibleManagedObject.Reference(), parentRef: r.Runtime.Host, guest: guest}
+	}
+	return m, nil
+}
+
+func getDatastores(ctx context.Context, root *view.ContainerView) (objectMap, error) {
+	var resources []mo.Datastore
+	err := root.Retrieve(ctx, []string{"Datastore"}, []string{"name", "parent"}, &resources)
+	if err != nil {
+		return nil, err
+	}
+	m := make(objectMap)
+	for _, r := range resources {
+		m[r.ExtensibleManagedObject.Reference().Value] = objectRef{
+			name: r.Name, ref: r.ExtensibleManagedObject.Reference(), parentRef: r.Parent}
+	}
+	return m, nil
+}
+
+// Close shuts down an Endpoint and releases any resources associated with it.
+func (e *Endpoint) Close() {
+	e.clientFactory.Close()
+}
+
+// Collect runs a round of data collections as specified in the configuration.
+func (e *Endpoint) Collect(ctx context.Context, acc telegraf.Accumulator) error {
+	// If we never managed to do a discovery, collection will be a no-op. Therefore,
+	// we need to check that a connection is available, or the collection will
+	// silently fail.
+	//
+	if _, err := e.clientFactory.GetClient(ctx); err != nil {
+		return err
+	}
+
+	e.collectMux.RLock()
+	defer e.collectMux.RUnlock()
+
+	if ctx.Err() != nil {
+		return ctx.Err()
+	}
+
+	// If discovery interval is disabled (0), discover on each collection cycle
+	//
+	if e.Parent.ObjectDiscoveryInterval.Duration == 0 {
+		err := e.discover(ctx)
+		if err != nil {
+			return err
+		}
+	}
+	for k, res := range e.resourceKinds {
+		if res.enabled {
+			err := e.collectResource(ctx, k, acc)
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
+func (e *Endpoint) chunker(ctx context.Context, f PushFunc, res *resourceKind, now time.Time, latest time.Time) {
+	pqs := make([]types.PerfQuerySpec, 0, e.Parent.MaxQueryObjects)
+	metrics := 0
+	total := 0
+	nRes := 0
+	for _, object := range res.objects {
+		info, found := e.instanceInfo[object.ref.Value]
+		if !found {
+			log.Printf("E! [input.vsphere]: Internal error: Instance info not found for MOID %s", object.ref)
+		}
+		mr := len(info.metrics)
+		for mr > 0 {
+			mc := mr
+			headroom := e.Parent.MaxQueryMetrics - metrics
+			if !res.realTime && mc > headroom { // Metric query limit only applies to non-realtime metrics
+				mc = headroom
+			}
+			fm := len(info.metrics) - mr
+			pq := types.PerfQuerySpec{
+				Entity:     object.ref,
+				MaxSample:  1,
+				MetricId:   info.metrics[fm : fm+mc],
+				IntervalId: res.sampling,
+			}
+
+			if !res.realTime {
+				pq.StartTime = &latest
+				pq.EndTime = &now
+			}
+			pqs = append(pqs, pq)
+			mr -= mc
+			metrics += mc
+
+			// We need to dump the current chunk of metrics for one of two reasons:
+			// 1) We filled up the metric quota while processing the current resource
+			// 2) We are at the last resource and have no more data to process.
+			if mr > 0 || (!res.realTime && metrics >= e.Parent.MaxQueryMetrics) || nRes >= e.Parent.MaxQueryObjects {
+				log.Printf("D! [input.vsphere]: Querying %d objects, %d metrics (%d remaining) of type %s for %s. Processed objects: %d. Total objects %d",
+					len(pqs), metrics, mr, res.name, e.URL.Host, total+1, len(res.objects))
+
+				// To prevent deadlocks, don't send work items if the context has been cancelled.
+				if ctx.Err() == context.Canceled {
+					return
+				}
+
+				// Call push function
+				f(ctx, pqs)
+				pqs = make([]types.PerfQuerySpec, 0, e.Parent.MaxQueryObjects)
+				metrics = 0
+				nRes = 0
+			}
+		}
+		total++
+		nRes++
+	}
+	// There may be dangling stuff in the queue. Handle them
+	//
+	if len(pqs) > 0 {
+		// Call push function
+		f(ctx, pqs)
+	}
+}
+
+func (e *Endpoint) collectResource(ctx context.Context, resourceType string, acc telegraf.Accumulator) error {
+
+	// Do we have new data yet?
+	res := e.resourceKinds[resourceType]
+	now := time.Now()
+	latest, hasLatest := e.lastColls[resourceType]
+	if hasLatest {
+		elapsed := time.Now().Sub(latest).Seconds() + 5.0 // Allow 5 second jitter.
+		log.Printf("D! [input.vsphere]: Latest: %s, elapsed: %f, resource: %s", latest, elapsed, resourceType)
+		if !res.realTime && elapsed < float64(res.sampling) {
+			// No new data would be available. We're outta herE! [input.vsphere]:
+			log.Printf("D! [input.vsphere]: Sampling period for %s of %d has not elapsed for %s",
+				resourceType, res.sampling, e.URL.Host)
+			return nil
+		}
+	} else {
+		latest = time.Now().Add(time.Duration(-res.sampling) * time.Second)
+	}
+
+	internalTags := map[string]string{"resourcetype": resourceType}
+	sw := NewStopwatchWithTags("gather_duration", e.URL.Host, internalTags)
+
+	log.Printf("D! [input.vsphere]: Start of sample period deemed to be %s", latest)
+	log.Printf("D! [input.vsphere]: Collecting metrics for %d objects of type %s for %s",
+		len(res.objects), resourceType, e.URL.Host)
+
+	count := int64(0)
+
+	// Set up a worker pool for collecting chunk metrics
+	wp := NewWorkerPool(10)
+	wp.Run(ctx, func(ctx context.Context, in interface{}) interface{} {
+		chunk := in.([]types.PerfQuerySpec)
+		n, err := e.collectChunk(ctx, chunk, resourceType, res, acc)
+		log.Printf("D! [input.vsphere]: Query returned %d metrics", n)
+		if err != nil {
+			return err
+		}
+		atomic.AddInt64(&count, int64(n))
+		return nil
+
+	}, e.Parent.CollectConcurrency)
+
+	// Fill the input channel of the worker queue by running the chunking
+	// logic implemented in chunker()
+	wp.Fill(ctx, func(ctx context.Context, f PushFunc) {
+		e.chunker(ctx, f, &res, now, latest)
+	})
+
+	// Drain the pool. We're getting errors back. They should all be nil
+	var mux sync.Mutex
+	err := make(multiError, 0)
+	wp.Drain(ctx, func(ctx context.Context, in interface{}) bool {
+		if in != nil {
+			mux.Unlock()
+			defer mux.Unlock()
+			err = append(err, in.(error))
+			return false
+		}
+		return true
+	})
+	e.lastColls[resourceType] = now // Use value captured at the beginning to avoid blind spots.
+
+	sw.Stop()
+	SendInternalCounterWithTags("gather_count", e.URL.Host, internalTags, count)
+	if len(err) > 0 {
+		return err
+	}
+	return nil
+}
+
+func (e *Endpoint) collectChunk(ctx context.Context, pqs []types.PerfQuerySpec, resourceType string,
+	res resourceKind, acc telegraf.Accumulator) (int, error) {
+	count := 0
+	prefix := "vsphere" + e.Parent.Separator + resourceType
+
+	client, err := e.clientFactory.GetClient(ctx)
+	if err != nil {
+		return 0, err
+	}
+
+	metricInfo, err := client.Perf.CounterInfoByName(ctx)
+	if err != nil {
+		return count, err
+	}
+
+	metrics, err := client.Perf.Query(ctx, pqs)
+	if err != nil {
+		return count, err
+	}
+
+	ems, err := client.Perf.ToMetricSeries(ctx, metrics)
+	if err != nil {
+		return count, err
+	}
+
+	// Iterate through results
+	for _, em := range ems {
+		moid := em.Entity.Reference().Value
+		instInfo, found := e.instanceInfo[moid]
+		if !found {
+			log.Printf("E! [input.vsphere]: MOID %s not found in cache. Skipping! (This should not happen!)", moid)
+			continue
+		}
+		buckets := make(map[string]metricEntry)
+		for _, v := range em.Value {
+			name := v.Name
+			t := map[string]string{
+				"vcenter": e.URL.Host,
+				"source":  instInfo.name,
+				"moid":    moid,
+			}
+
+			// Populate tags
+			objectRef, ok := res.objects[moid]
+			if !ok {
+				log.Printf("E! [input.vsphere]: MOID %s not found in cache. Skipping", moid)
+				continue
+			}
+			e.populateTags(&objectRef, resourceType, &res, t, &v)
+
+			// Now deal with the values
+			for idx, value := range v.Value {
+				ts := em.SampleInfo[idx].Timestamp
+
+				// Organize the metrics into a bucket per measurement.
+				// Data SHOULD be presented to us with the same timestamp for all samples, but in case
+				// they don't we use the measurement name + timestamp as the key for the bucket.
+				mn, fn := e.makeMetricIdentifier(prefix, name)
+				bKey := mn + " " + v.Instance + " " + strconv.FormatInt(ts.UnixNano(), 10)
+				bucket, found := buckets[bKey]
+				if !found {
+					bucket = metricEntry{name: mn, ts: ts, fields: make(map[string]interface{}), tags: t}
+					buckets[bKey] = bucket
+				}
+				if value < 0 {
+					log.Printf("D! [input.vsphere]: Negative value for %s on %s. Indicates missing samples", name, objectRef.name)
+					continue
+				}
+
+				// Percentage values must be scaled down by 100.
+				info, ok := metricInfo[name]
+				if !ok {
+					log.Printf("E! [input.vsphere]: Could not determine unit for %s. Skipping", name)
+				}
+				if info.UnitInfo.GetElementDescription().Key == "percent" {
+					bucket.fields[fn] = float64(value) / 100.0
+				} else {
+					bucket.fields[fn] = value
+				}
+				count++
+			}
+		}
+		// We've iterated through all the metrics and collected buckets for each
+		// measurement name. Now emit them!
+		for _, bucket := range buckets {
+			acc.AddFields(bucket.name, bucket.fields, bucket.tags, bucket.ts)
+		}
+	}
+	return count, nil
+}
+
+func (e *Endpoint) getParent(obj resourceInfo) (resourceInfo, bool) {
+	p := obj.parentRef
+	if p == nil {
+		log.Printf("D! [input.vsphere] No parent found for %s", obj.name)
+		return resourceInfo{}, false
+	}
+	r, ok := e.instanceInfo[p.Value]
+	return r, ok
+}
+
+func (e *Endpoint) populateTags(objectRef *objectRef, resourceType string, resource *resourceKind, t map[string]string, v *performance.MetricSeries) {
+	// Map name of object.
+	if resource.pKey != "" {
+		t[resource.pKey] = objectRef.name
+	}
+
+	// Map parent reference
+	parent, found := e.instanceInfo[objectRef.parentRef.Value]
+	if found {
+		t[resource.parentTag] = parent.name
+		if resourceType == "vm" {
+			if objectRef.guest != "" {
+				t["guest"] = objectRef.guest
+			}
+			if c, ok := e.getParent(parent); ok {
+				t["clustername"] = c.name
+			}
+		}
+	}
+
+	// Fill in Datacenter name
+	if objectRef.dcname != "" {
+		t["dcname"] = objectRef.dcname
+	}
+
+	// Determine which point tag to map to the instance
+	name := v.Name
+	instance := "instance-total"
+	if v.Instance != "" {
+		instance = v.Instance
+	}
+	if strings.HasPrefix(name, "cpu.") {
+		t["cpu"] = instance
+	} else if strings.HasPrefix(name, "datastore.") {
+		t["lun"] = instance
+	} else if strings.HasPrefix(name, "disk.") {
+		t["disk"] = cleanDiskTag(instance)
+	} else if strings.HasPrefix(name, "net.") {
+		t["interface"] = instance
+	} else if strings.HasPrefix(name, "storageAdapter.") {
+		t["adapter"] = instance
+	} else if strings.HasPrefix(name, "storagePath.") {
+		t["path"] = instance
+	} else if strings.HasPrefix(name, "sys.resource") {
+		t["resource"] = instance
+	} else if strings.HasPrefix(name, "vflashModule.") {
+		t["module"] = instance
+	} else if strings.HasPrefix(name, "virtualDisk.") {
+		t["disk"] = instance
+	} else if v.Instance != "" {
+		// default
+		t["instance"] = v.Instance
+	}
+}
+
+func (e *Endpoint) makeMetricIdentifier(prefix, metric string) (string, string) {
+	parts := strings.Split(metric, ".")
+	if len(parts) == 1 {
+		return prefix, parts[0]
+	}
+	return prefix + e.Parent.Separator + parts[0], strings.Join(parts[1:], e.Parent.Separator)
+}
+
+func cleanGuestID(id string) string {
+	return strings.TrimSuffix(id, "Guest")
+}
+
+func cleanDiskTag(disk string) string {
+	// Remove enclosing "<>"
+	return strings.TrimSuffix(strings.TrimPrefix(disk, "<"), ">")
+}
diff --git a/plugins/inputs/vsphere/selfhealth.go b/plugins/inputs/vsphere/selfhealth.go
new file mode 100644
index 00000000..66069ca7
--- /dev/null
+++ b/plugins/inputs/vsphere/selfhealth.go
@@ -0,0 +1,53 @@
+package vsphere
+
+import (
+	"time"
+
+	"github.com/influxdata/telegraf/selfstat"
+)
+
+// Stopwatch is a simple helper for recording timing information,
+// such as gather times and discovery times.
+type Stopwatch struct {
+	stat  selfstat.Stat
+	start time.Time
+}
+
+// NewStopwatch creates a new StopWatch and starts measuring time
+// its creation.
+func NewStopwatch(name, vCenter string) *Stopwatch {
+	return &Stopwatch{
+		stat:  selfstat.RegisterTiming("vsphere", name+"_ns", map[string]string{"vcenter": vCenter}),
+		start: time.Now(),
+	}
+}
+
+// NewStopwatchWithTags creates a new StopWatch and starts measuring time
+// its creation. Allows additional tags.
+func NewStopwatchWithTags(name, vCenter string, tags map[string]string) *Stopwatch {
+	tags["vcenter"] = vCenter
+	return &Stopwatch{
+		stat:  selfstat.RegisterTiming("vsphere", name+"_ns", tags),
+		start: time.Now(),
+	}
+}
+
+// Stop stops a Stopwatch and records the time.
+func (s *Stopwatch) Stop() {
+	s.stat.Set(time.Since(s.start).Nanoseconds())
+}
+
+// SendInternalCounter is a convenience method for sending
+// non-timing internal metrics.
+func SendInternalCounter(name, vCenter string, value int64) {
+	s := selfstat.Register("vsphere", name, map[string]string{"vcenter": vCenter})
+	s.Set(value)
+}
+
+// SendInternalCounterWithTags is a convenience method for sending
+// non-timing internal metrics. Allows additional tags
+func SendInternalCounterWithTags(name, vCenter string, tags map[string]string, value int64) {
+	tags["vcenter"] = vCenter
+	s := selfstat.Register("vsphere", name, tags)
+	s.Set(value)
+}
diff --git a/plugins/inputs/vsphere/vsphere.go b/plugins/inputs/vsphere/vsphere.go
new file mode 100644
index 00000000..26af1e8c
--- /dev/null
+++ b/plugins/inputs/vsphere/vsphere.go
@@ -0,0 +1,312 @@
+package vsphere
+
+import (
+	"context"
+	"log"
+	"sync"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
+	"github.com/influxdata/telegraf/plugins/inputs"
+	"github.com/vmware/govmomi/vim25/soap"
+)
+
+// VSphere is the top level type for the vSphere input plugin. It contains all the configuration
+// and a list of connected vSphere endpoints
+type VSphere struct {
+	Vcenters                []string
+	Username                string
+	Password                string
+	DatacenterInstances     bool
+	DatacenterMetricInclude []string
+	DatacenterMetricExclude []string
+	ClusterInstances        bool
+	ClusterMetricInclude    []string
+	ClusterMetricExclude    []string
+	HostInstances           bool
+	HostMetricInclude       []string
+	HostMetricExclude       []string
+	VMInstances             bool     `toml:"vm_instances"`
+	VMMetricInclude         []string `toml:"vm_metric_include"`
+	VMMetricExclude         []string `toml:"vm_metric_exclude"`
+	DatastoreInstances      bool
+	DatastoreMetricInclude  []string
+	DatastoreMetricExclude  []string
+	Separator               string
+
+	MaxQueryObjects         int
+	MaxQueryMetrics         int
+	CollectConcurrency      int
+	DiscoverConcurrency     int
+	ForceDiscoverOnInit     bool
+	ObjectDiscoveryInterval internal.Duration
+	Timeout                 internal.Duration
+
+	endpoints []*Endpoint
+	cancel    context.CancelFunc
+
+	// Mix in the TLS/SSL goodness from core
+	tls.ClientConfig
+}
+
+var sampleConfig = `
+  ## List of vCenter URLs to be monitored. These three lines must be uncommented
+  ## and edited for the plugin to work.
+  vcenters = [ "https://vcenter.local/sdk" ]
+  username = "user@corp.local"
+  password = "secret"
+
+  ## VMs
+  ## Typical VM metrics (if omitted or empty, all metrics are collected)
+  vm_metric_include = [
+    "cpu.demand.average",
+    "cpu.idle.summation",
+    "cpu.latency.average",
+    "cpu.readiness.average",
+    "cpu.ready.summation",
+    "cpu.run.summation",
+    "cpu.usagemhz.average",
+    "cpu.used.summation",
+    "cpu.wait.summation",
+    "mem.active.average",
+    "mem.granted.average",
+    "mem.latency.average",
+    "mem.swapin.average",
+    "mem.swapinRate.average",
+    "mem.swapout.average",
+    "mem.swapoutRate.average",
+    "mem.usage.average",
+    "mem.vmmemctl.average",
+    "net.bytesRx.average",
+    "net.bytesTx.average",
+    "net.droppedRx.summation",
+    "net.droppedTx.summation",
+    "net.usage.average",
+    "power.power.average",    
+    "virtualDisk.numberReadAveraged.average",
+    "virtualDisk.numberWriteAveraged.average",
+    "virtualDisk.read.average",
+    "virtualDisk.readOIO.latest",
+    "virtualDisk.throughput.usage.average",
+    "virtualDisk.totalReadLatency.average",
+    "virtualDisk.totalWriteLatency.average",
+    "virtualDisk.write.average",
+    "virtualDisk.writeOIO.latest",
+    "sys.uptime.latest",
+  ]
+  # vm_metric_exclude = [] ## Nothing is excluded by default
+  # vm_instances = true ## true by default
+
+  ## Hosts 
+  ## Typical host metrics (if omitted or empty, all metrics are collected)
+  host_metric_include = [
+    "cpu.coreUtilization.average",
+    "cpu.costop.summation",
+    "cpu.demand.average",
+    "cpu.idle.summation",
+    "cpu.latency.average",
+    "cpu.readiness.average",
+    "cpu.ready.summation",
+    "cpu.swapwait.summation",
+    "cpu.usage.average",
+    "cpu.usagemhz.average",
+    "cpu.used.summation",
+    "cpu.utilization.average",
+    "cpu.wait.summation",
+    "disk.deviceReadLatency.average",
+    "disk.deviceWriteLatency.average",
+    "disk.kernelReadLatency.average",
+    "disk.kernelWriteLatency.average",
+    "disk.numberReadAveraged.average",
+    "disk.numberWriteAveraged.average",
+    "disk.read.average",
+    "disk.totalReadLatency.average",
+    "disk.totalWriteLatency.average",
+    "disk.write.average",
+    "mem.active.average",
+    "mem.latency.average",
+    "mem.state.latest",
+    "mem.swapin.average",
+    "mem.swapinRate.average",
+    "mem.swapout.average",
+    "mem.swapoutRate.average",
+    "mem.totalCapacity.average",
+    "mem.usage.average",
+    "mem.vmmemctl.average",
+    "net.bytesRx.average",
+    "net.bytesTx.average",
+    "net.droppedRx.summation",
+    "net.droppedTx.summation",
+    "net.errorsRx.summation",
+    "net.errorsTx.summation",
+    "net.usage.average",
+    "power.power.average",
+    "storageAdapter.numberReadAveraged.average",
+    "storageAdapter.numberWriteAveraged.average",
+    "storageAdapter.read.average",
+    "storageAdapter.write.average",
+    "sys.uptime.latest",
+  ]
+  # host_metric_exclude = [] ## Nothing excluded by default
+  # host_instances = true ## true by default
+
+  ## Clusters 
+  # cluster_metric_include = [] ## if omitted or empty, all metrics are collected
+  # cluster_metric_exclude = [] ## Nothing excluded by default
+  # cluster_instances = true ## true by default
+
+  ## Datastores 
+  # datastore_metric_include = [] ## if omitted or empty, all metrics are collected
+  # datastore_metric_exclude = [] ## Nothing excluded by default
+  # datastore_instances = false ## false by default for Datastores only
+
+  ## Datacenters
+  datacenter_metric_include = [] ## if omitted or empty, all metrics are collected
+  datacenter_metric_exclude = [ "*" ] ## Datacenters are not collected by default.
+  # datacenter_instances = false ## false by default for Datastores only
+
+  ## Plugin Settings  
+  ## separator character to use for measurement and field names (default: "_")
+  # separator = "_"
+
+  ## number of objects to retreive per query for realtime resources (vms and hosts)
+  ## set to 64 for vCenter 5.5 and 6.0 (default: 256)
+  # max_query_objects = 256
+
+  ## number of metrics to retreive per query for non-realtime resources (clusters and datastores)
+  ## set to 64 for vCenter 5.5 and 6.0 (default: 256)
+  # max_query_metrics = 256
+
+  ## number of go routines to use for collection and discovery of objects and metrics
+  # collect_concurrency = 1
+  # discover_concurrency = 1
+
+  ## whether or not to force discovery of new objects on initial gather call before collecting metrics
+  ## when true for large environments this may cause errors for time elapsed while collecting metrics
+  ## when false (default) the first collection cycle may result in no or limited metrics while objects are discovered
+  # force_discover_on_init = false
+
+  ## the interval before (re)discovering objects subject to metrics collection (default: 300s)
+  # object_discovery_interval = "300s"
+
+  ## timeout applies to any of the api request made to vcenter
+  # timeout = "20s"
+
+  ## 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
+`
+
+// SampleConfig returns a set of default configuration to be used as a boilerplate when setting up
+// Telegraf.
+func (v *VSphere) SampleConfig() string {
+	return sampleConfig
+}
+
+// Description returns a short textual description of the plugin
+func (v *VSphere) Description() string {
+	return "Read metrics from VMware vCenter"
+}
+
+// Start is called from telegraf core when a plugin is started and allows it to
+// perform initialization tasks.
+func (v *VSphere) Start(acc telegraf.Accumulator) error {
+	log.Println("D! [input.vsphere]: Starting plugin")
+	ctx, cancel := context.WithCancel(context.Background())
+	v.cancel = cancel
+
+	// Create endpoints, one for each vCenter we're monitoring
+	v.endpoints = make([]*Endpoint, len(v.Vcenters))
+	for i, rawURL := range v.Vcenters {
+		u, err := soap.ParseURL(rawURL)
+		if err != nil {
+			return err
+		}
+		ep, err := NewEndpoint(ctx, v, u)
+		if err != nil {
+			return err
+		}
+		v.endpoints[i] = ep
+	}
+	return nil
+}
+
+// Stop is called from telegraf core when a plugin is stopped and allows it to
+// perform shutdown tasks.
+func (v *VSphere) Stop() {
+	log.Println("D! [input.vsphere]: Stopping plugin")
+	v.cancel()
+
+	// Wait for all endpoints to finish. No need to wait for
+	// Gather() to finish here, since it Stop() will only be called
+	// after the last Gather() has finished. We do, however, need to
+	// wait for any discovery to complete by trying to grab the
+	// "busy" mutex.
+	for _, ep := range v.endpoints {
+		log.Printf("D! [input.vsphere]: Waiting for endpoint %s to finish", ep.URL.Host)
+		func() {
+			ep.busy.Lock() // Wait until discovery is finished
+			defer ep.busy.Unlock()
+			ep.Close()
+		}()
+	}
+}
+
+// Gather is the main data collection function called by the Telegraf core. It performs all
+// the data collection and writes all metrics into the Accumulator passed as an argument.
+func (v *VSphere) Gather(acc telegraf.Accumulator) error {
+	var wg sync.WaitGroup
+	for _, ep := range v.endpoints {
+		wg.Add(1)
+		go func(endpoint *Endpoint) {
+			defer wg.Done()
+			err := endpoint.Collect(context.Background(), acc)
+			if err == context.Canceled {
+
+				// No need to signal errors if we were merely canceled.
+				err = nil
+			}
+			if err != nil {
+				acc.AddError(err)
+			}
+		}(ep)
+	}
+
+	wg.Wait()
+	return nil
+}
+
+func init() {
+	inputs.Add("vsphere", func() telegraf.Input {
+		return &VSphere{
+			Vcenters: []string{},
+
+			ClusterInstances:       true,
+			ClusterMetricInclude:   nil,
+			ClusterMetricExclude:   nil,
+			HostInstances:          true,
+			HostMetricInclude:      nil,
+			HostMetricExclude:      nil,
+			VMInstances:            true,
+			VMMetricInclude:        nil,
+			VMMetricExclude:        nil,
+			DatastoreInstances:     false,
+			DatastoreMetricInclude: nil,
+			DatastoreMetricExclude: nil,
+			Separator:              "_",
+
+			MaxQueryObjects:         256,
+			MaxQueryMetrics:         256,
+			CollectConcurrency:      1,
+			DiscoverConcurrency:     1,
+			ForceDiscoverOnInit:     false,
+			ObjectDiscoveryInterval: internal.Duration{Duration: time.Second * 300},
+			Timeout:                 internal.Duration{Duration: time.Second * 20},
+		}
+	})
+}
diff --git a/plugins/inputs/vsphere/vsphere_test.go b/plugins/inputs/vsphere/vsphere_test.go
new file mode 100644
index 00000000..20c61d92
--- /dev/null
+++ b/plugins/inputs/vsphere/vsphere_test.go
@@ -0,0 +1,246 @@
+package vsphere
+
+import (
+	"context"
+	"crypto/tls"
+	"fmt"
+	"regexp"
+	"sort"
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf/internal"
+	itls "github.com/influxdata/telegraf/internal/tls"
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/influxdata/toml"
+	"github.com/stretchr/testify/require"
+	"github.com/vmware/govmomi/simulator"
+)
+
+var configHeader = `
+# 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
+`
+
+func defaultVSphere() *VSphere {
+	return &VSphere{
+		ClusterMetricInclude: []string{
+			"cpu.usage.*",
+			"cpu.usagemhz.*",
+			"mem.usage.*",
+			"mem.active.*"},
+		ClusterMetricExclude: nil,
+		HostMetricInclude: []string{
+			"cpu.ready.summation.delta.millisecond",
+			"cpu.latency.average.rate.percent",
+			"cpu.coreUtilization.average.rate.percent",
+			"mem.usage.average.absolute.percent",
+			"mem.swapinRate.average.rate.kiloBytesPerSecond",
+			"mem.state.latest.absolute.number",
+			"mem.latency.average.absolute.percent",
+			"mem.vmmemctl.average.absolute.kiloBytes",
+			"disk.read.average.rate.kiloBytesPerSecond",
+			"disk.write.average.rate.kiloBytesPerSecond",
+			"disk.numberReadAveraged.average.rate.number",
+			"disk.numberWriteAveraged.average.rate.number",
+			"disk.deviceReadLatency.average.absolute.millisecond",
+			"disk.deviceWriteLatency.average.absolute.millisecond",
+			"disk.totalReadLatency.average.absolute.millisecond",
+			"disk.totalWriteLatency.average.absolute.millisecond",
+			"storageAdapter.read.average.rate.kiloBytesPerSecond",
+			"storageAdapter.write.average.rate.kiloBytesPerSecond",
+			"storageAdapter.numberReadAveraged.average.rate.number",
+			"storageAdapter.numberWriteAveraged.average.rate.number",
+			"net.errorsRx.summation.delta.number",
+			"net.errorsTx.summation.delta.number",
+			"net.bytesRx.average.rate.kiloBytesPerSecond",
+			"net.bytesTx.average.rate.kiloBytesPerSecond",
+			"cpu.used.summation.delta.millisecond",
+			"cpu.usage.average.rate.percent",
+			"cpu.utilization.average.rate.percent",
+			"cpu.wait.summation.delta.millisecond",
+			"cpu.idle.summation.delta.millisecond",
+			"cpu.readiness.average.rate.percent",
+			"cpu.costop.summation.delta.millisecond",
+			"cpu.swapwait.summation.delta.millisecond",
+			"mem.swapoutRate.average.rate.kiloBytesPerSecond",
+			"disk.kernelReadLatency.average.absolute.millisecond",
+			"disk.kernelWriteLatency.average.absolute.millisecond"},
+		HostMetricExclude: nil,
+		VMMetricInclude: []string{
+			"cpu.ready.summation.delta.millisecond",
+			"mem.swapinRate.average.rate.kiloBytesPerSecond",
+			"virtualDisk.numberReadAveraged.average.rate.number",
+			"virtualDisk.numberWriteAveraged.average.rate.number",
+			"virtualDisk.totalReadLatency.average.absolute.millisecond",
+			"virtualDisk.totalWriteLatency.average.absolute.millisecond",
+			"virtualDisk.readOIO.latest.absolute.number",
+			"virtualDisk.writeOIO.latest.absolute.number",
+			"net.bytesRx.average.rate.kiloBytesPerSecond",
+			"net.bytesTx.average.rate.kiloBytesPerSecond",
+			"net.droppedRx.summation.delta.number",
+			"net.droppedTx.summation.delta.number",
+			"cpu.run.summation.delta.millisecond",
+			"cpu.used.summation.delta.millisecond",
+			"mem.swapoutRate.average.rate.kiloBytesPerSecond",
+			"virtualDisk.read.average.rate.kiloBytesPerSecond",
+			"virtualDisk.write.average.rate.kiloBytesPerSecond"},
+		VMMetricExclude: nil,
+		DatastoreMetricInclude: []string{
+			"disk.used.*",
+			"disk.provsioned.*"},
+		DatastoreMetricExclude: nil,
+		ClientConfig:           itls.ClientConfig{InsecureSkipVerify: true},
+
+		MaxQueryObjects:         256,
+		ObjectDiscoveryInterval: internal.Duration{Duration: time.Second * 300},
+		Timeout:                 internal.Duration{Duration: time.Second * 20},
+		ForceDiscoverOnInit:     true,
+	}
+}
+
+func createSim() (*simulator.Model, *simulator.Server, error) {
+	model := simulator.VPX()
+
+	err := model.Create()
+	if err != nil {
+		return nil, nil, err
+	}
+
+	model.Service.TLS = new(tls.Config)
+
+	s := model.Service.NewServer()
+	//fmt.Printf("Server created at: %s\n", s.URL)
+
+	return model, s, nil
+}
+
+func TestParseConfig(t *testing.T) {
+	v := VSphere{}
+	c := v.SampleConfig()
+	p := regexp.MustCompile("\n#")
+	fmt.Printf("Source=%s", p.ReplaceAllLiteralString(c, "\n"))
+	c = configHeader + "\n[[inputs.vsphere]]\n" + p.ReplaceAllLiteralString(c, "\n")
+	fmt.Printf("Source=%s", c)
+	tab, err := toml.Parse([]byte(c))
+	require.NoError(t, err)
+	require.NotNil(t, tab)
+}
+
+func TestWorkerPool(t *testing.T) {
+	wp := NewWorkerPool(100)
+	ctx := context.Background()
+	wp.Run(ctx, func(ctx context.Context, p interface{}) interface{} {
+		return p.(int) * 2
+	}, 10)
+
+	n := 100000
+	wp.Fill(ctx, func(ctx context.Context, f PushFunc) {
+		for i := 0; i < n; i++ {
+			f(ctx, i)
+		}
+	})
+	results := make([]int, n)
+	i := 0
+	wp.Drain(ctx, func(ctx context.Context, p interface{}) bool {
+		results[i] = p.(int)
+		i++
+		return true
+	})
+	sort.Ints(results)
+	for i := 0; i < n; i++ {
+		require.Equal(t, results[i], i*2)
+	}
+}
+
+func TestAll(t *testing.T) {
+	m, s, err := createSim()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer m.Remove()
+	defer s.Close()
+
+	var acc testutil.Accumulator
+	v := defaultVSphere()
+	v.Vcenters = []string{s.URL.String()}
+	v.Start(nil) // We're not using the Accumulator, so it can be nil.
+	defer v.Stop()
+	require.NoError(t, v.Gather(&acc))
+}
diff --git a/plugins/inputs/vsphere/workerpool.go b/plugins/inputs/vsphere/workerpool.go
new file mode 100644
index 00000000..6695735c
--- /dev/null
+++ b/plugins/inputs/vsphere/workerpool.go
@@ -0,0 +1,119 @@
+package vsphere
+
+import (
+	"context"
+	"log"
+	"sync"
+)
+
+// WorkerFunc is a function that is supposed to do the actual work
+// of the WorkerPool. It is similar to the "map" portion of the
+// map/reduce semantics, in that it takes a single value as an input,
+// does some processing and returns a single result.
+type WorkerFunc func(context.Context, interface{}) interface{}
+
+// PushFunc is called from a FillerFunc to push a workitem onto
+// the input channel. Wraps some logic for gracefulk shutdowns.
+type PushFunc func(context.Context, interface{}) bool
+
+// DrainerFunc represents a function used to "drain" the WorkerPool,
+// i.e. pull out all the results generated by the workers and processing
+// them. The DrainerFunc is called once per result produced.
+// If the function returns false, the draining of the pool is aborted.
+type DrainerFunc func(context.Context, interface{}) bool
+
+// FillerFunc represents a function for filling the WorkerPool with jobs.
+// It is called once and is responsible for pushing jobs onto the supplied channel.
+type FillerFunc func(context.Context, PushFunc)
+
+// WorkerPool implements a simple work pooling mechanism. It runs a predefined
+// number of goroutines to process jobs. Jobs are inserted using the Fill call
+// and results are retrieved through the Drain function.
+type WorkerPool struct {
+	wg  sync.WaitGroup
+	In  chan interface{}
+	Out chan interface{}
+}
+
+// NewWorkerPool creates a worker pool
+func NewWorkerPool(bufsize int) *WorkerPool {
+	return &WorkerPool{
+		In:  make(chan interface{}, bufsize),
+		Out: make(chan interface{}, bufsize),
+	}
+}
+
+func (w *WorkerPool) push(ctx context.Context, job interface{}) bool {
+	select {
+	case w.In <- job:
+		return true
+	case <-ctx.Done():
+		return false
+	}
+}
+
+func (w *WorkerPool) pushOut(ctx context.Context, result interface{}) bool {
+	select {
+	case w.Out <- result:
+		return true
+	case <-ctx.Done():
+		return false
+	}
+}
+
+// Run takes a WorkerFunc and runs it in 'n' goroutines.
+func (w *WorkerPool) Run(ctx context.Context, f WorkerFunc, n int) bool {
+	w.wg.Add(1)
+	go func() {
+		defer w.wg.Done()
+		var localWg sync.WaitGroup
+		localWg.Add(n)
+		for i := 0; i < n; i++ {
+			go func() {
+				defer localWg.Done()
+				for {
+					select {
+					case job, ok := <-w.In:
+						if !ok {
+							return
+						}
+						w.pushOut(ctx, f(ctx, job))
+					case <-ctx.Done():
+						log.Printf("D! [input.vsphere]: Stop requested for worker pool. Exiting.")
+						return
+					}
+				}
+			}()
+		}
+		localWg.Wait()
+		close(w.Out)
+	}()
+	return ctx.Err() == nil
+}
+
+// Fill runs a FillerFunc responsible for supplying work to the pool. You may only
+// call Fill once. Calling it twice will panic.
+func (w *WorkerPool) Fill(ctx context.Context, f FillerFunc) bool {
+	w.wg.Add(1)
+	go func() {
+		defer w.wg.Done()
+		f(ctx, w.push)
+		close(w.In)
+	}()
+	return true
+}
+
+// Drain runs a DrainerFunc for each result generated by the workers.
+func (w *WorkerPool) Drain(ctx context.Context, f DrainerFunc) bool {
+	w.wg.Add(1)
+	go func() {
+		defer w.wg.Done()
+		for result := range w.Out {
+			if !f(ctx, result) {
+				break
+			}
+		}
+	}()
+	w.wg.Wait()
+	return ctx.Err() != nil
+}

From 51bb937fdd909a4a750f97a8c3983983b3543ac7 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 11 Sep 2018 14:55:18 -0700
Subject: [PATCH 769/835] Update changelog and readme

---
 CHANGELOG.md | 4 +++-
 README.md    | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf05e931..49ff3c70 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 - [pgbouncer](./plugins/inputs/pgbouncer/README.md) - Contributed by @nerzhul
 - [temp](./plugins/inputs/temp/README.md) - Contributed by @pytimer
 - [tengine](./plugins/inputs/tengine/README.md) - Contributed by @ertaoxu
+- [vsphere](./plugins/inputs/vsphere/README.md) - Contributed by @prydin
 - [x509_cert](./plugins/inputs/x509_cert/README.md) - Contributed by @jtyr
 
 ### New Processors
@@ -99,7 +100,8 @@
 - [#4411](https://github.com/influxdata/telegraf/pull/4411): Add temp input plugin.
 - [#4272](https://github.com/influxdata/telegraf/pull/4272): Add Beanstalkd input plugin.
 - [#4669](https://github.com/influxdata/telegraf/pull/4669): Add means to specify server password for redis input.
-- [#4339](https://github.com/influxdata/telegraf/pull/4339): Add Splunk Metrics serializer
+- [#4339](https://github.com/influxdata/telegraf/pull/4339): Add Splunk Metrics serializer.
+- [#4141](https://github.com/influxdata/telegraf/pull/4141): Add input plugin for VMware vSphere.
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index 7ac997ff..c93d9ea7 100644
--- a/README.md
+++ b/README.md
@@ -252,6 +252,7 @@ configuration options.
 * [udp_listener](./plugins/inputs/socket_listener)
 * [unbound](./plugins/inputs/unbound)
 * [varnish](./plugins/inputs/varnish)
+* [vsphere](./plugins/inputs/vsphere) VMware vSphere
 * [webhooks](./plugins/inputs/webhooks)
   * [filestack](./plugins/inputs/webhooks/filestack)
   * [github](./plugins/inputs/webhooks/github)

From 03a119e322e260568ec86dcd420f9c285756e4bd Mon Sep 17 00:00:00 2001
From: Jon McKenzie <jcmcken@gmail.com>
Date: Tue, 11 Sep 2018 17:59:39 -0400
Subject: [PATCH 770/835] Align metrics window to interval in cloudwatch input
 (#4667)

---
 plugins/inputs/cloudwatch/cloudwatch.go      | 36 ++++++++++++++-----
 plugins/inputs/cloudwatch/cloudwatch_test.go | 37 +++++++++++++++++++-
 2 files changed, 64 insertions(+), 9 deletions(-)

diff --git a/plugins/inputs/cloudwatch/cloudwatch.go b/plugins/inputs/cloudwatch/cloudwatch.go
index 9ba15b6a..626511e2 100644
--- a/plugins/inputs/cloudwatch/cloudwatch.go
+++ b/plugins/inputs/cloudwatch/cloudwatch.go
@@ -36,6 +36,8 @@ type (
 		RateLimit   int               `toml:"ratelimit"`
 		client      cloudwatchClient
 		metricCache *MetricCache
+		windowStart time.Time
+		windowEnd   time.Time
 	}
 
 	Metric struct {
@@ -197,6 +199,11 @@ func (c *CloudWatch) Gather(acc telegraf.Accumulator) error {
 
 	now := time.Now()
 
+	err = c.updateWindow(now)
+	if err != nil {
+		return err
+	}
+
 	// limit concurrency or we can easily exhaust user connection limit
 	// see cloudwatch API request limits:
 	// http://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/cloudwatch_limits.html
@@ -208,7 +215,7 @@ func (c *CloudWatch) Gather(acc telegraf.Accumulator) error {
 		<-lmtr.C
 		go func(inm *cloudwatch.Metric) {
 			defer wg.Done()
-			acc.AddError(c.gatherMetric(acc, inm, now))
+			acc.AddError(c.gatherMetric(acc, inm))
 		}(m)
 	}
 	wg.Wait()
@@ -216,6 +223,22 @@ func (c *CloudWatch) Gather(acc telegraf.Accumulator) error {
 	return nil
 }
 
+func (c *CloudWatch) updateWindow(relativeTo time.Time) error {
+	windowEnd := relativeTo.Add(-c.Delay.Duration)
+
+	if c.windowEnd.IsZero() {
+		// this is the first run, no window info, so just get a single period
+		c.windowStart = windowEnd.Add(-c.Period.Duration)
+	} else {
+		// subsequent window, start where last window left off
+		c.windowStart = c.windowEnd
+	}
+
+	c.windowEnd = windowEnd
+
+	return nil
+}
+
 func init() {
 	inputs.Add("cloudwatch", func() telegraf.Input {
 		ttl, _ := time.ParseDuration("1hr")
@@ -291,9 +314,8 @@ func (c *CloudWatch) fetchNamespaceMetrics() ([]*cloudwatch.Metric, error) {
 func (c *CloudWatch) gatherMetric(
 	acc telegraf.Accumulator,
 	metric *cloudwatch.Metric,
-	now time.Time,
 ) error {
-	params := c.getStatisticsInput(metric, now)
+	params := c.getStatisticsInput(metric)
 	resp, err := c.client.GetMetricStatistics(params)
 	if err != nil {
 		return err
@@ -356,12 +378,10 @@ func snakeCase(s string) string {
 /*
  * Map Metric to *cloudwatch.GetMetricStatisticsInput for given timeframe
  */
-func (c *CloudWatch) getStatisticsInput(metric *cloudwatch.Metric, now time.Time) *cloudwatch.GetMetricStatisticsInput {
-	end := now.Add(-c.Delay.Duration)
-
+func (c *CloudWatch) getStatisticsInput(metric *cloudwatch.Metric) *cloudwatch.GetMetricStatisticsInput {
 	input := &cloudwatch.GetMetricStatisticsInput{
-		StartTime:  aws.Time(end.Add(-c.Period.Duration)),
-		EndTime:    aws.Time(end),
+		StartTime:  aws.Time(c.windowStart),
+		EndTime:    aws.Time(c.windowEnd),
 		MetricName: metric.MetricName,
 		Namespace:  metric.Namespace,
 		Period:     aws.Int64(int64(c.Period.Duration.Seconds())),
diff --git a/plugins/inputs/cloudwatch/cloudwatch_test.go b/plugins/inputs/cloudwatch/cloudwatch_test.go
index c52b3a35..57c92b3f 100644
--- a/plugins/inputs/cloudwatch/cloudwatch_test.go
+++ b/plugins/inputs/cloudwatch/cloudwatch_test.go
@@ -197,7 +197,9 @@ func TestGenerateStatisticsInputParams(t *testing.T) {
 
 	now := time.Now()
 
-	params := c.getStatisticsInput(m, now)
+	c.updateWindow(now)
+
+	params := c.getStatisticsInput(m)
 
 	assert.EqualValues(t, *params.EndTime, now.Add(-c.Delay.Duration))
 	assert.EqualValues(t, *params.StartTime, now.Add(-c.Period.Duration).Add(-c.Delay.Duration))
@@ -217,3 +219,36 @@ func TestMetricsCacheTimeout(t *testing.T) {
 	cache.Fetched = time.Now().Add(-time.Minute)
 	assert.False(t, cache.IsValid())
 }
+
+func TestUpdateWindow(t *testing.T) {
+	duration, _ := time.ParseDuration("1m")
+	internalDuration := internal.Duration{
+		Duration: duration,
+	}
+
+	c := &CloudWatch{
+		Namespace: "AWS/ELB",
+		Delay:     internalDuration,
+		Period:    internalDuration,
+	}
+
+	now := time.Now()
+
+	assert.True(t, c.windowEnd.IsZero())
+	assert.True(t, c.windowStart.IsZero())
+
+	c.updateWindow(now)
+
+	newStartTime := c.windowEnd
+
+	// initial window just has a single period
+	assert.EqualValues(t, c.windowEnd, now.Add(-c.Delay.Duration))
+	assert.EqualValues(t, c.windowStart, now.Add(-c.Delay.Duration).Add(-c.Period.Duration))
+
+	now = time.Now()
+	c.updateWindow(now)
+
+	// subsequent window uses previous end time as start time
+	assert.EqualValues(t, c.windowEnd, now.Add(-c.Delay.Duration))
+	assert.EqualValues(t, c.windowStart, newStartTime)
+}

From d4a74337faff1c441edbe9c41ac70d9526a2c45b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 11 Sep 2018 15:00:21 -0700
Subject: [PATCH 771/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 49ff3c70..91374d12 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -102,6 +102,7 @@
 - [#4669](https://github.com/influxdata/telegraf/pull/4669): Add means to specify server password for redis input.
 - [#4339](https://github.com/influxdata/telegraf/pull/4339): Add Splunk Metrics serializer.
 - [#4141](https://github.com/influxdata/telegraf/pull/4141): Add input plugin for VMware vSphere.
+- [#4667](https://github.com/influxdata/telegraf/pull/4667): Align metrics window to interval in cloudwatch input.
 
 ### Bugfixes
 

From 9d72d078a37da0234fc6b41a24624c0806e7f0a3 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 11 Sep 2018 15:15:45 -0700
Subject: [PATCH 772/835] Add new fields to mem input readme

---
 plugins/inputs/mem/README.md | 49 ++++++++++++++++++++++++++----------
 1 file changed, 36 insertions(+), 13 deletions(-)

diff --git a/plugins/inputs/mem/README.md b/plugins/inputs/mem/README.md
index 8a9ff823..84254682 100644
--- a/plugins/inputs/mem/README.md
+++ b/plugins/inputs/mem/README.md
@@ -14,22 +14,45 @@ For a more complete explanation of the difference between *used* and
 
 ### Metrics:
 
+Available fields are dependent on platform.
+
 - 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)
-  	- wired (int)
+    - active (integer)
+    - available (integer)
+    - buffered (integer)
+    - cached (integer)
+    - free (integer)
+    - inactive (integer)
+    - slab (integer)
+    - total (integer)
+    - used (integer)
+    - available_percent (float)
+    - used_percent (float)
+    - wired (integer)
+    - commit_limit (integer)
+    - committed_as (integer)
+    - dirty (integer)
+    - high_free (integer)
+    - high_total (integer)
+    - huge_page_size (integer)
+    - huge_pages_free (integer)
+    - huge_pages_total (integer)
+    - low_free (integer)
+    - low_total (integer)
+    - mapped (integer)
+    - page_tables (integer)
+    - shared (integer)
+    - swap_cached (integer)
+    - swap_free (integer)
+    - swap_total (integer)
+    - vmalloc_chunk (integer)
+    - vmalloc_total (integer)
+    - vmalloc_used (integer)
+    - write_back (integer)
+    - write_back_tmp (integer)
 
 ### 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
+mem active=11347566592i,available=18705133568i,available_percent=89.4288960571006,buffered=1976709120i,cached=13975572480i,commit_limit=14753067008i,committed_as=2872422400i,dirty=87461888i,free=1352400896i,high_free=0i,high_total=0i,huge_page_size=2097152i,huge_pages_free=0i,huge_pages_total=0i,inactive=6201593856i,low_free=0i,low_total=0i,mapped=310427648i,page_tables=14397440i,shared=200781824i,slab=1937526784i,swap_cached=0i,swap_free=4294963200i,swap_total=4294963200i,total=20916207616i,used=3611525120i,used_percent=17.26663449848977,vmalloc_chunk=0i,vmalloc_total=35184372087808i,vmalloc_used=0i,wired=0i,write_back=0i,write_back_tmp=0i 1536704085000000000
 ```

From eff7f0f0830f4ac19b891ecaf90463c2ebb211fd Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 11 Sep 2018 16:03:47 -0700
Subject: [PATCH 773/835] Use operation subtables in enum and rename processors
 (#4672)

---
 plugins/processors/enum/README.md        | 20 ++++---
 plugins/processors/enum/enum.go          | 33 ++++++------
 plugins/processors/enum/enum_test.go     | 14 ++---
 plugins/processors/rename/README.md      | 35 ++++++------
 plugins/processors/rename/rename.go      | 69 ++++++++++--------------
 plugins/processors/rename/rename_test.go | 23 ++++----
 6 files changed, 93 insertions(+), 101 deletions(-)

diff --git a/plugins/processors/enum/README.md b/plugins/processors/enum/README.md
index f0ed5856..291c25c8 100644
--- a/plugins/processors/enum/README.md
+++ b/plugins/processors/enum/README.md
@@ -13,13 +13,13 @@ source field is overwritten.
 
 ```toml
 [[processors.enum]]
-  [[processors.enum.fields]]
+  [[processors.enum.mapping]]
     ## Name of the field to map
-    source = "name"
+    field = "status"
 
     ## Destination field to be used for the mapped value.  By default the source
     ## field is used, overwriting the original value.
-    # destination = "mapped"
+    # dest = "status_code"
 
     ## Default value to be used for all values not contained in the mapping
     ## table.  When unset, the unmodified value for the field will be used if no
@@ -27,7 +27,15 @@ source field is overwritten.
     # default = 0
 
     ## Table of mappings
-    [processors.enum.fields.value_mappings]
-      value1 = 1
-      value2 = 2
+    [processors.enum.mapping.value_mappings]
+      green = 1
+      amber = 2
+      red = 3
+```
+
+### Example:
+
+```diff
+- xyzzy status="green" 1502489900000000000
++ xyzzy status="green",status_code=1i 1502489900000000000
 ```
diff --git a/plugins/processors/enum/enum.go b/plugins/processors/enum/enum.go
index 134a02bb..b08307f0 100644
--- a/plugins/processors/enum/enum.go
+++ b/plugins/processors/enum/enum.go
@@ -8,13 +8,13 @@ import (
 )
 
 var sampleConfig = `
-  [[processors.enum.fields]]
+  [[processors.enum.mapping]]
     ## Name of the field to map
-    source = "name"
+    field = "status"
 
     ## Destination field to be used for the mapped value.  By default the source
     ## field is used, overwriting the original value.
-    # destination = "mapped"
+    # dest = "status_code"
 
     ## Default value to be used for all values not contained in the mapping
     ## table.  When unset, the unmodified value for the field will be used if no
@@ -22,18 +22,19 @@ var sampleConfig = `
     # default = 0
 
     ## Table of mappings
-    [processors.enum.fields.value_mappings]
-      value1 = 1
-      value2 = 2
+    [processors.enum.mapping.value_mappings]
+      green = 1
+      yellow = 2
+      red = 3
 `
 
 type EnumMapper struct {
-	Fields []Mapping
+	Mappings []Mapping `toml:"mapping"`
 }
 
 type Mapping struct {
-	Source        string
-	Destination   string
+	Field         string
+	Dest          string
 	Default       interface{}
 	ValueMappings map[string]interface{}
 }
@@ -54,8 +55,8 @@ func (mapper *EnumMapper) Apply(in ...telegraf.Metric) []telegraf.Metric {
 }
 
 func (mapper *EnumMapper) applyMappings(metric telegraf.Metric) telegraf.Metric {
-	for _, mapping := range mapper.Fields {
-		if originalValue, isPresent := metric.GetField(mapping.Source); isPresent == true {
+	for _, mapping := range mapper.Mappings {
+		if originalValue, isPresent := metric.GetField(mapping.Field); isPresent == true {
 			if adjustedValue, isString := adjustBoolValue(originalValue).(string); isString == true {
 				if mappedValue, isMappedValuePresent := mapping.mapValue(adjustedValue); isMappedValuePresent == true {
 					writeField(metric, mapping.getDestination(), mappedValue)
@@ -84,16 +85,14 @@ func (mapping *Mapping) mapValue(original string) (interface{}, bool) {
 }
 
 func (mapping *Mapping) getDestination() string {
-	if mapping.Destination != "" {
-		return mapping.Destination
+	if mapping.Dest != "" {
+		return mapping.Dest
 	}
-	return mapping.Source
+	return mapping.Field
 }
 
 func writeField(metric telegraf.Metric, name string, value interface{}) {
-	if metric.HasField(name) {
-		metric.RemoveField(name)
-	}
+	metric.RemoveField(name)
 	metric.AddField(name, value)
 }
 
diff --git a/plugins/processors/enum/enum_test.go b/plugins/processors/enum/enum_test.go
index 2185b91b..d8c0e26d 100644
--- a/plugins/processors/enum/enum_test.go
+++ b/plugins/processors/enum/enum_test.go
@@ -49,7 +49,7 @@ func TestRetainsMetric(t *testing.T) {
 }
 
 func TestMapsSingleStringValue(t *testing.T) {
-	mapper := EnumMapper{Fields: []Mapping{{Source: "string_value", ValueMappings: map[string]interface{}{"test": int64(1)}}}}
+	mapper := EnumMapper{Mappings: []Mapping{{Field: "string_value", ValueMappings: map[string]interface{}{"test": int64(1)}}}}
 
 	fields := calculateProcessedValues(mapper, createTestMetric())
 
@@ -57,7 +57,7 @@ func TestMapsSingleStringValue(t *testing.T) {
 }
 
 func TestNoFailureOnMappingsOnNonStringValuedFields(t *testing.T) {
-	mapper := EnumMapper{Fields: []Mapping{{Source: "int_value", ValueMappings: map[string]interface{}{"13i": int64(7)}}}}
+	mapper := EnumMapper{Mappings: []Mapping{{Field: "int_value", ValueMappings: map[string]interface{}{"13i": int64(7)}}}}
 
 	fields := calculateProcessedValues(mapper, createTestMetric())
 
@@ -65,7 +65,7 @@ func TestNoFailureOnMappingsOnNonStringValuedFields(t *testing.T) {
 }
 
 func TestMapSingleBoolValue(t *testing.T) {
-	mapper := EnumMapper{Fields: []Mapping{{Source: "true_value", ValueMappings: map[string]interface{}{"true": int64(1)}}}}
+	mapper := EnumMapper{Mappings: []Mapping{{Field: "true_value", ValueMappings: map[string]interface{}{"true": int64(1)}}}}
 
 	fields := calculateProcessedValues(mapper, createTestMetric())
 
@@ -73,7 +73,7 @@ func TestMapSingleBoolValue(t *testing.T) {
 }
 
 func TestMapsToDefaultValueOnUnknownSourceValue(t *testing.T) {
-	mapper := EnumMapper{Fields: []Mapping{{Source: "string_value", Default: int64(42), ValueMappings: map[string]interface{}{"other": int64(1)}}}}
+	mapper := EnumMapper{Mappings: []Mapping{{Field: "string_value", Default: int64(42), ValueMappings: map[string]interface{}{"other": int64(1)}}}}
 
 	fields := calculateProcessedValues(mapper, createTestMetric())
 
@@ -81,7 +81,7 @@ func TestMapsToDefaultValueOnUnknownSourceValue(t *testing.T) {
 }
 
 func TestDoNotMapToDefaultValueKnownSourceValue(t *testing.T) {
-	mapper := EnumMapper{Fields: []Mapping{{Source: "string_value", Default: int64(42), ValueMappings: map[string]interface{}{"test": int64(1)}}}}
+	mapper := EnumMapper{Mappings: []Mapping{{Field: "string_value", Default: int64(42), ValueMappings: map[string]interface{}{"test": int64(1)}}}}
 
 	fields := calculateProcessedValues(mapper, createTestMetric())
 
@@ -89,7 +89,7 @@ func TestDoNotMapToDefaultValueKnownSourceValue(t *testing.T) {
 }
 
 func TestNoMappingWithoutDefaultOrDefinedMappingValue(t *testing.T) {
-	mapper := EnumMapper{Fields: []Mapping{{Source: "string_value", ValueMappings: map[string]interface{}{"other": int64(1)}}}}
+	mapper := EnumMapper{Mappings: []Mapping{{Field: "string_value", ValueMappings: map[string]interface{}{"other": int64(1)}}}}
 
 	fields := calculateProcessedValues(mapper, createTestMetric())
 
@@ -97,7 +97,7 @@ func TestNoMappingWithoutDefaultOrDefinedMappingValue(t *testing.T) {
 }
 
 func TestWritesToDestination(t *testing.T) {
-	mapper := EnumMapper{Fields: []Mapping{{Source: "string_value", Destination: "string_code", ValueMappings: map[string]interface{}{"test": int64(1)}}}}
+	mapper := EnumMapper{Mappings: []Mapping{{Field: "string_value", Dest: "string_code", ValueMappings: map[string]interface{}{"test": int64(1)}}}}
 
 	fields := calculateProcessedValues(mapper, createTestMetric())
 
diff --git a/plugins/processors/rename/README.md b/plugins/processors/rename/README.md
index dbd31490..cc3c61a9 100644
--- a/plugins/processors/rename/README.md
+++ b/plugins/processors/rename/README.md
@@ -5,28 +5,23 @@ The `rename` processor renames measurements, fields, and tags.
 ### Configuration:
 
 ```toml
-## Measurement, tag, and field renamings are stored in separate sub-tables.
-## Specify one sub-table per rename operation.
 [[processors.rename]]
-[[processors.rename.measurement]]
-  ## measurement to change
-  from = "network_interface_throughput"
-  to = "throughput"
+  ## Specify one sub-table per rename operation.
+  [[processors.rename.replace]]
+    measurement = "network_interface_throughput"
+    dest = "throughput"
 
-[[processors.rename.tag]]
-  ## tag to change
-  from = "hostname"
-  to = "host"
+  [[processors.rename.replace]]
+    tag = "hostname"
+    dest = "host"
 
-[[processors.rename.field]]
-  ## field to change
-  from = "lower"
-  to = "min"
+  [[processors.rename.replace]]
+    field = "lower"
+    dest = "min"
 
-[[processors.rename.field]]
-  ## field to change
-  from = "upper"
-  to = "max"
+  [[processors.rename.replace]]
+    field = "upper"
+    dest = "max"
 ```
 
 ### Tags:
@@ -36,6 +31,6 @@ No tags are applied by this processor, though it can alter them by renaming.
 ### Example processing:
 
 ```diff
-- network_interface_throughput,hostname=backend.example.com,units=kbps lower=10i,upper=1000i,mean=500i 1502489900000000000
-+ throughput,host=backend.example.com,units=kbps min=10i,max=1000i,mean=500i 1502489900000000000
+- network_interface_throughput,hostname=backend.example.com lower=10i,upper=1000i,mean=500i 1502489900000000000
++ throughput,host=backend.example.com min=10i,max=1000i,mean=500i 1502489900000000000
 ```
diff --git a/plugins/processors/rename/rename.go b/plugins/processors/rename/rename.go
index 2da787a3..acb6d2cc 100644
--- a/plugins/processors/rename/rename.go
+++ b/plugins/processors/rename/rename.go
@@ -6,38 +6,17 @@ import (
 )
 
 const sampleConfig = `
-  ## Measurement, tag, and field renamings are stored in separate sub-tables.
-  ## Specify one sub-table per rename operation.
-  # [[processors.rename.measurement]]
-  #   ## measurement to change
-  #   from = "kilobytes_per_second"
-  #   to = "kbps"
-
-  # [[processors.rename.tag]]
-  #   ## tag to change
-  #   from = "host"
-  #   to = "hostname"
-
-  # [[processors.rename.field]]
-  #   ## field to change
-  #   from = "lower"
-  #   to = "min"
-
-  # [[processors.rename.field]]
-  #   ## field to change
-  #   from = "upper"
-  #   to = "max"
 `
 
-type renamer struct {
-	From string
-	To   string
+type Replace struct {
+	Measurement string `toml:"measurement"`
+	Tag         string `toml:"tag"`
+	Field       string `toml:"field"`
+	Dest        string `toml:"dest"`
 }
 
 type Rename struct {
-	Measurement []renamer
-	Tag         []renamer
-	Field       []renamer
+	Replaces []Replace `toml:"replace"`
 }
 
 func (r *Rename) SampleConfig() string {
@@ -50,24 +29,32 @@ func (r *Rename) Description() string {
 
 func (r *Rename) Apply(in ...telegraf.Metric) []telegraf.Metric {
 	for _, point := range in {
-		for _, measurementRenamer := range r.Measurement {
-			if point.Name() == measurementRenamer.From {
-				point.SetName(measurementRenamer.To)
-				break
+		for _, replace := range r.Replaces {
+			if replace.Dest == "" {
+				continue
 			}
-		}
 
-		for _, tagRenamer := range r.Tag {
-			if value, ok := point.GetTag(tagRenamer.From); ok {
-				point.RemoveTag(tagRenamer.From)
-				point.AddTag(tagRenamer.To, value)
+			if replace.Measurement != "" {
+				if value := point.Name(); value == replace.Measurement {
+					point.SetName(replace.Dest)
+				}
+				continue
 			}
-		}
 
-		for _, fieldRenamer := range r.Field {
-			if value, ok := point.GetField(fieldRenamer.From); ok {
-				point.RemoveField(fieldRenamer.From)
-				point.AddField(fieldRenamer.To, value)
+			if replace.Tag != "" {
+				if value, ok := point.GetTag(replace.Tag); ok {
+					point.RemoveTag(replace.Tag)
+					point.AddTag(replace.Dest, value)
+				}
+				continue
+			}
+
+			if replace.Field != "" {
+				if value, ok := point.GetField(replace.Field); ok {
+					point.RemoveField(replace.Field)
+					point.AddField(replace.Dest, value)
+				}
+				continue
 			}
 		}
 	}
diff --git a/plugins/processors/rename/rename_test.go b/plugins/processors/rename/rename_test.go
index 43f7fcc3..1f8e0b7d 100644
--- a/plugins/processors/rename/rename_test.go
+++ b/plugins/processors/rename/rename_test.go
@@ -21,10 +21,11 @@ func newMetric(name string, tags map[string]string, fields map[string]interface{
 }
 
 func TestMeasurementRename(t *testing.T) {
-	r := Rename{}
-	r.Measurement = []renamer{
-		{From: "foo", To: "bar"},
-		{From: "baz", To: "quux"},
+	r := Rename{
+		Replaces: []Replace{
+			{Measurement: "foo", Dest: "bar"},
+			{Measurement: "baz", Dest: "quux"},
+		},
 	}
 	m1 := newMetric("foo", nil, nil)
 	m2 := newMetric("bar", nil, nil)
@@ -36,9 +37,10 @@ func TestMeasurementRename(t *testing.T) {
 }
 
 func TestTagRename(t *testing.T) {
-	r := Rename{}
-	r.Tag = []renamer{
-		{From: "hostname", To: "host"},
+	r := Rename{
+		Replaces: []Replace{
+			{Tag: "hostname", Dest: "host"},
+		},
 	}
 	m := newMetric("foo", map[string]string{"hostname": "localhost", "region": "east-1"}, nil)
 	results := r.Apply(m)
@@ -47,9 +49,10 @@ func TestTagRename(t *testing.T) {
 }
 
 func TestFieldRename(t *testing.T) {
-	r := Rename{}
-	r.Field = []renamer{
-		{From: "time_msec", To: "time"},
+	r := Rename{
+		Replaces: []Replace{
+			{Field: "time_msec", Dest: "time"},
+		},
 	}
 	m := newMetric("foo", nil, map[string]interface{}{"time_msec": int64(1250), "snakes": true})
 	results := r.Apply(m)

From 4c571d2cfadabba92e0d330338031b35a8962c9b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 11 Sep 2018 16:04:16 -0700
Subject: [PATCH 774/835] Log access denied opening a service at debug level
 (#4674)

---
 plugins/inputs/win_services/README.md         |  19 +-
 plugins/inputs/win_services/win_services.go   | 164 ++++++++++--------
 .../win_services_integration_test.go          |  98 ++---------
 3 files changed, 125 insertions(+), 156 deletions(-)

diff --git a/plugins/inputs/win_services/README.md b/plugins/inputs/win_services/README.md
index 4aa9e6b8..eef64171 100644
--- a/plugins/inputs/win_services/README.md
+++ b/plugins/inputs/win_services/README.md
@@ -1,7 +1,9 @@
-# Telegraf Plugin: win_services
-Input plugin to report Windows services info.
+# Windows Services Input Plugin
+
+Reports information about Windows service status.
+
+Monitoring some services may require running Telegraf with administrator privileges.
 
-It requires that Telegraf must be running under the administrator privileges.
 ### Configuration:
 
 ```toml
@@ -25,7 +27,7 @@ The `state` field can have the following values:
 - 3 - stop pending
 - 4 - running
 - 5 - continue pending
-- 6 - pause pending 
+- 6 - pause pending
 - 7 - paused
 
 The `startup_mode` field can have the following values:
@@ -33,7 +35,7 @@ The `startup_mode` field can have the following values:
 - 1 - system start
 - 2 - auto start
 - 3 - demand start
-- 4 - disabled   
+- 4 - disabled
 
 ### Tags:
 
@@ -43,14 +45,13 @@ The `startup_mode` field can have the following values:
 
 ### 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
+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_. 
+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.
 
 ```
diff --git a/plugins/inputs/win_services/win_services.go b/plugins/inputs/win_services/win_services.go
index 8e56a96d..1befc4a6 100644
--- a/plugins/inputs/win_services/win_services.go
+++ b/plugins/inputs/win_services/win_services.go
@@ -4,32 +4,52 @@ package win_services
 
 import (
 	"fmt"
+	"log"
+	"os"
+
 	"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 ServiceErr struct {
+	Message string
+	Service string
+	Err     error
+}
+
+func (e *ServiceErr) Error() string {
+	return fmt.Sprintf("%s: '%s': %v", e.Message, e.Service, e.Err)
+}
+
+func IsPermission(err error) bool {
+	if err, ok := err.(*ServiceErr); ok {
+		return os.IsPermission(err.Err)
+	}
+	return false
+}
+
+// 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 {
+// ManagerProvider sets interface for acquiring manager instance, like mgr.Mgr
+type ManagerProvider interface {
 	Connect() (WinServiceManager, error)
 }
 
-//WinServiceManager provides interface for mgr.Mgr
+// 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
+// WinSvcMgr is wrapper for mgr.Mgr implementing WinServiceManager interface
 type WinSvcMgr struct {
 	realMgr *mgr.Mgr
 }
@@ -45,7 +65,7 @@ func (m *WinSvcMgr) ListServices() ([]string, error) {
 	return m.realMgr.ListServices()
 }
 
-//MgProvider is an implementation of WinServiceManagerProvider interface returning WinSvcMgr
+// MgProvider is an implementation of WinServiceManagerProvider interface returning WinSvcMgr
 type MgProvider struct {
 }
 
@@ -71,7 +91,7 @@ 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
+	mgrProvider  ManagerProvider
 }
 
 type ServiceInfo struct {
@@ -79,7 +99,6 @@ type ServiceInfo struct {
 	DisplayName string
 	State       int
 	StartUpMode int
-	Error       error
 }
 
 func (m *WinServices) Description() string {
@@ -91,93 +110,102 @@ func (m *WinServices) SampleConfig() string {
 }
 
 func (m *WinServices) Gather(acc telegraf.Accumulator) error {
+	scmgr, err := m.mgrProvider.Connect()
+	if err != nil {
+		return fmt.Errorf("Could not open service manager: %s", err)
+	}
+	defer scmgr.Disconnect()
 
-	serviceInfos, err := listServices(m.mgrProvider, m.ServiceNames)
-
+	serviceNames, err := listServices(scmgr, 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
+	for _, srvName := range serviceNames {
+		service, err := collectServiceInfo(scmgr, srvName)
+		if err != nil {
+			if IsPermission(err) {
+				log.Printf("D! Error in plugin [inputs.win_services]: %v", err)
+			} else {
+				acc.AddError(err)
 			}
-			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)
+			continue
 		}
+
+		tags := map[string]string{
+			"service_name": service.ServiceName,
+		}
+		//display name could be empty, but still valid service
+		if len(service.DisplayName) > 0 {
+			tags["display_name"] = service.DisplayName
+		}
+
+		fields := map[string]interface{}{
+			"state":        service.State,
+			"startup_mode": service.StartUpMode,
+		}
+		acc.AddFields("win_services", fields, tags)
 	}
 
 	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()
+// listServices returns a list of services to gather.
+func listServices(scmgr WinServiceManager, userServices []string) ([]string, error) {
+	if len(userServices) != 0 {
+		return userServices, nil
+	}
+
+	names, err := scmgr.ListServices()
 	if err != nil {
-		return nil, fmt.Errorf("Could not open service manager: %s", err)
+		return nil, fmt.Errorf("Could not list services: %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
+	return names, nil
 }
 
-//collectServiceInfo gathers info about a  service from WindowsAPI
-func collectServiceInfo(scmgr WinServiceManager, serviceName string) (serviceInfo ServiceInfo) {
-
-	serviceInfo.ServiceName = serviceName
+// collectServiceInfo gathers info about a service.
+func collectServiceInfo(scmgr WinServiceManager, serviceName string) (*ServiceInfo, error) {
 	srv, err := scmgr.OpenService(serviceName)
 	if err != nil {
-		serviceInfo.Error = fmt.Errorf("Could not open service '%s': %s", serviceName, err)
-		return
+		return nil, &ServiceErr{
+			Message: "could not open service",
+			Service: serviceName,
+			Err:     err,
+		}
 	}
 	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
+	if err != nil {
+		return nil, &ServiceErr{
+			Message: "could not query service",
+			Service: serviceName,
+			Err:     err,
+		}
 	}
 
 	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)
+	if err != nil {
+		return nil, &ServiceErr{
+			Message: "could not get config of service",
+			Service: serviceName,
+			Err:     err,
+		}
 	}
-	return
+
+	serviceInfo := &ServiceInfo{
+		ServiceName: serviceName,
+		DisplayName: srvCfg.DisplayName,
+		StartUpMode: int(srvCfg.StartType),
+		State:       int(srvStatus.State),
+	}
+	return serviceInfo, nil
 }
 
 func init() {
-	inputs.Add("win_services", func() telegraf.Input { return &WinServices{mgrProvider: &MgProvider{}} })
+	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
index 20174651..a39df49c 100644
--- a/plugins/inputs/win_services/win_services_integration_test.go
+++ b/plugins/inputs/win_services/win_services_integration_test.go
@@ -4,11 +4,10 @@
 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"
+
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/require"
 )
 
 var InvalidServices = []string{"XYZ1@", "ZYZ@", "SDF_@#"}
@@ -18,57 +17,30 @@ func TestList(t *testing.T) {
 	if testing.Short() {
 		t.Skip("Skipping integration test in short mode")
 	}
-	services, err := listServices(&MgProvider{}, KnownServices)
+	provider := &MgProvider{}
+	scmgr, err := provider.Connect()
 	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)
+	defer scmgr.Disconnect()
+
+	services, err := listServices(scmgr, KnownServices)
+	require.NoError(t, err)
+	require.Len(t, services, 2, "Different number of services")
+	require.Equal(t, services[0], KnownServices[0])
+	require.Equal(t, services[1], KnownServices[1])
 }
 
 func TestEmptyList(t *testing.T) {
 	if testing.Short() {
 		t.Skip("Skipping integration test in short mode")
 	}
-	services, err := listServices(&MgProvider{}, []string{})
+	provider := &MgProvider{}
+	scmgr, err := provider.Connect()
 	require.NoError(t, err)
-	assert.Condition(t, func() bool { return len(services) > 20 }, "Too few service")
-}
+	defer scmgr.Disconnect()
 
-func TestListEr(t *testing.T) {
-	if testing.Short() {
-		t.Skip("Skipping integration test in short mode")
-	}
-	services, err := listServices(&MgProvider{}, InvalidServices)
+	services, err := listServices(scmgr, []string{})
 	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)
-	}
+	require.Condition(t, func() bool { return len(services) > 20 }, "Too few service")
 }
 
 func TestGatherErrors(t *testing.T) {
@@ -76,40 +48,8 @@ func TestGatherErrors(t *testing.T) {
 		t.Skip("Skipping integration test in short mode")
 	}
 	ws := &WinServices{InvalidServices, &MgProvider{}}
-	assert.Len(t, ws.ServiceNames, 3, "Different number of services")
+	require.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
+	require.Len(t, acc.Errors, 3, "There should be 3 errors after gather")
 }

From 6a60e3f9ffae5295e8e413aab802ebd8fd44957a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 11 Sep 2018 16:08:22 -0700
Subject: [PATCH 775/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91374d12..99ea85e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -110,6 +110,7 @@
 - [#4499](https://github.com/influxdata/telegraf/issues/4499): Fix instance and object name in performance counters with backslashes.
 - [#4646](https://github.com/influxdata/telegraf/issues/4646): Reset/flush saved contents from bad metric.
 - [#4520](https://github.com/influxdata/telegraf/issues/4520): Document all supported cli arguments.
+- [#4674](https://github.com/influxdata/telegraf/pull/4674): Log access denied opening a service at debug level in win_services.
 
 ## v1.7.4 [2018-08-29]
 

From b43165f2d859813a077a4460e96e5b94400308b2 Mon Sep 17 00:00:00 2001
From: Mark Wilkinson - m82labs <mark@m82labs.com>
Date: Tue, 11 Sep 2018 21:47:30 -0400
Subject: [PATCH 776/835] Improve Azure Managed Instance support + more in
 sqlserver input (#4642)

---
 Gopkg.lock                            |  35 ++--
 Gopkg.toml                            |   2 +-
 plugins/inputs/sqlserver/README.md    |  15 +-
 plugins/inputs/sqlserver/sqlserver.go | 276 ++++++++++++++++----------
 4 files changed, 211 insertions(+), 117 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index ed161e69..7a44f79b 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -1,6 +1,14 @@
 # This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
 
 
+[[projects]]
+  digest = "1:972f38a9c879a4920d1e3a3d3438104b6c06163bfa3e6f4064adb00468d40587"
+  name = "cloud.google.com/go"
+  packages = ["civil"]
+  pruneopts = ""
+  revision = "c728a003b238b26cef9ab6753a5dc424b331c3ad"
+  version = "v0.27.0"
+
 [[projects]]
   branch = "master"
   digest = "1:fc0802104acded1f48e4860a9f2db85b82b4a754fca9eae750ff4e8b8cdf2116"
@@ -122,7 +130,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:0828d8c0f95689f832cf348fe23827feb7640cd698d612ef59e2f9d041f54c68"
+  digest = "1:5a5f28fcfe3a74247733a31ceaac0e53bfc2723e43c596b2e3f110eda9378575"
   name = "github.com/apache/thrift"
   packages = ["lib/go/thrift"]
   pruneopts = ""
@@ -230,6 +238,17 @@
   revision = "346938d642f2ec3594ed81d874461961cd0faa76"
   version = "v1.1.0"
 
+[[projects]]
+  branch = "master"
+  digest = "1:7fdc54859cd901c25b9d8db964410a4e0d98fa0dca267fe4cf49c0eede5e06c2"
+  name = "github.com/denisenkom/go-mssqldb"
+  packages = [
+    ".",
+    "internal/cp",
+  ]
+  pruneopts = ""
+  revision = "1eb28afdf9b6e56cf673badd47545f844fe81103"
+
 [[projects]]
   digest = "1:6098222470fe0172157ce9bbef5d2200df4edde17ee649c5d6e48330e4afa4c6"
   name = "github.com/dgrijalva/jwt-go"
@@ -257,7 +276,7 @@
   revision = "edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
 
 [[projects]]
-  digest = "1:d149605f1b00713fdc48150122892d77d49d30c825f690dd92f497aeb6cf18f5"
+  digest = "1:d2ca9295cce7d0e7b26b498c6b59ff903d8315e8ead97f0f6cadf9e7d613e1e8"
   name = "github.com/docker/docker"
   packages = [
     "api",
@@ -498,7 +517,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:ff65bf6fc4d1116f94ac305342725c21b55c16819c2606adc8f527755716937f"
+  digest = "1:e1c91a91cc738cebecbf12fc98f554f6f932c8b97e2052ad63ea43948df5bcb0"
   name = "github.com/hashicorp/go-rootcerts"
   packages = ["."]
   pruneopts = ""
@@ -1016,14 +1035,6 @@
   pruneopts = ""
   revision = "46796da1b0b4794e1e341883a399f12cc7574b55"
 
-[[projects]]
-  branch = "master"
-  digest = "1:2fcfc6c3fb8dfe0d80d7789272230d3ac7db15022b66817113f98d9fff880225"
-  name = "github.com/zensqlmonitor/go-mssqldb"
-  packages = ["."]
-  pruneopts = ""
-  revision = "e8fbf836e44e86764eba398361d1825651709547"
-
 [[projects]]
   branch = "master"
   digest = "1:0773b5c3be42874166670a20aa177872edb450cd9fc70b1df97303d977702a50"
@@ -1312,6 +1323,7 @@
     "github.com/aws/aws-sdk-go/service/sts",
     "github.com/bsm/sarama-cluster",
     "github.com/couchbase/go-couchbase",
+    "github.com/denisenkom/go-mssqldb",
     "github.com/dgrijalva/jwt-go",
     "github.com/docker/docker/api/types",
     "github.com/docker/docker/api/types/container",
@@ -1375,7 +1387,6 @@
     "github.com/vmware/govmomi/vim25/soap",
     "github.com/vmware/govmomi/vim25/types",
     "github.com/wvanbergen/kafka/consumergroup",
-    "github.com/zensqlmonitor/go-mssqldb",
     "golang.org/x/net/context",
     "golang.org/x/net/html/charset",
     "golang.org/x/oauth2",
diff --git a/Gopkg.toml b/Gopkg.toml
index c8957839..110e8480 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -183,7 +183,7 @@
   branch = "master"
 
 [[constraint]]
-  name = "github.com/zensqlmonitor/go-mssqldb"
+  name = "github.com/denisenkom/go-mssqldb"
   branch = "master"
 
 [[constraint]]
diff --git a/plugins/inputs/sqlserver/README.md b/plugins/inputs/sqlserver/README.md
index 766bb95e..33800ca2 100644
--- a/plugins/inputs/sqlserver/README.md
+++ b/plugins/inputs/sqlserver/README.md
@@ -90,7 +90,17 @@ The new (version 2) metrics provide:
   - *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 + 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.
+- *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 same categories used in Query Store.
+- *Azure Managed Instances*
+  - Stats from `sys.server_resource_stats`:
+    - cpu_count
+    - server_memory
+    - sku
+    - engine_edition
+    - hardware_type
+    - total_storage_mb
+    - available_storage_mb
+    - uptime
 
 The following metrics can be used directly, with no delta calculations:
  - SQLServer:Buffer Manager\Buffer cache hit ratio
@@ -129,5 +139,4 @@ 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:
-- `sql_instance`: Physical host and instance name (hostname:instance)
-
+- `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 1ca29eca..5f2cbb29 100644
--- a/plugins/inputs/sqlserver/sqlserver.go
+++ b/plugins/inputs/sqlserver/sqlserver.go
@@ -9,7 +9,7 @@ import (
 	"github.com/influxdata/telegraf/plugins/inputs"
 
 	// go-mssqldb initialization
-	_ "github.com/zensqlmonitor/go-mssqldb"
+	_ "github.com/denisenkom/go-mssqldb"
 )
 
 // SQLServer struct
@@ -348,7 +348,9 @@ ELSE
 EXEC(@SQL)
 `
 
-const sqlDatabaseIOV2 = `SELECT
+const sqlDatabaseIOV2 = `IF SERVERPROPERTY('EngineEdition') = 5
+BEGIN
+SELECT
 'sqlserver_database_io' As [measurement],
 REPLACE(@@SERVERNAME,'\',':') AS [sql_instance],
 DB_NAME([vfs].[database_id]) [database_name],
@@ -358,43 +360,123 @@ 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
+b.name as logical_filename,
+b.physical_name as physical_filename,
+CASE WHEN vfs.file_id = 2 THEN 'LOG' ELSE 'DATA' END AS file_type
 FROM
 [sys].[dm_io_virtual_file_stats](NULL,NULL) AS vfs
-OPTION( RECOMPILE );
+inner join sys.database_files b on  b.file_id = vfs.file_id
+END
+ELSE
+BEGIN
+SELECT
+'sqlserver_database_io' As [measurement],
+REPLACE(@@SERVERNAME,'\',':') AS [sql_instance],
+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,
+b.name as logical_filename,
+b.physical_name as physical_filename,
+CASE WHEN vfs.file_id = 2 THEN 'LOG' ELSE 'DATA' END AS file_type
+FROM
+[sys].[dm_io_virtual_file_stats](NULL,NULL) AS vfs
+inner join sys.master_files b on b.database_id = vfs.database_id and b.file_id = vfs.file_id
+END
 `
 
 const sqlServerPropertiesV2 = `DECLARE @sys_info TABLE (
 	cpu_count INT,
-	server_memory INT,
+	server_memory BIGINT,
+	sku NVARCHAR(64),
+	engine_edition SMALLINT,
+	hardware_type VARCHAR(15),
+	total_storage_mb BIGINT,
+	available_storage_mb BIGINT,
 	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, (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
+ 
+	IF SERVERPROPERTY('EngineEdition') = 8  -- Managed Instance
+		INSERT INTO @sys_info ( cpu_count, server_memory, sku, engine_edition, hardware_type, total_storage_mb, available_storage_mb, uptime )
+		SELECT 	TOP(1)
+				virtual_core_count AS cpu_count,
+				(SELECT process_memory_limit_mb FROM sys.dm_os_job_object) AS server_memory,
+				sku,
+				cast(SERVERPROPERTY('EngineEdition') as smallint) AS engine_edition,
+				hardware_generation AS hardware_type, 
+				reserved_storage_mb AS total_storage_mb, 
+				(reserved_storage_mb - storage_space_used_mb) AS available_storage_mb,
+				(select DATEDIFF(MINUTE,sqlserver_start_time,GETDATE()) from sys.dm_os_sys_info) as uptime
+		FROM	sys.server_resource_stats
+		ORDER BY start_time DESC
 
-SELECT
-'sqlserver_server_properties' As [measurement],
-REPLACE(@@SERVERNAME,'\',':') AS [sql_instance],
-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
-OPTION( RECOMPILE );
+	ELSE
+	BEGIN
+		DECLARE @total_disk_size_mb BIGINT,
+				@available_space_mb BIGINT
+
+		SELECT	@total_disk_size_mb = sum(total_disk_size_mb),
+				@available_space_mb = sum(free_disk_space_mb) 
+		FROM	(
+					SELECT	distinct logical_volume_name AS LogicalName,
+							total_bytes/(1024*1024)as total_disk_size_mb, 
+							available_bytes /(1024*1024) free_disk_space_mb
+					FROM	sys.master_files AS f  
+							CROSS APPLY sys.dm_os_volume_stats(f.database_id, f.file_id)
+				) as osVolumes
+
+		INSERT INTO @sys_info ( cpu_count, server_memory, sku, engine_edition, hardware_type, total_storage_mb, available_storage_mb, uptime )
+		SELECT	cpu_count,
+				(SELECT total_physical_memory_kb FROM sys.dm_os_sys_memory) AS server_memory,
+				CAST(SERVERPROPERTY('Edition') AS NVARCHAR(64)) as sku,
+				CAST(SERVERPROPERTY('EngineEdition') as smallint) as engine_edition,
+				CASE virtual_machine_type_desc
+					WHEN 'NONE' THEN 'PHYSICAL Machine'
+					ELSE virtual_machine_type_desc
+				END AS hardware_type,
+				@total_disk_size_mb,
+				@available_space_mb,
+				 DATEDIFF(MINUTE,sqlserver_start_time,GETDATE())
+		FROM	sys.dm_os_sys_info
+	END
+END
+	
+SELECT	'sqlserver_server_properties' AS [measurement],
+		REPLACE(@@SERVERNAME,'\',':') AS [sql_instance],
+		s.cpu_count,
+		s.server_memory,
+		s.sku,
+		s.engine_edition,
+		s.hardware_type,
+		s.total_storage_mb,
+		s.available_storage_mb,
+		s.uptime,
+		db_online,
+		db_restoring,
+		db_recovering,
+		db_recoveryPending,
+		db_suspect,
+		db_offline
+FROM	(
+			SELECT	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
+			FROM	sys.databases
+		) AS dbs
+		CROSS APPLY (
+			SELECT	cpu_count, server_memory, sku, engine_edition, hardware_type, total_storage_mb, available_storage_mb, uptime
+			FROM	@sys_info
+		) AS s
+OPTION( RECOMPILE )
 `
 
 const sqlPerformanceCountersV2 string = `
@@ -416,53 +498,45 @@ SELECT	DISTINCT
 		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)',
-			'Forwarded Recs/sec'
-		)
-		) OR (
-			instance_name IN ('_Total','Column store object pool')
-			AND counter_name IN (
+			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',
+				'Memory Grants Outstanding',
+				'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)',
 				'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',
@@ -477,29 +551,18 @@ WHERE	(
 				'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'
-				)
-				AND instance_name = '_Total'
-			)
-		) OR (
-			counter_name IN ('Transaction Delay')
-		) OR (
-			counter_name IN (
+				'XTP Memory Used (KB)',
+				'Transaction Delay',
+				'Log Bytes Received/sec',
+				'Log Apply Pending Queue',
+				'Redone Bytes/sec',
+				'Recovery Queue',
+				'Log Apply Ready Queue',
 				'CPU usage %',
 				'CPU usage % base',
 				'Queued requests',
 				'Requests completed/sec',
-				'Blocked tasks'
-			)
-		) OR (
-			counter_name IN (
+				'Blocked tasks',
 				'Active memory grant amount (KB)',
 				'Disk Read Bytes/sec',
 				'Disk Read IO Throttled/sec',
@@ -507,11 +570,22 @@ WHERE	(
 				'Disk Write Bytes/sec',
 				'Disk Write IO Throttled/sec',
 				'Disk Write IO/sec',
-				'Used memory (KB)'
+				'Used memory (KB)',
+				'Forwarded Recs/sec',
+				'Background Writer pages/sec',
+				'Percent Log Used'
 			)
-		) OR  (
+		) OR (
 			object_name LIKE '%User Settable%'
 			OR object_name LIKE '%SQL Errors%'
+		) OR (
+			instance_name IN ('_Total')
+			AND counter_name IN (
+				'Lock Timeouts/sec',
+				'Number of Deadlocks/sec',
+				'Lock Waits/sec',
+				'Latch Waits/sec'
+			)
 		)
 
 DECLARE @SQL NVARCHAR(MAX)
@@ -617,6 +691,7 @@ LEFT OUTER JOIN ( VALUES
 ('CMEMPARTITIONED','Memory'),
 ('CMEMTHREAD','Memory'),
 ('CXPACKET','Parallelism'),
+('CXCONSUMER','Parallelism'),
 ('DBMIRROR_DBM_EVENT','Mirroring'),
 ('DBMIRROR_DBM_MUTEX','Mirroring'),
 ('DBMIRROR_EVENTS_QUEUE','Mirroring'),
@@ -1098,10 +1173,8 @@ ws.wait_type NOT IN (
 	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_OS_PIPEOPS','PREEMPTIVE_OS_GENERICOPS', N'PREEMPTIVE_OS_VERIFYTRUST',
+	N'PREEMPTIVE_OS_DEVICEOPS', 
 	N'PREEMPTIVE_XE_CALLBACKEXECUTE', N'PREEMPTIVE_XE_DISPATCHER',
 	N'PREEMPTIVE_XE_GETTARGETSTATE', N'PREEMPTIVE_XE_SESSIONCOMMIT',
 	N'PREEMPTIVE_XE_TARGETINIT', N'PREEMPTIVE_XE_TARGETFINALIZE',
@@ -1113,14 +1186,15 @@ ws.wait_type NOT IN (
 	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'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')
+	N'XE_DISPATCHER_WAIT', N'XE_LIVE_TARGET_TVF', N'XE_TIMER_EVENT',
+	N'SOS_WORK_DISPATCHER','RESERVED_MEMORY_ALLOCATION_EXT')
 AND waiting_tasks_count > 0
-ORDER BY
-waiting_tasks_count DESC
+AND wait_time_ms > 100
 OPTION (RECOMPILE);
 `
 

From 94566098cc448bf6e982382f5def1683674b4953 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 11 Sep 2018 18:51:58 -0700
Subject: [PATCH 777/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99ea85e8..fa95dd2b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -103,6 +103,7 @@
 - [#4339](https://github.com/influxdata/telegraf/pull/4339): Add Splunk Metrics serializer.
 - [#4141](https://github.com/influxdata/telegraf/pull/4141): Add input plugin for VMware vSphere.
 - [#4667](https://github.com/influxdata/telegraf/pull/4667): Align metrics window to interval in cloudwatch input.
+- [#4642](https://github.com/influxdata/telegraf/pull/4642): Improve Azure Managed Instance support + more in sqlserver input.
 
 ### Bugfixes
 

From 1aa969aabcbd4c446fccc12558446bf7346fad04 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 12 Sep 2018 00:23:50 -0700
Subject: [PATCH 778/835] Use separate mutexes for write and aggregation in
 running_output

---
 internal/models/running_output.go | 15 +++++++++------
 output.go                         | 18 ++++++++++++++++++
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/internal/models/running_output.go b/internal/models/running_output.go
index 01420245..bad1f765 100644
--- a/internal/models/running_output.go
+++ b/internal/models/running_output.go
@@ -36,8 +36,10 @@ type RunningOutput struct {
 	metrics     *buffer.Buffer
 	failMetrics *buffer.Buffer
 
+	// Guards against concurrent calls to Add, Push, Reset
+	aggMutex sync.Mutex
 	// Guards against concurrent calls to the Output as described in #3009
-	sync.Mutex
+	writeMutex sync.Mutex
 }
 
 func NewRunningOutput(
@@ -94,8 +96,6 @@ 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) {
-	ro.Lock()
-	defer ro.Unlock()
 
 	if m == nil {
 		return
@@ -118,7 +118,9 @@ func (ro *RunningOutput) AddMetric(m telegraf.Metric) {
 	}
 
 	if output, ok := ro.Output.(telegraf.AggregatingOutput); ok {
+		ro.aggMutex.Lock()
 		output.Add(m)
+		ro.aggMutex.Unlock()
 		return
 	}
 
@@ -135,13 +137,12 @@ func (ro *RunningOutput) AddMetric(m telegraf.Metric) {
 
 // Write writes all cached points to this output.
 func (ro *RunningOutput) Write() error {
-	ro.Lock()
-	defer ro.Unlock()
-
 	if output, ok := ro.Output.(telegraf.AggregatingOutput); ok {
+		ro.aggMutex.Lock()
 		metrics := output.Push()
 		ro.metrics.Add(metrics...)
 		output.Reset()
+		ro.aggMutex.Unlock()
 	}
 
 	nFails, nMetrics := ro.failMetrics.Len(), ro.metrics.Len()
@@ -192,6 +193,8 @@ func (ro *RunningOutput) write(metrics []telegraf.Metric) error {
 	if nMetrics == 0 {
 		return nil
 	}
+	ro.writeMutex.Lock()
+	defer ro.writeMutex.Unlock()
 	start := time.Now()
 	err := ro.Output.Write(metrics)
 	elapsed := time.Since(start)
diff --git a/output.go b/output.go
index 39b371ac..2421048f 100644
--- a/output.go
+++ b/output.go
@@ -13,9 +13,26 @@ type Output interface {
 	Write(metrics []Metric) error
 }
 
+// AggregatingOutput adds aggregating functionality to an Output.  May be used
+// if the Output only accepts a fixed set of aggregations over a time period.
+// These functions may be called concurrently to the Write function.
 type AggregatingOutput interface {
+	// Connect to the Output
+	Connect() error
+	// Close any connections to the Output
+	Close() error
+	// Description returns a one-sentence description on the Output
+	Description() string
+	// SampleConfig returns the default configuration of the Output
+	SampleConfig() string
+	// Write takes in group of points to be written to the Output
+	Write(metrics []Metric) error
+
+	// Add the metric to the aggregator
 	Add(in Metric)
+	// Push returns the aggregated metrics and is called every flush interval.
 	Push() []Metric
+	// Reset signals the the aggregator period is completed.
 	Reset()
 }
 
@@ -30,6 +47,7 @@ type ServiceOutput interface {
 	SampleConfig() string
 	// Write takes in group of points to be written to the Output
 	Write(metrics []Metric) error
+
 	// Start the "service" that will provide an Output
 	Start() error
 	// Stop the "service" that will provide an Output

From 9bd14b283fc013790fad77693da008e9cc1ea773 Mon Sep 17 00:00:00 2001
From: Greg <g2linton@gmail.com>
Date: Wed, 12 Sep 2018 02:03:59 -0600
Subject: [PATCH 779/835] Add support for couchdb 2.0+ API (#4654)

---
 plugins/inputs/couchdb/README.md         | 196 +--------------
 plugins/inputs/couchdb/couchdb.go        | 291 +++++++++++++++--------
 plugins/inputs/couchdb/couchdb_test.go   |   9 +-
 plugins/inputs/couchdb/dev/telegraf.conf |   9 +
 4 files changed, 207 insertions(+), 298 deletions(-)
 create mode 100644 plugins/inputs/couchdb/dev/telegraf.conf

diff --git a/plugins/inputs/couchdb/README.md b/plugins/inputs/couchdb/README.md
index 68691458..0af06cc5 100644
--- a/plugins/inputs/couchdb/README.md
+++ b/plugins/inputs/couchdb/README.md
@@ -62,194 +62,12 @@ httpd statistics:
 
 ### Example output:
 
+**Post Couchdb 2.0**
 ```
-➜  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,
-couchdb_auth_cache_hits_max=0,
-couchdb_auth_cache_hits_mean=0,
-couchdb_auth_cache_hits_min=0,
-couchdb_auth_cache_hits_stddev=0,
-couchdb_auth_cache_hits_sum=0,
-couchdb_auth_cache_misses_current=0,
-couchdb_auth_cache_misses_max=0,
-couchdb_auth_cache_misses_mean=0,
-couchdb_auth_cache_misses_min=0,
-couchdb_auth_cache_misses_stddev=0,
-couchdb_auth_cache_misses_sum=0,
-couchdb_database_reads_current=0,
-couchdb_database_reads_max=0,
-couchdb_database_reads_mean=0,
-couchdb_database_reads_min=0,
-couchdb_database_reads_stddev=0,
-couchdb_database_reads_sum=0,
-couchdb_database_writes_current=1102,
-couchdb_database_writes_max=131,
-couchdb_database_writes_mean=0.116,
-couchdb_database_writes_min=0,
-couchdb_database_writes_stddev=3.536,
-couchdb_database_writes_sum=1102,
-couchdb_open_databases_current=1,
-couchdb_open_databases_max=1,
-couchdb_open_databases_mean=0,
-couchdb_open_databases_min=0,
-couchdb_open_databases_stddev=0.01,
-couchdb_open_databases_sum=1,
-couchdb_open_os_files_current=2,
-couchdb_open_os_files_max=2,
-couchdb_open_os_files_mean=0,
-couchdb_open_os_files_min=0,
-couchdb_open_os_files_stddev=0.02,
-couchdb_open_os_files_sum=2,
-couchdb_request_time_current=242.21,
-couchdb_request_time_max=102,
-couchdb_request_time_mean=5.767,
-couchdb_request_time_min=1,
-couchdb_request_time_stddev=17.369,
-couchdb_request_time_sum=242.21,
-httpd_bulk_requests_current=0,
-httpd_bulk_requests_max=0,
-httpd_bulk_requests_mean=0,
-httpd_bulk_requests_min=0,
-httpd_bulk_requests_stddev=0,
-httpd_bulk_requests_sum=0,
-httpd_clients_requesting_changes_current=0,
-httpd_clients_requesting_changes_max=0,
-httpd_clients_requesting_changes_mean=0,
-httpd_clients_requesting_changes_min=0,
-httpd_clients_requesting_changes_stddev=0,
-httpd_clients_requesting_changes_sum=0,
-httpd_request_methods_copy_current=0,
-httpd_request_methods_copy_max=0,
-httpd_request_methods_copy_mean=0,
-httpd_request_methods_copy_min=0,
-httpd_request_methods_copy_stddev=0,
-httpd_request_methods_copy_sum=0,
-httpd_request_methods_delete_current=0,
-httpd_request_methods_delete_max=0,
-httpd_request_methods_delete_mean=0,
-httpd_request_methods_delete_min=0,
-httpd_request_methods_delete_stddev=0,
-httpd_request_methods_delete_sum=0,
-httpd_request_methods_get_current=31,
-httpd_request_methods_get_max=1,
-httpd_request_methods_get_mean=0.003,
-httpd_request_methods_get_min=0,
-httpd_request_methods_get_stddev=0.057,
-httpd_request_methods_get_sum=31,
-httpd_request_methods_head_current=0,
-httpd_request_methods_head_max=0,
-httpd_request_methods_head_mean=0,
-httpd_request_methods_head_min=0,
-httpd_request_methods_head_stddev=0,
-httpd_request_methods_head_sum=0,
-httpd_request_methods_post_current=1102,
-httpd_request_methods_post_max=131,
-httpd_request_methods_post_mean=0.116,
-httpd_request_methods_post_min=0,
-httpd_request_methods_post_stddev=3.536,
-httpd_request_methods_post_sum=1102,
-httpd_request_methods_put_current=1,
-httpd_request_methods_put_max=1,
-httpd_request_methods_put_mean=0,
-httpd_request_methods_put_min=0,
-httpd_request_methods_put_stddev=0.01,
-httpd_request_methods_put_sum=1,
-httpd_requests_current=1133,
-httpd_requests_max=130,
-httpd_requests_mean=0.118,
-httpd_requests_min=0,
-httpd_requests_stddev=3.512,
-httpd_requests_sum=1133,
-httpd_status_codes_200_current=31,
-httpd_status_codes_200_max=1,
-httpd_status_codes_200_mean=0.003,
-httpd_status_codes_200_min=0,
-httpd_status_codes_200_stddev=0.057,
-httpd_status_codes_200_sum=31,
-httpd_status_codes_201_current=1103,
-httpd_status_codes_201_max=130,
-httpd_status_codes_201_mean=0.116,
-httpd_status_codes_201_min=0,
-httpd_status_codes_201_stddev=3.532,
-httpd_status_codes_201_sum=1103,
-httpd_status_codes_202_current=0,
-httpd_status_codes_202_max=0,
-httpd_status_codes_202_mean=0,
-httpd_status_codes_202_min=0,
-httpd_status_codes_202_stddev=0,
-httpd_status_codes_202_sum=0,
-httpd_status_codes_301_current=0,
-httpd_status_codes_301_max=0,
-httpd_status_codes_301_mean=0,
-httpd_status_codes_301_min=0,
-httpd_status_codes_301_stddev=0,
-httpd_status_codes_301_sum=0,
-httpd_status_codes_304_current=0,
-httpd_status_codes_304_max=0,
-httpd_status_codes_304_mean=0,
-httpd_status_codes_304_min=0,
-httpd_status_codes_304_stddev=0,
-httpd_status_codes_304_sum=0,
-httpd_status_codes_400_current=0,
-httpd_status_codes_400_max=0,
-httpd_status_codes_400_mean=0,
-httpd_status_codes_400_min=0,
-httpd_status_codes_400_stddev=0,
-httpd_status_codes_400_sum=0,
-httpd_status_codes_401_current=0,
-httpd_status_codes_401_max=0,
-httpd_status_codes_401_mean=0,
-httpd_status_codes_401_min=0,
-httpd_status_codes_401_stddev=0,
-httpd_status_codes_401_sum=0,
-httpd_status_codes_403_current=0,
-httpd_status_codes_403_max=0,
-httpd_status_codes_403_mean=0,
-httpd_status_codes_403_min=0,
-httpd_status_codes_403_stddev=0,
-httpd_status_codes_403_sum=0,
-httpd_status_codes_404_current=0,
-httpd_status_codes_404_max=0,
-httpd_status_codes_404_mean=0,
-httpd_status_codes_404_min=0,
-httpd_status_codes_404_stddev=0,
-httpd_status_codes_404_sum=0,
-httpd_status_codes_405_current=0,
-httpd_status_codes_405_max=0,
-httpd_status_codes_405_mean=0,
-httpd_status_codes_405_min=0,
-httpd_status_codes_405_stddev=0,
-httpd_status_codes_405_sum=0,
-httpd_status_codes_409_current=0,
-httpd_status_codes_409_max=0,
-httpd_status_codes_409_mean=0,
-httpd_status_codes_409_min=0,
-httpd_status_codes_409_stddev=0,
-httpd_status_codes_409_sum=0,
-httpd_status_codes_412_current=0,
-httpd_status_codes_412_max=0,
-httpd_status_codes_412_mean=0,
-httpd_status_codes_412_min=0,
-httpd_status_codes_412_stddev=0,
-httpd_status_codes_412_sum=0,
-httpd_status_codes_500_current=0,
-httpd_status_codes_500_max=0,
-httpd_status_codes_500_mean=0,
-httpd_status_codes_500_min=0,
-httpd_status_codes_500_stddev=0,
-httpd_status_codes_500_sum=0,
-httpd_temporary_view_reads_current=0,
-httpd_temporary_view_reads_max=0,
-httpd_temporary_view_reads_mean=0,
-httpd_temporary_view_reads_min=0,
-httpd_temporary_view_reads_stddev=0,
-httpd_temporary_view_reads_sum=0,
-httpd_view_reads_current=0,
-httpd_view_reads_max=0,
-httpd_view_reads_mean=0,
-httpd_view_reads_min=0,
-httpd_view_reads_stddev=0,
-httpd_view_reads_sum=0 1454692257621938169
+couchdb,server=http://couchdb22:5984/_node/_local/_stats couchdb_auth_cache_hits_value=0,httpd_request_methods_delete_value=0,couchdb_auth_cache_misses_value=0,httpd_request_methods_get_value=42,httpd_status_codes_304_value=0,httpd_status_codes_400_value=0,httpd_request_methods_head_value=0,httpd_status_codes_201_value=0,couchdb_database_reads_value=0,httpd_request_methods_copy_value=0,couchdb_request_time_max=0,httpd_status_codes_200_value=42,httpd_status_codes_301_value=0,couchdb_open_os_files_value=2,httpd_request_methods_put_value=0,httpd_request_methods_post_value=0,httpd_status_codes_202_value=0,httpd_status_codes_403_value=0,httpd_status_codes_409_value=0,couchdb_database_writes_value=0,couchdb_request_time_min=0,httpd_status_codes_412_value=0,httpd_status_codes_500_value=0,httpd_status_codes_401_value=0,httpd_status_codes_404_value=0,httpd_status_codes_405_value=0,couchdb_open_databases_value=0 1536707179000000000
+```
+
+**Pre Couchdb 2.0**
+```
+couchdb,server=http://couchdb16:5984/_stats couchdb_request_time_sum=96,httpd_status_codes_200_sum=37,httpd_status_codes_200_min=0,httpd_requests_mean=0.005,httpd_requests_min=0,couchdb_request_time_stddev=3.833,couchdb_request_time_min=1,httpd_request_methods_get_stddev=0.073,httpd_request_methods_get_min=0,httpd_status_codes_200_mean=0.005,httpd_status_codes_200_max=1,httpd_requests_sum=37,couchdb_request_time_current=96,httpd_request_methods_get_sum=37,httpd_request_methods_get_mean=0.005,httpd_request_methods_get_max=1,httpd_status_codes_200_stddev=0.073,couchdb_request_time_mean=2.595,couchdb_request_time_max=25,httpd_request_methods_get_current=37,httpd_status_codes_200_current=37,httpd_requests_current=37,httpd_requests_stddev=0.073,httpd_requests_max=1 1536707179000000000
 ```
diff --git a/plugins/inputs/couchdb/couchdb.go b/plugins/inputs/couchdb/couchdb.go
index da6ba67d..bc9f3168 100644
--- a/plugins/inputs/couchdb/couchdb.go
+++ b/plugins/inputs/couchdb/couchdb.go
@@ -3,44 +3,52 @@ package couchdb
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/plugins/inputs"
 	"net/http"
-	"reflect"
 	"sync"
 	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
-// Schema:
-type metaData struct {
-	Description string  `json:"description"`
-	Current     float64 `json:"current"`
-	Sum         float64 `json:"sum"`
-	Mean        float64 `json:"mean"`
-	Stddev      float64 `json:"stddev"`
-	Min         float64 `json:"min"`
-	Max         float64 `json:"max"`
-}
+type (
+	metaData struct {
+		Current *float64 `json:"current"`
+		Sum     *float64 `json:"sum"`
+		Mean    *float64 `json:"mean"`
+		Stddev  *float64 `json:"stddev"`
+		Min     *float64 `json:"min"`
+		Max     *float64 `json:"max"`
+		Value   *float64 `json:"value"`
+	}
 
-type Stats struct {
-	Couchdb struct {
-		AuthCacheMisses metaData `json:"auth_cache_misses"`
-		DatabaseWrites  metaData `json:"database_writes"`
-		OpenDatabases   metaData `json:"open_databases"`
-		AuthCacheHits   metaData `json:"auth_cache_hits"`
-		RequestTime     metaData `json:"request_time"`
-		DatabaseReads   metaData `json:"database_reads"`
-		OpenOsFiles     metaData `json:"open_os_files"`
-	} `json:"couchdb"`
-	HttpdRequestMethods struct {
+	oldValue struct {
+		Value metaData `json:"value"`
+		metaData
+	}
+
+	couchdb struct {
+		AuthCacheHits       metaData            `json:"auth_cache_hits"`
+		AuthCacheMisses     metaData            `json:"auth_cache_misses"`
+		DatabaseWrites      metaData            `json:"database_writes"`
+		DatabaseReads       metaData            `json:"database_reads"`
+		OpenDatabases       metaData            `json:"open_databases"`
+		OpenOsFiles         metaData            `json:"open_os_files"`
+		RequestTime         oldValue            `json:"request_time"`
+		HttpdRequestMethods httpdRequestMethods `json:"httpd_request_methods"`
+		HttpdStatusCodes    httpdStatusCodes    `json:"httpd_status_codes"`
+	}
+
+	httpdRequestMethods struct {
 		Put    metaData `json:"PUT"`
 		Get    metaData `json:"GET"`
 		Copy   metaData `json:"COPY"`
 		Delete metaData `json:"DELETE"`
 		Post   metaData `json:"POST"`
 		Head   metaData `json:"HEAD"`
-	} `json:"httpd_request_methods"`
-	HttpdStatusCodes struct {
+	}
+
+	httpdStatusCodes struct {
 		Status200 metaData `json:"200"`
 		Status201 metaData `json:"201"`
 		Status202 metaData `json:"202"`
@@ -54,19 +62,29 @@ type Stats struct {
 		Status409 metaData `json:"409"`
 		Status412 metaData `json:"412"`
 		Status500 metaData `json:"500"`
-	} `json:"httpd_status_codes"`
-	Httpd struct {
-		ClientsRequestingChanges metaData `json:"clients_requesting_changes"`
-		TemporaryViewReads       metaData `json:"temporary_view_reads"`
-		Requests                 metaData `json:"requests"`
-		BulkRequests             metaData `json:"bulk_requests"`
-		ViewReads                metaData `json:"view_reads"`
-	} `json:"httpd"`
-}
+	}
 
-type CouchDB struct {
-	HOSTs []string `toml:"hosts"`
-}
+	httpd struct {
+		BulkRequests             metaData `json:"bulk_requests"`
+		Requests                 metaData `json:"requests"`
+		TemporaryViewReads       metaData `json:"temporary_view_reads"`
+		ViewReads                metaData `json:"view_reads"`
+		ClientsRequestingChanges metaData `json:"clients_requesting_changes"`
+	}
+
+	Stats struct {
+		Couchdb             couchdb             `json:"couchdb"`
+		HttpdRequestMethods httpdRequestMethods `json:"httpd_request_methods"`
+		HttpdStatusCodes    httpdStatusCodes    `json:"httpd_status_codes"`
+		Httpd               httpd               `json:"httpd"`
+	}
+
+	CouchDB struct {
+		Hosts []string `toml:"hosts"`
+
+		client *http.Client
+	}
+)
 
 func (*CouchDB) Description() string {
 	return "Read CouchDB Stats from one or more servers"
@@ -75,14 +93,14 @@ func (*CouchDB) Description() string {
 func (*CouchDB) SampleConfig() string {
 	return `
   ## Works with CouchDB stats endpoints out of the box
-  ## Multiple HOSTs from which to read CouchDB stats:
+  ## Multiple Hosts from which to read CouchDB stats:
   hosts = ["http://localhost:8086/_stats"]
 `
 }
 
 func (c *CouchDB) Gather(accumulator telegraf.Accumulator) error {
 	var wg sync.WaitGroup
-	for _, u := range c.HOSTs {
+	for _, u := range c.Hosts {
 		wg.Add(1)
 		go func(host string) {
 			defer wg.Done()
@@ -97,67 +115,125 @@ func (c *CouchDB) Gather(accumulator telegraf.Accumulator) error {
 	return nil
 }
 
-var tr = &http.Transport{
-	ResponseHeaderTimeout: time.Duration(3 * time.Second),
-}
-
-var client = &http.Client{
-	Transport: tr,
-	Timeout:   time.Duration(4 * time.Second),
-}
-
 func (c *CouchDB) fetchAndInsertData(accumulator telegraf.Accumulator, host string) error {
-
-	response, error := client.Get(host)
+	if c.client == nil {
+		c.client = &http.Client{
+			Transport: &http.Transport{
+				ResponseHeaderTimeout: time.Duration(3 * time.Second),
+			},
+			Timeout: time.Duration(4 * time.Second),
+		}
+	}
+	response, error := c.client.Get(host)
 	if error != nil {
 		return error
 	}
 	defer response.Body.Close()
 
-	var stats Stats
+	if response.StatusCode != 200 {
+		return fmt.Errorf("Failed to get stats from couchdb: HTTP responded %d", response.StatusCode)
+	}
+
+	stats := Stats{}
 	decoder := json.NewDecoder(response.Body)
 	decoder.Decode(&stats)
 
 	fields := map[string]interface{}{}
 
+	// for couchdb 2.0 API changes
+	requestTime := metaData{
+		Current: stats.Couchdb.RequestTime.Current,
+		Sum:     stats.Couchdb.RequestTime.Sum,
+		Mean:    stats.Couchdb.RequestTime.Mean,
+		Stddev:  stats.Couchdb.RequestTime.Stddev,
+		Min:     stats.Couchdb.RequestTime.Min,
+		Max:     stats.Couchdb.RequestTime.Max,
+	}
+
+	httpdRequestMethodsPut := stats.HttpdRequestMethods.Put
+	httpdRequestMethodsGet := stats.HttpdRequestMethods.Get
+	httpdRequestMethodsCopy := stats.HttpdRequestMethods.Copy
+	httpdRequestMethodsDelete := stats.HttpdRequestMethods.Delete
+	httpdRequestMethodsPost := stats.HttpdRequestMethods.Post
+	httpdRequestMethodsHead := stats.HttpdRequestMethods.Head
+
+	httpdStatusCodesStatus200 := stats.HttpdStatusCodes.Status200
+	httpdStatusCodesStatus201 := stats.HttpdStatusCodes.Status201
+	httpdStatusCodesStatus202 := stats.HttpdStatusCodes.Status202
+	httpdStatusCodesStatus301 := stats.HttpdStatusCodes.Status301
+	httpdStatusCodesStatus304 := stats.HttpdStatusCodes.Status304
+	httpdStatusCodesStatus400 := stats.HttpdStatusCodes.Status400
+	httpdStatusCodesStatus401 := stats.HttpdStatusCodes.Status401
+	httpdStatusCodesStatus403 := stats.HttpdStatusCodes.Status403
+	httpdStatusCodesStatus404 := stats.HttpdStatusCodes.Status404
+	httpdStatusCodesStatus405 := stats.HttpdStatusCodes.Status405
+	httpdStatusCodesStatus409 := stats.HttpdStatusCodes.Status409
+	httpdStatusCodesStatus412 := stats.HttpdStatusCodes.Status412
+	httpdStatusCodesStatus500 := stats.HttpdStatusCodes.Status500
+	// check if couchdb2.0 is used
+	if stats.Couchdb.HttpdRequestMethods.Get.Value != nil {
+		requestTime = stats.Couchdb.RequestTime.Value
+
+		httpdRequestMethodsPut = stats.Couchdb.HttpdRequestMethods.Put
+		httpdRequestMethodsGet = stats.Couchdb.HttpdRequestMethods.Get
+		httpdRequestMethodsCopy = stats.Couchdb.HttpdRequestMethods.Copy
+		httpdRequestMethodsDelete = stats.Couchdb.HttpdRequestMethods.Delete
+		httpdRequestMethodsPost = stats.Couchdb.HttpdRequestMethods.Post
+		httpdRequestMethodsHead = stats.Couchdb.HttpdRequestMethods.Head
+
+		httpdStatusCodesStatus200 = stats.Couchdb.HttpdStatusCodes.Status200
+		httpdStatusCodesStatus201 = stats.Couchdb.HttpdStatusCodes.Status201
+		httpdStatusCodesStatus202 = stats.Couchdb.HttpdStatusCodes.Status202
+		httpdStatusCodesStatus301 = stats.Couchdb.HttpdStatusCodes.Status301
+		httpdStatusCodesStatus304 = stats.Couchdb.HttpdStatusCodes.Status304
+		httpdStatusCodesStatus400 = stats.Couchdb.HttpdStatusCodes.Status400
+		httpdStatusCodesStatus401 = stats.Couchdb.HttpdStatusCodes.Status401
+		httpdStatusCodesStatus403 = stats.Couchdb.HttpdStatusCodes.Status403
+		httpdStatusCodesStatus404 = stats.Couchdb.HttpdStatusCodes.Status404
+		httpdStatusCodesStatus405 = stats.Couchdb.HttpdStatusCodes.Status405
+		httpdStatusCodesStatus409 = stats.Couchdb.HttpdStatusCodes.Status409
+		httpdStatusCodesStatus412 = stats.Couchdb.HttpdStatusCodes.Status412
+		httpdStatusCodesStatus500 = stats.Couchdb.HttpdStatusCodes.Status500
+	}
+
 	// CouchDB meta stats:
-	c.MapCopy(fields, c.generateFields("couchdb_auth_cache_misses", stats.Couchdb.AuthCacheMisses))
-	c.MapCopy(fields, c.generateFields("couchdb_database_writes", stats.Couchdb.DatabaseWrites))
-	c.MapCopy(fields, c.generateFields("couchdb_open_databases", stats.Couchdb.OpenDatabases))
-	c.MapCopy(fields, c.generateFields("couchdb_auth_cache_hits", stats.Couchdb.AuthCacheHits))
-	c.MapCopy(fields, c.generateFields("couchdb_request_time", stats.Couchdb.RequestTime))
-	c.MapCopy(fields, c.generateFields("couchdb_database_reads", stats.Couchdb.DatabaseReads))
-	c.MapCopy(fields, c.generateFields("couchdb_open_os_files", stats.Couchdb.OpenOsFiles))
+	c.generateFields(fields, "couchdb_auth_cache_misses", stats.Couchdb.AuthCacheMisses)
+	c.generateFields(fields, "couchdb_database_writes", stats.Couchdb.DatabaseWrites)
+	c.generateFields(fields, "couchdb_open_databases", stats.Couchdb.OpenDatabases)
+	c.generateFields(fields, "couchdb_auth_cache_hits", stats.Couchdb.AuthCacheHits)
+	c.generateFields(fields, "couchdb_request_time", requestTime)
+	c.generateFields(fields, "couchdb_database_reads", stats.Couchdb.DatabaseReads)
+	c.generateFields(fields, "couchdb_open_os_files", stats.Couchdb.OpenOsFiles)
 
 	// http request methods stats:
-	c.MapCopy(fields, c.generateFields("httpd_request_methods_put", stats.HttpdRequestMethods.Put))
-	c.MapCopy(fields, c.generateFields("httpd_request_methods_get", stats.HttpdRequestMethods.Get))
-	c.MapCopy(fields, c.generateFields("httpd_request_methods_copy", stats.HttpdRequestMethods.Copy))
-	c.MapCopy(fields, c.generateFields("httpd_request_methods_delete", stats.HttpdRequestMethods.Delete))
-	c.MapCopy(fields, c.generateFields("httpd_request_methods_post", stats.HttpdRequestMethods.Post))
-	c.MapCopy(fields, c.generateFields("httpd_request_methods_head", stats.HttpdRequestMethods.Head))
+	c.generateFields(fields, "httpd_request_methods_put", httpdRequestMethodsPut)
+	c.generateFields(fields, "httpd_request_methods_get", httpdRequestMethodsGet)
+	c.generateFields(fields, "httpd_request_methods_copy", httpdRequestMethodsCopy)
+	c.generateFields(fields, "httpd_request_methods_delete", httpdRequestMethodsDelete)
+	c.generateFields(fields, "httpd_request_methods_post", httpdRequestMethodsPost)
+	c.generateFields(fields, "httpd_request_methods_head", httpdRequestMethodsHead)
 
 	// status code stats:
-	c.MapCopy(fields, c.generateFields("httpd_status_codes_200", stats.HttpdStatusCodes.Status200))
-	c.MapCopy(fields, c.generateFields("httpd_status_codes_201", stats.HttpdStatusCodes.Status201))
-	c.MapCopy(fields, c.generateFields("httpd_status_codes_202", stats.HttpdStatusCodes.Status202))
-	c.MapCopy(fields, c.generateFields("httpd_status_codes_301", stats.HttpdStatusCodes.Status301))
-	c.MapCopy(fields, c.generateFields("httpd_status_codes_304", stats.HttpdStatusCodes.Status304))
-	c.MapCopy(fields, c.generateFields("httpd_status_codes_400", stats.HttpdStatusCodes.Status400))
-	c.MapCopy(fields, c.generateFields("httpd_status_codes_401", stats.HttpdStatusCodes.Status401))
-	c.MapCopy(fields, c.generateFields("httpd_status_codes_403", stats.HttpdStatusCodes.Status403))
-	c.MapCopy(fields, c.generateFields("httpd_status_codes_404", stats.HttpdStatusCodes.Status404))
-	c.MapCopy(fields, c.generateFields("httpd_status_codes_405", stats.HttpdStatusCodes.Status405))
-	c.MapCopy(fields, c.generateFields("httpd_status_codes_409", stats.HttpdStatusCodes.Status409))
-	c.MapCopy(fields, c.generateFields("httpd_status_codes_412", stats.HttpdStatusCodes.Status412))
-	c.MapCopy(fields, c.generateFields("httpd_status_codes_500", stats.HttpdStatusCodes.Status500))
+	c.generateFields(fields, "httpd_status_codes_200", httpdStatusCodesStatus200)
+	c.generateFields(fields, "httpd_status_codes_201", httpdStatusCodesStatus201)
+	c.generateFields(fields, "httpd_status_codes_202", httpdStatusCodesStatus202)
+	c.generateFields(fields, "httpd_status_codes_301", httpdStatusCodesStatus301)
+	c.generateFields(fields, "httpd_status_codes_304", httpdStatusCodesStatus304)
+	c.generateFields(fields, "httpd_status_codes_400", httpdStatusCodesStatus400)
+	c.generateFields(fields, "httpd_status_codes_401", httpdStatusCodesStatus401)
+	c.generateFields(fields, "httpd_status_codes_403", httpdStatusCodesStatus403)
+	c.generateFields(fields, "httpd_status_codes_404", httpdStatusCodesStatus404)
+	c.generateFields(fields, "httpd_status_codes_405", httpdStatusCodesStatus405)
+	c.generateFields(fields, "httpd_status_codes_409", httpdStatusCodesStatus409)
+	c.generateFields(fields, "httpd_status_codes_412", httpdStatusCodesStatus412)
+	c.generateFields(fields, "httpd_status_codes_500", httpdStatusCodesStatus500)
 
 	// httpd stats:
-	c.MapCopy(fields, c.generateFields("httpd_clients_requesting_changes", stats.Httpd.ClientsRequestingChanges))
-	c.MapCopy(fields, c.generateFields("httpd_temporary_view_reads", stats.Httpd.TemporaryViewReads))
-	c.MapCopy(fields, c.generateFields("httpd_requests", stats.Httpd.Requests))
-	c.MapCopy(fields, c.generateFields("httpd_bulk_requests", stats.Httpd.BulkRequests))
-	c.MapCopy(fields, c.generateFields("httpd_view_reads", stats.Httpd.ViewReads))
+	c.generateFields(fields, "httpd_clients_requesting_changes", stats.Httpd.ClientsRequestingChanges)
+	c.generateFields(fields, "httpd_temporary_view_reads", stats.Httpd.TemporaryViewReads)
+	c.generateFields(fields, "httpd_requests", stats.Httpd.Requests)
+	c.generateFields(fields, "httpd_bulk_requests", stats.Httpd.BulkRequests)
+	c.generateFields(fields, "httpd_view_reads", stats.Httpd.ViewReads)
 
 	tags := map[string]string{
 		"server": host,
@@ -166,34 +242,39 @@ func (c *CouchDB) fetchAndInsertData(accumulator telegraf.Accumulator, host stri
 	return nil
 }
 
-func (*CouchDB) MapCopy(dst, src interface{}) {
-	dv, sv := reflect.ValueOf(dst), reflect.ValueOf(src)
-	for _, k := range sv.MapKeys() {
-		dv.SetMapIndex(k, sv.MapIndex(k))
+func (c *CouchDB) generateFields(fields map[string]interface{}, prefix string, obj metaData) {
+	if obj.Value != nil {
+		fields[prefix+"_value"] = *obj.Value
 	}
-}
-
-func (*CouchDB) safeCheck(value interface{}) interface{} {
-	if value == nil {
-		return 0.0
+	if obj.Current != nil {
+		fields[prefix+"_current"] = *obj.Current
 	}
-	return value
-}
-
-func (c *CouchDB) generateFields(prefix string, obj metaData) map[string]interface{} {
-	fields := map[string]interface{}{
-		prefix + "_current": c.safeCheck(obj.Current),
-		prefix + "_sum":     c.safeCheck(obj.Sum),
-		prefix + "_mean":    c.safeCheck(obj.Mean),
-		prefix + "_stddev":  c.safeCheck(obj.Stddev),
-		prefix + "_min":     c.safeCheck(obj.Min),
-		prefix + "_max":     c.safeCheck(obj.Max),
+	if obj.Sum != nil {
+		fields[prefix+"_sum"] = *obj.Sum
+	}
+	if obj.Mean != nil {
+		fields[prefix+"_mean"] = *obj.Mean
+	}
+	if obj.Stddev != nil {
+		fields[prefix+"_stddev"] = *obj.Stddev
+	}
+	if obj.Min != nil {
+		fields[prefix+"_min"] = *obj.Min
+	}
+	if obj.Max != nil {
+		fields[prefix+"_max"] = *obj.Max
 	}
-	return fields
 }
 
 func init() {
 	inputs.Add("couchdb", func() telegraf.Input {
-		return &CouchDB{}
+		return &CouchDB{
+			client: &http.Client{
+				Transport: &http.Transport{
+					ResponseHeaderTimeout: time.Duration(3 * time.Second),
+				},
+				Timeout: time.Duration(4 * time.Second),
+			},
+		}
 	})
 }
diff --git a/plugins/inputs/couchdb/couchdb_test.go b/plugins/inputs/couchdb/couchdb_test.go
index 4c037085..933d6cc8 100644
--- a/plugins/inputs/couchdb/couchdb_test.go
+++ b/plugins/inputs/couchdb/couchdb_test.go
@@ -1,12 +1,13 @@
 package couchdb_test
 
 import (
-	"github.com/influxdata/telegraf/plugins/inputs/couchdb"
-	"github.com/influxdata/telegraf/testutil"
-	"github.com/stretchr/testify/require"
 	"net/http"
 	"net/http/httptest"
 	"testing"
+
+	"github.com/influxdata/telegraf/plugins/inputs/couchdb"
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/require"
 )
 
 func TestBasic(t *testing.T) {
@@ -312,7 +313,7 @@ func TestBasic(t *testing.T) {
 	defer fakeServer.Close()
 
 	plugin := &couchdb.CouchDB{
-		HOSTs: []string{fakeServer.URL + "/_stats"},
+		Hosts: []string{fakeServer.URL + "/_stats"},
 	}
 
 	var acc testutil.Accumulator
diff --git a/plugins/inputs/couchdb/dev/telegraf.conf b/plugins/inputs/couchdb/dev/telegraf.conf
new file mode 100644
index 00000000..30366e92
--- /dev/null
+++ b/plugins/inputs/couchdb/dev/telegraf.conf
@@ -0,0 +1,9 @@
+[agent]
+  interval="1s"
+  flush_interval="1s"
+
+[[inputs.couchdb]]
+  hosts = ["http://couchdb16:5984/_stats", "http://couchdb22:5984/_node/_local/_stats"]
+
+[[outputs.file]]
+  files = ["stdout"]

From a84ca7bcdb128a166f832aeac8a792ef614d2f34 Mon Sep 17 00:00:00 2001
From: Pontus Rydin <prydin@vmware.com>
Date: Wed, 12 Sep 2018 14:06:38 -0400
Subject: [PATCH 780/835] Remove call to View.Destroy() that causes errors to
 be logged by vCenter (#4684)

---
 plugins/inputs/vsphere/client.go | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/plugins/inputs/vsphere/client.go b/plugins/inputs/vsphere/client.go
index b9547b17..2148a72f 100644
--- a/plugins/inputs/vsphere/client.go
+++ b/plugins/inputs/vsphere/client.go
@@ -164,12 +164,10 @@ func (c *Client) close() {
 	// to close it multiple times.
 	c.closeGate.Do(func() {
 		ctx := context.Background()
-		if c.Views != nil {
-			c.Views.Destroy(ctx)
-
-		}
 		if c.Client != nil {
-			c.Client.Logout(ctx)
+			if err := c.Client.Logout(ctx); err != nil {
+				log.Printf("E! [input.vsphere]: Error during logout: %s", err)
+			}
 		}
 	})
 }

From 9c9a5f84384dcb7d78b5ac8047bc2f5738d21840 Mon Sep 17 00:00:00 2001
From: Thanabodee Charoenpiriyakij <wingyminus@gmail.com>
Date: Thu, 13 Sep 2018 01:39:21 +0700
Subject: [PATCH 781/835] Use sarama version 1.18.0 to support Kafka 2.0
 (#4676)

---
 Gopkg.lock | 6 +++---
 Gopkg.toml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index 7a44f79b..cb633811 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -63,12 +63,12 @@
   version = "v0.4.9"
 
 [[projects]]
-  digest = "1:9362b2212139b7821f73a86169bf80ce6b0264956f87d82ab3aeedb2b5c08fea"
+  digest = "1:213b41361ad1cb4768add9d26c2e27794c65264eefdb24ed6ea34cdfeeff3f3c"
   name = "github.com/Shopify/sarama"
   packages = ["."]
   pruneopts = ""
-  revision = "35324cf48e33d8260e1c7c18854465a904ade249"
-  version = "v1.17.0"
+  revision = "a6144ae922fd99dd0ea5046c8137acfb7fab0914"
+  version = "v1.18.0"
 
 [[projects]]
   digest = "1:f82b8ac36058904227087141017bb82f4b0fc58272990a4cdae3e2d6d222644e"
diff --git a/Gopkg.toml b/Gopkg.toml
index 110e8480..2fa3e4c4 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -152,7 +152,7 @@
 
 [[constraint]]
   name = "github.com/Shopify/sarama"
-  version = "1.17.0"
+  version = "1.18.0"
 
 [[constraint]]
   name = "github.com/soniah/gosnmp"

From bcb65a5ee82c80d92c85b1d0590203bcbddd2241 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 12 Sep 2018 11:40:43 -0700
Subject: [PATCH 782/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa95dd2b..3a5b37d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -112,6 +112,7 @@
 - [#4646](https://github.com/influxdata/telegraf/issues/4646): Reset/flush saved contents from bad metric.
 - [#4520](https://github.com/influxdata/telegraf/issues/4520): Document all supported cli arguments.
 - [#4674](https://github.com/influxdata/telegraf/pull/4674): Log access denied opening a service at debug level in win_services.
+- [#4588](https://github.com/influxdata/telegraf/issues/4588): Add support for Kafka 2.0.
 
 ## v1.7.4 [2018-08-29]
 

From 6361fd377416593322a9b5ee8e8c867d70754e03 Mon Sep 17 00:00:00 2001
From: dangeist <dan@polter.net>
Date: Wed, 12 Sep 2018 14:47:45 -0400
Subject: [PATCH 783/835] Allow alternate binaries for iptables input plugin.
 (#4682)

---
 etc/telegraf.conf                   |  2 ++
 plugins/inputs/iptables/README.md   |  2 ++
 plugins/inputs/iptables/iptables.go | 11 ++++++++++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 9315aa45..11842e7e 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -2004,6 +2004,8 @@
 #   ## 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
+#   ## Define an alternate executable, such as "ip6tables". Default is "iptables".
+#   # binary = "ip6tables"
 #   ## defines the table to monitor:
 #   table = "filter"
 #   ## defines the chains to monitor.
diff --git a/plugins/inputs/iptables/README.md b/plugins/inputs/iptables/README.md
index 527723f0..03bf784e 100644
--- a/plugins/inputs/iptables/README.md
+++ b/plugins/inputs/iptables/README.md
@@ -45,6 +45,8 @@ Defining multiple instances of this plugin in telegraf.conf can lead to concurre
   use_sudo = false
   # run iptables with the lock option
   use_lock = false
+  # Define an alternate executable, such as "ip6tables". Default is "iptables".
+  # binary = "ip6tables"
   # 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 01041fcc..21f6642a 100644
--- a/plugins/inputs/iptables/iptables.go
+++ b/plugins/inputs/iptables/iptables.go
@@ -17,6 +17,7 @@ import (
 type Iptables struct {
 	UseSudo bool
 	UseLock bool
+	Binary  string
 	Table   string
 	Chains  []string
 	lister  chainLister
@@ -38,6 +39,8 @@ func (ipt *Iptables) SampleConfig() string {
   ## 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
+  ## Define an alternate executable, such as "ip6tables". Default is "iptables".
+  # binary = "ip6tables"
   ## defines the table to monitor:
   table = "filter"
   ## defines the chains to monitor.
@@ -70,7 +73,13 @@ func (ipt *Iptables) Gather(acc telegraf.Accumulator) error {
 }
 
 func (ipt *Iptables) chainList(table, chain string) (string, error) {
-	iptablePath, err := exec.LookPath("iptables")
+	var binary string
+	if ipt.Binary != "" {
+		binary = ipt.Binary
+	} else {
+		binary = "iptables"
+	}
+	iptablePath, err := exec.LookPath(binary)
 	if err != nil {
 		return "", err
 	}

From 436dfdb44a20a91de9eb034902f36bd0e895200e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 12 Sep 2018 11:48:54 -0700
Subject: [PATCH 784/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a5b37d3..6bf96251 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -104,6 +104,7 @@
 - [#4141](https://github.com/influxdata/telegraf/pull/4141): Add input plugin for VMware vSphere.
 - [#4667](https://github.com/influxdata/telegraf/pull/4667): Align metrics window to interval in cloudwatch input.
 - [#4642](https://github.com/influxdata/telegraf/pull/4642): Improve Azure Managed Instance support + more in sqlserver input.
+- [#4682](https://github.com/influxdata/telegraf/pull/4682): Allow alternate binaries for iptables input plugin.
 
 ### Bugfixes
 

From 37fefa300b87d72e8d96028af3da0230b1093d36 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 12 Sep 2018 11:53:25 -0700
Subject: [PATCH 785/835] Remove non-existant option from sample config

---
 plugins/inputs/http/http.go | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plugins/inputs/http/http.go b/plugins/inputs/http/http.go
index c9c3460b..f5a2544c 100644
--- a/plugins/inputs/http/http.go
+++ b/plugins/inputs/http/http.go
@@ -52,9 +52,6 @@ var sampleConfig = `
   # username = "username"
   # password = "pa$$word"
 
-  ## Tag all metrics with the url
-  # tag_url = true
-
   ## Optional TLS Config
   # tls_ca = "/etc/telegraf/ca.pem"
   # tls_cert = "/etc/telegraf/cert.pem"

From 71aaa844f52455c6543f84b9de3ba2333f7d76c3 Mon Sep 17 00:00:00 2001
From: Gunnar Aasen <gunnar.r.aasen@gmail.com>
Date: Wed, 12 Sep 2018 12:01:42 -0700
Subject: [PATCH 786/835] Update Azure Monitor README

---
 plugins/outputs/azure_monitor/README.md | 28 ++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/plugins/outputs/azure_monitor/README.md b/plugins/outputs/azure_monitor/README.md
index cd138613..d1b91a83 100644
--- a/plugins/outputs/azure_monitor/README.md
+++ b/plugins/outputs/azure_monitor/README.md
@@ -1,5 +1,8 @@
 # Azure Monitor
 
+__The Azure Monitor custom metrics service is currently in preview and not
+available in a subset of Azure regions.__
+
 This plugin will send custom metrics to Azure Monitor. Azure Monitor has a
 metric resolution of one minute. To handle this in Telegraf, the Azure Monitor
 output plugin will automatically aggregates metrics into one minute buckets,
@@ -11,12 +14,6 @@ metric is written as the Azure Monitor metric name. All field values are
 written as a summarized set that includes: min, max, sum, count. Tags are
 written as a dimension on each Azure Monitor metric.
 
-Since Azure Monitor only accepts numeric values, string-typed fields are
-dropped by default. There is a configuration option (`strings_as_dimensions`)
-to retain fields that contain strings as extra dimensions. Azure Monitor
-allows a maximum of 10 dimensions per metric so any dimensions over that
-amount will be deterministically dropped.
-
 ### Configuration:
 
 ```toml
@@ -88,7 +85,8 @@ authentication is checked. Here are the preferred authentication methods:
     - Primarily useful if Telegraf is writing metrics for other resources.
       [More information][principal].
     - A Service Principal or User Principal needs to be assigned the `Monitoring
-      Contributor` roles.
+      Metrics Publisher` role on the resource(s) metrics will be emitted
+      against.
 3. AAD User Tokens (User Principals)
     - Allows Telegraf to authenticate like a user. It is best to use this method
       for development.
@@ -137,3 +135,19 @@ following configurations:
 
 **Note: As shown above, the last option (#4) is the preferred way to
 authenticate when running Telegraf on Azure VMs.
+
+### Dimensions
+
+Azure Monitor only accepts values with a numeric type. The plugin will drop
+fields with a string type by default. The plugin can set all string type fields
+as extra dimensions in the Azure Monitor custom metric by setting the
+configuration option `strings_as_dimensions` to `true`. 
+
+Keep in mind, Azure Monitor allows a maximum of 10 dimensions per metric. The
+plugin will deterministically dropped any dimensions that exceed the 10
+dimension limit.
+
+To convert only a subset of string-typed fields as dimensions, enable
+`strings_as_dimensions` and use the [`fieldpass` or `fielddrop`
+processors](https://docs.influxdata.com/telegraf/v1.7/administration/configuration/#processor-configuration)
+to limit the string-typed fields that are sent to the plugin.

From 1fdf032db057ba0b83fd506730c62ed9aa92fda8 Mon Sep 17 00:00:00 2001
From: Greg <g2linton@gmail.com>
Date: Wed, 12 Sep 2018 15:48:59 -0600
Subject: [PATCH 787/835] Add influx v2 output plugin (#4645)

---
 plugins/outputs/all/all.go                    |   1 +
 plugins/outputs/influxdb_v2/README.md         |  51 +++
 plugins/outputs/influxdb_v2/http.go           | 292 ++++++++++++++++++
 .../outputs/influxdb_v2/http_internal_test.go |  59 ++++
 plugins/outputs/influxdb_v2/http_test.go      |  49 +++
 plugins/outputs/influxdb_v2/influxdb.go       | 201 ++++++++++++
 plugins/outputs/influxdb_v2/influxdb_test.go  | 103 ++++++
 7 files changed, 756 insertions(+)
 create mode 100644 plugins/outputs/influxdb_v2/README.md
 create mode 100644 plugins/outputs/influxdb_v2/http.go
 create mode 100644 plugins/outputs/influxdb_v2/http_internal_test.go
 create mode 100644 plugins/outputs/influxdb_v2/http_test.go
 create mode 100644 plugins/outputs/influxdb_v2/influxdb.go
 create mode 100644 plugins/outputs/influxdb_v2/influxdb_test.go

diff --git a/plugins/outputs/all/all.go b/plugins/outputs/all/all.go
index 4d49c0c6..24748c53 100644
--- a/plugins/outputs/all/all.go
+++ b/plugins/outputs/all/all.go
@@ -15,6 +15,7 @@ import (
 	_ "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/influxdb_v2"
 	_ "github.com/influxdata/telegraf/plugins/outputs/instrumental"
 	_ "github.com/influxdata/telegraf/plugins/outputs/kafka"
 	_ "github.com/influxdata/telegraf/plugins/outputs/kinesis"
diff --git a/plugins/outputs/influxdb_v2/README.md b/plugins/outputs/influxdb_v2/README.md
new file mode 100644
index 00000000..795f4467
--- /dev/null
+++ b/plugins/outputs/influxdb_v2/README.md
@@ -0,0 +1,51 @@
+# InfluxDB Output Plugin
+
+This InfluxDB output plugin writes metrics to the [InfluxDB 2.0](https://github.com/influxdata/platform) HTTP service.
+
+### Configuration:
+
+```toml
+# Configuration for sending metrics to InfluxDB 2.0
+[[outputs.influxdb_v2]]
+  ## The URLs of the InfluxDB cluster nodes.
+  ##
+  ## Multiple URLs can be specified for a single cluster, only ONE of the
+  ## urls will be written to each interval.
+  urls = ["http://127.0.0.1:9999"]
+
+  ## Token for authentication.
+  token = ""
+
+  ## Organization is the name of the organization you wish to write to.
+  organization = ""
+
+  ## Bucket to the name fo the bucketwrite into; must exist.
+  bucket = ""
+
+  ## Timeout for HTTP messages.
+  # timeout = "5s"
+
+  ## Additional HTTP headers
+  # http_headers = {"X-Special-Header" = "Special-Value"}
+
+  ## 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"
+
+  ## HTTP User-Agent
+  # user_agent = "telegraf"
+
+  ## Content-Encoding for write request body, can be set to "gzip" to
+  ## compress body or "identity" to apply no encoding.
+  # content_encoding = "gzip"
+
+  ## Enable or disable uint support for writing uints influxdb 2.0.
+  # influx_uint_support = false
+
+  ## 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
+```
diff --git a/plugins/outputs/influxdb_v2/http.go b/plugins/outputs/influxdb_v2/http.go
new file mode 100644
index 00000000..1e7061a2
--- /dev/null
+++ b/plugins/outputs/influxdb_v2/http.go
@@ -0,0 +1,292 @@
+package influxdb_v2
+
+import (
+	"compress/gzip"
+	"context"
+	"crypto/tls"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"log"
+	"net"
+	"net/http"
+	"net/url"
+	"path"
+	"strconv"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/serializers/influx"
+)
+
+type APIErrorType int
+
+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
+}
+
+const (
+	defaultRequestTimeout = time.Second * 5
+	defaultMaxWait        = 10 // seconds
+	defaultDatabase       = "telegraf"
+	defaultUserAgent      = "telegraf"
+)
+
+type HTTPConfig struct {
+	URL             *url.URL
+	Token           string
+	Organization    string
+	Bucket          string
+	Timeout         time.Duration
+	Headers         map[string]string
+	Proxy           *url.URL
+	UserAgent       string
+	ContentEncoding string
+	TLSConfig       *tls.Config
+
+	Serializer *influx.Serializer
+}
+
+type httpClient struct {
+	WriteURL        string
+	ContentEncoding string
+	Timeout         time.Duration
+	Headers         map[string]string
+
+	client     *http.Client
+	serializer *influx.Serializer
+	url        *url.URL
+	retryTime  time.Time
+}
+
+func NewHTTPClient(config *HTTPConfig) (*httpClient, error) {
+	if config.URL == nil {
+		return nil, ErrMissingURL
+	}
+
+	timeout := config.Timeout
+	if timeout == 0 {
+		timeout = defaultRequestTimeout
+	}
+
+	userAgent := config.UserAgent
+	if userAgent == "" {
+		userAgent = defaultUserAgent
+	}
+
+	var headers = make(map[string]string, len(config.Headers)+2)
+	headers["User-Agent"] = userAgent
+	headers["Authorization"] = "Token " + config.Token
+	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, err := makeWriteURL(
+		*config.URL,
+		config.Organization,
+		config.Bucket)
+	if err != nil {
+		return nil, err
+	}
+
+	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,
+					timeout,
+				)
+			},
+		}
+	default:
+		return nil, fmt.Errorf("unsupported scheme %q", config.URL.Scheme)
+	}
+
+	client := &httpClient{
+		serializer: serializer,
+		client: &http.Client{
+			Timeout:   timeout,
+			Transport: transport,
+		},
+		url:             config.URL,
+		WriteURL:        writeURL,
+		ContentEncoding: config.ContentEncoding,
+		Timeout:         timeout,
+		Headers:         headers,
+	}
+	return client, nil
+}
+
+// URL returns the origin URL that this client connects too.
+func (c *httpClient) URL() string {
+	return c.url.String()
+}
+
+type genericRespError struct {
+	Code      string
+	Message   string
+	Line      *int32
+	MaxLength *int32
+}
+
+func (g genericRespError) Error() string {
+	errString := fmt.Sprintf("%s: %s", g.Code, g.Message)
+	if g.Line != nil {
+		return fmt.Sprintf("%s - line[%d]", errString, g.Line)
+	} else if g.MaxLength != nil {
+		return fmt.Sprintf("%s - maxlen[%d]", errString, g.MaxLength)
+	}
+	return errString
+}
+
+func (c *httpClient) Write(ctx context.Context, metrics []telegraf.Metric) error {
+	if c.retryTime.After(time.Now()) {
+		return errors.New("Retry time has not elapsed")
+	}
+	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 := &genericRespError{}
+	err = json.NewDecoder(resp.Body).Decode(writeResp)
+	desc := writeResp.Error()
+	if err != nil {
+		desc = err.Error()
+	}
+
+	switch resp.StatusCode {
+	case http.StatusBadRequest, http.StatusUnauthorized,
+		http.StatusForbidden, http.StatusRequestEntityTooLarge:
+		log.Printf("E! [outputs.influxdb_v2] Failed to write metric: %s\n", desc)
+		return nil
+	case http.StatusTooManyRequests, http.StatusServiceUnavailable:
+		retryAfter := resp.Header.Get("Retry-After")
+		retry, err := strconv.Atoi(retryAfter)
+		if err != nil {
+			retry = 0
+		}
+		if retry > defaultMaxWait {
+			retry = defaultMaxWait
+		}
+		c.retryTime = time.Now().Add(time.Duration(retry) * time.Second)
+		return fmt.Errorf("Waiting %ds for server before sending metric again", retry)
+	}
+
+	// This is only until platform spec is fully implemented. As of the
+	// time of writing, there is no error body returned.
+	if xErr := resp.Header.Get("X-Influx-Error"); xErr != "" {
+		desc = fmt.Sprintf("%s; %s", desc, xErr)
+	}
+
+	return &APIError{
+		StatusCode:  resp.StatusCode,
+		Title:       resp.Status,
+		Description: desc,
+	}
+}
+
+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 (c *httpClient) addHeaders(req *http.Request) {
+	for header, value := range c.Headers {
+		req.Header.Set(header, value)
+	}
+}
+
+func compressWithGzip(data io.Reader) (io.Reader, error) {
+	pipeReader, pipeWriter := io.Pipe()
+	gzipWriter := gzip.NewWriter(pipeWriter)
+	var err error
+
+	go func() {
+		_, err = io.Copy(gzipWriter, data)
+		gzipWriter.Close()
+		pipeWriter.Close()
+	}()
+
+	return pipeReader, err
+}
+
+func makeWriteURL(loc url.URL, org, bucket string) (string, error) {
+	params := url.Values{}
+	params.Set("bucket", bucket)
+	params.Set("org", org)
+
+	switch loc.Scheme {
+	case "unix":
+		loc.Scheme = "http"
+		loc.Host = "127.0.0.1"
+		loc.Path = "v2/write"
+	case "http", "https":
+		loc.Path = path.Join(loc.Path, "v2/write")
+	default:
+		return "", fmt.Errorf("unsupported scheme: %q", loc.Scheme)
+	}
+	loc.RawQuery = params.Encode()
+	return loc.String(), nil
+}
diff --git a/plugins/outputs/influxdb_v2/http_internal_test.go b/plugins/outputs/influxdb_v2/http_internal_test.go
new file mode 100644
index 00000000..5df51fc8
--- /dev/null
+++ b/plugins/outputs/influxdb_v2/http_internal_test.go
@@ -0,0 +1,59 @@
+package influxdb_v2
+
+import (
+	"io"
+	"net/url"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func genURL(u string) *url.URL {
+	URL, _ := url.Parse(u)
+	return URL
+}
+
+func TestMakeWriteURL(t *testing.T) {
+	tests := []struct {
+		err bool
+		url *url.URL
+		act string
+	}{
+		{
+			url: genURL("http://localhost:9999"),
+			act: "http://localhost:9999/v2/write?bucket=telegraf&org=influx",
+		},
+		{
+			url: genURL("unix://var/run/influxd.sock"),
+			act: "http://127.0.0.1/v2/write?bucket=telegraf&org=influx",
+		},
+		{
+			err: true,
+			url: genURL("udp://localhost:9999"),
+		},
+	}
+
+	for i := range tests {
+		rURL, err := makeWriteURL(*tests[i].url, "influx", "telegraf")
+		if !tests[i].err {
+			require.NoError(t, err)
+		} else {
+			require.Error(t, err)
+			t.Log(err)
+		}
+		if err == nil {
+			require.Equal(t, tests[i].act, rURL)
+		}
+	}
+}
+
+func TestMakeWriteRequest(t *testing.T) {
+	reader, _ := io.Pipe()
+	cli := httpClient{
+		WriteURL:        "http://localhost:9999/v2/write?bucket=telegraf&org=influx",
+		ContentEncoding: "gzip",
+		Headers:         map[string]string{"x": "y"},
+	}
+	_, err := cli.makeWriteRequest(reader)
+	require.NoError(t, err)
+}
diff --git a/plugins/outputs/influxdb_v2/http_test.go b/plugins/outputs/influxdb_v2/http_test.go
new file mode 100644
index 00000000..33ff9e24
--- /dev/null
+++ b/plugins/outputs/influxdb_v2/http_test.go
@@ -0,0 +1,49 @@
+package influxdb_v2_test
+
+import (
+	"net/url"
+	"testing"
+
+	influxdb "github.com/influxdata/telegraf/plugins/outputs/influxdb_v2"
+	"github.com/stretchr/testify/require"
+)
+
+func genURL(u string) *url.URL {
+	URL, _ := url.Parse(u)
+	return URL
+}
+func TestNewHTTPClient(t *testing.T) {
+	tests := []struct {
+		err bool
+		cfg *influxdb.HTTPConfig
+	}{
+		{
+			err: true,
+			cfg: &influxdb.HTTPConfig{},
+		},
+		{
+			err: true,
+			cfg: &influxdb.HTTPConfig{
+				URL: genURL("udp://localhost:9999"),
+			},
+		},
+		{
+			cfg: &influxdb.HTTPConfig{
+				URL: genURL("unix://var/run/influxd.sock"),
+			},
+		},
+	}
+
+	for i := range tests {
+		client, err := influxdb.NewHTTPClient(tests[i].cfg)
+		if !tests[i].err {
+			require.NoError(t, err)
+		} else {
+			require.Error(t, err)
+			t.Log(err)
+		}
+		if err == nil {
+			client.URL()
+		}
+	}
+}
diff --git a/plugins/outputs/influxdb_v2/influxdb.go b/plugins/outputs/influxdb_v2/influxdb.go
new file mode 100644
index 00000000..886907c0
--- /dev/null
+++ b/plugins/outputs/influxdb_v2/influxdb.go
@@ -0,0 +1,201 @@
+package influxdb_v2
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"log"
+	"math/rand"
+	"net/url"
+	"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/influx"
+)
+
+var (
+	defaultURL = "http://localhost:9999"
+
+	ErrMissingURL = errors.New("missing URL")
+)
+
+var sampleConfig = `
+  ## The URLs of the InfluxDB cluster nodes.
+  ##
+  ## Multiple URLs can be specified for a single cluster, only ONE of the
+  ## urls will be written to each interval.
+  urls = ["http://127.0.0.1:9999"]
+
+  ## Token for authentication.
+  token = ""
+
+  ## Organization is the name of the organization you wish to write to; must exist.
+  organization = ""
+
+  ## Bucket to the name fo the bucketwrite into; must exist.
+  bucket = ""
+
+  ## Timeout for HTTP messages.
+  # timeout = "5s"
+
+  ## Additional HTTP headers
+  # http_headers = {"X-Special-Header" = "Special-Value"}
+
+  ## 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"
+
+  ## HTTP User-Agent
+  # user_agent = "telegraf"
+
+  ## Content-Encoding for write request body, can be set to "gzip" to
+  ## compress body or "identity" to apply no encoding.
+  # content_encoding = "gzip"
+
+  ## Enable or disable uint support for writing uints influxdb 2.0.
+  # influx_uint_support = false
+
+  ## 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
+`
+
+type Client interface {
+	Write(context.Context, []telegraf.Metric) error
+
+	URL() string // for logging
+}
+
+type InfluxDB struct {
+	URLs            []string          `toml:"urls"`
+	Token           string            `toml:"token"`
+	Organization    string            `toml:"organization"`
+	Bucket          string            `toml:"bucket"`
+	Timeout         internal.Duration `toml:"timeout"`
+	HTTPHeaders     map[string]string `toml:"http_headers"`
+	HTTPProxy       string            `toml:"http_proxy"`
+	UserAgent       string            `toml:"user_agent"`
+	ContentEncoding string            `toml:"content_encoding"`
+	UintSupport     bool              `toml:"influx_uint_support"`
+	tls.ClientConfig
+
+	clients    []Client
+	serializer *influx.Serializer
+}
+
+func (i *InfluxDB) Connect() error {
+	ctx := context.Background()
+
+	if len(i.URLs) == 0 {
+		i.URLs = append(i.URLs, defaultURL)
+	}
+
+	i.serializer = influx.NewSerializer()
+	if i.UintSupport {
+		i.serializer.SetFieldTypeSupport(influx.UintSupport)
+	}
+
+	for _, u := range i.URLs {
+		parts, err := url.Parse(u)
+		if err != nil {
+			return fmt.Errorf("error parsing url [%q]: %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 parsing proxy_url [%s]: %v", i.HTTPProxy, err)
+			}
+		}
+
+		switch parts.Scheme {
+		case "http", "https", "unix":
+			c, err := i.getHTTPClient(ctx, parts, proxy)
+			if err != nil {
+				return err
+			}
+
+			i.clients = append(i.clients, c)
+		default:
+			return fmt.Errorf("unsupported scheme [%q]: %q", u, parts.Scheme)
+		}
+	}
+
+	return nil
+}
+
+func (i *InfluxDB) Close() error {
+	return nil
+}
+
+func (i *InfluxDB) Description() string {
+	return "Configuration for sending metrics to InfluxDB"
+}
+
+func (i *InfluxDB) SampleConfig() string {
+	return sampleConfig
+}
+
+// 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 {
+	ctx := context.Background()
+
+	var err error
+	p := rand.Perm(len(i.clients))
+	for _, n := range p {
+		client := i.clients[n]
+		err = client.Write(ctx, metrics)
+		if err == nil {
+			return nil
+		}
+
+		log.Printf("E! [outputs.influxdb] when writing to [%s]: %v", client.URL(), err)
+	}
+
+	return errors.New("could not write any address")
+}
+
+func (i *InfluxDB) getHTTPClient(ctx context.Context, url *url.URL, proxy *url.URL) (Client, error) {
+	tlsConfig, err := i.ClientConfig.TLSConfig()
+	if err != nil {
+		return nil, err
+	}
+
+	config := &HTTPConfig{
+		URL:             url,
+		Token:           i.Token,
+		Organization:    i.Organization,
+		Bucket:          i.Bucket,
+		Timeout:         i.Timeout.Duration,
+		Headers:         i.HTTPHeaders,
+		Proxy:           proxy,
+		UserAgent:       i.UserAgent,
+		ContentEncoding: i.ContentEncoding,
+		TLSConfig:       tlsConfig,
+		Serializer:      i.serializer,
+	}
+
+	c, err := NewHTTPClient(config)
+	if err != nil {
+		return nil, fmt.Errorf("error creating HTTP client [%s]: %v", url, err)
+	}
+
+	return c, nil
+}
+
+func init() {
+	outputs.Add("influxdb_v2", func() telegraf.Output {
+		return &InfluxDB{
+			Timeout:         internal.Duration{Duration: time.Second * 5},
+			ContentEncoding: "gzip",
+		}
+	})
+}
diff --git a/plugins/outputs/influxdb_v2/influxdb_test.go b/plugins/outputs/influxdb_v2/influxdb_test.go
new file mode 100644
index 00000000..3702b430
--- /dev/null
+++ b/plugins/outputs/influxdb_v2/influxdb_test.go
@@ -0,0 +1,103 @@
+package influxdb_v2_test
+
+import (
+	"testing"
+
+	"github.com/influxdata/telegraf/internal/tls"
+	"github.com/influxdata/telegraf/plugins/outputs"
+	influxdb "github.com/influxdata/telegraf/plugins/outputs/influxdb_v2"
+	"github.com/stretchr/testify/require"
+)
+
+func TestDefaultURL(t *testing.T) {
+	output := influxdb.InfluxDB{}
+	err := output.Connect()
+	require.NoError(t, err)
+	if len(output.URLs) < 1 {
+		t.Fatal("Default URL failed to get set")
+	}
+	require.Equal(t, "http://localhost:9999", output.URLs[0])
+}
+func TestConnect(t *testing.T) {
+	tests := []struct {
+		err bool
+		out influxdb.InfluxDB
+	}{
+		{
+			out: influxdb.InfluxDB{
+				URLs:      []string{"http://localhost:1234"},
+				HTTPProxy: "http://localhost:9999",
+				HTTPHeaders: map[string]string{
+					"x": "y",
+				},
+			},
+		},
+		{
+			err: true,
+			out: influxdb.InfluxDB{
+				URLs:      []string{"!@#$qwert"},
+				HTTPProxy: "http://localhost:9999",
+				HTTPHeaders: map[string]string{
+					"x": "y",
+				},
+			},
+		},
+		{
+			err: true,
+			out: influxdb.InfluxDB{
+				URLs:      []string{"http://localhost:1234"},
+				HTTPProxy: "!@#$%^&*()_+",
+				HTTPHeaders: map[string]string{
+					"x": "y",
+				},
+			},
+		},
+		{
+			err: true,
+			out: influxdb.InfluxDB{
+				URLs:      []string{"!@#$%^&*()_+"},
+				HTTPProxy: "http://localhost:9999",
+				HTTPHeaders: map[string]string{
+					"x": "y",
+				},
+			},
+		},
+		{
+			err: true,
+			out: influxdb.InfluxDB{
+				URLs:      []string{":::@#$qwert"},
+				HTTPProxy: "http://localhost:9999",
+				HTTPHeaders: map[string]string{
+					"x": "y",
+				},
+			},
+		},
+		{
+			err: true,
+			out: influxdb.InfluxDB{
+				URLs: []string{"https://localhost:8080"},
+				ClientConfig: tls.ClientConfig{
+					TLSCA: "thing",
+				},
+			},
+		},
+	}
+
+	for i := range tests {
+		err := tests[i].out.Connect()
+		if !tests[i].err {
+			require.NoError(t, err)
+		} else {
+			require.Error(t, err)
+			t.Log(err)
+		}
+	}
+}
+
+func TestUnused(t *testing.T) {
+	thing := influxdb.InfluxDB{}
+	thing.Close()
+	thing.Description()
+	thing.SampleConfig()
+	outputs.Outputs["influxdb_v2"]()
+}

From 634762b739a34fd4456691be257cbe66e8d8d293 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 12 Sep 2018 14:50:53 -0700
Subject: [PATCH 788/835] Update changelog

---
 CHANGELOG.md | 2 ++
 README.md    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6bf96251..8240478c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@
 ### New Outputs
 
 - [azure_monitor](./plugins/outputs/azure_monitor/README.md) - Contributed by @influxdata
+- [influxdb_v2](./plugins/outputs/influxdb_v2/README.md) - Contributed by @influxdata
 
 ### New Parsers
 
@@ -105,6 +106,7 @@
 - [#4667](https://github.com/influxdata/telegraf/pull/4667): Align metrics window to interval in cloudwatch input.
 - [#4642](https://github.com/influxdata/telegraf/pull/4642): Improve Azure Managed Instance support + more in sqlserver input.
 - [#4682](https://github.com/influxdata/telegraf/pull/4682): Allow alternate binaries for iptables input plugin.
+- [#4645](https://github.com/influxdata/telegraf/pull/4645): Add influxdb_v2 output plugin.
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index c93d9ea7..6ddb793e 100644
--- a/README.md
+++ b/README.md
@@ -171,6 +171,7 @@ configuration options.
 * [http_response](./plugins/inputs/http_response)
 * [icinga2](./plugins/inputs/icinga2)
 * [influxdb](./plugins/inputs/influxdb)
+* [influxdb_v2](./plugins/inputs/influxdb_v2)
 * [internal](./plugins/inputs/internal)
 * [interrupts](./plugins/inputs/interrupts)
 * [ipmi_sensor](./plugins/inputs/ipmi_sensor)

From 96f3d7def4e1a1c0afd9586cd7ddc6c12469fa45 Mon Sep 17 00:00:00 2001
From: Greg Linton <g2linton@gmail.com>
Date: Wed, 12 Sep 2018 16:06:31 -0600
Subject: [PATCH 789/835] Update telegraf.conf

---
 etc/telegraf.conf | 465 +++++++++++++++++++++++++++++++++++++++++-----
 scripts/build.py  |   2 +-
 2 files changed, 422 insertions(+), 45 deletions(-)

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 11842e7e..8d1371a2 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -183,8 +183,8 @@
 #   ## If true, exchange will be passively declared.
 #   # exchange_declare_passive = false
 #
-#   ## If true, exchange will be created as a durable exchange.
-#   # exchange_durable = true
+#   ## Exchange durability can be either "transient" or "durable".
+#   # exchange_durability = "durable"
 #
 #   ## Additional exchange arguments.
 #   # exchange_arguments = { }
@@ -256,7 +256,7 @@
 #   # timeout = "5s"
 #
 #   ## Enable additional diagnostic logging.
-#   # enable_diagnosic_logging = false
+#   # enable_diagnostic_logging = false
 #
 #   ## Context Tag Sources add Application Insights context tags to a tag value.
 #   ##
@@ -267,6 +267,32 @@
 #   #   "ai.cloud.roleInstance" = "kubernetes_pod_name"
 
 
+# # Send aggregate metrics to Azure Monitor
+# [[outputs.azure_monitor]]
+#   ## Timeout for HTTP writes.
+#   # timeout = "20s"
+#
+#   ## Set the namespace prefix, defaults to "Telegraf/<input-name>".
+#   # namespace_prefix = "Telegraf/"
+#
+#   ## Azure Monitor doesn't have a string value type, so convert string
+#   ## fields to dimensions (a.k.a. tags) if enabled. Azure Monitor allows
+#   ## a maximum of 10 dimensions so Telegraf will only send the first 10
+#   ## alphanumeric dimensions.
+#   # strings_as_dimensions = false
+#
+#   ## Both region and resource_id must be set or be available via the
+#   ## Instance Metadata service on Azure Virtual Machines.
+#   #
+#   ## Azure Region to publish metrics against.
+#   ##   ex: region = "southcentralus"
+#   # region = ""
+#   #
+#   ## The Azure Resource ID against which metric will be logged, e.g.
+#   ##   ex: resource_id = "/subscriptions/<subscription_id>/resourceGroups/<resource_group>/providers/Microsoft.Compute/virtualMachines/<vm_name>"
+#   # resource_id = ""
+
+
 # # Configuration for AWS CloudWatch output.
 # [[outputs.cloudwatch]]
 #   ## Amazon REGION
@@ -287,8 +313,22 @@
 #   #profile = ""
 #   #shared_credential_file = ""
 #
+#   ## Endpoint to make request against, the correct endpoint is automatically
+#   ## determined and this option should only be set if you wish to override the
+#   ## default.
+#   ##   ex: endpoint_url = "http://localhost:8000"
+#   # endpoint_url = ""
+#
 #   ## Namespace for the CloudWatch MetricDatums
 #   namespace = "InfluxData/Telegraf"
+#
+#   ## If you have a large amount of metrics, you should consider to send statistic
+#   ## values instead of raw metrics which could not only improve performance but
+#   ## also save AWS API cost. If enable this flag, this plugin would parse the required
+#   ## CloudWatch statistic fields (count, min, max, and sum) and send them to CloudWatch.
+#   ## You could use basicstats aggregator to calculate those fields. If not all statistic
+#   ## fields are available, all fields would still be sent as raw metrics.
+#   # write_statistics = false
 
 
 # # Configuration for CrateDB to send metrics to.
@@ -429,6 +469,12 @@
 #   # username = "username"
 #   # password = "pa$$word"
 #
+#   ## OAuth2 Client Credentials Grant
+#   # client_id = "clientid"
+#   # client_secret = "secret"
+#   # token_url = "https://indentityprovider/oauth2/v1/token"
+#   # scopes = ["urn:opc:idm:__myscopes__"]
+#
 #   ## Optional TLS Config
 #   # tls_ca = "/etc/telegraf/ca.pem"
 #   # tls_cert = "/etc/telegraf/cert.pem"
@@ -470,6 +516,15 @@
 #   ## Kafka topic for producer messages
 #   topic = "telegraf"
 #
+#   ## Optional Client id
+#   # client_id = "Telegraf"
+#
+#   ## Set the minimal supported Kafka version.  Setting this enables the use of new
+#   ## Kafka features and APIs.  Of particular interest, lz4 compression
+#   ## requires at least version 0.10.0.0.
+#   ##   ex: version = "1.1.0"
+#   # version = ""
+#
 #   ## Optional topic suffix configuration.
 #   ## If the section is omitted, no suffix is used.
 #   ## Following topic suffix methods are supported:
@@ -501,11 +556,19 @@
 #   ##  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.  If set to "random",
+#   ## a random value will be generated for each message.
+#   ##   ex: routing_key = "random"
+#   ##       routing_key = "telegraf"
+#   # routing_key = ""
+#
 #   ## CompressionCodec represents the various compression codecs recognized by
 #   ## Kafka in messages.
 #   ##  0 : No compression
 #   ##  1 : Gzip compression
 #   ##  2 : Snappy compression
+#   ##  3 : LZ4 compression
 #   # compression_codec = 0
 #
 #   ##  RequiredAcks is used in Produce Requests to tell the broker how many
@@ -528,6 +591,10 @@
 #   ## until the next flush.
 #   # max_retry = 3
 #
+#   ## The maximum permitted size of a message. Should be set equal to or
+#   ## smaller than the broker's 'message.max.bytes'.
+#   # max_message_bytes = 1000000
+#
 #   ## Optional TLS Config
 #   # tls_ca = "/etc/telegraf/ca.pem"
 #   # tls_cert = "/etc/telegraf/cert.pem"
@@ -566,6 +633,12 @@
 #   #profile = ""
 #   #shared_credential_file = ""
 #
+#   ## Endpoint to make request against, the correct endpoint is automatically
+#   ## determined and this option should only be set if you wish to override the
+#   ## default.
+#   ##   ex: endpoint_url = "http://localhost:8000"
+#   # endpoint_url = ""
+#
 #   ## Kinesis StreamName must exist prior to starting telegraf.
 #   streamname = "StreamName"
 #   ## DEPRECATED: PartitionKey as used for sharding data.
@@ -721,11 +794,11 @@
 #
 #   ## Number of data points to send to OpenTSDB in Http requests.
 #   ## Not used with telnet API.
-#   httpBatchSize = 50
+#   http_batch_size = 50
 #
 #   ## URI Path for Http requests to OpenTSDB.
 #   ## Used in cases where OpenTSDB is located behind a reverse proxy.
-#   httpPath = "/api/put"
+#   http_path = "/api/put"
 #
 #   ## Debug true - Prints OpenTSDB communication
 #   debug = false
@@ -737,29 +810,33 @@
 # # Configuration for the Prometheus client to spawn
 # [[outputs.prometheus_client]]
 #   ## Address to listen on
-#   # listen = ":9273"
+#   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"
 #
-#   ## Use http basic authentication
-#   #basic_username = "Foo"
-#   #basic_password = "Bar"
+#   ## If set, the IP Ranges which are allowed to access metrics.
+#   ##   ex: ip_range = ["192.168.0.0/24", "192.168.1.0/30"]
+#   # ip_range = []
 #
-#   ## IP Ranges which are allowed to access metrics
-#   #ip_range = ["192.168.0.0/24", "192.168.1.0/30"]
+#   ## Path to publish the metrics on.
+#   # path = "/metrics"
 #
-#   ## Interval to expire metrics and not deliver to prometheus, 0 == no expiration
+#   ## Expiration interval for each metric. 0 == no expiration
 #   # expiration_interval = "60s"
 #
 #   ## Collectors to enable, valid entries are "gocollector" and "process".
 #   ## If unset, both are enabled.
-#   collectors_exclude = ["gocollector", "process"]
+#   # 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
+#   ## Send string metrics as Prometheus labels.
+#   ## Unless set to false all string metrics will be sent as labels.
+#   # string_as_label = true
+#
+#   ## If set, enable TLS with the given certificate.
+#   # tls_cert = "/etc/ssl/telegraf.crt"
+#   # tls_key = "/etc/ssl/telegraf.key"
 
 
 # # Configuration for the Riemann server to send metrics to
@@ -913,6 +990,27 @@
 #     float = []
 
 
+# # Map enum values according to given table.
+# [[processors.enum]]
+#   [[processors.enum.fields]]
+#     ## Name of the field to map
+#     source = "name"
+#
+#     ## Destination field to be used for the mapped value.  By default the source
+#     ## field is used, overwriting the original value.
+#     # destination = "mapped"
+#
+#     ## Default value to be used for all values not contained in the mapping
+#     ## table.  When unset, the unmodified value for the field will be used if no
+#     ## match is found.
+#     # default = 0
+#
+#     ## Table of mappings
+#     [processors.enum.fields.value_mappings]
+#       value1 = 1
+#       value2 = 2
+
+
 # # Apply metric modifications using override semantics.
 # [[processors.override]]
 #   ## All modifications on inputs and aggregators can be overridden:
@@ -925,6 +1023,25 @@
 #   #   additional_tag = "tag_value"
 
 
+# # Parse a value in a specified field/tag(s) and add the result in a new metric
+# [[processors.parser]]
+#   ## The name of the fields whose value will be parsed.
+#   parse_fields = []
+#
+#   ## If true, incoming metrics are not emitted.
+#   drop_original = false
+#
+#   ## If set to override, emitted metrics will be merged by overriding the
+#   ## original metric using the newly parsed metrics.
+#   merge = "override"
+#
+#   ## The dataformat to be read from files
+#   ## 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"
+
+
 # # Print all metrics that pass through this filter.
 # [[processors.printer]]
 
@@ -959,6 +1076,67 @@
 #   #   result_key = "search_category"
 
 
+# # Rename measurements, tags, and fields that pass through this filter.
+# [[processors.rename]]
+#   ## Measurement, tag, and field renamings are stored in separate sub-tables.
+#   ## Specify one sub-table per rename operation.
+#   # [[processors.rename.measurement]]
+#   #   ## measurement to change
+#   #   from = "kilobytes_per_second"
+#   #   to = "kbps"
+#
+#   # [[processors.rename.tag]]
+#   #   ## tag to change
+#   #   from = "host"
+#   #   to = "hostname"
+#
+#   # [[processors.rename.field]]
+#   #   ## field to change
+#   #   from = "lower"
+#   #   to = "min"
+#
+#   # [[processors.rename.field]]
+#   #   ## field to change
+#   #   from = "upper"
+#   #   to = "max"
+
+
+# # Perform string processing on tags, fields, and measurements
+# [[processors.strings]]
+#   ## Convert a tag value to uppercase
+#   # [[processors.strings.uppercase]]
+#   #   tag = "method"
+#
+#   ## Convert a field value to lowercase and store in a new field
+#   # [[processors.strings.lowercase]]
+#   #   field = "uri_stem"
+#   #   dest = "uri_stem_normalised"
+#
+#   ## Trim leading and trailing whitespace using the default cutset
+#   # [[processors.strings.trim]]
+#   #   field = "message"
+#
+#   ## Trim leading characters in cutset
+#   # [[processors.strings.trim_left]]
+#   #   field = "message"
+#   #   cutset = "\t"
+#
+#   ## Trim trailing characters in cutset
+#   # [[processors.strings.trim_right]]
+#   #   field = "message"
+#   #   cutset = "\r\n"
+#
+#   ## Trim the given prefix from the field
+#   # [[processors.strings.trim_prefix]]
+#   #   field = "my_value"
+#   #   prefix = "my_"
+#
+#   ## Trim the given suffix from the field
+#   # [[processors.strings.trim_suffix]]
+#   #   field = "read_count"
+#   #   suffix = "_count"
+
+
 # # Print all metrics that pass through this filter.
 # [[processors.topk]]
 #   ## How many seconds between aggregations
@@ -1060,6 +1238,18 @@
 #   drop_original = false
 
 
+# # Count the occurance of values in fields.
+# [[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 = []
+
+
 
 ###############################################################################
 #                            INPUT PLUGINS                                    #
@@ -1139,6 +1329,31 @@
   # no configuration
 
 
+# # Gather ActiveMQ metrics
+# [[inputs.activemq]]
+#   ## Required ActiveMQ Endpoint
+#   # server = "192.168.50.10"
+#
+#   ## Required ActiveMQ port
+#   # port = 8161
+#
+#   ## Credentials for basic HTTP authentication
+#   # username = "admin"
+#   # password = "admin"
+#
+#   ## Required ActiveMQ webadmin root path
+#   # webadmin = "admin"
+#
+#   ## Maximum time to receive response.
+#   # 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
+
+
 # # Read stats from aerospike server(s)
 # [[inputs.aerospike]]
 #   ## Aerospike servers to connect to (with port)
@@ -1349,6 +1564,12 @@
 #   #profile = ""
 #   #shared_credential_file = ""
 #
+#   ## Endpoint to make request against, the correct endpoint is automatically
+#   ## determined and this option should only be set if you wish to override the
+#   ## default.
+#   ##   ex: endpoint_url = "http://localhost:8000"
+#   # endpoint_url = ""
+#
 #   # 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, 5 minute, or larger intervals. See https://aws.amazon.com/cloudwatch/faqs/#monitoring.
@@ -1385,7 +1606,9 @@
 #   #[[inputs.cloudwatch.metrics]]
 #   #  names = ["Latency", "RequestCount"]
 #   #
-#   #  ## Dimension filters for Metric (optional)
+#   #  ## Dimension filters for Metric.  These are optional however all dimensions
+#   #  ## defined for the metric names must be specified in order to retrieve
+#   #  ## the metric statistics.
 #   #  [[inputs.cloudwatch.metrics.dimensions]]
 #   #    name = "LoadBalancerName"
 #   #    value = "p-example"
@@ -1455,7 +1678,7 @@
 # # 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:
+#   ## Multiple Hosts from which to read CouchDB stats:
 #   hosts = ["http://localhost:8086/_stats"]
 
 
@@ -1685,6 +1908,48 @@
 #   # timeout = "5s"
 
 
+# # Reload and gather from file[s] on telegraf's interval.
+# [[inputs.file]]
+#   ## Files to parse each interval.
+#   ## 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 read the apache log file
+#   files = ["/var/log/apache/access.log"]
+#
+#   ## The dataformat to be read from files
+#   ## 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"
+
+
+# # Count files in a directory
+# [[inputs.filecount]]
+#   ## Directory to gather stats about.
+#   directory = "/var/cache/apt/archives"
+#
+#   ## Only count files that match the name pattern. Defaults to "*".
+#   name = "*.deb"
+#
+#   ## Count files in subdirectories. Defaults to true.
+#   recursive = false
+#
+#   ## Only count regular files. Defaults to true.
+#   regular_only = true
+#
+#   ## Only count files that are at least this size in bytes. If size is
+#   ## a negative number, only count files that are smaller than the
+#   ## absolute value of size. Defaults to 0.
+#   size = 0
+#
+#   ## Only count files that have not been touched for at least this
+#   ## duration. If mtime is negative, only count files that have been
+#   ## touched in this duration. Defaults to "0s".
+#   mtime = "0s"
+
+
 # # Read stats about given file(s)
 # [[inputs.filestat]]
 #   ## Files to gather stats about.
@@ -1919,6 +2184,29 @@
 #   #   apiVersion = "v1"
 
 
+# # Gather Icinga2 status
+# [[inputs.icinga2]]
+#   ## Required Icinga2 server address (default: "https://localhost:5665")
+#   # server = "https://localhost:5665"
+#
+#   ## Required Icinga2 object type ("services" or "hosts, default "services")
+#   # object_type = "services"
+#
+#   ## Credentials for basic HTTP authentication
+#   # username = "admin"
+#   # password = "admin"
+#
+#   ## Maximum time to receive response.
+#   # 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 = true
+
+
 # # Read InfluxDB-formatted JSON metrics from one or more HTTP endpoints
 # [[inputs.influxdb]]
 #   ## Works with InfluxDB debug endpoints out of the box,
@@ -1978,7 +2266,7 @@
 #
 #   ## Timeout for the ipmitool command to complete
 #   timeout = "20s"
-
+#
 #   ## Schema Version: (Optional, defaults to version 1)
 #   metric_version = 2
 
@@ -2004,8 +2292,6 @@
 #   ## 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
-#   ## Define an alternate executable, such as "ip6tables". Default is "iptables".
-#   # binary = "ip6tables"
 #   ## defines the table to monitor:
 #   table = "filter"
 #   ## defines the chains to monitor.
@@ -2164,6 +2450,26 @@
 #   # no configuration
 
 
+# # Read status information from one or more Kibana servers
+# [[inputs.kibana]]
+#   ## specify a list of one or more Kibana servers
+#   servers = ["http://localhost:5601"]
+#
+#   ## Timeout for HTTP requests
+#   timeout = "5s"
+#
+#   ## HTTP Basic Auth credentials
+#   # 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 from the kubernetes kubelet api
 # [[inputs.kubernetes]]
 #   ## URL for the kubelet
@@ -2348,7 +2654,7 @@
 #   ## gather thread state counts from INFORMATION_SCHEMA.PROCESSLIST
 #   gather_process_list                       = true
 #   #
-#   ## gather thread state counts from INFORMATION_SCHEMA.USER_STATISTICS
+#   ## gather user statistics from INFORMATION_SCHEMA.USER_STATISTICS
 #   gather_user_statistics                    = true
 #   #
 #   ## gather auto_increment columns and max values from information schema
@@ -2499,11 +2805,11 @@
 
 # # 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: path to nvidia-smi binary, defaults to $PATH via exec.LookPath
+#   # bin_path = "/usr/bin/nvidia-smi"
 #
-# ## Optional: timeout for GPU polling
-# # timeout = 5s
+#   ## Optional: timeout for GPU polling
+#   # timeout = "5s"
 
 
 # # OpenLDAP cn=Monitor plugin
@@ -2514,7 +2820,7 @@
 #   # 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
@@ -2591,20 +2897,23 @@
 
 # # 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>)
+#   urls = ["example.org"]
+#
+#   ## 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>)
+#
+#   ## 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>)
+#
+#   ## 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>)
+#
+#   ## 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>)
+#
+#   ## 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 = ""
 
@@ -2748,6 +3057,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
 
 
 # # Read metrics from one or many RethinkDB servers
@@ -3119,6 +3435,22 @@
 #   # virtual_servers = [1]
 
 
+# # 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.cer"
+#   # tls_key = "/etc/telegraf/key.key"
+#   ## Use TLS but skip chain & host verification
+#   # insecure_skip_verify = false
+
+
 # # Gather metrics from the Tomcat server status page.
 # [[inputs.tomcat]]
 #   ## URL of the Tomcat server status
@@ -3195,6 +3527,23 @@
 #   # instance_name = instanceName
 
 
+# # Reads metrics from a SSL certificate
+# [[inputs.x509_cert]]
+#   ## List certificate sources
+#   sources = ["/etc/ssl/certs/ssl-cert-snakeoil.pem", "tcp://example.org:443"]
+#
+#   ## Timeout for SSL connection
+#   # 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
+
+
 # # Read metrics of ZFS from arcstats, zfetchstats, vdev_cache_stats, and pools
 # [[inputs.zfs]]
 #   ## ZFS kstat path. Ignored on FreeBSD
@@ -3268,10 +3617,13 @@
 #   # exchange_arguments = { }
 #   # exchange_arguments = {"hash_propery" = "timestamp"}
 #
-#   ## AMQP queue name
+#   ## AMQP queue name.
 #   queue = "telegraf"
 #
-#   ## Binding Key
+#   ## AMQP queue durability can be "transient" or "durable".
+#   queue_durability = "durable"
+#
+#   ## Binding Key.
 #   binding_key = "#"
 #
 #   ## Maximum number of messages server should give to the worker.
@@ -3404,6 +3756,15 @@
 #   ## topic(s) to consume
 #   topics = ["telegraf"]
 #
+#   ## Optional Client id
+#   # client_id = "Telegraf"
+#
+#   ## Set the minimal supported Kafka version.  Setting this enables the use of new
+#   ## Kafka features and APIs.  Of particular interest, lz4 compression
+#   ## requires at least version 0.10.0.0.
+#   ##   ex: version = "1.1.0"
+#   # version = ""
+#
 #   ## Optional TLS Config
 #   # tls_ca = "/etc/telegraf/ca.pem"
 #   # tls_cert = "/etc/telegraf/cert.pem"
@@ -3428,7 +3789,7 @@
 #
 #   ## Maximum length of a message to consume, in bytes (default 0/unlimited);
 #   ## larger messages are dropped
-#   max_message_len = 65536
+#   max_message_len = 1000000
 
 
 # # Read metrics from Kafka topic(s)
@@ -3457,6 +3818,9 @@
 
 # # Stream and parse log file(s).
 # [[inputs.logparser]]
+#   ## DEPRECATED: The 'logparser' plugin is deprecated in 1.8.  Please use the
+#   ## 'tail' plugin with the grok data_format as a replacement.
+#
 #   ## Log files to parse.
 #   ## These accept standard unix glob matching rules, but with the addition of
 #   ## ** as a "super asterisk". ie:
@@ -3590,6 +3954,19 @@
 #   data_format = "influx"
 
 
+# # Read metrics from one or many pgbouncer servers
+# [[inputs.pgbouncer]]
+#   ## 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.
+#   ##
+#   address = "host=localhost user=pgbouncer sslmode=disable"
+
+
 # # Read metrics from one or many postgresql servers
 # [[inputs.postgresql]]
 #   ## specify address via a url matching:
@@ -3820,9 +4197,9 @@
 #   ## Only applies to stream sockets (e.g. TCP).
 #   # max_connections = 1024
 #
-#   ## Read timeout (default = 500ms).
+#   ## Read timeout is the maximum time allowed for reading a single message (default = 5s).
 #   ## 0 means unlimited.
-#   # read_timeout = 500ms
+#   # read_timeout = "5s"
 #
 #   ## Whether to parse in best effort mode or not (default = false).
 #   ## By default best effort parsing is off.
diff --git a/scripts/build.py b/scripts/build.py
index bfaba5a8..675a4c3c 100755
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -95,7 +95,7 @@ supported_packages = {
     "freebsd": [ "tar" ]
 }
 
-next_version = '1.8.0'
+next_version = '1.9.0'
 
 ################
 #### Telegraf Functions

From 41d528c8ce02fe00ca42c281e506e1e20e60f378 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 17 Sep 2018 11:45:08 -0700
Subject: [PATCH 790/835] Split parser/serializer docs (#4690)

---
 README.md                                  |   39 +-
 docs/DATA_FORMATS_INPUT.md                 | 1131 +-------------------
 docs/DATA_FORMATS_OUTPUT.md                |  197 +---
 docs/METRICS.md                            |   22 +
 docs/README.md                             |   21 +
 docs/TEMPLATE_PATTERN.md                   |  135 +++
 plugins/inputs/statsd/README.md            |    8 +-
 plugins/inputs/statsd/statsd.go            |    2 +-
 plugins/parsers/EXAMPLE_README.md          |   46 +
 plugins/parsers/collectd/README.md         |   44 +
 plugins/parsers/csv/README.md              |  104 ++
 plugins/parsers/dropwizard/README.md       |  171 +++
 plugins/parsers/graphite/README.md         |   48 +
 plugins/parsers/grok/README.md             |  222 ++++
 plugins/parsers/influx/README.md           |   20 +
 plugins/parsers/json/README.md             |  214 ++++
 plugins/parsers/logfmt/README.md           |   34 +
 plugins/parsers/nagios/README.md           |   17 +
 plugins/parsers/value/README.md            |   36 +
 plugins/parsers/wavefront/README.md        |   20 +
 plugins/serializers/EXAMPLE_README.md      |   46 +
 plugins/serializers/graphite/README.md     |   51 +
 plugins/serializers/influx/README.md       |   34 +
 plugins/serializers/json/README.md         |   77 ++
 plugins/serializers/splunkmetric/README.md |    4 +-
 25 files changed, 1412 insertions(+), 1331 deletions(-)
 create mode 100644 docs/METRICS.md
 create mode 100644 docs/README.md
 create mode 100644 docs/TEMPLATE_PATTERN.md
 create mode 100644 plugins/parsers/EXAMPLE_README.md
 create mode 100644 plugins/parsers/collectd/README.md
 create mode 100644 plugins/parsers/csv/README.md
 create mode 100644 plugins/parsers/dropwizard/README.md
 create mode 100644 plugins/parsers/graphite/README.md
 create mode 100644 plugins/parsers/grok/README.md
 create mode 100644 plugins/parsers/influx/README.md
 create mode 100644 plugins/parsers/json/README.md
 create mode 100644 plugins/parsers/logfmt/README.md
 create mode 100644 plugins/parsers/nagios/README.md
 create mode 100644 plugins/parsers/value/README.md
 create mode 100644 plugins/parsers/wavefront/README.md
 create mode 100644 plugins/serializers/EXAMPLE_README.md
 create mode 100644 plugins/serializers/graphite/README.md
 create mode 100644 plugins/serializers/influx/README.md
 create mode 100644 plugins/serializers/json/README.md

diff --git a/README.md b/README.md
index 6ddb793e..5bc83045 100644
--- a/README.md
+++ b/README.md
@@ -1,23 +1,19 @@
 # Telegraf [![Circle CI](https://circleci.com/gh/influxdata/telegraf.svg?style=svg)](https://circleci.com/gh/influxdata/telegraf) [![Docker pulls](https://img.shields.io/docker/pulls/library/telegraf.svg)](https://hub.docker.com/_/telegraf/)
 
-Telegraf is an agent written in Go for collecting, processing, aggregating,
-and writing metrics.
+Telegraf is an agent for collecting, processing, aggregating, 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
-.  For an example configuration referencet from local or remote services.
+that developers in the community can easily add support for collecting
+metrics.
 
-Telegraf is plugin-driven and has the concept of 4 distinct plugins:
+Telegraf is plugin-driven and has the concept of 4 distinct plugin types:
 
 1. [Input Plugins](#input-plugins) collect metrics from the system, services, or 3rd party APIs
 2. [Processor Plugins](#processor-plugins) transform, decorate, and/or filter metrics
 3. [Aggregator Plugins](#aggregator-plugins) create aggregate metrics (e.g. mean, min, max, quantiles, etc.)
 4. [Output Plugins](#output-plugins) write metrics to various destinations
 
-For more information on Processor and Aggregator plugins please [read this](./docs/AGGREGATORS_AND_PROCESSORS.md).
-
-New plugins are designed to be easy to contribute,
-we'll eagerly accept pull
+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.
 
 ## Contributing
@@ -26,7 +22,7 @@ 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/)
+- Answer questions and discuss here on github and on the [Community Site](https://community.influxdata.com/)
 - [Contribute plugins](CONTRIBUTING.md)
 
 ## Installation:
@@ -42,7 +38,7 @@ Ansible role: https://github.com/rossmcdonald/telegraf
 
 Telegraf requires golang version 1.9 or newer, the Makefile requires GNU make.
 
-1. [Install Go](https://golang.org/doc/install) >=1.9
+1. [Install Go](https://golang.org/doc/install) >=1.9 (1.10 recommended)
 2. [Install dep](https://golang.github.io/dep/docs/installation.html) ==v0.5.0
 3. Download Telegraf source:
    ```
@@ -86,44 +82,47 @@ These builds are generated from the master branch:
 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:
 
 ```
-./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:
 
 ```
-./telegraf --config telegraf.conf --test
+telegraf --config telegraf.conf --test
 ```
 
 #### 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:
 
 ```
-./telegraf --config telegraf.conf --input-filter cpu:mem --output-filter influxdb
+telegraf --config telegraf.conf --input-filter cpu:mem --output-filter influxdb
 ```
 
+## Documentation
 
-## Configuration
+[Latest Release Documentation][release docs].
 
-See the [configuration guide](docs/CONFIGURATION.md) for a rundown of the more advanced
-configuration options.
+For documentation on the latest development code see the [documentation index][devel docs].
+
+[release docs]: https://docs.influxdata.com/telegraf
+[devel docs]: docs
 
 ## Input Plugins
 
diff --git a/docs/DATA_FORMATS_INPUT.md b/docs/DATA_FORMATS_INPUT.md
index ff916081..b7165016 100644
--- a/docs/DATA_FORMATS_INPUT.md
+++ b/docs/DATA_FORMATS_INPUT.md
@@ -1,42 +1,24 @@
-# Telegraf Input Data Formats
+# Input Data Formats
 
-Telegraf is able to parse the following input data formats into metrics:
+Telegraf contains many general purpose plugins that support parsing input data
+using a configurable parser into [metrics][].  This allows, for example, the
+`kafka_consumer` input plugin to process messages in either InfluxDB Line
+Protocol or in JSON format.
 
-1. [InfluxDB Line Protocol](#influx)
-1. [JSON](#json)
-1. [Graphite](#graphite)
-1. [Value](#value), ie: 45 or "booyah"
-1. [Nagios](#nagios) (exec input only)
-1. [Collectd](#collectd)
-1. [Dropwizard](#dropwizard)
-1. [Grok](#grok)
-1. [Logfmt](#logfmt)
-1. [Wavefront](#wavefront)
-1. [CSV](#csv)
+- [InfluxDB Line Protocol](/plugins/parsers/influx)
+- [Collectd](/plugins/parsers/collectd)
+- [CSV](/plugins/parsers/csv)
+- [Dropwizard](/plugins/parsers/dropwizard)
+- [Graphite](/plugins/parsers/graphite)
+- [Grok](/plugins/parsers/grok)
+- [JSON](/plugins/parsers/json)
+- [Logfmt](/plugins/parsers/logfmt)
+- [Nagios](/plugins/parsers/nagios)
+- [Value](/plugins/parsers/value), ie: 45 or "booyah"
+- [Wavefront](/plugins/parsers/wavefront)
 
-Telegraf metrics, similar to InfluxDB's [points][influxdb key concepts], are a
-combination of four basic parts:
-
-[influxdb key concepts]: https://docs.influxdata.com/influxdb/v1.6/concepts/key_concepts/
-
-1. Measurement Name
-1. Tags
-1. Fields
-1. Timestamp
-
-These four parts are easily defined when using InfluxDB line-protocol as a
-data format. But there are other data formats that users may want to use which
-require more advanced configuration to create usable Telegraf metrics.
-
-Plugins such as `exec` and `kafka_consumer` parse textual data. Up until now,
-these plugins were statically configured to parse just a single
-data format. `exec` mostly only supported parsing JSON, and `kafka_consumer` only
-supported data in InfluxDB line-protocol.
-
-But now we are normalizing the parsing of various data formats across all
-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 exec plugin:
+Any input plugin containing the `data_format` option can use it to select the
+desired parser:
 
 ```toml
 [[inputs.exec]]
@@ -51,1081 +33,6 @@ example, in the exec plugin:
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
   data_format = "json"
-
-  ## Additional configuration options go here
-```
-
-Each data_format has an additional set of configuration options available, which
-I'll go over below.
-
-# Influx:
-
-There are no additional configuration options for InfluxDB [line protocol][]. The
-metrics are parsed directly into Telegraf metrics.
-
-[line protocol]: https://docs.influxdata.com/influxdb/latest/write_protocols/line/
-
-#### Influx Configuration:
-
-```toml
-[[inputs.exec]]
-  ## Commands array
-  commands = ["/tmp/test.sh", "/usr/bin/mycollector --foo=bar"]
-
-  ## 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"
-```
-
-# JSON:
-
-The JSON data format flattens JSON into metric _fields_.
-NOTE: Only numerical values are converted to fields, and they are converted
-into a float. strings are ignored unless specified as a tag_key (see below).
-
-So for example, this JSON:
-
-```json
-{
-    "a": 5,
-    "b": {
-        "c": 6
-    },
-    "ignored": "I'm a string"
-}
-```
-
-Would get translated into _fields_ of a measurement:
-
-```
-myjsonmetric a=5,b_c=6
-```
-
-The _measurement_ _name_ is usually the name of the plugin,
-but can be overridden using the `name_override` config option.
-
-#### JSON Configuration:
-
-The JSON data format supports specifying "tag_keys", "json_string_fields", and "json_query".
-If specified, keys in "tag_keys" and "json_string_fields" will be searched for in the root-level
-and any nested lists of the JSON blob. All int and float values are added to fields by default.
-If the key(s) exist, they will be applied as tags or fields to the Telegraf metrics.
-If "json_string_fields" is specified, the string will be added as a field.
-
-The "json_query" configuration is a gjson path to an JSON object or
-list of JSON objects. If this path leads to an array of values or
-single data point an error will be thrown.  If this configuration
-is specified, only the result of the query will be parsed and returned as metrics.
-
-The "json_name_key" configuration specifies the key of the field whos value will be
-added as the metric name.
-
-Object paths are specified using gjson path format, which is denoted by object keys
-concatenated with "." to go deeper in nested JSON objects.
-Additional information on gjson paths can be found here: https://github.com/tidwall/gjson#path-syntax
-
-The JSON data format also supports extracting time values through the
-config "json_time_key" and "json_time_format". If "json_time_key" is set,
-"json_time_format" must be specified.  The "json_time_key" describes the
-name of the field containing time information.  The "json_time_format"
-must be a recognized Go time format.
-If parsing a Unix epoch timestamp in seconds, e.g. 1536092344.1, this config must be set to "unix" (case insensitive);
-corresponding JSON value can have a decimal part and can be a string or a number JSON representation.
-If value is in number representation, it'll be treated as a double precision float, and could have some precision loss.
-If value is in string representation, there'll be no precision loss up to nanosecond precision. Decimal positions beyond that will be dropped.
-If parsing a Unix epoch timestamp in milliseconds, e.g. 1536092344100, this config must be set to "unix_ms" (case insensitive);
-corresponding JSON value must be a (long) integer and be in number JSON representation.
-If there is no year provided, the metrics will have the current year.
-More info on time formats can be found here: https://golang.org/pkg/time/#Parse
-
-For example, if you had this configuration:
-
-```toml
-[[inputs.exec]]
-  ## Commands array
-  commands = ["/tmp/test.sh", "/usr/bin/mycollector --foo=bar"]
-
-  ## 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 = "json"
-
-  ## List of tag names to extract from JSON server response
-  tag_keys = [
-    "my_tag_1",
-    "my_tag_2"
-  ]
-
-  ## The json path specifying where to extract the metric name from
-  # json_name_key = ""
-
-  ## List of field names to extract from JSON and add as string fields
-  # json_string_fields = []
-
-  ## gjson query path to specify a specific chunk of JSON to be parsed with
-  ## the above configuration. If not specified, the whole file will be parsed.
-  ## gjson query paths are described here: https://github.com/tidwall/gjson#path-syntax
-  # json_query = ""
-
-  ## holds the name of the tag of timestamp
-  # json_time_key = ""
-
-  ## holds the format of timestamp to be parsed
-  # json_time_format = ""
 ```
 
-with this JSON output from a command:
-
-```json
-{
-    "a": 5,
-    "b": {
-        "c": 6
-    },
-    "my_tag_1": "foo"
-}
-```
-
-Your Telegraf metrics would get tagged with "my_tag_1"
-
-```
-exec_mycollector,my_tag_1=foo a=5,b_c=6
-```
-
-If the JSON data is an array, then each element of the array is
-parsed with the configured settings.  Each resulting metric will
-be output with the same timestamp.
-
-For example, if the following configuration:
-
-```toml
-[[inputs.exec]]
-  ## Commands array
-  commands = ["/usr/bin/mycollector --foo=bar"]
-
-  ## 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 = "json"
-
-  ## List of tag names to extract from top-level of JSON server response
-  tag_keys = [
-    "my_tag_1",
-    "my_tag_2"
-  ]
-
-  ## List of field names to extract from JSON and add as string fields
-  # json_string_fields = []
-
-  ## gjson query path to specify a specific chunk of JSON to be parsed with
-  ## the above configuration. If not specified, the whole file will be parsed
-  # json_query = ""
-
-  ## holds the name of the tag of timestamp
-  json_time_key = "b_time"
-
-  ## holds the format of timestamp to be parsed
-  json_time_format = "02 Jan 06 15:04 MST"
-```
-
-with this JSON output from a command:
-
-```json
-[
-    {
-        "a": 5,
-        "b": {
-            "c": 6,
-            "time":"04 Jan 06 15:04 MST"
-        },
-        "my_tag_1": "foo",
-        "my_tag_2": "baz"
-    },
-    {
-        "a": 7,
-        "b": {
-            "c": 8,
-            "time":"11 Jan 07 15:04 MST"
-        },
-        "my_tag_1": "bar",
-        "my_tag_2": "baz"
-    }
-]
-```
-
-Your Telegraf metrics would get tagged with "my_tag_1" and "my_tag_2" and fielded with "b_c"
-The metric's time will be a time.Time object, as specified by "b_time"
-
-```
-exec_mycollector,my_tag_1=foo,my_tag_2=baz b_c=6 1136387040000000000
-exec_mycollector,my_tag_1=bar,my_tag_2=baz b_c=8 1168527840000000000
-```
-
-If you want to only use a specific portion of your JSON, use the "json_query"
-configuration to specify a path to a JSON object.
-
-For example, with the following config:
-```toml
-[[inputs.exec]]
-  ## Commands array
-  commands = ["/usr/bin/mycollector --foo=bar"]
-
-  ## 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 = "json"
-
-  ## List of tag names to extract from top-level of JSON server response
-  tag_keys = ["first"]
-
-  ## List of field names to extract from JSON and add as string fields
-  json_string_fields = ["last"]
-
-  ## gjson query path to specify a specific chunk of JSON to be parsed with
-  ## the above configuration. If not specified, the whole file will be parsed
-  json_query = "obj.friends"
-
-  ## holds the name of the tag of timestamp
-  # json_time_key = ""
-
-  ## holds the format of timestamp to be parsed
-  # json_time_format = ""
-```
-
-with this JSON as input:
-```json
-{
-    "obj": {
-        "name": {"first": "Tom", "last": "Anderson"},
-        "age":37,
-        "children": ["Sara","Alex","Jack"],
-        "fav.movie": "Deer Hunter",
-        "friends": [
-            {"first": "Dale", "last": "Murphy", "age": 44},
-            {"first": "Roger", "last": "Craig", "age": 68},
-            {"first": "Jane", "last": "Murphy", "age": 47}
-        ]
-    }
-}
-```
-You would recieve 3 metrics tagged with "first", and fielded with "last" and "age"
-
-```
-exec_mycollector, "first":"Dale" "last":"Murphy","age":44
-exec_mycollector, "first":"Roger" "last":"Craig","age":68
-exec_mycollector, "first":"Jane" "last":"Murphy","age":47
-```
-
-# Value:
-
-The "value" data format translates single values into Telegraf metrics. This
-is done by assigning a measurement name and setting a single field ("value")
-as the parsed metric.
-
-#### Value Configuration:
-
-You **must** tell Telegraf what type of metric to collect by using the
-`data_type` configuration option. Available options are:
-
-1. integer
-2. float or long
-3. string
-4. boolean
-
-**Note:** It is also recommended that you set `name_override` to a measurement
-name that makes sense for your metric, otherwise it will just be set to the
-name of the plugin.
-
-```toml
-[[inputs.exec]]
-  ## Commands array
-  commands = ["cat /proc/sys/kernel/random/entropy_avail"]
-
-  ## override the default metric name of "exec"
-  name_override = "entropy_available"
-
-  ## 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 = "value"
-  data_type = "integer" # required
-```
-
-# Graphite:
-
-The Graphite data format translates graphite _dot_ buckets directly into
-telegraf measurement names, with a single value field, and without any tags.
-By default, the separator is left as ".", but this can be changed using the
-"separator" argument. For more advanced options,
-Telegraf supports specifying "templates" to translate
-graphite buckets into Telegraf metrics.
-
-Templates are of the form:
-
-```
-"host.mytag.mytag.measurement.measurement.field*"
-```
-
-Where the following keywords exist:
-
-1. `measurement`: specifies that this section of the graphite bucket corresponds
-to the measurement name. This can be specified multiple times.
-2. `field`: specifies that this section of the graphite bucket corresponds
-to the field name. This can be specified multiple times.
-3. `measurement*`: specifies that all remaining elements of the graphite bucket
-correspond to the measurement name.
-4. `field*`: specifies that all remaining elements of the graphite bucket
-correspond to the field name.
-
-Any part of the template that is not a keyword is treated as a tag key. This
-can also be specified multiple times.
-
-NOTE: `field*` cannot be used in conjunction with `measurement*`!
-
-#### Measurement & Tag Templates:
-
-The most basic template is to specify a single transformation to apply to all
-incoming metrics. So the following template:
-
-```toml
-templates = [
-    "region.region.measurement*"
-]
-```
-
-would result in the following Graphite -> Telegraf transformation.
-
-```
-us.west.cpu.load 100
-=> cpu.load,region=us.west value=100
-```
-
-Multiple templates can also be specified, but these should be differentiated
-using _filters_ (see below for more details)
-
-```toml
-templates = [
-    "*.*.* region.region.measurement", # <- all 3-part measurements will match this one.
-    "*.*.*.* region.region.host.measurement", # <- all 4-part measurements will match this one.
-]
-```
-
-#### Field Templates:
-
-The field keyword tells Telegraf to give the metric that field name.
-So the following template:
-
-```toml
-separator = "_"
-templates = [
-    "measurement.measurement.field.field.region"
-]
-```
-
-would result in the following Graphite -> Telegraf transformation.
-
-```
-cpu.usage.idle.percent.eu-east 100
-=> cpu_usage,region=eu-east idle_percent=100
-```
-
-The field key can also be derived from all remaining elements of the graphite
-bucket by specifying `field*`:
-
-```toml
-separator = "_"
-templates = [
-    "measurement.measurement.region.field*"
-]
-```
-
-which would result in the following Graphite -> Telegraf transformation.
-
-```
-cpu.usage.eu-east.idle.percentage 100
-=> cpu_usage,region=eu-east idle_percentage=100
-```
-
-#### Filter Templates:
-
-Users can also filter the template(s) to use based on the name of the bucket,
-using glob matching, like so:
-
-```toml
-templates = [
-    "cpu.* measurement.measurement.region",
-    "mem.* measurement.measurement.host"
-]
-```
-
-which would result in the following transformation:
-
-```
-cpu.load.eu-east 100
-=> cpu_load,region=eu-east value=100
-
-mem.cached.localhost 256
-=> mem_cached,host=localhost value=256
-```
-
-#### Adding Tags:
-
-Additional tags can be added to a metric that don't exist on the received metric.
-You can add additional tags by specifying them after the pattern.
-Tags have the same format as the line protocol.
-Multiple tags are separated by commas.
-
-```toml
-templates = [
-    "measurement.measurement.field.region datacenter=1a"
-]
-```
-
-would result in the following Graphite -> Telegraf transformation.
-
-```
-cpu.usage.idle.eu-east 100
-=> cpu_usage,region=eu-east,datacenter=1a idle=100
-```
-
-There are many more options available,
-[More details can be found here](https://github.com/influxdata/influxdb/tree/master/services/graphite#templates)
-
-#### Graphite Configuration:
-
-```toml
-[[inputs.exec]]
-  ## Commands array
-  commands = ["/tmp/test.sh", "/usr/bin/mycollector --foo=bar"]
-
-  ## 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 = "graphite"
-
-  ## 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. 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
-  templates = [
-    "*.app env.service.resource.measurement",
-    "stats.* .host.measurement* region=eu-east,agent=sensu",
-    "stats2.* .host.measurement.field",
-    "measurement*"
-  ]
-```
-
-# Nagios:
-
-There are no additional configuration options for Nagios line-protocol. The
-metrics are parsed directly into Telegraf metrics.
-
-Note: Nagios Input Data Formats is only supported in `exec` input plugin.
-
-#### Nagios Configuration:
-
-```toml
-[[inputs.exec]]
-  ## Commands array
-  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 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"
-```
-
-# 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 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"
-
-  ## 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"]
-
-  # Multi-value plugins can be handled two ways.
-  # "split" will parse and store the multi-value plugin data into separate measurements
-  # "join" will parse and store the multi-value plugin as a single multi-value measurement.
-  # "split" is the default behavior for backward compatability with previous versions of influxdb.
-  collectd_parse_multivalue = "split"
-```
-
-# 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 value types are supported, `string`, `number` and `boolean`.
-
-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"
-```
-
-# Grok:
-
-The grok data format parses line delimited data using a regular expression like
-language.
-
-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 grok parser uses a slightly modified version of logstash "grok"
-patterns, with the format:
-
-```
-%{<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.
-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
-  - float
-  - duration (ie, 5.23ms gets converted to int nanoseconds)
-  - tag      (converts the field into a tag)
-  - drop     (drops the field completely)
-  - measurement (use the matched text as the measurement name)
-- Timestamp modifiers:
-  - ts               (This will auto-learn the timestamp format)
-  - ts-ansic         ("Mon Jan _2 15:04:05 2006")
-  - ts-unix          ("Mon Jan _2 15:04:05 MST 2006")
-  - ts-ruby          ("Mon Jan 02 15:04:05 -0700 2006")
-  - ts-rfc822        ("02 Jan 06 15:04 MST")
-  - ts-rfc822z       ("02 Jan 06 15:04 -0700")
-  - ts-rfc850        ("Monday, 02-Jan-06 15:04:05 MST")
-  - ts-rfc1123       ("Mon, 02 Jan 2006 15:04:05 MST")
-  - ts-rfc1123z      ("Mon, 02 Jan 2006 15:04:05 -0700")
-  - 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, 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
-"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),
-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!
-
-#### Grok Configuration:
-```toml
-[[inputs.file]]
-  ## Files to parse each interval.
-  ## 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"]
-
-  ## The dataformat to be read from files
-  ## 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 = "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.
-  ## Other common built-in patterns are:
-  ##   %{COMMON_LOG_FORMAT}   (plain apache & nginx access logs)
-  ##   %{COMBINED_LOG_FORMAT} (access logs + referrer & agent)
-  grok_patterns = ["%{COMBINED_LOG_FORMAT}"]
-
-  ## Full path(s) to custom pattern files.
-  grok_custom_pattern_files = []
-
-  ## Custom patterns can also be defined here. Put one pattern per line.
-  grok_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
-  grok_timezone = "Canada/Eastern"
-```
-
-#### 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.file]]
-  grok_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.file]]
-  grok_patterns = ['%{NUMBER:timestamp:ts-epoch} 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.file]]
-  grok_patterns = ["%{TS_UNIX:timestamp:ts-unix} value=%{NUMBER:value:int}"]
-  grok_custom_patterns = '''
-    TS_UNIX %{DAY} %{MONTH} %{MONTHDAY} %{HOUR}:%{MINUTE}:%{SECOND} %{TZ} %{YEAR}
-  '''
-```
-
-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),
-grok will offset the timestamp accordingly.
-
-#### 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.file]]
-  grok_patterns = ["\\|%{NUMBER:value:int}\\|%{UNICODE_ESCAPE:escape}\\|'%{WORD:name}'\\|"]
-  grok_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.file]]
-  grok_patterns = ["\\|%{NUMBER:value:int}\\|%{UNICODE_ESCAPE:escape}\\|'%{WORD:name}'\\|"]
-  grok_custom_patterns = 'UNICODE_ESCAPE (?:\\u[0-9A-F]{4})+'
-```
-
-A multi-line literal string allows us to encode the pattern:
-```toml
-[[inputs.file]]
-  grok_patterns = ['''
-    \|%{NUMBER:value:int}\|%{UNICODE_ESCAPE:escape}\|'%{WORD:name}'\|
-  ''']
-  grok_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.
-
-# Logfmt
-This parser implements the logfmt format by extracting and converting key-value pairs from log text in the form `<key>=<value>`.
-At the moment, the plugin will produce one metric per line and all keys
-are added as fields.
-A typical log
-```
-method=GET host=influxdata.org ts=2018-07-24T19:43:40.275Z
-connect=4ms service=8ms status=200 bytes=1653
-```
-will be converted into
-```
-logfmt method="GET",host="influxdata.org",ts="2018-07-24T19:43:40.275Z",connect="4ms",service="8ms",status=200i,bytes=1653i
-
-```
-Additional information about the logfmt format can be found [here](https://brandur.org/logfmt).
-
-# Wavefront:
-
-Wavefront Data Format is metrics are parsed directly into Telegraf metrics.
-For more information about the Wavefront Data Format see
-[here](https://docs.wavefront.com/wavefront_data_format.html).
-
-There are no additional configuration options for Wavefront Data Format line-protocol.
-
-#### Wavefront Configuration:
-
-```toml
-[[inputs.exec]]
-  ## Commands array
-  commands = ["/tmp/test.sh", "/usr/bin/mycollector --foo=bar"]
-
-  ## 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 = "wavefront"
-```
-
-# CSV
-Parse out metrics from a CSV formatted table. By default, the parser assumes there is no header and
-will read data from the first line. If `csv_header_row_count` is set to anything besides 0, the parser
-will extract column names from the first number of rows. Headers of more than 1 row will have their
-names concatenated together.  Any unnamed columns will be ignored by the parser.
-
-The `csv_skip_rows` config indicates the number of rows to skip before looking for header information or data
-to parse. By default, no rows will be skipped.
-
-The `csv_skip_columns` config indicates the number of columns to be skipped before parsing data. These
-columns will not be read out of the header.  Naming with the `csv_column_names` will begin at the first
-parsed column after skipping the indicated columns.  By default, no columns are skipped.
-
-To assign custom column names, the `csv_column_names` config is available. If the `csv_column_names`
-config is used, all columns must be named as additional columns will be ignored. If `csv_header_row_count`
-is set to 0, `csv_column_names` must be specified.  Names listed in `csv_column_names` will override names extracted
-from the header.
-
-The `csv_tag_columns` and `csv_field_columns` configs are available to add the column data to the metric.
-The name used to specify the column is the name in the header, or if specified, the corresponding
-name assigned in `csv_column_names`. If neither config is specified, no data will be added to the metric.
-
-Additional configs are available to dynamically name metrics and set custom timestamps.  If the
-`csv_column_names` config is specified, the parser will assign the metric name to the value found
-in that column. If the `csv_timestamp_column` is specified, the parser will extract the timestamp from
-that column. If `csv_timestamp_column` is specified, the `csv_timestamp_format` must also be specified
-or an error will be thrown.
-
-#### CSV Configuration
-```toml
-  data_format = "csv"
-
-  ## Indicates how many rows to treat as a header. By default, the parser assumes
-  ## there is no header and will parse the first row as data. If set to anything more
-  ## than 1, column names will be concatenated with the name listed in the next header row.
-  ## If `csv_column_names` is specified, the column names in header will be overridden.
-  # csv_header_row_count = 0
-
-  ## Indicates the number of rows to skip before looking for header information.
-  # csv_skip_rows = 0
-
-  ## Indicates the number of columns to skip before looking for data to parse.
-  ## These columns will be skipped in the header as well.
-  # csv_skip_columns = 0
-
-  ## The seperator between csv fields
-  ## By default, the parser assumes a comma (",")
-  # csv_delimiter = ","
-
-  ## The character reserved for marking a row as a comment row
-  ## Commented rows are skipped and not parsed
-  # csv_comment = ""
-
-  ## If set to true, the parser will remove leading whitespace from fields
-  ## By default, this is false
-  # csv_trim_space = false
-
-  ## For assigning custom names to columns
-  ## If this is specified, all columns should have a name
-  ## Unnamed columns will be ignored by the parser.
-  ## If `csv_header_row_count` is set to 0, this config must be used
-  csv_column_names = []
-
-  ## Columns listed here will be added as tags. Any other columns
-  ## will be added as fields.
-  csv_tag_columns = []
-
-  ## The column to extract the name of the metric from
-  ## By default, this is the name of the plugin
-  ## the `name_override` config overrides this
-  # csv_measurement_column = ""
-
-  ## The column to extract time information for the metric
-  ## `csv_timestamp_format` must be specified if this is used
-  # csv_timestamp_column = ""
-
-  ## The format of time data extracted from `csv_timestamp_column`
-  ## this must be specified if `csv_timestamp_column` is specified
-  # csv_timestamp_format = ""
-  ```
+[metrics]: /docs/METRICS.md
diff --git a/docs/DATA_FORMATS_OUTPUT.md b/docs/DATA_FORMATS_OUTPUT.md
index 60902165..c06ab471 100644
--- a/docs/DATA_FORMATS_OUTPUT.md
+++ b/docs/DATA_FORMATS_OUTPUT.md
@@ -4,13 +4,14 @@ 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)
-1. [SplunkMetric](../plugins/serializers/splunkmetric/README.md)
+1. [InfluxDB Line Protocol](/plugins/serializers/influx)
+1. [JSON](/plugins/serializers/json)
+1. [Graphite](/plugins/serializers/graphite)
+1. [SplunkMetric](/plugins/serializers/splunkmetric)
 
 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.
@@ -22,191 +23,3 @@ You will be able to identify the plugins with support by the presence of a
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
   data_format = "influx"
 ```
-
-## Influx
-
-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 unless another format is required for
-interoperability.
-
-### Influx 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 = "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
-
-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"
-```
-
-In the above template, we have four parts:
-
-1. _host_ is a tag key. This can be any tag key that is in the Telegraf
-metric(s). If the key doesn't exist, it will be ignored. If it does exist, the
-tag value will be filled in.
-1. _tags_ is a special keyword that outputs all remaining tag values, separated
-by dots and in alphabetical order (by tag key). These will be filled after all
-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.
-
-**Example Conversion**:
-
-```
-cpu,cpu=cpu-total,dc=us-east-1,host=tars usage_idle=98.09,usage_user=0.89 1455320660004257758
-=>
-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 string values will be skipped.  Boolean fields will be converted
-to 1 (true) or 0 (false).
-
-#### 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
-=>
-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
-[[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 = "graphite"
-
-  ## Prefix added to each graphite bucket
-  prefix = "telegraf"
-  ## Graphite template pattern
-  template = "host.tags.measurement.field"
-
-  ## Support Graphite tags, recommended to enable when using Graphite 1.1 or later.
-  # graphite_tag_support = false
-```
-
-## 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
-}
-```
-
-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]]
-  ## 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 = "json"
-
-  ## 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/docs/METRICS.md b/docs/METRICS.md
new file mode 100644
index 00000000..1c238e30
--- /dev/null
+++ b/docs/METRICS.md
@@ -0,0 +1,22 @@
+# Metrics
+
+Telegraf metrics are the internal representation used to model data during
+processing.  Metrics are closely based on InfluxDB's data model and contain
+four main components:
+
+- **Measurement Name**: Description and namespace for the metric.
+- **Tags**: Key/Value string pairs and usually used to identify the
+  metric.
+- **Fields**: Key/Value pairs that are typed and usually contain the
+  metric data.
+- **Timestamp**: Date and time associated with the fields.
+
+This metric type exists only in memory and must be converted to a concrete
+representation in order to be transmitted or viewed.  To acheive this we
+provide several [output data formats][] sometimes referred to as
+*serializers*.  Our default serializer converts to [InfluxDB Line
+Protocol][line protocol] which provides a high performance and one-to-one
+direct mapping from Telegraf metrics.
+
+[output data formats]: /docs/DATA_FORMATS_OUTPUT.md
+[line protocol]: /plugins/serializers/influx
diff --git a/docs/README.md b/docs/README.md
new file mode 100644
index 00000000..b7b55336
--- /dev/null
+++ b/docs/README.md
@@ -0,0 +1,21 @@
+# Telegraf
+
+- Concepts
+  - [Metrics][metrics]
+  - [Input Data Formats][parsers]
+  - [Output Data Formats][serializers]
+  - [Aggregators & Processors][aggproc]
+- Administration
+  - [Configuration][conf]
+  - [Profiling][profiling]
+  - [Windows Service][winsvc]
+  - [FAQ][faq]
+
+[conf]: /docs/CONFIGURATION.md
+[metrics]: /docs/METRICS.md
+[parsers]: /docs/DATA_FORMATS_INPUT.md
+[serializers]: /docs/DATA_FORMATS_OUTPUT.md
+[aggproc]: /docs/AGGREGATORS_AND_PROCESSORS.md
+[profiling]: /docs/PROFILING.md
+[winsvc]: /docs/WINDOWS_SERVICE.md
+[faq]: /docs/FAQ.md
diff --git a/docs/TEMPLATE_PATTERN.md b/docs/TEMPLATE_PATTERN.md
new file mode 100644
index 00000000..4244369d
--- /dev/null
+++ b/docs/TEMPLATE_PATTERN.md
@@ -0,0 +1,135 @@
+# Template Patterns
+
+Template patterns are a mini language that describes how a dot delimited
+string should be mapped to and from [metrics][].
+
+A template has the form:
+```
+"host.mytag.mytag.measurement.measurement.field*"
+```
+
+Where the following keywords can be set:
+
+1. `measurement`: specifies that this section of the graphite bucket corresponds
+to the measurement name. This can be specified multiple times.
+2. `field`: specifies that this section of the graphite bucket corresponds
+to the field name. This can be specified multiple times.
+3. `measurement*`: specifies that all remaining elements of the graphite bucket
+correspond to the measurement name.
+4. `field*`: specifies that all remaining elements of the graphite bucket
+correspond to the field name.
+
+Any part of the template that is not a keyword is treated as a tag key. This
+can also be specified multiple times.
+
+**NOTE:** `field*` cannot be used in conjunction with `measurement*`.
+
+### Examples
+
+#### Measurement & Tag Templates
+
+The most basic template is to specify a single transformation to apply to all
+incoming metrics. So the following template:
+
+```toml
+templates = [
+    "region.region.measurement*"
+]
+```
+
+would result in the following Graphite -> Telegraf transformation.
+
+```
+us.west.cpu.load 100
+=> cpu.load,region=us.west value=100
+```
+
+Multiple templates can also be specified, but these should be differentiated
+using _filters_ (see below for more details)
+
+```toml
+templates = [
+    "*.*.* region.region.measurement", # <- all 3-part measurements will match this one.
+    "*.*.*.* region.region.host.measurement", # <- all 4-part measurements will match this one.
+]
+```
+
+#### Field Templates
+
+The field keyword tells Telegraf to give the metric that field name.
+So the following template:
+
+```toml
+separator = "_"
+templates = [
+    "measurement.measurement.field.field.region"
+]
+```
+
+would result in the following Graphite -> Telegraf transformation.
+
+```
+cpu.usage.idle.percent.eu-east 100
+=> cpu_usage,region=eu-east idle_percent=100
+```
+
+The field key can also be derived from all remaining elements of the graphite
+bucket by specifying `field*`:
+
+```toml
+separator = "_"
+templates = [
+    "measurement.measurement.region.field*"
+]
+```
+
+which would result in the following Graphite -> Telegraf transformation.
+
+```
+cpu.usage.eu-east.idle.percentage 100
+=> cpu_usage,region=eu-east idle_percentage=100
+```
+
+#### Filter Templates
+
+Users can also filter the template(s) to use based on the name of the bucket,
+using glob matching, like so:
+
+```toml
+templates = [
+    "cpu.* measurement.measurement.region",
+    "mem.* measurement.measurement.host"
+]
+```
+
+which would result in the following transformation:
+
+```
+cpu.load.eu-east 100
+=> cpu_load,region=eu-east value=100
+
+mem.cached.localhost 256
+=> mem_cached,host=localhost value=256
+```
+
+#### Adding Tags
+
+Additional tags can be added to a metric that don't exist on the received metric.
+You can add additional tags by specifying them after the pattern.
+Tags have the same format as the line protocol.
+Multiple tags are separated by commas.
+
+```toml
+templates = [
+    "measurement.measurement.field.region datacenter=1a"
+]
+```
+
+would result in the following Graphite -> Telegraf transformation.
+
+```
+cpu.usage.idle.eu-east 100
+=> cpu_usage,region=eu-east,datacenter=1a idle=100
+```
+
+[metrics]: /docs/METRICS.md
diff --git a/plugins/inputs/statsd/README.md b/plugins/inputs/statsd/README.md
index 85cb4a46..c1093bf3 100644
--- a/plugins/inputs/statsd/README.md
+++ b/plugins/inputs/statsd/README.md
@@ -10,7 +10,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
 
@@ -45,7 +45,7 @@
   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
+  ## https://github.com/influxdata/telegraf/blob/master/docs/TEMPLATE_PATTERN.md
   # templates = [
   #     "cpu.* measurement*"
   # ]
@@ -227,5 +227,5 @@ mem.cached.localhost:256|g
 => mem_cached,host=localhost 256
 ```
 
-There are many more options available,
-[More details can be found here](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#graphite)
+Consult the [Template Patterns](/docs/TEMPLATE_PATTERN.md) documentation for
+additional details.
diff --git a/plugins/inputs/statsd/statsd.go b/plugins/inputs/statsd/statsd.go
index 60b55887..6b0dd0b7 100644
--- a/plugins/inputs/statsd/statsd.go
+++ b/plugins/inputs/statsd/statsd.go
@@ -216,7 +216,7 @@ const sampleConfig = `
   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
+  ## https://github.com/influxdata/telegraf/blob/master/docs/TEMPLATE_PATTERN.md
   # templates = [
   #     "cpu.* measurement*"
   # ]
diff --git a/plugins/parsers/EXAMPLE_README.md b/plugins/parsers/EXAMPLE_README.md
new file mode 100644
index 00000000..b3c1bc2e
--- /dev/null
+++ b/plugins/parsers/EXAMPLE_README.md
@@ -0,0 +1,46 @@
+# Example
+
+This description explains at a high level what the parser does and provides
+links to where additional information about the format can be found.
+
+### Configuration
+
+This section contains the sample configuration for the parser.  Since the
+configuration for a parser is not have a standalone plugin, use the `file` or
+`exec` input as the base config.
+
+```toml
+[[inputs.file]]
+  files = ["example"]
+
+  ## 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 = "example"
+
+  ## Describe variables using the standard SampleConfig style.
+  ##   https://github.com/influxdata/telegraf/wiki/SampleConfig
+  example_option = "example_value"
+```
+
+#### example_option
+
+If an option requires a more expansive explanation than can be included inline
+in the sample configuration, it may be described here.
+
+### Metrics
+
+The optional Metrics section contains details about how the parser converts
+input data into Telegraf metrics.
+
+### Examples
+
+The optional Examples section can show an example conversion from the input
+format using InfluxDB Line Protocol as the reference format.
+
+For line delimited text formats a diff may be appropriate:
+```diff
+- cpu|host=localhost|source=example.org|value=42
++ cpu,host=localhost,source=example.org value=42
+```
diff --git a/plugins/parsers/collectd/README.md b/plugins/parsers/collectd/README.md
new file mode 100644
index 00000000..06f14d6d
--- /dev/null
+++ b/plugins/parsers/collectd/README.md
@@ -0,0 +1,44 @@
+# 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`.
+
+### Configuration
+
+```toml
+[[inputs.file]]
+  files = ["example"]
+
+  ## 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 = "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"]
+
+  ## Multi-value plugins can be handled two ways.
+  ## "split" will parse and store the multi-value plugin data into separate measurements
+  ## "join" will parse and store the multi-value plugin as a single multi-value measurement.
+  ## "split" is the default behavior for backward compatability with previous versions of influxdb.
+  collectd_parse_multivalue = "split"
+```
diff --git a/plugins/parsers/csv/README.md b/plugins/parsers/csv/README.md
new file mode 100644
index 00000000..53298099
--- /dev/null
+++ b/plugins/parsers/csv/README.md
@@ -0,0 +1,104 @@
+# CSV
+
+The `csv` parser creates metrics from a document containing comma separated
+values.
+
+### Configuration
+
+```toml
+[[inputs.file]]
+  files = ["example"]
+
+  ## 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 = "csv"
+
+  ## Indicates how many rows to treat as a header. By default, the parser assumes
+  ## there is no header and will parse the first row as data. If set to anything more
+  ## than 1, column names will be concatenated with the name listed in the next header row.
+  ## If `csv_column_names` is specified, the column names in header will be overridden.
+  csv_header_row_count = 0
+
+  ## For assigning custom names to columns
+  ## If this is specified, all columns should have a name
+  ## Unnamed columns will be ignored by the parser.
+  ## If `csv_header_row_count` is set to 0, this config must be used
+  csv_column_names = []
+
+  ## Indicates the number of rows to skip before looking for header information.
+  csv_skip_rows = 0
+
+  ## Indicates the number of columns to skip before looking for data to parse.
+  ## These columns will be skipped in the header as well.
+  csv_skip_columns = 0
+
+  ## The seperator between csv fields
+  ## By default, the parser assumes a comma (",")
+  csv_delimiter = ","
+
+  ## The character reserved for marking a row as a comment row
+  ## Commented rows are skipped and not parsed
+  csv_comment = ""
+
+  ## If set to true, the parser will remove leading whitespace from fields
+  ## By default, this is false
+  csv_trim_space = false
+
+  ## Columns listed here will be added as tags. Any other columns
+  ## will be added as fields.
+  csv_tag_columns = []
+
+  ## The column to extract the name of the metric from
+  csv_measurement_column = ""
+
+  ## The column to extract time information for the metric
+  ## `csv_timestamp_format` must be specified if this is used
+  csv_timestamp_column = ""
+
+  ## The format of time data extracted from `csv_timestamp_column`
+  ## this must be specified if `csv_timestamp_column` is specified
+  csv_timestamp_format = ""
+  ```
+#### csv_timestamp_column, csv_timestamp_format
+
+By default the current time will be used for all created metrics, to set the
+time using the JSON document you can use the `csv_timestamp_column` and
+`csv_timestamp_format` options together to set the time to a value in the parsed
+document.
+
+The `csv_timestamp_column` option specifies the column name containing the
+time value and `csv_timestamp_format` must be set to a Go "reference time"
+which is defined to be the specific time: `Mon Jan 2 15:04:05 MST 2006`.
+
+Consult the Go [time][time parse] package for details and additional examples
+on how to set the time format.
+
+### Metrics
+
+One metric is created for each row with the columns added as fields.  The type
+of the field is automatically determined based on the contents of the value.
+
+### Examples
+
+Config:
+```
+[[inputs.file]]
+  files = ["example"]
+  data_format = "csv"
+  csv_header_row_count = 1
+  csv_timestamp_column = "time"
+  csv_timestamp_format = "2006-01-02T15:04:05Z07:00"
+```
+
+Input:
+```
+measurement,cpu,time_user,time_system,time_idle,time
+cpu,cpu0,42,42,42,2018-09-13T13:03:28Z
+```
+
+Output:
+```
+cpu cpu=cpu0,time_user=42,time_system=42,time_idle=42 1536869008000000000
+```
diff --git a/plugins/parsers/dropwizard/README.md b/plugins/parsers/dropwizard/README.md
new file mode 100644
index 00000000..f0ff6d15
--- /dev/null
+++ b/plugins/parsers/dropwizard/README.md
@@ -0,0 +1,171 @@
+# Dropwizard
+
+The `dropwizard` data format can parse the [JSON Dropwizard][dropwizard] 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 a custom [template pattern][templates]. All field value types are supported, `string`, `number` and `boolean`.
+
+[templates]: /docs/TEMPLATE_PATTERN.md
+[dropwizard]: http://metrics.dropwizard.io/3.1.0/manual/json/
+
+### Configuration
+
+```toml
+[[inputs.file]]
+  files = ["example"]
+
+  ## 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"
+```
+
+
+### Examples
+
+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"
+```
diff --git a/plugins/parsers/graphite/README.md b/plugins/parsers/graphite/README.md
new file mode 100644
index 00000000..b0b1127a
--- /dev/null
+++ b/plugins/parsers/graphite/README.md
@@ -0,0 +1,48 @@
+# Graphite
+
+The Graphite data format translates graphite *dot* buckets directly into
+telegraf measurement names, with a single value field, and without any tags.
+By default, the separator is left as `.`, but this can be changed using the
+`separator` argument. For more advanced options, Telegraf supports specifying
+[templates](#templates) to translate graphite buckets into Telegraf metrics.
+
+### Configuration
+
+```toml
+[[inputs.exec]]
+  ## Commands array
+  commands = ["/tmp/test.sh", "/usr/bin/mycollector --foo=bar"]
+
+  ## 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 = "graphite"
+
+  ## 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. 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
+  templates = [
+    "*.app env.service.resource.measurement",
+    "stats.* .host.measurement* region=eu-east,agent=sensu",
+    "stats2.* .host.measurement.field",
+    "measurement*"
+  ]
+```
+
+#### templates
+
+Consult the [Template Patterns](/docs/TEMPLATE_PATTERN.md) documentation for
+details.
diff --git a/plugins/parsers/grok/README.md b/plugins/parsers/grok/README.md
new file mode 100644
index 00000000..7b22d340
--- /dev/null
+++ b/plugins/parsers/grok/README.md
@@ -0,0 +1,222 @@
+# Grok
+
+The grok data format parses line delimited data using a regular expression like
+language.
+
+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 grok parser uses a slightly modified version of logstash "grok"
+patterns, with the format:
+
+```
+%{<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.
+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
+  - float
+  - duration (ie, 5.23ms gets converted to int nanoseconds)
+  - tag      (converts the field into a tag)
+  - drop     (drops the field completely)
+  - measurement (use the matched text as the measurement name)
+- Timestamp modifiers:
+  - ts               (This will auto-learn the timestamp format)
+  - ts-ansic         ("Mon Jan _2 15:04:05 2006")
+  - ts-unix          ("Mon Jan _2 15:04:05 MST 2006")
+  - ts-ruby          ("Mon Jan 02 15:04:05 -0700 2006")
+  - ts-rfc822        ("02 Jan 06 15:04 MST")
+  - ts-rfc822z       ("02 Jan 06 15:04 -0700")
+  - ts-rfc850        ("Monday, 02-Jan-06 15:04:05 MST")
+  - ts-rfc1123       ("Mon, 02 Jan 2006 15:04:05 MST")
+  - ts-rfc1123z      ("Mon, 02 Jan 2006 15:04:05 -0700")
+  - 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, 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
+"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),
+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!
+
+### Configuration
+```toml
+[[inputs.file]]
+  ## Files to parse each interval.
+  ## 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"]
+
+  ## The dataformat to be read from files
+  ## 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 = "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.
+  ## Other common built-in patterns are:
+  ##   %{COMMON_LOG_FORMAT}   (plain apache & nginx access logs)
+  ##   %{COMBINED_LOG_FORMAT} (access logs + referrer & agent)
+  grok_patterns = ["%{COMBINED_LOG_FORMAT}"]
+
+  ## Full path(s) to custom pattern files.
+  grok_custom_pattern_files = []
+
+  ## Custom patterns can also be defined here. Put one pattern per line.
+  grok_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
+  grok_timezone = "Canada/Eastern"
+```
+
+#### 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.file]]
+  grok_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.file]]
+  grok_patterns = ['%{NUMBER:timestamp:ts-epoch} 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.file]]
+  grok_patterns = ["%{TS_UNIX:timestamp:ts-unix} value=%{NUMBER:value:int}"]
+  grok_custom_patterns = '''
+    TS_UNIX %{DAY} %{MONTH} %{MONTHDAY} %{HOUR}:%{MINUTE}:%{SECOND} %{TZ} %{YEAR}
+  '''
+```
+
+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),
+grok will offset the timestamp accordingly.
+
+#### 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.file]]
+  grok_patterns = ["\\|%{NUMBER:value:int}\\|%{UNICODE_ESCAPE:escape}\\|'%{WORD:name}'\\|"]
+  grok_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.file]]
+  grok_patterns = ["\\|%{NUMBER:value:int}\\|%{UNICODE_ESCAPE:escape}\\|'%{WORD:name}'\\|"]
+  grok_custom_patterns = 'UNICODE_ESCAPE (?:\\u[0-9A-F]{4})+'
+```
+
+A multi-line literal string allows us to encode the pattern:
+```toml
+[[inputs.file]]
+  grok_patterns = ['''
+    \|%{NUMBER:value:int}\|%{UNICODE_ESCAPE:escape}\|'%{WORD:name}'\|
+  ''']
+  grok_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.
+
+
diff --git a/plugins/parsers/influx/README.md b/plugins/parsers/influx/README.md
new file mode 100644
index 00000000..51c0106e
--- /dev/null
+++ b/plugins/parsers/influx/README.md
@@ -0,0 +1,20 @@
+# InfluxDB Line Protocol
+
+There are no additional configuration options for InfluxDB [line protocol][]. The
+metrics are parsed directly into Telegraf metrics.
+
+[line protocol]: https://docs.influxdata.com/influxdb/latest/write_protocols/line/
+
+### Configuration
+
+```toml
+[[inputs.file]]
+  files = ["example"]
+
+  ## 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"
+```
+
diff --git a/plugins/parsers/json/README.md b/plugins/parsers/json/README.md
new file mode 100644
index 00000000..fa0d767f
--- /dev/null
+++ b/plugins/parsers/json/README.md
@@ -0,0 +1,214 @@
+# JSON
+
+The JSON data format parses a [JSON][json] object or an array of objects into
+metric fields.
+
+**NOTE:** All JSON numbers are converted to float fields.  JSON String are
+ignored unless specified in the `tag_key` or `json_string_fields` options.
+
+### Configuration
+
+```toml
+[[inputs.file]]
+  files = ["example"]
+
+  ## 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 = "json"
+
+  ## Query is a GJSON path that specifies a specific chunk of JSON to be
+  ## parsed, if not specified the whole document will be parsed.
+  ##
+  ## GJSON query paths are described here:
+  ##   https://github.com/tidwall/gjson#path-syntax
+  json_query = ""
+
+  ## Tag keys is an array of keys that should be added as tags.
+  tag_keys = [
+    "my_tag_1",
+    "my_tag_2"
+  ]
+
+  ## String fields is an array of keys that should be added as string fields.
+  json_string_fields = []
+
+  ## Name key is the key to use as the measurement name.
+  json_name_key = ""
+
+  ## Time key is the key containing the time that should be used to create the
+  ## metric.
+  json_time_key = ""
+
+  ## Time format is the time layout that should be used to interprete the
+  ## json_time_key.  The time must be `unix`, `unix_ms` or a time in the
+  ## "reference time".
+  ##   ex: json_time_format = "Mon Jan 2 15:04:05 -0700 MST 2006"
+  ##       json_time_format = "2006-01-02T15:04:05Z07:00"
+  ##       json_time_format = "unix"
+  ##       json_time_format = "unix_ms"
+  json_time_format = ""
+```
+
+#### json_query
+
+The `json_query` is a [GJSON][gjson] path that can be used to limit the
+portion of the overall JSON document that should be parsed.  The result of the
+query should contain a JSON object or an array of objects.
+
+Consult the GJSON [path syntax][gjson syntax] for details and examples.
+
+#### json_time_key, json_time_format
+
+By default the current time will be used for all created metrics, to set the
+time using the JSON document you can use the `json_time_key` and
+`json_time_format` options together to set the time to a value in the parsed
+document.
+
+The `json_time_key` option specifies the key containing the time value and
+`json_time_format` must be set to `unix`, `unix_ms`, or the Go "reference
+time" which is defined to be the specific time: `Mon Jan 2 15:04:05 MST 2006`.
+
+Consult the Go [time][time parse] package for details and additional examples
+on how to set the time format.
+
+### Examples
+
+#### Basic Parsing
+Config:
+```toml
+[[inputs.file]]
+  files = ["example"]
+  name_override = "myjsonmetric"
+  data_format = "json"
+```
+
+Input:
+```json
+{
+    "a": 5,
+    "b": {
+        "c": 6
+    },
+    "ignored": "I'm a string"
+}
+```
+
+Output:
+```
+myjsonmetric a=5,b_c=6
+```
+
+#### Name, Tags, and String Fields
+
+Config:
+```toml
+[[inputs.file]]
+  files = ["example"]
+  name_key = "name"
+  tag_keys = ["my_tag_1"]
+  string_fields = ["my_field"]
+  data_format = "json"
+```
+
+Input:
+```json
+{
+    "a": 5,
+    "b": {
+        "c": 6,
+        "my_field": "description"
+    },
+    "my_tag_1": "foo",
+    "name": "my_json"
+}
+```
+
+Output:
+```
+my_json,my_tag_1=foo a=5,b_c=6,my_field="description"
+```
+
+#### Arrays
+
+If the JSON data is an array, then each object within the array is parsed with
+the configured settings.
+
+Config:
+```toml
+[[inputs.file]]
+  files = ["example"]
+  data_format = "json"
+  json_time_key = "b_time"
+  json_time_format = "02 Jan 06 15:04 MST"
+```
+
+Input:
+```json
+[
+    {
+        "a": 5,
+        "b": {
+            "c": 6,
+            "time":"04 Jan 06 15:04 MST"
+        },
+    },
+    {
+        "a": 7,
+        "b": {
+            "c": 8,
+            "time":"11 Jan 07 15:04 MST"
+        },
+    }
+]
+```
+
+Output:
+```
+file a=5,b_c=6 1136387040000000000
+file a=7,b_c=8 1168527840000000000
+```
+
+#### Query
+
+The `json_query` option can be used to parse a subset of the document.
+
+Config:
+```toml
+[[inputs.file]]
+  files = ["example"]
+  data_format = "json"
+  tag_keys = ["first"]
+  json_string_fields = ["last"]
+  json_query = "obj.friends"
+```
+
+Input:
+```json
+{
+    "obj": {
+        "name": {"first": "Tom", "last": "Anderson"},
+        "age":37,
+        "children": ["Sara","Alex","Jack"],
+        "fav.movie": "Deer Hunter",
+        "friends": [
+            {"first": "Dale", "last": "Murphy", "age": 44},
+            {"first": "Roger", "last": "Craig", "age": 68},
+            {"first": "Jane", "last": "Murphy", "age": 47}
+        ]
+    }
+}
+```
+
+Output:
+```
+file,first=Dale last="Murphy",age=44
+file,first=Roger last="Craig",age=68
+file,first=Jane last="Murphy",age=47
+```
+
+[gjson]:        https://github.com/tidwall/gjson
+[gjson syntax]: https://github.com/tidwall/gjson#path-syntax
+[json]:         https://www.json.org/
+[time parse]:   https://golang.org/pkg/time/#Parse
diff --git a/plugins/parsers/logfmt/README.md b/plugins/parsers/logfmt/README.md
new file mode 100644
index 00000000..fb3a565b
--- /dev/null
+++ b/plugins/parsers/logfmt/README.md
@@ -0,0 +1,34 @@
+# Logfmt
+
+The `logfmt` data format parses data in [logfmt] format.
+
+[logfmt]: https://brandur.org/logfmt
+
+### Configuration
+
+```toml
+[[inputs.file]]
+  files = ["example"]
+
+  ## 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 = "logfmt"
+
+  ## Set the name of the created metric, if unset the name of the plugin will
+  ## be used.
+  metric_name = "logfmt"
+```
+
+### Metrics
+
+Each key/value pair in the line is added to a new metric as a field.  The type
+of the field is automatically determined based on the contents of the value.
+
+### Examples
+
+```
+- method=GET host=example.org ts=2018-07-24T19:43:40.275Z connect=4ms service=8ms status=200 bytes=1653
++ logfmt method="GET",host="example.org",ts="2018-07-24T19:43:40.275Z",connect="4ms",service="8ms",status=200i,bytes=1653i
+```
diff --git a/plugins/parsers/nagios/README.md b/plugins/parsers/nagios/README.md
new file mode 100644
index 00000000..e9be6a0d
--- /dev/null
+++ b/plugins/parsers/nagios/README.md
@@ -0,0 +1,17 @@
+# Nagios
+
+The `nagios` data format parses the output of nagios plugins.
+
+### Configuration
+
+```toml
+[[inputs.exec]]
+  ## Commands array
+  commands = ["/usr/lib/nagios/plugins/check_load -w 5,6,7 -c 7,8,9"]
+
+  ## 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 = "nagios"
+```
diff --git a/plugins/parsers/value/README.md b/plugins/parsers/value/README.md
new file mode 100644
index 00000000..db184d4e
--- /dev/null
+++ b/plugins/parsers/value/README.md
@@ -0,0 +1,36 @@
+# Value
+
+The "value" data format translates single values into Telegraf metrics. This
+is done by assigning a measurement name and setting a single field ("value")
+as the parsed metric.
+
+### Configuration
+
+You **must** tell Telegraf what type of metric to collect by using the
+`data_type` configuration option. Available options are:
+
+1. integer
+2. float or long
+3. string
+4. boolean
+
+**Note:** It is also recommended that you set `name_override` to a measurement
+name that makes sense for your metric, otherwise it will just be set to the
+name of the plugin.
+
+```toml
+[[inputs.exec]]
+  ## Commands array
+  commands = ["cat /proc/sys/kernel/random/entropy_avail"]
+
+  ## override the default metric name of "exec"
+  name_override = "entropy_available"
+
+  ## 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 = "value"
+  data_type = "integer" # required
+```
+
diff --git a/plugins/parsers/wavefront/README.md b/plugins/parsers/wavefront/README.md
new file mode 100644
index 00000000..ab7c56ee
--- /dev/null
+++ b/plugins/parsers/wavefront/README.md
@@ -0,0 +1,20 @@
+# Wavefront
+
+Wavefront Data Format is metrics are parsed directly into Telegraf metrics.
+For more information about the Wavefront Data Format see
+[here](https://docs.wavefront.com/wavefront_data_format.html).
+
+### Configuration
+
+There are no additional configuration options for Wavefront Data Format line-protocol.
+
+```toml
+[[inputs.file]]
+  files = ["example"]
+
+  ## 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 = "wavefront"
+```
diff --git a/plugins/serializers/EXAMPLE_README.md b/plugins/serializers/EXAMPLE_README.md
new file mode 100644
index 00000000..11965c07
--- /dev/null
+++ b/plugins/serializers/EXAMPLE_README.md
@@ -0,0 +1,46 @@
+# Example
+
+This description explains at a high level what the serializer does and
+provides links to where additional information about the format can be found.
+
+### Configuration
+
+This section contains the sample configuration for the serializer.  Since the
+configuration for a serializer is not have a standalone plugin, use the `file`
+or `http` outputs as the base config.
+
+```toml
+[[inputs.file]]
+  files = ["stdout"]
+
+  ## Describe variables using the standard SampleConfig style.
+  ##   https://github.com/influxdata/telegraf/wiki/SampleConfig
+  example_option = "example_value"
+
+  ## 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_INPUT.md
+  data_format = "example"
+```
+
+#### example_option
+
+If an option requires a more expansive explanation than can be included inline
+in the sample configuration, it may be described here.
+
+### Metrics
+
+The optional Metrics section contains details about how the serializer converts
+Telegraf metrics into output.
+
+### Example
+
+The optional Example section can show an example conversion to the output
+format using InfluxDB Line Protocol as the reference format.
+
+For line delimited text formats a diff may be appropriate:
+```diff
+- cpu,host=localhost,source=example.org value=42
++ cpu|host=localhost|source=example.org|value=42
+```
diff --git a/plugins/serializers/graphite/README.md b/plugins/serializers/graphite/README.md
new file mode 100644
index 00000000..031dee37
--- /dev/null
+++ b/plugins/serializers/graphite/README.md
@@ -0,0 +1,51 @@
+# Graphite
+
+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][templates]) is used.
+
+### 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 = "graphite"
+
+  ## Prefix added to each graphite bucket
+  prefix = "telegraf"
+  ## Graphite template pattern
+  template = "host.tags.measurement.field"
+
+  ## Support Graphite tags, recommended to enable when using Graphite 1.1 or later.
+  # graphite_tag_support = false
+```
+
+#### 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
+=>
+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
+```
+
+#### templates
+
+Consult the [Template Patterns](/docs/TEMPLATE_PATTERN.md) documentation for
+details.
diff --git a/plugins/serializers/influx/README.md b/plugins/serializers/influx/README.md
new file mode 100644
index 00000000..d97fd42c
--- /dev/null
+++ b/plugins/serializers/influx/README.md
@@ -0,0 +1,34 @@
+# Influx
+
+The `influx` data format outputs metrics into [InfluxDB Line Protocol][line
+protocol].  This is the recommended format unless another format is required
+for interoperability.
+
+### 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 = "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
+```
+
+[line protocol]: https://docs.influxdata.com/influxdb/latest/write_protocols/line_protocol_tutorial/
diff --git a/plugins/serializers/json/README.md b/plugins/serializers/json/README.md
new file mode 100644
index 00000000..08bb9d4f
--- /dev/null
+++ b/plugins/serializers/json/README.md
@@ -0,0 +1,77 @@
+# JSON
+
+The `json` output data format converts metrics into JSON documents.
+
+### 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 = "json"
+
+  ## 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"
+```
+
+### Examples:
+
+Standard form:
+```json
+{
+    "fields": {
+        "field_1": 30,
+        "field_2": 4,
+        "field_N": 59,
+        "n_images": 660
+    },
+    "name": "docker",
+    "tags": {
+        "host": "raynor"
+    },
+    "timestamp": 1458229140
+}
+```
+
+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
+        }
+    ]
+}
+```
diff --git a/plugins/serializers/splunkmetric/README.md b/plugins/serializers/splunkmetric/README.md
index 02d69db6..e00286e5 100644
--- a/plugins/serializers/splunkmetric/README.md
+++ b/plugins/serializers/splunkmetric/README.md
@@ -79,7 +79,7 @@ The following aspects of the token can be overriden with tags:
 * source
 
 You can either use `[global_tags]` or using a more advanced configuration as documented [here](https://github.com/influxdata/telegraf/blob/master/docs/CONFIGURATION.md).
- 
+
 Such as this example which overrides the index just on the cpu metric:
 ```toml
 [[inputs.cpu]]
@@ -122,7 +122,7 @@ TIMESTAMP_FIELDS = time
 TIME_FORMAT = %s.%3N
 ```
 
-An example configuration of a file based output is: 
+An example configuration of a file based output is:
 
 ```toml
  # Send telegraf metrics to file(s)

From 44c2435f6471859381650700a28eaf0382851ce9 Mon Sep 17 00:00:00 2001
From: Lee Jaeyong <lastiverse@gmail.com>
Date: Tue, 18 Sep 2018 08:20:50 +0900
Subject: [PATCH 791/835] Support tailing files created after startup in tail
 input (#4704)

---
 plugins/inputs/tail/tail.go | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/plugins/inputs/tail/tail.go b/plugins/inputs/tail/tail.go
index 0de2a344..ad3d713f 100644
--- a/plugins/inputs/tail/tail.go
+++ b/plugins/inputs/tail/tail.go
@@ -25,7 +25,7 @@ type Tail struct {
 	Pipe          bool
 	WatchMethod   string
 
-	tailers []*tail.Tail
+	tailers map[string]*tail.Tail
 	parser  parsers.Parser
 	wg      sync.WaitGroup
 	acc     telegraf.Accumulator
@@ -74,7 +74,10 @@ func (t *Tail) Description() string {
 }
 
 func (t *Tail) Gather(acc telegraf.Accumulator) error {
-	return nil
+	t.Lock()
+	defer t.Unlock()
+
+	return t.tailNewFiles(true)
 }
 
 func (t *Tail) Start(acc telegraf.Accumulator) error {
@@ -82,9 +85,14 @@ func (t *Tail) Start(acc telegraf.Accumulator) error {
 	defer t.Unlock()
 
 	t.acc = acc
+	t.tailers = make(map[string]*tail.Tail)
 
+	return t.tailNewFiles(t.FromBeginning)
+}
+
+func (t *Tail) tailNewFiles(fromBeginning bool) error {
 	var seek *tail.SeekInfo
-	if !t.Pipe && !t.FromBeginning {
+	if !t.Pipe && !fromBeginning {
 		seek = &tail.SeekInfo{
 			Whence: 2,
 			Offset: 0,
@@ -103,6 +111,11 @@ func (t *Tail) Start(acc telegraf.Accumulator) error {
 			t.acc.AddError(fmt.Errorf("E! Error Glob %s failed to compile, %s", filepath, err))
 		}
 		for file, _ := range g.Match() {
+			if _, ok := t.tailers[file]; ok {
+				// we're already tailing this file
+				continue
+			}
+
 			tailer, err := tail.TailFile(file,
 				tail.Config{
 					ReOpen:    true,
@@ -114,16 +127,15 @@ func (t *Tail) Start(acc telegraf.Accumulator) error {
 					Logger:    tail.DiscardingLogger,
 				})
 			if err != nil {
-				acc.AddError(err)
+				t.acc.AddError(err)
 				continue
 			}
 			// create a goroutine for each "tailer"
 			t.wg.Add(1)
 			go t.receiver(tailer)
-			t.tailers = append(t.tailers, tailer)
+			t.tailers[file] = tailer
 		}
 	}
-
 	return nil
 }
 

From 77f669344b0a54496023dae6c08a06beecc8c39a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 17 Sep 2018 18:00:12 -0700
Subject: [PATCH 792/835] Exclude Windows WMI tests from -short tests

---
 plugins/inputs/procstat/native_finder_windows_test.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/plugins/inputs/procstat/native_finder_windows_test.go b/plugins/inputs/procstat/native_finder_windows_test.go
index 2f51a3f9..ef9c5ffb 100644
--- a/plugins/inputs/procstat/native_finder_windows_test.go
+++ b/plugins/inputs/procstat/native_finder_windows_test.go
@@ -11,6 +11,9 @@ import (
 )
 
 func TestGather_RealPattern(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
 	pg, err := NewNativeFinder()
 	require.NoError(t, err)
 	pids, err := pg.Pattern(`procstat`)
@@ -20,6 +23,9 @@ func TestGather_RealPattern(t *testing.T) {
 }
 
 func TestGather_RealFullPattern(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
 	pg, err := NewNativeFinder()
 	require.NoError(t, err)
 	pids, err := pg.FullPattern(`%procstat%`)
@@ -29,6 +35,9 @@ func TestGather_RealFullPattern(t *testing.T) {
 }
 
 func TestGather_RealUser(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
 	user, err := user.Current()
 	require.NoError(t, err)
 	pg, err := NewNativeFinder()

From f05fdde48ba103200a0dbb5cd5e60e865949bdf0 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 18 Sep 2018 09:07:28 -0700
Subject: [PATCH 793/835] Remove the startup authentication check from the
 cloudwatch output (#4695)

---
 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 d3bd6630..b5dca364 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"
@@ -209,20 +208,7 @@ func (c *CloudWatch) Connect() error {
 		EndpointURL: c.EndpointURL,
 	}
 	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 d3ad591481e29787d9bcc9c86661d9d633ad40a5 Mon Sep 17 00:00:00 2001
From: Greg <g2linton@gmail.com>
Date: Tue, 18 Sep 2018 10:08:13 -0600
Subject: [PATCH 794/835] Fix null value crash in postgresql_extensible input
 (#4689)

---
 .../postgresql_extensible.go                  | 21 +++++-----
 .../postgresql_extensible_test.go             | 39 +++++++++++++++++++
 2 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/plugins/inputs/postgresql_extensible/postgresql_extensible.go b/plugins/inputs/postgresql_extensible/postgresql_extensible.go
index a0438288..a247b603 100644
--- a/plugins/inputs/postgresql_extensible/postgresql_extensible.go
+++ b/plugins/inputs/postgresql_extensible/postgresql_extensible.go
@@ -19,14 +19,8 @@ type Postgresql struct {
 	postgresql.Service
 	Databases      []string
 	AdditionalTags []string
-	Query          []struct {
-		Sqlquery    string
-		Version     int
-		Withdbname  bool
-		Tagvalue    string
-		Measurement string
-	}
-	Debug bool
+	Query          query
+	Debug          bool
 }
 
 type query []struct {
@@ -127,7 +121,6 @@ func (p *Postgresql) Gather(acc telegraf.Accumulator) error {
 	)
 
 	// Retreiving the database version
-
 	query = `select substring(setting from 1 for 3) as version from pg_settings where name='server_version_num'`
 	if err = p.DB.QueryRow(query).Scan(&db_version); err != nil {
 		db_version = 0
@@ -135,7 +128,6 @@ func (p *Postgresql) Gather(acc telegraf.Accumulator) error {
 
 	// We loop in order to process each query
 	// Query is not run if Database version does not match the query version.
-
 	for i := range p.Query {
 		sql_query = p.Query[i].Sqlquery
 		tag_value = p.Query[i].Tagvalue
@@ -221,9 +213,14 @@ func (p *Postgresql) accRow(meas_name string, row scanner, acc telegraf.Accumula
 		return err
 	}
 
-	if columnMap["datname"] != nil {
+	if c, ok := columnMap["datname"]; ok && *c != nil {
 		// extract the database name from the column map
-		dbname.WriteString((*columnMap["datname"]).(string))
+		switch datname := (*c).(type) {
+		case string:
+			dbname.WriteString(datname)
+		default:
+			dbname.WriteString("postgres")
+		}
 	} else {
 		dbname.WriteString("postgres")
 	}
diff --git a/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go b/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go
index 0f9358da..1ed62a1c 100644
--- a/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go
+++ b/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go
@@ -1,6 +1,7 @@
 package postgresql_extensible
 
 import (
+	"errors"
 	"fmt"
 	"testing"
 
@@ -223,3 +224,41 @@ func TestPostgresqlIgnoresUnwantedColumns(t *testing.T) {
 		assert.False(t, acc.HasMeasurement(col))
 	}
 }
+
+func TestAccRow(t *testing.T) {
+	p := Postgresql{}
+	var acc testutil.Accumulator
+	columns := []string{"datname", "cat"}
+
+	testRows := []fakeRow{
+		{fields: []interface{}{1, "gato"}},
+		{fields: []interface{}{nil, "gato"}},
+		{fields: []interface{}{"name", "gato"}},
+	}
+	for i := range testRows {
+		err := p.accRow("pgTEST", testRows[i], &acc, columns)
+		if err != nil {
+			t.Fatalf("Scan failed: %s", err)
+		}
+	}
+}
+
+type fakeRow struct {
+	fields []interface{}
+}
+
+func (f fakeRow) Scan(dest ...interface{}) error {
+	if len(f.fields) != len(dest) {
+		return errors.New("Nada matchy buddy")
+	}
+
+	for i, d := range dest {
+		switch d.(type) {
+		case (*interface{}):
+			*d.(*interface{}) = f.fields[i]
+		default:
+			return fmt.Errorf("Bad type %T", d)
+		}
+	}
+	return nil
+}

From 1d763434224e149253b7d2a3d256b8de02c99813 Mon Sep 17 00:00:00 2001
From: Greg <g2linton@gmail.com>
Date: Tue, 18 Sep 2018 10:08:46 -0600
Subject: [PATCH 795/835] Enhance performance data for nagios parser (#4691)

---
 plugins/parsers/nagios/parser.go      | 167 +++++++++++++++++---------
 plugins/parsers/nagios/parser_test.go | 119 ++++++++++++++----
 2 files changed, 210 insertions(+), 76 deletions(-)

diff --git a/plugins/parsers/nagios/parser.go b/plugins/parsers/nagios/parser.go
index 4d5f7f00..858f5082 100644
--- a/plugins/parsers/nagios/parser.go
+++ b/plugins/parsers/nagios/parser.go
@@ -1,6 +1,8 @@
 package nagios
 
 import (
+	"errors"
+	"log"
 	"regexp"
 	"strconv"
 	"strings"
@@ -17,8 +19,10 @@ type NagiosParser struct {
 
 // Got from Alignak
 // https://github.com/Alignak-monitoring/alignak/blob/develop/alignak/misc/perfdata.py
-var perfSplitRegExp, _ = regexp.Compile(`([^=]+=\S+)`)
-var nagiosRegExp, _ = regexp.Compile(`^([^=]+)=([\d\.\-\+eE]+)([\w\/%]*);?([\d\.\-\+eE:~@]+)?;?([\d\.\-\+eE:~@]+)?;?([\d\.\-\+eE]+)?;?([\d\.\-\+eE]+)?;?\s*`)
+var (
+	perfSplitRegExp = regexp.MustCompile(`([^=]+=\S+)`)
+	nagiosRegExp    = regexp.MustCompile(`^([^=]+)=([\d\.\-\+eE]+)([\w\/%]*);?([\d\.\-\+eE:~@]+)?;?([\d\.\-\+eE:~@]+)?;?([\d\.\-\+eE]+)?;?([\d\.\-\+eE]+)?;?\s*`)
+)
 
 func (p *NagiosParser) ParseLine(line string) (telegraf.Metric, error) {
 	metrics, err := p.Parse([]byte(line))
@@ -29,88 +33,99 @@ func (p *NagiosParser) SetDefaultTags(tags map[string]string) {
 	p.DefaultTags = tags
 }
 
-//> rta,host=absol,unit=ms critical=6000,min=0,value=0.332,warning=4000 1456374625003628099
-//> pl,host=absol,unit=% critical=90,min=0,value=0,warning=80 1456374625003693967
-
 func (p *NagiosParser) Parse(buf []byte) ([]telegraf.Metric, error) {
 	metrics := make([]telegraf.Metric, 0)
-	// Convert to string
-	out := string(buf)
-	// Prepare output for splitting
-	// Delete escaped pipes
-	out = strings.Replace(out, `\|`, "___PROTECT_PIPE___", -1)
-	// Split lines and get the first one
-	lines := strings.Split(out, "\n")
-	// Split output and perfdatas
-	data_splitted := strings.Split(lines[0], "|")
-	if len(data_splitted) <= 1 {
-		// No pipe == no perf data
-		return nil, nil
+	lines := strings.Split(strings.TrimSpace(string(buf)), "\n")
+
+	for _, line := range lines {
+		data_splitted := strings.Split(line, "|")
+
+		if len(data_splitted) != 2 {
+			// got human readable output only or bad line
+			continue
+		}
+		m, err := parsePerfData(data_splitted[1])
+		if err != nil {
+			log.Printf("E! [parser.nagios] failed to parse performance data: %s\n", err.Error())
+			continue
+		}
+		metrics = append(metrics, m...)
 	}
-	// Get perfdatas
-	perfdatas := data_splitted[1]
-	// Add escaped pipes
-	perfdatas = strings.Replace(perfdatas, "___PROTECT_PIPE___", `\|`, -1)
-	// Split perfs
-	unParsedPerfs := perfSplitRegExp.FindAllSubmatch([]byte(perfdatas), -1)
-	// Iterate on all perfs
-	for _, unParsedPerfs := range unParsedPerfs {
-		// Get metrics
-		// Trim perf
-		trimedPerf := strings.Trim(string(unParsedPerfs[0]), " ")
-		// Parse perf
-		perf := nagiosRegExp.FindAllSubmatch([]byte(trimedPerf), -1)
-		// Bad string
-		if len(perf) == 0 {
+	return metrics, nil
+}
+
+func parsePerfData(perfdatas string) ([]telegraf.Metric, error) {
+	metrics := make([]telegraf.Metric, 0)
+
+	for _, unParsedPerf := range perfSplitRegExp.FindAllString(perfdatas, -1) {
+		trimedPerf := strings.TrimSpace(unParsedPerf)
+		perf := nagiosRegExp.FindStringSubmatch(trimedPerf)
+
+		// verify at least `'label'=value[UOM];` existed
+		if len(perf) < 3 {
 			continue
 		}
-		if len(perf[0]) <= 2 {
+		if perf[1] == "" || perf[2] == "" {
 			continue
 		}
-		if perf[0][1] == nil || perf[0][2] == nil {
-			continue
-		}
-		fieldName := string(perf[0][1])
-		tags := make(map[string]string)
-		if perf[0][3] != nil {
-			str := string(perf[0][3])
+
+		fieldName := strings.Trim(perf[1], "'")
+		tags := map[string]string{"perfdata": fieldName}
+		if perf[3] != "" {
+			str := string(perf[3])
 			if str != "" {
 				tags["unit"] = str
 			}
 		}
+
 		fields := make(map[string]interface{})
-		f, err := strconv.ParseFloat(string(perf[0][2]), 64)
+		if perf[2] == "U" {
+			return nil, errors.New("Value undetermined")
+		}
+
+		f, err := strconv.ParseFloat(string(perf[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 {
-			f, err := strconv.ParseFloat(string(perf[0][4]), 64)
+		if perf[4] != "" {
+			low, high, err := parseThreshold(perf[4])
 			if err == nil {
-				fields["warning"] = f
+				if strings.Contains(perf[4], "@") {
+					fields["warning_le"] = low
+					fields["warning_ge"] = high
+				} else {
+					fields["warning_lt"] = low
+					fields["warning_gt"] = high
+				}
 			}
 		}
-		if perf[0][5] != nil {
-			f, err := strconv.ParseFloat(string(perf[0][5]), 64)
+		if perf[5] != "" {
+			low, high, err := parseThreshold(perf[5])
 			if err == nil {
-				fields["critical"] = f
+				if strings.Contains(perf[5], "@") {
+					fields["critical_le"] = low
+					fields["critical_ge"] = high
+				} else {
+					fields["critical_lt"] = low
+					fields["critical_gt"] = high
+				}
 			}
 		}
-		if perf[0][6] != nil {
-			f, err := strconv.ParseFloat(string(perf[0][6]), 64)
+		if perf[6] != "" {
+			f, err := strconv.ParseFloat(perf[6], 64)
 			if err == nil {
 				fields["min"] = f
 			}
 		}
-		if perf[0][7] != nil {
-			f, err := strconv.ParseFloat(string(perf[0][7]), 64)
+		if perf[7] != "" {
+			f, err := strconv.ParseFloat(perf[7], 64)
 			if err == nil {
 				fields["max"] = f
 			}
 		}
+
 		// Create metric
-		metric, err := metric.New(fieldName, tags, fields, time.Now().UTC())
+		metric, err := metric.New("nagios", tags, fields, time.Now().UTC())
 		if err != nil {
 			return nil, err
 		}
@@ -120,3 +135,47 @@ func (p *NagiosParser) Parse(buf []byte) ([]telegraf.Metric, error) {
 
 	return metrics, nil
 }
+
+// from math
+const (
+	MaxFloat64 = 1.797693134862315708145274237317043567981e+308 // 2**1023 * (2**53 - 1) / 2**52
+	MinFloat64 = 4.940656458412465441765687928682213723651e-324 // 1 / 2**(1023 - 1 + 52)
+)
+
+var ErrBadThresholdFormat = errors.New("Bad threshold format")
+
+// Handles all cases from https://nagios-plugins.org/doc/guidelines.html#THRESHOLDFORMAT
+func parseThreshold(threshold string) (min float64, max float64, err error) {
+	thresh := strings.Split(threshold, ":")
+	switch len(thresh) {
+	case 1:
+		max, err = strconv.ParseFloat(string(thresh[0]), 64)
+		if err != nil {
+			return 0, 0, ErrBadThresholdFormat
+		}
+
+		return 0, max, nil
+	case 2:
+		if thresh[0] == "~" {
+			min = MinFloat64
+		} else {
+			min, err = strconv.ParseFloat(string(thresh[0]), 64)
+			if err != nil {
+				min = 0
+			}
+		}
+
+		if thresh[1] == "" {
+			max = MaxFloat64
+		} else {
+			max, err = strconv.ParseFloat(string(thresh[1]), 64)
+			if err != nil {
+				return 0, 0, ErrBadThresholdFormat
+			}
+		}
+	default:
+		return 0, 0, ErrBadThresholdFormat
+	}
+
+	return
+}
diff --git a/plugins/parsers/nagios/parser_test.go b/plugins/parsers/nagios/parser_test.go
index b1e3d6fd..a4da3003 100644
--- a/plugins/parsers/nagios/parser_test.go
+++ b/plugins/parsers/nagios/parser_test.go
@@ -13,6 +13,7 @@ with three lines
 `
 const validOutput2 = "TCP OK - 0.008 second response time on port 80|time=0.008457s;;;0.000000;10.000000"
 const validOutput3 = "TCP OK - 0.008 second response time on port 80|time=0.008457"
+const validOutput4 = "OK: Load average: 0.00, 0.01, 0.05 | 'load1'=0.00;~:4;@0:6;0; 'load5'=0.01;3;0:5;0; 'load15'=0.05;0:2;0:4;0;"
 const invalidOutput3 = "PING OK - Packet loss = 0%, RTA = 0.30 ms"
 const invalidOutput4 = "PING OK - Packet loss = 0%, RTA = 0.30 ms| =3;;;; dgasdg =;;;; sff=;;;;"
 
@@ -24,50 +25,71 @@ func TestParseValidOutput(t *testing.T) {
 	// Output1
 	metrics, err := parser.Parse([]byte(validOutput1))
 	require.NoError(t, err)
-	assert.Len(t, metrics, 2)
+	require.Len(t, metrics, 2)
 	// rta
-	assert.Equal(t, "rta", metrics[0].Name())
+	assert.Equal(t, "rta", metrics[0].Tags()["perfdata"])
 	assert.Equal(t, map[string]interface{}{
-		"value":    float64(0.298),
-		"warning":  float64(4000),
-		"critical": float64(6000),
-		"min":      float64(0),
+		"value":       float64(0.298),
+		"warning_lt":  float64(0),
+		"warning_gt":  float64(4000),
+		"critical_lt": float64(0),
+		"critical_gt": float64(6000),
+		"min":         float64(0),
 	}, metrics[0].Fields())
-	assert.Equal(t, map[string]string{"unit": "ms"}, metrics[0].Tags())
+	assert.Equal(t, map[string]string{"unit": "ms", "perfdata": "rta"}, metrics[0].Tags())
 	// pl
-	assert.Equal(t, "pl", metrics[1].Name())
+	assert.Equal(t, "pl", metrics[1].Tags()["perfdata"])
 	assert.Equal(t, map[string]interface{}{
-		"value":    float64(0),
-		"warning":  float64(80),
-		"critical": float64(90),
-		"min":      float64(0),
-		"max":      float64(100),
+		"value":       float64(0),
+		"warning_lt":  float64(0),
+		"warning_gt":  float64(80),
+		"critical_lt": float64(0),
+		"critical_gt": float64(90),
+		"min":         float64(0),
+		"max":         float64(100),
 	}, metrics[1].Fields())
-	assert.Equal(t, map[string]string{"unit": "%"}, metrics[1].Tags())
+	assert.Equal(t, map[string]string{"unit": "%", "perfdata": "pl"}, metrics[1].Tags())
 
 	// Output2
 	metrics, err = parser.Parse([]byte(validOutput2))
 	require.NoError(t, err)
-	assert.Len(t, metrics, 1)
+	require.Len(t, metrics, 1)
 	// time
-	assert.Equal(t, "time", metrics[0].Name())
+	assert.Equal(t, "time", metrics[0].Tags()["perfdata"])
 	assert.Equal(t, map[string]interface{}{
 		"value": float64(0.008457),
 		"min":   float64(0),
 		"max":   float64(10),
 	}, metrics[0].Fields())
-	assert.Equal(t, map[string]string{"unit": "s"}, metrics[0].Tags())
+	assert.Equal(t, map[string]string{"unit": "s", "perfdata": "time"}, metrics[0].Tags())
 
 	// Output3
 	metrics, err = parser.Parse([]byte(validOutput3))
 	require.NoError(t, err)
-	assert.Len(t, metrics, 1)
+	require.Len(t, metrics, 1)
 	// time
-	assert.Equal(t, "time", metrics[0].Name())
+	assert.Equal(t, "time", metrics[0].Tags()["perfdata"])
 	assert.Equal(t, map[string]interface{}{
 		"value": float64(0.008457),
 	}, metrics[0].Fields())
-	assert.Equal(t, map[string]string{}, metrics[0].Tags())
+	assert.Equal(t, map[string]string{"perfdata": "time"}, metrics[0].Tags())
+
+	// Output4
+	metrics, err = parser.Parse([]byte(validOutput4))
+	require.NoError(t, err)
+	require.Len(t, metrics, 3)
+	// load
+	// const validOutput4 = "OK: Load average: 0.00, 0.01, 0.05 | 'load1'=0.00;0:4;0:6;0; 'load5'=0.01;0:3;0:5;0; 'load15'=0.05;0:2;0:4;0;"
+	assert.Equal(t, map[string]interface{}{
+		"value":       float64(0.00),
+		"warning_lt":  MinFloat64,
+		"warning_gt":  float64(4),
+		"critical_le": float64(0),
+		"critical_ge": float64(6),
+		"min":         float64(0),
+	}, metrics[0].Fields())
+
+	assert.Equal(t, map[string]string{"perfdata": "load1"}, metrics[0].Tags())
 }
 
 func TestParseInvalidOutput(t *testing.T) {
@@ -78,11 +100,64 @@ func TestParseInvalidOutput(t *testing.T) {
 	// invalidOutput3
 	metrics, err := parser.Parse([]byte(invalidOutput3))
 	require.NoError(t, err)
-	assert.Len(t, metrics, 0)
+	require.Len(t, metrics, 0)
 
 	// invalidOutput4
 	metrics, err = parser.Parse([]byte(invalidOutput4))
 	require.NoError(t, err)
-	assert.Len(t, metrics, 0)
+	require.Len(t, metrics, 0)
 
 }
+
+func TestParseThreshold(t *testing.T) {
+	tests := []struct {
+		input string
+		eMin  float64
+		eMax  float64
+		eErr  error
+	}{
+		{
+			input: "10",
+			eMin:  0,
+			eMax:  10,
+			eErr:  nil,
+		},
+		{
+			input: "10:",
+			eMin:  10,
+			eMax:  MaxFloat64,
+			eErr:  nil,
+		},
+		{
+			input: "~:10",
+			eMin:  MinFloat64,
+			eMax:  10,
+			eErr:  nil,
+		},
+		{
+			input: "10:20",
+			eMin:  10,
+			eMax:  20,
+			eErr:  nil,
+		},
+		{
+			input: "10:20",
+			eMin:  10,
+			eMax:  20,
+			eErr:  nil,
+		},
+		{
+			input: "10:20:30",
+			eMin:  0,
+			eMax:  0,
+			eErr:  ErrBadThresholdFormat,
+		},
+	}
+
+	for i := range tests {
+		min, max, err := parseThreshold(tests[i].input)
+		require.Equal(t, tests[i].eMin, min)
+		require.Equal(t, tests[i].eMax, max)
+		require.Equal(t, tests[i].eErr, err)
+	}
+}

From b5299f4cc457e4984c54428312a9e93060e6fcaf Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 18 Sep 2018 09:23:45 -0700
Subject: [PATCH 796/835] Fix cleanup of csv parser options, use per file
 parser (#4712)

---
 internal/config/config.go             | 42 ++++++++++++++++------
 plugins/inputs/logparser/logparser.go |  6 ++--
 plugins/inputs/tail/tail.go           | 51 +++++++++++++++++++++------
 plugins/inputs/tail/tail_test.go      | 12 +++----
 plugins/parsers/csv/parser.go         |  7 +++-
 plugins/parsers/csv/parser_test.go    | 45 +++++++++++++++++++++++
 plugins/parsers/registry.go           | 50 +++++++++++++++-----------
 7 files changed, 160 insertions(+), 53 deletions(-)

diff --git a/internal/config/config.go b/internal/config/config.go
index 2208268d..c613244f 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -855,6 +855,17 @@ func (c *Config) addInput(name string, table *ast.Table) error {
 		t.SetParser(parser)
 	}
 
+	switch t := input.(type) {
+	case parsers.ParserFuncInput:
+		config, err := getParserConfig(name, table)
+		if err != nil {
+			return err
+		}
+		t.SetParserFunc(func() (parsers.Parser, error) {
+			return parsers.NewParser(config)
+		})
+	}
+
 	pluginConfig, err := buildInput(name, table)
 	if err != nil {
 		return err
@@ -1212,6 +1223,14 @@ func buildInput(name string, tbl *ast.Table) (*models.InputConfig, error) {
 // a parsers.Parser object, and creates it, which can then be added onto
 // an Input object.
 func buildParser(name string, tbl *ast.Table) (parsers.Parser, error) {
+	config, err := getParserConfig(name, tbl)
+	if err != nil {
+		return nil, err
+	}
+	return parsers.NewParser(config)
+}
+
+func getParserConfig(name string, tbl *ast.Table) (*parsers.Config, error) {
 	c := &parsers.Config{}
 
 	if node, ok := tbl.Fields["data_format"]; ok {
@@ -1510,12 +1529,12 @@ func buildParser(name string, tbl *ast.Table) (parsers.Parser, error) {
 
 	if node, ok := tbl.Fields["csv_header_row_count"]; ok {
 		if kv, ok := node.(*ast.KeyValue); ok {
-			if str, ok := kv.Value.(*ast.String); ok {
-				iVal, err := strconv.Atoi(str.Value)
-				c.CSVHeaderRowCount = iVal
+			if integer, ok := kv.Value.(*ast.Integer); ok {
+				v, err := integer.Int()
 				if err != nil {
-					return nil, fmt.Errorf("E! parsing to int: %v", err)
+					return nil, err
 				}
+				c.CSVHeaderRowCount = int(v)
 			}
 		}
 	}
@@ -1583,16 +1602,19 @@ func buildParser(name string, tbl *ast.Table) (parsers.Parser, error) {
 	delete(tbl.Fields, "grok_custom_patterns")
 	delete(tbl.Fields, "grok_custom_pattern_files")
 	delete(tbl.Fields, "grok_timezone")
-	delete(tbl.Fields, "csv_data_columns")
-	delete(tbl.Fields, "csv_tag_columns")
+	delete(tbl.Fields, "csv_column_names")
+	delete(tbl.Fields, "csv_comment")
+	delete(tbl.Fields, "csv_delimiter")
 	delete(tbl.Fields, "csv_field_columns")
-	delete(tbl.Fields, "csv_name_column")
+	delete(tbl.Fields, "csv_header_row_count")
+	delete(tbl.Fields, "csv_measurement_column")
+	delete(tbl.Fields, "csv_skip_columns")
+	delete(tbl.Fields, "csv_skip_rows")
+	delete(tbl.Fields, "csv_tag_columns")
 	delete(tbl.Fields, "csv_timestamp_column")
 	delete(tbl.Fields, "csv_timestamp_format")
-	delete(tbl.Fields, "csv_delimiter")
-	delete(tbl.Fields, "csv_header")
 
-	return parsers.NewParser(c)
+	return c, nil
 }
 
 // buildSerializer grabs the necessary entries from the ast.Table for creating
diff --git a/plugins/inputs/logparser/logparser.go b/plugins/inputs/logparser/logparser.go
index bdfa4bac..d52df3aa 100644
--- a/plugins/inputs/logparser/logparser.go
+++ b/plugins/inputs/logparser/logparser.go
@@ -191,15 +191,13 @@ func (l *LogParserPlugin) tailNewfiles(fromBeginning bool) error {
 					Poll:      poll,
 					Logger:    tail.DiscardingLogger,
 				})
-
-			//add message saying a new tailer was added for the file
-			log.Printf("D! tail added for file: %v", file)
-
 			if err != nil {
 				l.acc.AddError(err)
 				continue
 			}
 
+			log.Printf("D! [inputs.logparser] tail added for file: %v", file)
+
 			// create a goroutine for each "tailer"
 			l.wg.Add(1)
 			go l.receiver(tailer)
diff --git a/plugins/inputs/tail/tail.go b/plugins/inputs/tail/tail.go
index ad3d713f..cdea675e 100644
--- a/plugins/inputs/tail/tail.go
+++ b/plugins/inputs/tail/tail.go
@@ -4,6 +4,7 @@ package tail
 
 import (
 	"fmt"
+	"log"
 	"strings"
 	"sync"
 
@@ -25,10 +26,10 @@ type Tail struct {
 	Pipe          bool
 	WatchMethod   string
 
-	tailers map[string]*tail.Tail
-	parser  parsers.Parser
-	wg      sync.WaitGroup
-	acc     telegraf.Accumulator
+	tailers    map[string]*tail.Tail
+	parserFunc parsers.ParserFunc
+	wg         sync.WaitGroup
+	acc        telegraf.Accumulator
 
 	sync.Mutex
 }
@@ -130,10 +131,18 @@ func (t *Tail) tailNewFiles(fromBeginning bool) error {
 				t.acc.AddError(err)
 				continue
 			}
+
+			log.Printf("D! [inputs.tail] tail added for file: %v", file)
+
+			parser, err := t.parserFunc()
+			if err != nil {
+				t.acc.AddError(fmt.Errorf("error creating parser: %v", err))
+			}
+
 			// create a goroutine for each "tailer"
 			t.wg.Add(1)
-			go t.receiver(tailer)
-			t.tailers[file] = tailer
+			go t.receiver(parser, tailer)
+			t.tailers[tailer.Filename] = tailer
 		}
 	}
 	return nil
@@ -141,9 +150,11 @@ func (t *Tail) tailNewFiles(fromBeginning bool) error {
 
 // this is launched as a goroutine to continuously watch a tailed logfile
 // for changes, parse any incoming msgs, and add to the accumulator.
-func (t *Tail) receiver(tailer *tail.Tail) {
+func (t *Tail) receiver(parser parsers.Parser, tailer *tail.Tail) {
 	defer t.wg.Done()
 
+	var firstLine = true
+	var metrics []telegraf.Metric
 	var m telegraf.Metric
 	var err error
 	var line *tail.Line
@@ -156,7 +167,21 @@ func (t *Tail) receiver(tailer *tail.Tail) {
 		// Fix up files with Windows line endings.
 		text := strings.TrimRight(line.Text, "\r")
 
-		m, err = t.parser.ParseLine(text)
+		if firstLine {
+			metrics, err = parser.Parse([]byte(text))
+			if err == nil {
+				if len(metrics) == 0 {
+					firstLine = false
+					continue
+				} else {
+					m = metrics[0]
+				}
+			}
+			firstLine = false
+		} else {
+			m, err = parser.ParseLine(text)
+		}
+
 		if err == nil {
 			if m != nil {
 				tags := m.Tags()
@@ -168,6 +193,9 @@ func (t *Tail) receiver(tailer *tail.Tail) {
 				tailer.Filename, line.Text, err))
 		}
 	}
+
+	log.Printf("D! [inputs.tail] tail removed for file: %v", tailer.Filename)
+
 	if err := tailer.Err(); err != nil {
 		t.acc.AddError(fmt.Errorf("E! Error tailing file %s, Error: %s\n",
 			tailer.Filename, err))
@@ -183,13 +211,16 @@ func (t *Tail) Stop() {
 		if err != nil {
 			t.acc.AddError(fmt.Errorf("E! Error stopping tail on file %s\n", tailer.Filename))
 		}
+	}
+
+	for _, tailer := range t.tailers {
 		tailer.Cleanup()
 	}
 	t.wg.Wait()
 }
 
-func (t *Tail) SetParser(parser parsers.Parser) {
-	t.parser = parser
+func (t *Tail) SetParserFunc(fn parsers.ParserFunc) {
+	t.parserFunc = fn
 }
 
 func init() {
diff --git a/plugins/inputs/tail/tail_test.go b/plugins/inputs/tail/tail_test.go
index 23df0d0b..06db2c17 100644
--- a/plugins/inputs/tail/tail_test.go
+++ b/plugins/inputs/tail/tail_test.go
@@ -27,8 +27,7 @@ func TestTailFromBeginning(t *testing.T) {
 	tt := NewTail()
 	tt.FromBeginning = true
 	tt.Files = []string{tmpfile.Name()}
-	p, _ := parsers.NewInfluxParser()
-	tt.SetParser(p)
+	tt.SetParserFunc(parsers.NewInfluxParser)
 	defer tt.Stop()
 	defer tmpfile.Close()
 
@@ -60,8 +59,7 @@ func TestTailFromEnd(t *testing.T) {
 
 	tt := NewTail()
 	tt.Files = []string{tmpfile.Name()}
-	p, _ := parsers.NewInfluxParser()
-	tt.SetParser(p)
+	tt.SetParserFunc(parsers.NewInfluxParser)
 	defer tt.Stop()
 	defer tmpfile.Close()
 
@@ -98,8 +96,7 @@ func TestTailBadLine(t *testing.T) {
 	tt := NewTail()
 	tt.FromBeginning = true
 	tt.Files = []string{tmpfile.Name()}
-	p, _ := parsers.NewInfluxParser()
-	tt.SetParser(p)
+	tt.SetParserFunc(parsers.NewInfluxParser)
 	defer tt.Stop()
 	defer tmpfile.Close()
 
@@ -124,8 +121,7 @@ func TestTailDosLineendings(t *testing.T) {
 	tt := NewTail()
 	tt.FromBeginning = true
 	tt.Files = []string{tmpfile.Name()}
-	p, _ := parsers.NewInfluxParser()
-	tt.SetParser(p)
+	tt.SetParserFunc(parsers.NewInfluxParser)
 	defer tt.Stop()
 	defer tmpfile.Close()
 
diff --git a/plugins/parsers/csv/parser.go b/plugins/parsers/csv/parser.go
index 9193fbf5..8e0b8b47 100644
--- a/plugins/parsers/csv/parser.go
+++ b/plugins/parsers/csv/parser.go
@@ -26,6 +26,11 @@ type Parser struct {
 	TimestampColumn   string
 	TimestampFormat   string
 	DefaultTags       map[string]string
+	TimeFunc          func() time.Time
+}
+
+func (p *Parser) SetTimeFunc(fn metric.TimeFunc) {
+	p.TimeFunc = fn
 }
 
 func (p *Parser) compile(r *bytes.Reader) (*csv.Reader, error) {
@@ -167,7 +172,7 @@ outer:
 		measurementName = fmt.Sprintf("%v", recordFields[p.MeasurementColumn])
 	}
 
-	metricTime := time.Now()
+	metricTime := p.TimeFunc()
 	if p.TimestampColumn != "" {
 		if recordFields[p.TimestampColumn] == nil {
 			return nil, fmt.Errorf("timestamp column: %v could not be found", p.TimestampColumn)
diff --git a/plugins/parsers/csv/parser_test.go b/plugins/parsers/csv/parser_test.go
index b488a1f1..e3668d3a 100644
--- a/plugins/parsers/csv/parser_test.go
+++ b/plugins/parsers/csv/parser_test.go
@@ -6,13 +6,19 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf/metric"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/require"
 )
 
+var DefaultTime = func() time.Time {
+	return time.Unix(3600, 0)
+}
+
 func TestBasicCSV(t *testing.T) {
 	p := Parser{
 		ColumnNames: []string{"first", "second", "third"},
 		TagColumns:  []string{"third"},
+		TimeFunc:    DefaultTime,
 	}
 
 	_, err := p.ParseLine("1.4,true,hi")
@@ -23,6 +29,7 @@ func TestHeaderConcatenationCSV(t *testing.T) {
 	p := Parser{
 		HeaderRowCount:    2,
 		MeasurementColumn: "3",
+		TimeFunc:          DefaultTime,
 	}
 	testCSV := `first,second
 1,2,3
@@ -38,6 +45,7 @@ func TestHeaderOverride(t *testing.T) {
 		HeaderRowCount:    1,
 		ColumnNames:       []string{"first", "second", "third"},
 		MeasurementColumn: "third",
+		TimeFunc:          DefaultTime,
 	}
 	testCSV := `line1,line2,line3
 3.4,70,test_name`
@@ -53,6 +61,7 @@ func TestTimestamp(t *testing.T) {
 		MeasurementColumn: "third",
 		TimestampColumn:   "first",
 		TimestampFormat:   "02/01/06 03:04:05 PM",
+		TimeFunc:          DefaultTime,
 	}
 	testCSV := `line1,line2,line3
 23/05/09 04:05:06 PM,70,test_name
@@ -70,6 +79,7 @@ func TestTimestampError(t *testing.T) {
 		ColumnNames:       []string{"first", "second", "third"},
 		MeasurementColumn: "third",
 		TimestampColumn:   "first",
+		TimeFunc:          DefaultTime,
 	}
 	testCSV := `line1,line2,line3
 23/05/09 04:05:06 PM,70,test_name
@@ -83,6 +93,7 @@ func TestQuotedCharacter(t *testing.T) {
 		HeaderRowCount:    1,
 		ColumnNames:       []string{"first", "second", "third"},
 		MeasurementColumn: "third",
+		TimeFunc:          DefaultTime,
 	}
 
 	testCSV := `line1,line2,line3
@@ -98,6 +109,7 @@ func TestDelimiter(t *testing.T) {
 		Delimiter:         "%",
 		ColumnNames:       []string{"first", "second", "third"},
 		MeasurementColumn: "third",
+		TimeFunc:          DefaultTime,
 	}
 
 	testCSV := `line1%line2%line3
@@ -113,6 +125,7 @@ func TestValueConversion(t *testing.T) {
 		Delimiter:      ",",
 		ColumnNames:    []string{"first", "second", "third", "fourth"},
 		MetricName:     "test_value",
+		TimeFunc:       DefaultTime,
 	}
 	testCSV := `3.3,4,true,hello`
 
@@ -142,6 +155,7 @@ func TestSkipComment(t *testing.T) {
 		Comment:        "#",
 		ColumnNames:    []string{"first", "second", "third", "fourth"},
 		MetricName:     "test_value",
+		TimeFunc:       DefaultTime,
 	}
 	testCSV := `#3.3,4,true,hello
 4,9.9,true,name_this`
@@ -164,6 +178,7 @@ func TestTrimSpace(t *testing.T) {
 		TrimSpace:      true,
 		ColumnNames:    []string{"first", "second", "third", "fourth"},
 		MetricName:     "test_value",
+		TimeFunc:       DefaultTime,
 	}
 	testCSV := ` 3.3, 4,    true,hello`
 
@@ -185,6 +200,7 @@ func TestSkipRows(t *testing.T) {
 		SkipRows:          1,
 		TagColumns:        []string{"line1"},
 		MeasurementColumn: "line3",
+		TimeFunc:          DefaultTime,
 	}
 	testCSV := `garbage nonsense
 line1,line2,line3
@@ -203,6 +219,7 @@ func TestSkipColumns(t *testing.T) {
 	p := Parser{
 		SkipColumns: 1,
 		ColumnNames: []string{"line1", "line2"},
+		TimeFunc:    DefaultTime,
 	}
 	testCSV := `hello,80,test_name`
 
@@ -219,6 +236,7 @@ func TestSkipColumnsWithHeader(t *testing.T) {
 	p := Parser{
 		SkipColumns:    1,
 		HeaderRowCount: 2,
+		TimeFunc:       DefaultTime,
 	}
 	testCSV := `col,col,col
 	1,2,3
@@ -229,3 +247,30 @@ func TestSkipColumnsWithHeader(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, map[string]interface{}{"col2": int64(80), "col3": "test_name"}, metrics[0].Fields())
 }
+
+func TestParseStream(t *testing.T) {
+	p := Parser{
+		MetricName:     "csv",
+		HeaderRowCount: 1,
+		TimeFunc:       DefaultTime,
+	}
+
+	csvHeader := "a,b,c"
+	csvBody := "1,2,3"
+
+	metrics, err := p.Parse([]byte(csvHeader))
+	require.NoError(t, err)
+	require.Len(t, metrics, 0)
+	metric, err := p.ParseLine(csvBody)
+	testutil.RequireMetricEqual(t,
+		testutil.MustMetric(
+			"csv",
+			map[string]string{},
+			map[string]interface{}{
+				"a": int64(1),
+				"b": int64(2),
+				"c": int64(3),
+			},
+			DefaultTime(),
+		), metric)
+}
diff --git a/plugins/parsers/registry.go b/plugins/parsers/registry.go
index 32027e41..28ff3026 100644
--- a/plugins/parsers/registry.go
+++ b/plugins/parsers/registry.go
@@ -2,6 +2,7 @@ package parsers
 
 import (
 	"fmt"
+	"time"
 
 	"github.com/influxdata/telegraf"
 
@@ -18,6 +19,8 @@ import (
 	"github.com/influxdata/telegraf/plugins/parsers/wavefront"
 )
 
+type ParserFunc func() (Parser, error)
+
 // ParserInput is an interface for input plugins that are able to parse
 // arbitrary data formats.
 type ParserInput interface {
@@ -25,6 +28,13 @@ type ParserInput interface {
 	SetParser(parser Parser)
 }
 
+// ParserFuncInput is an interface for input plugins that are able to parse
+// arbitrary data formats.
+type ParserFuncInput interface {
+	// GetParser returns a new parser.
+	SetParserFunc(fn ParserFunc)
+}
+
 // Parser is an interface defining functions that a parser plugin must satisfy.
 type Parser interface {
 	// Parse takes a byte buffer separated by newlines
@@ -116,17 +126,17 @@ type Config struct {
 	GrokTimeZone           string
 
 	//csv configuration
-	CSVDelimiter         string
-	CSVComment           string
-	CSVTrimSpace         bool
-	CSVColumnNames       []string
-	CSVTagColumns        []string
-	CSVMeasurementColumn string
-	CSVTimestampColumn   string
-	CSVTimestampFormat   string
-	CSVHeaderRowCount    int
-	CSVSkipRows          int
-	CSVSkipColumns       int
+	CSVColumnNames       []string `toml:"csv_column_names"`
+	CSVComment           string   `toml:"csv_comment"`
+	CSVDelimiter         string   `toml:"csv_delimiter"`
+	CSVHeaderRowCount    int      `toml:"csv_header_row_count"`
+	CSVMeasurementColumn string   `toml:"csv_measurement_column"`
+	CSVSkipColumns       int      `toml:"csv_skip_columns"`
+	CSVSkipRows          int      `toml:"csv_skip_rows"`
+	CSVTagColumns        []string `toml:"csv_tag_columns"`
+	CSVTimestampColumn   string   `toml:"csv_timestamp_column"`
+	CSVTimestampFormat   string   `toml:"csv_timestamp_format"`
+	CSVTrimSpace         bool     `toml:"csv_trim_space"`
 }
 
 // NewParser returns a Parser interface based on the given config.
@@ -199,28 +209,27 @@ func NewParser(config *Config) (Parser, error) {
 }
 
 func newCSVParser(metricName string,
-	header int,
+	headerRowCount int,
 	skipRows int,
 	skipColumns int,
 	delimiter string,
 	comment string,
 	trimSpace bool,
-	dataColumns []string,
+	columnNames []string,
 	tagColumns []string,
 	nameColumn string,
 	timestampColumn string,
 	timestampFormat string,
 	defaultTags map[string]string) (Parser, error) {
 
-	if header == 0 && len(dataColumns) == 0 {
-		// if there is no header and no DataColumns, that's an error
-		return nil, fmt.Errorf("there must be a header if `csv_data_columns` is not specified")
+	if headerRowCount == 0 && len(columnNames) == 0 {
+		return nil, fmt.Errorf("there must be a header if `csv_column_names` is not specified")
 	}
 
 	if delimiter != "" {
 		runeStr := []rune(delimiter)
 		if len(runeStr) > 1 {
-			return nil, fmt.Errorf("delimiter must be a single character, got: %s", delimiter)
+			return nil, fmt.Errorf("csv_delimiter must be a single character, got: %s", delimiter)
 		}
 		delimiter = fmt.Sprintf("%v", runeStr[0])
 	}
@@ -228,25 +237,26 @@ func newCSVParser(metricName string,
 	if comment != "" {
 		runeStr := []rune(comment)
 		if len(runeStr) > 1 {
-			return nil, fmt.Errorf("delimiter must be a single character, got: %s", comment)
+			return nil, fmt.Errorf("csv_delimiter must be a single character, got: %s", comment)
 		}
 		comment = fmt.Sprintf("%v", runeStr[0])
 	}
 
 	parser := &csv.Parser{
 		MetricName:        metricName,
-		HeaderRowCount:    header,
+		HeaderRowCount:    headerRowCount,
 		SkipRows:          skipRows,
 		SkipColumns:       skipColumns,
 		Delimiter:         delimiter,
 		Comment:           comment,
 		TrimSpace:         trimSpace,
-		ColumnNames:       dataColumns,
+		ColumnNames:       columnNames,
 		TagColumns:        tagColumns,
 		MeasurementColumn: nameColumn,
 		TimestampColumn:   timestampColumn,
 		TimestampFormat:   timestampFormat,
 		DefaultTags:       defaultTags,
+		TimeFunc:          time.Now,
 	}
 
 	return parser, nil

From 448f92be1dc22cd84a805d337b8cae057500f2e8 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 18 Sep 2018 09:24:25 -0700
Subject: [PATCH 797/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8240478c..76bb6245 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -116,6 +116,12 @@
 - [#4520](https://github.com/influxdata/telegraf/issues/4520): Document all supported cli arguments.
 - [#4674](https://github.com/influxdata/telegraf/pull/4674): Log access denied opening a service at debug level in win_services.
 - [#4588](https://github.com/influxdata/telegraf/issues/4588): Add support for Kafka 2.0.
+- [#4087](https://github.com/influxdata/telegraf/issues/4087): Fix nagios parser does not support ranges in performance data.
+- [#4088](https://github.com/influxdata/telegraf/issues/4088): Fix nagios parser does not strip quotes from performance data.
+- [#4688](https://github.com/influxdata/telegraf/issues/4688): Fix null value crash in postgresql_extensible input.
+- [#4681](https://github.com/influxdata/telegraf/pull/4681): Remove the startup authentication check from the cloudwatch output.
+- [#4644](https://github.com/influxdata/telegraf/issues/4644): Support tailing files created after startup in tail input.
+- [#4706](https://github.com/influxdata/telegraf/issues/4706): Fix csv format configuration loading.
 
 ## v1.7.4 [2018-08-29]
 

From a75c789e3ecdc92fede5635da9465c044001bace Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 18 Sep 2018 18:13:20 -0700
Subject: [PATCH 798/835] Remove warning not to set flush_interval below
 interval

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

diff --git a/internal/config/config.go b/internal/config/config.go
index c613244f..8010ab6f 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -246,8 +246,8 @@ var header = `# Telegraf Configuration
   ## 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
+  ## Default flushing interval for all outputs. 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.

From dab6ed7d8f015b608e234b445c63160c4aaa45c1 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 18 Sep 2018 18:15:10 -0700
Subject: [PATCH 799/835] Update sample telegraf.conf

---
 etc/telegraf.conf | 267 +++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 231 insertions(+), 36 deletions(-)

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 8d1371a2..d81e1b99 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -47,8 +47,8 @@
   ## 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
+  ## Default flushing interval for all outputs. 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.
@@ -494,6 +494,51 @@
 #   #   Content-Type = "text/plain; charset=utf-8"
 
 
+# # Configuration for sending metrics to InfluxDB
+# [[outputs.influxdb_v2]]
+#   ## The URLs of the InfluxDB cluster nodes.
+#   ##
+#   ## Multiple URLs can be specified for a single cluster, only ONE of the
+#   ## urls will be written to each interval.
+#   urls = ["http://127.0.0.1:9999"]
+#
+#   ## Token for authentication.
+#   token = ""
+#
+#   ## Organization is the name of the organization you wish to write to; must exist.
+#   organization = ""
+#
+#   ## Bucket to the name fo the bucketwrite into; must exist.
+#   bucket = ""
+#
+#   ## Timeout for HTTP messages.
+#   # timeout = "5s"
+#
+#   ## Additional HTTP headers
+#   # http_headers = {"X-Special-Header" = "Special-Value"}
+#
+#   ## 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"
+#
+#   ## HTTP User-Agent
+#   # user_agent = "telegraf"
+#
+#   ## Content-Encoding for write request body, can be set to "gzip" to
+#   ## compress body or "identity" to apply no encoding.
+#   # content_encoding = "gzip"
+#
+#   ## Enable or disable uint support for writing uints influxdb 2.0.
+#   # influx_uint_support = false
+#
+#   ## 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
+
+
 # # Configuration for sending metrics to an Instrumental project
 # [[outputs.instrumental]]
 #   ## Project API Token (required)
@@ -992,13 +1037,13 @@
 
 # # Map enum values according to given table.
 # [[processors.enum]]
-#   [[processors.enum.fields]]
+#   [[processors.enum.mapping]]
 #     ## Name of the field to map
-#     source = "name"
+#     field = "status"
 #
 #     ## Destination field to be used for the mapped value.  By default the source
 #     ## field is used, overwriting the original value.
-#     # destination = "mapped"
+#     # dest = "status_code"
 #
 #     ## Default value to be used for all values not contained in the mapping
 #     ## table.  When unset, the unmodified value for the field will be used if no
@@ -1006,9 +1051,10 @@
 #     # default = 0
 #
 #     ## Table of mappings
-#     [processors.enum.fields.value_mappings]
-#       value1 = 1
-#       value2 = 2
+#     [processors.enum.mapping.value_mappings]
+#       green = 1
+#       yellow = 2
+#       red = 3
 
 
 # # Apply metric modifications using override semantics.
@@ -1078,27 +1124,6 @@
 
 # # Rename measurements, tags, and fields that pass through this filter.
 # [[processors.rename]]
-#   ## Measurement, tag, and field renamings are stored in separate sub-tables.
-#   ## Specify one sub-table per rename operation.
-#   # [[processors.rename.measurement]]
-#   #   ## measurement to change
-#   #   from = "kilobytes_per_second"
-#   #   to = "kbps"
-#
-#   # [[processors.rename.tag]]
-#   #   ## tag to change
-#   #   from = "host"
-#   #   to = "hostname"
-#
-#   # [[processors.rename.field]]
-#   #   ## field to change
-#   #   from = "lower"
-#   #   to = "min"
-#
-#   # [[processors.rename.field]]
-#   #   ## field to change
-#   #   from = "upper"
-#   #   to = "max"
 
 
 # # Perform string processing on tags, fields, and measurements
@@ -1433,6 +1458,16 @@
 #   bcacheDevs = ["bcache0"]
 
 
+# # Collects Beanstalkd server and tubes stats
+# [[inputs.beanstalkd]]
+#   ## Server to collect data from
+#   server = "localhost:11300"
+#
+#   ## List of tubes to gather stats about.
+#   ## If no tubes specified then data gathered for each tube on server reported by list-tubes command
+#   tubes = ["notifications"]
+
+
 # # Collect bond interface status, slaves statuses and failures count
 # [[inputs.bond]]
 #   ## Sets 'proc' directory path
@@ -2029,6 +2064,10 @@
 #   ## If no servers are specified, then default to 127.0.0.1:1936/haproxy?stats
 #   servers = ["http://myhaproxy.com:1936/haproxy?stats"]
 #
+#   ## Credentials for basic HTTP authentication
+#   # username = "admin"
+#   # password = "admin"
+#
 #   ## 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.
@@ -2077,9 +2116,6 @@
 #   # username = "username"
 #   # password = "pa$$word"
 #
-#   ## Tag all metrics with the url
-#   # tag_url = true
-#
 #   ## Optional TLS Config
 #   # tls_ca = "/etc/telegraf/ca.pem"
 #   # tls_cert = "/etc/telegraf/cert.pem"
@@ -2292,6 +2328,8 @@
 #   ## 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
+#   ## Define an alternate executable, such as "ip6tables". Default is "iptables".
+#   # binary = "ip6tables"
 #   ## defines the table to monitor:
 #   table = "filter"
 #   ## defines the chains to monitor.
@@ -3058,6 +3096,9 @@
 #   ## If no port is specified, 6379 is used
 #   servers = ["tcp://localhost:6379"]
 #
+#   ## specify server password
+#   # password = "s#cr@t%"
+#
 #   ## Optional TLS Config
 #   # tls_ca = "/etc/telegraf/ca.pem"
 #   # tls_cert = "/etc/telegraf/cert.pem"
@@ -3435,6 +3476,11 @@
 #   # virtual_servers = [1]
 
 
+# # Read metrics about temperature
+# [[inputs.temp]]
+#   # no configuration
+
+
 # # Read Tengine's basic status information (ngx_http_reqstat_module)
 # [[inputs.tengine]]
 #   # An array of Tengine reqstat module URI to gather stats.
@@ -3818,9 +3864,6 @@
 
 # # Stream and parse log file(s).
 # [[inputs.logparser]]
-#   ## DEPRECATED: The 'logparser' plugin is deprecated in 1.8.  Please use the
-#   ## 'tail' plugin with the grok data_format as a replacement.
-#
 #   ## Log files to parse.
 #   ## These accept standard unix glob matching rules, but with the addition of
 #   ## ** as a "super asterisk". ie:
@@ -4158,7 +4201,7 @@
 #   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
+#   ## https://github.com/influxdata/telegraf/blob/master/docs/TEMPLATE_PATTERN.md
 #   # templates = [
 #   #     "cpu.* measurement*"
 #   # ]
@@ -4254,6 +4297,158 @@
 #   # see https://github.com/influxdata/telegraf/tree/master/plugins/inputs/socket_listener
 
 
+# # Read metrics from VMware vCenter
+# [[inputs.vsphere]]
+#   ## List of vCenter URLs to be monitored. These three lines must be uncommented
+#   ## and edited for the plugin to work.
+#   vcenters = [ "https://vcenter.local/sdk" ]
+#   username = "user@corp.local"
+#   password = "secret"
+#
+#   ## VMs
+#   ## Typical VM metrics (if omitted or empty, all metrics are collected)
+#   vm_metric_include = [
+#     "cpu.demand.average",
+#     "cpu.idle.summation",
+#     "cpu.latency.average",
+#     "cpu.readiness.average",
+#     "cpu.ready.summation",
+#     "cpu.run.summation",
+#     "cpu.usagemhz.average",
+#     "cpu.used.summation",
+#     "cpu.wait.summation",
+#     "mem.active.average",
+#     "mem.granted.average",
+#     "mem.latency.average",
+#     "mem.swapin.average",
+#     "mem.swapinRate.average",
+#     "mem.swapout.average",
+#     "mem.swapoutRate.average",
+#     "mem.usage.average",
+#     "mem.vmmemctl.average",
+#     "net.bytesRx.average",
+#     "net.bytesTx.average",
+#     "net.droppedRx.summation",
+#     "net.droppedTx.summation",
+#     "net.usage.average",
+#     "power.power.average",
+#     "virtualDisk.numberReadAveraged.average",
+#     "virtualDisk.numberWriteAveraged.average",
+#     "virtualDisk.read.average",
+#     "virtualDisk.readOIO.latest",
+#     "virtualDisk.throughput.usage.average",
+#     "virtualDisk.totalReadLatency.average",
+#     "virtualDisk.totalWriteLatency.average",
+#     "virtualDisk.write.average",
+#     "virtualDisk.writeOIO.latest",
+#     "sys.uptime.latest",
+#   ]
+#   # vm_metric_exclude = [] ## Nothing is excluded by default
+#   # vm_instances = true ## true by default
+#
+#   ## Hosts
+#   ## Typical host metrics (if omitted or empty, all metrics are collected)
+#   host_metric_include = [
+#     "cpu.coreUtilization.average",
+#     "cpu.costop.summation",
+#     "cpu.demand.average",
+#     "cpu.idle.summation",
+#     "cpu.latency.average",
+#     "cpu.readiness.average",
+#     "cpu.ready.summation",
+#     "cpu.swapwait.summation",
+#     "cpu.usage.average",
+#     "cpu.usagemhz.average",
+#     "cpu.used.summation",
+#     "cpu.utilization.average",
+#     "cpu.wait.summation",
+#     "disk.deviceReadLatency.average",
+#     "disk.deviceWriteLatency.average",
+#     "disk.kernelReadLatency.average",
+#     "disk.kernelWriteLatency.average",
+#     "disk.numberReadAveraged.average",
+#     "disk.numberWriteAveraged.average",
+#     "disk.read.average",
+#     "disk.totalReadLatency.average",
+#     "disk.totalWriteLatency.average",
+#     "disk.write.average",
+#     "mem.active.average",
+#     "mem.latency.average",
+#     "mem.state.latest",
+#     "mem.swapin.average",
+#     "mem.swapinRate.average",
+#     "mem.swapout.average",
+#     "mem.swapoutRate.average",
+#     "mem.totalCapacity.average",
+#     "mem.usage.average",
+#     "mem.vmmemctl.average",
+#     "net.bytesRx.average",
+#     "net.bytesTx.average",
+#     "net.droppedRx.summation",
+#     "net.droppedTx.summation",
+#     "net.errorsRx.summation",
+#     "net.errorsTx.summation",
+#     "net.usage.average",
+#     "power.power.average",
+#     "storageAdapter.numberReadAveraged.average",
+#     "storageAdapter.numberWriteAveraged.average",
+#     "storageAdapter.read.average",
+#     "storageAdapter.write.average",
+#     "sys.uptime.latest",
+#   ]
+#   # host_metric_exclude = [] ## Nothing excluded by default
+#   # host_instances = true ## true by default
+#
+#   ## Clusters
+#   # cluster_metric_include = [] ## if omitted or empty, all metrics are collected
+#   # cluster_metric_exclude = [] ## Nothing excluded by default
+#   # cluster_instances = true ## true by default
+#
+#   ## Datastores
+#   # datastore_metric_include = [] ## if omitted or empty, all metrics are collected
+#   # datastore_metric_exclude = [] ## Nothing excluded by default
+#   # datastore_instances = false ## false by default for Datastores only
+#
+#   ## Datacenters
+#   datacenter_metric_include = [] ## if omitted or empty, all metrics are collected
+#   datacenter_metric_exclude = [ "*" ] ## Datacenters are not collected by default.
+#   # datacenter_instances = false ## false by default for Datastores only
+#
+#   ## Plugin Settings
+#   ## separator character to use for measurement and field names (default: "_")
+#   # separator = "_"
+#
+#   ## number of objects to retreive per query for realtime resources (vms and hosts)
+#   ## set to 64 for vCenter 5.5 and 6.0 (default: 256)
+#   # max_query_objects = 256
+#
+#   ## number of metrics to retreive per query for non-realtime resources (clusters and datastores)
+#   ## set to 64 for vCenter 5.5 and 6.0 (default: 256)
+#   # max_query_metrics = 256
+#
+#   ## number of go routines to use for collection and discovery of objects and metrics
+#   # collect_concurrency = 1
+#   # discover_concurrency = 1
+#
+#   ## whether or not to force discovery of new objects on initial gather call before collecting metrics
+#   ## when true for large environments this may cause errors for time elapsed while collecting metrics
+#   ## when false (default) the first collection cycle may result in no or limited metrics while objects are discovered
+#   # force_discover_on_init = false
+#
+#   ## the interval before (re)discovering objects subject to metrics collection (default: 300s)
+#   # object_discovery_interval = "300s"
+#
+#   ## timeout applies to any of the api request made to vcenter
+#   # timeout = "20s"
+#
+#   ## 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
+
+
 # # A Webhooks Event collector
 # [[inputs.webhooks]]
 #   ## Address and port to host Webhook listener on

From 820d1afa2eea113c5ad1654e95618873541f3bc6 Mon Sep 17 00:00:00 2001
From: Leandro Piccilli <lpic10@users.noreply.github.com>
Date: Thu, 20 Sep 2018 03:23:58 +0200
Subject: [PATCH 800/835] Fix changelog and add Kibana input plugin to README
 (#4718)

---
 CHANGELOG.md | 2 +-
 README.md    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76bb6245..019e802f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@
 - [filecount](./plugins/inputs/filecount/README.md) - Contributed by @sometimesfood
 - [file](./plugins/inputs/file/README.md) - Contributed by @maxunt
 - [icinga2](./plugins/inputs/icinga2/README.md) - Contributed by @mlabouardy
-- [kibana](./plugins/inputs/icinga2/README.md) - Contributed by @lpic10
+- [kibana](./plugins/inputs/kibana/README.md) - Contributed by @lpic10
 - [pgbouncer](./plugins/inputs/pgbouncer/README.md) - Contributed by @nerzhul
 - [temp](./plugins/inputs/temp/README.md) - Contributed by @pytimer
 - [tengine](./plugins/inputs/tengine/README.md) - Contributed by @ertaoxu
diff --git a/README.md b/README.md
index 5bc83045..4ba1a66c 100644
--- a/README.md
+++ b/README.md
@@ -183,6 +183,7 @@ For documentation on the latest development code see the [documentation index][d
 * [kapacitor](./plugins/inputs/kapacitor)
 * [kernel](./plugins/inputs/kernel)
 * [kernel_vmstat](./plugins/inputs/kernel_vmstat)
+* [kibana](./plugins/inputs/kibana)
 * [kubernetes](./plugins/inputs/kubernetes)
 * [leofs](./plugins/inputs/leofs)
 * [linux_sysctl_fs](./plugins/inputs/linux_sysctl_fs)

From dfe8e3b47381167a73a5122c794aa711188c2bea Mon Sep 17 00:00:00 2001
From: Lee Jaeyong <lastiverse@gmail.com>
Date: Fri, 21 Sep 2018 04:43:39 +0900
Subject: [PATCH 801/835] Fix config file types of csv_skip_rows and
 csv_skip_columns (#4726)

---
 internal/config/config.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/internal/config/config.go b/internal/config/config.go
index 8010ab6f..cd4d9825 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -1541,24 +1541,24 @@ func getParserConfig(name string, tbl *ast.Table) (*parsers.Config, error) {
 
 	if node, ok := tbl.Fields["csv_skip_rows"]; ok {
 		if kv, ok := node.(*ast.KeyValue); ok {
-			if str, ok := kv.Value.(*ast.String); ok {
-				iVal, err := strconv.Atoi(str.Value)
-				c.CSVSkipRows = iVal
+			if integer, ok := kv.Value.(*ast.Integer); ok {
+				v, err := integer.Int()
 				if err != nil {
-					return nil, fmt.Errorf("E! parsing to int: %v", err)
+					return nil, err
 				}
+				c.CSVHeaderRowCount = int(v)
 			}
 		}
 	}
 
 	if node, ok := tbl.Fields["csv_skip_columns"]; ok {
 		if kv, ok := node.(*ast.KeyValue); ok {
-			if str, ok := kv.Value.(*ast.String); ok {
-				iVal, err := strconv.Atoi(str.Value)
-				c.CSVSkipColumns = iVal
+			if integer, ok := kv.Value.(*ast.Integer); ok {
+				v, err := integer.Int()
 				if err != nil {
-					return nil, fmt.Errorf("E! parsing to int: %v", err)
+					return nil, err
 				}
+				c.CSVHeaderRowCount = int(v)
 			}
 		}
 	}

From 1e3e28428d8c9cf00a6350fd381d938b2f90373c Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 20 Sep 2018 12:55:58 -0700
Subject: [PATCH 802/835] Clean up csv_trim_space after building parser config

---
 internal/config/config.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/internal/config/config.go b/internal/config/config.go
index cd4d9825..d62536cf 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -1613,6 +1613,7 @@ func getParserConfig(name string, tbl *ast.Table) (*parsers.Config, error) {
 	delete(tbl.Fields, "csv_tag_columns")
 	delete(tbl.Fields, "csv_timestamp_column")
 	delete(tbl.Fields, "csv_timestamp_format")
+	delete(tbl.Fields, "csv_trim_space")
 
 	return c, nil
 }

From fe0b964d3e7004f39ab0870dd4d25ca5fb39a1e8 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 20 Sep 2018 15:00:05 -0700
Subject: [PATCH 803/835] Document that proc/agg/outputs are not run as part of
 --test

---
 internal/usage.go         | 3 ++-
 internal/usage_windows.go | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/internal/usage.go b/internal/usage.go
index 99db5aeb..a49021b4 100644
--- a/internal/usage.go
+++ b/internal/usage.go
@@ -26,7 +26,8 @@ The commands & flags are:
   --processor-filter <filter>    filter the processors to enable, separator is :
   --quiet                        run in quiet mode
   --sample-config                print out full sample configuration
-  --test                         gather metrics, print them out, and exit
+  --test                         gather metrics, print them out, and exit;
+                                 processors, aggregators, and outputs are not run
   --usage <plugin>               print usage for a plugin, ie, 'telegraf --usage mysql'
   --version                      display the version and exit
 
diff --git a/internal/usage_windows.go b/internal/usage_windows.go
index 585c2996..db5e492a 100644
--- a/internal/usage_windows.go
+++ b/internal/usage_windows.go
@@ -26,7 +26,8 @@ The commands & flags are:
   --processor-filter <filter>    filter the processors to enable, separator is :
   --quiet                        run in quiet mode
   --sample-config                print out full sample configuration
-  --test                         gather metrics, print them out, and exit
+  --test                         gather metrics, print them out, and exit;
+                                 processors, aggregators, and outputs are not run
   --usage <plugin>               print usage for a plugin, ie, 'telegraf --usage mysql'
   --version                      display the version and exit
 

From a55e141264e4b7f85efb3505a474ceeca54b75a9 Mon Sep 17 00:00:00 2001
From: Simon Murray <spjmurray@yahoo.co.uk>
Date: Thu, 20 Sep 2018 23:05:47 +0100
Subject: [PATCH 804/835] Use typed struct instead of type assertions in Ceph
 Input Plugin (#4721)

---
 plugins/inputs/ceph/ceph.go      | 251 ++++++++++++++++---------------
 plugins/inputs/ceph/ceph_test.go | 244 ++++++++++++++++++++++++++++--
 2 files changed, 356 insertions(+), 139 deletions(-)

diff --git a/plugins/inputs/ceph/ceph.go b/plugins/inputs/ceph/ceph.go
index 0de9cb13..369795e7 100644
--- a/plugins/inputs/ceph/ceph.go
+++ b/plugins/inputs/ceph/ceph.go
@@ -294,6 +294,7 @@ func flatten(data interface{}) []*metric {
 	return metrics
 }
 
+// exec executes the 'ceph' command with the supplied arguments, returning JSON formatted output
 func (c *Ceph) exec(command string) (string, error) {
 	cmdArgs := []string{"--conf", c.CephConfig, "--name", c.CephUser, "--format", "json"}
 	cmdArgs = append(cmdArgs, strings.Split(command, " ")...)
@@ -317,145 +318,145 @@ func (c *Ceph) exec(command string) (string, error) {
 	return output, nil
 }
 
+// CephStatus is used to unmarshal "ceph -s" output
+type CephStatus struct {
+	OSDMap struct {
+		OSDMap struct {
+			Epoch          float64 `json:"epoch"`
+			NumOSDs        float64 `json:"num_osds"`
+			NumUpOSDs      float64 `json:"num_up_osds"`
+			NumInOSDs      float64 `json:"num_in_osds"`
+			Full           bool    `json:"full"`
+			NearFull       bool    `json:"nearfull"`
+			NumRemappedPGs float64 `json:"num_rempapped_pgs"`
+		} `json:"osdmap"`
+	} `json:"osdmap"`
+	PGMap struct {
+		PGsByState []struct {
+			StateName string  `json:"state_name"`
+			Count     float64 `json:"count"`
+		} `json:"pgs_by_state"`
+		Version       float64 `json:"version"`
+		NumPGs        float64 `json:"num_pgs"`
+		DataBytes     float64 `json:"data_bytes"`
+		BytesUsed     float64 `json:"bytes_used"`
+		BytesAvail    float64 `json:"bytes_avail"`
+		BytesTotal    float64 `json:"bytes_total"`
+		ReadBytesSec  float64 `json:"read_bytes_sec"`
+		WriteBytesSec float64 `json:"write_bytes_sec"`
+		OpPerSec      float64 `json:"op_per_sec"`
+	} `json:"pgmap"`
+}
+
+// decodeStatus decodes the output of 'ceph -s'
 func decodeStatus(acc telegraf.Accumulator, input string) error {
-	data := make(map[string]interface{})
-	err := json.Unmarshal([]byte(input), &data)
-	if err != nil {
+	data := &CephStatus{}
+	if err := json.Unmarshal([]byte(input), data); err != nil {
 		return fmt.Errorf("failed to parse json: '%s': %v", input, err)
 	}
 
-	err = decodeStatusOsdmap(acc, data)
-	if err != nil {
-		return err
+	decoders := []func(telegraf.Accumulator, *CephStatus) error{
+		decodeStatusOsdmap,
+		decodeStatusPgmap,
+		decodeStatusPgmapState,
 	}
 
-	err = decodeStatusPgmap(acc, data)
-	if err != nil {
-		return err
-	}
-
-	err = decodeStatusPgmapState(acc, data)
-	if err != nil {
-		return err
+	for _, decoder := range decoders {
+		if err := decoder(acc, data); err != nil {
+			return err
+		}
 	}
 
 	return nil
 }
 
-func decodeStatusOsdmap(acc telegraf.Accumulator, data map[string]interface{}) error {
-	osdmap, ok := data["osdmap"].(map[string]interface{})
-	if !ok {
-		return fmt.Errorf("WARNING %s - unable to decode osdmap", measurement)
-	}
-	fields, ok := osdmap["osdmap"].(map[string]interface{})
-	if !ok {
-		return fmt.Errorf("WARNING %s - unable to decode osdmap", measurement)
+// decodeStatusOsdmap decodes the OSD map portion of the output of 'ceph -s'
+func decodeStatusOsdmap(acc telegraf.Accumulator, data *CephStatus) error {
+	fields := map[string]interface{}{
+		"epoch":             data.OSDMap.OSDMap.Epoch,
+		"num_osds":          data.OSDMap.OSDMap.NumOSDs,
+		"num_up_osds":       data.OSDMap.OSDMap.NumUpOSDs,
+		"num_in_osds":       data.OSDMap.OSDMap.NumInOSDs,
+		"full":              data.OSDMap.OSDMap.Full,
+		"nearfull":          data.OSDMap.OSDMap.NearFull,
+		"num_rempapped_pgs": data.OSDMap.OSDMap.NumRemappedPGs,
 	}
 	acc.AddFields("ceph_osdmap", fields, map[string]string{})
 	return nil
 }
 
-func decodeStatusPgmap(acc telegraf.Accumulator, data map[string]interface{}) error {
-	pgmap, ok := data["pgmap"].(map[string]interface{})
-	if !ok {
-		return fmt.Errorf("WARNING %s - unable to decode pgmap", measurement)
-	}
-	fields := make(map[string]interface{})
-	for key, value := range pgmap {
-		switch value.(type) {
-		case float64:
-			fields[key] = value
-		}
+// decodeStatusPgmap decodes the PG map portion of the output of 'ceph -s'
+func decodeStatusPgmap(acc telegraf.Accumulator, data *CephStatus) error {
+	fields := map[string]interface{}{
+		"version":         data.PGMap.Version,
+		"num_pgs":         data.PGMap.NumPGs,
+		"data_bytes":      data.PGMap.DataBytes,
+		"bytes_used":      data.PGMap.BytesUsed,
+		"bytes_avail":     data.PGMap.BytesAvail,
+		"bytes_total":     data.PGMap.BytesTotal,
+		"read_bytes_sec":  data.PGMap.ReadBytesSec,
+		"write_bytes_sec": data.PGMap.WriteBytesSec,
+		"op_per_sec":      data.PGMap.OpPerSec,
 	}
 	acc.AddFields("ceph_pgmap", fields, map[string]string{})
 	return nil
 }
 
-func extractPgmapStates(data map[string]interface{}) ([]interface{}, error) {
-	const key = "pgs_by_state"
-
-	pgmap, ok := data["pgmap"].(map[string]interface{})
-	if !ok {
-		return nil, fmt.Errorf("WARNING %s - unable to decode pgmap", measurement)
-	}
-
-	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)
-		}
-
+// decodeStatusPgmapState decodes the PG map state portion of the output of 'ceph -s'
+func decodeStatusPgmapState(acc telegraf.Accumulator, data *CephStatus) error {
+	for _, pgState := range data.PGMap.PGsByState {
 		tags := map[string]string{
-			"state": stateName,
+			"state": pgState.StateName,
 		}
 		fields := map[string]interface{}{
-			"count": stateCount,
+			"count": pgState.Count,
 		}
 		acc.AddFields("ceph_pgmap_state", fields, tags)
 	}
 	return nil
 }
 
+// CephDF is used to unmarshal 'ceph df' output
+type CephDf struct {
+	Stats struct {
+		TotalSpace float64 `json:"total_space"`
+		TotalUsed  float64 `json:"total_used"`
+		TotalAvail float64 `json:"total_avail"`
+	} `json:"stats"`
+	Pools []struct {
+		Name  string `json:"name"`
+		Stats struct {
+			KBUsed    float64 `json:"kb_used"`
+			BytesUsed float64 `json:"bytes_used"`
+			Objects   float64 `json:"objects"`
+		} `json:"stats"`
+	} `json:"pools"`
+}
+
+// decodeDf decodes the output of 'ceph df'
 func decodeDf(acc telegraf.Accumulator, input string) error {
-	data := make(map[string]interface{})
-	err := json.Unmarshal([]byte(input), &data)
-	if err != nil {
+	data := &CephDf{}
+	if err := json.Unmarshal([]byte(input), data); err != nil {
 		return fmt.Errorf("failed to parse json: '%s': %v", input, err)
 	}
 
 	// ceph.usage: records global utilization and number of objects
-	stats_fields, ok := data["stats"].(map[string]interface{})
-	if !ok {
-		return fmt.Errorf("WARNING %s - unable to decode df stats", measurement)
+	fields := map[string]interface{}{
+		"total_space": data.Stats.TotalSpace,
+		"total_used":  data.Stats.TotalUsed,
+		"total_avail": data.Stats.TotalAvail,
 	}
-	acc.AddFields("ceph_usage", stats_fields, map[string]string{})
+	acc.AddFields("ceph_usage", fields, map[string]string{})
 
 	// ceph.pool.usage: records per pool utilization and number of objects
-	pools, ok := data["pools"].([]interface{})
-	if !ok {
-		return fmt.Errorf("WARNING %s - unable to decode df pools", measurement)
-	}
-
-	for _, pool := range pools {
-		pool_map, ok := pool.(map[string]interface{})
-		if !ok {
-			return fmt.Errorf("WARNING %s - unable to decode df pool", measurement)
-		}
-		pool_name, ok := pool_map["name"].(string)
-		if !ok {
-			return fmt.Errorf("WARNING %s - unable to decode df pool name", measurement)
-		}
-		fields, ok := pool_map["stats"].(map[string]interface{})
-		if !ok {
-			return fmt.Errorf("WARNING %s - unable to decode df pool stats", measurement)
-		}
+	for _, pool := range data.Pools {
 		tags := map[string]string{
-			"name": pool_name,
+			"name": pool.Name,
+		}
+		fields := map[string]interface{}{
+			"kb_used":    pool.Stats.KBUsed,
+			"bytes_used": pool.Stats.BytesUsed,
+			"objects":    pool.Stats.Objects,
 		}
 		acc.AddFields("ceph_pool_usage", fields, tags)
 	}
@@ -463,36 +464,40 @@ func decodeDf(acc telegraf.Accumulator, input string) error {
 	return nil
 }
 
+// CephOSDPoolStats is used to unmarshal 'ceph osd pool stats' output
+type CephOSDPoolStats []struct {
+	PoolName     string `json:"pool_name"`
+	ClientIORate struct {
+		ReadBytesSec  float64 `json:"read_bytes_sec"`
+		WriteBytesSec float64 `json:"write_bytes_sec"`
+		OpPerSec      float64 `json:"op_per_sec"`
+	} `json:"client_io_rate"`
+	RecoveryRate struct {
+		RecoveringObjectsPerSec float64 `json:"recovering_objects_per_sec"`
+		RecoveringBytesPerSec   float64 `json:"recovering_bytes_per_sec"`
+		RecoveringKeysPerSec    float64 `json:"recovering_keys_per_sec"`
+	} `json:"recovery_rate"`
+}
+
+// decodeOsdPoolStats decodes the output of 'ceph osd pool stats'
 func decodeOsdPoolStats(acc telegraf.Accumulator, input string) error {
-	data := make([]map[string]interface{}, 0)
-	err := json.Unmarshal([]byte(input), &data)
-	if err != nil {
+	data := CephOSDPoolStats{}
+	if err := json.Unmarshal([]byte(input), &data); err != nil {
 		return fmt.Errorf("failed to parse json: '%s': %v", input, err)
 	}
 
 	// ceph.pool.stats: records pre pool IO and recovery throughput
 	for _, pool := range data {
-		pool_name, ok := pool["pool_name"].(string)
-		if !ok {
-			return fmt.Errorf("WARNING %s - unable to decode osd pool stats name", measurement)
-		}
-		// Note: the 'recovery' object looks broken (in hammer), so it's omitted
-		objects := []string{
-			"client_io_rate",
-			"recovery_rate",
-		}
-		fields := make(map[string]interface{})
-		for _, object := range objects {
-			perfdata, ok := pool[object].(map[string]interface{})
-			if !ok {
-				return fmt.Errorf("WARNING %s - unable to decode osd pool stats", measurement)
-			}
-			for key, value := range perfdata {
-				fields[key] = value
-			}
-		}
 		tags := map[string]string{
-			"name": pool_name,
+			"name": pool.PoolName,
+		}
+		fields := map[string]interface{}{
+			"read_bytes_sec":             pool.ClientIORate.ReadBytesSec,
+			"write_bytes_sec":            pool.ClientIORate.WriteBytesSec,
+			"op_per_sec":                 pool.ClientIORate.OpPerSec,
+			"recovering_objects_per_sec": pool.RecoveryRate.RecoveringObjectsPerSec,
+			"recovering_bytes_per_sec":   pool.RecoveryRate.RecoveringBytesPerSec,
+			"recovering_keys_per_sec":    pool.RecoveryRate.RecoveringKeysPerSec,
 		}
 		acc.AddFields("ceph_pool_stats", fields, tags)
 	}
diff --git a/plugins/inputs/ceph/ceph_test.go b/plugins/inputs/ceph/ceph_test.go
index f4a3ebb8..9f3ded52 100644
--- a/plugins/inputs/ceph/ceph_test.go
+++ b/plugins/inputs/ceph/ceph_test.go
@@ -1,7 +1,6 @@
 package ceph
 
 import (
-	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -18,6 +17,12 @@ const (
 	epsilon = float64(0.00000001)
 )
 
+type expectedResult struct {
+	metric string
+	fields map[string]interface{}
+	tags   map[string]string
+}
+
 func TestParseSockId(t *testing.T) {
 	s := parseSockId(sockFile(osdPrefix, 1), osdPrefix, sockSuffix)
 	assert.Equal(t, s, "1")
@@ -37,26 +42,33 @@ func TestParseOsdDump(t *testing.T) {
 	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)
-
+func TestDecodeStatus(t *testing.T) {
 	acc := &testutil.Accumulator{}
-	err = decodeStatusPgmapState(acc, data)
+	err := decodeStatus(acc, clusterStatusDump)
 	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 cephStatusResults {
+		acc.AssertContainsTaggedFields(t, r.metric, r.fields, r.tags)
 	}
+}
 
-	for _, r := range results {
-		acc.AssertContainsTaggedFields(t, "ceph_pgmap_state", r.fields, r.tags)
+func TestDecodeDf(t *testing.T) {
+	acc := &testutil.Accumulator{}
+	err := decodeDf(acc, cephDFDump)
+	assert.NoError(t, err)
+
+	for _, r := range cephDfResults {
+		acc.AssertContainsTaggedFields(t, r.metric, r.fields, r.tags)
+	}
+}
+
+func TestDecodeOSDPoolStats(t *testing.T) {
+	acc := &testutil.Accumulator{}
+	err := decodeOsdPoolStats(acc, cephODSPoolStatsDump)
+	assert.NoError(t, err)
+
+	for _, r := range cephOSDPoolStatsResults {
+		acc.AssertContainsTaggedFields(t, r.metric, r.fields, r.tags)
 	}
 }
 
@@ -834,3 +846,203 @@ var clusterStatusDump = `
   }
 }
 `
+
+var cephStatusResults = []expectedResult{
+	{
+		metric: "ceph_osdmap",
+		fields: map[string]interface{}{
+			"epoch":             float64(21734),
+			"num_osds":          float64(24),
+			"num_up_osds":       float64(24),
+			"num_in_osds":       float64(24),
+			"full":              false,
+			"nearfull":          false,
+			"num_rempapped_pgs": float64(0),
+		},
+		tags: map[string]string{},
+	},
+	{
+		metric: "ceph_pgmap",
+		fields: map[string]interface{}{
+			"version":         float64(52314277),
+			"num_pgs":         float64(2560),
+			"data_bytes":      float64(2700031960713),
+			"bytes_used":      float64(7478347665408),
+			"bytes_avail":     float64(9857462382592),
+			"bytes_total":     float64(17335810048000),
+			"read_bytes_sec":  float64(0),
+			"write_bytes_sec": float64(367217),
+			"op_per_sec":      float64(98),
+		},
+		tags: map[string]string{},
+	},
+	{
+		metric: "ceph_pgmap_state",
+		fields: map[string]interface{}{
+			"count": float64(2560),
+		},
+		tags: map[string]string{
+			"state": "active+clean",
+		},
+	},
+	{
+		metric: "ceph_pgmap_state",
+		fields: map[string]interface{}{
+			"count": float64(10),
+		},
+		tags: map[string]string{
+			"state": "active+scrubbing",
+		},
+	},
+	{
+		metric: "ceph_pgmap_state",
+		fields: map[string]interface{}{
+			"count": float64(5),
+		},
+		tags: map[string]string{
+			"state": "active+backfilling",
+		},
+	},
+}
+
+var cephDFDump = `
+{ "stats": { "total_space": 472345880,
+      "total_used": 71058504,
+      "total_avail": 377286864},
+  "pools": [
+        { "name": "data",
+          "id": 0,
+          "stats": { "kb_used": 0,
+              "bytes_used": 0,
+              "objects": 0}},
+        { "name": "metadata",
+          "id": 1,
+          "stats": { "kb_used": 25,
+              "bytes_used": 25052,
+              "objects": 53}},
+        { "name": "rbd",
+          "id": 2,
+          "stats": { "kb_used": 0,
+              "bytes_used": 0,
+              "objects": 0}},
+        { "name": "test",
+          "id": 3,
+          "stats": { "kb_used": 55476,
+              "bytes_used": 56806602,
+              "objects": 1}}]}`
+
+var cephDfResults = []expectedResult{
+	{
+		metric: "ceph_usage",
+		fields: map[string]interface{}{
+			"total_space": float64(472345880),
+			"total_used":  float64(71058504),
+			"total_avail": float64(377286864),
+		},
+		tags: map[string]string{},
+	},
+	{
+		metric: "ceph_pool_usage",
+		fields: map[string]interface{}{
+			"kb_used":    float64(0),
+			"bytes_used": float64(0),
+			"objects":    float64(0),
+		},
+		tags: map[string]string{
+			"name": "data",
+		},
+	},
+	{
+		metric: "ceph_pool_usage",
+		fields: map[string]interface{}{
+			"kb_used":    float64(25),
+			"bytes_used": float64(25052),
+			"objects":    float64(53),
+		},
+		tags: map[string]string{
+			"name": "metadata",
+		},
+	},
+	{
+		metric: "ceph_pool_usage",
+		fields: map[string]interface{}{
+			"kb_used":    float64(0),
+			"bytes_used": float64(0),
+			"objects":    float64(0),
+		},
+		tags: map[string]string{
+			"name": "rbd",
+		},
+	},
+	{
+		metric: "ceph_pool_usage",
+		fields: map[string]interface{}{
+			"kb_used":    float64(55476),
+			"bytes_used": float64(56806602),
+			"objects":    float64(1),
+		},
+		tags: map[string]string{
+			"name": "test",
+		},
+	},
+}
+
+var cephODSPoolStatsDump = `
+[
+    { "pool_name": "data",
+      "pool_id": 0,
+      "recovery": {},
+      "recovery_rate": {},
+      "client_io_rate": {}},
+    { "pool_name": "metadata",
+      "pool_id": 1,
+      "recovery": {},
+      "recovery_rate": {},
+      "client_io_rate": {}},
+    { "pool_name": "rbd",
+      "pool_id": 2,
+      "recovery": {},
+      "recovery_rate": {},
+      "client_io_rate": {}},
+    { "pool_name": "pbench",
+      "pool_id": 3,
+      "recovery": { "degraded_objects": 18446744073709551562,
+          "degraded_total": 412,
+          "degrated_ratio": "-13.107"},
+      "recovery_rate": { "recovering_objects_per_sec": 279,
+          "recovering_bytes_per_sec": 176401059,
+          "recovering_keys_per_sec": 0},
+      "client_io_rate": { "read_bytes_sec": 10566067,
+          "write_bytes_sec": 15165220376,
+          "op_per_sec": 9828}}]`
+
+var cephOSDPoolStatsResults = []expectedResult{
+	{
+		metric: "ceph_pool_stats",
+		fields: map[string]interface{}{
+			"read_bytes_sec":             float64(0),
+			"write_bytes_sec":            float64(0),
+			"op_per_sec":                 float64(0),
+			"recovering_objects_per_sec": float64(0),
+			"recovering_bytes_per_sec":   float64(0),
+			"recovering_keys_per_sec":    float64(0),
+		},
+		tags: map[string]string{
+			"name": "data",
+		},
+	},
+	{
+		metric: "ceph_pool_stats",
+		fields: map[string]interface{}{
+			"read_bytes_sec":             float64(10566067),
+			"write_bytes_sec":            float64(15165220376),
+			"op_per_sec":                 float64(9828),
+			"recovering_objects_per_sec": float64(279),
+			"recovering_bytes_per_sec":   float64(176401059),
+			"recovering_keys_per_sec":    float64(0),
+		},
+		tags: map[string]string{
+			"name": "pbench",
+		},
+	},
+}

From 3349b53905f9b5efad83db44545439cc9209e071 Mon Sep 17 00:00:00 2001
From: Greg <g2linton@gmail.com>
Date: Fri, 21 Sep 2018 11:17:09 -0700
Subject: [PATCH 805/835] Rename vsphere markdown files (#4733)

---
 plugins/inputs/vsphere/{METRICS.MD => METRICS.md} | 0
 plugins/inputs/vsphere/{README.MD => README.md}   | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename plugins/inputs/vsphere/{METRICS.MD => METRICS.md} (100%)
 rename plugins/inputs/vsphere/{README.MD => README.md} (100%)

diff --git a/plugins/inputs/vsphere/METRICS.MD b/plugins/inputs/vsphere/METRICS.md
similarity index 100%
rename from plugins/inputs/vsphere/METRICS.MD
rename to plugins/inputs/vsphere/METRICS.md
diff --git a/plugins/inputs/vsphere/README.MD b/plugins/inputs/vsphere/README.md
similarity index 100%
rename from plugins/inputs/vsphere/README.MD
rename to plugins/inputs/vsphere/README.md

From adf2668c1d0e432574668594376632abcefc2e45 Mon Sep 17 00:00:00 2001
From: Tracy Boggiano <tracy@tracyboggiano.com>
Date: Fri, 21 Sep 2018 15:18:27 -0400
Subject: [PATCH 806/835] Fix forwarded records and offline state in sqlserver
 input (#4730)

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

diff --git a/plugins/inputs/sqlserver/sqlserver.go b/plugins/inputs/sqlserver/sqlserver.go
index 5f2cbb29..a4b5fc70 100644
--- a/plugins/inputs/sqlserver/sqlserver.go
+++ b/plugins/inputs/sqlserver/sqlserver.go
@@ -244,7 +244,7 @@ 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 = `DECLARE @SQL NVARCHAR(MAX) = 'SELECT	
+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,
@@ -401,7 +401,7 @@ const sqlServerPropertiesV2 = `DECLARE @sys_info TABLE (
 
 IF OBJECT_ID('master.sys.dm_os_sys_info') IS NOT NULL
 BEGIN
- 
+
 	IF SERVERPROPERTY('EngineEdition') = 8  -- Managed Instance
 		INSERT INTO @sys_info ( cpu_count, server_memory, sku, engine_edition, hardware_type, total_storage_mb, available_storage_mb, uptime )
 		SELECT 	TOP(1)
@@ -409,8 +409,8 @@ BEGIN
 				(SELECT process_memory_limit_mb FROM sys.dm_os_job_object) AS server_memory,
 				sku,
 				cast(SERVERPROPERTY('EngineEdition') as smallint) AS engine_edition,
-				hardware_generation AS hardware_type, 
-				reserved_storage_mb AS total_storage_mb, 
+				hardware_generation AS hardware_type,
+				reserved_storage_mb AS total_storage_mb,
 				(reserved_storage_mb - storage_space_used_mb) AS available_storage_mb,
 				(select DATEDIFF(MINUTE,sqlserver_start_time,GETDATE()) from sys.dm_os_sys_info) as uptime
 		FROM	sys.server_resource_stats
@@ -422,12 +422,12 @@ BEGIN
 				@available_space_mb BIGINT
 
 		SELECT	@total_disk_size_mb = sum(total_disk_size_mb),
-				@available_space_mb = sum(free_disk_space_mb) 
+				@available_space_mb = sum(free_disk_space_mb)
 		FROM	(
 					SELECT	distinct logical_volume_name AS LogicalName,
-							total_bytes/(1024*1024)as total_disk_size_mb, 
+							total_bytes/(1024*1024)as total_disk_size_mb,
 							available_bytes /(1024*1024) free_disk_space_mb
-					FROM	sys.master_files AS f  
+					FROM	sys.master_files AS f
 							CROSS APPLY sys.dm_os_volume_stats(f.database_id, f.file_id)
 				) as osVolumes
 
@@ -446,7 +446,7 @@ BEGIN
 		FROM	sys.dm_os_sys_info
 	END
 END
-	
+
 SELECT	'sqlserver_server_properties' AS [measurement],
 		REPLACE(@@SERVERNAME,'\',':') AS [sql_instance],
 		s.cpu_count,
@@ -469,7 +469,7 @@ FROM	(
 					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
+					SUM( CASE WHEN state = 6 or state = 10 THEN 1 ELSE 0 END ) AS db_offline
 			FROM	sys.databases
 		) AS dbs
 		CROSS APPLY (
@@ -571,7 +571,7 @@ WHERE	(
 				'Disk Write IO Throttled/sec',
 				'Disk Write IO/sec',
 				'Used memory (KB)',
-				'Forwarded Recs/sec',
+				'Forwarded Records/sec',
 				'Background Writer pages/sec',
 				'Percent Log Used'
 			)
@@ -598,7 +598,7 @@ CAST(vs.value AS BIGINT) AS value,
 1
 FROM
 (
-    SELECT 
+    SELECT
     rgwg.name AS instance,
     rgwg.total_request_count AS "Request Count",
     rgwg.total_queued_request_count AS "Queued Request Count",
@@ -1166,15 +1166,15 @@ ws.wait_type NOT IN (
 	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_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'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','PREEMPTIVE_OS_GENERICOPS', N'PREEMPTIVE_OS_VERIFYTRUST',
-	N'PREEMPTIVE_OS_DEVICEOPS', 
+	N'PREEMPTIVE_OS_DEVICEOPS',
 	N'PREEMPTIVE_XE_CALLBACKEXECUTE', N'PREEMPTIVE_XE_DISPATCHER',
 	N'PREEMPTIVE_XE_GETTARGETSTATE', N'PREEMPTIVE_XE_SESSIONCOMMIT',
 	N'PREEMPTIVE_XE_TARGETINIT', N'PREEMPTIVE_XE_TARGETFINALIZE',
@@ -1186,7 +1186,7 @@ ws.wait_type NOT IN (
 	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_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',
@@ -1212,9 +1212,9 @@ BEGIN
 		max_session_percent,
 		dtu_limit,
 		avg_login_rate_percent,
-		end_time 
+		end_time
 	FROM
-		sys.dm_db_resource_stats WITH (NOLOCK) 
+		sys.dm_db_resource_stats WITH (NOLOCK)
 	ORDER BY
 		end_time DESC
 	OPTION (RECOMPILE)

From e08c975fbd90a2e477355a971a070ac51ec5e675 Mon Sep 17 00:00:00 2001
From: Greg <g2linton@gmail.com>
Date: Fri, 21 Sep 2018 12:39:05 -0700
Subject: [PATCH 807/835] Fix rune conversion in csv parser (#4728)

---
 plugins/parsers/registry.go | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugins/parsers/registry.go b/plugins/parsers/registry.go
index 28ff3026..c662cf30 100644
--- a/plugins/parsers/registry.go
+++ b/plugins/parsers/registry.go
@@ -231,7 +231,6 @@ func newCSVParser(metricName string,
 		if len(runeStr) > 1 {
 			return nil, fmt.Errorf("csv_delimiter must be a single character, got: %s", delimiter)
 		}
-		delimiter = fmt.Sprintf("%v", runeStr[0])
 	}
 
 	if comment != "" {
@@ -239,7 +238,6 @@ func newCSVParser(metricName string,
 		if len(runeStr) > 1 {
 			return nil, fmt.Errorf("csv_delimiter must be a single character, got: %s", comment)
 		}
-		comment = fmt.Sprintf("%v", runeStr[0])
 	}
 
 	parser := &csv.Parser{

From 85db54c2f20e115632630fb2106c4ab7d146cc73 Mon Sep 17 00:00:00 2001
From: Gunnar <628831+gunnaraasen@users.noreply.github.com>
Date: Fri, 21 Sep 2018 12:39:37 -0700
Subject: [PATCH 808/835] Add note about docker socket permissions (#4724)

---
 plugins/inputs/docker/README.md | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/docker/README.md b/plugins/inputs/docker/README.md
index b7e64af3..39fc7d6a 100644
--- a/plugins/inputs/docker/README.md
+++ b/plugins/inputs/docker/README.md
@@ -66,6 +66,31 @@ to gather stats from the [Engine API](https://docs.docker.com/engine/api/v1.24/)
 When using the `"ENV"` endpoint, the connection is configured using the
 [cli Docker environment variables](https://godoc.org/github.com/moby/moby/client#NewEnvClient).
 
+#### Security
+
+Giving telegraf access to the Docker daemon expands the [attack surface](https://docs.docker.com/engine/security/security/#docker-daemon-attack-surface) that could result in an attacker gaining root access to a machine. This is especially relevant if the telegraf configuration can be changed by untrusted users.
+
+#### Docker Daemon Permissions
+
+Typically, telegraf must be given permission to access the docker daemon unix
+socket when using the default endpoint. This can be done by adding the
+`telegraf` unix user (created when installing a Telegraf package) to the
+`docker` unix group with the following command:
+
+```
+sudo usermod -aG docker telegraf
+```
+
+If telegraf is run within a container, the unix socket will need to be exposed
+within the telegraf container. This can be done in the docker CLI by add the
+option `-v /var/run/docker.sock:/var/run/docker.sock` or adding the following
+lines to the telegraf container definition in a docker compose file:
+
+```
+volumes:
+  - /var/run/docker.sock:/var/run/docker.sock
+```
+
 #### Kubernetes Labels
 
 Kubernetes may add many labels to your containers, if they are not needed you
@@ -74,7 +99,6 @@ may prefer to exclude them:
   docker_label_exclude = ["annotation.kubernetes*"]
 ```
 
-
 ### Metrics:
 
 - docker

From 403ed001bf06a6ad633447fc1c3422a4762de110 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 21 Sep 2018 13:07:12 -0700
Subject: [PATCH 809/835] Add version to the influxdb output plugins readme

---
 plugins/outputs/influxdb/README.md    | 6 ++++--
 plugins/outputs/influxdb_v2/README.md | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/plugins/outputs/influxdb/README.md b/plugins/outputs/influxdb/README.md
index aed96e46..e9b3b034 100644
--- a/plugins/outputs/influxdb/README.md
+++ b/plugins/outputs/influxdb/README.md
@@ -1,6 +1,6 @@
-# InfluxDB Output Plugin
+# InfluxDB v1.x Output Plugin
 
-This InfluxDB output plugin writes metrics to the [InfluxDB](https://github.com/influxdata/influxdb) HTTP or UDP service.
+The InfluxDB output plugin writes metrics to the [InfluxDB v1.x] HTTP or UDP service.
 
 ### Configuration:
 
@@ -68,3 +68,5 @@ This InfluxDB output plugin writes metrics to the [InfluxDB](https://github.com/
   ## existing data has been written.
   # influx_uint_support = false
 ```
+
+[InfluxDB v1.x]: https://github.com/influxdata/influxdb
diff --git a/plugins/outputs/influxdb_v2/README.md b/plugins/outputs/influxdb_v2/README.md
index 795f4467..5755e6b1 100644
--- a/plugins/outputs/influxdb_v2/README.md
+++ b/plugins/outputs/influxdb_v2/README.md
@@ -1,6 +1,6 @@
-# InfluxDB Output Plugin
+# InfluxDB v2.x Output Plugin
 
-This InfluxDB output plugin writes metrics to the [InfluxDB 2.0](https://github.com/influxdata/platform) HTTP service.
+The InfluxDB output plugin writes metrics to the [InfluxDB v2.x] HTTP service.
 
 ### Configuration:
 
@@ -49,3 +49,5 @@ This InfluxDB output plugin writes metrics to the [InfluxDB 2.0](https://github.
   ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 ```
+
+[InfluxDB v2.x]: https://github.com/influxdata/platform

From d07bbe24e3791e918c574a8de69710b82b7ff480 Mon Sep 17 00:00:00 2001
From: Greg Linton <g2linton@gmail.com>
Date: Fri, 21 Sep 2018 15:05:36 -0700
Subject: [PATCH 810/835] Update link in graphite serializer README

---
 plugins/serializers/graphite/README.md | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/plugins/serializers/graphite/README.md b/plugins/serializers/graphite/README.md
index 031dee37..6cff2cbe 100644
--- a/plugins/serializers/graphite/README.md
+++ b/plugins/serializers/graphite/README.md
@@ -3,7 +3,7 @@
 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][templates]) is used.
+method is used, otherwise the [Template Pattern](templates) is used.
 
 ### Configuration
 
@@ -45,7 +45,4 @@ 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
 ```
 
-#### templates
-
-Consult the [Template Patterns](/docs/TEMPLATE_PATTERN.md) documentation for
-details.
+[templates]: /docs/TEMPLATE_PATTERN.md

From 146a30e065b03789ded3d72cce52bbb9defd1044 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 21 Sep 2018 13:23:46 -0700
Subject: [PATCH 811/835] Clarify output format for splunkmetric

---
 plugins/serializers/splunkmetric/README.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/plugins/serializers/splunkmetric/README.md b/plugins/serializers/splunkmetric/README.md
index e00286e5..552b90ea 100644
--- a/plugins/serializers/splunkmetric/README.md
+++ b/plugins/serializers/splunkmetric/README.md
@@ -1,12 +1,11 @@
 # Splunk Metrics serializer
 
-This serializer formats and outputs the metric data in a format that can be consumed by a Splunk metrics index.
-It can be used to write to a file using the file output, or for sending metrics to a HEC using the standard telegraf HTTP output.
+The Splunk Metrics serializer outputs metrics in the [Splunk metric HEC JSON format][splunk-format].
 
+It can be used to write to a file using the file output, or for sending metrics to a HEC using the standard telegraf HTTP output.
 If you're using the HTTP output, this serializer knows how to batch the metrics so you don't end up with an HTTP POST per metric.
 
-Th data is output in a format that conforms to the specified Splunk HEC JSON format as found here:
-[Send metrics in JSON format](http://dev.splunk.com/view/event-collector/SP-CAAAFDN).
+[splunk-format]: http://dev.splunk.com/view/event-collector/SP-CAAAFDN#json
 
 An example event looks like:
 ```javascript

From 4c9c31c34fb92335bea0dc8fd464769aab1e3906 Mon Sep 17 00:00:00 2001
From: Greg <g2linton@gmail.com>
Date: Fri, 21 Sep 2018 15:47:41 -0700
Subject: [PATCH 812/835] Fix panic if JSONNameKey is not found (#4735)

---
 plugins/parsers/json/README.md |  4 ++--
 plugins/parsers/json/parser.go | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/plugins/parsers/json/README.md b/plugins/parsers/json/README.md
index fa0d767f..e1fce555 100644
--- a/plugins/parsers/json/README.md
+++ b/plugins/parsers/json/README.md
@@ -108,7 +108,7 @@ Config:
   files = ["example"]
   name_key = "name"
   tag_keys = ["my_tag_1"]
-  string_fields = ["my_field"]
+  string_fields = ["b_my_field"]
   data_format = "json"
 ```
 
@@ -127,7 +127,7 @@ Input:
 
 Output:
 ```
-my_json,my_tag_1=foo a=5,b_c=6,my_field="description"
+my_json,my_tag_1=foo a=5,b_c=6,b_my_field="description"
 ```
 
 #### Arrays
diff --git a/plugins/parsers/json/parser.go b/plugins/parsers/json/parser.go
index 697296a1..1d8ce2d0 100644
--- a/plugins/parsers/json/parser.go
+++ b/plugins/parsers/json/parser.go
@@ -5,6 +5,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"log"
+	"math"
+	"regexp"
 	"strconv"
 	"strings"
 	"time"
@@ -13,8 +15,6 @@ import (
 	"github.com/influxdata/telegraf/metric"
 	"github.com/pkg/errors"
 	"github.com/tidwall/gjson"
-	"math"
-	"regexp"
 )
 
 var (
@@ -94,7 +94,6 @@ func parseUnixTimestamp(jsonValue interface{}, format string) (time.Time, error)
 }
 
 func (p *JSONParser) parseObject(metrics []telegraf.Metric, jsonOut map[string]interface{}) ([]telegraf.Metric, error) {
-
 	tags := make(map[string]string)
 	for k, v := range p.DefaultTags {
 		tags[k] = v
@@ -108,7 +107,10 @@ func (p *JSONParser) parseObject(metrics []telegraf.Metric, jsonOut map[string]i
 
 	//checks if json_name_key is set
 	if p.JSONNameKey != "" {
-		p.MetricName = f.Fields[p.JSONNameKey].(string)
+		switch field := f.Fields[p.JSONNameKey].(type) {
+		case string:
+			p.MetricName = field
+		}
 	}
 
 	//if time key is specified, set it to nTime

From 54b7262228f53d1b5eace9c8ff907714a94166de Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 21 Sep 2018 16:11:36 -0700
Subject: [PATCH 813/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 019e802f..cd02a3d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## v1.8 [unreleased]
+## v1.8 [2018-09-21]
 
 ### New Inputs
 

From 1a437e5690af31646eb42e7dd010645f74f60816 Mon Sep 17 00:00:00 2001
From: JP Mens <jp@mens.de>
Date: Mon, 24 Sep 2018 21:13:36 +0200
Subject: [PATCH 814/835] Clarify monitoring backend provenance (#4739)

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

diff --git a/plugins/inputs/openldap/README.md b/plugins/inputs/openldap/README.md
index 619e845c..48f29cb6 100644
--- a/plugins/inputs/openldap/README.md
+++ b/plugins/inputs/openldap/README.md
@@ -4,7 +4,7 @@ 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.
+To use this plugin you must enable the [slapd monitoring](https://www.openldap.org/devel/admin/monitoringslapd.html) backend.
 
 ```toml
 [[inputs.openldap]]

From 05c9197aafc4e71657ff43f906cfd67c5ca936cb Mon Sep 17 00:00:00 2001
From: JP Mens <jp@mens.de>
Date: Mon, 24 Sep 2018 22:41:12 +0200
Subject: [PATCH 815/835] Fix grammar in exec input readme (#4740)

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

diff --git a/plugins/inputs/exec/README.md b/plugins/inputs/exec/README.md
index 788c8eec..f4e91724 100644
--- a/plugins/inputs/exec/README.md
+++ b/plugins/inputs/exec/README.md
@@ -40,7 +40,7 @@ This script produces static values, since no timestamp is specified the values a
 echo 'example,tag1=a,tag2=b i=42i,j=43i,k=44i'
 ```
 
-It can be paired with the following configuration and will be ran at the `interval` of the agent.
+It can be paired with the following configuration and will be run at the `interval` of the agent.
 ```toml
 [[inputs.exec]]
   commands = ["sh /tmp/test.sh"]

From f72e52528d1edf757a068c059fcebf23ad27f29f Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 24 Sep 2018 15:35:12 -0700
Subject: [PATCH 816/835] Fix dep check errors in Gopkg.lock

---
 Gopkg.lock | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index cb633811..80a6277b 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -130,7 +130,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:5a5f28fcfe3a74247733a31ceaac0e53bfc2723e43c596b2e3f110eda9378575"
+  digest = "1:0828d8c0f95689f832cf348fe23827feb7640cd698d612ef59e2f9d041f54c68"
   name = "github.com/apache/thrift"
   packages = ["lib/go/thrift"]
   pruneopts = ""
@@ -276,7 +276,7 @@
   revision = "edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
 
 [[projects]]
-  digest = "1:d2ca9295cce7d0e7b26b498c6b59ff903d8315e8ead97f0f6cadf9e7d613e1e8"
+  digest = "1:d149605f1b00713fdc48150122892d77d49d30c825f690dd92f497aeb6cf18f5"
   name = "github.com/docker/docker"
   packages = [
     "api",
@@ -517,7 +517,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:e1c91a91cc738cebecbf12fc98f554f6f932c8b97e2052ad63ea43948df5bcb0"
+  digest = "1:ff65bf6fc4d1116f94ac305342725c21b55c16819c2606adc8f527755716937f"
   name = "github.com/hashicorp/go-rootcerts"
   packages = ["."]
   pruneopts = ""
@@ -1320,7 +1320,6 @@
     "github.com/aws/aws-sdk-go/aws/session",
     "github.com/aws/aws-sdk-go/service/cloudwatch",
     "github.com/aws/aws-sdk-go/service/kinesis",
-    "github.com/aws/aws-sdk-go/service/sts",
     "github.com/bsm/sarama-cluster",
     "github.com/couchbase/go-couchbase",
     "github.com/denisenkom/go-mssqldb",
@@ -1359,6 +1358,7 @@
     "github.com/nsqio/go-nsq",
     "github.com/openzipkin/zipkin-go-opentracing",
     "github.com/openzipkin/zipkin-go-opentracing/thrift/gen-go/zipkincore",
+    "github.com/pkg/errors",
     "github.com/prometheus/client_golang/prometheus",
     "github.com/prometheus/client_golang/prometheus/promhttp",
     "github.com/prometheus/client_model/go",
@@ -1380,9 +1380,13 @@
     "github.com/tidwall/gjson",
     "github.com/vjeantet/grok",
     "github.com/vmware/govmomi",
+    "github.com/vmware/govmomi/object",
     "github.com/vmware/govmomi/performance",
+    "github.com/vmware/govmomi/session",
     "github.com/vmware/govmomi/simulator",
     "github.com/vmware/govmomi/view",
+    "github.com/vmware/govmomi/vim25",
+    "github.com/vmware/govmomi/vim25/methods",
     "github.com/vmware/govmomi/vim25/mo",
     "github.com/vmware/govmomi/vim25/soap",
     "github.com/vmware/govmomi/vim25/types",

From 69f6612c2a427d90ef3799b7dd4edc52366dbec7 Mon Sep 17 00:00:00 2001
From: Tracy Boggiano <tracy@tracyboggiano.com>
Date: Wed, 26 Sep 2018 22:02:29 -0400
Subject: [PATCH 817/835] Fix hardware_type may be truncated in sqlserver input
 (#4750)

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

diff --git a/plugins/inputs/sqlserver/sqlserver.go b/plugins/inputs/sqlserver/sqlserver.go
index a4b5fc70..bf1fb9af 100644
--- a/plugins/inputs/sqlserver/sqlserver.go
+++ b/plugins/inputs/sqlserver/sqlserver.go
@@ -393,7 +393,7 @@ const sqlServerPropertiesV2 = `DECLARE @sys_info TABLE (
 	server_memory BIGINT,
 	sku NVARCHAR(64),
 	engine_edition SMALLINT,
-	hardware_type VARCHAR(15),
+	hardware_type VARCHAR(16),
 	total_storage_mb BIGINT,
 	available_storage_mb BIGINT,
 	uptime INT

From 74e9d1f078775b20ebbb10f0030b2abecc335e8d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 26 Sep 2018 19:04:21 -0700
Subject: [PATCH 818/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd02a3d3..79f90656 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## v1.8.1 [unreleased]
+
+### Bugfixes
+
+- [#4750](https://github.com/influxdata/telegraf/pull/4750): Fix hardware_type may be truncated in sqlserver input.
+
 ## v1.8 [2018-09-21]
 
 ### New Inputs

From 38e5e103ceff8494e0ab8339ac5bfdb42c15ba3f Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 26 Sep 2018 19:05:55 -0700
Subject: [PATCH 819/835] Clarify platform support for temp input (#4756)

---
 plugins/inputs/temp/README.md | 29 +++++++++++++----------------
 plugins/inputs/temp/temp.go   |  4 ++++
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/plugins/inputs/temp/README.md b/plugins/inputs/temp/README.md
index 87f365ca..873a7328 100644
--- a/plugins/inputs/temp/README.md
+++ b/plugins/inputs/temp/README.md
@@ -1,6 +1,9 @@
 # Temp Input plugin
 
-This input plugin collect temperature.
+The temp input plugin gather metrics on system temperature.  This plugin is
+meant to be multi platform and uses platform specific collection methods.
+
+Currently supports Linux and Windows.
 
 ### Configuration:
 
@@ -8,25 +11,19 @@ This input plugin collect temperature.
 [[inputs.temp]]
 ```
 
-### Measurements & Fields:
+### Metrics:
 
-All fields are float64.
-
-- temp ( unit: °Celsius)
-
-### Tags:
-
-- All measurements have the following tags:
-    - host
+- temp
+  - tags:
     - sensor
+  - fields:
+    - temp (float, celcius)
 
 ### Example Output:
 
 ```
-$ ./telegraf --config telegraf.conf --input-filter temp --test
-* Plugin: temp, Collection 1
-> temp,host=localhost,sensor=coretemp_physicalid0_crit temp=100 1531298763000000000
-> temp,host=localhost,sensor=coretemp_physicalid0_critalarm temp=0 1531298763000000000
-> temp,host=localhost,sensor=coretemp_physicalid0_input temp=100 1531298763000000000
-> temp,host=localhost,sensor=coretemp_physicalid0_max temp=100 1531298763000000000
+temp,sensor=coretemp_physicalid0_crit temp=100 1531298763000000000
+temp,sensor=coretemp_physicalid0_critalarm temp=0 1531298763000000000
+temp,sensor=coretemp_physicalid0_input temp=100 1531298763000000000
+temp,sensor=coretemp_physicalid0_max temp=100 1531298763000000000
 ```
diff --git a/plugins/inputs/temp/temp.go b/plugins/inputs/temp/temp.go
index 10e61673..baf647b5 100644
--- a/plugins/inputs/temp/temp.go
+++ b/plugins/inputs/temp/temp.go
@@ -2,6 +2,7 @@ package temp
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
@@ -25,6 +26,9 @@ func (t *Temperature) SampleConfig() string {
 func (t *Temperature) Gather(acc telegraf.Accumulator) error {
 	temps, err := t.ps.Temperature()
 	if err != nil {
+		if strings.Contains(err.Error(), "not implemented yet") {
+			return fmt.Errorf("plugin is not supported on this platform: %v", err)
+		}
 		return fmt.Errorf("error getting temperatures info: %s", err)
 	}
 	for _, temp := range temps {

From 54e61aa78aab4b49a1ba17bbba4a606111cd4274 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 26 Sep 2018 19:08:46 -0700
Subject: [PATCH 820/835] Use FieldList in basicstats to improve performance
 (#4741)

---
 plugins/aggregators/basicstats/basicstats.go | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/plugins/aggregators/basicstats/basicstats.go b/plugins/aggregators/basicstats/basicstats.go
index 42b795ab..701cd8a8 100644
--- a/plugins/aggregators/basicstats/basicstats.go
+++ b/plugins/aggregators/basicstats/basicstats.go
@@ -72,9 +72,9 @@ func (m *BasicStats) Add(in telegraf.Metric) {
 			tags:   in.Tags(),
 			fields: make(map[string]basicstats),
 		}
-		for k, v := range in.Fields() {
-			if fv, ok := convert(v); ok {
-				a.fields[k] = basicstats{
+		for _, field := range in.FieldList() {
+			if fv, ok := convert(field.Value); ok {
+				a.fields[field.Key] = basicstats{
 					count: 1,
 					min:   fv,
 					max:   fv,
@@ -86,11 +86,11 @@ func (m *BasicStats) Add(in telegraf.Metric) {
 		}
 		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 {
+		for _, field := range in.FieldList() {
+			if fv, ok := convert(field.Value); ok {
+				if _, ok := m.cache[id].fields[field.Key]; !ok {
 					// hit an uncached field of a cached metric
-					m.cache[id].fields[k] = basicstats{
+					m.cache[id].fields[field.Key] = basicstats{
 						count: 1,
 						min:   fv,
 						max:   fv,
@@ -101,7 +101,7 @@ func (m *BasicStats) Add(in telegraf.Metric) {
 					continue
 				}
 
-				tmp := m.cache[id].fields[k]
+				tmp := m.cache[id].fields[field.Key]
 				//https://en.m.wikipedia.org/wiki/Algorithms_for_calculating_variance
 				//variable initialization
 				x := fv
@@ -126,7 +126,7 @@ func (m *BasicStats) Add(in telegraf.Metric) {
 				//sum compute
 				tmp.sum += fv
 				//store final data
-				m.cache[id].fields[k] = tmp
+				m.cache[id].fields[field.Key] = tmp
 			}
 		}
 	}

From 358920e6bafa13d71727baab57af6d5e8a9fdf53 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 26 Sep 2018 19:09:53 -0700
Subject: [PATCH 821/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79f90656..4f75756e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### Bugfixes
 
 - [#4750](https://github.com/influxdata/telegraf/pull/4750): Fix hardware_type may be truncated in sqlserver input.
+- [#4723](https://github.com/influxdata/telegraf/issues/4723): Improve performance in basicstats aggregator.
 
 ## v1.8 [2018-09-21]
 

From a086ea6989cbbec69591e22560e2384dc181b047 Mon Sep 17 00:00:00 2001
From: Lee Jaeyong <lastiverse@gmail.com>
Date: Thu, 27 Sep 2018 11:15:38 +0900
Subject: [PATCH 822/835] Use time.AfterFunc to avoid need for goroutine in
 WaitTimeout (#4702)

---
 internal/internal.go | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/internal/internal.go b/internal/internal.go
index adc4df82..f7d75dfb 100644
--- a/internal/internal.go
+++ b/internal/internal.go
@@ -153,22 +153,24 @@ func RunTimeout(c *exec.Cmd, timeout time.Duration) error {
 // It assumes the command has already been started.
 // If the command times out, it attempts to kill the process.
 func WaitTimeout(c *exec.Cmd, timeout time.Duration) error {
-	timer := time.NewTimer(timeout)
-	done := make(chan error)
-	go func() { done <- c.Wait() }()
-	select {
-	case err := <-done:
-		timer.Stop()
-		return err
-	case <-timer.C:
-		if err := c.Process.Kill(); err != nil {
+	timer := time.AfterFunc(timeout, func() {
+		err := c.Process.Kill()
+		if err != nil {
 			log.Printf("E! FATAL error killing process: %s", err)
-			return err
+			return
 		}
-		// wait for the command to return after killing it
-		<-done
+	})
+
+	err := c.Wait()
+	isTimeout := timer.Stop()
+
+	if err != nil {
+		return err
+	} else if isTimeout == false {
 		return TimeoutErr
 	}
+
+	return err
 }
 
 // RandomSleep will sleep for a random amount of time up to max.

From a21524c6b33d6a24d7a31b5c80124239a4c81553 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Onur=20G=C3=BCzel?= <guzelmu@gmail.com>
Date: Thu, 27 Sep 2018 05:16:39 +0300
Subject: [PATCH 823/835] Add hostname to TLS config for SNI support (#4747)

---
 plugins/inputs/x509_cert/x509_cert.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/inputs/x509_cert/x509_cert.go b/plugins/inputs/x509_cert/x509_cert.go
index 252b60e1..affd3fa0 100644
--- a/plugins/inputs/x509_cert/x509_cert.go
+++ b/plugins/inputs/x509_cert/x509_cert.go
@@ -80,6 +80,7 @@ func (c *X509Cert) getCert(location string, timeout time.Duration) ([]*x509.Cert
 		}
 		defer ipConn.Close()
 
+		tlsCfg.ServerName = u.Host
 		conn := tls.Client(ipConn, tlsCfg)
 		defer conn.Close()
 

From d70c80722de83e193aa8b80a3e37a312a0cff428 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 26 Sep 2018 19:17:55 -0700
Subject: [PATCH 824/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f75756e..69c817dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - [#4750](https://github.com/influxdata/telegraf/pull/4750): Fix hardware_type may be truncated in sqlserver input.
 - [#4723](https://github.com/influxdata/telegraf/issues/4723): Improve performance in basicstats aggregator.
+- [#4747](https://github.com/influxdata/telegraf/pull/4723): Add hostname to TLS config for SNI support.
 
 ## v1.8 [2018-09-21]
 

From 2e2e998ebdcca812c4337042adccf285871ed0f5 Mon Sep 17 00:00:00 2001
From: Greg <g2linton@gmail.com>
Date: Wed, 26 Sep 2018 20:26:23 -0600
Subject: [PATCH 825/835] Don't add tags with empty values to opentsdb output
 (#4751)

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

diff --git a/plugins/outputs/opentsdb/opentsdb.go b/plugins/outputs/opentsdb/opentsdb.go
index 964b1768..1dfd2ce3 100644
--- a/plugins/outputs/opentsdb/opentsdb.go
+++ b/plugins/outputs/opentsdb/opentsdb.go
@@ -213,7 +213,10 @@ 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[sanitize(k)] = sanitize(v)
+		val := sanitize(v)
+		if val != "" {
+			tagSet[sanitize(k)] = val
+		}
 	}
 	return tagSet
 }

From 0a8301ec3c9a9f04709114fe65d4b8a5e54d1784 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 26 Sep 2018 19:27:31 -0700
Subject: [PATCH 826/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69c817dd..04d40576 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - [#4750](https://github.com/influxdata/telegraf/pull/4750): Fix hardware_type may be truncated in sqlserver input.
 - [#4723](https://github.com/influxdata/telegraf/issues/4723): Improve performance in basicstats aggregator.
 - [#4747](https://github.com/influxdata/telegraf/pull/4723): Add hostname to TLS config for SNI support.
+- [#4675](https://github.com/influxdata/telegraf/issues/4675): Don't add tags with empty values to opentsdb output.
 
 ## v1.8 [2018-09-21]
 

From 8cbd39501ba01ca30fa56cfefde03aa756b19ec9 Mon Sep 17 00:00:00 2001
From: Bo Zhao <bzhao@lyft.com>
Date: Wed, 26 Sep 2018 19:30:02 -0700
Subject: [PATCH 827/835] Add replace function to strings processor (#4686)

---
 plugins/processors/strings/README.md       | 18 ++++++
 plugins/processors/strings/strings.go      | 74 ++++++++++++++++------
 plugins/processors/strings/strings_test.go | 49 ++++++++++++++
 3 files changed, 122 insertions(+), 19 deletions(-)

diff --git a/plugins/processors/strings/README.md b/plugins/processors/strings/README.md
index f1e7361f..06bffaee 100644
--- a/plugins/processors/strings/README.md
+++ b/plugins/processors/strings/README.md
@@ -10,11 +10,14 @@ Implemented functions are:
 - trim_right
 - trim_prefix
 - trim_suffix
+- replace
 
 Please note that in this implementation these are processed in the order that they appear above.
 
 Specify the `measurement`, `tag` or `field` that you want processed in each section and optionally a `dest` if you want the result stored in a new tag or field. You can specify lots of transformations on data with a single strings processor.
 
+If you'd like to apply the change to every `tag`, `field`, or `measurement`, use the value "*" for each respective field. Note that the `dest` field will be ignored if "*" is used
+
 ### Configuration:
 
 ```toml
@@ -45,6 +48,11 @@ Specify the `measurement`, `tag` or `field` that you want processed in each sect
   # [[processors.strings.trim_suffix]]
   #   field = "read_count"
   #   suffix = "_count"
+
+  # [[processors.strings.replace]]
+  #   measurement = "*"
+  #   old = ":"
+  #   new = "_"
 ```
 
 #### Trim, TrimLeft, TrimRight
@@ -56,6 +64,16 @@ The `trim`, `trim_left`, and `trim_right` functions take an optional parameter:
 The `trim_prefix` and `trim_suffix` functions remote the given `prefix` or `suffix`
 respectively from the string.
 
+#### Replace
+
+The `replace` function does a substring replacement across the entire
+string to allow for different conventions between various input and output
+plugins. Some example usages are eliminating disallowed characters in
+field names or replacing separators between different separators.
+Can also be used to eliminate unneeded chars that were in metrics.
+If the entire name would be deleted, it will refuse to perform
+the operation and keep the old name.
+
 ### Example
 **Config**
 ```toml
diff --git a/plugins/processors/strings/strings.go b/plugins/processors/strings/strings.go
index 8e68dbc5..69e89f02 100644
--- a/plugins/processors/strings/strings.go
+++ b/plugins/processors/strings/strings.go
@@ -16,6 +16,7 @@ type Strings struct {
 	TrimRight  []converter `toml:"trim_right"`
 	TrimPrefix []converter `toml:"trim_prefix"`
 	TrimSuffix []converter `toml:"trim_suffix"`
+	Replace    []converter `toml:"replace"`
 
 	converters []converter
 	init       bool
@@ -31,6 +32,8 @@ type converter struct {
 	Cutset      string
 	Suffix      string
 	Prefix      string
+	Old         string
+	New         string
 
 	fn ConvertFunc
 }
@@ -68,6 +71,12 @@ const sampleConfig = `
   # [[processors.strings.trim_suffix]]
   #   field = "read_count"
   #   suffix = "_count"
+
+  ## Replace substrings within field names
+  # [[processors.strings.trim_suffix]]
+  #   measurement = "*"
+  #   old = ":"
+  #   new = "_"
 `
 
 func (s *Strings) SampleConfig() string {
@@ -79,37 +88,53 @@ func (s *Strings) Description() string {
 }
 
 func (c *converter) convertTag(metric telegraf.Metric) {
-	tv, ok := metric.GetTag(c.Tag)
-	if !ok {
-		return
+	var tags map[string]string
+	if c.Tag == "*" {
+		tags = metric.Tags()
+	} else {
+		tags = make(map[string]string)
+		tv, ok := metric.GetTag(c.Tag)
+		if !ok {
+			return
+		}
+		tags[c.Tag] = tv
 	}
 
-	dest := c.Tag
-	if c.Dest != "" {
-		dest = c.Dest
+	for tag, value := range tags {
+		dest := tag
+		if c.Tag != "*" && c.Dest != "" {
+			dest = c.Dest
+		}
+		metric.AddTag(dest, c.fn(value))
 	}
-
-	metric.AddTag(dest, c.fn(tv))
 }
 
 func (c *converter) convertField(metric telegraf.Metric) {
-	fv, ok := metric.GetField(c.Field)
-	if !ok {
-		return
+	var fields map[string]interface{}
+	if c.Field == "*" {
+		fields = metric.Fields()
+	} else {
+		fields = make(map[string]interface{})
+		fv, ok := metric.GetField(c.Field)
+		if !ok {
+			return
+		}
+		fields[c.Field] = fv
 	}
 
-	dest := c.Field
-	if c.Dest != "" {
-		dest = c.Dest
-	}
-
-	if fv, ok := fv.(string); ok {
-		metric.AddField(dest, c.fn(fv))
+	for tag, value := range fields {
+		dest := tag
+		if c.Tag != "*" && c.Dest != "" {
+			dest = c.Dest
+		}
+		if fv, ok := value.(string); ok {
+			metric.AddField(dest, c.fn(fv))
+		}
 	}
 }
 
 func (c *converter) convertMeasurement(metric telegraf.Metric) {
-	if metric.Name() != c.Measurement {
+	if metric.Name() != c.Measurement && c.Measurement != "*" {
 		return
 	}
 
@@ -176,6 +201,17 @@ func (s *Strings) initOnce() {
 		c.fn = func(s string) string { return strings.TrimSuffix(s, c.Suffix) }
 		s.converters = append(s.converters, c)
 	}
+	for _, c := range s.Replace {
+		c.fn = func(s string) string {
+			newString := strings.Replace(s, c.Old, c.New, -1)
+			if newString == "" {
+				return s
+			} else {
+				return newString
+			}
+		}
+		s.converters = append(s.converters, c)
+	}
 
 	s.init = true
 }
diff --git a/plugins/processors/strings/strings_test.go b/plugins/processors/strings/strings_test.go
index 2097ac5a..a4a16d7d 100644
--- a/plugins/processors/strings/strings_test.go
+++ b/plugins/processors/strings/strings_test.go
@@ -481,3 +481,52 @@ func TestReadmeExample(t *testing.T) {
 	assert.Equal(t, expectedFields, processed[0].Fields())
 	assert.Equal(t, expectedTags, processed[0].Tags())
 }
+
+func newMetric(name string) telegraf.Metric {
+	tags := map[string]string{}
+	fields := map[string]interface{}{}
+	m, _ := metric.New(name, tags, fields, time.Now())
+	return m
+}
+
+func TestMeasurementReplace(t *testing.T) {
+	plugin := &Strings{
+		Replace: []converter{
+			converter{
+				Old:         "_",
+				New:         "-",
+				Measurement: "*",
+			},
+		},
+	}
+	metrics := []telegraf.Metric{
+		newMetric("foo:some_value:bar"),
+		newMetric("average:cpu:usage"),
+		newMetric("average_cpu_usage"),
+	}
+	results := plugin.Apply(metrics...)
+	assert.Equal(t, "foo:some-value:bar", results[0].Name(), "`_` was not changed to `-`")
+	assert.Equal(t, "average:cpu:usage", results[1].Name(), "Input name should have been unchanged")
+	assert.Equal(t, "average-cpu-usage", results[2].Name(), "All instances of `_` should have been changed to `-`")
+}
+
+func TestMeasurementCharDeletion(t *testing.T) {
+	plugin := &Strings{
+		Replace: []converter{
+			converter{
+				Old:         "foo",
+				New:         "",
+				Measurement: "*",
+			},
+		},
+	}
+	metrics := []telegraf.Metric{
+		newMetric("foo:bar:baz"),
+		newMetric("foofoofoo"),
+		newMetric("barbarbar"),
+	}
+	results := plugin.Apply(metrics...)
+	assert.Equal(t, ":bar:baz", results[0].Name(), "Should have deleted the initial `foo`")
+	assert.Equal(t, "foofoofoo", results[1].Name(), "Should have refused to delete the whole string")
+	assert.Equal(t, "barbarbar", results[2].Name(), "Should not have changed the input")
+}

From c47a75ae53f162b99365d540e7306d9f2e0e839a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 26 Sep 2018 19:31:43 -0700
Subject: [PATCH 828/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04d40576..43a97dfa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## v1.9 [unreleased]
+
+### Features
+
+- [#4686](https://github.com/influxdata/telegraf/pull/4686): Add replace function to strings processor.
+
 ## v1.8.1 [unreleased]
 
 ### Bugfixes

From af0ef55c0281af67fe2db52d8c700fa8f636010e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 27 Sep 2018 10:10:27 -0700
Subject: [PATCH 829/835] Fix license type for go-ole

---
 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 f5496fc2..2333650f 100644
--- a/docs/LICENSE_OF_DEPENDENCIES.md
+++ b/docs/LICENSE_OF_DEPENDENCIES.md
@@ -37,7 +37,7 @@ following works:
 - 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-ole/go-ole [MIT](https://github.com/go-ole/go-ole/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)

From 7d97ae64218c63d3960121173c57bda3ec929253 Mon Sep 17 00:00:00 2001
From: Lee Jaeyong <lastiverse@gmail.com>
Date: Fri, 28 Sep 2018 09:26:36 +0900
Subject: [PATCH 830/835] Query servers in parallel in dns_query input (#4754)

---
 plugins/inputs/dns_query/dns_query.go | 40 +++++++++++++++------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/plugins/inputs/dns_query/dns_query.go b/plugins/inputs/dns_query/dns_query.go
index 98fcc09c..ec524d95 100644
--- a/plugins/inputs/dns_query/dns_query.go
+++ b/plugins/inputs/dns_query/dns_query.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"net"
 	"strconv"
+	"sync"
 	"time"
 
 	"github.com/miekg/dns"
@@ -70,32 +71,37 @@ func (d *DnsQuery) Description() string {
 	return "Query given DNS server and gives statistics"
 }
 func (d *DnsQuery) Gather(acc telegraf.Accumulator) error {
+	var wg sync.WaitGroup
 	d.setDefaultValues()
 
 	for _, domain := range d.Domains {
 		for _, server := range d.Servers {
-			fields := make(map[string]interface{}, 2)
-			tags := map[string]string{
-				"server":      server,
-				"domain":      domain,
-				"record_type": d.RecordType,
-			}
+			wg.Add(1)
+			go func(domain, server string) {
+				fields := make(map[string]interface{}, 2)
+				tags := map[string]string{
+					"server":      server,
+					"domain":      domain,
+					"record_type": d.RecordType,
+				}
 
-			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)
-			}
+				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)
+				acc.AddFields("dns_query", fields, tags)
+			}(domain, server)
 		}
 	}
 
+	wg.Wait()
 	return nil
 }
 

From c369c1989f541ac0e7c76d5c7610de0cf5f940ee Mon Sep 17 00:00:00 2001
From: Pontus Rydin <prydin@vmware.com>
Date: Thu, 27 Sep 2018 20:29:17 -0400
Subject: [PATCH 831/835] Fix panic during network error in vsphere input
 (#4765)

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

diff --git a/plugins/inputs/vsphere/endpoint.go b/plugins/inputs/vsphere/endpoint.go
index cad4dec0..22b479a5 100644
--- a/plugins/inputs/vsphere/endpoint.go
+++ b/plugins/inputs/vsphere/endpoint.go
@@ -661,7 +661,7 @@ func (e *Endpoint) collectResource(ctx context.Context, resourceType string, acc
 	err := make(multiError, 0)
 	wp.Drain(ctx, func(ctx context.Context, in interface{}) bool {
 		if in != nil {
-			mux.Unlock()
+			mux.Lock()
 			defer mux.Unlock()
 			err = append(err, in.(error))
 			return false

From 008ee617cb6959b61a2dea35d4ab2de35f74541d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 27 Sep 2018 17:55:31 -0700
Subject: [PATCH 832/835] Update changelog.

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 43a97dfa..f8d3aa62 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### Features
 
 - [#4686](https://github.com/influxdata/telegraf/pull/4686): Add replace function to strings processor.
+- [#4754](https://github.com/influxdata/telegraf/pull/4754): Query servers in parallel in dns_query input.
 
 ## v1.8.1 [unreleased]
 
@@ -12,6 +13,7 @@
 - [#4723](https://github.com/influxdata/telegraf/issues/4723): Improve performance in basicstats aggregator.
 - [#4747](https://github.com/influxdata/telegraf/pull/4723): Add hostname to TLS config for SNI support.
 - [#4675](https://github.com/influxdata/telegraf/issues/4675): Don't add tags with empty values to opentsdb output.
+- [#4765](https://github.com/influxdata/telegraf/pull/4765): Fix panic during network error in vsphere input.
 
 ## v1.8 [2018-09-21]
 

From 6b7d64f1d6057f71e71a49648cec36049ae0532f Mon Sep 17 00:00:00 2001
From: Lee Jaeyong <lastiverse@gmail.com>
Date: Fri, 28 Sep 2018 10:41:24 +0900
Subject: [PATCH 833/835] Add ability to define a custom service name when
 installing as a Windows service (#4753)

---
 cmd/telegraf/telegraf.go  |  3 ++-
 docs/WINDOWS_SERVICE.md   | 10 ++++++++++
 internal/usage_windows.go |  4 ++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go
index 5b7295d6..93336ffb 100644
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -55,6 +55,7 @@ var fUsage = flag.String("usage", "",
 	"print usage for a plugin, ie, 'telegraf --usage mysql'")
 var fService = flag.String("service", "",
 	"operate on the service (windows only)")
+var fServiceName = flag.String("service-name", "telegraf", "service name (windows only)")
 var fRunAsConsole = flag.Bool("console", false, "run as console application (windows only)")
 
 var (
@@ -327,7 +328,7 @@ func main() {
 
 	if runtime.GOOS == "windows" && !(*fRunAsConsole) {
 		svcConfig := &service.Config{
-			Name:        "telegraf",
+			Name:        *fServiceName,
 			DisplayName: "Telegraf Data Collector Service",
 			Description: "Collects data using a series of plugins and publishes it to" +
 				"another series of plugins.",
diff --git a/docs/WINDOWS_SERVICE.md b/docs/WINDOWS_SERVICE.md
index 886887d5..51ce6a7a 100644
--- a/docs/WINDOWS_SERVICE.md
+++ b/docs/WINDOWS_SERVICE.md
@@ -46,6 +46,16 @@ 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     |
 
+## Install multiple services
+
+You can install multiple telegraf instances with --service-name flag:
+
+```
+   > C:\"Program Files"\Telegraf\telegraf.exe --service install --service-name telegraf-1
+   > C:\"Program Files"\Telegraf\telegraf.exe --service install --service-name telegraf-2
+   > C:\"Program Files"\Telegraf\telegraf.exe --service uninstall --service-name telegraf-1
+```
+
 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
diff --git a/internal/usage_windows.go b/internal/usage_windows.go
index db5e492a..0bdd7302 100644
--- a/internal/usage_windows.go
+++ b/internal/usage_windows.go
@@ -33,6 +33,7 @@ The commands & flags are:
 
   --console                      run as console application (windows only)
   --service <service>            operate on the service (windows only)
+  --service-name                 service name (windows only)
 
 Examples:
 
@@ -59,4 +60,7 @@ Examples:
 
   # install telegraf service
   telegraf --service install --config "C:\Program Files\Telegraf\telegraf.conf"
+
+  # install telegraf service with custom name
+  telegraf --service install --service-name=my-telegraf
 `

From cc64b14ab41d33844917c38c6374074f133029d1 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 27 Sep 2018 18:42:13 -0700
Subject: [PATCH 834/835] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f8d3aa62..5c517ab6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - [#4686](https://github.com/influxdata/telegraf/pull/4686): Add replace function to strings processor.
 - [#4754](https://github.com/influxdata/telegraf/pull/4754): Query servers in parallel in dns_query input.
+- [#4753](https://github.com/influxdata/telegraf/pull/4753): Add ability to define a custom service name when installing as a Windows service.
 
 ## v1.8.1 [unreleased]
 

From 7553c8fd1362618a11f04c5578e8c9feb4e9c73d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Fri, 28 Sep 2018 14:48:20 -0700
Subject: [PATCH 835/835] Remove metric recreation when filtering (#4767)

---
 agent/accumulator.go                       |  56 +++--
 agent/accumulator_test.go                  |  26 +-
 docs/CONFIGURATION.md                      | 127 +++++-----
 internal/config/config.go                  |  15 --
 internal/models/filter.go                  | 129 +++++-----
 internal/models/filter_test.go             | 176 ++++++++------
 internal/models/makemetric.go              |  80 ++----
 internal/models/running_aggregator.go      |  62 ++---
 internal/models/running_aggregator_test.go |  82 ++++---
 internal/models/running_input.go           |  37 ++-
 internal/models/running_input_test.go      |  98 ++++----
 internal/models/running_output.go          |  42 ++--
 internal/models/running_output_test.go     |  17 --
 internal/models/running_processor.go       |  18 +-
 internal/models/running_processor_test.go  | 268 ++++++++++++++-------
 15 files changed, 631 insertions(+), 602 deletions(-)

diff --git a/agent/accumulator.go b/agent/accumulator.go
index 51c213a8..05e99350 100644
--- a/agent/accumulator.go
+++ b/agent/accumulator.go
@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/metric"
 	"github.com/influxdata/telegraf/selfstat"
 )
 
@@ -14,13 +15,13 @@ var (
 
 type MetricMaker interface {
 	Name() string
-	MakeMetric(
-		measurement string,
-		fields map[string]interface{},
-		tags map[string]string,
-		mType telegraf.ValueType,
-		t time.Time,
-	) telegraf.Metric
+	MakeMetric(metric telegraf.Metric) telegraf.Metric
+}
+
+type accumulator struct {
+	maker     MetricMaker
+	metrics   chan telegraf.Metric
+	precision time.Duration
 }
 
 func NewAccumulator(
@@ -35,23 +36,13 @@ func NewAccumulator(
 	return &acc
 }
 
-type accumulator struct {
-	metrics chan telegraf.Metric
-
-	maker MetricMaker
-
-	precision time.Duration
-}
-
 func (ac *accumulator) AddFields(
 	measurement string,
 	fields map[string]interface{},
 	tags map[string]string,
 	t ...time.Time,
 ) {
-	if m := ac.maker.MakeMetric(measurement, fields, tags, telegraf.Untyped, ac.getTime(t)); m != nil {
-		ac.metrics <- m
-	}
+	ac.addMetric(measurement, tags, fields, telegraf.Untyped, t...)
 }
 
 func (ac *accumulator) AddGauge(
@@ -60,9 +51,7 @@ func (ac *accumulator) AddGauge(
 	tags map[string]string,
 	t ...time.Time,
 ) {
-	if m := ac.maker.MakeMetric(measurement, fields, tags, telegraf.Gauge, ac.getTime(t)); m != nil {
-		ac.metrics <- m
-	}
+	ac.addMetric(measurement, tags, fields, telegraf.Gauge, t...)
 }
 
 func (ac *accumulator) AddCounter(
@@ -71,9 +60,7 @@ func (ac *accumulator) AddCounter(
 	tags map[string]string,
 	t ...time.Time,
 ) {
-	if m := ac.maker.MakeMetric(measurement, fields, tags, telegraf.Counter, ac.getTime(t)); m != nil {
-		ac.metrics <- m
-	}
+	ac.addMetric(measurement, tags, fields, telegraf.Counter, t...)
 }
 
 func (ac *accumulator) AddSummary(
@@ -82,9 +69,7 @@ func (ac *accumulator) AddSummary(
 	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
-	}
+	ac.addMetric(measurement, tags, fields, telegraf.Summary, t...)
 }
 
 func (ac *accumulator) AddHistogram(
@@ -93,7 +78,21 @@ func (ac *accumulator) AddHistogram(
 	tags map[string]string,
 	t ...time.Time,
 ) {
-	if m := ac.maker.MakeMetric(measurement, fields, tags, telegraf.Histogram, ac.getTime(t)); m != nil {
+	ac.addMetric(measurement, tags, fields, telegraf.Histogram, t...)
+}
+
+func (ac *accumulator) addMetric(
+	measurement string,
+	tags map[string]string,
+	fields map[string]interface{},
+	tp telegraf.ValueType,
+	t ...time.Time,
+) {
+	m, err := metric.New(measurement, tags, fields, ac.getTime(t), tp)
+	if err != nil {
+		return
+	}
+	if m := ac.maker.MakeMetric(m); m != nil {
 		ac.metrics <- m
 	}
 }
@@ -105,7 +104,6 @@ func (ac *accumulator) AddError(err error) {
 		return
 	}
 	NErrors.Incr(1)
-	//TODO suppress/throttle consecutive duplicate errors?
 	log.Printf("E! Error in plugin [%s]: %s", ac.maker.Name(), err)
 }
 
diff --git a/agent/accumulator_test.go b/agent/accumulator_test.go
index 22fa3e40..2bb08920 100644
--- a/agent/accumulator_test.go
+++ b/agent/accumulator_test.go
@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/metric"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -134,26 +133,7 @@ type TestMetricMaker struct {
 func (tm *TestMetricMaker) Name() string {
 	return "TestPlugin"
 }
-func (tm *TestMetricMaker) MakeMetric(
-	measurement string,
-	fields map[string]interface{},
-	tags map[string]string,
-	mType telegraf.ValueType,
-	t time.Time,
-) telegraf.Metric {
-	switch mType {
-	case telegraf.Untyped:
-		if m, err := metric.New(measurement, tags, fields, t); err == nil {
-			return m
-		}
-	case telegraf.Counter:
-		if m, err := metric.New(measurement, tags, fields, t, telegraf.Counter); err == nil {
-			return m
-		}
-	case telegraf.Gauge:
-		if m, err := metric.New(measurement, tags, fields, t, telegraf.Gauge); err == nil {
-			return m
-		}
-	}
-	return nil
+
+func (tm *TestMetricMaker) MakeMetric(metric telegraf.Metric) telegraf.Metric {
+	return metric
 }
diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md
index 39825376..0698721e 100644
--- a/docs/CONFIGURATION.md
+++ b/docs/CONFIGURATION.md
@@ -1,11 +1,14 @@
-# Telegraf Configuration
+# Configuration
 
-You can see the latest config file with all available plugins here:
-[telegraf.conf](https://github.com/influxdata/telegraf/blob/master/etc/telegraf.conf)
+Telegraf's configuration file is written using
+[TOML](https://github.com/toml-lang/toml#toml).
+
+[View the telegraf.conf config file with all available
+plugins](/etc/telegraf.conf).
 
 ## Generating a Configuration File
 
-A default Telegraf config file can be auto-generated by telegraf:
+A default config file can be generated by telegraf:
 
 ```
 telegraf config > telegraf.conf
@@ -18,7 +21,7 @@ To generate a file with specific inputs and outputs, you can use the
 telegraf --input-filter cpu:mem:net:swap --output-filter influxdb:kafka config
 ```
 
-## Environment Variables
+### Environment Variables
 
 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"),
@@ -27,7 +30,7 @@ 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
+### Configuration file locations
 
 The location of the configuration file can be set via the `--config` command
 line flag.
@@ -40,13 +43,13 @@ 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
 
 Global tags can be specified in the `[global_tags]` section of the config file
 in key="value" format. All metrics being gathered on this host will be tagged
 with the tags specified here.
 
-## Agent Configuration
+### Agent Configuration
 
 Telegraf has a few options you can configure under the `[agent]` section of the
 config.
@@ -85,7 +88,7 @@ ie, a jitter of 5s and flush_interval 10s means flushes will happen every 10-15s
 * **hostname**: Override default hostname, if empty use os.Hostname().
 * **omit_hostname**: If true, do no set the "host" tag in the telegraf agent.
 
-## Input Configuration
+### Input Configuration
 
 The following config parameters are available for all inputs:
 
@@ -98,15 +101,15 @@ 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.
+The [metric filtering](#metric-filtering) parameters can be used to limit what metrics are
+emitted from the input plugin.
 
-## Output Configuration
+### Output Configuration
 
-The [measurement filtering](#measurement-filtering) parameters can be used to
-limit what metrics are emitted from the output plugin.
+The [metric filtering](#metric-filtering) parameters can be used to limit what metrics are
+emitted from the output plugin.
 
-## Aggregator Configuration
+### Aggregator Configuration
 
 The following config parameters are available for all aggregators:
 
@@ -125,63 +128,77 @@ 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 can be used to
-limit what metrics are handled by the aggregator.  Excluded metrics are passed
-downstream to the next aggregator.
+The [metric filtering](#metric-filtering) parameters can be used to limit what metrics are
+handled by the aggregator.  Excluded metrics are passed downstream to the next
+aggregator.
 
-## Processor Configuration
+### Processor Configuration
 
 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) parameters can be used
-to limit what metrics are handled by the processor.  Excluded metrics are
-passed downstream to the next processor.
+The [metric filtering](#metric-filtering) parameters can be used to limit what metrics are
+handled by the processor.  Excluded metrics are passed downstream to the next
+processor.
 
-#### Measurement Filtering
+<a id="measurement-filtering"></a>
+### Metric Filtering
 
-Filters can be configured per input, output, processor, or aggregator,
-see below for examples.
+Metric filtering can be configured per plugin on any input, output, processor,
+and aggregator plugin.  Filters fall under two categories: Selectors and
+Modifiers.
 
-* **namepass**:
-An array of glob pattern strings.  Only points whose measurement name matches
+#### Selectors
+
+Selector filters include or exclude entire metrics.  When a metric is excluded
+from a Input or an Output plugin, the metric is dropped.  If a metric is
+excluded from a Processor or Aggregator plugin, it is skips the plugin and is
+sent onwards to the next stage of processing.
+
+- **namepass**:
+An array of glob pattern strings.  Only metrics 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.
-* **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.
-* **tagpass**:
-A table mapping tag keys to arrays of glob pattern strings.  Only points
+
+- **namedrop**:
+The inverse of `namepass`.  If a match is found the metric is discarded. This
+is tested on metrics after they have passed the `namepass` test.
+
+- **tagpass**:
+A table mapping tag keys to arrays of glob pattern strings.  Only metrics
 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**:
+
+- **tagdrop**:
+The inverse of `tagpass`.  If a match is found the metric is discarded. This
+is tested on metrics after they have passed the `tagpass` test.
+
+#### Modifiers
+
+Modifier filters remove tags and fields from a metric.  If all fields are
+removed the metric is removed.
+
+- **fieldpass**:
+An array of glob pattern strings.  Only fields whose field key matches a
+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 metric.  This is tested on metrics after
+they have passed the `fieldpass` 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**:
+metric based on its tag, `taginclude` removes all non matching tags from the
+metric.
+
+- **tagexclude**:
 The inverse of `taginclude`. Tags with a tag key matching one of the patterns
-will be discarded from the point.
+will be discarded from the metric.
 
-**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
+### Input Configuration Examples
 
 This is a full working config that will output CPU data to an InfluxDB instance
 at 192.168.59.103:8086, tagging measurements with dc="denver-1". It will output
diff --git a/internal/config/config.go b/internal/config/config.go
index d62536cf..3d051097 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -884,14 +884,6 @@ func (c *Config) addInput(name string, table *ast.Table) error {
 // builds the filter and returns a
 // models.AggregatorConfig to be inserted into models.RunningAggregator
 func buildAggregator(name string, tbl *ast.Table) (*models.AggregatorConfig, error) {
-	unsupportedFields := []string{"tagexclude", "taginclude"}
-	for _, field := range unsupportedFields {
-		if _, ok := tbl.Fields[field]; ok {
-			return nil, fmt.Errorf("%s is not supported for aggregator plugins (%s).",
-				field, name)
-		}
-	}
-
 	conf := &models.AggregatorConfig{
 		Name:   name,
 		Delay:  time.Millisecond * 100,
@@ -989,13 +981,6 @@ func buildAggregator(name string, tbl *ast.Table) (*models.AggregatorConfig, err
 // models.ProcessorConfig to be inserted into models.RunningProcessor
 func buildProcessor(name string, tbl *ast.Table) (*models.ProcessorConfig, error) {
 	conf := &models.ProcessorConfig{Name: name}
-	unsupportedFields := []string{"tagexclude", "taginclude", "fielddrop", "fieldpass"}
-	for _, field := range unsupportedFields {
-		if _, ok := tbl.Fields[field]; ok {
-			return nil, fmt.Errorf("%s is not supported for processor plugins (%s).",
-				field, name)
-		}
-	}
 
 	if node, ok := tbl.Fields["order"]; ok {
 		if kv, ok := node.(*ast.KeyValue); ok {
diff --git a/internal/models/filter.go b/internal/models/filter.go
index 2848ccf0..664a6ff0 100644
--- a/internal/models/filter.go
+++ b/internal/models/filter.go
@@ -3,6 +3,7 @@ package models
 import (
 	"fmt"
 
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/filter"
 )
 
@@ -93,45 +94,35 @@ func (f *Filter) Compile() error {
 	return nil
 }
 
-// Apply applies the filter to the given measurement name, fields map, and
-// tags map. It will return false if the metric should be "filtered out", and
-// true if the metric should "pass".
-// It will modify tags & fields in-place if they need to be deleted.
-func (f *Filter) Apply(
-	measurement string,
-	fields map[string]interface{},
-	tags map[string]string,
-) bool {
+// Select returns true if the metric matches according to the
+// namepass/namedrop and tagpass/tagdrop filters.  The metric is not modified.
+func (f *Filter) Select(metric telegraf.Metric) bool {
 	if !f.isActive {
 		return true
 	}
 
-	// check if the measurement name should pass
-	if !f.shouldNamePass(measurement) {
+	if !f.shouldNamePass(metric.Name()) {
 		return false
 	}
 
-	// check if the tags should pass
-	if !f.shouldTagsPass(tags) {
+	if !f.shouldTagsPass(metric.TagList()) {
 		return false
 	}
 
-	// filter fields
-	for fieldkey, _ := range fields {
-		if !f.shouldFieldPass(fieldkey) {
-			delete(fields, fieldkey)
-		}
-	}
-	if len(fields) == 0 {
-		return false
-	}
-
-	// filter tags
-	f.filterTags(tags)
-
 	return true
 }
 
+// Modify removes any tags and fields from the metric according to the
+// fieldpass/fielddrop and taginclude/tagexclude filters.
+func (f *Filter) Modify(metric telegraf.Metric) {
+	if !f.isActive {
+		return
+	}
+
+	f.filterFields(metric)
+	f.filterTags(metric)
+}
+
 // IsActive checking if filter is active
 func (f *Filter) IsActive() bool {
 	return f.isActive
@@ -140,7 +131,6 @@ 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 {
-
 	pass := func(f *Filter) bool {
 		if f.namePass.Match(key) {
 			return true
@@ -169,44 +159,29 @@ func (f *Filter) shouldNamePass(key string) bool {
 // 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 {
-
-	pass := func(f *Filter) bool {
-		if f.fieldPass.Match(key) {
-			return true
-		}
-		return false
-	}
-
-	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)
+		return f.fieldPass.Match(key) && !f.fieldDrop.Match(key)
 	} else if f.fieldPass != nil {
-		return pass(f)
+		return f.fieldPass.Match(key)
 	} else if f.fieldDrop != nil {
-		return drop(f)
+		return !f.fieldDrop.Match(key)
 	}
-
 	return true
 }
 
 // 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 {
-
+func (f *Filter) shouldTagsPass(tags []*telegraf.Tag) bool {
 	pass := func(f *Filter) bool {
 		for _, pat := range f.TagPass {
 			if pat.filter == nil {
 				continue
 			}
-			if tagval, ok := tags[pat.Name]; ok {
-				if pat.filter.Match(tagval) {
-					return true
+			for _, tag := range tags {
+				if tag.Key == pat.Name {
+					if pat.filter.Match(tag.Value) {
+						return true
+					}
 				}
 			}
 		}
@@ -218,9 +193,11 @@ func (f *Filter) shouldTagsPass(tags map[string]string) bool {
 			if pat.filter == nil {
 				continue
 			}
-			if tagval, ok := tags[pat.Name]; ok {
-				if pat.filter.Match(tagval) {
-					return false
+			for _, tag := range tags {
+				if tag.Key == pat.Name {
+					if pat.filter.Match(tag.Value) {
+						return false
+					}
 				}
 			}
 		}
@@ -242,22 +219,42 @@ func (f *Filter) shouldTagsPass(tags map[string]string) bool {
 	return true
 }
 
-// Apply TagInclude and TagExclude filters.
-// modifies the tags map in-place.
-func (f *Filter) filterTags(tags map[string]string) {
-	if f.tagInclude != nil {
-		for k, _ := range tags {
-			if !f.tagInclude.Match(k) {
-				delete(tags, k)
-			}
+// filterFields removes fields according to fieldpass/fielddrop.
+func (f *Filter) filterFields(metric telegraf.Metric) {
+	filterKeys := []string{}
+	for _, field := range metric.FieldList() {
+		if !f.shouldFieldPass(field.Key) {
+			filterKeys = append(filterKeys, field.Key)
 		}
 	}
 
-	if f.tagExclude != nil {
-		for k, _ := range tags {
-			if f.tagExclude.Match(k) {
-				delete(tags, k)
+	for _, key := range filterKeys {
+		metric.RemoveField(key)
+	}
+}
+
+// filterTags removes tags according to taginclude/tagexclude.
+func (f *Filter) filterTags(metric telegraf.Metric) {
+	filterKeys := []string{}
+	if f.tagInclude != nil {
+		for _, tag := range metric.TagList() {
+			if !f.tagInclude.Match(tag.Key) {
+				filterKeys = append(filterKeys, tag.Key)
 			}
 		}
 	}
+	for _, key := range filterKeys {
+		metric.RemoveTag(key)
+	}
+
+	if f.tagExclude != nil {
+		for _, tag := range metric.TagList() {
+			if f.tagExclude.Match(tag.Key) {
+				filterKeys = append(filterKeys, tag.Key)
+			}
+		}
+	}
+	for _, key := range filterKeys {
+		metric.RemoveTag(key)
+	}
 }
diff --git a/internal/models/filter_test.go b/internal/models/filter_test.go
index 46f16e83..16a147ca 100644
--- a/internal/models/filter_test.go
+++ b/internal/models/filter_test.go
@@ -2,17 +2,24 @@ package models
 
 import (
 	"testing"
+	"time"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/metric"
 	"github.com/stretchr/testify/require"
 )
 
 func TestFilter_ApplyEmpty(t *testing.T) {
 	f := Filter{}
 	require.NoError(t, f.Compile())
-	assert.False(t, f.IsActive())
+	require.False(t, f.IsActive())
 
-	assert.True(t, f.Apply("m", map[string]interface{}{"value": int64(1)}, map[string]string{}))
+	m, err := metric.New("m",
+		map[string]string{},
+		map[string]interface{}{"value": int64(1)},
+		time.Now())
+	require.NoError(t, err)
+	require.True(t, f.Select(m))
 }
 
 func TestFilter_ApplyTagsDontPass(t *testing.T) {
@@ -27,11 +34,14 @@ func TestFilter_ApplyTagsDontPass(t *testing.T) {
 	}
 	require.NoError(t, f.Compile())
 	require.NoError(t, f.Compile())
-	assert.True(t, f.IsActive())
+	require.True(t, f.IsActive())
 
-	assert.False(t, f.Apply("m",
+	m, err := metric.New("m",
+		map[string]string{"cpu": "cpu-total"},
 		map[string]interface{}{"value": int64(1)},
-		map[string]string{"cpu": "cpu-total"}))
+		time.Now())
+	require.NoError(t, err)
+	require.False(t, f.Select(m))
 }
 
 func TestFilter_ApplyDeleteFields(t *testing.T) {
@@ -40,11 +50,19 @@ func TestFilter_ApplyDeleteFields(t *testing.T) {
 	}
 	require.NoError(t, f.Compile())
 	require.NoError(t, f.Compile())
-	assert.True(t, f.IsActive())
+	require.True(t, f.IsActive())
 
-	fields := map[string]interface{}{"value": int64(1), "value2": int64(2)}
-	assert.True(t, f.Apply("m", fields, nil))
-	assert.Equal(t, map[string]interface{}{"value2": int64(2)}, fields)
+	m, err := metric.New("m",
+		map[string]string{},
+		map[string]interface{}{
+			"value":  int64(1),
+			"value2": int64(2),
+		},
+		time.Now())
+	require.NoError(t, err)
+	require.True(t, f.Select(m))
+	f.Modify(m)
+	require.Equal(t, map[string]interface{}{"value2": int64(2)}, m.Fields())
 }
 
 func TestFilter_ApplyDeleteAllFields(t *testing.T) {
@@ -53,10 +71,19 @@ func TestFilter_ApplyDeleteAllFields(t *testing.T) {
 	}
 	require.NoError(t, f.Compile())
 	require.NoError(t, f.Compile())
-	assert.True(t, f.IsActive())
+	require.True(t, f.IsActive())
 
-	fields := map[string]interface{}{"value": int64(1), "value2": int64(2)}
-	assert.False(t, f.Apply("m", fields, nil))
+	m, err := metric.New("m",
+		map[string]string{},
+		map[string]interface{}{
+			"value":  int64(1),
+			"value2": int64(2),
+		},
+		time.Now())
+	require.NoError(t, err)
+	require.True(t, f.Select(m))
+	f.Modify(m)
+	require.Len(t, m.FieldList(), 0)
 }
 
 func TestFilter_Empty(t *testing.T) {
@@ -230,20 +257,20 @@ func TestFilter_TagPass(t *testing.T) {
 	}
 	require.NoError(t, f.Compile())
 
-	passes := []map[string]string{
-		{"cpu": "cpu-total"},
-		{"cpu": "cpu-0"},
-		{"cpu": "cpu-1"},
-		{"cpu": "cpu-2"},
-		{"mem": "mem_free"},
+	passes := [][]*telegraf.Tag{
+		[]*telegraf.Tag{&telegraf.Tag{Key: "cpu", Value: "cpu-total"}},
+		[]*telegraf.Tag{&telegraf.Tag{Key: "cpu", Value: "cpu-0"}},
+		[]*telegraf.Tag{&telegraf.Tag{Key: "cpu", Value: "cpu-1"}},
+		[]*telegraf.Tag{&telegraf.Tag{Key: "cpu", Value: "cpu-2"}},
+		[]*telegraf.Tag{&telegraf.Tag{Key: "mem", Value: "mem_free"}},
 	}
 
-	drops := []map[string]string{
-		{"cpu": "cputotal"},
-		{"cpu": "cpu0"},
-		{"cpu": "cpu1"},
-		{"cpu": "cpu2"},
-		{"mem": "mem_used"},
+	drops := [][]*telegraf.Tag{
+		[]*telegraf.Tag{&telegraf.Tag{Key: "cpu", Value: "cputotal"}},
+		[]*telegraf.Tag{&telegraf.Tag{Key: "cpu", Value: "cpu0"}},
+		[]*telegraf.Tag{&telegraf.Tag{Key: "cpu", Value: "cpu1"}},
+		[]*telegraf.Tag{&telegraf.Tag{Key: "cpu", Value: "cpu2"}},
+		[]*telegraf.Tag{&telegraf.Tag{Key: "mem", Value: "mem_used"}},
 	}
 
 	for _, tags := range passes {
@@ -274,20 +301,20 @@ func TestFilter_TagDrop(t *testing.T) {
 	}
 	require.NoError(t, f.Compile())
 
-	drops := []map[string]string{
-		{"cpu": "cpu-total"},
-		{"cpu": "cpu-0"},
-		{"cpu": "cpu-1"},
-		{"cpu": "cpu-2"},
-		{"mem": "mem_free"},
+	drops := [][]*telegraf.Tag{
+		[]*telegraf.Tag{&telegraf.Tag{Key: "cpu", Value: "cpu-total"}},
+		[]*telegraf.Tag{&telegraf.Tag{Key: "cpu", Value: "cpu-0"}},
+		[]*telegraf.Tag{&telegraf.Tag{Key: "cpu", Value: "cpu-1"}},
+		[]*telegraf.Tag{&telegraf.Tag{Key: "cpu", Value: "cpu-2"}},
+		[]*telegraf.Tag{&telegraf.Tag{Key: "mem", Value: "mem_free"}},
 	}
 
-	passes := []map[string]string{
-		{"cpu": "cputotal"},
-		{"cpu": "cpu0"},
-		{"cpu": "cpu1"},
-		{"cpu": "cpu2"},
-		{"mem": "mem_used"},
+	passes := [][]*telegraf.Tag{
+		[]*telegraf.Tag{&telegraf.Tag{Key: "cpu", Value: "cputotal"}},
+		[]*telegraf.Tag{&telegraf.Tag{Key: "cpu", Value: "cpu0"}},
+		[]*telegraf.Tag{&telegraf.Tag{Key: "cpu", Value: "cpu1"}},
+		[]*telegraf.Tag{&telegraf.Tag{Key: "cpu", Value: "cpu2"}},
+		[]*telegraf.Tag{&telegraf.Tag{Key: "mem", Value: "mem_used"}},
 	}
 
 	for _, tags := range passes {
@@ -304,58 +331,70 @@ func TestFilter_TagDrop(t *testing.T) {
 }
 
 func TestFilter_FilterTagsNoMatches(t *testing.T) {
-	pretags := map[string]string{
-		"host":  "localhost",
-		"mytag": "foobar",
-	}
+	m, err := metric.New("m",
+		map[string]string{
+			"host":  "localhost",
+			"mytag": "foobar",
+		},
+		map[string]interface{}{"value": int64(1)},
+		time.Now())
+	require.NoError(t, err)
 	f := Filter{
 		TagExclude: []string{"nomatch"},
 	}
 	require.NoError(t, f.Compile())
 
-	f.filterTags(pretags)
-	assert.Equal(t, map[string]string{
+	f.filterTags(m)
+	require.Equal(t, map[string]string{
 		"host":  "localhost",
 		"mytag": "foobar",
-	}, pretags)
+	}, m.Tags())
 
 	f = Filter{
 		TagInclude: []string{"nomatch"},
 	}
 	require.NoError(t, f.Compile())
 
-	f.filterTags(pretags)
-	assert.Equal(t, map[string]string{}, pretags)
+	f.filterTags(m)
+	require.Equal(t, map[string]string{}, m.Tags())
 }
 
 func TestFilter_FilterTagsMatches(t *testing.T) {
-	pretags := map[string]string{
-		"host":  "localhost",
-		"mytag": "foobar",
-	}
+	m, err := metric.New("m",
+		map[string]string{
+			"host":  "localhost",
+			"mytag": "foobar",
+		},
+		map[string]interface{}{"value": int64(1)},
+		time.Now())
+	require.NoError(t, err)
 	f := Filter{
 		TagExclude: []string{"ho*"},
 	}
 	require.NoError(t, f.Compile())
 
-	f.filterTags(pretags)
-	assert.Equal(t, map[string]string{
+	f.filterTags(m)
+	require.Equal(t, map[string]string{
 		"mytag": "foobar",
-	}, pretags)
+	}, m.Tags())
 
-	pretags = map[string]string{
-		"host":  "localhost",
-		"mytag": "foobar",
-	}
+	m, err = metric.New("m",
+		map[string]string{
+			"host":  "localhost",
+			"mytag": "foobar",
+		},
+		map[string]interface{}{"value": int64(1)},
+		time.Now())
+	require.NoError(t, err)
 	f = Filter{
 		TagInclude: []string{"my*"},
 	}
 	require.NoError(t, f.Compile())
 
-	f.filterTags(pretags)
-	assert.Equal(t, map[string]string{
+	f.filterTags(m)
+	require.Equal(t, map[string]string{
 		"mytag": "foobar",
-	}, pretags)
+	}, m.Tags())
 }
 
 // TestFilter_FilterNamePassAndDrop used for check case when
@@ -374,7 +413,7 @@ func TestFilter_FilterNamePassAndDrop(t *testing.T) {
 	require.NoError(t, f.Compile())
 
 	for i, name := range inputData {
-		assert.Equal(t, f.shouldNamePass(name), expectedResult[i])
+		require.Equal(t, f.shouldNamePass(name), expectedResult[i])
 	}
 }
 
@@ -394,7 +433,7 @@ func TestFilter_FilterFieldPassAndDrop(t *testing.T) {
 	require.NoError(t, f.Compile())
 
 	for i, field := range inputData {
-		assert.Equal(t, f.shouldFieldPass(field), expectedResult[i])
+		require.Equal(t, f.shouldFieldPass(field), expectedResult[i])
 	}
 }
 
@@ -402,12 +441,11 @@ func TestFilter_FilterFieldPassAndDrop(t *testing.T) {
 // 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"},
+	inputData := [][]*telegraf.Tag{
+		[]*telegraf.Tag{&telegraf.Tag{Key: "tag1", Value: "1"}, &telegraf.Tag{Key: "tag2", Value: "3"}},
+		[]*telegraf.Tag{&telegraf.Tag{Key: "tag1", Value: "1"}, &telegraf.Tag{Key: "tag2", Value: "2"}},
+		[]*telegraf.Tag{&telegraf.Tag{Key: "tag1", Value: "2"}, &telegraf.Tag{Key: "tag2", Value: "1"}},
+		[]*telegraf.Tag{&telegraf.Tag{Key: "tag1", Value: "4"}, &telegraf.Tag{Key: "tag2", Value: "1"}},
 	}
 
 	expectedResult := []bool{false, true, false, false}
@@ -438,7 +476,7 @@ func TestFilter_FilterTagsPassAndDrop(t *testing.T) {
 	require.NoError(t, f.Compile())
 
 	for i, tag := range inputData {
-		assert.Equal(t, f.shouldTagsPass(tag), expectedResult[i])
+		require.Equal(t, f.shouldTagsPass(tag), expectedResult[i])
 	}
 
 }
diff --git a/internal/models/makemetric.go b/internal/models/makemetric.go
index b74e236c..29ef5f45 100644
--- a/internal/models/makemetric.go
+++ b/internal/models/makemetric.go
@@ -1,86 +1,42 @@
 package models
 
 import (
-	"log"
-	"time"
-
 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/metric"
 )
 
-// makemetric is used by both RunningAggregator & RunningInput
-// to make metrics.
-//   nameOverride: override the name of the measurement being made.
-//   namePrefix:   add this prefix to each measurement name.
-//   nameSuffix:   add this suffix to each measurement name.
-//   pluginTags:   these are tags that are specific to this plugin.
-//   daemonTags:   these are daemon-wide global tags, and get applied after pluginTags.
-//   filter:       this is a filter to apply to each metric being made.
-//   applyFilter:  if false, the above filter is not applied to each metric.
-//                 This is used by Aggregators, because aggregators use filters
-//                 on incoming metrics instead of on created metrics.
-// TODO refactor this to not have such a huge func signature.
+// Makemetric applies new metric plugin and agent measurement and tag
+// settings.
 func makemetric(
-	measurement string,
-	fields map[string]interface{},
-	tags map[string]string,
+	metric telegraf.Metric,
 	nameOverride string,
 	namePrefix string,
 	nameSuffix string,
-	pluginTags map[string]string,
-	daemonTags map[string]string,
-	filter Filter,
-	applyFilter bool,
-	mType telegraf.ValueType,
-	t time.Time,
+	tags map[string]string,
+	globalTags map[string]string,
 ) telegraf.Metric {
-	if len(fields) == 0 || len(measurement) == 0 {
-		return nil
-	}
-	if tags == nil {
-		tags = make(map[string]string)
+	if len(nameOverride) != 0 {
+		metric.SetName(nameOverride)
 	}
 
-	// Override measurement name if set
-	if len(nameOverride) != 0 {
-		measurement = nameOverride
-	}
-	// Apply measurement prefix and suffix if set
 	if len(namePrefix) != 0 {
-		measurement = namePrefix + measurement
+		metric.AddPrefix(namePrefix)
 	}
 	if len(nameSuffix) != 0 {
-		measurement = measurement + nameSuffix
+		metric.AddSuffix(nameSuffix)
 	}
 
-	// Apply plugin-wide tags if set
-	for k, v := range pluginTags {
-		if _, ok := tags[k]; !ok {
-			tags[k] = v
+	// Apply plugin-wide tags
+	for k, v := range tags {
+		if _, ok := metric.GetTag(k); !ok {
+			metric.AddTag(k, v)
 		}
 	}
-	// Apply daemon-wide tags if set
-	for k, v := range daemonTags {
-		if _, ok := tags[k]; !ok {
-			tags[k] = v
+	// Apply global tags
+	for k, v := range globalTags {
+		if _, ok := metric.GetTag(k); !ok {
+			metric.AddTag(k, v)
 		}
 	}
 
-	// Apply the metric filter(s)
-	// for aggregators, the filter does not get applied when the metric is made.
-	// instead, the filter is applied to metric incoming into the plugin.
-	//   ie, it gets applied in the RunningAggregator.Apply function.
-	if applyFilter {
-		if ok := filter.Apply(measurement, fields, tags); !ok {
-			return nil
-		}
-	}
-
-	m, err := metric.New(measurement, tags, fields, t, mType)
-	if err != nil {
-		log.Printf("Error adding point [%s]: %s\n", measurement, err.Error())
-		return nil
-	}
-
-	return m
+	return metric
 }
diff --git a/internal/models/running_aggregator.go b/internal/models/running_aggregator.go
index 8cb04e4f..960fd313 100644
--- a/internal/models/running_aggregator.go
+++ b/internal/models/running_aggregator.go
@@ -5,7 +5,6 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/metric"
 )
 
 type RunningAggregator struct {
@@ -29,47 +28,32 @@ func NewRunningAggregator(
 	}
 }
 
-// AggregatorConfig containing configuration parameters for the running
-// aggregator plugin.
+// AggregatorConfig is the common config for all aggregators.
 type AggregatorConfig struct {
-	Name string
+	Name         string
+	DropOriginal bool
+	Period       time.Duration
+	Delay        time.Duration
 
-	DropOriginal      bool
 	NameOverride      string
 	MeasurementPrefix string
 	MeasurementSuffix string
 	Tags              map[string]string
 	Filter            Filter
-
-	Period time.Duration
-	Delay  time.Duration
 }
 
 func (r *RunningAggregator) Name() string {
 	return "aggregators." + r.Config.Name
 }
 
-func (r *RunningAggregator) MakeMetric(
-	measurement string,
-	fields map[string]interface{},
-	tags map[string]string,
-	mType telegraf.ValueType,
-	t time.Time,
-) telegraf.Metric {
+func (r *RunningAggregator) MakeMetric(metric telegraf.Metric) telegraf.Metric {
 	m := makemetric(
-		measurement,
-		fields,
-		tags,
+		metric,
 		r.Config.NameOverride,
 		r.Config.MeasurementPrefix,
 		r.Config.MeasurementSuffix,
 		r.Config.Tags,
-		nil,
-		r.Config.Filter,
-		false,
-		mType,
-		t,
-	)
+		nil)
 
 	if m != nil {
 		m.SetAggregate(true)
@@ -78,27 +62,23 @@ func (r *RunningAggregator) MakeMetric(
 	return m
 }
 
-// Add applies the given metric to the aggregator.
-// Before applying to the plugin, it will run any defined filters on the metric.
-// Apply returns true if the original metric should be dropped.
-func (r *RunningAggregator) Add(in telegraf.Metric) bool {
-	if r.Config.Filter.IsActive() {
-		// check if the aggregator should apply this metric
-		name := in.Name()
-		fields := in.Fields()
-		tags := in.Tags()
-		t := in.Time()
-		if ok := r.Config.Filter.Apply(name, fields, tags); !ok {
-			// aggregator should not apply this metric
-			return false
-		}
-
-		in, _ = metric.New(name, tags, fields, t)
+// Add a metric to the aggregator and return true if the original metric
+// should be dropped.
+func (r *RunningAggregator) Add(metric telegraf.Metric) bool {
+	if ok := r.Config.Filter.Select(metric); !ok {
+		return false
 	}
 
-	r.metrics <- in
+	r.Config.Filter.Modify(metric)
+	if len(metric.FieldList()) == 0 {
+		return r.Config.DropOriginal
+	}
+
+	r.metrics <- metric
+
 	return r.Config.DropOriginal
 }
+
 func (r *RunningAggregator) add(in telegraf.Metric) {
 	r.a.Add(in)
 }
diff --git a/internal/models/running_aggregator_test.go b/internal/models/running_aggregator_test.go
index cf92fe67..34d51364 100644
--- a/internal/models/running_aggregator_test.go
+++ b/internal/models/running_aggregator_test.go
@@ -7,9 +7,11 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/metric"
 	"github.com/influxdata/telegraf/testutil"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestAdd(t *testing.T) {
@@ -25,13 +27,15 @@ func TestAdd(t *testing.T) {
 	acc := testutil.Accumulator{}
 	go ra.Run(&acc, make(chan struct{}))
 
-	m := ra.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
+	m, err := metric.New("RITest",
 		map[string]string{},
-		telegraf.Untyped,
+		map[string]interface{}{
+			"value": int64(101),
+		},
 		time.Now().Add(time.Millisecond*150),
-	)
+		telegraf.Untyped)
+	require.NoError(t, err)
+
 	assert.False(t, ra.Add(m))
 
 	for {
@@ -56,34 +60,37 @@ func TestAddMetricsOutsideCurrentPeriod(t *testing.T) {
 	acc := testutil.Accumulator{}
 	go ra.Run(&acc, make(chan struct{}))
 
-	// metric before current period
-	m := ra.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
+	m, err := metric.New("RITest",
 		map[string]string{},
-		telegraf.Untyped,
+		map[string]interface{}{
+			"value": int64(101),
+		},
 		time.Now().Add(-time.Hour),
-	)
+		telegraf.Untyped)
+	require.NoError(t, err)
+
 	assert.False(t, ra.Add(m))
 
 	// metric after current period
-	m = ra.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
+	m, err = metric.New("RITest",
 		map[string]string{},
-		telegraf.Untyped,
+		map[string]interface{}{
+			"value": int64(101),
+		},
 		time.Now().Add(time.Hour),
-	)
+		telegraf.Untyped)
+	require.NoError(t, err)
 	assert.False(t, ra.Add(m))
 
 	// "now" metric
-	m = ra.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
+	m, err = metric.New("RITest",
 		map[string]string{},
-		telegraf.Untyped,
+		map[string]interface{}{
+			"value": int64(101),
+		},
 		time.Now().Add(time.Millisecond*50),
-	)
+		telegraf.Untyped)
+	require.NoError(t, err)
 	assert.False(t, ra.Add(m))
 
 	for {
@@ -115,13 +122,14 @@ func TestAddAndPushOnePeriod(t *testing.T) {
 		ra.Run(&acc, shutdown)
 	}()
 
-	m := ra.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
+	m, err := metric.New("RITest",
 		map[string]string{},
-		telegraf.Untyped,
+		map[string]interface{}{
+			"value": int64(101),
+		},
 		time.Now().Add(time.Millisecond*100),
-	)
+		telegraf.Untyped)
+	require.NoError(t, err)
 	assert.False(t, ra.Add(m))
 
 	for {
@@ -146,23 +154,25 @@ func TestAddDropOriginal(t *testing.T) {
 	})
 	assert.NoError(t, ra.Config.Filter.Compile())
 
-	m := ra.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
+	m, err := metric.New("RITest",
 		map[string]string{},
-		telegraf.Untyped,
+		map[string]interface{}{
+			"value": int64(101),
+		},
 		time.Now(),
-	)
+		telegraf.Untyped)
+	require.NoError(t, err)
 	assert.True(t, ra.Add(m))
 
 	// this metric name doesn't match the filter, so Add will return false
-	m2 := ra.MakeMetric(
-		"foobar",
-		map[string]interface{}{"value": int(101)},
+	m2, err := metric.New("foobar",
 		map[string]string{},
-		telegraf.Untyped,
+		map[string]interface{}{
+			"value": int64(101),
+		},
 		time.Now(),
-	)
+		telegraf.Untyped)
+	require.NoError(t, err)
 	assert.False(t, ra.Add(m2))
 }
 
diff --git a/internal/models/running_input.go b/internal/models/running_input.go
index ffe0b5f5..fce2437c 100644
--- a/internal/models/running_input.go
+++ b/internal/models/running_input.go
@@ -36,44 +36,39 @@ func NewRunningInput(
 	}
 }
 
-// InputConfig containing a name, interval, and filter
+// InputConfig is the common config for all inputs.
 type InputConfig struct {
-	Name              string
+	Name     string
+	Interval time.Duration
+
 	NameOverride      string
 	MeasurementPrefix string
 	MeasurementSuffix string
 	Tags              map[string]string
 	Filter            Filter
-	Interval          time.Duration
 }
 
 func (r *RunningInput) Name() string {
 	return "inputs." + r.Config.Name
 }
 
-// MakeMetric either returns a metric, or returns nil if the metric doesn't
-// need to be created (because of filtering, an error, etc.)
-func (r *RunningInput) MakeMetric(
-	measurement string,
-	fields map[string]interface{},
-	tags map[string]string,
-	mType telegraf.ValueType,
-	t time.Time,
-) telegraf.Metric {
+func (r *RunningInput) MakeMetric(metric telegraf.Metric) telegraf.Metric {
+	if ok := r.Config.Filter.Select(metric); !ok {
+		return nil
+	}
+
+	r.Config.Filter.Modify(metric)
+	if len(metric.FieldList()) == 0 {
+		return nil
+	}
+
 	m := makemetric(
-		measurement,
-		fields,
-		tags,
+		metric,
 		r.Config.NameOverride,
 		r.Config.MeasurementPrefix,
 		r.Config.MeasurementSuffix,
 		r.Config.Tags,
-		r.defaultTags,
-		r.Config.Filter,
-		true,
-		mType,
-		t,
-	)
+		r.defaultTags)
 
 	if r.trace && m != nil {
 		s := influx.NewSerializer()
diff --git a/internal/models/running_input_test.go b/internal/models/running_input_test.go
index 4d016851..b83f75ea 100644
--- a/internal/models/running_input_test.go
+++ b/internal/models/running_input_test.go
@@ -17,13 +17,13 @@ func TestMakeMetricNoFields(t *testing.T) {
 		Name: "TestRunningInput",
 	})
 
-	m := ri.MakeMetric(
-		"RITest",
-		map[string]interface{}{},
+	m, err := metric.New("RITest",
 		map[string]string{},
-		telegraf.Untyped,
+		map[string]interface{}{},
 		now,
-	)
+		telegraf.Untyped)
+	m = ri.MakeMetric(m)
+	require.NoError(t, err)
 	assert.Nil(t, m)
 }
 
@@ -34,16 +34,16 @@ func TestMakeMetricNilFields(t *testing.T) {
 		Name: "TestRunningInput",
 	})
 
-	m := ri.MakeMetric(
-		"RITest",
+	m, err := metric.New("RITest",
+		map[string]string{},
 		map[string]interface{}{
-			"value": int(101),
+			"value": int64(101),
 			"nil":   nil,
 		},
-		map[string]string{},
-		telegraf.Untyped,
 		now,
-	)
+		telegraf.Untyped)
+	require.NoError(t, err)
+	m = ri.MakeMetric(m)
 
 	expected, err := metric.New("RITest",
 		map[string]string{},
@@ -69,13 +69,15 @@ func TestMakeMetricWithPluginTags(t *testing.T) {
 	ri.SetTrace(true)
 	assert.Equal(t, true, ri.Trace())
 
-	m := ri.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
-		nil,
-		telegraf.Untyped,
+	m, err := metric.New("RITest",
+		map[string]string{},
+		map[string]interface{}{
+			"value": int64(101),
+		},
 		now,
-	)
+		telegraf.Untyped)
+	require.NoError(t, err)
+	m = ri.MakeMetric(m)
 
 	expected, err := metric.New("RITest",
 		map[string]string{
@@ -104,13 +106,15 @@ func TestMakeMetricFilteredOut(t *testing.T) {
 	assert.Equal(t, true, ri.Trace())
 	assert.NoError(t, ri.Config.Filter.Compile())
 
-	m := ri.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
-		nil,
-		telegraf.Untyped,
+	m, err := metric.New("RITest",
+		map[string]string{},
+		map[string]interface{}{
+			"value": int64(101),
+		},
 		now,
-	)
+		telegraf.Untyped)
+	m = ri.MakeMetric(m)
+	require.NoError(t, err)
 	assert.Nil(t, m)
 }
 
@@ -126,13 +130,15 @@ func TestMakeMetricWithDaemonTags(t *testing.T) {
 	ri.SetTrace(true)
 	assert.Equal(t, true, ri.Trace())
 
-	m := ri.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
+	m, err := metric.New("RITest",
 		map[string]string{},
-		telegraf.Untyped,
+		map[string]interface{}{
+			"value": int64(101),
+		},
 		now,
-	)
+		telegraf.Untyped)
+	require.NoError(t, err)
+	m = ri.MakeMetric(m)
 	expected, err := metric.New("RITest",
 		map[string]string{
 			"foo": "bar",
@@ -153,13 +159,15 @@ func TestMakeMetricNameOverride(t *testing.T) {
 		NameOverride: "foobar",
 	})
 
-	m := ri.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
+	m, err := metric.New("RITest",
 		map[string]string{},
-		telegraf.Untyped,
+		map[string]interface{}{
+			"value": int64(101),
+		},
 		now,
-	)
+		telegraf.Untyped)
+	require.NoError(t, err)
+	m = ri.MakeMetric(m)
 	expected, err := metric.New("foobar",
 		nil,
 		map[string]interface{}{
@@ -178,13 +186,15 @@ func TestMakeMetricNamePrefix(t *testing.T) {
 		MeasurementPrefix: "foobar_",
 	})
 
-	m := ri.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
+	m, err := metric.New("RITest",
 		map[string]string{},
-		telegraf.Untyped,
+		map[string]interface{}{
+			"value": int64(101),
+		},
 		now,
-	)
+		telegraf.Untyped)
+	require.NoError(t, err)
+	m = ri.MakeMetric(m)
 	expected, err := metric.New("foobar_RITest",
 		nil,
 		map[string]interface{}{
@@ -203,13 +213,15 @@ func TestMakeMetricNameSuffix(t *testing.T) {
 		MeasurementSuffix: "_foobar",
 	})
 
-	m := ri.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
+	m, err := metric.New("RITest",
 		map[string]string{},
-		telegraf.Untyped,
+		map[string]interface{}{
+			"value": int64(101),
+		},
 		now,
-	)
+		telegraf.Untyped)
+	require.NoError(t, err)
+	m = ri.MakeMetric(m)
 	expected, err := metric.New("RITest_foobar",
 		nil,
 		map[string]interface{}{
diff --git a/internal/models/running_output.go b/internal/models/running_output.go
index bad1f765..0f2c138a 100644
--- a/internal/models/running_output.go
+++ b/internal/models/running_output.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal/buffer"
-	"github.com/influxdata/telegraf/metric"
 	"github.com/influxdata/telegraf/selfstat"
 )
 
@@ -42,6 +41,12 @@ type RunningOutput struct {
 	writeMutex sync.Mutex
 }
 
+// OutputConfig containing name and filter
+type OutputConfig struct {
+	Name   string
+	Filter Filter
+}
+
 func NewRunningOutput(
 	name string,
 	output telegraf.Output,
@@ -95,36 +100,25 @@ 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 {
+func (ro *RunningOutput) AddMetric(metric telegraf.Metric) {
+	if ok := ro.Config.Filter.Select(metric); !ok {
+		ro.MetricsFiltered.Incr(1)
 		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
-		// metrics are immutable once created.
-		name := m.Name()
-		tags := m.Tags()
-		fields := m.Fields()
-		t := m.Time()
-		tp := m.Type()
-		if ok := ro.Config.Filter.Apply(name, fields, tags); !ok {
-			ro.MetricsFiltered.Incr(1)
-			return
-		}
-		// error is not possible if creating from another metric, so ignore.
-		m, _ = metric.New(name, tags, fields, t, tp)
+
+	ro.Config.Filter.Modify(metric)
+	if len(metric.FieldList()) == 0 {
+		return
 	}
 
 	if output, ok := ro.Output.(telegraf.AggregatingOutput); ok {
 		ro.aggMutex.Lock()
-		output.Add(m)
+		output.Add(metric)
 		ro.aggMutex.Unlock()
 		return
 	}
 
-	ro.metrics.Add(m)
+	ro.metrics.Add(metric)
 	if ro.metrics.Len() == ro.MetricBatchSize {
 		batch := ro.metrics.Batch(ro.MetricBatchSize)
 		err := ro.write(batch)
@@ -206,9 +200,3 @@ func (ro *RunningOutput) write(metrics []telegraf.Metric) error {
 	}
 	return err
 }
-
-// OutputConfig containing name and filter
-type OutputConfig struct {
-	Name   string
-	Filter Filter
-}
diff --git a/internal/models/running_output_test.go b/internal/models/running_output_test.go
index bd39f2f9..c5533421 100644
--- a/internal/models/running_output_test.go
+++ b/internal/models/running_output_test.go
@@ -75,23 +75,6 @@ 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{
diff --git a/internal/models/running_processor.go b/internal/models/running_processor.go
index 92d3d44d..a210d979 100644
--- a/internal/models/running_processor.go
+++ b/internal/models/running_processor.go
@@ -34,14 +34,18 @@ func (rp *RunningProcessor) Apply(in ...telegraf.Metric) []telegraf.Metric {
 	ret := []telegraf.Metric{}
 
 	for _, metric := range in {
-		if rp.Config.Filter.IsActive() {
-			// check if the filter should be applied to this metric
-			if ok := rp.Config.Filter.Apply(metric.Name(), metric.Fields(), metric.Tags()); !ok {
-				// this means filter should not be applied
-				ret = append(ret, metric)
-				continue
-			}
+		// In processors when a filter selects a metric it is sent through the
+		// processor.  Otherwise the metric continues downstream unmodified.
+		if ok := rp.Config.Filter.Select(metric); !ok {
+			ret = append(ret, metric)
+			continue
 		}
+
+		rp.Config.Filter.Modify(metric)
+		if len(metric.FieldList()) == 0 {
+			continue
+		}
+
 		// This metric should pass through the filter, so call the filter Apply
 		// function and append results to the output slice.
 		ret = append(ret, rp.Processor.Apply(metric)...)
diff --git a/internal/models/running_processor_test.go b/internal/models/running_processor_test.go
index 8a691a9b..02db4046 100644
--- a/internal/models/running_processor_test.go
+++ b/internal/models/running_processor_test.go
@@ -1,117 +1,203 @@
 package models
 
 import (
+	"sort"
 	"testing"
+	"time"
 
 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/testutil"
+	"github.com/influxdata/telegraf/metric"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
-type TestProcessor struct {
+// MockProcessor is a Processor with an overrideable Apply implementation.
+type MockProcessor struct {
+	ApplyF func(in ...telegraf.Metric) []telegraf.Metric
 }
 
-func (f *TestProcessor) SampleConfig() string { return "" }
-func (f *TestProcessor) Description() string  { return "" }
-
-// Apply renames:
-//   "foo" to "fuz"
-//   "bar" to "baz"
-// And it also drops measurements named "dropme"
-func (f *TestProcessor) Apply(in ...telegraf.Metric) []telegraf.Metric {
-	out := make([]telegraf.Metric, 0)
-	for _, m := range in {
-		switch m.Name() {
-		case "foo":
-			out = append(out, testutil.TestMetric(1, "fuz"))
-		case "bar":
-			out = append(out, testutil.TestMetric(1, "baz"))
-		case "dropme":
-			// drop the metric!
-		default:
-			out = append(out, m)
-		}
-	}
-	return out
+func (p *MockProcessor) SampleConfig() string {
+	return ""
 }
 
-func NewTestRunningProcessor() *RunningProcessor {
-	out := &RunningProcessor{
-		Name:      "test",
-		Processor: &TestProcessor{},
-		Config:    &ProcessorConfig{Filter: Filter{}},
-	}
-	return out
+func (p *MockProcessor) Description() string {
+	return ""
 }
 
-func TestRunningProcessor(t *testing.T) {
-	inmetrics := []telegraf.Metric{
-		testutil.TestMetric(1, "foo"),
-		testutil.TestMetric(1, "bar"),
-		testutil.TestMetric(1, "baz"),
-	}
-
-	expectedNames := []string{
-		"fuz",
-		"baz",
-		"baz",
-	}
-	rfp := NewTestRunningProcessor()
-	filteredMetrics := rfp.Apply(inmetrics...)
-
-	actualNames := []string{
-		filteredMetrics[0].Name(),
-		filteredMetrics[1].Name(),
-		filteredMetrics[2].Name(),
-	}
-	assert.Equal(t, expectedNames, actualNames)
+func (p *MockProcessor) Apply(in ...telegraf.Metric) []telegraf.Metric {
+	return p.ApplyF(in...)
 }
 
-func TestRunningProcessor_WithNameDrop(t *testing.T) {
-	inmetrics := []telegraf.Metric{
-		testutil.TestMetric(1, "foo"),
-		testutil.TestMetric(1, "bar"),
-		testutil.TestMetric(1, "baz"),
+// TagProcessor returns a Processor whose Apply function adds the tag and
+// value.
+func TagProcessor(key, value string) *MockProcessor {
+	return &MockProcessor{
+		ApplyF: func(in ...telegraf.Metric) []telegraf.Metric {
+			for _, m := range in {
+				m.AddTag(key, value)
+			}
+			return in
+		},
 	}
-
-	expectedNames := []string{
-		"foo",
-		"baz",
-		"baz",
-	}
-	rfp := NewTestRunningProcessor()
-
-	rfp.Config.Filter.NameDrop = []string{"foo"}
-	assert.NoError(t, rfp.Config.Filter.Compile())
-
-	filteredMetrics := rfp.Apply(inmetrics...)
-
-	actualNames := []string{
-		filteredMetrics[0].Name(),
-		filteredMetrics[1].Name(),
-		filteredMetrics[2].Name(),
-	}
-	assert.Equal(t, expectedNames, actualNames)
 }
 
-func TestRunningProcessor_DroppedMetric(t *testing.T) {
-	inmetrics := []telegraf.Metric{
-		testutil.TestMetric(1, "dropme"),
-		testutil.TestMetric(1, "foo"),
-		testutil.TestMetric(1, "bar"),
+func Metric(
+	name string,
+	tags map[string]string,
+	fields map[string]interface{},
+	tm time.Time,
+	tp ...telegraf.ValueType,
+) telegraf.Metric {
+	m, err := metric.New(name, tags, fields, tm, tp...)
+	if err != nil {
+		panic(err)
 	}
+	return m
+}
 
-	expectedNames := []string{
-		"fuz",
-		"baz",
+func TestRunningProcessor_Apply(t *testing.T) {
+	type args struct {
+		Processor telegraf.Processor
+		Config    *ProcessorConfig
 	}
-	rfp := NewTestRunningProcessor()
-	filteredMetrics := rfp.Apply(inmetrics...)
 
-	actualNames := []string{
-		filteredMetrics[0].Name(),
-		filteredMetrics[1].Name(),
+	tests := []struct {
+		name     string
+		args     args
+		input    []telegraf.Metric
+		expected []telegraf.Metric
+	}{
+		{
+			name: "inactive filter applies metrics",
+			args: args{
+				Processor: TagProcessor("apply", "true"),
+				Config: &ProcessorConfig{
+					Filter: Filter{},
+				},
+			},
+			input: []telegraf.Metric{
+				Metric(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"value": 42.0,
+					},
+					time.Unix(0, 0),
+				),
+			},
+			expected: []telegraf.Metric{
+				Metric(
+					"cpu",
+					map[string]string{
+						"apply": "true",
+					},
+					map[string]interface{}{
+						"value": 42.0,
+					},
+					time.Unix(0, 0),
+				),
+			},
+		},
+		{
+			name: "filter applies",
+			args: args{
+				Processor: TagProcessor("apply", "true"),
+				Config: &ProcessorConfig{
+					Filter: Filter{
+						NamePass: []string{"cpu"},
+					},
+				},
+			},
+			input: []telegraf.Metric{
+				Metric(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"value": 42.0,
+					},
+					time.Unix(0, 0),
+				),
+			},
+			expected: []telegraf.Metric{
+				Metric(
+					"cpu",
+					map[string]string{
+						"apply": "true",
+					},
+					map[string]interface{}{
+						"value": 42.0,
+					},
+					time.Unix(0, 0),
+				),
+			},
+		},
+		{
+			name: "filter doesn't apply",
+			args: args{
+				Processor: TagProcessor("apply", "true"),
+				Config: &ProcessorConfig{
+					Filter: Filter{
+						NameDrop: []string{"cpu"},
+					},
+				},
+			},
+			input: []telegraf.Metric{
+				Metric(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"value": 42.0,
+					},
+					time.Unix(0, 0),
+				),
+			},
+			expected: []telegraf.Metric{
+				Metric(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"value": 42.0,
+					},
+					time.Unix(0, 0),
+				),
+			},
+		},
 	}
-	assert.Equal(t, expectedNames, actualNames)
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			rp := &RunningProcessor{
+				Processor: tt.args.Processor,
+				Config:    tt.args.Config,
+			}
+			rp.Config.Filter.Compile()
+
+			actual := rp.Apply(tt.input...)
+			require.Equal(t, tt.expected, actual)
+		})
+	}
+}
+
+func TestRunningProcessor_Order(t *testing.T) {
+	rp1 := &RunningProcessor{
+		Config: &ProcessorConfig{
+			Order: 1,
+		},
+	}
+	rp2 := &RunningProcessor{
+		Config: &ProcessorConfig{
+			Order: 2,
+		},
+	}
+	rp3 := &RunningProcessor{
+		Config: &ProcessorConfig{
+			Order: 3,
+		},
+	}
+
+	procs := RunningProcessors{rp2, rp3, rp1}
+	sort.Sort(procs)
+	require.Equal(t,
+		RunningProcessors{rp1, rp2, rp3},
+		procs)
 }