Merge ~sergiodj/ubuntu/+source/telegraf:bug1916305-telegraf-conf into ~sergiodj/ubuntu/+source/telegraf:master

[Sergio Durigan Junior]

Fix for bug 1916305.

In a nutshell: after installing telegraf, it will always try to connect to an influxdb instance. This is because of the default configuration file shipped with it. When it fails, it generated *a lot* of pollution in the log files. Since we might not always have such an instance in the system, it makes sense to disable this by default. And given that, by design, telegraf must always have at least one output configured, this MP enables the prometheus_client output, which should be harmless and is actually a good thing to allow the user to verify whether things are running OK.

There's a build with the proposed change here:

https://launchpad.net/~sergiodj/+archive/ubuntu/telegraf-merge

Unmerged commits

1f84544... by Sergio Durigan Junior on 2021-02-19

Update changelog for 1.17.2+ds1-0ubuntu2 release

d5fd29c... by Sergio Durigan Junior on 2021-02-19

d/p/adjust-etc-telegraf.conf.patch: Adjust /etc/telegraf.conf.

We have to adjust /etc/telegraf.conf in order to prevent it to try to
connect to an influxdb instance, which might not be present in the
system. Since we still need to define an output in the config file,

LP: #1916305

f137011... by Sergio Durigan Junior on 2021-02-03

Update changelog for 1.17.2+ds1-0ubuntu1 release

2a96daf... by Sergio Durigan Junior on 2021-02-02

d/p/use-mod-vendor-on-leofs-test.patch: Remove patch.

Upstream has changed the way leofs works, and it's not invoking "go"
directly anymore. For this reason, there is no more need to make sure
"go" was invoked with "-mod=vendor".

ba8445b... by Sergio Durigan Junior on 2021-02-02

Update upstream source from tag 'upstream/1.17.2+ds1'

Update to upstream version '1.17.2+ds1'
with Debian dir e013ced513190d8ffc298a1e79126b8d3c70a424

a5a4b1c... by Sergio Durigan Junior on 2021-02-02

New upstream version 1.17.2+ds1

57c734e... by Sergio Durigan Junior on 2021-02-02

d/repack-telegraf-with-vendor.sh: Allow user to specify the Go binary.

Signed-off-by: Sergio Durigan Junior <email address hidden>

32ea982... by Sergio Durigan Junior on 2021-02-02

d/repack-telegraf-with-vendor.sh: Fix "trap" instruction.

Signed-off-by: Sergio Durigan Junior <email address hidden>

diff --git a/.circleci/config.yml b/.circleci/config.yml
index dad9a5e..5e44cfe 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,27 +1,72 @@
----
-defaults:
-  defaults: &defaults
+version: 2.1
+
+executors:
+  go-1_14:
     working_directory: '/go/src/github.com/influxdata/telegraf'
+    docker:
+      - image: 'quay.io/influxdb/telegraf-ci:1.14.9'
     environment:
       GOFLAGS: -p=8
-  go-1_13: &go-1_13
-    docker:
-      - image: 'quay.io/influxdb/telegraf-ci:1.13.13'
-  go-1_14: &go-1_14
+  go-1_15:
+    working_directory: '/go/src/github.com/influxdata/telegraf'
     docker:
-      - image: 'quay.io/influxdb/telegraf-ci:1.14.5'
-  mac: &mac
+      - image: 'quay.io/influxdb/telegraf-ci:1.15.5'
+    environment:
+      GOFLAGS: -p=8
+  mac:
     macos:
-      xcode: 11.3.1
+      xcode: 12.1.0
     working_directory: '~/go/src/github.com/influxdata/telegraf'
     environment:
       HOMEBREW_NO_AUTO_UPDATE: 1
       GOFLAGS: -p=8
 
-version: 2
+commands:
+  test-go:
+    parameters:
+      goarch:
+        type: string
+        default: "amd64"
+    steps:
+      - checkout
+      - attach_workspace:
+          at: '/go'
+      - run: 'GOARCH=<< parameters.goarch >> make'
+      - run: 'GOARCH=<< parameters.goarch >> make check'
+      - run: 'GOARCH=<< parameters.goarch >> make check-deps'
+      - run: 'GOARCH=<< parameters.goarch >> make test'
+  test-go-mac:
+    steps:
+      - checkout
+      - attach_workspace:
+          at: '/'
+      - run: 'make'
+      - run: 'make check'
+      - run: 'make test'
+  package:
+    parameters:
+      nightly:
+        type: boolean
+        default: false
+    steps:
+      - checkout
+      - attach_workspace:
+          at: '/go'
+      - when:
+          condition: << parameters.nightly >>
+          steps: 
+            - run: 'NIGHTLY=1 make package'
+            - run: 'make upload-nightly'
+      - unless:
+          condition: << parameters.nightly >>
+          steps:
+            - run: 'make package'
+      - store_artifacts:
+          path: './build/dist'
+          destination: 'build/dist'
 jobs:
   deps:
-    <<: [ *defaults, *go-1_14 ]
+    executor: go-1_15
     steps:
       - checkout
       - restore_cache:
@@ -38,17 +83,17 @@ jobs:
           paths:
             - '*'
   macdeps:
-    <<: [ *mac ]
+    executor: mac
     steps:
       - checkout
       - restore_cache:
-          key: mac-go-mod-v1-{{ checksum "go.sum" }}
+          key: mac-go-mod-v2-{{ checksum "go.sum" }}
       - run: 'brew install go' # latest
       - run: 'make deps'
       - run: 'make tidy'
       - save_cache:
           name: 'go module cache'
-          key: mac-go-mod-v1-{{ checksum "go.sum" }}
+          key: mac-go-mod-v2-{{ checksum "go.sum" }}
           paths:
             - '~/go/pkg/mod'
             - '/usr/local/Cellar/go'
@@ -62,75 +107,42 @@ jobs:
             - 'usr/local/bin/gofmt'
             - 'Users/distiller/go'
 
-  test-go-1.13:
-    <<: [ *defaults, *go-1_13 ]
+  test-go-1_14:
+    executor: go-1_14
     steps:
-      - attach_workspace:
-          at: '/go'
-      - run: 'make'
-      - run: 'make test'
-  test-go-1.13-386:
-    <<: [ *defaults, *go-1_13 ]
+      - test-go
+  test-go-1_14-386:
+    executor: go-1_14
     steps:
-      - attach_workspace:
-          at: '/go'
-      - run: 'GOARCH=386 make'
-      - run: 'GOARCH=386 make test'
-  test-go-1.14:
-    <<: [ *defaults, *go-1_14 ]
+      - test-go:
+          goarch: "386"
+  test-go-1_15:
+    executor: go-1_15
     steps:
-      - attach_workspace:
-          at: '/go'
-      - run: 'make'
-      - run: 'make check'
-      - run: 'make check-deps'
-      - run: 'make test'
-  test-go-1.14-386:
-    <<: [ *defaults, *go-1_14 ]
+      - test-go
+  test-go-1_15-386:
+    executor: go-1_15
     steps:
-      - attach_workspace:
-          at: '/go'
-      - run: 'GOARCH=386 make'
-      - run: 'GOARCH=386 make check'
-      - run: 'GOARCH=386 make test'
+      - test-go:
+          goarch: "386"
   test-go-darwin:
-    <<: [ *mac ]
+    executor: mac
     steps:
-      - attach_workspace:
-          at: '/'
-      - run: 'make'
-      - run: 'make check'
-      - run: 'make test'
+      - test-go-mac
 
   package:
-    <<: [ *defaults, *go-1_14 ]
+    executor: go-1_15
     steps:
-      - attach_workspace:
-          at: '/go'
-      - run: 'make package'
-      - store_artifacts:
-          path: './build/dist'
-          destination: 'build/dist'
-
+      - package
   release:
-    <<: [ *defaults, *go-1_14 ]
+    executor: go-1_15
     steps:
-      - attach_workspace:
-          at: '/go'
-      - run: 'make package'
-      - store_artifacts:
-          path: './build/dist'
-          destination: 'build/dist'
+      - package
   nightly:
-    <<: [ *defaults, *go-1_14 ]
+    executor: go-1_15
     steps:
-      - attach_workspace:
-          at: '/go'
-      - run: 'NIGHTLY=1 make package'
-      - run: 'make upload-nightly'
-      - store_artifacts:
-          path: './build/dist'
-          destination: 'build/dist'
+      - package:
+          nightly: true
 
 workflows:
   version: 2
@@ -144,25 +156,25 @@ workflows:
           filters:
             tags:
               only: /.*/
-      - 'test-go-1.13':
+      - 'test-go-1_14':
           requires:
             - 'deps'
           filters:
             tags:
               only: /.*/
-      - 'test-go-1.13-386':
+      - 'test-go-1_14-386':
           requires:
             - 'deps'
           filters:
             tags:
               only: /.*/
-      - 'test-go-1.14':
+      - 'test-go-1_15':
           requires:
             - 'deps'
           filters:
             tags:
               only: /.*/
-      - 'test-go-1.14-386':
+      - 'test-go-1_15-386':
           requires:
             - 'deps'
           filters:
@@ -177,17 +189,17 @@ workflows:
       - 'package':
           requires:
             - 'test-go-darwin'
-            - 'test-go-1.13'
-            - 'test-go-1.13-386'
-            - 'test-go-1.14'
-            - 'test-go-1.14-386'
+            - 'test-go-1_14'
+            - 'test-go-1_14-386'
+            - 'test-go-1_15'
+            - 'test-go-1_15-386'
       - 'release':
           requires:
             - 'test-go-darwin'
-            - 'test-go-1.13'
-            - 'test-go-1.13-386'
-            - 'test-go-1.14'
-            - 'test-go-1.14-386'
+            - 'test-go-1_14'
+            - 'test-go-1_14-386'
+            - 'test-go-1_15'
+            - 'test-go-1_15-386'
           filters:
             tags:
               only: /.*/
@@ -197,16 +209,16 @@ workflows:
     jobs:
       - 'deps'
       - 'macdeps'
-      - 'test-go-1.13':
+      - 'test-go-1_14':
           requires:
             - 'deps'
-      - 'test-go-1.13-386':
+      - 'test-go-1_14-386':
           requires:
             - 'deps'
-      - 'test-go-1.14':
+      - 'test-go-1_15':
           requires:
             - 'deps'
-      - 'test-go-1.14-386':
+      - 'test-go-1_15-386':
           requires:
             - 'deps'
       - 'test-go-darwin':
@@ -215,10 +227,10 @@ workflows:
       - 'nightly':
           requires:
             - 'test-go-darwin'
-            - 'test-go-1.13'
-            - 'test-go-1.13-386'
-            - 'test-go-1.14'
-            - 'test-go-1.14-386'
+            - 'test-go-1_14'
+            - 'test-go-1_14-386'
+            - 'test-go-1_15'
+            - 'test-go-1_15-386'
     triggers:
       - schedule:
           cron: "0 7 * * *"
diff --git a/.gitattributes b/.gitattributes
index 21bc439..7769daa 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,3 +3,4 @@ README.md merge=union
 go.sum merge=union
 plugins/inputs/all/all.go merge=union
 plugins/outputs/all/all.go merge=union
+**/testdata/** test eol=lf
diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
index e03395f..28c6237 100644
--- a/.github/ISSUE_TEMPLATE/Bug_report.md
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -1,5 +1,6 @@
 ---
 name: Bug report
+labels: bug
 about: Create a report to help us improve
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md
index 20aba04..00eb152 100644
--- a/.github/ISSUE_TEMPLATE/Feature_request.md
+++ b/.github/ISSUE_TEMPLATE/Feature_request.md
@@ -1,5 +1,6 @@
 ---
 name: Feature request
+labels: feature request
 about: Suggest an idea for this project
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/Support.md b/.github/ISSUE_TEMPLATE/Support.md
new file mode 100644
index 0000000..d150dbf
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Support.md
@@ -0,0 +1,22 @@
+---
+name: Support request
+labels: support
+about: Open a support request
+
+---
+
+<!--
+WOAHH, hold up. This isn't this best place for support questions. 
+  You can get a faster response on slack or forums:
+
+Please redirect any QUESTIONS about Telegraf usage to 
+- InfluxData Slack Channel: https://www.influxdata.com/slack 
+- InfluxData Community Site: https://community.influxdata.com
+
+Check the documentation for the related plugin including the troubleshooting
+section if available.
+
+https://docs.influxdata.com/telegraf
+https://github.com/influxdata/telegraf/tree/master/docs
+
+-->
diff --git a/.gitignore b/.gitignore
index a32255f..3009b88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,11 @@
+/.idea
 /build
 /telegraf
 /telegraf.exe
 /telegraf.gz
 /vendor
 .DS_Store
+<<<<<<< .gitignore
+=======
+process.yml
+>>>>>>> .gitignore
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 562071e..bac05b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,4 @@
+<<<<<<< CHANGELOG.md
 ## v1.15.3 [2020-09-11]
 
 #### Release Notes
@@ -24,15 +25,324 @@
 
 
 ## v1.15.2 [2020-07-31]
+=======
+## v1.17.2 [2021-01-28]
 
 #### Bugfixes
 
+  - [#8770](https://github.com/influxdata/telegraf/pull/8770) `inputs.ping` Set interface for native
+  - [#8764](https://github.com/influxdata/telegraf/pull/8764) `inputs.ping` Resolve regression, re-add missing function
+
+
+## v1.17.1 [2021-01-27]
+
+#### Release Notes
+
+  Included a few more changes that add configuration options to plugins as it's been while since the last release
+
+  - [#8335](https://github.com/influxdata/telegraf/pull/8335) `inputs.ipmi_sensor` Add setting to enable caching in ipmitool
+  - [#8616](https://github.com/influxdata/telegraf/pull/8616) Add Event Log support for Windows
+  - [#8602](https://github.com/influxdata/telegraf/pull/8602) `inputs.postgresql_extensible` Add timestamp column support to postgresql_extensible
+  - [#8627](https://github.com/influxdata/telegraf/pull/8627) `parsers.csv` Added ability to define skip values in csv parser
+  - [#8646](https://github.com/influxdata/telegraf/pull/8646) link to Open Hardware Monitor
+  - [#8055](https://github.com/influxdata/telegraf/pull/8055) `outputs.http` outputs/http: add option to control idle connection timeout
+  - [#7897](https://github.com/influxdata/telegraf/pull/7897) `common.tls` common/tls: Allow specifying SNI hostnames
+  - [#8541](https://github.com/influxdata/telegraf/pull/8541) `inputs.snmp` Extended the internal snmp wrapper to support AES192, AES192C, AES256, and AES256C
+  - [#6165](https://github.com/influxdata/telegraf/pull/6165) `inputs.procstat` Provide method to include core count when reporting cpu_usage in procstat input
+  - [#8287](https://github.com/influxdata/telegraf/pull/8287) `inputs.jenkins` Add support for an inclusive job list in Jenkins plugin
+  - [#8524](https://github.com/influxdata/telegraf/pull/8524) `inputs.ipmi_sensor` Add hex_key parameter for IPMI input plugin connection
+
+#### Bugfixes
+
+  - [#8662](https://github.com/influxdata/telegraf/pull/8662) `outputs.influxdb_v2` [outputs.influxdb_v2] add exponential backoff, and respect client error responses
+  - [#8748](https://github.com/influxdata/telegraf/pull/8748) `outputs.elasticsearch` Fix issue with elasticsearch output being really noisy about some errors
+  - [#7533](https://github.com/influxdata/telegraf/pull/7533) `inputs.zookeeper` improve mntr regex to match user specific keys.
+  - [#7967](https://github.com/influxdata/telegraf/pull/7967) `inputs.lustre2` Fix crash in lustre2 input plugin, when field name and value
+  - [#8673](https://github.com/influxdata/telegraf/pull/8673) Update grok-library to v1.0.1 with dots and dash-patterns fixed.
+  - [#8679](https://github.com/influxdata/telegraf/pull/8679) `inputs.ping` Use go-ping for "native" execution in Ping plugin
+  - [#8741](https://github.com/influxdata/telegraf/pull/8741) `inputs.x509_cert` fix x509 cert timeout issue
+  - [#8714](https://github.com/influxdata/telegraf/pull/8714) Bump github.com/nsqio/go-nsq from 1.0.7 to 1.0.8
+  - [#8715](https://github.com/influxdata/telegraf/pull/8715) Bump github.com/Shopify/sarama from 1.27.1 to 1.27.2
+  - [#8712](https://github.com/influxdata/telegraf/pull/8712) Bump github.com/newrelic/newrelic-telemetry-sdk-go from 0.2.0 to 0.5.1
+  - [#8659](https://github.com/influxdata/telegraf/pull/8659) `inputs.gnmi` GNMI plugin should not take off the first character of field keys when no 'alias path' exists.
+  - [#8609](https://github.com/influxdata/telegraf/pull/8609) `inputs.webhooks` Use the 'measurement' json field from the particle webhook as the measurment name, or if it's blank, use the 'name' field of the event's json.
+  - [#8658](https://github.com/influxdata/telegraf/pull/8658) `inputs.procstat` Procstat input plugin should use the same timestamp in all metrics in the same Gather() cycle.
+  - [#8391](https://github.com/influxdata/telegraf/pull/8391) `aggregators.merge` Optimize SeriesGrouper & aggregators.merge
+  - [#8545](https://github.com/influxdata/telegraf/pull/8545) `inputs.prometheus` Using mime-type in prometheus parser to handle protocol-buffer responses
+  - [#8588](https://github.com/influxdata/telegraf/pull/8588) `inputs.snmp` Input SNMP plugin - upgrade gosnmp library to version 1.29.0
+  - [#8502](https://github.com/influxdata/telegraf/pull/8502) `inputs.http_listener_v2` Fix Stop() bug when plugin fails to start
+
+
+## v1.17.0 [2020-12-18]
+
+#### Release Notes
+
+  - Starlark plugins can now store state between runs using a global state variable. This lets you make custom aggregators as well as custom processors that are state-aware.
+  - New input plugins: Riemann-Protobuff Listener, Intel PowerStat
+  - New output plugins: Yandex.Cloud monitoring, Logz.io
+  - New parser plugin: Prometheus
+  - New serializer: Prometheus remote write
+
+#### Bugfixes
+
+  - [#8505](https://github.com/influxdata/telegraf/pull/8505) `inputs.vsphere` Fixed misspelled check for datacenter
+  - [#8499](https://github.com/influxdata/telegraf/pull/8499) `processors.execd` Adding support for new lines in influx line protocol fields.
+  - [#8254](https://github.com/influxdata/telegraf/pull/8254) `serializers.carbon2` Fix carbon2 tests
+  - [#8498](https://github.com/influxdata/telegraf/pull/8498) `inputs.http_response` fixed network test
+  - [#8414](https://github.com/influxdata/telegraf/pull/8414) `inputs.bcache` Fix tests for Windows - part 1
+  - [#8577](https://github.com/influxdata/telegraf/pull/8577) `inputs.ping` fix potential issue with race condition
+  - [#8562](https://github.com/influxdata/telegraf/pull/8562) `inputs.mqtt_consumer` fix issue with mqtt concurrent map write
+  - [#8574](https://github.com/influxdata/telegraf/pull/8574) `inputs.ecs` Remove duplicated field "revision" from ecs_task because it's already defined as a tag there
+  - [#8551](https://github.com/influxdata/telegraf/pull/8551) `inputs.socket_listener` fix crash when socket_listener receiving invalid data
+  - [#8564](https://github.com/influxdata/telegraf/pull/8564) `parsers.graphite` Graphite tags parser
+  - [#8472](https://github.com/influxdata/telegraf/pull/8472) `inputs.kube_inventory` Fixing issue with missing metrics when pod has only pending containers
+  - [#8542](https://github.com/influxdata/telegraf/pull/8542) `inputs.aerospike` fix edge case in aerospike plugin where an expected hex string was converted to integer if all digits
+  - [#8512](https://github.com/influxdata/telegraf/pull/8512) `inputs.kube_inventory` Update string parsing of allocatable cpu cores in kube_inventory
+
+#### Features
+
+  - [#8038](https://github.com/influxdata/telegraf/pull/8038) `inputs.jenkins` feat: add build number field to jenkins_job measurement
+  - [#7345](https://github.com/influxdata/telegraf/pull/7345) `inputs.ping` Add percentiles to the ping plugin
+  - [#8369](https://github.com/influxdata/telegraf/pull/8369) `inputs.sqlserver` Added tags for monitoring readable secondaries for Azure SQL MI
+  - [#8379](https://github.com/influxdata/telegraf/pull/8379) `inputs.sqlserver` SQL Server HA/DR Availability Group queries
+  - [#8520](https://github.com/influxdata/telegraf/pull/8520) Add initialization example to mock-plugin.
+  - [#8426](https://github.com/influxdata/telegraf/pull/8426) `inputs.snmp` Add support to convert snmp hex strings to integers
+  - [#8509](https://github.com/influxdata/telegraf/pull/8509) `inputs.statsd` Add configurable Max TTL duration for statsd input plugin entries
+  - [#8508](https://github.com/influxdata/telegraf/pull/8508) `inputs.bind` Add configurable timeout to bind input plugin http call
+  - [#8368](https://github.com/influxdata/telegraf/pull/8368) `inputs.sqlserver` Added is_primary_replica for monitoring readable secondaries for Azure SQL DB
+  - [#8462](https://github.com/influxdata/telegraf/pull/8462) `inputs.sqlserver` sqlAzureMIRequests - remove duplicate column [session_db_name]
+  - [#8464](https://github.com/influxdata/telegraf/pull/8464) `inputs.sqlserver` Add column measurement_db_type to output of all queries if not empty
+  - [#8389](https://github.com/influxdata/telegraf/pull/8389) `inputs.opcua` Add node groups to opcua input plugin
+  - [#8432](https://github.com/influxdata/telegraf/pull/8432) add support for linux/ppc64le
+  - [#8474](https://github.com/influxdata/telegraf/pull/8474) `inputs.modbus` Add FLOAT64-IEEE support to inputs.modbus (#8361) (by @Nemecsek)
+  - [#8447](https://github.com/influxdata/telegraf/pull/8447) `processors.starlark` Add the shared state to the global scope to get previous data
+  - [#8383](https://github.com/influxdata/telegraf/pull/8383) `inputs.zfs` Add dataset metrics to zfs input
+  - [#8429](https://github.com/influxdata/telegraf/pull/8429) `outputs.nats` Added "name" parameter to NATS output plugin
+  - [#8477](https://github.com/influxdata/telegraf/pull/8477) `inputs.http` proxy support for http input
+  - [#8466](https://github.com/influxdata/telegraf/pull/8466) `inputs.snmp` Translate snmp field values
+  - [#8435](https://github.com/influxdata/telegraf/pull/8435) `common.kafka` Enable kafka zstd compression and idempotent writes
+  - [#8056](https://github.com/influxdata/telegraf/pull/8056) `inputs.monit` Add response_time to monit plugin
+  - [#8446](https://github.com/influxdata/telegraf/pull/8446) update to go 1.15.5
+  - [#8428](https://github.com/influxdata/telegraf/pull/8428) `aggregators.basicstats` Add rate and interval to the basicstats aggregator plugin
+  - [#8575](https://github.com/influxdata/telegraf/pull/8575) `inputs.win_services` Added Glob pattern matching for "Windows Services" plugin
+  - [#6132](https://github.com/influxdata/telegraf/pull/6132) `inputs.mysql` Add per user metrics to mysql input
+  - [#8500](https://github.com/influxdata/telegraf/pull/8500) `inputs.github` [inputs.github] Add query of pull-request statistics
+  - [#8598](https://github.com/influxdata/telegraf/pull/8598) `processors.enum` Allow globs (wildcards) in config for tags/fields in enum processor
+  - [#8590](https://github.com/influxdata/telegraf/pull/8590) `inputs.ethtool` [ethtool] interface_up field added
+  - [#8579](https://github.com/influxdata/telegraf/pull/8579) `parsers.json` Add wildcard tags json parser support
+
+
+#### New Parser Plugins
+
+  - [#7778](https://github.com/influxdata/telegraf/pull/7778) `parsers.prometheus` Add a parser plugin for prometheus
+
+#### New Serializer Plugins
+
+  - [#8360](https://github.com/influxdata/telegraf/pull/8360) `serializers.prometheusremotewrite` Add prometheus remote write serializer
+
+#### New Input Plugins
+
+  - [#8163](https://github.com/influxdata/telegraf/pull/8163) `inputs.riemann` Support Riemann-Protobuff Listener
+  - [#8488](https://github.com/influxdata/telegraf/pull/8488) `inputs.intel_powerstat` New Intel PowerStat input plugin
+
+#### New Output Plugins
+
+  - [#8296](https://github.com/influxdata/telegraf/pull/8296) `outputs.yandex_cloud_monitoring` #8295 Initial Yandex.Cloud monitoring
+  - [#8202](https://github.com/influxdata/telegraf/pull/8202) `outputs.logzio` A new Logz.io output plugin
+
+
+## v1.16.3 [2020-12-01]
+
+#### Bugfixes
+
+  - [#8483](https://github.com/influxdata/telegraf/pull/8483) `inputs.gnmi` Log SubscribeResponse_Error message and code. #8482
+  - [#7987](https://github.com/influxdata/telegraf/pull/7987) update godirwalk to v1.16.1
+  - [#8438](https://github.com/influxdata/telegraf/pull/8438) `processors.starlark` Starlark example dropbytype
+  - [#8468](https://github.com/influxdata/telegraf/pull/8468) `inputs.sqlserver` Fix typo in column name
+  - [#8461](https://github.com/influxdata/telegraf/pull/8461) `inputs.phpfpm` [php-fpm] Fix possible "index out of range"
+  - [#8444](https://github.com/influxdata/telegraf/pull/8444) `inputs.apcupsd` Update mdlayher/apcupsd dependency
+  - [#8439](https://github.com/influxdata/telegraf/pull/8439) `processors.starlark` Show how to return a custom error with the Starlark processor
+  - [#8440](https://github.com/influxdata/telegraf/pull/8440) `parsers.csv` keep field name as is for csv timestamp column
+  - [#8436](https://github.com/influxdata/telegraf/pull/8436) `inputs.nvidia_smi` Add DriverVersion and CUDA Version to output
+  - [#8423](https://github.com/influxdata/telegraf/pull/8423) `processors.starlark` Show how to return several metrics with the Starlark processor
+  - [#8408](https://github.com/influxdata/telegraf/pull/8408) `processors.starlark` Support logging in starlark
+  - [#8315](https://github.com/influxdata/telegraf/pull/8315) add kinesis output to external plugins list
+  - [#8406](https://github.com/influxdata/telegraf/pull/8406) `outputs.wavefront` #8405 add non-retryable debug logging
+  - [#8404](https://github.com/influxdata/telegraf/pull/8404) `outputs.wavefront` Wavefront output should distinguish between retryable and non-retryable errors
+  - [#8401](https://github.com/influxdata/telegraf/pull/8401) `processors.starlark` Allow to catch errors that occur in the apply function
+
+
+## v1.16.2 [2020-11-13]
+
+#### Bugfixes
+
+  - [#8400](https://github.com/influxdata/telegraf/pull/8400) `parsers.csv` Fix parsing of multiple files with different headers (#6318).
+  - [#8326](https://github.com/influxdata/telegraf/pull/8326) `inputs.proxmox` proxmox: ignore QEMU templates and iron out a few bugs
+  - [#7991](https://github.com/influxdata/telegraf/pull/7991) `inputs.systemd_units` systemd_units: add --plain to command invocation (#7990)
+  - [#8307](https://github.com/influxdata/telegraf/pull/8307) fix links in external plugins readme
+  - [#8370](https://github.com/influxdata/telegraf/pull/8370) `inputs.redis` Fix minor typos in readmes
+  - [#8374](https://github.com/influxdata/telegraf/pull/8374) `inputs.smart` Fix SMART plugin to recognize all devices from config
+  - [#8288](https://github.com/influxdata/telegraf/pull/8288) `inputs.redfish` Add OData-Version header to requests
+  - [#8357](https://github.com/influxdata/telegraf/pull/8357) `inputs.vsphere` Prydin issue 8169
+  - [#8356](https://github.com/influxdata/telegraf/pull/8356) `inputs.sqlserver` On-prem fix for #8324
+  - [#8165](https://github.com/influxdata/telegraf/pull/8165) `outputs.wavefront` [output.wavefront] Introduced "immediate_flush" flag
+  - [#7938](https://github.com/influxdata/telegraf/pull/7938) `inputs.gnmi` added support for bytes encoding
+  - [#8337](https://github.com/influxdata/telegraf/pull/8337) `inputs.dcos` Update jwt-go module to address CVE-2020-26160
+  - [#8350](https://github.com/influxdata/telegraf/pull/8350) `inputs.ras` fix plugins/input/ras test
+  - [#8329](https://github.com/influxdata/telegraf/pull/8329) `outputs.dynatrace` #8328 Fixed a bug with the state map in Dynatrace Plugin
+
+## v1.16.1 [2020-10-28]
+
+#### Release Notes
+
+  - [#8318](https://github.com/influxdata/telegraf/pull/8318) `common.kafka` kafka sasl-mechanism auth support for SCRAM-SHA-256, SCRAM-SHA-512, GSSAPI
+
+#### Bugfixes
+
+  - [#8331](https://github.com/influxdata/telegraf/pull/8331) `inputs.sqlserver` SQL Server Azure PerfCounters Fix
+  - [#8325](https://github.com/influxdata/telegraf/pull/8325) `inputs.sqlserver` SQL Server - PerformanceCounters - removed synthetic counters
+  - [#8324](https://github.com/influxdata/telegraf/pull/8324) `inputs.sqlserver` SQL Server - server_properties added sql_version_desc
+  - [#8317](https://github.com/influxdata/telegraf/pull/8317) `inputs.ras` Disable RAS input plugin on specific Linux architectures: mips64, mips64le, ppc64le, riscv64
+  - [#8309](https://github.com/influxdata/telegraf/pull/8309) `inputs.processes` processes: fix issue with stat no such file/dir
+  - [#8308](https://github.com/influxdata/telegraf/pull/8308) `inputs.win_perf_counters` fix issue with PDH_CALC_NEGATIVE_DENOMINATOR error
+  - [#8306](https://github.com/influxdata/telegraf/pull/8306) `inputs.ras` RAS plugin - fix for too many open files handlers
+
+
+## v1.16.0 [2020-10-21]
+
+#### Release Notes
+
+  - New [code examples](/plugins/processors/starlark/testdata) for the [Starlark processor](/plugins/processors/starlark/README.md)
+  - [#7920](https://github.com/influxdata/telegraf/pull/7920) `inputs.rabbitmq` remove deprecated healthcheck
+  - [#7953](https://github.com/influxdata/telegraf/pull/7953) Add details to connect to InfluxDB OSS 2 and Cloud 2
+  - [#8054](https://github.com/influxdata/telegraf/pull/8054) add guidelines run to external plugins with execd
+  - [#8198](https://github.com/influxdata/telegraf/pull/8198) `inputs.influxdb_v2_listener` change default influxdb port from 9999 to 8086 to match OSS 2.0 release
+  - [starlark](https://github.com/influxdata/telegraf/tree/release-1.16/plugins/processors/starlark/testdata) `processors.starlark` add various code exampels for the Starlark processor
+
+#### Features
+
+  - [#7814](https://github.com/influxdata/telegraf/pull/7814) `agent` Send metrics in FIFO order
+  - [#7869](https://github.com/influxdata/telegraf/pull/7869) `inputs.modbus` extend support of fixed point values on input
+  - [#7870](https://github.com/influxdata/telegraf/pull/7870) `inputs.mongodb` Added new metric "pages written from cache"
+  - [#7875](https://github.com/influxdata/telegraf/pull/7875) `inputs.consul` input consul - added metric_version flag
+  - [#7894](https://github.com/influxdata/telegraf/pull/7894) `inputs.cloudwatch` Implement AWS CloudWatch Input Plugin ListMetrics API calls to use Active Metric Filter
+  - [#7904](https://github.com/influxdata/telegraf/pull/7904) `inputs.clickhouse` add additional metrics to clickhouse input plugin
+  - [#7934](https://github.com/influxdata/telegraf/pull/7934) `inputs.sqlserver` Database_type config to Split up sql queries by engine type
+  - [#8018](https://github.com/influxdata/telegraf/pull/8018) `processors.ifname` Add addTag debugging in ifname plugin
+  - [#8019](https://github.com/influxdata/telegraf/pull/8019) `outputs.elasticsearch` added force_document_id option to ES output enable resend data and avoiding duplicated ES documents
+  - [#8025](https://github.com/influxdata/telegraf/pull/8025) `inputs.aerospike` Add set, and histogram reporting to aerospike telegraf plugin
+  - [#8082](https://github.com/influxdata/telegraf/pull/8082) `inputs.snmp` Add agent host tag configuration option
+  - [#8113](https://github.com/influxdata/telegraf/pull/8113) `inputs.smart` Add more missing NVMe attributes to smart plugin
+  - [#8120](https://github.com/influxdata/telegraf/pull/8120) `inputs.sqlserver` Added more performance counters to SqlServer input plugin
+  - [#8127](https://github.com/influxdata/telegraf/pull/8127) `agent` Sort plugin name lists for output
+  - [#8132](https://github.com/influxdata/telegraf/pull/8132) `outputs.sumologic` Sumo Logic output plugin: carbon2 default to include field in metric
+  - [#8133](https://github.com/influxdata/telegraf/pull/8133) `inputs.influxdb_v2_listener` influxdb_v2_listener - add /ready route
+  - [#8168](https://github.com/influxdata/telegraf/pull/8168) `processors.starlark` add json parsing support to starlark
+  - [#8186](https://github.com/influxdata/telegraf/pull/8186) `inputs.sqlserver` New sql server queries (Azure)
+  - [#8189](https://github.com/influxdata/telegraf/pull/8189) `inputs.snmp_trap` If the community string is available, add it as a tag
+  - [#8190](https://github.com/influxdata/telegraf/pull/8190) `inputs.tail` Semigroupoid multiline (#8167)
+  - [#8196](https://github.com/influxdata/telegraf/pull/8196) `inputs.redis` add functionality to get values from redis commands
+  - [#8220](https://github.com/influxdata/telegraf/pull/8220) `build` update to Go 1.15
+  - [#8032](https://github.com/influxdata/telegraf/pull/8032) `inputs.http_response` http_response: match on status code
+  - [#8172](https://github.com/influxdata/telegraf/pull/8172) `inputs.sqlserver` New sql server queries (on-prem) - refactoring and formatting
+
+#### Bugfixes
+
+  - [#7816](https://github.com/influxdata/telegraf/pull/7816) `shim` fix bug with loading plugins in shim with no config
+  - [#7818](https://github.com/influxdata/telegraf/pull/7818) `build` Fix darwin package build flags
+  - [#7819](https://github.com/influxdata/telegraf/pull/7819) `inputs.tail` Close file to ensure it has been flushed
+  - [#7853](https://github.com/influxdata/telegraf/pull/7853) Initialize aggregation processors
+  - [#7865](https://github.com/influxdata/telegraf/pull/7865) `common.shim` shim logger improvements
+  - [#7867](https://github.com/influxdata/telegraf/pull/7867) `inputs.execd` fix issue with execd restart_delay being ignored
+  - [#7872](https://github.com/influxdata/telegraf/pull/7872) `inputs.gnmi` Recv next message after send returns EOF
+  - [#7877](https://github.com/influxdata/telegraf/pull/7877) Fix arch name in deb/rpm builds
+  - [#7909](https://github.com/influxdata/telegraf/pull/7909) fixes issue with rpm /var/log/telegraf permissions
+  - [#7918](https://github.com/influxdata/telegraf/pull/7918) `inputs.net` fix broken link to proc.c
+  - [#7927](https://github.com/influxdata/telegraf/pull/7927) `inputs.tail` Fix tail following on EOF
+  - [#8005](https://github.com/influxdata/telegraf/pull/8005) Fix docker-image make target
+  - [#8039](https://github.com/influxdata/telegraf/pull/8039) `serializers.splunkmetric` Remove Event field as it is causing issues with pre-trained source types
+  - [#8048](https://github.com/influxdata/telegraf/pull/8048) `inputs.jenkins` Multiple escaping occurs on Jenkins URLs at certain folder depth
+  - [#8071](https://github.com/influxdata/telegraf/pull/8071) `inputs.kubernetes` add missing error check for HTTP req failure
+  - [#8145](https://github.com/influxdata/telegraf/pull/8145) `processors.execd` Increased the maximum serialized metric size in line protocol
+  - [#8159](https://github.com/influxdata/telegraf/pull/8159) `outputs.dynatrace` Dynatrace Output: change handling of monotonic counters
+  - [#8176](https://github.com/influxdata/telegraf/pull/8176) fix panic on streaming processers using logging
+  - [#8177](https://github.com/influxdata/telegraf/pull/8177) `parsers.influx` fix: plugins/parsers/influx: avoid ParseError.Error panic
+  - [#8199](https://github.com/influxdata/telegraf/pull/8199) `inputs.docker` Fix vulnerabilities found in BDBA scan
+  - [#8200](https://github.com/influxdata/telegraf/pull/8200) `inputs.sqlserver` Fixed Query mapping
+  - [#8201](https://github.com/influxdata/telegraf/pull/8201) `outputs.sumologic` Fix carbon2 serializer not falling through to field separate when carbon2_format field is unset
+  - [#8210](https://github.com/influxdata/telegraf/pull/8210) update gopsutil: fix procstat performance regression
+  - [#8162](https://github.com/influxdata/telegraf/pull/8162) Fix bool serialization when using carbon2
+  - [#8240](https://github.com/influxdata/telegraf/pull/8240) Fix bugs found by LGTM analysis platform
+  - [#8251](https://github.com/influxdata/telegraf/pull/8251) `outputs.dynatrace` Dynatrace Output Plugin: Fixed behaviour when state map is cleared
+  - [#8274](https://github.com/influxdata/telegraf/pull/8274) `common.shim` fix issue with loading processor config from execd
+
+#### New Input Plugins
+
+  - [influxdb_v2_listener](/plugins/inputs/influxdb_v2_listener/README.md) Influxdb v2 listener - Contributed by @magichair
+  - [intel_rdt](/plugins/inputs/intel_rdt/README.md) New input plugin for Intel RDT (Intel Resource Director Technology) - Contributed by @p-zak
+  - [nsd](/plugins/inputs/nsd/README.md) add nsd input plugin - Contributed by @gearnode
+  - [opcua](/plugins/inputs/opcua/README.md) Add OPC UA input plugin - Contributed by InfluxData
+  - [proxmox](/plugins/inputs/proxmox/README.md) Proxmox plugin - Contributed by @effitient
+  - [ras](/plugins/inputs/ras/README.md) New input plugin for RAS (Reliability, Availability and Serviceability) - Contributed by @p-zak
+  - [win_eventlog](/plugins/inputs/win_eventlog/README.md) Windows eventlog input plugin - Contributed by @simnv
+
+#### New Output Plugins
+
+  - [dynatrace](/plugins/outputs/dynatrace/README.md) Dynatrace output plugin - Contributed by @thschue
+  - [sumologic](/plugins/outputs/sumologic/README.md) Sumo Logic output plugin - Contributed by @pmalek-sumo
+  - [timestream](/plugins/outputs/timestream) Timestream Output Plugin - Contributed by @piotrwest
+
+#### New External Plugins
+
+  See [EXTERNAL_PLUGINS.md](/EXTERNAL_PLUGINS.md) for a full list of external plugins
+
+  - [awsalarms](https://github.com/vipinvkmenon/awsalarms) - Simple plugin to gather/monitor alarms generated  in AWS.
+  - [youtube-telegraf-plugin](https://github.com/inabagumi/youtube-telegraf-plugin) - Gather view and subscriber stats from your youtube videos
+  - [octoprint](https://github.com/BattleBas/octoprint-telegraf-plugin) - Gather 3d print information from the octoprint API.
+  - [systemd-timings](https://github.com/pdmorrow/telegraf-execd-systemd-timings) - Gather systemd boot and unit timestamp metrics.
+
+## v1.15.4 [2020-10-20]
+>>>>>>> CHANGELOG.md
+
+#### Bugfixes
+
+  - [#8274](https://github.com/influxdata/telegraf/pull/8274) `common.shim` fix issue with loading processor config from execd
+  - [#8176](https://github.com/influxdata/telegraf/pull/8176) `agent` fix panic on streaming processers using logging
+
+## v1.15.3 [2020-09-11]
+
+#### Release Notes
+
+  - Many documentation updates
+  - New [code examples](https://github.com/influxdata/telegraf/tree/master/plugins/processors/starlark/testdata) for the [Starlark processor](https://github.com/influxdata/telegraf/blob/master/plugins/processors/starlark/README.md)
+
+#### Bugfixes
+
+  - [#7999](https://github.com/influxdata/telegraf/pull/7999) `agent` fix minor agent error message race condition
+  - [#8051](https://github.com/influxdata/telegraf/pull/8051) `build` fix docker build. update dockerfiles to Go 1.14
+  - [#8052](https://github.com/influxdata/telegraf/pull/8052) `shim` fix bug in shim logger affecting AddError
+  - [#7996](https://github.com/influxdata/telegraf/pull/7996) `shim` fix issue with shim use of config.Duration
+  - [#8006](https://github.com/influxdata/telegraf/pull/8006) `inputs.eventhub_consumer` Fix string to int conversion in eventhub consumer
+  - [#7986](https://github.com/influxdata/telegraf/pull/7986) `inputs.http_listener_v2` make http header tags case insensitive
+  - [#7869](https://github.com/influxdata/telegraf/pull/7869) `inputs.modbus` extend support of fixed point values on input
+  - [#7861](https://github.com/influxdata/telegraf/pull/7861) `inputs.ping` Fix Ping Input plugin for FreeBSD's ping6
+  - [#7808](https://github.com/influxdata/telegraf/pull/7808) `inputs.sqlserver` added new counter - Lock Timeouts (timeout > 0)/sec
+  - [#8026](https://github.com/influxdata/telegraf/pull/8026) `inputs.vsphere` vSphere Fixed missing clustername issue 7878
+  - [#8020](https://github.com/influxdata/telegraf/pull/8020) `processors.starlark` improve the quality of starlark docs by executing them as tests
+  - [#7976](https://github.com/influxdata/telegraf/pull/7976) `processors.starlark` add pivot example for starlark processor
+  - [#7134](https://github.com/influxdata/telegraf/pull/7134) `outputs.application_insights` Added the ability to set the endpoint url
+  - [#7908](https://github.com/influxdata/telegraf/pull/7908) `outputs.opentsdb` fix JSON handling of values NaN and Inf
+
+## v1.15.2 [2020-07-31]
+
+#### Bug Fixes
+
 - [#7905](https://github.com/influxdata/telegraf/issues/7905): Fix RPM /var/log/telegraf permissions
 - [#7880](https://github.com/influxdata/telegraf/issues/7880): Fix tail following on EOF
 
 ## v1.15.1 [2020-07-22]
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#7877](https://github.com/influxdata/telegraf/pull/7877): Fix architecture in non-amd64 deb and rpm packages.
 
@@ -128,7 +438,7 @@
 - [#7154](https://github.com/influxdata/telegraf/pull/7154): Add v3 metadata support to ecs input.
 - [#7792](https://github.com/influxdata/telegraf/pull/7792): Support utf-16 in file and tail inputs.
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#7371](https://github.com/influxdata/telegraf/issues/7371): Fix unable to write metrics to CloudWatch with IMDSv1 disabled.
 - [#7233](https://github.com/influxdata/telegraf/issues/7233): Fix vSphere 6.7 missing data issue.
@@ -147,7 +457,7 @@
 
 ## v1.14.5 [2020-06-30]
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#7686](https://github.com/influxdata/telegraf/pull/7686): Improve the performance of the procstat input.
 - [#7658](https://github.com/influxdata/telegraf/pull/7658): Fix ping exit code handling on non-Linux.
@@ -159,7 +469,7 @@
 
 ## v1.14.4 [2020-06-09]
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#7325](https://github.com/influxdata/telegraf/issues/7325): Fix "cannot insert the value NULL error" with PerformanceCounters query.
 - [#7579](https://github.com/influxdata/telegraf/pull/7579): Fix numeric to bool conversion in converter processor.
@@ -168,7 +478,7 @@
 
 ## v1.14.3 [2020-05-19]
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#7412](https://github.com/influxdata/telegraf/pull/7412): Use same timestamp for all objects in arrays in the json parser.
 - [#7343](https://github.com/influxdata/telegraf/issues/7343): Handle multiple metrics with the same timestamp in dedup processor.
@@ -177,7 +487,7 @@
 
 ## v1.14.2 [2020-04-28]
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#7241](https://github.com/influxdata/telegraf/issues/7241): Trim whitespace from instance tag in sqlserver input.
 - [#7322](https://github.com/influxdata/telegraf/issues/7322): Use increased AWS Cloudwatch GetMetricData limit of 500 metrics per call.
@@ -191,7 +501,7 @@
 
 ## v1.14.1 [2020-04-14]
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#7236](https://github.com/influxdata/telegraf/issues/7236): Fix PerformanceCounter query performance degradation in sqlserver input.
 - [#7257](https://github.com/influxdata/telegraf/issues/7257): Fix error when using the Name field in template processor.
@@ -271,7 +581,7 @@
 - [#7150](https://github.com/influxdata/telegraf/pull/7150): Add option for explicitly including queries in sqlserver input.
 - [#7173](https://github.com/influxdata/telegraf/pull/7173): Add support for GNMI DecimalVal type to cisco_telemetry_gnmi.
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#6397](https://github.com/influxdata/telegraf/issues/6397): Fix conversion to floats in AzureDBResourceStats query in the sqlserver input.
 - [#6867](https://github.com/influxdata/telegraf/issues/6867): Fix case sensitive collation in sqlserver input.
@@ -291,7 +601,7 @@
 
 - Official packages now built with Go 1.13.8.
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#6988](https://github.com/influxdata/telegraf/issues/6988): Parse NaN values from summary types in prometheus input.
 - [#6820](https://github.com/influxdata/telegraf/issues/6820): Fix pgbouncer input when used with newer pgbouncer versions.
@@ -303,7 +613,7 @@
 
 ## v1.13.3 [2020-02-04]
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#5744](https://github.com/influxdata/telegraf/issues/5744): Fix kibana input with Kibana versions greater than 6.4.
 - [#6960](https://github.com/influxdata/telegraf/issues/6960): Fix duplicate TrackingIDs can be returned in queue consumer plugins.
@@ -312,7 +622,7 @@
 
 ## v1.13.2 [2020-01-21]
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#2652](https://github.com/influxdata/telegraf/issues/2652): Warn without error when processes input is started on Windows.
 - [#6890](https://github.com/influxdata/telegraf/issues/6890): Only parse certificate blocks in x509_cert input.
@@ -324,7 +634,7 @@
 
 ## v1.13.1 [2020-01-08]
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#6788](https://github.com/influxdata/telegraf/issues/6788): Fix ServerProperty query stops working on Azure after failover.
 - [#6803](https://github.com/influxdata/telegraf/pull/6803): Add leading period to OID in SNMP v1 generic traps.
@@ -410,7 +720,7 @@
 - [#6740](https://github.com/influxdata/telegraf/pull/6740): Add base64decode operation to string processor.
 - [#6790](https://github.com/influxdata/telegraf/pull/6790): Add option to control collecting global variables to mysql input.
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#6484](https://github.com/influxdata/telegraf/issues/6484): Show correct default settings in mysql sample config.
 - [#6583](https://github.com/influxdata/telegraf/issues/6583): Use 1h or 3h rain values as appropriate in openweathermap input.
@@ -427,7 +737,7 @@
 
 ## v1.12.6 [2019-11-19]
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#6666](https://github.com/influxdata/telegraf/issues/6666): Fix many plugin errors are logged at debug logging level.
 - [#6652](https://github.com/influxdata/telegraf/issues/6652): Use nanosecond precision in docker_log input.
@@ -436,7 +746,7 @@
 
 ## v1.12.5 [2019-11-12]
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#6576](https://github.com/influxdata/telegraf/issues/6576): Fix incorrect results in ping input plugin.
 - [#6610](https://github.com/influxdata/telegraf/pull/6610): Add missing character replacement to sql_instance tag.
@@ -454,7 +764,7 @@
 
 - Official packages built with Go 1.12.12.
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#6521](https://github.com/influxdata/telegraf/issues/6521): Fix metric generation with ping input native method.
 - [#6541](https://github.com/influxdata/telegraf/issues/6541): Exclude alias tag if unset from plugin internal stats.
@@ -462,7 +772,7 @@
 
 ## v1.12.3 [2019-10-07]
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#6445](https://github.com/influxdata/telegraf/issues/6445): Use batch serialization format in exec output.
 - [#6455](https://github.com/influxdata/telegraf/issues/6455): Build official packages with Go 1.12.10.
@@ -474,7 +784,7 @@
 
 ## v1.12.2 [2019-09-24]
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#6386](https://github.com/influxdata/telegraf/issues/6386): Fix detection of layout timestamps in csv and json parser.
 - [#6394](https://github.com/influxdata/telegraf/issues/6394): Fix parsing of BATTDATE in apcupsd input.
@@ -484,7 +794,7 @@
 
 ## v1.12.1 [2019-09-10]
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#6344](https://github.com/influxdata/telegraf/issues/6344): Fix depends on GLIBC_2.14 symbol version.
 - [#6329](https://github.com/influxdata/telegraf/issues/6329): Fix filecount for paths with trailing slash.
@@ -581,7 +891,7 @@
 - [#6207](https://github.com/influxdata/telegraf/pull/6207): Add ability to label inputs for logging.
 - [#6300](https://github.com/influxdata/telegraf/pull/6300): Add TLS support to nginx_plus, nginx_plus_api and nginx_vts.
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#5692](https://github.com/influxdata/telegraf/issues/5692): Fix sensor read error stops reporting of all sensors in temp input.
 - [#4356](https://github.com/influxdata/telegraf/issues/4356): Fix double pct replacement in sysstat input.
@@ -598,7 +908,7 @@
 
 ## v1.11.5 [2019-08-27]
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#6250](https://github.com/influxdata/telegraf/pull/6250): Update go-sql-driver/mysql driver to 1.4.1 to address auth issues.
 - [#6279](https://github.com/influxdata/telegraf/issues/6279): Return error status from --test if input plugins produce an error.
@@ -611,7 +921,7 @@
 
 ## v1.11.4 [2019-08-06]
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#6200](https://github.com/influxdata/telegraf/pull/6200): Correct typo in kubernetes logsfs_available_bytes field.
 - [#6191](https://github.com/influxdata/telegraf/issues/6191): Skip floats that are NaN or Inf in Datadog output.
@@ -619,7 +929,7 @@
 
 ## v1.11.3 [2019-07-23]
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#6054](https://github.com/influxdata/telegraf/issues/6054): Fix unable to reconnect after vCenter reboot in vsphere input.
 - [#6073](https://github.com/influxdata/telegraf/issues/6073): Handle unknown error in nvidia-smi output.
@@ -632,7 +942,7 @@
 
 ## v1.11.2 [2019-07-09]
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#6056](https://github.com/influxdata/telegraf/pull/6056): Fix source address ping flag on BSD.
 - [#6059](https://github.com/influxdata/telegraf/issues/6059): Fix value out of range error on 32-bit systems in bind input.
@@ -643,7 +953,7 @@
 
 ## v1.11.1 [2019-06-25]
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#5980](https://github.com/influxdata/telegraf/issues/5980): Cannot set mount_points option in disk input.
 - [#5983](https://github.com/influxdata/telegraf/issues/5983): Omit keys when creating measurement names for GNMI telemetry.
@@ -720,7 +1030,7 @@
 - [#5547](https://github.com/influxdata/telegraf/pull/5547): Add file rotation support to the file output.
 - [#5955](https://github.com/influxdata/telegraf/pull/5955): Add source tag to hddtemp plugin.
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#5692](https://github.com/influxdata/telegraf/pull/5692): Temperature input plugin stops working when WiFi is turned off.
 - [#5631](https://github.com/influxdata/telegraf/pull/5631): Create Windows service only when specified or in service manager.
@@ -746,7 +1056,7 @@
 
 ## v1.10.4 [2019-05-14]
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#5764](https://github.com/influxdata/telegraf/pull/5764): Fix race condition in the Wavefront parser.
 - [#5783](https://github.com/influxdata/telegraf/pull/5783): Create telegraf user in pre-install rpm scriptlet.
@@ -760,7 +1070,7 @@
 
 ## v1.10.3 [2019-04-16]
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#5680](https://github.com/influxdata/telegraf/pull/5680): Allow colons in metric names in prometheus_client output.
 - [#5716](https://github.com/influxdata/telegraf/pull/5716): Set log directory attributes in rpm spec.
@@ -773,7 +1083,7 @@
   the grok parser.  If you are capturing quoted strings you may need to update
   the patterns.
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#5612](https://github.com/influxdata/telegraf/pull/5612): Fix deadlock when Telegraf is aligning aggregators.
 - [#5523](https://github.com/influxdata/telegraf/issues/5523): Fix missing cluster stats in ceph input.
@@ -793,7 +1103,7 @@
 
 ## v1.10.1 [2019-03-19]
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#5448](https://github.com/influxdata/telegraf/issues/5448): Show error when TLS configuration cannot be loaded.
 - [#5543](https://github.com/influxdata/telegraf/pull/5543): Add Base64-encoding/decoding for Google Cloud PubSub plugins.
@@ -863,7 +1173,7 @@
 - [#5490](https://github.com/influxdata/telegraf/pull/5490): Add tag based routing in influxdb/influxdb_v2 outputs.
 - [#5533](https://github.com/influxdata/telegraf/pull/5533): Allow grok parser to produce metrics with no fields.
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#4610](https://github.com/influxdata/telegraf/pull/4610): Fix initscript removes pidfile of restarted Telegraf process.
 - [#5320](https://github.com/influxdata/telegraf/pull/5320): Use datacenter option spelling in consul input.
@@ -879,7 +1189,7 @@
 
 ## v1.9.5 [2019-02-26]
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#5315](https://github.com/influxdata/telegraf/issues/5315): Skip string fields when writing to stackdriver output.
 - [#5364](https://github.com/influxdata/telegraf/issues/5364): Send metrics in ascending time order in stackdriver output.
@@ -893,7 +1203,7 @@
 
 ## v1.9.4 [2019-02-05]
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#5334](https://github.com/influxdata/telegraf/issues/5334): Fix skip_rows and skip_columns options in csv parser.
 - [#5181](https://github.com/influxdata/telegraf/issues/5181): Always send basic auth in jenkins input.
@@ -902,7 +1212,7 @@
 
 ## v1.9.3 [2019-01-22]
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#5261](https://github.com/influxdata/telegraf/pull/5261):  Fix arithmetic overflow in sqlserver input.
 - [#5194](https://github.com/influxdata/telegraf/issues/5194): Fix latest metrics not sent first when output fails.
@@ -913,7 +1223,7 @@
 
 ## v1.9.2 [2019-01-08]
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#5130](https://github.com/influxdata/telegraf/pull/5130): Increase varnishstat timeout.
 - [#5135](https://github.com/influxdata/telegraf/pull/5135): Remove storage calculation for non Azure managed instances and add server version.
@@ -932,7 +1242,7 @@
 
 ## v1.9.1 [2018-12-11]
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#5006](https://github.com/influxdata/telegraf/issues/5006): Fix boolean handling in splunkmetric serializer.
 - [#5046](https://github.com/influxdata/telegraf/issues/5046): Set default config values in jenkins input.
@@ -1001,7 +1311,7 @@
 - [#4920](https://github.com/influxdata/telegraf/pull/4920): Add scraping for Prometheus endpoint in Kubernetes.
 - [#4938](https://github.com/influxdata/telegraf/pull/4938): Add per output flush_interval, metric_buffer_limit and metric_batch_size.
 
-#### Bugfixes
+#### Bug Fixes
 
 - [#4950](https://github.com/influxdata/telegraf/pull/4950): Remove the time_key from the field values in JSON parser.
 - [#3968](https://github.com/influxdata/telegraf/issues/3968): Fix input time rounding when using a custom interval.
@@ -1014,7 +1324,7 @@
 
 ## v1.8.3 [2018-10-30]
 
-### Bugfixes
+### Bug Fixes
 
 - [#4873](https://github.com/influxdata/telegraf/pull/4873): Add DN attributes as tags in x509_cert input to avoid series overwrite.
 - [#4921](https://github.com/influxdata/telegraf/issues/4921): Prevent connection leak by closing unused connections in amqp output.
@@ -1026,7 +1336,7 @@
 
 ## v1.8.2 [2018-10-17]
 
-### Bugfixes
+### Bug Fixes
 
 - [#4844](https://github.com/influxdata/telegraf/pull/4844): Update write path to match updated InfluxDB v2 API.
 - [#4840](https://github.com/influxdata/telegraf/pull/4840): Fix missing timeouts in vsphere input.
@@ -1041,7 +1351,7 @@
 
 ## v1.8.1 [2018-10-03]
 
-### Bugfixes
+### Bug Fixes
 
 - [#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.
@@ -1165,7 +1475,7 @@
 - [#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
+### Bug Fixes
 
 - [#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.
@@ -1182,7 +1492,7 @@
 
 ## v1.7.4 [2018-08-29]
 
-### Bugfixes
+### Bug Fixes
 
 - [#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.
@@ -1195,7 +1505,7 @@
 
 ## v1.7.3 [2018-08-07]
 
-### Bugfixes
+### Bug Fixes
 
 - [#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.
@@ -1207,7 +1517,7 @@
 
 ## v1.7.2 [2018-07-18]
 
-### Bugfixes
+### Bug Fixes
 
 - [#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.
@@ -1219,7 +1529,7 @@
 
 ## v1.7.1 [2018-07-03]
 
-### Bugfixes
+### Bug Fixes
 
 - [#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.
@@ -1296,7 +1606,7 @@
 - [#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
+### Bug Fixes
 
 - [#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.
@@ -1310,7 +1620,7 @@
 
 ## v1.6.4 [2018-06-05]
 
-### Bugfixes
+### Bug Fixes
 
 - [#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.
@@ -1319,7 +1629,7 @@
 
 ## v1.6.3 [2018-05-21]
 
-### Bugfixes
+### Bug Fixes
 
 - [#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.
@@ -1330,7 +1640,7 @@
 
 ## v1.6.2 [2018-05-08]
 
-### Bugfixes
+### Bug Fixes
 
 - [#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.
@@ -1340,7 +1650,7 @@
 
 ## v1.6.1 [2018-04-23]
 
-### Bugfixes
+### Bug Fixes
 
 - [#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.
@@ -1449,7 +1759,7 @@
 - [#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
+### Bug Fixes
 
 - [#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.
@@ -1466,7 +1776,7 @@
 
 ## v1.5.3 [2018-03-14]
 
-### Bugfixes
+### Bug Fixes
 
 - [#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.
@@ -1478,7 +1788,7 @@
 
 ## v1.5.2 [2018-01-30]
 
-### Bugfixes
+### Bug Fixes
 
 - [#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.
@@ -1492,7 +1802,7 @@
 
 ## v1.5.1 [2018-01-10]
 
-### Bugfixes
+### Bug Fixes
 
 - [#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.
@@ -1588,7 +1898,7 @@
 - [#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
+### Bug Fixes
 
 - [#3136](https://github.com/influxdata/telegraf/issues/3136): Fix webhooks input address in use during reload.
 - [#3258](https://github.com/influxdata/telegraf/issues/3258): Unlock Statsd when stopping to prevent deadlock.
@@ -1607,7 +1917,7 @@
 
 ## v1.4.5 [2017-12-01]
 
-### Bugfixes
+### Bug Fixes
 
 - [#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.
@@ -1615,7 +1925,7 @@
 
 ## v1.4.4 [2017-11-08]
 
-### Bugfixes
+### Bug Fixes
 
 - [#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.
@@ -1625,7 +1935,7 @@
 
 ## v1.4.3 [2017-10-25]
 
-### Bugfixes
+### Bug Fixes
 
 - [#3327](https://github.com/influxdata/telegraf/issues/3327): Fix container name filters in docker input.
 - [#3321](https://github.com/influxdata/telegraf/issues/3321): Fix snmpwalk address format in leofs input.
@@ -1641,7 +1951,7 @@
 
 ## v1.4.2 [2017-10-10]
 
-### Bugfixes
+### Bug Fixes
 
 - [#3259](https://github.com/influxdata/telegraf/issues/3259): Fix error if int larger than 32-bit in /proc/vmstat.
 - [#3265](https://github.com/influxdata/telegraf/issues/3265): Fix parsing of JSON with a UTF8 BOM in httpjson.
@@ -1655,7 +1965,7 @@
 
 ## v1.4.1 [2017-09-26]
 
-### Bugfixes
+### Bug Fixes
 
 - [#3167](https://github.com/influxdata/telegraf/issues/3167): Fix MQTT input exits if Broker is not available on startup.
 - [#3217](https://github.com/influxdata/telegraf/issues/3217): Fix optional field value conversions in fluentd input.
@@ -1732,7 +2042,7 @@
 - [#3112](https://github.com/influxdata/telegraf/pull/3112): Add tomcat input plugin.
 - [#3182](https://github.com/influxdata/telegraf/pull/3182): HTTP headers can be added to InfluxDB output.
 
-### Bugfixes
+### Bug Fixes
 
 - [#2607](https://github.com/influxdata/telegraf/issues/2607): Improve logging of errors in Cassandra input.
 - [#2819](https://github.com/influxdata/telegraf/pull/2819): [enh] set db_version at 0 if query version fails
@@ -1775,7 +2085,7 @@
 
 ## v1.3.5 [2017-07-26]
 
-### Bugfixes
+### Bug Fixes
 
 - [#3049](https://github.com/influxdata/telegraf/issues/3049): Fix prometheus output cannot be reloaded.
 - [#3037](https://github.com/influxdata/telegraf/issues/3037): Fix filestat reporting exists when cannot list directory.
@@ -1784,7 +2094,7 @@
 
 ## v1.3.4 [2017-07-12]
 
-### Bugfixes
+### Bug Fixes
 
 - [#3001](https://github.com/influxdata/telegraf/issues/3001): Fix handling of escape characters within fields.
 - [#2988](https://github.com/influxdata/telegraf/issues/2988): Fix chrony plugin does not track system time offset.
@@ -1793,7 +2103,7 @@
 
 ## v1.3.3 [2017-06-28]
 
-### Bugfixes
+### Bug Fixes
 
 - [#2915](https://github.com/influxdata/telegraf/issues/2915): Allow dos line endings in tail and logparser.
 - [#2937](https://github.com/influxdata/telegraf/issues/2937): Remove label value sanitization in prometheus output.
@@ -1802,7 +2112,7 @@
 
 ## v1.3.2 [2017-06-14]
 
-### Bugfixes
+### Bug Fixes
 
 - [#2862](https://github.com/influxdata/telegraf/issues/2862): Fix InfluxDB UDP metric splitting.
 - [#2888](https://github.com/influxdata/telegraf/issues/2888): Fix mongodb/leofs urls without scheme.
@@ -1810,7 +2120,7 @@
 
 ## v1.3.1 [2017-05-31]
 
-### Bugfixes
+### Bug Fixes
 
 - [#2749](https://github.com/influxdata/telegraf/pull/2749): Fixed sqlserver input to work with case sensitive server collation.
 - [#2782](https://github.com/influxdata/telegraf/pull/2782): Reuse transports in input plugins
@@ -1905,7 +2215,7 @@ be deprecated eventually.
 - [#2712](https://github.com/influxdata/telegraf/issues/2712): Documentation for rabbitmq input plugin
 - [#2141](https://github.com/influxdata/telegraf/pull/2141): Logparser handles newly-created files.
 
-### Bugfixes
+### Bug Fixes
 
 - [#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.
@@ -1947,7 +2257,7 @@ be deprecated eventually.
 
 ## v1.2.1 [2017-02-01]
 
-### Bugfixes
+### Bug Fixes
 
 - [#2317](https://github.com/influxdata/telegraf/issues/2317): Fix segfault on nil metrics with influxdb output.
 - [#2324](https://github.com/influxdata/telegraf/issues/2324): Fix negative number handling.
@@ -2004,7 +2314,7 @@ plugins, not just statsd.
 - [#2097](https://github.com/influxdata/telegraf/issues/2097): Configurable HTTP timeouts in Jolokia plugin
 - [#2255](https://github.com/influxdata/telegraf/pull/2255): Allow changing jolokia attribute delimiter
 
-### Bugfixes
+### Bug Fixes
 
 - [#2049](https://github.com/influxdata/telegraf/pull/2049): Fix the Value data format not trimming null characters from input.
 - [#1949](https://github.com/influxdata/telegraf/issues/1949): Fix windows `net` plugin.
@@ -2032,14 +2342,14 @@ plugins, not just statsd.
 
 ## v1.1.2 [2016-12-12]
 
-### Bugfixes
+### Bug Fixes
 
 - [#2007](https://github.com/influxdata/telegraf/issues/2007): Make snmptranslate not required when using numeric OID.
 - [#2104](https://github.com/influxdata/telegraf/issues/2104): Add a global snmp translation cache.
 
 ## v1.1.1 [2016-11-14]
 
-### Bugfixes
+### Bug Fixes
 
 - [#2023](https://github.com/influxdata/telegraf/issues/2023): Fix issue parsing toml durations with single quotes.
 
@@ -2086,7 +2396,7 @@ continue sending logs to /var/log/telegraf/telegraf.log.
 - [#1700](https://github.com/influxdata/telegraf/pull/1700): HAProxy plugin socket glob matching.
 - [#1847](https://github.com/influxdata/telegraf/pull/1847): Add Kubernetes plugin for retrieving pod metrics.
 
-### Bugfixes
+### Bug Fixes
 
 - [#1955](https://github.com/influxdata/telegraf/issues/1955): Fix NATS plug-ins reconnection logic.
 - [#1936](https://github.com/influxdata/telegraf/issues/1936): Set required default values in udp_listener & tcp_listener.
@@ -2122,7 +2432,7 @@ continue sending logs to /var/log/telegraf/telegraf.log.
 
 ## v1.0.1 [2016-09-26]
 
-### Bugfixes
+### Bug Fixes
 
 - [#1775](https://github.com/influxdata/telegraf/issues/1775): Prometheus output: Fix bug with multi-batch writes.
 - [#1738](https://github.com/influxdata/telegraf/issues/1738): Fix unmarshal of influxdb metrics with null tags.
@@ -2225,7 +2535,7 @@ consistent with the behavior of `collection_jitter`.
 - [#1414](https://github.com/influxdata/telegraf/pull/1414): Forking sensors command to remove C package dependency.
 - [#1389](https://github.com/influxdata/telegraf/pull/1389): Add a new SNMP plugin.
 
-### Bugfixes
+### Bug Fixes
 
 - [#1619](https://github.com/influxdata/telegraf/issues/1619): Fix `make windows` build target
 - [#1519](https://github.com/influxdata/telegraf/pull/1519): Fix error race conditions and partial failures.
@@ -2299,7 +2609,7 @@ to "stdout".
 - [#479](https://github.com/influxdata/telegraf/issues/479): per-plugin execution time added to debug output.
 - [#1249](https://github.com/influxdata/telegraf/issues/1249): influxdb output: added write_consistency argument.
 
-### Bugfixes
+### Bug Fixes
 
 - [#1195](https://github.com/influxdata/telegraf/pull/1195): Docker panic on timeout. Thanks @zstyblik!
 - [#1211](https://github.com/influxdata/telegraf/pull/1211): mongodb input. Fix possible panic. Thanks @kols!
@@ -2393,7 +2703,7 @@ It is not included on the report path. This is necessary for reporting host disk
 - [#1128](https://github.com/influxdata/telegraf/pull/1128): MongoDB jumbo chunks metric for MongoDB input plugin
 - [#1146](https://github.com/influxdata/telegraf/pull/1146): HAProxy socket support. Thanks weshmashian!
 
-### Bugfixes
+### Bug Fixes
 
 - [#1050](https://github.com/influxdata/telegraf/issues/1050): jolokia plugin - do not overwrite host tag. Thanks @saiello!
 - [#921](https://github.com/influxdata/telegraf/pull/921): mqtt_consumer stops gathering metrics. Thanks @chaton78!
@@ -2439,7 +2749,7 @@ because the `value` field is redundant in the graphite/librato context.
 - [#1001](https://github.com/influxdata/telegraf/pull/1001): Graphite serializer templates.
 - [#1008](https://github.com/influxdata/telegraf/pull/1008): Adding memstats metrics to the influxdb plugin.
 
-### Bugfixes
+### Bug Fixes
 - [#968](https://github.com/influxdata/telegraf/issues/968): Processes plugin gets unknown state when spaces are in (command name)
 - [#969](https://github.com/influxdata/telegraf/pull/969): ipmi_sensors: allow : in password. Thanks @awaw!
 - [#972](https://github.com/influxdata/telegraf/pull/972): dovecot: remove extra newline in dovecot command. Thanks @mrannanj!
@@ -2466,7 +2776,7 @@ because the `value` field is redundant in the graphite/librato context.
 - [#919](https://github.com/influxdata/telegraf/pull/919): ipmi_sensor input plugin. Thanks @ebookbug!
 - [#945](https://github.com/influxdata/telegraf/pull/945): KAFKA output: codec, acks, and retry configuration. Thanks @framiere!
 
-### Bugfixes
+### Bug Fixes
 - [#890](https://github.com/influxdata/telegraf/issues/890): Create TLS config even if only ssl_ca is provided.
 - [#884](https://github.com/influxdata/telegraf/issues/884): Do not call write method if there are 0 metrics to write.
 - [#898](https://github.com/influxdata/telegraf/issues/898): Put database name in quotes, fixes special characters in the database name.
@@ -2487,7 +2797,7 @@ because the `value` field is redundant in the graphite/librato context.
 - [#747](https://github.com/influxdata/telegraf/pull/747): Start telegraf on install & remove on uninstall. Thanks @PierreF!
 - [#794](https://github.com/influxdata/telegraf/pull/794): Add service reload ability. Thanks @entertainyou!
 
-### Bugfixes
+### Bug Fixes
 - [#852](https://github.com/influxdata/telegraf/issues/852): Windows zip package fix
 - [#859](https://github.com/influxdata/telegraf/issues/859): httpjson plugin panic
 
@@ -2512,7 +2822,7 @@ because the `value` field is redundant in the graphite/librato context.
 - [#826](https://github.com/influxdata/telegraf/pull/826): "kernel" linux plugin for /proc/stat metrics (context switches, interrupts, etc.)
 - [#847](https://github.com/influxdata/telegraf/pull/847): `ntpq`: Input plugin for running ntp query executable and gathering metrics.
 
-### Bugfixes
+### Bug Fixes
 - [#748](https://github.com/influxdata/telegraf/issues/748): Fix sensor plugin split on ":"
 - [#722](https://github.com/influxdata/telegraf/pull/722): Librato output plugin fixes. Thanks @chrusty!
 - [#745](https://github.com/influxdata/telegraf/issues/745): Fix Telegraf toml parse panic on large config files. Thanks @titilambert!
@@ -2530,7 +2840,7 @@ because the `value` field is redundant in the graphite/librato context.
 ### Release Notes
 - Bug in the build script broke deb and rpm packages.
 
-### Bugfixes
+### Bug Fixes
 - [#750](https://github.com/influxdata/telegraf/issues/750): deb package broken
 - [#752](https://github.com/influxdata/telegraf/issues/752): rpm package broken
 
@@ -2550,7 +2860,7 @@ on the metric _name_.
 - [#736](https://github.com/influxdata/telegraf/pull/736): Ignore dummy filesystems from disk plugin. Thanks @PierreF!
 - [#737](https://github.com/influxdata/telegraf/pull/737): Support multiple fields for statsd input. Thanks @mattheath!
 
-### Bugfixes
+### Bug Fixes
 - [#701](https://github.com/influxdata/telegraf/pull/701): output write count shouldnt print in quiet mode.
 - [#746](https://github.com/influxdata/telegraf/pull/746): httpjson plugin: Fix HTTP GET parameters.
 
@@ -2586,7 +2896,7 @@ and is in the `[agent]` config section.
 - [#699](https://github.com/influxdata/telegraf/pull/699): Flush based on buffer size rather than time.
 - [#682](https://github.com/influxdata/telegraf/pull/682): Mesos input plugin. Thanks @tripledes!
 
-### Bugfixes
+### Bug Fixes
 - [#443](https://github.com/influxdata/telegraf/issues/443): Fix Ping command timeout parameter on Linux.
 - [#662](https://github.com/influxdata/telegraf/pull/667): Change `[tags]` to `[global_tags]` to fix multiple-plugin tags bug.
 - [#642](https://github.com/influxdata/telegraf/issues/642): Riemann output plugin issues.
@@ -2613,7 +2923,7 @@ doing the opposite of what it claimed to do (yikes). It's been replaced by
 - [#617](https://github.com/influxdata/telegraf/pull/617): exec plugin: parse influx line protocol in addition to JSON.
 - [#628](https://github.com/influxdata/telegraf/pull/628): Windows perf counters: pre-vista support
 
-### Bugfixes
+### Bug Fixes
 - [#595](https://github.com/influxdata/telegraf/issues/595): graphite output should include tags to separate duplicate measurements.
 - [#599](https://github.com/influxdata/telegraf/issues/599): datadog plugin tags not working.
 - [#600](https://github.com/influxdata/telegraf/issues/600): datadog measurement/field name parsing is wrong.
@@ -2658,7 +2968,7 @@ specifying a docker endpoint to get metrics from.
 - [#573](https://github.com/influxdata/telegraf/pull/573): Github webhooks consumer input. Thanks @jackzampolin!
 - [#471](https://github.com/influxdata/telegraf/pull/471): httpjson request headers. Thanks @asosso!
 
-### Bugfixes
+### Bug Fixes
 - [#506](https://github.com/influxdata/telegraf/pull/506): Ping input doesn't return response time metric when timeout. Thanks @titilambert!
 - [#508](https://github.com/influxdata/telegraf/pull/508): Fix prometheus cardinality issue with the `net` plugin
 - [#499](https://github.com/influxdata/telegraf/issues/499) & [#502](https://github.com/influxdata/telegraf/issues/502): php fpm unix socket and other fixes, thanks @kureikain!
@@ -2704,7 +3014,7 @@ configurations overwritten by the upgrade. There is a backup stored at
 (`name_prefix` and `name_suffix`)
 - Added ability to override base plugin measurement name. (`name_override`)
 
-### Bugfixes
+### Bug Fixes
 
 ## v0.2.5 [unreleased]
 
@@ -2713,7 +3023,7 @@ configurations overwritten by the upgrade. There is a backup stored at
 - [#428](https://github.com/influxdata/telegraf/pull/428): Amazon Kinesis output. Thanks @jimmystewpot!
 - [#449](https://github.com/influxdata/telegraf/pull/449): influxdb plugin, thanks @mark-rushakoff
 
-### Bugfixes
+### Bug Fixes
 - [#430](https://github.com/influxdata/telegraf/issues/430): Network statistics removed in elasticsearch 2.1. Thanks @jipperinbham!
 - [#452](https://github.com/influxdata/telegraf/issues/452): Elasticsearch open file handles error. Thanks @jipperinbham!
 
@@ -2729,7 +3039,7 @@ configurations overwritten by the upgrade. There is a backup stored at
 - [#382](https://github.com/influxdata/telegraf/pull/382): Add system wide network protocol stats to `net` plugin.
 - [#401](https://github.com/influxdata/telegraf/pull/401): Support pass/drop/tagpass/tagdrop for outputs. Thanks @oldmantaiter!
 
-### Bugfixes
+### Bug Fixes
 - [#405](https://github.com/influxdata/telegraf/issues/405): Prometheus output cardinality issue
 - [#388](https://github.com/influxdata/telegraf/issues/388): Fix collection hangup when cpu times decrement.
 
@@ -2766,7 +3076,7 @@ same type can be specified, like this:
 - [#383](https://github.com/influxdata/telegraf/pull/383): Specify plugins as a list.
 - [#354](https://github.com/influxdata/telegraf/pull/354): Add ability to specify multiple metrics in one statsd line. Thanks @MerlinDMC!
 
-### Bugfixes
+### Bug Fixes
 - [#371](https://github.com/influxdata/telegraf/issues/371): Kafka consumer plugin not functioning.
 - [#389](https://github.com/influxdata/telegraf/issues/389): NaN value panic
 
@@ -2776,7 +3086,7 @@ same type can be specified, like this:
 - 0.2.1 has a bug where all lists within plugins get duplicated, this includes
 lists of servers/URLs. 0.2.2 is being released solely to fix that bug
 
-### Bugfixes
+### Bug Fixes
 - [#377](https://github.com/influxdata/telegraf/pull/377): Fix for duplicate slices in inputs.
 
 ## v0.2.1 [2015-11-16]
@@ -2805,7 +3115,7 @@ same type.
 - [#370](https://github.com/influxdata/telegraf/pull/370): Support specifying multiple outputs, as lists.
 - [#372](https://github.com/influxdata/telegraf/pull/372): Remove gosigar and update go-dockerclient for FreeBSD support. Thanks @MerlinDMC!
 
-### Bugfixes
+### Bug Fixes
 - [#331](https://github.com/influxdata/telegraf/pull/331): Dont overwrite host tag in redis plugin.
 - [#336](https://github.com/influxdata/telegraf/pull/336): Mongodb plugin should take 2 measurements.
 - [#351](https://github.com/influxdata/telegraf/issues/317): Fix continual "CREATE DATABASE" in writes
@@ -2853,7 +3163,7 @@ of metrics collected and from how many inputs.
 - [#300](https://github.com/influxdata/telegraf/issues/300): aerospike plugin. Thanks @oldmantaiter!
 - [#322](https://github.com/influxdata/telegraf/issues/322): Librato output. Thanks @jipperinbham!
 
-### Bugfixes
+### Bug Fixes
 - [#228](https://github.com/influxdata/telegraf/pull/228): New version of package will replace old one. Thanks @ekini!
 - [#232](https://github.com/influxdata/telegraf/pull/232): Fix bashism run during deb package installation. Thanks @yankcrime!
 - [#261](https://github.com/influxdata/telegraf/issues/260): RabbitMQ panics if wrong credentials given. Thanks @ekini!
@@ -2896,7 +3206,7 @@ re-added in a "verbose" mode if there is demand for it.
 - [#217](https://github.com/influxdata/telegraf/pull/217): Add filtering for output sinks
 and filtering when specifying a config file.
 
-### Bugfixes
+### Bug Fixes
 - [#170](https://github.com/influxdata/telegraf/issues/170): Systemd support
 - [#175](https://github.com/influxdata/telegraf/issues/175): Set write precision before gathering metrics
 - [#178](https://github.com/influxdata/telegraf/issues/178): redis plugin, multiple server thread hang bug
@@ -2924,7 +3234,7 @@ and filtering when specifying a config file.
 - [#166](https://github.com/influxdata/telegraf/pull/166): Upload binaries to S3
 - [#169](https://github.com/influxdata/telegraf/pull/169): Ping plugin
 
-### Bugfixes
+### Bug Fixes
 
 ## v0.1.7 [2015-08-28]
 
@@ -2937,7 +3247,7 @@ and filtering when specifying a config file.
 - [#142](https://github.com/influxdata/telegraf/pull/142): Add Description and SampleConfig funcs to output interface
 - Indent the toml config file for readability
 
-### Bugfixes
+### Bug Fixes
 - [#128](https://github.com/influxdata/telegraf/issues/128): system_load measurement missing.
 - [#129](https://github.com/influxdata/telegraf/issues/129): Latest pkg url fix.
 - [#131](https://github.com/influxdata/telegraf/issues/131): Fix memory reporting on linux & darwin. Thanks @subhachandrachandra!
@@ -2950,7 +3260,7 @@ and filtering when specifying a config file.
 - [#116](https://github.com/influxdata/telegraf/pull/116): Use godep to vendor all dependencies
 - [#120](https://github.com/influxdata/telegraf/pull/120): Httpjson plugin. Thanks @jpalay & @alvaromorales!
 
-### Bugfixes
+### Bug Fixes
 - [#113](https://github.com/influxdata/telegraf/issues/113): Update README with Telegraf/InfluxDB compatibility
 - [#118](https://github.com/influxdata/telegraf/pull/118): Fix for disk usage stats in Windows. Thanks @srfraser!
 - [#122](https://github.com/influxdata/telegraf/issues/122): Fix for DiskUsage segv fault. Thanks @srfraser!
@@ -2976,7 +3286,7 @@ and filtering when specifying a config file.
 - [#108](https://github.com/influxdata/telegraf/issues/108): Support setting per-CPU and total-CPU gathering.
 - [#111](https://github.com/influxdata/telegraf/pull/111): Report CPU Usage in cpu plugin. Thanks @jpalay!
 
-### Bugfixes
+### Bug Fixes
 - [#85](https://github.com/influxdata/telegraf/pull/85): Fix GetLocalHost testutil function for mac users
 - [#89](https://github.com/influxdata/telegraf/pull/89): go fmt fixes
 - [#94](https://github.com/influxdata/telegraf/pull/94): Fix for issue #93, explicitly call sarama.v1 -> sarama
@@ -2988,7 +3298,7 @@ and filtering when specifying a config file.
 ### Features
 - [#56](https://github.com/influxdata/telegraf/pull/56): Update README for Kafka plugin. Thanks @EmilS!
 
-### Bugfixes
+### Bug Fixes
 - [#50](https://github.com/influxdata/telegraf/pull/50): Fix init.sh script to use telegraf directory. Thanks @jseriff!
 - [#52](https://github.com/influxdata/telegraf/pull/52): Update CHANGELOG to reference updated directory. Thanks @benfb!
 
@@ -2998,7 +3308,7 @@ and filtering when specifying a config file.
 - [#35](https://github.com/influxdata/telegraf/pull/35): Add Kafka plugin. Thanks @EmilS!
 - [#47](https://github.com/influxdata/telegraf/pull/47): Add RethinkDB plugin. Thanks @jipperinbham!
 
-### Bugfixes
+### Bug Fixes
 - [#45](https://github.com/influxdata/telegraf/pull/45): Skip disk tags that don't have a value. Thanks @jhofeditz!
 - [#43](https://github.com/influxdata/telegraf/pull/43): Fix bug in MySQL plugin. Thanks @marcosnils!
 
@@ -3010,7 +3320,7 @@ and filtering when specifying a config file.
 - [#16](https://github.com/influxdata/telegraf/pull/16): Convert Redis to use URI, support Redis AUTH. Thanks @jipperinbham!
 - [#21](https://github.com/influxdata/telegraf/pull/21): Add memcached plugin. Thanks @Yukki!
 
-### Bugfixes
+### Bug Fixes
 - [#13](https://github.com/influxdata/telegraf/pull/13): Fix the packaging script.
 - [#19](https://github.com/influxdata/telegraf/pull/19): Add host name to metric tags. Thanks @sherifzain!
 - [#20](https://github.com/influxdata/telegraf/pull/20): Fix race condition with accumulator mutex. Thanks @nkatsaros!
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 897ac13..fb6c97a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -13,8 +13,13 @@
 1. Ensure you have added proper unit tests and documentation.
 1. Open a new [pull request][].
 
+<<<<<<< CONTRIBUTING.md
 #### Contributing an External Plugin *(experimental)*
 Input, output, and processor plugins written for internal Telegraf can be run as externally-compiled plugins through the [Execd Input](plugins/inputs/execd), [Execd Output](/plugins/inputs/execd), and [Execd Processor](plugins/processors/execd) Plugins without having to change the plugin code.
+=======
+#### Contributing an External Plugin *(new)*
+Input, output, and processor plugins written for internal Telegraf can be run as externally-compiled plugins through the [Execd Input](plugins/inputs/execd), [Execd Output](/plugins/outputs/execd), and [Execd Processor](plugins/processors/execd) Plugins without having to change the plugin code.
+>>>>>>> CONTRIBUTING.md
 
 Follow the guidelines of how to integrate your plugin with the [Execd Go Shim](/plugins/common/shim) to easily compile it as a separate app and run it with the respective `execd` plugin. 
 Check out our [guidelines](docs/EXTERNAL_PLUGINS.md#external-plugin-guidelines) on how to build and set up your external plugins to run with `execd`.
diff --git a/EXTERNAL_PLUGINS.md b/EXTERNAL_PLUGINS.md
index 07c917e..93dcb14 100644
--- a/EXTERNAL_PLUGINS.md
+++ b/EXTERNAL_PLUGINS.md
@@ -1,11 +1,26 @@
 # External Plugins
 
-This is a list of plugins that can be compiled outside of Telegraf and used via the execd input.
+This is a list of plugins that can be compiled outside of Telegraf and used via the `execd` [input](plugins/inputs/execd), [output](plugins/outputs/execd), or [processor](plugins/processors/execd). 
+Check out the [external plugin documentation](/docs/EXTERNAL_PLUGINS.md) for more information on writing and contributing a plugin. 
 
 Pull requests welcome.
 
 ## Inputs
+- [awsalarms](https://github.com/vipinvkmenon/awsalarms) - Simple plugin to gather/monitor alarms generated  in AWS.
+- [octoprint](https://github.com/BattleBas/octoprint-telegraf-plugin) - Gather 3d print information from the octoprint API.
+- [open-hardware-monitor](https://github.com/marianob85/open_hardware_monitor-telegraf-plugin) - Gather sensors data provided by [Open Hardware Monitor](http://openhardwaremonitor.org)
 - [rand](https://github.com/ssoroka/rand) - Generate random numbers
+- [systemd-timings](https://github.com/pdmorrow/telegraf-execd-systemd-timings) - Gather systemd boot and unit timestamp metrics.
 - [twitter](https://github.com/inabagumi/twitter-telegraf-plugin) - Gather account information from Twitter accounts
 - [youtube](https://github.com/inabagumi/youtube-telegraf-plugin) - Gather account information from YouTube channels
+<<<<<<< EXTERNAL_PLUGINS.md
 - [awsalarms](https://github.com/vipinvkmenon/awsalarms) - Simple plugin to gather/monitor alarms generated  in AWS.
+=======
+
+## Outputs
+- [kinesis](https://github.com/morfien101/telegraf-output-kinesis) - Aggregation and compression of metrics to send Amazon Kinesis.
+
+## Processors
+ - [geoip](https://github.com/a-bali/telegraf-geoip) - Add GeoIP information to IP addresses.
+ 
+>>>>>>> EXTERNAL_PLUGINS.md
diff --git a/Makefile b/Makefile
index f07afed..6fd50e3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,12 @@
+<<<<<<< Makefile
 next_version := 1.15.3
+=======
+next_version :=  $(shell cat build_version.txt)
+>>>>>>> Makefile
 tag := $(shell git describe --exact-match --tags 2>git_describe_error.tmp; rm -f git_describe_error.tmp)
 branch := $(shell git rev-parse --abbrev-ref HEAD)
 commit := $(shell git rev-parse --short=8 HEAD)
+glibc_version := 2.17
 
 ifdef NIGHTLY
 	version := $(next_version)
@@ -40,7 +45,7 @@ GOOS ?= $(shell go env GOOS)
 GOARCH ?= $(shell go env GOARCH)
 HOSTGO := env -u GOOS -u GOARCH -u GOARM -- go
 
-LDFLAGS := $(LDFLAGS) -X main.commit=$(commit) -X main.branch=$(branch)
+LDFLAGS := $(LDFLAGS) -X main.commit=$(commit) -X main.branch=$(branch) -X main.goos=$(GOOS) -X main.goarch=$(GOARCH)
 ifneq ($(tag),)
 	LDFLAGS += -X main.version=$(version)
 endif
@@ -86,7 +91,12 @@ deps:
 
 .PHONY: telegraf
 telegraf:
-	go build -ldflags "$(LDFLAGS)" ./cmd/telegraf
+	go build -mod=mod -ldflags "$(LDFLAGS)" ./cmd/telegraf
+
+# Used by dockerfile builds
+.PHONY: go-install
+go-install:
+	go install -mod=mod -ldflags "-w -s $(LDFLAGS)" ./cmd/telegraf
 
 # Used by dockerfile builds
 .PHONY: go-install
@@ -113,12 +123,7 @@ fmtcheck:
 
 .PHONY: test-windows
 test-windows:
-	go test -short $(race_detector) ./plugins/inputs/ping/...
-	go test -short $(race_detector) ./plugins/inputs/win_perf_counters/...
-	go test -short $(race_detector) ./plugins/inputs/win_services/...
-	go test -short $(race_detector) ./plugins/inputs/procstat/...
-	go test -short $(race_detector) ./plugins/inputs/ntpq/...
-	go test -short $(race_detector) ./plugins/processors/port_name/...
+	go test -short ./...
 
 .PHONY: vet
 vet:
@@ -159,7 +164,11 @@ clean:
 
 .PHONY: docker-image
 docker-image:
+<<<<<<< Makefile
 	docker build -f scripts/stretch.docker -t "telegraf:$(commit)" .
+=======
+	docker build -f scripts/buster.docker -t "telegraf:$(commit)" .
+>>>>>>> Makefile
 
 plugins/parsers/influx/machine.go: plugins/parsers/influx/machine.go.rl
 	ragel -Z -G2 $^ -o $@
@@ -169,15 +178,15 @@ plugin-%:
 	@echo "Starting dev environment for $${$(@)} input plugin..."
 	@docker-compose -f plugins/inputs/$${$(@)}/dev/docker-compose.yml up
 
+.PHONY: ci-1.15
+ci-1.15:
+	docker build -t quay.io/influxdb/telegraf-ci:1.15.5 - < scripts/ci-1.15.docker
+	docker push quay.io/influxdb/telegraf-ci:1.15.5
+
 .PHONY: ci-1.14
 ci-1.14:
-	docker build -t quay.io/influxdb/telegraf-ci:1.14.5 - < scripts/ci-1.14.docker
-	docker push quay.io/influxdb/telegraf-ci:1.14.5
-
-.PHONY: ci-1.13
-ci-1.13:
-	docker build -t quay.io/influxdb/telegraf-ci:1.13.13 - < scripts/ci-1.13.docker
-	docker push quay.io/influxdb/telegraf-ci:1.13.13
+	docker build -t quay.io/influxdb/telegraf-ci:1.14.9 - < scripts/ci-1.14.docker
+	docker push quay.io/influxdb/telegraf-ci:1.14.9
 
 .PHONY: install
 install: $(buildbin)
@@ -191,6 +200,7 @@ install: $(buildbin)
 	@if [ $(GOOS) != "windows" ]; then cp -fv etc/telegraf.conf $(DESTDIR)$(sysconfdir)/telegraf/telegraf.conf$(conf_suffix); fi
 	@if [ $(GOOS) != "windows" ]; then cp -fv etc/logrotate.d/telegraf $(DESTDIR)$(sysconfdir)/logrotate.d; fi
 	@if [ $(GOOS) = "windows" ]; then cp -fv etc/telegraf_windows.conf $(DESTDIR)/telegraf.conf; fi
+	@if [ $(GOOS) = "linux" ]; then scripts/check-dynamic-glibc-versions.sh $(buildbin) $(glibc_version); fi
 	@if [ $(GOOS) = "linux" ]; then mkdir -pv $(DESTDIR)$(prefix)/lib/telegraf/scripts; fi
 	@if [ $(GOOS) = "linux" ]; then cp -fv scripts/telegraf.service $(DESTDIR)$(prefix)/lib/telegraf/scripts; fi
 	@if [ $(GOOS) = "linux" ]; then cp -fv scripts/init.sh $(DESTDIR)$(prefix)/lib/telegraf/scripts; fi
@@ -210,12 +220,14 @@ debs += telegraf_$(deb_version)_i386.deb
 debs += telegraf_$(deb_version)_mips.deb
 debs += telegraf_$(deb_version)_mipsel.deb
 debs += telegraf_$(deb_version)_s390x.deb
+debs += telegraf_$(deb_version)_ppc64el.deb
 
 rpms += telegraf-$(rpm_version).aarch64.rpm
 rpms += telegraf-$(rpm_version).armel.rpm
 rpms += telegraf-$(rpm_version).armv6hl.rpm
 rpms += telegraf-$(rpm_version).i386.rpm
 rpms += telegraf-$(rpm_version).s390x.rpm
+rpms += telegraf-$(rpm_version).ppc64le.rpm
 rpms += telegraf-$(rpm_version).x86_64.rpm
 
 tars += telegraf-$(tar_version)_darwin_amd64.tar.gz
@@ -229,6 +241,7 @@ tars += telegraf-$(tar_version)_linux_i386.tar.gz
 tars += telegraf-$(tar_version)_linux_mips.tar.gz
 tars += telegraf-$(tar_version)_linux_mipsel.tar.gz
 tars += telegraf-$(tar_version)_linux_s390x.tar.gz
+tars += telegraf-$(tar_version)_linux_ppc64le.tar.gz
 tars += telegraf-$(tar_version)_static_linux_amd64.tar.gz
 
 zips += telegraf-$(tar_version)_windows_amd64.zip
@@ -242,6 +255,7 @@ package: $(dists)
 rpm_amd64 := amd64
 rpm_386 := i386
 rpm_s390x := s390x
+rpm_ppc64le := ppc64le
 rpm_arm5 := armel
 rpm_arm6 := armv6hl
 rpm_arm647 := aarch64
@@ -278,6 +292,7 @@ $(rpms):
 deb_amd64 := amd64
 deb_386 := i386
 deb_s390x := s390x
+deb_ppc64le := ppc64el
 deb_arm5 := armel
 deb_arm6 := armhf
 deb_arm647 := arm64
@@ -363,6 +378,9 @@ upload-nightly:
 %s390x.deb %s390x.rpm %linux_s390x.tar.gz: export GOOS := linux
 %s390x.deb %s390x.rpm %linux_s390x.tar.gz: export GOARCH := s390x
 
+%ppc64el.deb %ppc64le.rpm %linux_ppc64le.tar.gz: export GOOS := linux
+%ppc64el.deb %ppc64le.rpm %linux_ppc64le.tar.gz: export GOARCH := ppc64le
+
 %freebsd_amd64.tar.gz: export GOOS := freebsd
 %freebsd_amd64.tar.gz: export GOARCH := amd64
 
diff --git a/README.md b/README.md
index 715a232..1999f63 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
 # 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/)
+[![Slack Status](https://img.shields.io/badge/slack-join_chat-white.svg?logo=slack&style=social)](https://www.influxdata.com/slack)
 
 Telegraf is an agent for collecting, processing, aggregating, and writing metrics.
 
@@ -53,7 +54,7 @@ Ansible role: https://github.com/rossmcdonald/telegraf
 
 Telegraf requires Go version 1.13 or newer, the Makefile requires GNU make.
 
-1. [Install Go](https://golang.org/doc/install) >=1.13 (1.14 recommended)
+1. [Install Go](https://golang.org/doc/install) >=1.13 (1.15 recommended)
 2. Clone the Telegraf repository:
    ```
    cd ~/src
@@ -93,6 +94,8 @@ These builds are generated from the master branch:
 - [telegraf-nightly_linux_s390x.tar.gz](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly_linux_s390x.tar.gz)
 - [telegraf_nightly_s390x.deb](https://dl.influxdata.com/telegraf/nightlies/telegraf_nightly_s390x.deb)
 - [telegraf-nightly.s390x.rpm](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly.s390x.rpm)
+- [telegraf_nightly_ppc64el.deb](https://dl.influxdata.com/telegraf/nightlies/telegraf_nightly_ppc64el.deb)
+- [telegraf-nightly.ppc64le.rpm](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly.ppc64le.rpm)
 - [telegraf-nightly_windows_amd64.zip](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly_windows_amd64.zip)
 - [telegraf-nightly_windows_i386.zip](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly_windows_i386.zip)
 - [telegraf-nightly.x86_64.rpm](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly.x86_64.rpm)
@@ -210,6 +213,9 @@ For documentation on the latest development code see the [documentation index][d
 * [infiniband](./plugins/inputs/infiniband)
 * [influxdb](./plugins/inputs/influxdb)
 * [influxdb_listener](./plugins/inputs/influxdb_listener)
+* [influxdb_v2_listener](./plugins/inputs/influxdb_v2_listener)
+* [intel_powerstat](plugins/inputs/intel_powerstat)
+* [intel_rdt](./plugins/inputs/intel_rdt)
 * [internal](./plugins/inputs/internal)
 * [interrupts](./plugins/inputs/interrupts)
 * [ipmi_sensor](./plugins/inputs/ipmi_sensor)
@@ -259,11 +265,13 @@ For documentation on the latest development code see the [documentation index][d
 * [nginx_sts](./plugins/inputs/nginx_sts)
 * [nginx_upstream_check](./plugins/inputs/nginx_upstream_check)
 * [nginx_vts](./plugins/inputs/nginx_vts)
+* [nsd](./plugins/inputs/nsd)
 * [nsq_consumer](./plugins/inputs/nsq_consumer)
 * [nsq](./plugins/inputs/nsq)
 * [nstat](./plugins/inputs/nstat)
 * [ntpq](./plugins/inputs/ntpq)
 * [nvidia_smi](./plugins/inputs/nvidia_smi)
+* [opcua](./plugins/inputs/opcua)
 * [openldap](./plugins/inputs/openldap)
 * [openntpd](./plugins/inputs/openntpd)
 * [opensmtpd](./plugins/inputs/opensmtpd)
@@ -281,9 +289,11 @@ For documentation on the latest development code see the [documentation index][d
 * [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))
+* [proxmox](./plugins/inputs/proxmox)
 * [puppetagent](./plugins/inputs/puppetagent)
 * [rabbitmq](./plugins/inputs/rabbitmq)
 * [raindrops](./plugins/inputs/raindrops)
+* [ras](./plugins/inputs/ras)
 * [redfish](./plugins/inputs/redfish)
 * [redis](./plugins/inputs/redis)
 * [rethinkdb](./plugins/inputs/rethinkdb)
@@ -326,6 +336,7 @@ For documentation on the latest development code see the [documentation index][d
   * [papertrail](./plugins/inputs/webhooks/papertrail)
   * [particle](./plugins/inputs/webhooks/particle)
   * [rollbar](./plugins/inputs/webhooks/rollbar)
+* [win_eventlog](./plugins/inputs/win_eventlog)
 * [win_perf_counters](./plugins/inputs/win_perf_counters) (windows performance counters)
 * [win_services](./plugins/inputs/win_services)
 * [wireguard](./plugins/inputs/wireguard)
@@ -410,6 +421,7 @@ For documentation on the latest development code see the [documentation index][d
 * [cratedb](./plugins/outputs/cratedb)
 * [datadog](./plugins/outputs/datadog)
 * [discard](./plugins/outputs/discard)
+* [dynatrace](./plugins/outputs/dynatrace)
 * [elasticsearch](./plugins/outputs/elasticsearch)
 * [exec](./plugins/outputs/exec)
 * [execd](./plugins/outputs/execd)
@@ -421,6 +433,7 @@ For documentation on the latest development code see the [documentation index][d
 * [instrumental](./plugins/outputs/instrumental)
 * [kafka](./plugins/outputs/kafka)
 * [librato](./plugins/outputs/librato)
+* [logz.io](./plugins/outputs/logzio)
 * [mqtt](./plugins/outputs/mqtt)
 * [nats](./plugins/outputs/nats)
 * [newrelic](./plugins/outputs/newrelic)
@@ -436,3 +449,5 @@ For documentation on the latest development code see the [documentation index][d
 * [udp](./plugins/outputs/socket_writer)
 * [warp10](./plugins/outputs/warp10)
 * [wavefront](./plugins/outputs/wavefront)
+* [sumologic](./plugins/outputs/sumologic)
+* [yandex_cloud_monitoring](./plugins/outputs/yandex_cloud_monitoring)
diff --git a/agent/tick_test.go b/agent/tick_test.go
index daa999e..5b8db7e 100644
--- a/agent/tick_test.go
+++ b/agent/tick_test.go
@@ -52,7 +52,7 @@ func TestAlignedTickerJitter(t *testing.T) {
 
 	clock := clock.NewMock()
 	since := clock.Now()
-	until := since.Add(60 * time.Second)
+	until := since.Add(61 * time.Second)
 
 	ticker := newAlignedTicker(since, interval, jitter, clock)
 	defer ticker.Stop()
@@ -61,12 +61,14 @@ func TestAlignedTickerJitter(t *testing.T) {
 	for !clock.Now().After(until) {
 		select {
 		case tm := <-ticker.Elapsed():
-			require.True(t, tm.Sub(last) <= 15*time.Second)
-			require.True(t, tm.Sub(last) >= 5*time.Second)
+			dur := tm.Sub(last)
+			// 10s interval + 5s jitter + up to 1s late firing.
+			require.True(t, dur <= 16*time.Second, "expected elapsed time to be less than 16 seconds, but was %s", dur)
+			require.True(t, dur >= 5*time.Second, "expected elapsed time to be more than 5 seconds, but was %s", dur)
 			last = last.Add(interval)
 		default:
 		}
-		clock.Add(5 * time.Second)
+		clock.Add(1 * time.Second)
 	}
 }
 
diff --git a/appveyor.yml b/appveyor.yml
index b454c8d..6f5f6e9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,7 +12,7 @@ clone_folder: C:\gopath\src\github.com\influxdata\telegraf
 environment:
   GOPATH: C:\gopath
 
-stack: go 1.14
+stack: go 1.15
 
 platform: x64
 
diff --git a/build_version.txt b/build_version.txt
new file mode 100644
index 0000000..06fb41b
--- /dev/null
+++ b/build_version.txt
@@ -0,0 +1 @@
+1.17.2
diff --git a/cmd/telegraf/telegraf_windows.go b/cmd/telegraf/telegraf_windows.go
index 830e6ea..52b9c43 100644
--- a/cmd/telegraf/telegraf_windows.go
+++ b/cmd/telegraf/telegraf_windows.go
@@ -12,6 +12,9 @@ import (
 )
 
 func run(inputFilters, outputFilters, aggregatorFilters, processorFilters []string) {
+	// Register the eventlog logging target for windows.
+	logger.RegisterEventLogger(*fServiceName)
+
 	if runtime.GOOS == "windows" && windowsRunAsService() {
 		runAsWindowsService(
 			inputFilters,
@@ -96,12 +99,7 @@ func runAsWindowsService(inputFilters, outputFilters, aggregatorFilters, process
 		}
 		os.Exit(0)
 	} else {
-		winlogger, err := s.Logger(nil)
-		if err == nil {
-			//When in service mode, register eventlog target andd setup default logging to eventlog
-			logger.RegisterEventLogger(winlogger)
-			logger.SetupLogging(logger.LogConfig{LogTarget: logger.LogTargetEventlog})
-		}
+		logger.SetupLogging(logger.LogConfig{LogTarget: logger.LogTargetEventlog})
 		err = s.Run()
 
 		if err != nil {
diff --git a/config/aws/credentials.go b/config/aws/credentials.go
index 1e4f91b..f9c98ed 100644
--- a/config/aws/credentials.go
+++ b/config/aws/credentials.go
@@ -29,8 +29,10 @@ func (c *CredentialConfig) Credentials() client.ConfigProvider {
 
 func (c *CredentialConfig) rootCredentials() client.ConfigProvider {
 	config := &aws.Config{
-		Region:   aws.String(c.Region),
-		Endpoint: &c.EndpointURL,
+		Region: aws.String(c.Region),
+	}
+	if c.EndpointURL != "" {
+		config.Endpoint = &c.EndpointURL
 	}
 	if c.AccessKey != "" || c.SecretKey != "" {
 		config.Credentials = credentials.NewStaticCredentials(c.AccessKey, c.SecretKey, c.Token)
diff --git a/config/config.go b/config/config.go
index 4798814..e126f53 100644
--- a/config/config.go
+++ b/config/config.go
@@ -2,15 +2,14 @@ package config
 
 import (
 	"bytes"
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"log"
-	"math"
 	"net/http"
 	"net/url"
 	"os"
 	"path/filepath"
+	"reflect"
 	"regexp"
 	"runtime"
 	"sort"
@@ -56,6 +55,10 @@ var (
 // will be logging to, as well as all the plugins that the user has
 // specified
 type Config struct {
+	toml         *toml.Config
+	errs         []error // config load errors.
+	UnusedFields map[string]bool
+
 	Tags          map[string]string
 	InputFilters  []string
 	OutputFilters []string
@@ -69,8 +72,13 @@ type Config struct {
 	AggProcessors models.RunningProcessors
 }
 
+// NewConfig creates a new struct to hold the Telegraf config.
+// For historical reasons, It holds the actual instances of the running plugins
+// once the configuration is parsed.
 func NewConfig() *Config {
 	c := &Config{
+		UnusedFields: map[string]bool{},
+
 		// Agent defaults:
 		Agent: &AgentConfig{
 			Interval:                   internal.Duration{Duration: 10 * time.Second},
@@ -88,9 +96,18 @@ func NewConfig() *Config {
 		InputFilters:  make([]string, 0),
 		OutputFilters: make([]string, 0),
 	}
+
+	tomlCfg := &toml.Config{
+		NormFieldName: toml.DefaultConfig.NormFieldName,
+		FieldToKey:    toml.DefaultConfig.FieldToKey,
+		MissingField:  c.missingTomlField,
+	}
+	c.toml = tomlCfg
+
 	return c
 }
 
+// AgentConfig defines configuration that will be used by the Telegraf agent
 type AgentConfig struct {
 	// Interval at which to gather information
 	Interval internal.Duration
@@ -174,40 +191,60 @@ type AgentConfig struct {
 	OmitHostname bool
 }
 
-// Inputs returns a list of strings of the configured inputs.
+// InputNames returns a list of strings of the configured inputs.
 func (c *Config) InputNames() []string {
 	var name []string
 	for _, input := range c.Inputs {
 		name = append(name, input.Config.Name)
 	}
-	return name
+	return PluginNameCounts(name)
 }
 
-// Outputs returns a list of strings of the configured aggregators.
+// AggregatorNames 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.Config.Name)
 	}
-	return name
+	return PluginNameCounts(name)
 }
 
-// Outputs returns a list of strings of the configured processors.
+// ProcessorNames 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.Config.Name)
 	}
-	return name
+	return PluginNameCounts(name)
 }
 
-// Outputs returns a list of strings of the configured outputs.
+// OutputNames returns a list of strings of the configured outputs.
 func (c *Config) OutputNames() []string {
 	var name []string
 	for _, output := range c.Outputs {
 		name = append(name, output.Config.Name)
 	}
-	return name
+	return PluginNameCounts(name)
+}
+
+// PluginNameCounts returns a list of sorted plugin names and their count
+func PluginNameCounts(plugins []string) []string {
+	names := make(map[string]int)
+	for _, plugin := range plugins {
+		names[plugin]++
+	}
+
+	var namecount []string
+	for name, count := range names {
+		if count == 1 {
+			namecount = append(namecount, name)
+		} else {
+			namecount = append(namecount, fmt.Sprintf("%s (%dx)", name, count))
+		}
+	}
+
+	sort.Strings(namecount)
+	return namecount
 }
 
 // ListTags returns a string of tags specified in the config,
@@ -603,7 +640,7 @@ func PrintInputConfig(name string) error {
 	if creator, ok := inputs.Inputs[name]; ok {
 		printConfig(name, creator(), "inputs", false)
 	} else {
-		return errors.New(fmt.Sprintf("Input %s not found", name))
+		return fmt.Errorf("Input %s not found", name)
 	}
 	return nil
 }
@@ -613,11 +650,12 @@ func PrintOutputConfig(name string) error {
 	if creator, ok := outputs.Outputs[name]; ok {
 		printConfig(name, creator(), "outputs", false)
 	} else {
-		return errors.New(fmt.Sprintf("Output %s not found", name))
+		return fmt.Errorf("Output %s not found", name)
 	}
 	return nil
 }
 
+// LoadDirectory loads all toml config files found in the specified path, recursively.
 func (c *Config) LoadDirectory(path string) error {
 	walkfn := func(thispath string, info os.FileInfo, _ error) error {
 		if info == nil {
@@ -707,8 +745,8 @@ func (c *Config) LoadConfigData(data []byte) error {
 			if !ok {
 				return fmt.Errorf("invalid configuration, bad table name %q", tableName)
 			}
-			if err = toml.UnmarshalTable(subTable, c.Tags); err != nil {
-				return fmt.Errorf("error parsing table name %q: %w", tableName, err)
+			if err = c.toml.UnmarshalTable(subTable, c.Tags); err != nil {
+				return fmt.Errorf("error parsing table name %q: %s", tableName, err)
 			}
 		}
 	}
@@ -719,8 +757,8 @@ func (c *Config) LoadConfigData(data []byte) error {
 		if !ok {
 			return fmt.Errorf("invalid configuration, error parsing agent table")
 		}
-		if err = toml.UnmarshalTable(subTable, c.Agent); err != nil {
-			return fmt.Errorf("error parsing agent table: %w", err)
+		if err = c.toml.UnmarshalTable(subTable, c.Agent); err != nil {
+			return fmt.Errorf("error parsing [agent]: %w", err)
 		}
 	}
 
@@ -737,6 +775,10 @@ func (c *Config) LoadConfigData(data []byte) error {
 		c.Tags["host"] = c.Agent.Hostname
 	}
 
+	if len(c.UnusedFields) > 0 {
+		return fmt.Errorf("line %d: configuration specified the fields %q, but they weren't used", tbl.Line, keys(c.UnusedFields))
+	}
+
 	// Parse all the rest of the plugins:
 	for name, val := range tbl.Fields {
 		subTable, ok := val.(*ast.Table)
@@ -752,18 +794,21 @@ func (c *Config) LoadConfigData(data []byte) error {
 				// legacy [outputs.influxdb] support
 				case *ast.Table:
 					if err = c.addOutput(pluginName, pluginSubTable); err != nil {
-						return fmt.Errorf("Error parsing %s, %s", pluginName, err)
+						return fmt.Errorf("error parsing %s, %w", pluginName, err)
 					}
 				case []*ast.Table:
 					for _, t := range pluginSubTable {
 						if err = c.addOutput(pluginName, t); err != nil {
-							return fmt.Errorf("Error parsing %s array, %s", pluginName, err)
+							return fmt.Errorf("error parsing %s array, %w", pluginName, err)
 						}
 					}
 				default:
-					return fmt.Errorf("Unsupported config format: %s",
+					return fmt.Errorf("unsupported config format: %s",
 						pluginName)
 				}
+				if len(c.UnusedFields) > 0 {
+					return fmt.Errorf("plugin %s.%s: line %d: configuration specified the fields %q, but they weren't used", name, pluginName, subTable.Line, keys(c.UnusedFields))
+				}
 			}
 		case "inputs", "plugins":
 			for pluginName, pluginVal := range subTable.Fields {
@@ -771,18 +816,21 @@ func (c *Config) LoadConfigData(data []byte) error {
 				// legacy [inputs.cpu] support
 				case *ast.Table:
 					if err = c.addInput(pluginName, pluginSubTable); err != nil {
-						return fmt.Errorf("Error parsing %s, %s", pluginName, err)
+						return fmt.Errorf("error parsing %s, %w", pluginName, err)
 					}
 				case []*ast.Table:
 					for _, t := range pluginSubTable {
 						if err = c.addInput(pluginName, t); err != nil {
-							return fmt.Errorf("Error parsing %s, %s", pluginName, err)
+							return fmt.Errorf("error parsing %s, %w", pluginName, err)
 						}
 					}
 				default:
 					return fmt.Errorf("Unsupported config format: %s",
 						pluginName)
 				}
+				if len(c.UnusedFields) > 0 {
+					return fmt.Errorf("plugin %s.%s: line %d: configuration specified the fields %q, but they weren't used", name, pluginName, subTable.Line, keys(c.UnusedFields))
+				}
 			}
 		case "processors":
 			for pluginName, pluginVal := range subTable.Fields {
@@ -790,13 +838,16 @@ func (c *Config) LoadConfigData(data []byte) error {
 				case []*ast.Table:
 					for _, t := range pluginSubTable {
 						if err = c.addProcessor(pluginName, t); err != nil {
-							return fmt.Errorf("Error parsing %s, %s", pluginName, err)
+							return fmt.Errorf("error parsing %s, %w", pluginName, err)
 						}
 					}
 				default:
 					return fmt.Errorf("Unsupported config format: %s",
 						pluginName)
 				}
+				if len(c.UnusedFields) > 0 {
+					return fmt.Errorf("plugin %s.%s: line %d: configuration specified the fields %q, but they weren't used", name, pluginName, subTable.Line, keys(c.UnusedFields))
+				}
 			}
 		case "aggregators":
 			for pluginName, pluginVal := range subTable.Fields {
@@ -811,6 +862,9 @@ func (c *Config) LoadConfigData(data []byte) error {
 					return fmt.Errorf("Unsupported config format: %s",
 						pluginName)
 				}
+				if len(c.UnusedFields) > 0 {
+					return fmt.Errorf("plugin %s.%s: line %d: configuration specified the fields %q, but they weren't used", name, pluginName, subTable.Line, keys(c.UnusedFields))
+				}
 			}
 		// Assume it's an input input for legacy config file support if no other
 		// identifiers are present
@@ -892,19 +946,19 @@ func parseConfig(contents []byte) (*ast.Table, error) {
 			continue
 		}
 
-		var env_var []byte
+		var envVar []byte
 		if parameter[1] != nil {
-			env_var = parameter[1]
+			envVar = parameter[1]
 		} else if parameter[2] != nil {
-			env_var = parameter[2]
+			envVar = parameter[2]
 		} else {
 			continue
 		}
 
-		env_val, ok := os.LookupEnv(strings.TrimPrefix(string(env_var), "$"))
+		envVal, ok := os.LookupEnv(strings.TrimPrefix(string(envVar), "$"))
 		if ok {
-			env_val = escapeEnv(env_val)
-			contents = bytes.Replace(contents, parameter[0], []byte(env_val), 1)
+			envVal = escapeEnv(envVal)
+			contents = bytes.Replace(contents, parameter[0], []byte(envVal), 1)
 		}
 	}
 
@@ -918,12 +972,12 @@ func (c *Config) addAggregator(name string, table *ast.Table) error {
 	}
 	aggregator := creator()
 
-	conf, err := buildAggregator(name, table)
+	conf, err := c.buildAggregator(name, table)
 	if err != nil {
 		return err
 	}
 
-	if err := toml.UnmarshalTable(table, aggregator); err != nil {
+	if err := c.toml.UnmarshalTable(table, aggregator); err != nil {
 		return err
 	}
 
@@ -937,7 +991,7 @@ func (c *Config) addProcessor(name string, table *ast.Table) error {
 		return fmt.Errorf("Undefined but requested processor: %s", name)
 	}
 
-	processorConfig, err := buildProcessor(name, table)
+	processorConfig, err := c.buildProcessor(name, table)
 	if err != nil {
 		return err
 	}
@@ -967,11 +1021,11 @@ func (c *Config) newRunningProcessor(
 	processor := creator()
 
 	if p, ok := processor.(unwrappable); ok {
-		if err := toml.UnmarshalTable(table, p.Unwrap()); err != nil {
+		if err := c.toml.UnmarshalTable(table, p.Unwrap()); err != nil {
 			return nil, err
 		}
 	} else {
-		if err := toml.UnmarshalTable(table, processor); err != nil {
+		if err := c.toml.UnmarshalTable(table, processor); err != nil {
 			return nil, err
 		}
 	}
@@ -994,19 +1048,19 @@ func (c *Config) addOutput(name string, table *ast.Table) error {
 	// arbitrary types of output, so build the serializer and set it.
 	switch t := output.(type) {
 	case serializers.SerializerOutput:
-		serializer, err := buildSerializer(name, table)
+		serializer, err := c.buildSerializer(name, table)
 		if err != nil {
 			return err
 		}
 		t.SetSerializer(serializer)
 	}
 
-	outputConfig, err := buildOutput(name, table)
+	outputConfig, err := c.buildOutput(name, table)
 	if err != nil {
 		return err
 	}
 
-	if err := toml.UnmarshalTable(table, output); err != nil {
+	if err := c.toml.UnmarshalTable(table, output); err != nil {
 		return err
 	}
 
@@ -1034,7 +1088,11 @@ func (c *Config) addInput(name string, table *ast.Table) error {
 	// If the input has a SetParser function, then this means it can accept
 	// arbitrary types of input, so build the parser and set it.
 	if t, ok := input.(parsers.ParserInput); ok {
+<<<<<<< config/config.go
 		parser, err := buildParser(name, table)
+=======
+		parser, err := c.buildParser(name, table)
+>>>>>>> config/config.go
 		if err != nil {
 			return err
 		}
@@ -1042,7 +1100,11 @@ func (c *Config) addInput(name string, table *ast.Table) error {
 	}
 
 	if t, ok := input.(parsers.ParserFuncInput); ok {
+<<<<<<< config/config.go
 		config, err := getParserConfig(name, table)
+=======
+		config, err := c.getParserConfig(name, table)
+>>>>>>> config/config.go
 		if err != nil {
 			return err
 		}
@@ -1051,12 +1113,12 @@ func (c *Config) addInput(name string, table *ast.Table) error {
 		})
 	}
 
-	pluginConfig, err := buildInput(name, table)
+	pluginConfig, err := c.buildInput(name, table)
 	if err != nil {
 		return err
 	}
 
-	if err := toml.UnmarshalTable(table, input); err != nil {
+	if err := c.toml.UnmarshalTable(table, input); err != nil {
 		return err
 	}
 
@@ -1069,7 +1131,7 @@ func (c *Config) addInput(name string, table *ast.Table) error {
 // buildAggregator parses Aggregator specific items from the ast.Table,
 // builds the filter and returns a
 // models.AggregatorConfig to be inserted into models.RunningAggregator
-func buildAggregator(name string, tbl *ast.Table) (*models.AggregatorConfig, error) {
+func (c *Config) buildAggregator(name string, tbl *ast.Table) (*models.AggregatorConfig, error) {
 	conf := &models.AggregatorConfig{
 		Name:   name,
 		Delay:  time.Millisecond * 100,
@@ -1077,79 +1139,30 @@ func buildAggregator(name string, tbl *ast.Table) (*models.AggregatorConfig, err
 		Grace:  time.Second * 0,
 	}
 
-	if err := getConfigDuration(tbl, "period", &conf.Period); err != nil {
-		return nil, err
-	}
-
-	if err := getConfigDuration(tbl, "delay", &conf.Delay); err != nil {
-		return nil, err
-	}
-
-	if err := getConfigDuration(tbl, "grace", &conf.Grace); err != nil {
-		return nil, err
-	}
-
-	if node, ok := tbl.Fields["drop_original"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if b, ok := kv.Value.(*ast.Boolean); ok {
-				var err error
-				conf.DropOriginal, err = strconv.ParseBool(b.Value)
-				if err != nil {
-					return nil, fmt.Errorf("error parsing boolean value for %s: %s", name, err)
-				}
-			}
-		}
-	}
-
-	if node, ok := tbl.Fields["name_prefix"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if str, ok := kv.Value.(*ast.String); ok {
-				conf.MeasurementPrefix = str.Value
-			}
-		}
-	}
-
-	if node, ok := tbl.Fields["name_suffix"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if str, ok := kv.Value.(*ast.String); ok {
-				conf.MeasurementSuffix = str.Value
-			}
-		}
-	}
-
-	if node, ok := tbl.Fields["name_override"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if str, ok := kv.Value.(*ast.String); ok {
-				conf.NameOverride = str.Value
-			}
-		}
-	}
-
-	if node, ok := tbl.Fields["alias"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if str, ok := kv.Value.(*ast.String); ok {
-				conf.Alias = str.Value
-			}
-		}
-	}
+	c.getFieldDuration(tbl, "period", &conf.Period)
+	c.getFieldDuration(tbl, "delay", &conf.Delay)
+	c.getFieldDuration(tbl, "grace", &conf.Grace)
+	c.getFieldBool(tbl, "drop_original", &conf.DropOriginal)
+	c.getFieldString(tbl, "name_prefix", &conf.MeasurementPrefix)
+	c.getFieldString(tbl, "name_suffix", &conf.MeasurementSuffix)
+	c.getFieldString(tbl, "name_override", &conf.NameOverride)
+	c.getFieldString(tbl, "alias", &conf.Alias)
 
 	conf.Tags = make(map[string]string)
 	if node, ok := tbl.Fields["tags"]; ok {
 		if subtbl, ok := node.(*ast.Table); ok {
-			if err := toml.UnmarshalTable(subtbl, conf.Tags); err != nil {
+			if err := c.toml.UnmarshalTable(subtbl, conf.Tags); err != nil {
 				return nil, fmt.Errorf("could not parse tags for input %s", name)
 			}
 		}
 	}
 
-	delete(tbl.Fields, "drop_original")
-	delete(tbl.Fields, "name_prefix")
-	delete(tbl.Fields, "name_suffix")
-	delete(tbl.Fields, "name_override")
-	delete(tbl.Fields, "alias")
-	delete(tbl.Fields, "tags")
+	if c.hasErrs() {
+		return nil, c.firstErr()
+	}
+
 	var err error
-	conf.Filter, err = buildFilter(tbl)
+	conf.Filter, err = c.buildFilter(tbl)
 	if err != nil {
 		return conf, err
 	}
@@ -1159,33 +1172,18 @@ func buildAggregator(name string, tbl *ast.Table) (*models.AggregatorConfig, err
 // buildProcessor parses Processor specific items from the ast.Table,
 // builds the filter and returns a
 // models.ProcessorConfig to be inserted into models.RunningProcessor
-func buildProcessor(name string, tbl *ast.Table) (*models.ProcessorConfig, error) {
+func (c *Config) buildProcessor(name string, tbl *ast.Table) (*models.ProcessorConfig, error) {
 	conf := &models.ProcessorConfig{Name: name}
 
-	if node, ok := tbl.Fields["order"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if b, ok := kv.Value.(*ast.Integer); ok {
-				var err error
-				conf.Order, err = strconv.ParseInt(b.Value, 10, 64)
-				if err != nil {
-					return nil, fmt.Errorf("error parsing int value for %s: %s", name, err)
-				}
-			}
-		}
-	}
+	c.getFieldInt64(tbl, "order", &conf.Order)
+	c.getFieldString(tbl, "alias", &conf.Alias)
 
-	if node, ok := tbl.Fields["alias"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if str, ok := kv.Value.(*ast.String); ok {
-				conf.Alias = str.Value
-			}
-		}
+	if c.hasErrs() {
+		return nil, c.firstErr()
 	}
 
-	delete(tbl.Fields, "alias")
-	delete(tbl.Fields, "order")
 	var err error
-	conf.Filter, err = buildFilter(tbl)
+	conf.Filter, err = c.buildFilter(tbl)
 	if err != nil {
 		return conf, err
 	}
@@ -1196,205 +1194,63 @@ func buildProcessor(name string, tbl *ast.Table) (*models.ProcessorConfig, error
 // (tagpass/tagdrop/namepass/namedrop/fieldpass/fielddrop) to
 // be inserted into the models.OutputConfig/models.InputConfig
 // to be used for glob filtering on tags and measurements
-func buildFilter(tbl *ast.Table) (models.Filter, error) {
+func (c *Config) buildFilter(tbl *ast.Table) (models.Filter, error) {
 	f := models.Filter{}
 
-	if node, ok := tbl.Fields["namepass"]; 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 {
-						f.NamePass = append(f.NamePass, str.Value)
-					}
-				}
-			}
-		}
-	}
-
-	if node, ok := tbl.Fields["namedrop"]; 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 {
-						f.NameDrop = append(f.NameDrop, str.Value)
-					}
-				}
-			}
-		}
-	}
+	c.getFieldStringSlice(tbl, "namepass", &f.NamePass)
+	c.getFieldStringSlice(tbl, "namedrop", &f.NameDrop)
 
-	fields := []string{"pass", "fieldpass"}
-	for _, field := range fields {
-		if node, ok := tbl.Fields[field]; 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 {
-							f.FieldPass = append(f.FieldPass, str.Value)
-						}
-					}
-				}
-			}
-		}
-	}
+	c.getFieldStringSlice(tbl, "pass", &f.FieldPass)
+	c.getFieldStringSlice(tbl, "fieldpass", &f.FieldPass)
 
-	fields = []string{"drop", "fielddrop"}
-	for _, field := range fields {
-		if node, ok := tbl.Fields[field]; 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 {
-							f.FieldDrop = append(f.FieldDrop, str.Value)
-						}
-					}
-				}
-			}
-		}
-	}
+	c.getFieldStringSlice(tbl, "drop", &f.FieldDrop)
+	c.getFieldStringSlice(tbl, "fielddrop", &f.FieldDrop)
 
-	if node, ok := tbl.Fields["tagpass"]; ok {
-		if subtbl, ok := node.(*ast.Table); ok {
-			for name, val := range subtbl.Fields {
-				if kv, ok := val.(*ast.KeyValue); ok {
-					tagfilter := &models.TagFilter{Name: name}
-					if ary, ok := kv.Value.(*ast.Array); ok {
-						for _, elem := range ary.Value {
-							if str, ok := elem.(*ast.String); ok {
-								tagfilter.Filter = append(tagfilter.Filter, str.Value)
-							}
-						}
-					}
-					f.TagPass = append(f.TagPass, *tagfilter)
-				}
-			}
-		}
-	}
+	c.getFieldTagFilter(tbl, "tagpass", &f.TagPass)
+	c.getFieldTagFilter(tbl, "tagdrop", &f.TagDrop)
 
-	if node, ok := tbl.Fields["tagdrop"]; ok {
-		if subtbl, ok := node.(*ast.Table); ok {
-			for name, val := range subtbl.Fields {
-				if kv, ok := val.(*ast.KeyValue); ok {
-					tagfilter := &models.TagFilter{Name: name}
-					if ary, ok := kv.Value.(*ast.Array); ok {
-						for _, elem := range ary.Value {
-							if str, ok := elem.(*ast.String); ok {
-								tagfilter.Filter = append(tagfilter.Filter, str.Value)
-							}
-						}
-					}
-					f.TagDrop = append(f.TagDrop, *tagfilter)
-				}
-			}
-		}
-	}
+	c.getFieldStringSlice(tbl, "tagexclude", &f.TagExclude)
+	c.getFieldStringSlice(tbl, "taginclude", &f.TagInclude)
 
-	if node, ok := tbl.Fields["tagexclude"]; 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 {
-						f.TagExclude = append(f.TagExclude, str.Value)
-					}
-				}
-			}
-		}
+	if c.hasErrs() {
+		return f, c.firstErr()
 	}
 
-	if node, ok := tbl.Fields["taginclude"]; 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 {
-						f.TagInclude = append(f.TagInclude, str.Value)
-					}
-				}
-			}
-		}
-	}
 	if err := f.Compile(); err != nil {
 		return f, err
 	}
 
-	delete(tbl.Fields, "namedrop")
-	delete(tbl.Fields, "namepass")
-	delete(tbl.Fields, "fielddrop")
-	delete(tbl.Fields, "fieldpass")
-	delete(tbl.Fields, "drop")
-	delete(tbl.Fields, "pass")
-	delete(tbl.Fields, "tagdrop")
-	delete(tbl.Fields, "tagpass")
-	delete(tbl.Fields, "tagexclude")
-	delete(tbl.Fields, "taginclude")
 	return f, nil
 }
 
 // buildInput parses input specific items from the ast.Table,
 // builds the filter and returns a
 // models.InputConfig to be inserted into models.RunningInput
-func buildInput(name string, tbl *ast.Table) (*models.InputConfig, error) {
+func (c *Config) buildInput(name string, tbl *ast.Table) (*models.InputConfig, error) {
 	cp := &models.InputConfig{Name: name}
-
-	if err := getConfigDuration(tbl, "interval", &cp.Interval); err != nil {
-		return nil, err
-	}
-
-	if err := getConfigDuration(tbl, "precision", &cp.Precision); err != nil {
-		return nil, err
-	}
-
-	if err := getConfigDuration(tbl, "collection_jitter", &cp.CollectionJitter); err != nil {
-		return nil, err
-	}
-
-	if node, ok := tbl.Fields["name_prefix"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if str, ok := kv.Value.(*ast.String); ok {
-				cp.MeasurementPrefix = str.Value
-			}
-		}
-	}
-
-	if node, ok := tbl.Fields["name_suffix"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if str, ok := kv.Value.(*ast.String); ok {
-				cp.MeasurementSuffix = str.Value
-			}
-		}
-	}
-
-	if node, ok := tbl.Fields["name_override"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if str, ok := kv.Value.(*ast.String); ok {
-				cp.NameOverride = str.Value
-			}
-		}
-	}
-
-	if node, ok := tbl.Fields["alias"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if str, ok := kv.Value.(*ast.String); ok {
-				cp.Alias = str.Value
-			}
-		}
-	}
+	c.getFieldDuration(tbl, "interval", &cp.Interval)
+	c.getFieldDuration(tbl, "precision", &cp.Precision)
+	c.getFieldDuration(tbl, "collection_jitter", &cp.CollectionJitter)
+	c.getFieldString(tbl, "name_prefix", &cp.MeasurementPrefix)
+	c.getFieldString(tbl, "name_suffix", &cp.MeasurementSuffix)
+	c.getFieldString(tbl, "name_override", &cp.NameOverride)
+	c.getFieldString(tbl, "alias", &cp.Alias)
 
 	cp.Tags = make(map[string]string)
 	if node, ok := tbl.Fields["tags"]; ok {
 		if subtbl, ok := node.(*ast.Table); ok {
-			if err := toml.UnmarshalTable(subtbl, cp.Tags); err != nil {
-				return nil, fmt.Errorf("could not parse tags for input %s\n", name)
+			if err := c.toml.UnmarshalTable(subtbl, cp.Tags); err != nil {
+				return nil, fmt.Errorf("could not parse tags for input %s", name)
 			}
 		}
 	}
 
-	delete(tbl.Fields, "name_prefix")
-	delete(tbl.Fields, "name_suffix")
-	delete(tbl.Fields, "name_override")
-	delete(tbl.Fields, "alias")
-	delete(tbl.Fields, "tags")
+	if c.hasErrs() {
+		return nil, c.firstErr()
+	}
+
 	var err error
-	cp.Filter, err = buildFilter(tbl)
+	cp.Filter, err = c.buildFilter(tbl)
 	if err != nil {
 		return cp, err
 	}
@@ -1404,787 +1260,341 @@ func buildInput(name string, tbl *ast.Table) (*models.InputConfig, error) {
 // buildParser grabs the necessary entries from the ast.Table for creating
 // 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)
+func (c *Config) buildParser(name string, tbl *ast.Table) (parsers.Parser, error) {
+	config, err := c.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{
+func (c *Config) getParserConfig(name string, tbl *ast.Table) (*parsers.Config, error) {
+	pc := &parsers.Config{
 		JSONStrict: true,
 	}
 
-	if node, ok := tbl.Fields["data_format"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if str, ok := kv.Value.(*ast.String); ok {
-				c.DataFormat = str.Value
-			}
-		}
-	}
+	c.getFieldString(tbl, "data_format", &pc.DataFormat)
 
 	// Legacy support, exec plugin originally parsed JSON by default.
-	if name == "exec" && c.DataFormat == "" {
-		c.DataFormat = "json"
-	} else if c.DataFormat == "" {
-		c.DataFormat = "influx"
+	if name == "exec" && pc.DataFormat == "" {
+		pc.DataFormat = "json"
+	} else if pc.DataFormat == "" {
+		pc.DataFormat = "influx"
+	}
+
+	c.getFieldString(tbl, "separator", &pc.Separator)
+
+	c.getFieldStringSlice(tbl, "templates", &pc.Templates)
+	c.getFieldStringSlice(tbl, "tag_keys", &pc.TagKeys)
+	c.getFieldStringSlice(tbl, "json_string_fields", &pc.JSONStringFields)
+	c.getFieldString(tbl, "json_name_key", &pc.JSONNameKey)
+	c.getFieldString(tbl, "json_query", &pc.JSONQuery)
+	c.getFieldString(tbl, "json_time_key", &pc.JSONTimeKey)
+	c.getFieldString(tbl, "json_time_format", &pc.JSONTimeFormat)
+	c.getFieldString(tbl, "json_timezone", &pc.JSONTimezone)
+	c.getFieldBool(tbl, "json_strict", &pc.JSONStrict)
+	c.getFieldString(tbl, "data_type", &pc.DataType)
+	c.getFieldString(tbl, "collectd_auth_file", &pc.CollectdAuthFile)
+	c.getFieldString(tbl, "collectd_security_level", &pc.CollectdSecurityLevel)
+	c.getFieldString(tbl, "collectd_parse_multivalue", &pc.CollectdSplit)
+
+	c.getFieldStringSlice(tbl, "collectd_typesdb", &pc.CollectdTypesDB)
+
+	c.getFieldString(tbl, "dropwizard_metric_registry_path", &pc.DropwizardMetricRegistryPath)
+	c.getFieldString(tbl, "dropwizard_time_path", &pc.DropwizardTimePath)
+	c.getFieldString(tbl, "dropwizard_time_format", &pc.DropwizardTimeFormat)
+	c.getFieldString(tbl, "dropwizard_tags_path", &pc.DropwizardTagsPath)
+	c.getFieldStringMap(tbl, "dropwizard_tag_paths", &pc.DropwizardTagPathsMap)
+
+	//for grok data_format
+	c.getFieldStringSlice(tbl, "grok_named_patterns", &pc.GrokNamedPatterns)
+	c.getFieldStringSlice(tbl, "grok_patterns", &pc.GrokPatterns)
+	c.getFieldString(tbl, "grok_custom_patterns", &pc.GrokCustomPatterns)
+	c.getFieldStringSlice(tbl, "grok_custom_pattern_files", &pc.GrokCustomPatternFiles)
+	c.getFieldString(tbl, "grok_timezone", &pc.GrokTimezone)
+	c.getFieldString(tbl, "grok_unique_timestamp", &pc.GrokUniqueTimestamp)
+
+	//for csv parser
+	c.getFieldStringSlice(tbl, "csv_column_names", &pc.CSVColumnNames)
+	c.getFieldStringSlice(tbl, "csv_column_types", &pc.CSVColumnTypes)
+	c.getFieldStringSlice(tbl, "csv_tag_columns", &pc.CSVTagColumns)
+	c.getFieldString(tbl, "csv_timezone", &pc.CSVTimezone)
+	c.getFieldString(tbl, "csv_delimiter", &pc.CSVDelimiter)
+	c.getFieldString(tbl, "csv_comment", &pc.CSVComment)
+	c.getFieldString(tbl, "csv_measurement_column", &pc.CSVMeasurementColumn)
+	c.getFieldString(tbl, "csv_timestamp_column", &pc.CSVTimestampColumn)
+	c.getFieldString(tbl, "csv_timestamp_format", &pc.CSVTimestampFormat)
+	c.getFieldInt(tbl, "csv_header_row_count", &pc.CSVHeaderRowCount)
+	c.getFieldInt(tbl, "csv_skip_rows", &pc.CSVSkipRows)
+	c.getFieldInt(tbl, "csv_skip_columns", &pc.CSVSkipColumns)
+	c.getFieldBool(tbl, "csv_trim_space", &pc.CSVTrimSpace)
+	c.getFieldStringSlice(tbl, "csv_skip_values", &pc.CSVSkipValues)
+
+	c.getFieldStringSlice(tbl, "form_urlencoded_tag_keys", &pc.FormUrlencodedTagKeys)
+
+	pc.MetricName = name
+
+	if c.hasErrs() {
+		return nil, c.firstErr()
+	}
+
+	return pc, nil
+}
+
+// buildSerializer grabs the necessary entries from the ast.Table for creating
+// a serializers.Serializer object, and creates it, which can then be added onto
+// an Output object.
+func (c *Config) buildSerializer(name string, tbl *ast.Table) (serializers.Serializer, error) {
+	sc := &serializers.Config{TimestampUnits: time.Duration(1 * time.Second)}
+
+	c.getFieldString(tbl, "data_format", &sc.DataFormat)
+
+	if sc.DataFormat == "" {
+		sc.DataFormat = "influx"
+	}
+
+	c.getFieldString(tbl, "prefix", &sc.Prefix)
+	c.getFieldString(tbl, "template", &sc.Template)
+	c.getFieldStringSlice(tbl, "templates", &sc.Templates)
+	c.getFieldString(tbl, "carbon2_format", &sc.Carbon2Format)
+	c.getFieldInt(tbl, "influx_max_line_bytes", &sc.InfluxMaxLineBytes)
+
+	c.getFieldBool(tbl, "influx_sort_fields", &sc.InfluxSortFields)
+	c.getFieldBool(tbl, "influx_uint_support", &sc.InfluxUintSupport)
+	c.getFieldBool(tbl, "graphite_tag_support", &sc.GraphiteTagSupport)
+	c.getFieldString(tbl, "graphite_separator", &sc.GraphiteSeparator)
+
+	c.getFieldDuration(tbl, "json_timestamp_units", &sc.TimestampUnits)
+
+	c.getFieldBool(tbl, "splunkmetric_hec_routing", &sc.HecRouting)
+	c.getFieldBool(tbl, "splunkmetric_multimetric", &sc.SplunkmetricMultiMetric)
+
+	c.getFieldStringSlice(tbl, "wavefront_source_override", &sc.WavefrontSourceOverride)
+	c.getFieldBool(tbl, "wavefront_use_strict", &sc.WavefrontUseStrict)
+
+	c.getFieldBool(tbl, "prometheus_export_timestamp", &sc.PrometheusExportTimestamp)
+	c.getFieldBool(tbl, "prometheus_sort_metrics", &sc.PrometheusSortMetrics)
+	c.getFieldBool(tbl, "prometheus_string_as_label", &sc.PrometheusStringAsLabel)
+
+	if c.hasErrs() {
+		return nil, c.firstErr()
+	}
+
+	return serializers.NewSerializer(sc)
+}
+
+// buildOutput parses output specific items from the ast.Table,
+// builds the filter and returns an
+// models.OutputConfig to be inserted into models.RunningInput
+// Note: error exists in the return for future calls that might require error
+func (c *Config) buildOutput(name string, tbl *ast.Table) (*models.OutputConfig, error) {
+	filter, err := c.buildFilter(tbl)
+	if err != nil {
+		return nil, err
+	}
+	oc := &models.OutputConfig{
+		Name:   name,
+		Filter: filter,
+	}
+
+	// TODO: support FieldPass/FieldDrop on outputs
+
+	c.getFieldDuration(tbl, "flush_interval", &oc.FlushInterval)
+	c.getFieldDuration(tbl, "flush_jitter", oc.FlushJitter)
+
+	c.getFieldInt(tbl, "metric_buffer_limit", &oc.MetricBufferLimit)
+	c.getFieldInt(tbl, "metric_batch_size", &oc.MetricBatchSize)
+	c.getFieldString(tbl, "alias", &oc.Alias)
+	c.getFieldString(tbl, "name_override", &oc.NameOverride)
+	c.getFieldString(tbl, "name_suffix", &oc.NameSuffix)
+	c.getFieldString(tbl, "name_prefix", &oc.NamePrefix)
+
+	if c.hasErrs() {
+		return nil, c.firstErr()
+	}
+
+	return oc, nil
+}
+
+func (c *Config) missingTomlField(typ reflect.Type, key string) error {
+	switch key {
+	case "alias", "carbon2_format", "collectd_auth_file", "collectd_parse_multivalue",
+		"collectd_security_level", "collectd_typesdb", "collection_jitter", "csv_column_names",
+		"csv_column_types", "csv_comment", "csv_delimiter", "csv_header_row_count",
+		"csv_measurement_column", "csv_skip_columns", "csv_skip_rows", "csv_tag_columns",
+		"csv_timestamp_column", "csv_timestamp_format", "csv_timezone", "csv_trim_space", "csv_skip_values",
+		"data_format", "data_type", "delay", "drop", "drop_original", "dropwizard_metric_registry_path",
+		"dropwizard_tag_paths", "dropwizard_tags_path", "dropwizard_time_format", "dropwizard_time_path",
+		"fielddrop", "fieldpass", "flush_interval", "flush_jitter", "form_urlencoded_tag_keys",
+		"grace", "graphite_separator", "graphite_tag_support", "grok_custom_pattern_files",
+		"grok_custom_patterns", "grok_named_patterns", "grok_patterns", "grok_timezone",
+		"grok_unique_timestamp", "influx_max_line_bytes", "influx_sort_fields", "influx_uint_support",
+		"interval", "json_name_key", "json_query", "json_strict", "json_string_fields",
+		"json_time_format", "json_time_key", "json_timestamp_units", "json_timezone",
+		"metric_batch_size", "metric_buffer_limit", "name_override", "name_prefix",
+		"name_suffix", "namedrop", "namepass", "order", "pass", "period", "precision",
+		"prefix", "prometheus_export_timestamp", "prometheus_sort_metrics", "prometheus_string_as_label",
+		"separator", "splunkmetric_hec_routing", "splunkmetric_multimetric", "tag_keys",
+		"tagdrop", "tagexclude", "taginclude", "tagpass", "tags", "template", "templates",
+		"wavefront_source_override", "wavefront_use_strict":
+
+		// ignore fields that are common to all plugins.
+	default:
+		c.UnusedFields[key] = true
 	}
+	return nil
+}
 
-	if node, ok := tbl.Fields["separator"]; ok {
+func (c *Config) getFieldString(tbl *ast.Table, fieldName string, target *string) {
+	if node, ok := tbl.Fields[fieldName]; ok {
 		if kv, ok := node.(*ast.KeyValue); ok {
 			if str, ok := kv.Value.(*ast.String); ok {
-				c.Separator = str.Value
+				*target = str.Value
 			}
 		}
 	}
+}
 
-	if node, ok := tbl.Fields["templates"]; ok {
+func (c *Config) getFieldDuration(tbl *ast.Table, fieldName string, target interface{}) {
+	if node, ok := tbl.Fields[fieldName]; 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.Templates = append(c.Templates, str.Value)
-					}
+			if str, ok := kv.Value.(*ast.String); ok {
+				d, err := time.ParseDuration(str.Value)
+				if err != nil {
+					c.addError(tbl, fmt.Errorf("error parsing duration: %w", err))
+					return
 				}
+				targetVal := reflect.ValueOf(target).Elem()
+				targetVal.Set(reflect.ValueOf(d))
 			}
 		}
 	}
+}
 
-	if node, ok := tbl.Fields["tag_keys"]; ok {
+func (c *Config) getFieldBool(tbl *ast.Table, fieldName string, target *bool) {
+	var err error
+	if node, ok := tbl.Fields[fieldName]; 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.TagKeys = append(c.TagKeys, str.Value)
-					}
+			switch t := kv.Value.(type) {
+			case *ast.Boolean:
+				*target, err = t.Boolean()
+				if err != nil {
+					c.addError(tbl, fmt.Errorf("unknown boolean value type %q, expecting boolean", kv.Value))
+					return
+				}
+			case *ast.String:
+				*target, err = strconv.ParseBool(t.Value)
+				if err != nil {
+					c.addError(tbl, fmt.Errorf("unknown boolean value type %q, expecting boolean", kv.Value))
+					return
 				}
+			default:
+				c.addError(tbl, fmt.Errorf("unknown boolean value type %q, expecting boolean", kv.Value.Source()))
+				return
 			}
 		}
 	}
+}
 
-	if node, ok := tbl.Fields["json_string_fields"]; ok {
+func (c *Config) getFieldInt(tbl *ast.Table, fieldName string, target *int) {
+	if node, ok := tbl.Fields[fieldName]; 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 iAst, ok := kv.Value.(*ast.Integer); ok {
+				i, err := iAst.Int()
+				if err != nil {
+					c.addError(tbl, fmt.Errorf("unexpected int type %q, expecting int", iAst.Value))
+					return
 				}
+				*target = int(i)
 			}
 		}
 	}
+}
 
-	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["json_timezone"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if str, ok := kv.Value.(*ast.String); ok {
-				c.JSONTimezone = str.Value
-			}
-		}
-	}
-
-	if node, ok := tbl.Fields["json_strict"]; ok {
+func (c *Config) getFieldInt64(tbl *ast.Table, fieldName string, target *int64) {
+	if node, ok := tbl.Fields[fieldName]; ok {
 		if kv, ok := node.(*ast.KeyValue); ok {
-			if b, ok := kv.Value.(*ast.Boolean); ok {
-				var err error
-				c.JSONStrict, err = b.Boolean()
+			if iAst, ok := kv.Value.(*ast.Integer); ok {
+				i, err := iAst.Int()
 				if err != nil {
-					return nil, err
+					c.addError(tbl, fmt.Errorf("unexpected int type %q, expecting int", iAst.Value))
+					return
 				}
+				*target = i
 			}
 		}
 	}
+}
 
-	if node, ok := tbl.Fields["data_type"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if str, ok := kv.Value.(*ast.String); ok {
-				c.DataType = str.Value
-			}
-		}
-	}
-
-	if node, ok := tbl.Fields["collectd_auth_file"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if str, ok := kv.Value.(*ast.String); ok {
-				c.CollectdAuthFile = str.Value
-			}
-		}
-	}
-
-	if node, ok := tbl.Fields["collectd_security_level"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if str, ok := kv.Value.(*ast.String); ok {
-				c.CollectdSecurityLevel = str.Value
-			}
-		}
-	}
-
-	if node, ok := tbl.Fields["collectd_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 {
+func (c *Config) getFieldStringSlice(tbl *ast.Table, fieldName string, target *[]string) {
+	if node, ok := tbl.Fields[fieldName]; ok {
 		if kv, ok := node.(*ast.KeyValue); ok {
 			if ary, ok := kv.Value.(*ast.Array); ok {
 				for _, elem := range ary.Value {
 					if str, ok := elem.(*ast.String); ok {
-						c.CollectdTypesDB = append(c.CollectdTypesDB, str.Value)
+						*target = append(*target, str.Value)
 					}
 				}
 			}
 		}
 	}
-
-	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 {
+}
+func (c *Config) getFieldTagFilter(tbl *ast.Table, fieldName string, target *[]models.TagFilter) {
+	if node, ok := tbl.Fields[fieldName]; 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
-					}
-				}
-			}
-		}
-	}
-
-	//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
-			}
-		}
-	}
-
-	if node, ok := tbl.Fields["grok_unique_timestamp"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if str, ok := kv.Value.(*ast.String); ok {
-				c.GrokUniqueTimestamp = str.Value
-			}
-		}
-	}
-
-	//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_column_types"]; 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.CSVColumnTypes = append(c.CSVColumnTypes, 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_timezone"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if str, ok := kv.Value.(*ast.String); ok {
-				c.CSVTimezone = str.Value
-			}
-		}
-	}
-
-	if node, ok := tbl.Fields["csv_header_row_count"]; 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.CSVHeaderRowCount = int(v)
-			}
-		}
-	}
-
-	if node, ok := tbl.Fields["csv_skip_rows"]; 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.CSVSkipRows = int(v)
-			}
-		}
-	}
-
-	if node, ok := tbl.Fields["csv_skip_columns"]; 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.CSVSkipColumns = int(v)
-			}
-		}
-	}
-
-	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)
-				}
-			}
-		}
-	}
-
-	if node, ok := tbl.Fields["form_urlencoded_tag_keys"]; 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.FormUrlencodedTagKeys = append(c.FormUrlencodedTagKeys, str.Value)
+					tagfilter := models.TagFilter{Name: name}
+					if ary, ok := kv.Value.(*ast.Array); ok {
+						for _, elem := range ary.Value {
+							if str, ok := elem.(*ast.String); ok {
+								tagfilter.Filter = append(tagfilter.Filter, str.Value)
+							}
+						}
 					}
+					*target = append(*target, tagfilter)
 				}
 			}
 		}
 	}
-
-	c.MetricName = name
-
-	delete(tbl.Fields, "data_format")
-	delete(tbl.Fields, "separator")
-	delete(tbl.Fields, "templates")
-	delete(tbl.Fields, "tag_keys")
-	delete(tbl.Fields, "json_name_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, "json_timezone")
-	delete(tbl.Fields, "json_strict")
-	delete(tbl.Fields, "data_type")
-	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")
-	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")
-	delete(tbl.Fields, "grok_unique_timestamp")
-	delete(tbl.Fields, "csv_column_names")
-	delete(tbl.Fields, "csv_column_types")
-	delete(tbl.Fields, "csv_comment")
-	delete(tbl.Fields, "csv_delimiter")
-	delete(tbl.Fields, "csv_field_columns")
-	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_timezone")
-	delete(tbl.Fields, "csv_trim_space")
-	delete(tbl.Fields, "form_urlencoded_tag_keys")
-
-	return c, nil
 }
 
-// buildSerializer grabs the necessary entries from the ast.Table for creating
-// a serializers.Serializer object, and creates it, which can then be added onto
-// an Output object.
-func buildSerializer(name string, tbl *ast.Table) (serializers.Serializer, error) {
-	c := &serializers.Config{TimestampUnits: time.Duration(1 * time.Second)}
-
-	if node, ok := tbl.Fields["data_format"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if str, ok := kv.Value.(*ast.String); ok {
-				c.DataFormat = str.Value
-			}
-		}
-	}
-
-	if c.DataFormat == "" {
-		c.DataFormat = "influx"
-	}
-
-	if node, ok := tbl.Fields["prefix"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if str, ok := kv.Value.(*ast.String); ok {
-				c.Prefix = str.Value
-			}
-		}
-	}
-
-	if node, ok := tbl.Fields["template"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if str, ok := kv.Value.(*ast.String); ok {
-				c.Template = str.Value
-			}
-		}
-	}
-
-	if node, ok := tbl.Fields["templates"]; 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.Templates = append(c.Templates, str.Value)
-					}
-				}
-			}
-		}
-	}
-
-	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["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["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["graphite_separator"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if str, ok := kv.Value.(*ast.String); ok {
-				c.GraphiteSeparator = str.Value
-			}
-		}
-	}
-
-	if node, ok := tbl.Fields["json_timestamp_units"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if str, ok := kv.Value.(*ast.String); ok {
-				timestampVal, err := time.ParseDuration(str.Value)
-				if err != nil {
-					return nil, fmt.Errorf("Unable to parse json_timestamp_units as a duration, %s", err)
-				}
-				// now that we have a duration, truncate it to the nearest
-				// power of ten (just in case)
-				nearest_exponent := int64(math.Log10(float64(timestampVal.Nanoseconds())))
-				new_nanoseconds := int64(math.Pow(10.0, float64(nearest_exponent)))
-				c.TimestampUnits = time.Duration(new_nanoseconds)
-			}
-		}
-	}
-
-	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
-				}
-			}
-		}
-	}
-
-	if node, ok := tbl.Fields["splunkmetric_multimetric"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if b, ok := kv.Value.(*ast.Boolean); ok {
-				var err error
-				c.SplunkmetricMultiMetric, err = b.Boolean()
-				if err != nil {
-					return nil, err
-				}
-			}
-		}
-	}
-
-	if node, ok := tbl.Fields["wavefront_source_override"]; 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.WavefrontSourceOverride = append(c.WavefrontSourceOverride, str.Value)
+func (c *Config) getFieldStringMap(tbl *ast.Table, fieldName string, target *map[string]string) {
+	*target = map[string]string{}
+	if node, ok := tbl.Fields[fieldName]; 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 {
+						(*target)[name] = str.Value
 					}
 				}
 			}
 		}
 	}
-
-	if node, ok := tbl.Fields["wavefront_use_strict"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if b, ok := kv.Value.(*ast.Boolean); ok {
-				var err error
-				c.WavefrontUseStrict, err = b.Boolean()
-				if err != nil {
-					return nil, err
-				}
-			}
-		}
-	}
-
-	if node, ok := tbl.Fields["prometheus_export_timestamp"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if b, ok := kv.Value.(*ast.Boolean); ok {
-				var err error
-				c.PrometheusExportTimestamp, err = b.Boolean()
-				if err != nil {
-					return nil, err
-				}
-			}
-		}
-	}
-
-	if node, ok := tbl.Fields["prometheus_sort_metrics"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if b, ok := kv.Value.(*ast.Boolean); ok {
-				var err error
-				c.PrometheusSortMetrics, err = b.Boolean()
-				if err != nil {
-					return nil, err
-				}
-			}
-		}
-	}
-
-	if node, ok := tbl.Fields["prometheus_string_as_label"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if b, ok := kv.Value.(*ast.Boolean); ok {
-				var err error
-				c.PrometheusStringAsLabel, 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")
-	delete(tbl.Fields, "graphite_tag_support")
-	delete(tbl.Fields, "graphite_separator")
-	delete(tbl.Fields, "data_format")
-	delete(tbl.Fields, "prefix")
-	delete(tbl.Fields, "template")
-	delete(tbl.Fields, "templates")
-	delete(tbl.Fields, "json_timestamp_units")
-	delete(tbl.Fields, "splunkmetric_hec_routing")
-	delete(tbl.Fields, "splunkmetric_multimetric")
-	delete(tbl.Fields, "wavefront_source_override")
-	delete(tbl.Fields, "wavefront_use_strict")
-	delete(tbl.Fields, "prometheus_export_timestamp")
-	delete(tbl.Fields, "prometheus_sort_metrics")
-	delete(tbl.Fields, "prometheus_string_as_label")
-	return serializers.NewSerializer(c)
 }
 
-// buildOutput parses output specific items from the ast.Table,
-// builds the filter and returns an
-// models.OutputConfig to be inserted into models.RunningInput
-// Note: error exists in the return for future calls that might require error
-func buildOutput(name string, tbl *ast.Table) (*models.OutputConfig, error) {
-	filter, err := buildFilter(tbl)
-	if err != nil {
-		return nil, err
-	}
-	oc := &models.OutputConfig{
-		Name:   name,
-		Filter: filter,
-	}
-
-	// TODO
-	// Outputs don't support FieldDrop/FieldPass, so set to NameDrop/NamePass
-	if len(oc.Filter.FieldDrop) > 0 {
-		oc.Filter.NameDrop = oc.Filter.FieldDrop
-	}
-	if len(oc.Filter.FieldPass) > 0 {
-		oc.Filter.NamePass = oc.Filter.FieldPass
-	}
-
-	if err := getConfigDuration(tbl, "flush_interval", &oc.FlushInterval); err != nil {
-		return nil, err
-	}
-
-	if err := getConfigDuration(tbl, "flush_jitter", &oc.FlushJitter); err != nil {
-		return nil, err
-	}
-
-	if node, ok := tbl.Fields["metric_buffer_limit"]; 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
-				}
-				oc.MetricBufferLimit = int(v)
-			}
-		}
-	}
-
-	if node, ok := tbl.Fields["metric_batch_size"]; 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
-				}
-				oc.MetricBatchSize = int(v)
-			}
-		}
-	}
-
-	if node, ok := tbl.Fields["alias"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if str, ok := kv.Value.(*ast.String); ok {
-				oc.Alias = str.Value
-			}
-		}
-	}
-
-	if node, ok := tbl.Fields["name_override"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if str, ok := kv.Value.(*ast.String); ok {
-				oc.NameOverride = str.Value
-			}
-		}
+func keys(m map[string]bool) []string {
+	result := []string{}
+	for k := range m {
+		result = append(result, k)
 	}
+	return result
+}
 
-	if node, ok := tbl.Fields["name_suffix"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if str, ok := kv.Value.(*ast.String); ok {
-				oc.NameSuffix = str.Value
-			}
-		}
-	}
+func (c *Config) hasErrs() bool {
+	return len(c.errs) > 0
+}
 
-	if node, ok := tbl.Fields["name_prefix"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if str, ok := kv.Value.(*ast.String); ok {
-				oc.NamePrefix = str.Value
-			}
-		}
+func (c *Config) firstErr() error {
+	if len(c.errs) == 0 {
+		return nil
 	}
+	return c.errs[0]
+}
 
-	delete(tbl.Fields, "metric_buffer_limit")
-	delete(tbl.Fields, "metric_batch_size")
-	delete(tbl.Fields, "alias")
-	delete(tbl.Fields, "name_override")
-	delete(tbl.Fields, "name_suffix")
-	delete(tbl.Fields, "name_prefix")
-
-	return oc, nil
+func (c *Config) addError(tbl *ast.Table, err error) {
+	c.errs = append(c.errs, fmt.Errorf("line %d:%d: %w", tbl.Line, tbl.Position, err))
 }
 
 // unwrappable lets you retrieve the original telegraf.Processor from the
@@ -2193,19 +1603,3 @@ func buildOutput(name string, tbl *ast.Table) (*models.OutputConfig, error) {
 type unwrappable interface {
 	Unwrap() telegraf.Processor
 }
-
-func getConfigDuration(tbl *ast.Table, key string, target *time.Duration) error {
-	if node, ok := tbl.Fields[key]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if str, ok := kv.Value.(*ast.String); ok {
-				d, err := time.ParseDuration(str.Value)
-				if err != nil {
-					return err
-				}
-				delete(tbl.Fields, key)
-				*target = d
-			}
-		}
-	}
-	return nil
-}
diff --git a/config/config_test.go b/config/config_test.go
index 6c5e366..79d74e8 100644
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -2,6 +2,7 @@ package config
 
 import (
 	"os"
+	"strings"
 	"testing"
 	"time"
 
@@ -12,6 +13,7 @@ import (
 	"github.com/influxdata/telegraf/plugins/inputs/http_listener_v2"
 	"github.com/influxdata/telegraf/plugins/inputs/memcached"
 	"github.com/influxdata/telegraf/plugins/inputs/procstat"
+	"github.com/influxdata/telegraf/plugins/outputs/azure_monitor"
 	httpOut "github.com/influxdata/telegraf/plugins/outputs/http"
 	"github.com/influxdata/telegraf/plugins/parsers"
 	"github.com/stretchr/testify/assert"
@@ -200,27 +202,26 @@ func TestConfig_LoadSpecialTypes(t *testing.T) {
 	// Tests telegraf size parsing.
 	assert.Equal(t, internal.Size{Size: 1024 * 1024}, inputHTTPListener.MaxBodySize)
 	// Tests toml multiline basic strings.
-	assert.Equal(t, "/path/to/my/cert\n", inputHTTPListener.TLSCert)
+	assert.Equal(t, "/path/to/my/cert", strings.TrimRight(inputHTTPListener.TLSCert, "\r\n"))
 }
 
 func TestConfig_FieldNotDefined(t *testing.T) {
 	c := NewConfig()
 	err := c.LoadConfig("./testdata/invalid_field.toml")
 	require.Error(t, err, "invalid field name")
-	assert.Equal(t, "Error loading config file ./testdata/invalid_field.toml: Error parsing http_listener_v2, line 2: field corresponding to `not_a_field' is not defined in http_listener_v2.HTTPListenerV2", err.Error())
-
+	assert.Equal(t, "Error loading config file ./testdata/invalid_field.toml: plugin inputs.http_listener_v2: line 1: configuration specified the fields [\"not_a_field\"], but they weren't used", err.Error())
 }
 
 func TestConfig_WrongFieldType(t *testing.T) {
 	c := NewConfig()
 	err := c.LoadConfig("./testdata/wrong_field_type.toml")
 	require.Error(t, err, "invalid field type")
-	assert.Equal(t, "Error loading config file ./testdata/wrong_field_type.toml: Error parsing http_listener_v2, line 2: (http_listener_v2.HTTPListenerV2.Port) cannot unmarshal TOML string into int", err.Error())
+	assert.Equal(t, "Error loading config file ./testdata/wrong_field_type.toml: error parsing http_listener_v2, line 2: (http_listener_v2.HTTPListenerV2.Port) cannot unmarshal TOML string into int", err.Error())
 
 	c = NewConfig()
 	err = c.LoadConfig("./testdata/wrong_field_type2.toml")
 	require.Error(t, err, "invalid field type2")
-	assert.Equal(t, "Error loading config file ./testdata/wrong_field_type2.toml: Error parsing http_listener_v2, line 2: (http_listener_v2.HTTPListenerV2.Methods) cannot unmarshal TOML string into []string", err.Error())
+	assert.Equal(t, "Error loading config file ./testdata/wrong_field_type2.toml: error parsing http_listener_v2, line 2: (http_listener_v2.HTTPListenerV2.Methods) cannot unmarshal TOML string into []string", err.Error())
 }
 
 func TestConfig_InlineTables(t *testing.T) {
@@ -255,5 +256,25 @@ func TestConfig_BadOrdering(t *testing.T) {
 	c := NewConfig()
 	err := c.LoadConfig("./testdata/non_slice_slice.toml")
 	require.Error(t, err, "bad ordering")
-	assert.Equal(t, "Error loading config file ./testdata/non_slice_slice.toml: Error parsing http array, line 4: cannot unmarshal TOML array into string (need slice)", err.Error())
+	assert.Equal(t, "Error loading config file ./testdata/non_slice_slice.toml: error parsing http array, line 4: cannot unmarshal TOML array into string (need slice)", err.Error())
+}
+
+func TestConfig_AzureMonitorNamespacePrefix(t *testing.T) {
+	// #8256 Cannot use empty string as the namespace prefix
+	c := NewConfig()
+	defaultPrefixConfig := `[[outputs.azure_monitor]]`
+	err := c.LoadConfigData([]byte(defaultPrefixConfig))
+	assert.NoError(t, err)
+	azureMonitor, ok := c.Outputs[0].Output.(*azure_monitor.AzureMonitor)
+	assert.Equal(t, "Telegraf/", azureMonitor.NamespacePrefix)
+	assert.Equal(t, true, ok)
+
+	c = NewConfig()
+	customPrefixConfig := `[[outputs.azure_monitor]]
+	namespace_prefix = ""`
+	err = c.LoadConfigData([]byte(customPrefixConfig))
+	assert.NoError(t, err)
+	azureMonitor, ok = c.Outputs[0].Output.(*azure_monitor.AzureMonitor)
+	assert.Equal(t, "", azureMonitor.NamespacePrefix)
+	assert.Equal(t, true, ok)
 }
diff --git a/config/testdata/telegraf-agent.toml b/config/testdata/telegraf-agent.toml
index f71b982..6967d6e 100644
--- a/config/testdata/telegraf-agent.toml
+++ b/config/testdata/telegraf-agent.toml
@@ -176,14 +176,6 @@
   # If no servers are specified, then 127.0.0.1 is used as the host and 4020 as the port.
   servers = ["127.0.0.1:4021"]
 
-# Read metrics from local Lustre service on OST, MDS
-[[inputs.lustre2]]
-  # An array of /proc globs to search for Lustre stats
-  # If not specified, the default will work on Lustre 2.5.x
-  #
-  # ost_procfiles = ["/proc/fs/lustre/obdfilter/*/stats", "/proc/fs/lustre/osd-ldiskfs/*/stats"]
-  # mds_procfiles = ["/proc/fs/lustre/mdt/*/md_stats"]
-
 # Read metrics about memory usage
 [[inputs.mem]]
   # no configuration
diff --git a/debian/changelog b/debian/changelog
index e32712d..197fbf0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,32 @@
+<<<<<<< debian/changelog
 telegraf (1.15.3+ds1-0ubuntu1) groovy; urgency=medium
 
   * New upstream version 1.15.3+ds1
 
  -- Sergio Durigan Junior <[e-mail]>  Mon, 28 Sep 2020 13:58:28 -0400
+=======
+telegraf (1.17.2+ds1-0ubuntu2) hirsute; urgency=medium
+
+  * d/p/adjust-etc-telegraf.conf.patch: Adjust /etc/telegraf.conf.
+    We have to adjust /etc/telegraf.conf in order to prevent it to try to
+    connect to an influxdb instance, which might not be present in the
+    system.  Since we still need to define an output in the config file,
+    (LP: #1916305)
+
+ -- Sergio Durigan Junior <[e-mail]>  Fri, 19 Feb 2021 18:09:35 -0500
+
+telegraf (1.17.2+ds1-0ubuntu1) hirsute; urgency=medium
+
+  * d/repack-telegraf-with-vendor.sh: Fix "trap" instruction.
+  * d/repack-telegraf-with-vendor.sh: Allow user to specify the Go binary.
+  * New upstream version 1.17.2+ds1
+  * d/p/use-mod-vendor-on-leofs-test.patch: Remove patch.
+    Upstream has changed the way leofs works, and it's not invoking "go"
+    directly anymore.  For this reason, there is no more need to make sure
+    "go" was invoked with "-mod=vendor".
+
+ -- Sergio Durigan Junior <[e-mail]>  Tue, 02 Feb 2021 19:06:07 -0500
+>>>>>>> debian/changelog
 
 telegraf (1.15.2+ds1-0ubuntu1) groovy; urgency=medium
 
diff --git a/debian/patches/adjust-etc-telegraf.conf.patch b/debian/patches/adjust-etc-telegraf.conf.patch
new file mode 100644
index 0000000..8a52a95
--- /dev/null
+++ b/debian/patches/adjust-etc-telegraf.conf.patch
@@ -0,0 +1,50 @@
+From: Sergio Durigan Junior <[e-mail]>
+Date: Fri, 19 Feb 2021 18:00:08 -0500
+Subject: Adjust /etc/telegraf.conf
+
+We have to adjust /etc/telegraf.conf in order to prevent it to try to
+connect to an influxdb instance, which might not be present in the
+system.  Since we still need to define an output in the config file,
+we enable prometheus_client, which should be harmless.
+
+Author: Sergio Durigan Junior <[e-mail]>
+Last-Updated: 2021-02-19
+Forwarded: not-needed
+---
+ etc/telegraf.conf | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/etc/telegraf.conf b/etc/telegraf.conf
+index 9d52d0a..7efb747 100644
+--- a/etc/telegraf.conf
++++ b/etc/telegraf.conf
+@@ -102,7 +102,7 @@
+ 
+ 
+ # Configuration for sending metrics to InfluxDB
+-[[outputs.influxdb]]
++#[[outputs.influxdb]]
+   ## The full HTTP or UDP URL for your InfluxDB instance.
+   ##
+   ## Multiple URLs can be specified for a single cluster, only ONE of the
+@@ -1203,9 +1203,9 @@
+ 
+ 
+ # # Configuration for the Prometheus client to spawn
+-# [[outputs.prometheus_client]]
++[[outputs.prometheus_client]]
+ #   ## Address to listen on
+-#   listen = ":9273"
++    listen = ":9273"
+ #
+ #   ## Metric version controls the mapping from Telegraf metrics into
+ #   ## Prometheus format.  When using the prometheus input, use the same value in
+@@ -1213,7 +1213,7 @@
+ #   ##
+ #   ##   example: metric_version = 1; deprecated in 1.13
+ #   ##            metric_version = 2; recommended version
+-#   # metric_version = 1
++    metric_version = 2
+ #
+ #   ## Use HTTP Basic Authentication.
+ #   # basic_username = "Foo"
diff --git a/debian/patches/series b/debian/patches/series
index cb6190e..7de5f2c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 adjust-service-user.patch
-use-mod-vendor-on-leofs-test.patch
+adjust-etc-telegraf.conf.patch
diff --git a/debian/patches/use-mod-vendor-on-leofs-test.patch b/debian/patches/use-mod-vendor-on-leofs-test.patch
deleted file mode 100644
index d397845..0000000
--- a/debian/patches/use-mod-vendor-on-leofs-test.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: Sergio Durigan Junior <[e-mail]>
-Last-Update: 2020-06-05
-
-Index: telegraf/plugins/inputs/leofs/leofs_test.go
-===================================================================
---- telegraf.orig/plugins/inputs/leofs/leofs_test.go	2020-06-05 13:29:07.033841504 -0400
-+++ telegraf/plugins/inputs/leofs/leofs_test.go	2020-06-05 18:22:18.458606480 -0400
-@@ -134,7 +134,7 @@
- }
- 
- func buildFakeSNMPCmd(src string) {
--	err := exec.Command("go", "build", "-o", "snmpwalk", src).Run()
-+	err := exec.Command("go", "build", "-mod=vendor", "-o", "snmpwalk", src).Run()
- 	if err != nil {
- 		log.Fatalln(err)
- 	}
diff --git a/debian/repack-telegraf-with-vendor.sh b/debian/repack-telegraf-with-vendor.sh
index cbcb1d7..a13a5e7 100755
--- a/debian/repack-telegraf-with-vendor.sh
+++ b/debian/repack-telegraf-with-vendor.sh
@@ -13,12 +13,14 @@ set -e
 set -x
 set -o pipefail
 
+GOBIN=${GOBIN:-go}
+
 upstream_version="$2"
 orig_tar=$(realpath "../telegraf_${upstream_version}.orig.tar.xz")
 orig_dir="$PWD"
 work_dir="$(mktemp -d)"
 
-trap "rm -rf $workdir" INT QUIT 0
+trap "rm -rf $work_dir" INT QUIT 0
 
 export GOPATH="$work_dir/.gopath"
 export GOCACHE="$work_dir/.gocache"
@@ -28,11 +30,11 @@ printf "Unpacking tarball '$orig_tar' to '$work_dir'"
 tar xf "$orig_tar" -C "$work_dir"
 source_dir_name="$(ls -1 "$work_dir")"
 cd "$work_dir/$source_dir_name"
-go mod vendor
+$GOBIN mod vendor
 cd ..
 tar cJf "$orig_tar" "$source_dir_name"
 
-go clean -cache -modcache
+$GOBIN clean -cache -modcache
 rm -rf "$work_dir"
 
 exit 0
diff --git a/docker-compose.yml b/docker-compose.yml
index eb96fc2..092a7b9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,9 +2,12 @@ version: '3'
 
 services:
   aerospike:
-    image: aerospike/aerospike-server:3.9.0
+    image: aerospike/aerospike-server:4.9.0.11
     ports:
       - "3000:3000"
+      - "3001:3001"
+      - "3002:3002"
+      - "3003:3003"
   zookeeper:
     image: wurstmeister/zookeeper
     environment:
@@ -50,7 +53,7 @@ services:
       - "6432:6432"
   postgres:
     image: postgres:alpine
-    environment: 
+    environment:
       - POSTGRES_HOST_AUTH_METHOD=trust
     ports:
       - "5432:5432"
diff --git a/docs/AGGREGATORS_AND_PROCESSORS.md b/docs/AGGREGATORS_AND_PROCESSORS.md
index 7be34ae..934a4b0 100644
--- a/docs/AGGREGATORS_AND_PROCESSORS.md
+++ b/docs/AGGREGATORS_AND_PROCESSORS.md
@@ -17,8 +17,8 @@ metrics as they pass through Telegraf:
 │  Memory   │───┤                                          ┌──▶│ InfluxDB  │
 │           │   │                                          │   │           │
 └───────────┘   │    ┌─────────────┐     ┌─────────────┐   │   └───────────┘
-                │    │             │     │Aggregate    │   │
-┌───────────┐   │    │Process      │     │ - mean      │   │   ┌───────────┐
+                │    │             │     │Aggregators  │   │
+┌───────────┐   │    │Processors   │     │ - mean      │   │   ┌───────────┐
 │           │   │    │ - transform │     │ - quantiles │   │   │           │
 │   MySQL   │───┼───▶│ - decorate  │────▶│ - min/max   │───┼──▶│   File    │
 │           │   │    │ - filter    │     │ - count     │   │   │           │
@@ -62,6 +62,6 @@ emit the aggregates and not the original metrics.
 
 Since aggregates are created for each measurement, field, and unique tag combination
 the plugin receives, you can make use of `taginclude` to group
-aggregates by specific tags only. 
+aggregates by specific tags only.
 
 **Note:** Aggregator plugins only aggregate metrics within their periods (`now() - period`). Data with a timestamp earlier than `now() - period` cannot be included.
diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md
index 341acce..2babf8e 100644
--- a/docs/CONFIGURATION.md
+++ b/docs/CONFIGURATION.md
@@ -55,7 +55,11 @@ INFLUX_PASSWORD="monkey123"
 ```
 For InfluxDB OSS 2:
 ```
+<<<<<<< docs/CONFIGURATION.md
 INFLUX_HOST="http://localhost:9999"
+=======
+INFLUX_HOST="http://localhost:8086" # used to be 9999
+>>>>>>> docs/CONFIGURATION.md
 INFLUX_TOKEN="replace_with_your_token"
 INFLUX_ORG="your_username"
 INFLUX_BUCKET="replace_with_your_bucket_name"
@@ -83,6 +87,7 @@ INFLUX_BUCKET="replace_with_your_bucket_name"
   urls = ["${INFLUX_URL}"]
   skip_database_creation = ${INFLUX_SKIP_DATABASE_CREATION}
   password = "${INFLUX_PASSWORD}"
+<<<<<<< docs/CONFIGURATION.md
   
 # For InfluxDB OSS 2:
 [[outputs.influxdb_v2]]
@@ -90,13 +95,28 @@ INFLUX_BUCKET="replace_with_your_bucket_name"
   token = ["${INFLUX_TOKEN}"]
   org = ["${INFLUX_ORG}"]
   bucket = ["${INFLUX_BUCKET}"]
+=======
+
+# For InfluxDB OSS 2:
+[[outputs.influxdb_v2]]
+  urls = ["${INFLUX_HOST}"]
+  token = "${INFLUX_TOKEN}"
+  organization = "${INFLUX_ORG}"
+  bucket = "${INFLUX_BUCKET}"
+>>>>>>> docs/CONFIGURATION.md
 
 # For InfluxDB Cloud 2:
 [[outputs.influxdb_v2]]
   urls = ["${INFLUX_HOST}"]
+<<<<<<< docs/CONFIGURATION.md
   token = ["${INFLUX_TOKEN}"]
   org = ["${INFLUX_ORG}"]
   bucket = ["${INFLUX_BUCKET}"]
+=======
+  token = "${INFLUX_TOKEN}"
+  organization = "${INFLUX_ORG}"
+  bucket = "${INFLUX_BUCKET}"
+>>>>>>> docs/CONFIGURATION.md
 ```
 
 The above files will produce the following effective configuration file to be
@@ -112,12 +132,21 @@ parsed:
   urls = "http://localhost:8086"
   skip_database_creation = true
   password = "monkey123"
+<<<<<<< docs/CONFIGURATION.md
   
 # For InfluxDB OSS 2:
 [[outputs.influxdb_v2]]
   urls = ["http://127.0.0.1:9999"]
   token = "replace_with_your_token"
   org = "your_username"
+=======
+
+# For InfluxDB OSS 2:
+[[outputs.influxdb_v2]]
+  urls = ["http://127.0.0.1:8086"] # double check the port. could be 9999 if using OSS Beta
+  token = "replace_with_your_token"
+  organization = "your_username"
+>>>>>>> docs/CONFIGURATION.md
   bucket = "replace_with_your_bucket_name"
 
 # For InfluxDB Cloud 2:
@@ -126,7 +155,11 @@ parsed:
   INFLUX_HOST="https://us-west-2-1.aws.cloud2.influxdata.com"
   # Other Cloud URLs at https://v2.docs.influxdata.com/v2.0/reference/urls/#influxdb-cloud-urls
   token = "replace_with_your_token"
+<<<<<<< docs/CONFIGURATION.md
   org = "[e-mail]"
+=======
+  organization = "[e-mail]"
+>>>>>>> docs/CONFIGURATION.md
   bucket = "replace_with_your_bucket_name"
 ```
 
@@ -499,8 +532,13 @@ patterns is emitted.
 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.
 
+<<<<<<< docs/CONFIGURATION.md
 > 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 
+=======
+> 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
+>>>>>>> docs/CONFIGURATION.md
 options will be interpreted as part of the tagpass/tagdrop tables.
 
 #### Modifiers
diff --git a/docs/DATA_FORMATS_INPUT.md b/docs/DATA_FORMATS_INPUT.md
index b716501..dbcb283 100644
--- a/docs/DATA_FORMATS_INPUT.md
+++ b/docs/DATA_FORMATS_INPUT.md
@@ -5,15 +5,16 @@ 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.
 
-- [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)
+- [InfluxDB Line Protocol](/plugins/parsers/influx)
 - [JSON](/plugins/parsers/json)
 - [Logfmt](/plugins/parsers/logfmt)
 - [Nagios](/plugins/parsers/nagios)
+- [Prometheus](/plugins/parsers/prometheus)
 - [Value](/plugins/parsers/value), ie: 45 or "booyah"
 - [Wavefront](/plugins/parsers/wavefront)
 
@@ -29,9 +30,6 @@ desired parser:
   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"
 ```
 
diff --git a/docs/DATA_FORMATS_OUTPUT.md b/docs/DATA_FORMATS_OUTPUT.md
index a8650b2..0d0bdff 100644
--- a/docs/DATA_FORMATS_OUTPUT.md
+++ b/docs/DATA_FORMATS_OUTPUT.md
@@ -9,6 +9,8 @@ plugins.
 1. [Graphite](/plugins/serializers/graphite)
 1. [JSON](/plugins/serializers/json)
 1. [Prometheus](/plugins/serializers/prometheus)
+1. [Prometheus Remote Write](/plugins/serializers/prometheusremotewrite)
+1. [ServiceNow Metrics](/plugins/serializers/nowmetric)
 1. [SplunkMetric](/plugins/serializers/splunkmetric)
 1. [Wavefront](/plugins/serializers/wavefront)
 
@@ -21,8 +23,5 @@ You will be able to identify the plugins with support by the presence of a
   files = ["stdout"]
 
   ## 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"
 ```
diff --git a/docs/EXTERNAL_PLUGINS.md b/docs/EXTERNAL_PLUGINS.md
index 3379327..a8be76d 100644
--- a/docs/EXTERNAL_PLUGINS.md
+++ b/docs/EXTERNAL_PLUGINS.md
@@ -1,8 +1,14 @@
 ### External Plugins
 
+<<<<<<< docs/EXTERNAL_PLUGINS.md
 External plugins are external programs that are built outside of Telegraf that
 can run through an `execd` plugin. These external plugins allow for more flexibility
 compared to internal Telegraf plugins.  
+=======
+[External plugins](/EXTERNAL_PLUGINS.md) are external programs that are built outside 
+of Telegraf that can run through an `execd` plugin. These external plugins allow for 
+more flexibility compared to internal Telegraf plugins.  
+>>>>>>> docs/EXTERNAL_PLUGINS.md
 
 - External plugins can be written in any language (internal Telegraf plugins can only written in Go)
 - External plugins can access to libraries not written in Go
@@ -10,6 +16,7 @@ compared to internal Telegraf plugins.
 - Can include large dependencies that would otherwise bloat Telegraf
 
 ### External Plugin Guidelines
+<<<<<<< docs/EXTERNAL_PLUGINS.md
 The guidelines of writing external plugins would follow those for our general [input](docs/INPUTS.md), 
 [output](docs/OUTPUTS.md), [processor](docs/PROCESSORS.md), and [aggregator](docs/AGGREGATOR.md) plugins. 
 Please reference the documentation on how to create these plugins written in Go.
@@ -17,11 +24,26 @@ Please reference the documentation on how to create these plugins written in Go.
 
 #### Execd Go Shim
 For Go plugins, there is a [Execd Go Shim](plugins/common/shim) that will make it trivial to extract an internal input, processor, or output plugin from the main Telegraf repo out to a stand-alone repo.  This shim This allows anyone to build and run it as a separate app using one of the `execd`plugins:
+=======
+The guidelines of writing external plugins would follow those for our general [input](/docs/INPUTS.md),
+[output](/docs/OUTPUTS.md), [processor](/docs/PROCESSORS.md), and [aggregator](/docs/AGGREGATORS.md) plugins.
+Please reference the documentation on how to create these plugins written in Go.
+
+_For listed [external plugins](/EXTERNAL_PLUGINS.md), the author of the external plugin is also responsible for the maintenance
+and feature development of external plugins. Expect to have users open plugin issues on its respective GitHub repository._
+
+#### Execd Go Shim
+For Go plugins, there is a [Execd Go Shim](/plugins/common/shim/) that will make it trivial to extract an internal input, processor, or output plugin from the main Telegraf repo out to a stand-alone repo. This shim allows anyone to build and run it as a separate app using one of the `execd`plugins:
+>>>>>>> docs/EXTERNAL_PLUGINS.md
 - [inputs.execd](/plugins/inputs/execd)
 - [processors.execd](/plugins/processors/execd)
 - [outputs.execd](/plugins/outputs/execd)
 
+<<<<<<< docs/EXTERNAL_PLUGINS.md
 Follow the [Steps to externalize a plugin](plugins/common/shim#steps-to-externalize-a-plugin) and [Steps to build and run your plugin](plugins/common/shim#steps-to-build-and-run-your-plugin) to properly with the Execd Go Shim
+=======
+Follow the [Steps to externalize a plugin](/plugins/common/shim#steps-to-externalize-a-plugin) and [Steps to build and run your plugin](/plugins/common/shim#steps-to-build-and-run-your-plugin) to properly with the Execd Go Shim
+>>>>>>> docs/EXTERNAL_PLUGINS.md
 
 #### Step-by-Step guidelines
 This is a guide to help you set up your plugin to use it with `execd`
@@ -29,15 +51,24 @@ This is a guide to help you set up your plugin to use it with `execd`
    - [Input Plugins](/docs/INPUTS.md)
    - [Processor Plugins](/docs/PROCESSORS.md)
    - [Aggregator Plugins](/docs/AGGREGATORS.md)
+<<<<<<< docs/EXTERNAL_PLUGINS.md
    - [Output Plugins](docs/OUTPUTS.md)
 2. If your plugin is written in Go, include the steps for the [Execd Go Shim](plugins/common/shim#steps-to-build-and-run-your-plugin)
+=======
+   - [Output Plugins](/docs/OUTPUTS.md)
+2. If your plugin is written in Go, include the steps for the [Execd Go Shim](/plugins/common/shim#steps-to-build-and-run-your-plugin)
+>>>>>>> docs/EXTERNAL_PLUGINS.md
   1. Move the project to an external repo, it's recommended to preserve the path
   structure, (but not strictly necessary). eg if your plugin was at
   `plugins/inputs/cpu`, it's recommended that it also be under `plugins/inputs/cpu`
   in the new repo. For a further example of what this might look like, take a
   look at [ssoroka/rand](https://github.com/ssoroka/rand) or
   [danielnelson/telegraf-execd-openvpn](https://github.com/danielnelson//telegraf-execd-openvpn)
+<<<<<<< docs/EXTERNAL_PLUGINS.md
   1. Copy [main.go](./example/cmd/main.go) into your project under the `cmd` folder.
+=======
+  1. Copy [main.go](/plugins/common/shim/example/cmd/main.go) into your project under the `cmd` folder.
+>>>>>>> docs/EXTERNAL_PLUGINS.md
   This will be the entrypoint to the plugin when run as a stand-alone program, and
   it will call the shim code for you to make that happen. It's recommended to
   have only one plugin per repo, as the shim is not designed to run multiple
@@ -52,9 +83,24 @@ This is a guide to help you set up your plugin to use it with `execd`
   Telegraf is expecting to load all configs**. If Telegraf reads this config file
   it will not know which plugin it relates to. Telegraf instead uses an execd config
   block to look for this plugin. 
+<<<<<<< docs/EXTERNAL_PLUGINS.md
  
 
 
 
 
 
+=======
+  1. Add usage and development instructions in the homepage of your repository for running 
+  your plugin with its respective `execd` plugin. Please refer to 
+  [openvpn](https://github.com/danielnelson/telegraf-execd-openvpn#usage) and [awsalarms](https://github.com/vipinvkmenon/awsalarms#installation) 
+  for examples. Include the following steps:
+     1. How to download the release package for your platform or how to clone the binary for your external plugin
+     1. The commands to unpack or build your binary
+     1. Location to edit your `telegraf.conf`
+     1. Configuration to run your external plugin with [inputs.execd](/plugins/inputs/execd), 
+     [processors.execd](/plugins/processors/execd) or [outputs.execd](/plugins/outputs/execd)
+     1. Note that restart or reload of Telegraf is required
+  1. Submit your plugin by opening a PR to add your external plugin to the [/EXTERNAL_PLUGINS.md](/EXTERNAL_PLUGINS.md) 
+  list. Please include the plugin name, link to the plugin repository and a short description of the plugin. 
+>>>>>>> docs/EXTERNAL_PLUGINS.md
diff --git a/docs/INPUTS.md b/docs/INPUTS.md
index f8e906f..6a10cf9 100644
--- a/docs/INPUTS.md
+++ b/docs/INPUTS.md
@@ -38,7 +38,8 @@ import (
 )
 
 type Simple struct {
-    Ok bool `toml:"ok"`
+    Ok  bool            `toml:"ok"`
+    Log telegraf.Logger `toml:"-"`
 }
 
 func (s *Simple) Description() string {
@@ -52,6 +53,7 @@ func (s *Simple) SampleConfig() string {
 `
 }
 
+// Init is for setup, and validating config.
 func (s *Simple) Init() error {
 	return nil
 }
@@ -81,7 +83,7 @@ func init() {
 
 ### Typed Metrics
 
-In addition the the `AddFields` function, the accumulator also supports
+In addition to the `AddFields` function, the accumulator also supports
 functions to add typed metrics: `AddGauge`, `AddCounter`, etc.  Metric types
 are ignored by the InfluxDB output, but can be used for other outputs, such as
 [prometheus][prom metric types].
diff --git a/docs/LICENSE_OF_DEPENDENCIES.md b/docs/LICENSE_OF_DEPENDENCIES.md
index 9c2a2d7..14c4644 100644
--- a/docs/LICENSE_OF_DEPENDENCIES.md
+++ b/docs/LICENSE_OF_DEPENDENCIES.md
@@ -31,6 +31,7 @@ following works:
 - github.com/cenkalti/backoff [MIT License](https://github.com/cenkalti/backoff/blob/master/LICENSE)
 - github.com/cespare/xxhash [MIT License](https://github.com/cespare/xxhash/blob/master/LICENSE.txt)
 - github.com/cisco-ie/nx-telemetry-proto [Apache License 2.0](https://github.com/cisco-ie/nx-telemetry-proto/blob/master/LICENSE)
+- github.com/containerd/containerd [Apache License 2.0](https://github.com/containerd/containerd/blob/master/LICENSE)
 - github.com/couchbase/go-couchbase [MIT License](https://github.com/couchbase/go-couchbase/blob/master/LICENSE)
 - github.com/couchbase/gomemcached [MIT License](https://github.com/couchbase/gomemcached/blob/master/LICENSE)
 - github.com/couchbase/goutils [COUCHBASE INC. COMMUNITY EDITION LICENSE](https://github.com/couchbase/goutils/blob/master/LICENSE.md)
@@ -50,9 +51,9 @@ following works:
 - github.com/eclipse/paho.mqtt.golang [Eclipse Public License - v 1.0](https://github.com/eclipse/paho.mqtt.golang/blob/master/LICENSE)
 - github.com/ericchiang/k8s [Apache License 2.0](https://github.com/ericchiang/k8s/blob/master/LICENSE)
 - github.com/ghodss/yaml [MIT License](https://github.com/ghodss/yaml/blob/master/LICENSE)
-- github.com/glinton/ping [MIT License](https://github.com/glinton/ping/blob/master/LICENSE)
 - github.com/go-logfmt/logfmt [MIT License](https://github.com/go-logfmt/logfmt/blob/master/LICENSE)
 - github.com/go-ole/go-ole [MIT License](https://github.com/go-ole/go-ole/blob/master/LICENSE)
+- github.com/go-ping/ping [MIT License](https://github.com/go-ping/ping/blob/master/LICENSE)
 - github.com/go-redis/redis [BSD 2-Clause "Simplified" License](https://github.com/go-redis/redis/blob/master/LICENSE)
 - github.com/go-sql-driver/mysql [Mozilla Public License 2.0](https://github.com/go-sql-driver/mysql/blob/master/LICENSE)
 - github.com/goburrow/modbus [BSD 3-Clause "New" or "Revised" License](https://github.com/goburrow/modbus/blob/master/LICENSE)
@@ -68,7 +69,10 @@ following works:
 - github.com/google/go-github [BSD 3-Clause "New" or "Revised" License](https://github.com/google/go-github/blob/master/LICENSE)
 - github.com/google/go-querystring [BSD 3-Clause "New" or "Revised" License](https://github.com/google/go-querystring/blob/master/LICENSE)
 - github.com/googleapis/gax-go [BSD 3-Clause "New" or "Revised" License](https://github.com/googleapis/gax-go/blob/master/LICENSE)
+- github.com/gopcua/opcua [MIT License](https://github.com/gopcua/opcua/blob/master/LICENSE)
 - github.com/gorilla/mux [BSD 3-Clause "New" or "Revised" License](https://github.com/gorilla/mux/blob/master/LICENSE)
+- github.com/gosnmp/gosnmp [BSD 2-Clause "Simplified" License](https://github.com/gosnmp/gosnmp/blob/master/LICENSE)
+- github.com/grpc-ecosystem/grpc-gateway [BSD 3-Clause "New" or "Revised" License](https://github.com/grpc-ecosystem/grpc-gateway/blob/master/LICENSE.txt)
 - github.com/hailocab/go-hostpool [MIT License](https://github.com/hailocab/go-hostpool/blob/master/LICENSE)
 - github.com/harlow/kinesis-consumer [MIT License](https://github.com/harlow/kinesis-consumer/blob/master/MIT-LICENSE)
 - github.com/hashicorp/consul [Mozilla Public License 2.0](https://github.com/hashicorp/consul/blob/master/LICENSE)
@@ -92,6 +96,7 @@ following works:
 - github.com/kubernetes/apimachinery [Apache License 2.0](https://github.com/kubernetes/apimachinery/blob/master/LICENSE)
 - github.com/leodido/ragel-machinery [MIT License](https://github.com/leodido/ragel-machinery/blob/develop/LICENSE)
 - github.com/mailru/easyjson [MIT License](https://github.com/mailru/easyjson/blob/master/LICENSE)
+- github.com/mattn/go-isatty [MIT License](https://github.com/mattn/go-isatty/blob/master/LICENSE)
 - github.com/matttproud/golang_protobuf_extensions [Apache License 2.0](https://github.com/matttproud/golang_protobuf_extensions/blob/master/LICENSE)
 - github.com/mdlayher/apcupsd [MIT License](https://github.com/mdlayher/apcupsd/blob/master/LICENSE.md)
 - github.com/mdlayher/genetlink [MIT License](https://github.com/mdlayher/genetlink/blob/master/LICENSE.md)
@@ -119,7 +124,9 @@ following works:
 - github.com/prometheus/client_model [Apache License 2.0](https://github.com/prometheus/client_model/blob/master/LICENSE)
 - github.com/prometheus/common [Apache License 2.0](https://github.com/prometheus/common/blob/master/LICENSE)
 - github.com/prometheus/procfs [Apache License 2.0](https://github.com/prometheus/procfs/blob/master/LICENSE)
+- github.com/prometheus/prometheus [Apache License 2.0](https://github.com/prometheus/prometheus/blob/master/LICENSE)
 - github.com/rcrowley/go-metrics [MIT License](https://github.com/rcrowley/go-metrics/blob/master/LICENSE)
+- github.com/riemann/riemann-go-client [MIT License](https://github.com/riemann/riemann-go-client/blob/master/LICENSE)
 - github.com/safchain/ethtool [Apache License 2.0](https://github.com/safchain/ethtool/blob/master/LICENSE)
 - github.com/samuel/go-zookeeper [BSD 3-Clause Clear License](https://github.com/samuel/go-zookeeper/blob/master/LICENSE)
 - github.com/shirou/gopsutil [BSD 3-Clause Clear License](https://github.com/shirou/gopsutil/blob/master/LICENSE)
@@ -138,6 +145,8 @@ following works:
 - github.com/wavefronthq/wavefront-sdk-go [Apache License 2.0](https://github.com/wavefrontHQ/wavefront-sdk-go/blob/master/LICENSE)
 - github.com/wvanbergen/kafka [MIT License](https://github.com/wvanbergen/kafka/blob/master/LICENSE)
 - github.com/wvanbergen/kazoo-go [MIT License](https://github.com/wvanbergen/kazoo-go/blob/master/MIT-LICENSE)
+- github.com/xdg/scram [Apache License 2.0](https://github.com/xdg-go/scram/blob/master/LICENSE)
+- github.com/xdg/stringprep [Apache License 2.0](https://github.com/xdg-go/stringprep/blob/master/LICENSE)
 - github.com/yuin/gopher-lua [MIT License](https://github.com/yuin/gopher-lua/blob/master/LICENSE)
 - go.opencensus.io [Apache License 2.0](https://github.com/census-instrumentation/opencensus-go/blob/master/LICENSE)
 - go.starlark.net [BSD 3-Clause "New" or "Revised" License](https://github.com/google/starlark-go/blob/master/LICENSE)
@@ -167,7 +176,12 @@ following works:
 - gopkg.in/mgo.v2 [BSD 2-Clause "Simplified" License](https://github.com/go-mgo/mgo/blob/v2/LICENSE)
 - gopkg.in/olivere/elastic.v5 [MIT License](https://github.com/olivere/elastic/blob/v5.0.76/LICENSE)
 - gopkg.in/tomb.v1 [BSD 3-Clause Clear License](https://github.com/go-tomb/tomb/blob/v1/LICENSE)
+- gopkg.in/tomb.v2 [BSD 3-Clause Clear License](https://github.com/go-tomb/tomb/blob/v2/LICENSE)
 - gopkg.in/yaml.v2 [Apache License 2.0](https://github.com/go-yaml/yaml/blob/v2.2.2/LICENSE)
+- gopkg.in/yaml.v3 [Apache License 2.0](https://github.com/go-yaml/yaml/blob/v3/LICENSE)
+- modernc.org/libc [BSD 3-Clause "New" or "Revised" License](https://gitlab.com/cznic/libc/-/blob/master/LICENSE)
+- modernc.org/memory [BSD 3-Clause "New" or "Revised" License](https://gitlab.com/cznic/memory/-/blob/master/LICENSE)
+- modernc.org/sqlite [BSD 3-Clause "New" or "Revised" License](https://gitlab.com/cznic/sqlite/-/blob/master/LICENSE)
 
 ## telegraf used and modified code from these projects
 - github.com/DataDog/datadog-agent [Apache License 2.0](https://github.com/DataDog/datadog-agent/LICENSE)
diff --git a/docs/OUTPUTS.md b/docs/OUTPUTS.md
index c60cd96..1a27ca5 100644
--- a/docs/OUTPUTS.md
+++ b/docs/OUTPUTS.md
@@ -30,7 +30,8 @@ import (
 )
 
 type Simple struct {
-    Ok bool `toml:"ok"`
+    Ok  bool            `toml:"ok"`
+    Log telegraf.Logger `toml:"-"`
 }
 
 func (s *Simple) Description() string {
@@ -43,20 +44,25 @@ func (s *Simple) SampleConfig() string {
 `
 }
 
+// Init is for setup, and validating config.
 func (s *Simple) Init() error {
 	return nil
 }
 
 func (s *Simple) Connect() error {
-    // Make a connection to the URL here
+    // Make any connection required here
     return nil
 }
 
 func (s *Simple) Close() error {
-    // Close connection to the URL here
+    // Close any connections here.
+    // Write will not be called once Close is called, so there is no need to synchronize.
     return nil
 }
 
+// Write should write immediately to the output, and not buffer writes
+// (Telegraf manages the buffer for you). Returning an error will fail this
+// batch of writes and the entire batch will be retried automatically.
 func (s *Simple) Write(metrics []telegraf.Metric) error {
     for _, metric := range metrics {
         // write `metric` to the output sink here
@@ -102,9 +108,9 @@ Metrics are flushed to outputs when any of the following events happen:
 - The telegraf process has received a SIGUSR1 signal
 
 Note that if the flush takes longer than the `agent.interval` to write the metrics
-to the output, you'll see a message saying the output `did not complete within its 
-flush interval`. This may mean your output is not keeping up with the flow of metrics, 
-and you may want to look into enabling compression, reducing the size of your metrics, 
+to the output, you'll see a message saying the output `did not complete within its
+flush interval`. This may mean your output is not keeping up with the flow of metrics,
+and you may want to look into enabling compression, reducing the size of your metrics,
 or investigate other reasons why the writes might be taking longer than expected.
 
 [file]: https://github.com/influxdata/telegraf/tree/master/plugins/inputs/file
diff --git a/docs/PROCESSORS.md b/docs/PROCESSORS.md
index 47f29a4..25566fe 100644
--- a/docs/PROCESSORS.md
+++ b/docs/PROCESSORS.md
@@ -33,6 +33,7 @@ import (
 )
 
 type Printer struct {
+	Log telegraf.Logger `toml:"-"`
 }
 
 var sampleConfig = `
@@ -46,6 +47,7 @@ func (p *Printer) Description() string {
 	return "Print all metrics that pass through this filter."
 }
 
+// Init is for setup, and validating config.
 func (p *Printer) Init() error {
 	return nil
 }
@@ -97,6 +99,7 @@ import (
 )
 
 type Printer struct {
+	Log telegraf.Logger `toml:"-"`
 }
 
 var sampleConfig = `
@@ -110,13 +113,27 @@ func (p *Printer) Description() string {
 	return "Print all metrics that pass through this filter."
 }
 
+// Init is for setup, and validating config.
 func (p *Printer) Init() error {
 	return nil
 }
 
+// Start is called once when the plugin starts; it is only called once per
+// plugin instance, and never in parallel.
+// Start should return once it is ready to receive metrics.
+// The passed in accumulator is the same as the one passed to Add(), so you
+// can choose to save it in the plugin, or use the one received from Add().
 func (p *Printer) Start(acc telegraf.Accumulator) error {
 }
 
+// Add is called for each metric to be processed. The Add() function does not
+// need to wait for the metric to be processed before returning, and it may
+// be acceptable to let background goroutine(s) handle the processing if you
+// have slow processing you need to do in parallel.
+// Keep in mind Add() should not spawn unbounded goroutines, so you may need
+// to use a semaphore or pool of workers (eg: reverse_dns plugin does this).
+// Metrics you don't want to pass downstream should have metric.Drop() called,
+// rather than simply omitting the acc.AddMetric() call
 func (p *Printer) Add(metric telegraf.Metric, acc telegraf.Accumulator) error {
 	// print!
 	fmt.Println(metric.String())
@@ -127,6 +144,12 @@ func (p *Printer) Add(metric telegraf.Metric, acc telegraf.Accumulator) error {
 	return nil
 }
 
+// Stop gives you an opportunity to gracefully shut down the processor.
+// Once Stop() is called, Add() will not be called any more. If you are using
+// goroutines, you should wait for any in-progress metrics to be processed
+// before returning from Stop().
+// When stop returns, you should no longer be writing metrics to the
+// accumulator.
 func (p *Printer) Stop() error {
 }
 
diff --git a/docs/TEMPLATE_PATTERN.md b/docs/TEMPLATE_PATTERN.md
index 4244369..42a5abe 100644
--- a/docs/TEMPLATE_PATTERN.md
+++ b/docs/TEMPLATE_PATTERN.md
@@ -22,6 +22,7 @@ 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:** `measurement` must be specified in your template.
 **NOTE:** `field*` cannot be used in conjunction with `measurement*`.
 
 ### Examples
diff --git a/docs/TLS.md b/docs/TLS.md
index 3cd6a10..355da32 100644
--- a/docs/TLS.md
+++ b/docs/TLS.md
@@ -18,6 +18,8 @@ For client TLS support we have the following options:
 # tls_key = "/etc/telegraf/key.pem"
 ## Skip TLS verification.
 # insecure_skip_verify = false
+## Send the specified TLS server name via SNI.
+# tls_server_name = "foo.example.com"
 ```
 
 ### Server Configuration
diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index be0dab4..a56b822 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -171,7 +171,7 @@
 
   ## HTTP Content-Encoding for write request body, can be set to "gzip" to
   ## compress body or "identity" to apply no encoding.
-  # content_encoding = "identity"
+  # content_encoding = "gzip"
 
   ## When true, Telegraf will output unsigned integers as unsigned values,
   ## i.e.: "42u".  You will need a version of InfluxDB supporting unsigned
@@ -390,7 +390,7 @@
 #   # base64_data = false
 #
 #   ## Optional. PubSub attributes to add to metrics.
-#   # [[inputs.pubsub.attributes]]
+#   # [outputs.cloud_pubsub.attributes]
 #   #   my_attr = "tag_value"
 
 
@@ -465,6 +465,39 @@
 #   # no configuration
 
 
+# # Send telegraf metrics to a Dynatrace environment
+# [[outputs.dynatrace]]
+#   ## For usage with the Dynatrace OneAgent you can omit any configuration,
+#   ## the only requirement is that the OneAgent is running on the same host.
+#   ## Only setup environment url and token if you want to monitor a Host without the OneAgent present.
+#   ##
+#   ## Your Dynatrace environment URL.
+#   ## For Dynatrace OneAgent you can leave this empty or set it to "http://127.0.0.1:14499/metrics/ingest" (default)
+#   ## For Dynatrace SaaS environments the URL scheme is "https://{your-environment-id}.live.dynatrace.com/api/v2/metrics/ingest"
+#   ## For Dynatrace Managed environments the URL scheme is "https://{your-domain}/e/{your-environment-id}/api/v2/metrics/ingest"
+#   url = ""
+#
+#   ## Your Dynatrace API token.
+#   ## Create an API token within your Dynatrace environment, by navigating to Settings > Integration > Dynatrace API
+#   ## The API token needs data ingest scope permission. When using OneAgent, no API token is required.
+#   api_token = ""
+#
+#   ## Optional prefix for metric names (e.g.: "telegraf.")
+#   prefix = "telegraf."
+#
+#   ## Optional TLS Config
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#
+#   ## Optional flag for ignoring tls certificate check
+#   # insecure_skip_verify = false
+#
+#
+#   ## Connection timeout, defaults to "5s" if not set.
+#   timeout = "5s"
+
+
 # # Configuration for Elasticsearch to send metrics to.
 # [[outputs.elasticsearch]]
 #   ## The full HTTP endpoint URL for your Elasticsearch instance
@@ -515,6 +548,9 @@
 #   template_name = "telegraf"
 #   ## Set to true if you want telegraf to overwrite an existing template
 #   overwrite_template = false
+#   ## If set to true a unique ID hash will be sent as sha256(concat(timestamp,measurement,series-hash)) string
+#   ## it will enable data resend and update metric points avoiding duplicated metrics with diferent id's
+#   force_document_id = false
 
 
 # # Send metrics to command as input over stdin
@@ -708,6 +744,11 @@
 #   # [outputs.http.headers]
 #   #   # Should be set manually to "application/json" for json data_format
 #   #   Content-Type = "text/plain; charset=utf-8"
+#
+#   ## Idle (keep-alive) connection timeout.
+#   ## Maximum amount of time before idle connection is closed.
+#   ## Zero means no limit.
+#   # idle_conn_timeout = 0
 
 
 # # Configuration for sending metrics to InfluxDB
@@ -717,7 +758,7 @@
 #   ## Multiple URLs can be specified for a single cluster, only ONE of the
 #   ## urls will be written to each interval.
 #   ##   ex: urls = ["https://us-west-2-1.aws.cloud2.influxdata.com"]
-#   urls = ["http://127.0.0.1:9999"]
+#   urls = ["http://127.0.0.1:8086"]
 #
 #   ## Token for authentication.
 #   token = ""
@@ -847,14 +888,19 @@
 #   ##       routing_key = "telegraf"
 #   # routing_key = ""
 #
-#   ## CompressionCodec represents the various compression codecs recognized by
+#   ## Compression codec represents the various compression codecs recognized by
 #   ## Kafka in messages.
-#   ##  0 : No compression
-#   ##  1 : Gzip compression
-#   ##  2 : Snappy compression
-#   ##  3 : LZ4 compression
+#   ##  0 : None
+#   ##  1 : Gzip
+#   ##  2 : Snappy
+#   ##  3 : LZ4
+#   ##  4 : ZSTD
 #   # compression_codec = 0
 #
+#   ## Idempotent Writes
+#   ## If enabled, exactly one copy of each message is written.
+#   # idempotent_writes = false
+#
 #   ##  RequiredAcks is used in Produce Requests to tell the broker how many
 #   ##  replica acknowledgements it must see before responding
 #   ##   0 : the producer never waits for an acknowledgement from the broker.
@@ -880,7 +926,6 @@
 #   # max_message_bytes = 1000000
 #
 #   ## Optional TLS Config
-#   # enable_tls = true
 #   # tls_ca = "/etc/telegraf/ca.pem"
 #   # tls_cert = "/etc/telegraf/cert.pem"
 #   # tls_key = "/etc/telegraf/key.pem"
@@ -891,6 +936,23 @@
 #   # sasl_username = "kafka"
 #   # sasl_password = "secret"
 #
+#   ## Optional SASL:
+#   ## one of: OAUTHBEARER, PLAIN, SCRAM-SHA-256, SCRAM-SHA-512, GSSAPI
+#   ## (defaults to PLAIN)
+#   # sasl_mechanism = ""
+#
+#   ## used if sasl_mechanism is GSSAPI (experimental)
+#   # sasl_gssapi_service_name = ""
+#   # ## One of: KRB5_USER_AUTH and KRB5_KEYTAB_AUTH
+#   # sasl_gssapi_auth_type = "KRB5_USER_AUTH"
+#   # sasl_gssapi_kerberos_config_path = "/"
+#   # sasl_gssapi_realm = "realm"
+#   # sasl_gssapi_key_tab_path = ""
+#   # sasl_gssapi_disable_pafxfast = false
+#
+#   ## used if sasl_mechanism is OAUTHBEARER (experimental)
+#   # sasl_access_token = ""
+#
 #   ## SASL protocol version.  When connecting to Azure EventHub set to 0.
 #   # sasl_version = 1
 #
@@ -987,6 +1049,23 @@
 #
 
 
+# # Send aggregate metrics to Logz.io
+# [[outputs.logzio]]
+#   ## Connection timeout, defaults to "5s" if not set.
+#   timeout = "5s"
+#
+#   ## Optional TLS Config
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#
+#   ## Logz.io account token
+#   token = "your logz.io token" # required
+#
+#   ## Use your listener URL for your Logz.io account region.
+#   # url = "https://listener.logz.io:8071"
+
+
 # # Configuration for MQTT server to send metrics to
 # [[outputs.mqtt]]
 #   servers = ["localhost:1883"] # required.
@@ -1039,6 +1118,9 @@
 #   ## URLs of NATS servers
 #   servers = ["nats://localhost:4222"]
 #
+#   ## Optional client name
+#   # name = ""
+#
 #   ## Optional credentials
 #   # username = ""
 #   # password = ""
@@ -1268,6 +1350,59 @@
 #   #   location = "eu-north0"
 
 
+# # A plugin that can transmit metrics to Sumo Logic HTTP Source
+# [[outputs.sumologic]]
+#   ## Unique URL generated for your HTTP Metrics Source.
+#   ## This is the address to send metrics to.
+#   # url = "https://events.sumologic.net/receiver/v1/http/<UniqueHTTPCollectorCode>"
+#
+#   ## Data format to be used for sending metrics.
+#   ## This will set the "Content-Type" header accordingly.
+#   ## Currently supported formats:
+#   ## * graphite - for Content-Type of application/vnd.sumologic.graphite
+#   ## * carbon2 - for Content-Type of application/vnd.sumologic.carbon2
+#   ## * prometheus - for Content-Type of application/vnd.sumologic.prometheus
+#   ##
+#   ## More information can be found at:
+#   ## https://help.sumologic.com/03Send-Data/Sources/02Sources-for-Hosted-Collectors/HTTP-Source/Upload-Metrics-to-an-HTTP-Source#content-type-headers-for-metrics
+#   ##
+#   ## NOTE:
+#   ## When unset, telegraf will by default use the influx serializer which is currently unsupported
+#   ## in HTTP Source.
+#   data_format = "carbon2"
+#
+#   ## Timeout used for HTTP request
+#   # timeout = "5s"
+#
+#   ## Max HTTP request body size in bytes before compression (if applied).
+#   ## By default 1MB is recommended.
+#   ## NOTE:
+#   ## Bear in mind that in some serializer a metric even though serialized to multiple
+#   ## lines cannot be split any further so setting this very low might not work
+#   ## as expected.
+#   # max_request_body_size = 1000000
+#
+#   ## Additional, Sumo specific options.
+#   ## Full list can be found here:
+#   ## https://help.sumologic.com/03Send-Data/Sources/02Sources-for-Hosted-Collectors/HTTP-Source/Upload-Metrics-to-an-HTTP-Source#supported-http-headers
+#
+#   ## Desired source name.
+#   ## Useful if you want to override the source name configured for the source.
+#   # source_name = ""
+#
+#   ## Desired host name.
+#   ## Useful if you want to override the source host configured for the source.
+#   # source_host = ""
+#
+#   ## Desired source category.
+#   ## Useful if you want to override the source category configured for the source.
+#   # source_category = ""
+#
+#   ## Comma-separated key=value list of dimensions to apply to every metric.
+#   ## Custom dimensions will allow you to query your metrics at a more granular level.
+#   # dimensions = ""
+
+
 # # Configuration for Syslog server to send metrics to
 # [[outputs.syslog]]
 #   ## URL to connect to
@@ -1346,6 +1481,118 @@
 #   # default_appname = "Telegraf"
 
 
+# # Configuration for Amazon Timestream output.
+# [[outputs.timestream]]
+#   ## Amazon Region
+#   region = "us-east-1"
+#
+#   ## Amazon Credentials
+#   ## Credentials are loaded in the following order:
+#   ## 1) Assumed credentials via STS if role_arn is specified
+#   ## 2) Explicit credentials from 'access_key' and 'secret_key'
+#   ## 3) Shared profile from 'profile'
+#   ## 4) Environment variables
+#   ## 5) Shared credentials file
+#   ## 6) EC2 Instance Profile
+#   #access_key = ""
+#   #secret_key = ""
+#   #token = ""
+#   #role_arn = ""
+#   #profile = ""
+#   #shared_credential_file = ""
+#
+#   ## 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 = ""
+#
+#   ## Timestream database where the metrics will be inserted.
+#   ## The database must exist prior to starting Telegraf.
+#   database_name = "yourDatabaseNameHere"
+#
+#   ## Specifies if the plugin should describe the Timestream database upon starting
+#   ## to validate if it has access necessary permissions, connection, etc., as a safety check.
+#   ## If the describe operation fails, the plugin will not start
+#   ## and therefore the Telegraf agent will not start.
+#   describe_database_on_start = false
+#
+#   ## The mapping mode specifies how Telegraf records are represented in Timestream.
+#   ## Valid values are: single-table, multi-table.
+#   ## For example, consider the following data in line protocol format:
+#   ## weather,location=us-midwest,season=summer temperature=82,humidity=71 1465839830100400200
+#   ## airquality,location=us-west no2=5,pm25=16 1465839830100400200
+#   ## where weather and airquality are the measurement names, location and season are tags,
+#   ## and temperature, humidity, no2, pm25 are fields.
+#   ## In multi-table mode:
+#   ##  - first line will be ingested to table named weather
+#   ##  - second line will be ingested to table named airquality
+#   ##  - the tags will be represented as dimensions
+#   ##  - first table (weather) will have two records:
+#   ##      one with measurement name equals to temperature,
+#   ##      another with measurement name equals to humidity
+#   ##  - second table (airquality) will have two records:
+#   ##      one with measurement name equals to no2,
+#   ##      another with measurement name equals to pm25
+#   ##  - the Timestream tables from the example will look like this:
+#   ##      TABLE "weather":
+#   ##        time | location | season | measure_name | measure_value::bigint
+#   ##        2016-06-13 17:43:50 | us-midwest | summer | temperature | 82
+#   ##        2016-06-13 17:43:50 | us-midwest | summer | humidity | 71
+#   ##      TABLE "airquality":
+#   ##        time | location | measure_name | measure_value::bigint
+#   ##        2016-06-13 17:43:50 | us-west | no2 | 5
+#   ##        2016-06-13 17:43:50 | us-west | pm25 | 16
+#   ## In single-table mode:
+#   ##  - the data will be ingested to a single table, which name will be valueOf(single_table_name)
+#   ##  - measurement name will stored in dimension named valueOf(single_table_dimension_name_for_telegraf_measurement_name)
+#   ##  - location and season will be represented as dimensions
+#   ##  - temperature, humidity, no2, pm25 will be represented as measurement name
+#   ##  - the Timestream table from the example will look like this:
+#   ##      Assuming:
+#   ##        - single_table_name = "my_readings"
+#   ##        - single_table_dimension_name_for_telegraf_measurement_name = "namespace"
+#   ##      TABLE "my_readings":
+#   ##        time | location | season | namespace | measure_name | measure_value::bigint
+#   ##        2016-06-13 17:43:50 | us-midwest | summer | weather | temperature | 82
+#   ##        2016-06-13 17:43:50 | us-midwest | summer | weather | humidity | 71
+#   ##        2016-06-13 17:43:50 | us-west | NULL | airquality | no2 | 5
+#   ##        2016-06-13 17:43:50 | us-west | NULL | airquality | pm25 | 16
+#   ## In most cases, using multi-table mapping mode is recommended.
+#   ## However, you can consider using single-table in situations when you have thousands of measurement names.
+#   mapping_mode = "multi-table"
+#
+#   ## Only valid and required for mapping_mode = "single-table"
+#   ## Specifies the Timestream table where the metrics will be uploaded.
+#   # single_table_name = "yourTableNameHere"
+#
+#   ## Only valid and required for mapping_mode = "single-table"
+#   ## Describes what will be the Timestream dimension name for the Telegraf
+#   ## measurement name.
+#   # single_table_dimension_name_for_telegraf_measurement_name = "namespace"
+#
+#   ## Specifies if the plugin should create the table, if the table do not exist.
+#   ## The plugin writes the data without prior checking if the table exists.
+#   ## When the table does not exist, the error returned from Timestream will cause
+#   ## the plugin to create the table, if this parameter is set to true.
+#   create_table_if_not_exists = true
+#
+#   ## Only valid and required if create_table_if_not_exists = true
+#   ## Specifies the Timestream table magnetic store retention period in days.
+#   ## Check Timestream documentation for more details.
+#   create_table_magnetic_store_retention_period_in_days = 365
+#
+#   ## Only valid and required if create_table_if_not_exists = true
+#   ## Specifies the Timestream table memory store retention period in hours.
+#   ## Check Timestream documentation for more details.
+#   create_table_memory_store_retention_period_in_hours = 24
+#
+#   ## Only valid and optional if create_table_if_not_exists = true
+#   ## Specifies the Timestream table tags.
+#   ## Check Timestream documentation for more details