update readme to include procstat_lookup metric

knock more errors from test files
clean up some test cases
2018-06-22 10:01:13 -07:00 · 2018-06-21 16:23:06 -07:00 · 2018-06-21 16:12:26 -07:00 · 2018-06-21 16:06:36 -07:00 · 2018-06-21 15:56:20 -07:00 · 2018-06-21 13:13:46 -07:00
131 changed files with 8883 additions and 2106 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,15 +2,12 @@
 defaults:
  defaults: &defaults
    working_directory: '/go/src/github.com/influxdata/telegraf'
-  go-1_8: &go-1_8
-    docker:
-      - image: 'circleci/golang:1.8.7'
  go-1_9: &go-1_9
    docker:
-      - image: 'circleci/golang:1.9.5'
+      - image: 'circleci/golang:1.9.7'
  go-1_10: &go-1_10
    docker:
-      - image: 'circleci/golang:1.10.1'
+      - image: 'circleci/golang:1.10.3'

 version: 2
 jobs:
@@ -18,17 +15,18 @@ jobs:
    <<: [ *defaults, *go-1_10 ]
    steps:
      - checkout
+      - restore_cache:
+          key: vendor-{{ .Branch }}-{{ checksum "Gopkg.lock" }}
      - run: 'make deps'
+      - save_cache:
+          name: 'vendored deps'
+          key: vendor-{{ .Branch }}-{{ checksum "Gopkg.lock" }}
+          paths:
+            - './vendor'
      - persist_to_workspace:
          root: '/go/src'
          paths:
            - '*'
-  test-go-1.8:
-    <<: [ *defaults, *go-1_8 ]
-    steps:
-      - attach_workspace:
-          at: '/go/src'
-      - run: 'make test-ci'
  test-go-1.9:
    <<: [ *defaults, *go-1_9 ]
    steps:
@@ -66,9 +64,6 @@ workflows:
  build_and_release:
    jobs:
      - 'deps'
-      - 'test-go-1.8':
-          requires:
-            - 'deps'
      - 'test-go-1.9':
          requires:
            - 'deps'
@@ -77,15 +72,11 @@ workflows:
            - 'deps'
      - 'release':
          requires:
-            - 'test-go-1.8'
            - 'test-go-1.9'
            - 'test-go-1.10'
  nightly:
    jobs:
      - 'deps'
-      - 'test-go-1.8':
-          requires:
-            - 'deps'
      - 'test-go-1.9':
          requires:
            - 'deps'
@@ -94,7 +85,6 @@ workflows:
            - 'deps'
      - 'nightly':
          requires:
-            - 'test-go-1.8'
            - 'test-go-1.9'
            - 'test-go-1.10'
    triggers:
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /telegraf
 /telegraf.exe
 /telegraf.gz
+/vendor
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,34 @@
-## v1.7 [unreleased]
+## v1.8 [unreleased]
+
+### Release Notes
+
+### New Inputs
+
+- [tengine](./plugins/inputs/tengine/README.md) - Contributed by @ertaoxu
+
+### New Aggregators
+
+- [valuecounter](./plugins/aggregators/valuecounter/README.md) - Contributed by @piotr1212
+
+### Features
+
+- [#4236](https://github.com/influxdata/telegraf/pull/4236): Add SSL/TLS support to redis input.
+- [#4160](https://github.com/influxdata/telegraf/pull/4160): Add tengine input plugin.
+- [#4262](https://github.com/influxdata/telegraf/pull/4262): Add power draw field to nvidia_smi plugin.
+- [#4271](https://github.com/influxdata/telegraf/pull/4271): Add support for solr 7 to the solr input.
+- [#4281](https://github.com/influxdata/telegraf/pull/4281): Add owner tag on partitions in burrow input.
+- [#4259](https://github.com/influxdata/telegraf/pull/4259): Add container status tag to docker input.
+- [#3523](https://github.com/influxdata/telegraf/pull/3523): Add valuecounter aggregator plugin.
+- [#4307](https://github.com/influxdata/telegraf/pull/4307): Add new measurement with results of pgrep lookup to procstat input.
+
+## v1.7.1 [unreleased]
+
+### Bugfixes
+
+- [#4277](https://github.com/influxdata/telegraf/pull/4277): Treat sigterm as a clean shutdown signal.
+- [#4284](https://github.com/influxdata/telegraf/pull/4284): Fix selection of tags under nested objects in the JSON parser.
+
+## v1.7 [2018-06-12]

 ### Release Notes

@@ -19,6 +49,7 @@
 - [jti_openconfig_telemetry](./plugins/inputs/jti_openconfig_telemetry/README.md) - Contributed by @ajhai
 - [mcrouter](./plugins/inputs/mcrouter/README.md) - Contributed by @cthayer
 - [nvidia_smi](./plugins/inputs/nvidia_smi/README.md) - Contributed by @jackzampolin
+- [syslog](./plugins/inputs/syslog/README.md) - Contributed by @influxdata

 ### New Processors

@@ -56,6 +87,12 @@
 - [#3489](https://github.com/influxdata/telegraf/pull/3489): Add burrow input plugin.
 - [#3969](https://github.com/influxdata/telegraf/pull/3969): Add option to unbound module to use threads as tags.
 - [#4183](https://github.com/influxdata/telegraf/pull/4183): Add support for TLS and username/password auth to aerospike input.
+- [#4190](https://github.com/influxdata/telegraf/pull/4190): Add special syslog timestamp parser to grok parser that uses current year.
+- [#4181](https://github.com/influxdata/telegraf/pull/4181): Add syslog input plugin.
+- [#4212](https://github.com/influxdata/telegraf/pull/4212): Print the enabled aggregator and processor plugins on startup.
+- [#3994](https://github.com/influxdata/telegraf/pull/3994): Add static routing_key option to amqp output.
+- [#3995](https://github.com/influxdata/telegraf/pull/3995): Add passive mode exchange declaration option to amqp consumer input.
+- [#4216](https://github.com/influxdata/telegraf/pull/4216): Add counter fields to pf input.

 ### Bugfixes

@@ -63,6 +100,20 @@
 - [#4036](https://github.com/influxdata/telegraf/pull/4036): Add all win_perf_counters fields for a series in a single metric.
 - [#4118](https://github.com/influxdata/telegraf/pull/4118): Report results of dns_query instead of 0ms on timeout.
 - [#4155](https://github.com/influxdata/telegraf/pull/4155): Add consul service tags to metric.
+- [#2879](https://github.com/influxdata/telegraf/issues/2879): Fix wildcards and multi instance processes in win_perf_counters.
+- [#2468](https://github.com/influxdata/telegraf/issues/2468): Fix crash on 32-bit Windows in win_perf_counters.
+- [#4198](https://github.com/influxdata/telegraf/issues/4198): Fix win_perf_counters not collecting at every interval.
+- [#4227](https://github.com/influxdata/telegraf/issues/4227): Use same flags for all BSD family ping variants.
+- [#4266](https://github.com/influxdata/telegraf/issues/4266): Remove tags with empty values from Wavefront output.
+
+## v1.6.4 [2018-06-05]
+
+### Bugfixes
+
+- [#4203](https://github.com/influxdata/telegraf/issues/4203): Fix snmp overriding of auto-configured table fields.
+- [#4218](https://github.com/influxdata/telegraf/issues/4218): Fix uint support in cloudwatch output.
+- [#4188](https://github.com/influxdata/telegraf/pull/4188): Fix documentation of instance_name option in varnish input.
+- [#4195](https://github.com/influxdata/telegraf/pull/4195): Revert to previous aerospike library version due to memory leak.

 ## v1.6.3 [2018-05-21]

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -30,9 +30,9 @@ which can be found [on our website](http://influxdb.com/community/cla.html)

 Assuming you can already build the project, run these in the telegraf directory:

-1. `go get github.com/sparrc/gdm`
-1. `gdm restore`
-1. `GOOS=linux gdm save`
+1. `go get -u github.com/golang/dep/cmd/dep`
+2. `dep ensure`
+3. `dep ensure -add github.com/[dependency]/[new-package]`

 ## Input Plugins

--- a/101
+++ b/101
@@ -1,101 +0,0 @@
-code.cloudfoundry.org/clock e9dc86bbf0e5bbe6bf7ff5a6f71e048959b61f71
-collectd.org 2ce144541b8903101fb8f1483cc0497a68798122
-github.com/aerospike/aerospike-client-go 9701404f4c60a6ea256595d24bf318f721a7e8b8
-github.com/Azure/go-autorest 9ad9326b278af8fa5cc67c30c0ce9a58cc0862b2
-github.com/amir/raidman c74861fe6a7bb8ede0a010ce4485bdbb4fc4c985
-github.com/apache/thrift 4aaa92ece8503a6da9bc6701604f69acf2b99d07
-github.com/aws/aws-sdk-go c861d27d0304a79f727e9a8a4e2ac1e74602fdc0
-github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
-github.com/bsm/sarama-cluster abf039439f66c1ce78017f560b490612552f6472
-github.com/cenkalti/backoff b02f2bbce11d7ea6b97f282ef1771b0fe2f65ef3
-github.com/couchbase/go-couchbase bfe555a140d53dc1adf390f1a1d4b0fd4ceadb28
-github.com/couchbase/gomemcached 4a25d2f4e1dea9ea7dd76dfd943407abf9b07d29
-github.com/couchbase/goutils 5823a0cbaaa9008406021dc5daf80125ea30bba6
-github.com/davecgh/go-spew 346938d642f2ec3594ed81d874461961cd0faa76
-github.com/dgrijalva/jwt-go dbeaa9332f19a944acb5736b4456cfcc02140e29
-github.com/docker/docker f5ec1e2936dcbe7b5001c2b817188b095c700c27
-github.com/docker/go-connections 990a1a1a70b0da4c4cb70e117971a4f0babfbf1a
-github.com/eapache/go-resiliency b86b1ec0dd4209a588dc1285cdd471e73525c0b3
-github.com/eapache/go-xerial-snappy bb955e01b9346ac19dc29eb16586c90ded99a98c
-github.com/eapache/queue 44cc805cf13205b55f69e14bcb69867d1ae92f98
-github.com/eclipse/paho.mqtt.golang aff15770515e3c57fc6109da73d42b0d46f7f483
-github.com/go-logfmt/logfmt 390ab7935ee28ec6b286364bba9b4dd6410cb3d5
-github.com/go-sql-driver/mysql 2e00b5cd70399450106cec6431c2e2ce3cae5034
-github.com/gobwas/glob bea32b9cd2d6f55753d94a28e959b13f0244797a
-github.com/go-ini/ini 9144852efba7c4daf409943ee90767da62d55438
-github.com/gogo/protobuf 7b6c6391c4ff245962047fc1e2c6e08b1cdfa0e8
-github.com/golang/protobuf 8ee79997227bf9b34611aee7946ae64735e6fd93
-github.com/golang/snappy 7db9049039a047d955fe8c19b83c8ff5abd765c7
-github.com/go-ole/go-ole be49f7c07711fcb603cff39e1de7c67926dc0ba7
-github.com/google/go-cmp f94e52cad91c65a63acc1e75d4be223ea22e99bc
-github.com/gorilla/mux 53c1911da2b537f792e7cafcb446b05ffe33b996
-github.com/go-redis/redis 73b70592cdaa9e6abdfcfbf97b4a90d80728c836
-github.com/go-sql-driver/mysql 2e00b5cd70399450106cec6431c2e2ce3cae5034
-github.com/hailocab/go-hostpool e80d13ce29ede4452c43dea11e79b9bc8a15b478
-github.com/hashicorp/consul 5174058f0d2bda63fa5198ab96c33d9a909c58ed
-github.com/influxdata/tail c43482518d410361b6c383d7aebce33d0471d7bc
-github.com/influxdata/toml 5d1d907f22ead1cd47adde17ceec5bda9cacaf8f
-github.com/influxdata/wlog 7c63b0a71ef8300adc255344d275e10e5c3a71ec
-github.com/fsnotify/fsnotify c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9
-github.com/jackc/pgx 63f58fd32edb5684b9e9f4cfaac847c6b42b3917
-github.com/jmespath/go-jmespath bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d
-github.com/kardianos/osext c2c54e542fb797ad986b31721e1baedf214ca413
-github.com/kardianos/service 6d3a0ee7d3425d9d835debc51a0ca1ffa28f4893
-github.com/kballard/go-shellquote d8ec1a69a250a17bb0e419c386eac1f3711dc142
-github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c
-github.com/Microsoft/ApplicationInsights-Go 3612f58550c1de70f1a110c78c830e55f29aa65d
-github.com/Microsoft/go-winio ce2922f643c8fd76b46cadc7f404a06282678b34
-github.com/miekg/dns 99f84ae56e75126dd77e5de4fae2ea034a468ca1
-github.com/mitchellh/mapstructure d0303fe809921458f417bcf828397a65db30a7e4
-github.com/multiplay/go-ts3 07477f49b8dfa3ada231afc7b7b17617d42afe8e
-github.com/naoina/go-stringutil 6b638e95a32d0c1131db0e7fe83775cbea4a0d0b
-github.com/nats-io/gnatsd 393bbb7c031433e68707c8810fda0bfcfbe6ab9b
-github.com/nats-io/go-nats ea9585611a4ab58a205b9b125ebd74c389a6b898
-github.com/nats-io/nats ea9585611a4ab58a205b9b125ebd74c389a6b898
-github.com/nats-io/nuid 289cccf02c178dc782430d534e3c1f5b72af807f
-github.com/nsqio/go-nsq eee57a3ac4174c55924125bb15eeeda8cffb6e6f
-github.com/opencontainers/runc 89ab7f2ccc1e45ddf6485eaa802c35dcf321dfc8
-github.com/opentracing-contrib/go-observer a52f2342449246d5bcc273e65cbdcfa5f7d6c63c
-github.com/opentracing/opentracing-go 06f47b42c792fef2796e9681353e1d908c417827
-github.com/openzipkin/zipkin-go-opentracing 1cafbdfde94fbf2b373534764e0863aa3bd0bf7b
-github.com/pierrec/lz4 5c9560bfa9ace2bf86080bf40d46b34ae44604df
-github.com/pierrec/xxHash 5a004441f897722c627870a981d02b29924215fa
-github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d
-github.com/pmezard/go-difflib/difflib 792786c7400a136282c1664665ae0a8db921c6c2
-github.com/prometheus/client_golang c317fb74746eac4fc65fe3909195f4cf67c5562a
-github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6
-github.com/prometheus/common dd2f054febf4a6c00f2343686efb775948a8bff4
-github.com/prometheus/procfs 1878d9fbb537119d24b21ca07effd591627cd160
-github.com/rcrowley/go-metrics 1f30fe9094a513ce4c700b9a54458bbb0c96996c
-github.com/samuel/go-zookeeper 1d7be4effb13d2d908342d349d71a284a7542693
-github.com/satori/go.uuid 5bf94b69c6b68ee1b541973bb8e1144db23a194b
-github.com/shirou/gopsutil c95755e4bcd7a62bb8bd33f3a597a7c7f35e2cf3
-github.com/shirou/w32 3c9377fc6748f222729a8270fe2775d149a249ad
-github.com/Shopify/sarama 3b1b38866a79f06deddf0487d5c27ba0697ccd65
-github.com/Sirupsen/logrus 61e43dc76f7ee59a82bdf3d71033dc12bea4c77d
-github.com/soniah/gosnmp f15472a4cd6f6ea7929e4c7d9f163c49f059924f
-github.com/StackExchange/wmi f3e2bae1e0cb5aef83e319133eabfee30013a4a5
-github.com/streadway/amqp 63795daa9a446c920826655f26ba31c81c860fd6
-github.com/stretchr/objx facf9a85c22f48d2f52f2380e4efce1768749a89
-github.com/stretchr/testify 12b6f73e6084dad08a7c6e575284b177ecafbc71
-github.com/tidwall/gjson 0623bd8fbdbf97cc62b98d15108832851a658e59
-github.com/tidwall/match 173748da739a410c5b0b813b956f89ff94730b4c
-github.com/vjeantet/grok d73e972b60935c7fec0b4ffbc904ed39ecaf7efe
-github.com/wvanbergen/kafka bc265fedb9ff5b5c5d3c0fdcef4a819b3523d3ee
-github.com/wvanbergen/kazoo-go 968957352185472eacb69215fa3dbfcfdbac1096
-github.com/yuin/gopher-lua 66c871e454fcf10251c61bf8eff02d0978cae75a
-github.com/zensqlmonitor/go-mssqldb ffe5510c6fa5e15e6d983210ab501c815b56b363
-golang.org/x/crypto dc137beb6cce2043eb6b5f223ab8bf51c32459f4
-golang.org/x/net a337091b0525af65de94df2eb7e98bd9962dcbe2
-golang.org/x/sys 739734461d1c916b6c72a63d7efda2b27edb369f
-golang.org/x/text 506f9d5c962f284575e88337e7d9296d27e729d3
-google.golang.org/genproto 11c7f9e547da6db876260ce49ea7536985904c9b
-google.golang.org/grpc de2209a968d48e8970546c8a710189f7461370f7
-gopkg.in/asn1-ber.v1 4e86f4367175e39f69d9358a5f17b4dda270378d
-gopkg.in/fatih/pool.v2 6e328e67893eb46323ad06f0e92cb9536babbabc
-gopkg.in/gorethink/gorethink.v3 7ab832f7b65573104a555d84a27992ae9ea1f659
-gopkg.in/ldap.v2 8168ee085ee43257585e50c6441aadf54ecb2c9f
-gopkg.in/mgo.v2 3f83fa5005286a7fe593b055f0d7771a7dce4655
-gopkg.in/olivere/elastic.v5 3113f9b9ad37509fe5f8a0e5e91c96fdc4435e26
-gopkg.in/tomb.v1 dd632973f1e7218eb1089048e0798ec9ae7dceb8
-gopkg.in/yaml.v2 4c78c975fe7c825c6d1466c42be594d1d6f3aba6
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -0,0 +1,973 @@
+# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
+
+
+[[projects]]
+  branch = "master"
+  name = "code.cloudfoundry.org/clock"
+  packages = ["."]
+  revision = "02e53af36e6c978af692887ed449b74026d76fec"
+
+[[projects]]
+  name = "collectd.org"
+  packages = [
+    "api",
+    "cdtime",
+    "network"
+  ]
+  revision = "2ce144541b8903101fb8f1483cc0497a68798122"
+  version = "v0.3.0"
+
+[[projects]]
+  name = "github.com/Microsoft/ApplicationInsights-Go"
+  packages = [
+    "appinsights",
+    "appinsights/contracts"
+  ]
+  revision = "d2df5d440eda5372f24fcac03839a64d6cb5f7e5"
+  version = "v0.4.2"
+
+[[projects]]
+  name = "github.com/Microsoft/go-winio"
+  packages = ["."]
+  revision = "7da180ee92d8bd8bb8c37fc560e673e6557c392f"
+  version = "v0.4.7"
+
+[[projects]]
+  name = "github.com/Shopify/sarama"
+  packages = ["."]
+  revision = "35324cf48e33d8260e1c7c18854465a904ade249"
+  version = "v1.17.0"
+
+[[projects]]
+  name = "github.com/StackExchange/wmi"
+  packages = ["."]
+  revision = "5d049714c4a64225c3c79a7cf7d02f7fb5b96338"
+  version = "1.0.0"
+
+[[projects]]
+  name = "github.com/aerospike/aerospike-client-go"
+  packages = [
+    ".",
+    "internal/lua",
+    "internal/lua/resources",
+    "logger",
+    "pkg/bcrypt",
+    "pkg/ripemd160",
+    "types",
+    "types/atomic",
+    "types/particle_type",
+    "types/rand",
+    "utils/buffer"
+  ]
+  revision = "c10b5393e43bd60125aca6289c7b24879edb1787"
+  version = "v1.33.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/alecthomas/template"
+  packages = [
+    ".",
+    "parse"
+  ]
+  revision = "a0175ee3bccc567396460bf5acd36800cb10c49c"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/alecthomas/units"
+  packages = ["."]
+  revision = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/amir/raidman"
+  packages = [
+    ".",
+    "proto"
+  ]
+  revision = "1ccc43bfb9c93cb401a4025e49c64ba71e5e668b"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/apache/thrift"
+  packages = ["lib/go/thrift"]
+  revision = "f5f430df56871bc937950274b2c86681d3db6e59"
+
+[[projects]]
+  name = "github.com/aws/aws-sdk-go"
+  packages = [
+    "aws",
+    "aws/awserr",
+    "aws/awsutil",
+    "aws/client",
+    "aws/client/metadata",
+    "aws/corehandlers",
+    "aws/credentials",
+    "aws/credentials/ec2rolecreds",
+    "aws/credentials/endpointcreds",
+    "aws/credentials/stscreds",
+    "aws/csm",
+    "aws/defaults",
+    "aws/ec2metadata",
+    "aws/endpoints",
+    "aws/request",
+    "aws/session",
+    "aws/signer/v4",
+    "internal/sdkio",
+    "internal/sdkrand",
+    "internal/shareddefaults",
+    "private/protocol",
+    "private/protocol/json/jsonutil",
+    "private/protocol/jsonrpc",
+    "private/protocol/query",
+    "private/protocol/query/queryutil",
+    "private/protocol/rest",
+    "private/protocol/xml/xmlutil",
+    "service/cloudwatch",
+    "service/kinesis",
+    "service/sts"
+  ]
+  revision = "bfc1a07cf158c30c41a3eefba8aae043d0bb5bff"
+  version = "v1.14.8"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/beorn7/perks"
+  packages = ["quantile"]
+  revision = "3a771d992973f24aa725d07868b467d1ddfceafb"
+
+[[projects]]
+  name = "github.com/bsm/sarama-cluster"
+  packages = ["."]
+  revision = "cf455bc755fe41ac9bb2861e7a961833d9c2ecc3"
+  version = "v2.1.13"
+
+[[projects]]
+  name = "github.com/cenkalti/backoff"
+  packages = ["."]
+  revision = "2ea60e5f094469f9e65adb9cd103795b73ae743e"
+  version = "v2.0.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/couchbase/go-couchbase"
+  packages = ["."]
+  revision = "16db1f1fe037412f12738fa4d8448c549c4edd77"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/couchbase/gomemcached"
+  packages = [
+    ".",
+    "client"
+  ]
+  revision = "0da75df145308b9a4e6704d762ca9d9b77752efc"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/couchbase/goutils"
+  packages = [
+    "logging",
+    "scramsha"
+  ]
+  revision = "e865a1461c8ac0032bd37e2d4dab3289faea3873"
+
+[[projects]]
+  name = "github.com/davecgh/go-spew"
+  packages = ["spew"]
+  revision = "346938d642f2ec3594ed81d874461961cd0faa76"
+  version = "v1.1.0"
+
+[[projects]]
+  name = "github.com/dgrijalva/jwt-go"
+  packages = ["."]
+  revision = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"
+  version = "v3.2.0"
+
+[[projects]]
+  name = "github.com/docker/distribution"
+  packages = [
+    "digest",
+    "reference"
+  ]
+  revision = "48294d928ced5dd9b378f7fd7c6f5da3ff3f2c89"
+  version = "v2.6.2"
+
+[[projects]]
+  name = "github.com/docker/docker"
+  packages = [
+    "api/types",
+    "api/types/blkiodev",
+    "api/types/container",
+    "api/types/events",
+    "api/types/filters",
+    "api/types/mount",
+    "api/types/network",
+    "api/types/reference",
+    "api/types/registry",
+    "api/types/strslice",
+    "api/types/swarm",
+    "api/types/time",
+    "api/types/versions",
+    "api/types/volume",
+    "client",
+    "pkg/tlsconfig"
+  ]
+  revision = "eef6495eddab52828327aade186443681ed71a4e"
+  version = "v17.03.2-ce-rc1"
+
+[[projects]]
+  name = "github.com/docker/go-connections"
+  packages = [
+    "nat",
+    "sockets",
+    "tlsconfig"
+  ]
+  revision = "3ede32e2033de7505e6500d6c868c2b9ed9f169d"
+  version = "v0.3.0"
+
+[[projects]]
+  name = "github.com/docker/go-units"
+  packages = ["."]
+  revision = "47565b4f722fb6ceae66b95f853feed578a4a51c"
+  version = "v0.3.3"
+
+[[projects]]
+  name = "github.com/eapache/go-resiliency"
+  packages = ["breaker"]
+  revision = "ea41b0fad31007accc7f806884dcdf3da98b79ce"
+  version = "v1.1.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/eapache/go-xerial-snappy"
+  packages = ["."]
+  revision = "bb955e01b9346ac19dc29eb16586c90ded99a98c"
+
+[[projects]]
+  name = "github.com/eapache/queue"
+  packages = ["."]
+  revision = "44cc805cf13205b55f69e14bcb69867d1ae92f98"
+  version = "v1.1.0"
+
+[[projects]]
+  name = "github.com/eclipse/paho.mqtt.golang"
+  packages = [
+    ".",
+    "packets"
+  ]
+  revision = "36d01c2b4cbeb3d2a12063e4880ce30800af9560"
+  version = "v1.1.1"
+
+[[projects]]
+  name = "github.com/go-ini/ini"
+  packages = ["."]
+  revision = "06f5f3d67269ccec1fe5fe4134ba6e982984f7f5"
+  version = "v1.37.0"
+
+[[projects]]
+  name = "github.com/go-logfmt/logfmt"
+  packages = ["."]
+  revision = "390ab7935ee28ec6b286364bba9b4dd6410cb3d5"
+  version = "v0.3.0"
+
+[[projects]]
+  name = "github.com/go-ole/go-ole"
+  packages = [
+    ".",
+    "oleutil"
+  ]
+  revision = "a41e3c4b706f6ae8dfbff342b06e40fa4d2d0506"
+  version = "v1.2.1"
+
+[[projects]]
+  name = "github.com/go-redis/redis"
+  packages = [
+    ".",
+    "internal",
+    "internal/consistenthash",
+    "internal/hashtag",
+    "internal/pool",
+    "internal/proto",
+    "internal/singleflight",
+    "internal/util"
+  ]
+  revision = "83fb42932f6145ce52df09860384a4653d2d332a"
+  version = "v6.12.0"
+
+[[projects]]
+  name = "github.com/go-sql-driver/mysql"
+  packages = ["."]
+  revision = "d523deb1b23d913de5bdada721a6071e71283618"
+  version = "v1.4.0"
+
+[[projects]]
+  name = "github.com/gobwas/glob"
+  packages = [
+    ".",
+    "compiler",
+    "match",
+    "syntax",
+    "syntax/ast",
+    "syntax/lexer",
+    "util/runes",
+    "util/strings"
+  ]
+  revision = "5ccd90ef52e1e632236f7326478d4faa74f99438"
+  version = "v0.2.3"
+
+[[projects]]
+  name = "github.com/gogo/protobuf"
+  packages = ["proto"]
+  revision = "1adfc126b41513cc696b209667c8656ea7aac67c"
+  version = "v1.0.0"
+
+[[projects]]
+  name = "github.com/golang/protobuf"
+  packages = [
+    "proto",
+    "ptypes",
+    "ptypes/any",
+    "ptypes/duration",
+    "ptypes/timestamp"
+  ]
+  revision = "b4deda0973fb4c70b50d226b1af49f3da59f5265"
+  version = "v1.1.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/golang/snappy"
+  packages = ["."]
+  revision = "2e65f85255dbc3072edf28d6b5b8efc472979f5a"
+
+[[projects]]
+  name = "github.com/google/go-cmp"
+  packages = [
+    "cmp",
+    "cmp/internal/diff",
+    "cmp/internal/function",
+    "cmp/internal/value"
+  ]
+  revision = "3af367b6b30c263d47e8895973edcca9a49cf029"
+  version = "v0.2.0"
+
+[[projects]]
+  name = "github.com/gorilla/context"
+  packages = ["."]
+  revision = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42"
+  version = "v1.1.1"
+
+[[projects]]
+  name = "github.com/gorilla/mux"
+  packages = ["."]
+  revision = "e3702bed27f0d39777b0b37b664b6280e8ef8fbf"
+  version = "v1.6.2"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/hailocab/go-hostpool"
+  packages = ["."]
+  revision = "e80d13ce29ede4452c43dea11e79b9bc8a15b478"
+
+[[projects]]
+  name = "github.com/hashicorp/consul"
+  packages = ["api"]
+  revision = "5174058f0d2bda63fa5198ab96c33d9a909c58ed"
+  version = "v1.1.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/hashicorp/go-cleanhttp"
+  packages = ["."]
+  revision = "d5fe4b57a186c716b0e00b8c301cbd9b4182694d"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/hashicorp/go-rootcerts"
+  packages = ["."]
+  revision = "6bb64b370b90e7ef1fa532be9e591a81c3493e00"
+
+[[projects]]
+  name = "github.com/hashicorp/serf"
+  packages = ["coordinate"]
+  revision = "d6574a5bb1226678d7010325fb6c985db20ee458"
+  version = "v0.8.1"
+
+[[projects]]
+  name = "github.com/influxdata/go-syslog"
+  packages = [
+    "rfc5424",
+    "rfc5425"
+  ]
+  revision = "eecd51df3ad85464a2bab9b7d3a45bc1e299059e"
+  version = "v1.0.1"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/influxdata/tail"
+  packages = [
+    ".",
+    "ratelimiter",
+    "util",
+    "watch",
+    "winfile"
+  ]
+  revision = "c43482518d410361b6c383d7aebce33d0471d7bc"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/influxdata/toml"
+  packages = [
+    ".",
+    "ast"
+  ]
+  revision = "2a2e3012f7cfbef64091cc79776311e65dfa211b"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/influxdata/wlog"
+  packages = ["."]
+  revision = "7c63b0a71ef8300adc255344d275e10e5c3a71ec"
+
+[[projects]]
+  name = "github.com/jackc/pgx"
+  packages = [
+    ".",
+    "chunkreader",
+    "internal/sanitize",
+    "pgio",
+    "pgproto3",
+    "pgtype",
+    "stdlib"
+  ]
+  revision = "da3231b0b66e2e74cdb779f1d46c5e958ba8be27"
+  version = "v3.1.0"
+
+[[projects]]
+  name = "github.com/jmespath/go-jmespath"
+  packages = ["."]
+  revision = "0b12d6b5"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/kardianos/osext"
+  packages = ["."]
+  revision = "ae77be60afb1dcacde03767a8c37337fad28ac14"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/kardianos/service"
+  packages = ["."]
+  revision = "615a14ed75099c9eaac6949e22ac2341bf9d3197"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/kballard/go-shellquote"
+  packages = ["."]
+  revision = "95032a82bc518f77982ea72343cc1ade730072f0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/kr/logfmt"
+  packages = ["."]
+  revision = "b84e30acd515aadc4b783ad4ff83aff3299bdfe0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/mailru/easyjson"
+  packages = [
+    ".",
+    "buffer",
+    "jlexer",
+    "jwriter"
+  ]
+  revision = "3fdea8d05856a0c8df22ed4bc71b3219245e4485"
+
+[[projects]]
+  name = "github.com/matttproud/golang_protobuf_extensions"
+  packages = ["pbutil"]
+  revision = "c12348ce28de40eed0136aa2b644d0ee0650e56c"
+  version = "v1.0.1"
+
+[[projects]]
+  name = "github.com/miekg/dns"
+  packages = ["."]
+  revision = "5a2b9fab83ff0f8bfc99684bd5f43a37abe560f1"
+  version = "v1.0.8"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/mitchellh/go-homedir"
+  packages = ["."]
+  revision = "3864e76763d94a6df2f9960b16a20a33da9f9a66"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/mitchellh/mapstructure"
+  packages = ["."]
+  revision = "bb74f1db0675b241733089d5a1faa5dd8b0ef57b"
+
+[[projects]]
+  name = "github.com/multiplay/go-ts3"
+  packages = ["."]
+  revision = "d0d44555495c8776880a17e439399e715a4ef319"
+  version = "v1.0.0"
+
+[[projects]]
+  name = "github.com/naoina/go-stringutil"
+  packages = ["."]
+  revision = "6b638e95a32d0c1131db0e7fe83775cbea4a0d0b"
+  version = "v0.1.0"
+
+[[projects]]
+  name = "github.com/nats-io/gnatsd"
+  packages = [
+    "conf",
+    "logger",
+    "server",
+    "server/pse",
+    "util"
+  ]
+  revision = "add6d7930ae6d4bff8823b28999ea87bf1bfd23d"
+  version = "v1.1.0"
+
+[[projects]]
+  name = "github.com/nats-io/go-nats"
+  packages = [
+    ".",
+    "encoders/builtin",
+    "util"
+  ]
+  revision = "062418ea1c2181f52dc0f954f6204370519a868b"
+  version = "v1.5.0"
+
+[[projects]]
+  name = "github.com/nats-io/nuid"
+  packages = ["."]
+  revision = "289cccf02c178dc782430d534e3c1f5b72af807f"
+  version = "v1.0.0"
+
+[[projects]]
+  name = "github.com/nsqio/go-nsq"
+  packages = ["."]
+  revision = "eee57a3ac4174c55924125bb15eeeda8cffb6e6f"
+  version = "v1.0.7"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/opentracing-contrib/go-observer"
+  packages = ["."]
+  revision = "a52f2342449246d5bcc273e65cbdcfa5f7d6c63c"
+
+[[projects]]
+  name = "github.com/opentracing/opentracing-go"
+  packages = [
+    ".",
+    "ext",
+    "log"
+  ]
+  revision = "1949ddbfd147afd4d964a9f00b24eb291e0e7c38"
+  version = "v1.0.2"
+
+[[projects]]
+  name = "github.com/openzipkin/zipkin-go-opentracing"
+  packages = [
+    ".",
+    "flag",
+    "thrift/gen-go/scribe",
+    "thrift/gen-go/zipkincore",
+    "types",
+    "wire"
+  ]
+  revision = "26cf9707480e6b90e5eff22cf0bbf05319154232"
+  version = "v0.3.4"
+
+[[projects]]
+  name = "github.com/pierrec/lz4"
+  packages = [
+    ".",
+    "internal/xxh32"
+  ]
+  revision = "6b9367c9ff401dbc54fabce3fb8d972e799b702d"
+  version = "v2.0.2"
+
+[[projects]]
+  name = "github.com/pkg/errors"
+  packages = ["."]
+  revision = "645ef00459ed84a119197bfb8d8205042c6df63d"
+  version = "v0.8.0"
+
+[[projects]]
+  name = "github.com/pmezard/go-difflib"
+  packages = ["difflib"]
+  revision = "792786c7400a136282c1664665ae0a8db921c6c2"
+  version = "v1.0.0"
+
+[[projects]]
+  name = "github.com/prometheus/client_golang"
+  packages = [
+    "prometheus",
+    "prometheus/promhttp"
+  ]
+  revision = "c5b7fccd204277076155f10851dad72b76a49317"
+  version = "v0.8.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/prometheus/client_model"
+  packages = ["go"]
+  revision = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/prometheus/common"
+  packages = [
+    "expfmt",
+    "internal/bitbucket.org/ww/goautoneg",
+    "log",
+    "model"
+  ]
+  revision = "7600349dcfe1abd18d72d3a1770870d9800a7801"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/prometheus/procfs"
+  packages = [
+    ".",
+    "internal/util",
+    "nfs",
+    "xfs"
+  ]
+  revision = "7d6f385de8bea29190f15ba9931442a0eaef9af7"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/rcrowley/go-metrics"
+  packages = ["."]
+  revision = "e2704e165165ec55d062f5919b4b29494e9fa790"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/samuel/go-zookeeper"
+  packages = ["zk"]
+  revision = "c4fab1ac1bec58281ad0667dc3f0907a9476ac47"
+
+[[projects]]
+  name = "github.com/satori/go.uuid"
+  packages = ["."]
+  revision = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"
+  version = "v1.2.0"
+
+[[projects]]
+  name = "github.com/shirou/gopsutil"
+  packages = [
+    "cpu",
+    "disk",
+    "host",
+    "internal/common",
+    "load",
+    "mem",
+    "net",
+    "process"
+  ]
+  revision = "eeb1d38d69593f121e060d24d17f7b1f0936b203"
+  version = "v2.18.05"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/shirou/w32"
+  packages = ["."]
+  revision = "bb4de0191aa41b5507caa14b0650cdbddcd9280b"
+
+[[projects]]
+  name = "github.com/sirupsen/logrus"
+  packages = ["."]
+  revision = "c155da19408a8799da419ed3eeb0cb5db0ad5dbc"
+  version = "v1.0.5"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/soniah/gosnmp"
+  packages = ["."]
+  revision = "bcf840db66be7d64bf96c3c0e075c92e3d98f793"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/streadway/amqp"
+  packages = ["."]
+  revision = "e5adc2ada8b8efff032bf61173a233d143e9318e"
+
+[[projects]]
+  name = "github.com/stretchr/objx"
+  packages = ["."]
+  revision = "477a77ecc69700c7cdeb1fa9e129548e1c1c393c"
+  version = "v0.1.1"
+
+[[projects]]
+  name = "github.com/stretchr/testify"
+  packages = [
+    "assert",
+    "mock",
+    "require"
+  ]
+  revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686"
+  version = "v1.2.2"
+
+[[projects]]
+  name = "github.com/tidwall/gjson"
+  packages = ["."]
+  revision = "afaeb9562041a8018c74e006551143666aed08bf"
+  version = "v1.1.1"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/tidwall/match"
+  packages = ["."]
+  revision = "1731857f09b1f38450e2c12409748407822dc6be"
+
+[[projects]]
+  name = "github.com/vjeantet/grok"
+  packages = ["."]
+  revision = "ce01e59abcf6fbc9833b7deb5e4b8ee1769bcc53"
+  version = "v1.0.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/wvanbergen/kafka"
+  packages = ["consumergroup"]
+  revision = "e2edea948ddfee841ea9a263b32ccca15f7d6c2f"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/wvanbergen/kazoo-go"
+  packages = ["."]
+  revision = "f72d8611297a7cf105da904c04198ad701a60101"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/yuin/gopher-lua"
+  packages = [
+    ".",
+    "ast",
+    "parse",
+    "pm"
+  ]
+  revision = "ca850f594eaafa5468da2bd53b865e4ee55be18b"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/zensqlmonitor/go-mssqldb"
+  packages = ["."]
+  revision = "e8fbf836e44e86764eba398361d1825651709547"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/crypto"
+  packages = [
+    "bcrypt",
+    "blowfish",
+    "ed25519",
+    "ed25519/internal/edwards25519",
+    "md4",
+    "pbkdf2",
+    "ssh/terminal"
+  ]
+  revision = "027cca12c2d63e3d62b670d901e8a2c95854feec"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/net"
+  packages = [
+    "bpf",
+    "context",
+    "context/ctxhttp",
+    "html",
+    "html/atom",
+    "html/charset",
+    "http/httpguts",
+    "http2",
+    "http2/hpack",
+    "idna",
+    "internal/iana",
+    "internal/socket",
+    "internal/socks",
+    "internal/timeseries",
+    "ipv4",
+    "ipv6",
+    "proxy",
+    "trace",
+    "websocket"
+  ]
+  revision = "db08ff08e8622530d9ed3a0e8ac279f6d4c02196"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/sys"
+  packages = [
+    "unix",
+    "windows",
+    "windows/registry",
+    "windows/svc",
+    "windows/svc/debug",
+    "windows/svc/eventlog",
+    "windows/svc/mgr"
+  ]
+  revision = "6c888cc515d3ed83fc103cf1d84468aad274b0a7"
+
+[[projects]]
+  name = "golang.org/x/text"
+  packages = [
+    "collate",
+    "collate/build",
+    "encoding",
+    "encoding/charmap",
+    "encoding/htmlindex",
+    "encoding/internal",
+    "encoding/internal/identifier",
+    "encoding/japanese",
+    "encoding/korean",
+    "encoding/simplifiedchinese",
+    "encoding/traditionalchinese",
+    "encoding/unicode",
+    "internal/colltab",
+    "internal/gen",
+    "internal/tag",
+    "internal/triegen",
+    "internal/ucd",
+    "internal/utf8internal",
+    "language",
+    "runes",
+    "secure/bidirule",
+    "transform",
+    "unicode/bidi",
+    "unicode/cldr",
+    "unicode/norm",
+    "unicode/rangetable"
+  ]
+  revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"
+  version = "v0.3.0"
+
+[[projects]]
+  name = "google.golang.org/appengine"
+  packages = ["cloudsql"]
+  revision = "b1f26356af11148e710935ed1ac8a7f5702c7612"
+  version = "v1.1.0"
+
+[[projects]]
+  branch = "master"
+  name = "google.golang.org/genproto"
+  packages = ["googleapis/rpc/status"]
+  revision = "32ee49c4dd805befd833990acba36cb75042378c"
+
+[[projects]]
+  name = "google.golang.org/grpc"
+  packages = [
+    ".",
+    "balancer",
+    "balancer/base",
+    "balancer/roundrobin",
+    "channelz",
+    "codes",
+    "connectivity",
+    "credentials",
+    "encoding",
+    "encoding/proto",
+    "grpclb/grpc_lb_v1/messages",
+    "grpclog",
+    "internal",
+    "keepalive",
+    "metadata",
+    "naming",
+    "peer",
+    "resolver",
+    "resolver/dns",
+    "resolver/passthrough",
+    "stats",
+    "status",
+    "tap",
+    "transport"
+  ]
+  revision = "7a6a684ca69eb4cae85ad0a484f2e531598c047b"
+  version = "v1.12.2"
+
+[[projects]]
+  name = "gopkg.in/alecthomas/kingpin.v2"
+  packages = ["."]
+  revision = "947dcec5ba9c011838740e680966fd7087a71d0d"
+  version = "v2.2.6"
+
+[[projects]]
+  name = "gopkg.in/asn1-ber.v1"
+  packages = ["."]
+  revision = "379148ca0225df7a432012b8df0355c2a2063ac0"
+  version = "v1.2"
+
+[[projects]]
+  name = "gopkg.in/fatih/pool.v2"
+  packages = ["."]
+  revision = "010e0b745d12eaf8426c95f9c3924d81dd0b668f"
+  version = "v2.0.0"
+
+[[projects]]
+  name = "gopkg.in/fsnotify.v1"
+  packages = ["."]
+  revision = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"
+  source = "https://github.com/fsnotify/fsnotify/archive/v1.4.7.tar.gz"
+  version = "v1.4.7"
+
+[[projects]]
+  name = "gopkg.in/gorethink/gorethink.v3"
+  packages = [
+    ".",
+    "encoding",
+    "ql2",
+    "types"
+  ]
+  revision = "7f5bdfd858bb064d80559b2a32b86669c5de5d3b"
+  version = "v3.0.5"
+
+[[projects]]
+  name = "gopkg.in/ldap.v2"
+  packages = ["."]
+  revision = "bb7a9ca6e4fbc2129e3db588a34bc970ffe811a9"
+  version = "v2.5.1"
+
+[[projects]]
+  branch = "v2"
+  name = "gopkg.in/mgo.v2"
+  packages = [
+    ".",
+    "bson",
+    "internal/json",
+    "internal/sasl",
+    "internal/scram"
+  ]
+  revision = "3f83fa5005286a7fe593b055f0d7771a7dce4655"
+
+[[projects]]
+  name = "gopkg.in/olivere/elastic.v5"
+  packages = [
+    ".",
+    "config",
+    "uritemplates"
+  ]
+  revision = "b708306d715bea9b983685e94ab4602cdc9f988b"
+  version = "v5.0.69"
+
+[[projects]]
+  branch = "v1"
+  name = "gopkg.in/tomb.v1"
+  packages = ["."]
+  revision = "dd632973f1e7218eb1089048e0798ec9ae7dceb8"
+
+[[projects]]
+  name = "gopkg.in/yaml.v2"
+  packages = ["."]
+  revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183"
+  version = "v2.2.1"
+
+[solve-meta]
+  analyzer-name = "dep"
+  analyzer-version = 1
+  inputs-digest = "024194b983d91b9500fe97e0aa0ddb5fe725030cb51ddfb034e386cae1098370"
+  solver-name = "gps-cdcl"
+  solver-version = 1
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -0,0 +1,243 @@
+[[constraint]]
+  name = "collectd.org"
+  version = "0.3.0"
+
+[[constraint]]
+  name = "github.com/aerospike/aerospike-client-go"
+  version = "^1.33.0"
+
+[[constraint]]
+  name = "github.com/amir/raidman"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/apache/thrift"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/aws/aws-sdk-go"
+  version = "1.14.8"
+#  version = "1.8.39"
+
+[[constraint]]
+  name = "github.com/bsm/sarama-cluster"
+  version = "2.1.13"
+#  version = "2.1.10"
+
+[[constraint]]
+  name = "github.com/couchbase/go-couchbase"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/dgrijalva/jwt-go"
+  version = "3.2.0"
+#  version = "3.1.0"
+
+[[constraint]]
+  name = "github.com/docker/docker"
+  version = "~17.03.2-ce"
+
+[[constraint]]
+  name = "github.com/docker/go-connections"
+  version = "0.3.0"
+#  version = "0.2.1"
+
+[[constraint]]
+  name = "github.com/eclipse/paho.mqtt.golang"
+  version = "~1.1.1"
+#  version = "1.1.0"
+
+[[constraint]]
+  name = "github.com/go-sql-driver/mysql"
+  version = "1.4.0"
+#  version = "1.3.0"
+
+[[constraint]]
+  name = "github.com/gobwas/glob"
+  version = "0.2.3"
+#  version = "0.2.2"
+
+[[constraint]]
+  name = "github.com/golang/protobuf"
+  version = "1.1.0"
+#  version = "1.0.0"
+
+[[constraint]]
+  name = "github.com/google/go-cmp"
+  version = "0.2.0"
+#  version = "0.1.0"
+
+[[constraint]]
+  name = "github.com/gorilla/mux"
+  version = "1.6.2"
+#  version = "1.6.1"
+
+[[constraint]]
+  name = "github.com/go-redis/redis"
+  version = "6.12.0"
+
+[[constraint]]
+  name = "github.com/hashicorp/consul"
+  version = "1.1.0"
+
+[[constraint]]
+  name = "github.com/influxdata/go-syslog"
+  version = "1.0.1"
+
+[[constraint]]
+  name = "github.com/influxdata/tail"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/influxdata/toml"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/influxdata/wlog"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/jackc/pgx"
+  version = "3.1.0"
+
+[[constraint]]
+  name = "github.com/kardianos/service"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/kballard/go-shellquote"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/matttproud/golang_protobuf_extensions"
+  version = "1.0.1"
+
+[[constraint]]
+  name = "github.com/Microsoft/ApplicationInsights-Go"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/miekg/dns"
+  version = "1.0.8"
+#  version = "1.0.0"
+
+[[constraint]]
+  name = "github.com/multiplay/go-ts3"
+  version = "1.0.0"
+
+[[constraint]]
+  name = "github.com/nats-io/gnatsd"
+  version = "1.1.0"
+#  version = "1.0.4"
+
+[[constraint]]
+  name = "github.com/nats-io/go-nats"
+  version = "1.5.0"
+#  version = "1.3.0"
+
+[[constraint]]
+  name = "github.com/nsqio/go-nsq"
+  version = "1.0.7"
+
+[[constraint]]
+  name = "github.com/openzipkin/zipkin-go-opentracing"
+  version = "0.3.4"
+#  version = "0.3.0"
+
+[[constraint]]
+  name = "github.com/prometheus/client_golang"
+  version = "0.8.0"
+
+[[constraint]]
+  name = "github.com/prometheus/client_model"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/prometheus/common"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/satori/go.uuid"
+  version = "1.2.0"
+
+[[constraint]]
+  name = "github.com/shirou/gopsutil"
+  version = "2.18.05"
+#  version = "2.18.04"
+
+[[constraint]]
+  name = "github.com/Shopify/sarama"
+  version = "1.17.0"
+#  version = "1.15.0"
+
+[[constraint]]
+  name = "github.com/soniah/gosnmp"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/StackExchange/wmi"
+  version = "1.0.0"
+
+[[constraint]]
+  name = "github.com/streadway/amqp"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/stretchr/testify"
+  version = "1.2.2"
+#  version = "1.2.1"
+
+[[constraint]]
+  name = "github.com/tidwall/gjson"
+  version = "1.1.1"
+#  version = "1.0.0"
+
+[[constraint]]
+  name = "github.com/vjeantet/grok"
+  version = "1.0.0"
+
+[[constraint]]
+  name = "github.com/wvanbergen/kafka"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/zensqlmonitor/go-mssqldb"
+  branch = "master"
+
+[[constraint]]
+  name = "golang.org/x/net"
+  branch = "master"
+
+[[constraint]]
+  name = "golang.org/x/sys"
+  branch = "master"
+
+[[constraint]]
+  name = "google.golang.org/grpc"
+  version = "1.12.2"
+#  version = "1.8.0"
+
+[[constraint]]
+  name = "gopkg.in/gorethink/gorethink.v3"
+  version = "3.0.5"
+
+[[constraint]]
+  name = "gopkg.in/ldap.v2"
+  version = "2.5.1"
+
+[[constraint]]
+  name = "gopkg.in/mgo.v2"
+  branch = "v2"
+
+[[constraint]]
+  name = "gopkg.in/olivere/elastic.v5"
+  version = "^5.0.69"
+#  version = "^6.1.23"
+
+[[constraint]]
+  name = "gopkg.in/yaml.v2"
+  version = "^2.2.1"
+
+[[override]]
+  source = "https://github.com/fsnotify/fsnotify/archive/v1.4.7.tar.gz"
+  name = "gopkg.in/fsnotify.v1"
--- a/6
+++ b/6
@@ -23,8 +23,8 @@ all:

 deps:
 	go get -u github.com/golang/lint/golint
-	go get github.com/sparrc/gdm
-	gdm restore --parallel=false
+	go get -u github.com/golang/dep/cmd/dep
+	dep ensure

 telegraf:
 	go build -ldflags "$(LDFLAGS)" ./cmd/telegraf
@@ -34,7 +34,7 @@ go-install:

 install: telegraf
 	mkdir -p $(DESTDIR)$(PREFIX)/bin/
-	cp $(TELEGRAF) $(DESTDIR)$(PREFIX)/bin/
+	cp telegraf $(DESTDIR)$(PREFIX)/bin/

 test:
 	go test -short ./...
--- a/README.md
+++ b/README.md
@@ -40,9 +40,9 @@ Ansible role: https://github.com/rossmcdonald/telegraf

 ### From Source:

-Telegraf requires golang version 1.8+, the Makefile requires GNU make.
+Telegraf requires golang version 1.9 or newer, the Makefile requires GNU make.

-Dependencies are managed with [gdm](https://github.com/sparrc/gdm),
+Dependencies are managed with [dep](https://github.com/golang/dep),
 which is installed by the Makefile if you don't have it already.

 1. [Install Go](https://golang.org/doc/install)
@@ -211,7 +211,9 @@ configuration options.
 * [snmp_legacy](./plugins/inputs/snmp_legacy)
 * [solr](./plugins/inputs/solr)
 * [sql server](./plugins/inputs/sqlserver) (microsoft)
+* [syslog](./plugins/inputs/syslog)
 * [teamspeak](./plugins/inputs/teamspeak)
+* [tengine](./plugins/inputs/tengine)
 * [tomcat](./plugins/inputs/tomcat)
 * [twemproxy](./plugins/inputs/twemproxy)
 * [unbound](./plugins/inputs/unbound)
@@ -280,6 +282,7 @@ formats may be used with input plugins supporting the `data_format` option:
 * [basicstats](./plugins/aggregators/basicstats)
 * [minmax](./plugins/aggregators/minmax)
 * [histogram](./plugins/aggregators/histogram)
+* [valuecounter](./plugins/aggregators/valuecounter)

 ## Output Plugins

--- a/agent/agent.go
+++ b/agent/agent.go
@@ -362,24 +362,6 @@ func (a *Agent) Run(shutdown chan struct{}) error {
 	metricC := make(chan telegraf.Metric, 100)
 	aggC := make(chan telegraf.Metric, 100)

-	// Start all ServicePlugins
-	for _, input := range a.Config.Inputs {
-		input.SetDefaultTags(a.Config.Tags)
-		switch p := input.Input.(type) {
-		case telegraf.ServiceInput:
-			acc := NewAccumulator(input, metricC)
-			// Service input plugins should set their own precision of their
-			// metrics.
-			acc.SetPrecision(time.Nanosecond, 0)
-			if err := p.Start(acc); err != nil {
-				log.Printf("E! Service for input %s failed to start, exiting\n%s\n",
-					input.Name(), err.Error())
-				return err
-			}
-			defer p.Stop()
-		}
-	}
-
 	// Round collection to nearest interval by sleeping
 	if a.Config.Agent.RoundInterval {
 		i := int64(a.Config.Agent.Interval.Duration)
@@ -419,6 +401,25 @@ func (a *Agent) Run(shutdown chan struct{}) error {
 		}(input, interval)
 	}

+	// Start all ServicePlugins inputs after all other
+	// plugins are loaded so that no metrics get dropped
+	for _, input := range a.Config.Inputs {
+		input.SetDefaultTags(a.Config.Tags)
+		switch p := input.Input.(type) {
+		case telegraf.ServiceInput:
+			acc := NewAccumulator(input, metricC)
+			// Service input plugins should set their own precision of their
+			// metrics.
+			acc.SetPrecision(time.Nanosecond, 0)
+			if err := p.Start(acc); err != nil {
+				log.Printf("E! Service for input %s failed to start, exiting\n%s\n",
+					input.Name(), err.Error())
+				return err
+			}
+			defer p.Stop()
+		}
+	}
+
 	wg.Wait()
 	a.Close()
 	return nil
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -21,6 +21,7 @@ install:
  - 7z x "C:\Cache\gnuwin32-dep.zip" -oC:\GnuWin32 -y
  - go version
  - go env
+  - git config --system core.longpaths true

 build_script:
  - cmd: C:\GnuWin32\bin\make deps
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -58,7 +58,7 @@ var fService = flag.String("service", "",
 var fRunAsConsole = flag.Bool("console", false, "run as console application (windows only)")

 var (
-	nextVersion = "1.7.0"
+	nextVersion = "1.8.0"
 	version     string
 	commit      string
 	branch      string
@@ -147,11 +147,11 @@ func reloadLoop(

 		shutdown := make(chan struct{})
 		signals := make(chan os.Signal)
-		signal.Notify(signals, os.Interrupt, syscall.SIGHUP)
+		signal.Notify(signals, os.Interrupt, syscall.SIGHUP, syscall.SIGTERM)
 		go func() {
 			select {
 			case sig := <-signals:
-				if sig == os.Interrupt {
+				if sig == os.Interrupt || sig == syscall.SIGTERM {
 					close(shutdown)
 				}
 				if sig == syscall.SIGHUP {
@@ -166,8 +166,10 @@ func reloadLoop(
 		}()

 		log.Printf("I! Starting Telegraf %s\n", displayVersion())
-		log.Printf("I! Loaded outputs: %s", strings.Join(c.OutputNames(), " "))
 		log.Printf("I! Loaded inputs: %s", strings.Join(c.InputNames(), " "))
+		log.Printf("I! Loaded aggregators: %s", strings.Join(c.AggregatorNames(), " "))
+		log.Printf("I! Loaded processors: %s", strings.Join(c.ProcessorNames(), " "))
+		log.Printf("I! Loaded outputs: %s", strings.Join(c.OutputNames(), " "))
 		log.Printf("I! Tags enabled: %s", c.ListTags())

 		if *fPidfile != "" {
--- a/docs/LICENSE_OF_DEPENDENCIES.md
+++ b/docs/LICENSE_OF_DEPENDENCIES.md
@@ -44,6 +44,7 @@ following works:
 - github.com/hashicorp/raft [MPL](https://github.com/hashicorp/raft/blob/master/LICENSE)
 - github.com/influxdata/tail [MIT](https://github.com/influxdata/tail/blob/master/LICENSE.txt)
 - github.com/influxdata/toml [MIT](https://github.com/influxdata/toml/blob/master/LICENSE)
+- github.com/influxdata/go-syslog [MIT](https://github.com/influxdata/go-syslog/blob/develop/LICENSE)
 - github.com/influxdata/wlog [MIT](https://github.com/influxdata/wlog/blob/master/LICENSE)
 - github.com/jackc/pgx [MIT](https://github.com/jackc/pgx/blob/master/LICENSE)
 - github.com/jmespath/go-jmespath [APACHE](https://github.com/jmespath/go-jmespath/blob/master/LICENSE)
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -158,30 +158,74 @@
 #   # timeout = "5s"


-# # Configuration for the AMQP server to send metrics to
+# # Publishes metrics to an AMQP broker
 # [[outputs.amqp]]
-#   ## AMQP url
-#   url = "amqp://localhost:5672/influxdb"
-#   ## AMQP exchange
+#   ## Broker to publish to.
+#   ##   deprecated in 1.7; use the brokers option
+#   # url = "amqp://localhost:5672/influxdb"
+#
+#   ## Brokers to publish to.  If multiple brokers are specified a random broker
+#   ## will be selected anytime a connection is established.  This can be
+#   ## helpful for load balancing when not using a dedicated load balancer.
+#   brokers = ["amqp://localhost:5672/influxdb"]
+#
+#   ## Maximum messages to send over a connection.  Once this is reached, the
+#   ## connection is closed and a new connection is made.  This can be helpful for
+#   ## load balancing when not using a dedicated load balancer.
+#   # max_messages = 0
+#
+#   ## Exchange to declare and publish to.
 #   exchange = "telegraf"
+#
+#   ## Exchange type; common types are "direct", "fanout", "topic", "header", "x-consistent-hash".
+#   # exchange_type = "topic"
+#
+#   ## If true, exchange will be passively declared.
+#   # exchange_declare_passive = false
+#
+#   ## If true, exchange will be created as a durable exchange.
+#   # exchange_durable = true
+#
+#   ## Additional exchange arguments.
+#   # exchange_arguments = { }
+#   # exchange_arguments = {"hash_propery" = "timestamp"}
+#
+#   ## Authentication credentials for the PLAIN auth_method.
+#   # username = ""
+#   # password = ""
+#
 #   ## Auth method. PLAIN and EXTERNAL are supported
 #   ## Using EXTERNAL requires enabling the rabbitmq_auth_mechanism_ssl plugin as
 #   ## described here: https://www.rabbitmq.com/plugins.html
 #   # auth_method = "PLAIN"
-#   ## Telegraf tag to use as a routing key
-#   ##  ie, if this tag exists, its value will be used as the routing key
-#   routing_tag = "host"
-#   ## Delivery Mode controls if a published message is persistent
-#   ## Valid options are "transient" and "persistent". default: "transient"
-#   delivery_mode = "transient"
 #
-#   ## InfluxDB retention policy
-#   # retention_policy = "default"
-#   ## InfluxDB database
+#   ## Metric tag to use as a routing key.
+#   ##   ie, if this tag exists, its value will be used as the routing key
+#   # routing_tag = "host"
+#
+#   ## Static routing key.  Used when no routing_tag is set or as a fallback
+#   ## when the tag specified in routing tag is not found.
+#   # routing_key = ""
+#   # routing_key = "telegraf"
+#
+#   ## Delivery Mode controls if a published message is persistent.
+#   ##   One of "transient" or "persistent".
+#   # delivery_mode = "transient"
+#
+#   ## InfluxDB database added as a message header.
+#   ##   deprecated in 1.7; use the headers option
 #   # database = "telegraf"
 #
-#   ## Write timeout, formatted as a string.  If not provided, will default
-#   ## to 5s. 0s means no timeout (not recommended).
+#   ## InfluxDB retention policy added as a message header
+#   ##   deprecated in 1.7; use the headers option
+#   # retention_policy = "default"
+#
+#   ## Static headers added to each published message.
+#   # headers = { }
+#   # headers = {"database" = "telegraf", "retention_policy" = "default"}
+#
+#   ## Connection timeout.  If not provided, will default to 5s.  0s means no
+#   ## timeout (not recommended).
 #   # timeout = "5s"
 #
 #   ## Optional TLS Config
@@ -191,11 +235,16 @@
 #   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
 #
+#   ## If true use batch serialization format instead of line based delimiting.
+#   ## Only applies to data formats which are not line based such as JSON.
+#   ## Recommended to set to true.
+#   # use_batch_format = false
+#
 #   ## Data format to output.
 #   ## Each data format has its own unique set of configuration options, read
 #   ## more about them here:
 #   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
-#   data_format = "influx"
+#   # data_format = "influx"


 # # Send metrics to Azure Application Insights
@@ -344,6 +393,10 @@
 #   ## Graphite output template
 #   ## see https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
 #   template = "host.tags.measurement.field"
+#
+#   ## Enable Graphite tags support
+#   # graphite_tag_support = false
+#
 #   ## timeout in seconds for the write connection to graphite
 #   timeout = 2
 #
@@ -376,11 +429,6 @@
 #   # username = "username"
 #   # password = "pa$$word"
 #
-#   ## Additional HTTP headers
-#   # [outputs.http.headers]
-#   #   # Should be set to "application/json" for json data_format
-#   #   Content-Type = "text/plain; charset=utf-8"
-#
 #   ## Optional TLS Config
 #   # tls_ca = "/etc/telegraf/ca.pem"
 #   # tls_cert = "/etc/telegraf/cert.pem"
@@ -393,6 +441,11 @@
 #   ## more about them here:
 #   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
 #   # data_format = "influx"
+#
+#   ## Additional HTTP headers
+#   # [outputs.http.headers]
+#   #   # Should be set manually to "application/json" for json data_format
+#   #   Content-Type = "text/plain; charset=utf-8"


 # # Configuration for sending metrics to an Instrumental project
@@ -825,6 +878,34 @@
 #                            PROCESSOR PLUGINS                                #
 ###############################################################################

+# # Convert values to another metric value type
+# [[processors.converter]]
+#   ## Tags to convert
+#   ##
+#   ## The table key determines the target type, and the array of key-values
+#   ## select the keys to convert.  The array may contain globs.
+#   ##   <target-type> = [<tag-key>...]
+#   [processors.converter.tags]
+#     string = []
+#     integer = []
+#     unsigned = []
+#     boolean = []
+#     float = []
+#
+#   ## Fields to convert
+#   ##
+#   ## The table key determines the target type, and the array of key-values
+#   ## select the keys to convert.  The array may contain globs.
+#   ##   <target-type> = [<field-key>...]
+#   [processors.converter.fields]
+#     tag = []
+#     string = []
+#     integer = []
+#     unsigned = []
+#     boolean = []
+#     float = []
+
+
 # # Apply metric modifications using override semantics.
 # [[processors.override]]
 #   ## All modifications on inputs and aggregators can be overridden:
@@ -841,6 +922,36 @@
 # [[processors.printer]]


+# # Transforms tag and field values with regex pattern
+# [[processors.regex]]
+#   ## Tag and field conversions defined in a separate sub-tables
+#   # [[processors.regex.tags]]
+#   #   ## Tag to change
+#   #   key = "resp_code"
+#   #   ## Regular expression to match on a tag value
+#   #   pattern = "^(\\d)\\d\\d$"
+#   #   ## Pattern for constructing a new value (${1} represents first subgroup)
+#   #   replacement = "${1}xx"
+#
+#   # [[processors.regex.fields]]
+#   #   key = "request"
+#   #   ## All the power of the Go regular expressions available here
+#   #   ## For example, named subgroups
+#   #   pattern = "^/api(?P<method>/[\\w/]+)\\S*"
+#   #   replacement = "${method}"
+#   #   ## If result_key is present, a new field will be created
+#   #   ## instead of changing existing field
+#   #   result_key = "method"
+#
+#   ## Multiple conversions may be applied for one field sequentially
+#   ## Let's extract one more value
+#   # [[processors.regex.fields]]
+#   #   key = "request"
+#   #   pattern = ".*category=(\\w+).*"
+#   #   replacement = "${1}"
+#   #   result_key = "search_category"
+
+
 # # Print all metrics that pass through this filter.
 # [[processors.topk]]
 #   ## How many seconds between aggregations
@@ -966,7 +1077,7 @@
  # mount_points = ["/"]

  ## Ignore mount points by filesystem type.
-  ignore_fs = ["tmpfs", "devtmpfs", "devfs"]
+  ignore_fs = ["tmpfs", "devtmpfs", "devfs", "overlay", "aufs", "squashfs"]


 # Read metrics about disk IO by device
@@ -1027,6 +1138,17 @@
 #   ## This plugin will query all namespaces the aerospike
 #   ## server has configured and get stats for them.
 #   servers = ["localhost:3000"]
+#
+#   # username = "telegraf"
+#   # password = "pa$$word"
+#
+#   ## Optional TLS Config
+#   # enable_tls = false
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## If false, skip chain & host verification
+#   # insecure_skip_verify = true


 # # Read Apache status information (mod_status)
@@ -1051,6 +1173,32 @@
 #   # insecure_skip_verify = false


+# # Gather metrics from Apache Aurora schedulers
+# [[inputs.aurora]]
+#   ## Schedulers are the base addresses of your Aurora Schedulers
+#   schedulers = ["http://127.0.0.1:8081"]
+#
+#   ## Set of role types to collect metrics from.
+#   ##
+#   ## The scheduler roles are checked each interval by contacting the
+#   ## scheduler nodes; zookeeper is not contacted.
+#   # roles = ["leader", "follower"]
+#
+#   ## Timeout is the max time for total network operations.
+#   # timeout = "5s"
+#
+#   ## Username and password are sent using HTTP Basic Auth.
+#   # username = "username"
+#   # password = "pa$$word"
+#
+#   ## Optional TLS Config
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## Use TLS but skip chain & host verification
+#   # insecure_skip_verify = false
+
+
 # # Read metrics of bcache from stats_total and dirty_data
 # [[inputs.bcache]]
 #   ## Bcache sets path
@@ -1075,6 +1223,49 @@
 #   # bond_interfaces = ["bond0"]


+# # Collect Kafka topics and consumers status from Burrow HTTP API.
+# [[inputs.burrow]]
+#   ## Burrow API endpoints in format "schema://host:port".
+#   ## Default is "http://localhost:8000".
+#   servers = ["http://localhost:8000"]
+#
+#   ## Override Burrow API prefix.
+#   ## Useful when Burrow is behind reverse-proxy.
+#   # api_prefix = "/v3/kafka"
+#
+#   ## Maximum time to receive response.
+#   # response_timeout = "5s"
+#
+#   ## Limit per-server concurrent connections.
+#   ## Useful in case of large number of topics or consumer groups.
+#   # concurrent_connections = 20
+#
+#   ## Filter clusters, default is no filtering.
+#   ## Values can be specified as glob patterns.
+#   # clusters_include = []
+#   # clusters_exclude = []
+#
+#   ## Filter consumer groups, default is no filtering.
+#   ## Values can be specified as glob patterns.
+#   # groups_include = []
+#   # groups_exclude = []
+#
+#   ## Filter topics, default is no filtering.
+#   ## Values can be specified as glob patterns.
+#   # topics_include = []
+#   # topics_exclude = []
+#
+#   ## Credentials for basic HTTP authentication.
+#   # username = ""
+#   # password = ""
+#
+#   ## Optional SSL config
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
+#   # insecure_skip_verify = false
+
+
 # # Collects performance metrics from the MON and OSD nodes in a Ceph storage cluster.
 # [[inputs.ceph]]
 #   ## This is the recommended interval to poll.  Too frequent and you will lose
@@ -2596,6 +2787,9 @@
 #   ## Remove numbers from field names.
 #   ## If true, a field name like 'temp1_input' will be changed to 'temp_input'.
 #   # remove_numbers = true
+#
+#   ## Timeout is the maximum amount of time that the sensors command can run.
+#   # timeout = "5s"


 # # Read metrics from storage devices supporting S.M.A.R.T.
@@ -2947,23 +3141,27 @@
 #   pools = ["redis_pool", "mc_pool"]


-# # A plugin to collect stats from Unbound - a validating, recursive, and caching DNS resolver
+# # A plugin to collect stats from the Unbound DNS resolver
 # [[inputs.unbound]]
-#   ## If running as a restricted user you can prepend sudo for additional access:
-#   #use_sudo = false
-#
-#   ## The default location of the unbound-control binary can be overridden with:
-#   binary = "/usr/sbin/unbound-control"
-#
-#   ## The default timeout of 1s can be overriden with:
-#   timeout = "1s"
-#
-#   ## Use the builtin fielddrop/fieldpass telegraf filters in order to keep/remove specific fields
-#   fieldpass = ["total_*", "num_*","time_up", "mem_*"]
-#
-#   ## IP of server to connect to, read from unbound conf default, optionally ':port'
+#   ## Address of server to connect to, read from unbound conf default, optionally ':port'
 #   ## Will lookup IP if given a hostname
 #   server = "127.0.0.1:8953"
+#
+#   ## If running as a restricted user you can prepend sudo for additional access:
+#   # use_sudo = false
+#
+#   ## The default location of the unbound-control binary can be overridden with:
+#   # binary = "/usr/sbin/unbound-control"
+#
+#   ## The default timeout of 1s can be overriden with:
+#   # timeout = "1s"
+#
+#   ## When set to true, thread metrics are tagged with the thread id.
+#   ##
+#   ## The default is false for backwards compatibility, and will be change to
+#   ## true in a future version.  It is recommended to set to true on new
+#   ## deployments.
+#   thread_as_tag = false


 # # A plugin to collect stats from Varnish HTTP Cache
@@ -2982,7 +3180,7 @@
 #
 #   ## Optional name for the varnish instance (or working directory) to query
 #   ## Usually appened after -n in varnish cli
-#   #name = instanceName
+#   # instance_name = instanceName


 # # Read metrics of ZFS from arcstats, zfetchstats, vdev_cache_stats, and pools
@@ -3029,17 +3227,43 @@

 # # AMQP consumer plugin
 # [[inputs.amqp_consumer]]
-#   ## AMQP url
-#   url = "amqp://localhost:5672/influxdb"
-#   ## AMQP exchange
+#   ## Broker to consume from.
+#   ##   deprecated in 1.7; use the brokers option
+#   # url = "amqp://localhost:5672/influxdb"
+#
+#   ## Brokers to consume from.  If multiple brokers are specified a random broker
+#   ## will be selected anytime a connection is established.  This can be
+#   ## helpful for load balancing when not using a dedicated load balancer.
+#   brokers = ["amqp://localhost:5672/influxdb"]
+#
+#   ## Authentication credentials for the PLAIN auth_method.
+#   # username = ""
+#   # password = ""
+#
+#   ## Exchange to declare and consume from.
 #   exchange = "telegraf"
+#
+#   ## Exchange type; common types are "direct", "fanout", "topic", "header", "x-consistent-hash".
+#   # exchange_type = "topic"
+#
+#   ## If true, exchange will be passively declared.
+#   # exchange_passive = false
+#
+#   ## Exchange durability can be either "transient" or "durable".
+#   # exchange_durability = "durable"
+#
+#   ## Additional exchange arguments.
+#   # exchange_arguments = { }
+#   # exchange_arguments = {"hash_propery" = "timestamp"}
+#
 #   ## AMQP queue name
 #   queue = "telegraf"
+#
 #   ## Binding Key
 #   binding_key = "#"
 #
 #   ## Maximum number of messages server should give to the worker.
-#   prefetch_count = 50
+#   # prefetch_count = 50
 #
 #   ## Auth method. PLAIN and EXTERNAL are supported
 #   ## Using EXTERNAL requires enabling the rabbitmq_auth_mechanism_ssl plugin as
@@ -3560,6 +3784,46 @@
 #   percentile_limit = 1000


+# # Accepts syslog messages per RFC5425
+# [[inputs.syslog]]
+#   ## Specify an ip or hostname with port - eg., tcp://localhost:6514, tcp://10.0.0.1:6514
+#   ## Protocol, address and port to host the syslog receiver.
+#   ## If no host is specified, then localhost is used.
+#   ## If no port is specified, 6514 is used (RFC5425#section-4.1).
+#   server = "tcp://:6514"
+#
+#   ## TLS Config
+#   # tls_allowed_cacerts = ["/etc/telegraf/ca.pem"]
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#
+#   ## Period between keep alive probes.
+#   ## 0 disables keep alive probes.
+#   ## Defaults to the OS configuration.
+#   ## Only applies to stream sockets (e.g. TCP).
+#   # keep_alive_period = "5m"
+#
+#   ## Maximum number of concurrent connections (default = 0).
+#   ## 0 means unlimited.
+#   ## Only applies to stream sockets (e.g. TCP).
+#   # max_connections = 1024
+#
+#   ## Read timeout (default = 500ms).
+#   ## 0 means unlimited.
+#   # read_timeout = 500ms
+#
+#   ## Whether to parse in best effort mode or not (default = false).
+#   ## By default best effort parsing is off.
+#   # best_effort = false
+#
+#   ## Character to prepend to SD-PARAMs (default = "_").
+#   ## A syslog message can contain multiple parameters and multiple identifiers within structured data section.
+#   ## Eg., [id1 name1="val1" name2="val2"][id2 name1="val1" nameA="valA"]
+#   ## For each combination a field is created.
+#   ## Its name is created concatenating identifier, sdparam_separator, and parameter name.
+#   # sdparam_separator = "_"
+
+
 # # Stream a log file, like the tail -f command
 # [[inputs.tail]]
 #   ## files to tail.
--- a/etc/telegraf_windows.conf
+++ b/etc/telegraf_windows.conf
@@ -242,7 +242,7 @@
 #
 #   ## Ignore some mountpoints by filesystem type. For example (dev)tmpfs (usually
 #   ## present on /run, /var/run, /dev/shm or /dev).
-#   # ignore_fs = ["tmpfs", "devtmpfs"]
+#   # ignore_fs = ["tmpfs", "devtmpfs", "devfs", "overlay", "aufs", "squashfs"]


 # # Read metrics about disk IO by device
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -156,6 +156,24 @@ func (c *Config) InputNames() []string {
 	return name
 }

+// Outputs returns a list of strings of the configured aggregators.
+func (c *Config) AggregatorNames() []string {
+	var name []string
+	for _, aggregator := range c.Aggregators {
+		name = append(name, aggregator.Name())
+	}
+	return name
+}
+
+// Outputs returns a list of strings of the configured processors.
+func (c *Config) ProcessorNames() []string {
+	var name []string
+	for _, processor := range c.Processors {
+		name = append(name, processor.Name)
+	}
+	return name
+}
+
 // Outputs returns a list of strings of the configured outputs.
 func (c *Config) OutputNames() []string {
 	var name []string
--- a/internal/internal.go
+++ b/internal/internal.go
@@ -11,6 +11,7 @@ import (
 	"os/exec"
 	"strconv"
 	"strings"
+	"syscall"
 	"time"
 	"unicode"
 )
@@ -193,3 +194,15 @@ func RandomSleep(max time.Duration, shutdown chan struct{}) {
 		return
 	}
 }
+
+// Exit status takes the error from exec.Command
+// and returns the exit status and true
+// if error is not exit status, will return 0 and false
+func ExitStatus(err error) (int, bool) {
+	if exiterr, ok := err.(*exec.ExitError); ok {
+		if status, ok := exiterr.Sys().(syscall.WaitStatus); ok {
+			return status.ExitStatus(), true
+		}
+	}
+	return 0, false
+}
--- a/internal/models/running_aggregator.go
+++ b/internal/models/running_aggregator.go
@@ -1,6 +1,7 @@
 package models

 import (
+	"log"
 	"time"

 	"github.com/influxdata/telegraf"
@@ -153,6 +154,7 @@ func (r *RunningAggregator) Run(
 				m.Time().After(r.periodEnd.Add(truncation).Add(r.Config.Delay)) {
 				// the metric is outside the current aggregation period, so
 				// skip it.
+				log.Printf("D! aggregator: metric \"%s\" is not in the current timewindow, skipping", m.Name())
 				continue
 			}
 			r.add(m)
--- a/internal/models/running_output.go
+++ b/internal/models/running_output.go
@@ -113,11 +113,6 @@ func (ro *RunningOutput) AddMetric(m telegraf.Metric) {
 		m, _ = metric.New(name, tags, fields, t)
 	}

-	if output, ok := ro.Output.(telegraf.AggregatingOutput); ok {
-		output.Add(m)
-		return
-	}
-
 	ro.metrics.Add(m)
 	if ro.metrics.Len() == ro.MetricBatchSize {
 		batch := ro.metrics.Batch(ro.MetricBatchSize)
@@ -130,12 +125,6 @@ func (ro *RunningOutput) AddMetric(m telegraf.Metric) {

 // Write writes all cached points to this output.
 func (ro *RunningOutput) Write() error {
-	if output, ok := ro.Output.(telegraf.AggregatingOutput); ok {
-		metrics := output.Push()
-		ro.metrics.Add(metrics...)
-		output.Reset()
-	}
-
 	nFails, nMetrics := ro.failMetrics.Len(), ro.metrics.Len()
 	ro.BufferSize.Set(int64(nFails + nMetrics))
 	log.Printf("D! Output [%s] buffer fullness: %d / %d metrics. ",
--- a/internal/tls/config.go
+++ b/internal/tls/config.go
@@ -17,7 +17,7 @@ type ClientConfig struct {
 	// Deprecated in 1.7; use TLS variables above
 	SSLCA   string `toml:"ssl_ca"`
 	SSLCert string `toml:"ssl_cert"`
-	SSLKey  string `toml:"ssl_ca"`
+	SSLKey  string `toml:"ssl_key"`
 }

 // ServerConfig represents the standard server TLS config.
--- a/output.go
+++ b/output.go
@@ -13,12 +13,6 @@ type Output interface {
 	Write(metrics []Metric) error
 }

-type AggregatingOutput interface {
-	Add(in Metric)
-	Push() []Metric
-	Reset()
-}
-
 type ServiceOutput interface {
 	// Connect to the Output
 	Connect() error
--- a/plugins/aggregators/all/all.go
+++ b/plugins/aggregators/all/all.go
@@ -4,4 +4,5 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/aggregators/basicstats"
 	_ "github.com/influxdata/telegraf/plugins/aggregators/histogram"
 	_ "github.com/influxdata/telegraf/plugins/aggregators/minmax"
+	_ "github.com/influxdata/telegraf/plugins/aggregators/valuecounter"
 )
--- a/plugins/aggregators/valuecounter/README.md
+++ b/plugins/aggregators/valuecounter/README.md
@@ -0,0 +1,73 @@
+# ValueCounter Aggregator Plugin
+
+The valuecounter plugin counts the occurrence of values in fields and emits the
+counter once every 'period' seconds.
+
+A use case for the valuecounter plugin is when you are processing a HTTP access
+log (with the logparser input) and want to count the HTTP status codes.
+
+The fields which will be counted must be configured with the `fields`
+configuration directive. When no `fields` is provided the plugin will not count
+any fields. The results are emitted in fields in the format:
+`originalfieldname_fieldvalue = count`.
+
+Valuecounter only works on fields of the type int, bool or string. Float fields
+are being dropped to prevent the creating of too many fields.
+
+### Configuration:
+
+```toml
+[[aggregators.valuecounter]]
+  ## General Aggregator Arguments:
+  ## The period on which to flush & clear the aggregator.
+  period = "30s"
+  ## If true, the original metric will be dropped by the
+  ## aggregator and will not get sent to the output plugins.
+  drop_original = false
+  ## The fields for which the values will be counted
+  fields = ["status"]
+```
+
+### Measurements & Fields:
+
+- measurement1
+    - field_value1
+    - field_value2
+
+### Tags:
+
+No tags are applied by this aggregator.
+
+### Example Output:
+
+Example for parsing a HTTP access log.
+
+telegraf.conf:
+```
+[[inputs.logparser]]
+  files = ["/tmp/tst.log"]
+  [inputs.logparser.grok]
+    patterns = ['%{DATA:url:tag} %{NUMBER:response:string}']
+    measurement = "access"
+
+[[aggregators.valuecounter]]
+  namepass = ["access"]
+  fields = ["response"]
+```
+
+/tmp/tst.log
+```
+/some/path 200
+/some/path 401
+/some/path 200
+```
+
+```
+$ telegraf --config telegraf.conf --quiet
+
+access,url=/some/path,path=/tmp/tst.log,host=localhost.localdomain response="200" 1511948755991487011
+access,url=/some/path,path=/tmp/tst.log,host=localhost.localdomain response="401" 1511948755991522282
+access,url=/some/path,path=/tmp/tst.log,host=localhost.localdomain response="200" 1511948755991531697
+
+access,path=/tmp/tst.log,host=localhost.localdomain,url=/some/path response_200=2i,response_401=1i 1511948761000000000
+```
--- a/plugins/aggregators/valuecounter/valuecounter.go
+++ b/plugins/aggregators/valuecounter/valuecounter.go
@@ -0,0 +1,108 @@
+package valuecounter
+
+import (
+	"fmt"
+	"log"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/aggregators"
+)
+
+type aggregate struct {
+	name       string
+	tags       map[string]string
+	fieldCount map[string]int
+}
+
+// ValueCounter an aggregation plugin
+type ValueCounter struct {
+	cache  map[uint64]aggregate
+	Fields []string
+}
+
+// NewValueCounter create a new aggregation plugin which counts the occurances
+// of fields and emits the count.
+func NewValueCounter() telegraf.Aggregator {
+	vc := &ValueCounter{}
+	vc.Reset()
+	return vc
+}
+
+var sampleConfig = `
+  ## General Aggregator Arguments:
+  ## The period on which to flush & clear the aggregator.
+  period = "30s"
+  ## If true, the original metric will be dropped by the
+  ## aggregator and will not get sent to the output plugins.
+  drop_original = false
+  ## The fields for which the values will be counted
+  fields = []
+`
+
+// SampleConfig generates a sample config for the ValueCounter plugin
+func (vc *ValueCounter) SampleConfig() string {
+	return sampleConfig
+}
+
+// Description returns the description of the ValueCounter plugin
+func (vc *ValueCounter) Description() string {
+	return "Count the occurance of values in fields."
+}
+
+// Add is run on every metric which passes the plugin
+func (vc *ValueCounter) Add(in telegraf.Metric) {
+	id := in.HashID()
+
+	// Check if the cache already has an entry for this metric, if not create it
+	if _, ok := vc.cache[id]; !ok {
+		a := aggregate{
+			name:       in.Name(),
+			tags:       in.Tags(),
+			fieldCount: make(map[string]int),
+		}
+		vc.cache[id] = a
+	}
+
+	// Check if this metric has fields which we need to count, if so increment
+	// the count.
+	for fk, fv := range in.Fields() {
+		for _, cf := range vc.Fields {
+			if fk == cf {
+				// Do not process float types to prevent memory from blowing up
+				switch fv.(type) {
+				default:
+					log.Printf("I! Valuecounter: Unsupported field type. " +
+						"Must be an int, string or bool. Ignoring.")
+					continue
+				case uint64, int64, string, bool:
+				}
+				fn := fmt.Sprintf("%v_%v", fk, fv)
+				vc.cache[id].fieldCount[fn]++
+			}
+		}
+	}
+}
+
+// Push emits the counters
+func (vc *ValueCounter) Push(acc telegraf.Accumulator) {
+	for _, agg := range vc.cache {
+		fields := map[string]interface{}{}
+
+		for field, count := range agg.fieldCount {
+			fields[field] = count
+		}
+
+		acc.AddFields(agg.name, fields, agg.tags)
+	}
+}
+
+// Reset the cache, executed after each push
+func (vc *ValueCounter) Reset() {
+	vc.cache = make(map[uint64]aggregate)
+}
+
+func init() {
+	aggregators.Add("valuecounter", func() telegraf.Aggregator {
+		return NewValueCounter()
+	})
+}
--- a/plugins/aggregators/valuecounter/valuecounter_test.go
+++ b/plugins/aggregators/valuecounter/valuecounter_test.go
@@ -0,0 +1,126 @@
+package valuecounter
+
+import (
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/metric"
+	"github.com/influxdata/telegraf/testutil"
+)
+
+// Create a valuecounter with config
+func NewTestValueCounter(fields []string) telegraf.Aggregator {
+	vc := &ValueCounter{
+		Fields: fields,
+	}
+	vc.Reset()
+
+	return vc
+}
+
+var m1, _ = metric.New("m1",
+	map[string]string{"foo": "bar"},
+	map[string]interface{}{
+		"status":    200,
+		"somefield": 20.1,
+		"foobar":    "bar",
+	},
+	time.Now(),
+)
+
+var m2, _ = metric.New("m1",
+	map[string]string{"foo": "bar"},
+	map[string]interface{}{
+		"status":    "OK",
+		"ignoreme":  "string",
+		"andme":     true,
+		"boolfield": false,
+	},
+	time.Now(),
+)
+
+func BenchmarkApply(b *testing.B) {
+	vc := NewTestValueCounter([]string{"status"})
+
+	for n := 0; n < b.N; n++ {
+		vc.Add(m1)
+		vc.Add(m2)
+	}
+}
+
+// Test basic functionality
+func TestBasic(t *testing.T) {
+	vc := NewTestValueCounter([]string{"status"})
+	acc := testutil.Accumulator{}
+
+	vc.Add(m1)
+	vc.Add(m2)
+	vc.Add(m1)
+	vc.Push(&acc)
+
+	expectedFields := map[string]interface{}{
+		"status_200": 2,
+		"status_OK":  1,
+	}
+	expectedTags := map[string]string{
+		"foo": "bar",
+	}
+	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
+}
+
+// Test with multiple fields to count
+func TestMultipleFields(t *testing.T) {
+	vc := NewTestValueCounter([]string{"status", "somefield", "boolfield"})
+	acc := testutil.Accumulator{}
+
+	vc.Add(m1)
+	vc.Add(m2)
+	vc.Add(m2)
+	vc.Add(m1)
+	vc.Push(&acc)
+
+	expectedFields := map[string]interface{}{
+		"status_200":      2,
+		"status_OK":       2,
+		"boolfield_false": 2,
+	}
+	expectedTags := map[string]string{
+		"foo": "bar",
+	}
+	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
+}
+
+// Test with a reset between two runs
+func TestWithReset(t *testing.T) {
+	vc := NewTestValueCounter([]string{"status"})
+	acc := testutil.Accumulator{}
+
+	vc.Add(m1)
+	vc.Add(m1)
+	vc.Add(m2)
+	vc.Push(&acc)
+
+	expectedFields := map[string]interface{}{
+		"status_200": 2,
+		"status_OK":  1,
+	}
+	expectedTags := map[string]string{
+		"foo": "bar",
+	}
+	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
+
+	acc.ClearMetrics()
+	vc.Reset()
+
+	vc.Add(m2)
+	vc.Add(m2)
+	vc.Add(m1)
+	vc.Push(&acc)
+
+	expectedFields = map[string]interface{}{
+		"status_200": 1,
+		"status_OK":  2,
+	}
+	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
+}
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -97,11 +97,13 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/solr"
 	_ "github.com/influxdata/telegraf/plugins/inputs/sqlserver"
 	_ "github.com/influxdata/telegraf/plugins/inputs/statsd"
+	_ "github.com/influxdata/telegraf/plugins/inputs/syslog"
 	_ "github.com/influxdata/telegraf/plugins/inputs/sysstat"
 	_ "github.com/influxdata/telegraf/plugins/inputs/system"
 	_ "github.com/influxdata/telegraf/plugins/inputs/tail"
 	_ "github.com/influxdata/telegraf/plugins/inputs/tcp_listener"
 	_ "github.com/influxdata/telegraf/plugins/inputs/teamspeak"
+	_ "github.com/influxdata/telegraf/plugins/inputs/tengine"
 	_ "github.com/influxdata/telegraf/plugins/inputs/tomcat"
 	_ "github.com/influxdata/telegraf/plugins/inputs/trig"
 	_ "github.com/influxdata/telegraf/plugins/inputs/twemproxy"
--- a/plugins/inputs/amqp_consumer/README.md
+++ b/plugins/inputs/amqp_consumer/README.md
@@ -15,23 +15,48 @@ The following defaults are known to work with RabbitMQ:
 ```toml
 # AMQP consumer plugin
 [[inputs.amqp_consumer]]
-  ## AMQP url
-  url = "amqp://localhost:5672/influxdb"
-  ## AMQP exchange
+  ## Broker to consume from.
+  ##   deprecated in 1.7; use the brokers option
+  # url = "amqp://localhost:5672/influxdb"
+
+  ## Brokers to consume from.  If multiple brokers are specified a random broker
+  ## will be selected anytime a connection is established.  This can be
+  ## helpful for load balancing when not using a dedicated load balancer.
+  brokers = ["amqp://localhost:5672/influxdb"]
+
+  ## Authentication credentials for the PLAIN auth_method.
+  # username = ""
+  # password = ""
+
+  ## Exchange to declare and consume from.
  exchange = "telegraf"
+
+  ## Exchange type; common types are "direct", "fanout", "topic", "header", "x-consistent-hash".
+  # exchange_type = "topic"
+
+  ## If true, exchange will be passively declared.
+  # exchange_passive = false
+
+  ## Exchange durability can be either "transient" or "durable".
+  # exchange_durability = "durable"
+
+  ## Additional exchange arguments.
+  # exchange_arguments = { }
+  # exchange_arguments = {"hash_propery" = "timestamp"}
+
  ## AMQP queue name
  queue = "telegraf"
  ## Binding Key
  binding_key = "#"

-  ## Controls how many messages the server will try to keep on the network
-  ## for consumers before receiving delivery acks.
-  #prefetch_count = 50
+  ## Maximum number of messages server should give to the worker.
+  # prefetch_count = 50

-  ## Auth method. PLAIN and EXTERNAL are supported.
+  ## Auth method. PLAIN and EXTERNAL are supported
  ## Using EXTERNAL requires enabling the rabbitmq_auth_mechanism_ssl plugin as
  ## described here: https://www.rabbitmq.com/plugins.html
  # auth_method = "PLAIN"
+
  ## Optional TLS Config
  # tls_ca = "/etc/telegraf/ca.pem"
  # tls_cert = "/etc/telegraf/cert.pem"
--- a/plugins/inputs/amqp_consumer/amqp_consumer.go
+++ b/plugins/inputs/amqp_consumer/amqp_consumer.go
@@ -1,8 +1,10 @@
 package amqp_consumer

 import (
+	"errors"
 	"fmt"
 	"log"
+	"math/rand"
 	"strings"
 	"sync"
 	"time"
@@ -17,9 +19,16 @@ import (

 // AMQPConsumer is the top level struct for this plugin
 type AMQPConsumer struct {
-	URL string
-	// AMQP exchange
-	Exchange string
+	URL                string            `toml:"url"` // deprecated in 1.7; use brokers
+	Brokers            []string          `toml:"brokers"`
+	Username           string            `toml:"username"`
+	Password           string            `toml:"password"`
+	Exchange           string            `toml:"exchange"`
+	ExchangeType       string            `toml:"exchange_type"`
+	ExchangeDurability string            `toml:"exchange_durability"`
+	ExchangePassive    bool              `toml:"exchange_passive"`
+	ExchangeArguments  map[string]string `toml:"exchange_arguments"`
+
 	// Queue Name
 	Queue string
 	// Binding Key
@@ -48,23 +57,55 @@ func (a *externalAuth) Response() string {
 }

 const (
-	DefaultAuthMethod    = "PLAIN"
+	DefaultAuthMethod = "PLAIN"
+
+	DefaultBroker = "amqp://localhost:5672/influxdb"
+
+	DefaultExchangeType       = "topic"
+	DefaultExchangeDurability = "durable"
+
 	DefaultPrefetchCount = 50
 )

 func (a *AMQPConsumer) SampleConfig() string {
 	return `
-  ## AMQP url
-  url = "amqp://localhost:5672/influxdb"
-  ## AMQP exchange
+  ## Broker to consume from.
+  ##   deprecated in 1.7; use the brokers option
+  # url = "amqp://localhost:5672/influxdb"
+
+  ## Brokers to consume from.  If multiple brokers are specified a random broker
+  ## will be selected anytime a connection is established.  This can be
+  ## helpful for load balancing when not using a dedicated load balancer.
+  brokers = ["amqp://localhost:5672/influxdb"]
+
+  ## Authentication credentials for the PLAIN auth_method.
+  # username = ""
+  # password = ""
+
+  ## Exchange to declare and consume from.
  exchange = "telegraf"
+
+  ## Exchange type; common types are "direct", "fanout", "topic", "header", "x-consistent-hash".
+  # exchange_type = "topic"
+
+  ## If true, exchange will be passively declared.
+  # exchange_passive = false
+
+  ## Exchange durability can be either "transient" or "durable".
+  # exchange_durability = "durable"
+
+  ## Additional exchange arguments.
+  # exchange_arguments = { }
+  # exchange_arguments = {"hash_propery" = "timestamp"}
+
  ## AMQP queue name
  queue = "telegraf"
+
  ## Binding Key
  binding_key = "#"

  ## Maximum number of messages server should give to the worker.
-  prefetch_count = 50
+  # prefetch_count = 50

  ## Auth method. PLAIN and EXTERNAL are supported
  ## Using EXTERNAL requires enabling the rabbitmq_auth_mechanism_ssl plugin as
@@ -106,16 +147,21 @@ func (a *AMQPConsumer) createConfig() (*amqp.Config, error) {
 		return nil, err
 	}

-	// parse auth method
-	var sasl []amqp.Authentication // nil by default
-
+	var auth []amqp.Authentication
 	if strings.ToUpper(a.AuthMethod) == "EXTERNAL" {
-		sasl = []amqp.Authentication{&externalAuth{}}
+		auth = []amqp.Authentication{&externalAuth{}}
+	} else if a.Username != "" || a.Password != "" {
+		auth = []amqp.Authentication{
+			&amqp.PlainAuth{
+				Username: a.Username,
+				Password: a.Password,
+			},
+		}
 	}

 	config := amqp.Config{
 		TLSClientConfig: tls,
-		SASL:            sasl, // if nil, it will be PLAIN
+		SASL:            auth, // if nil, it will be PLAIN
 	}
 	return &config, nil
 }
@@ -163,28 +209,55 @@ func (a *AMQPConsumer) Start(acc telegraf.Accumulator) error {
 }

 func (a *AMQPConsumer) connect(amqpConf *amqp.Config) (<-chan amqp.Delivery, error) {
-	conn, err := amqp.DialConfig(a.URL, *amqpConf)
-	if err != nil {
-		return nil, err
+	brokers := a.Brokers
+	if len(brokers) == 0 {
+		brokers = []string{a.URL}
 	}
-	a.conn = conn

-	ch, err := conn.Channel()
+	p := rand.Perm(len(brokers))
+	for _, n := range p {
+		broker := brokers[n]
+		log.Printf("D! [amqp_consumer] connecting to %q", broker)
+		conn, err := amqp.DialConfig(broker, *amqpConf)
+		if err == nil {
+			a.conn = conn
+			log.Printf("D! [amqp_consumer] connected to %q", broker)
+			break
+		}
+		log.Printf("D! [amqp_consumer] error connecting to %q", broker)
+	}
+
+	if a.conn == nil {
+		return nil, errors.New("could not connect to any broker")
+	}
+
+	ch, err := a.conn.Channel()
 	if err != nil {
 		return nil, fmt.Errorf("Failed to open a channel: %s", err)
 	}

-	err = ch.ExchangeDeclare(
-		a.Exchange, // name
-		"topic",    // type
-		true,       // durable
-		false,      // auto-deleted
-		false,      // internal
-		false,      // no-wait
-		nil,        // arguments
-	)
+	var exchangeDurable = true
+	switch a.ExchangeDurability {
+	case "transient":
+		exchangeDurable = false
+	default:
+		exchangeDurable = true
+	}
+
+	exchangeArgs := make(amqp.Table, len(a.ExchangeArguments))
+	for k, v := range a.ExchangeArguments {
+		exchangeArgs[k] = v
+	}
+
+	err = declareExchange(
+		ch,
+		a.Exchange,
+		a.ExchangeType,
+		a.ExchangePassive,
+		exchangeDurable,
+		exchangeArgs)
 	if err != nil {
-		return nil, fmt.Errorf("Failed to declare an exchange: %s", err)
+		return nil, err
 	}

 	q, err := ch.QueueDeclare(
@@ -236,6 +309,42 @@ func (a *AMQPConsumer) connect(amqpConf *amqp.Config) (<-chan amqp.Delivery, err
 	return msgs, err
 }

+func declareExchange(
+	channel *amqp.Channel,
+	exchangeName string,
+	exchangeType string,
+	exchangePassive bool,
+	exchangeDurable bool,
+	exchangeArguments amqp.Table,
+) error {
+	var err error
+	if exchangePassive {
+		err = channel.ExchangeDeclarePassive(
+			exchangeName,
+			exchangeType,
+			exchangeDurable,
+			false, // delete when unused
+			false, // internal
+			false, // no-wait
+			exchangeArguments,
+		)
+	} else {
+		err = channel.ExchangeDeclare(
+			exchangeName,
+			exchangeType,
+			exchangeDurable,
+			false, // delete when unused
+			false, // internal
+			false, // no-wait
+			exchangeArguments,
+		)
+	}
+	if err != nil {
+		return fmt.Errorf("error declaring exchange: %v", err)
+	}
+	return nil
+}
+
 // Read messages from queue and add them to the Accumulator
 func (a *AMQPConsumer) process(msgs <-chan amqp.Delivery, acc telegraf.Accumulator) {
 	defer a.wg.Done()
@@ -267,8 +376,11 @@ func (a *AMQPConsumer) Stop() {
 func init() {
 	inputs.Add("amqp_consumer", func() telegraf.Input {
 		return &AMQPConsumer{
-			AuthMethod:    DefaultAuthMethod,
-			PrefetchCount: DefaultPrefetchCount,
+			URL:                DefaultBroker,
+			AuthMethod:         DefaultAuthMethod,
+			ExchangeType:       DefaultExchangeType,
+			ExchangeDurability: DefaultExchangeDurability,
+			PrefetchCount:      DefaultPrefetchCount,
 		}
 	})
 }
--- a/plugins/inputs/burrow/README.md
+++ b/plugins/inputs/burrow/README.md
@@ -8,6 +8,7 @@ Supported Burrow version: `1.x`
 ### Configuration

 ```
+[[inputs.burrow]]
  ## Burrow API endpoints in format "schema://host:port".
  ## Default is "http://localhost:8000".
  servers = ["http://localhost:8000"]
@@ -91,6 +92,7 @@ Supported Burrow version: `1.x`
  - group (string)
  - topic (string)
  - partition (int)
+  - owner (string)

 * `burrow_topic`
  - cluster (string)
--- a/plugins/inputs/burrow/burrow.go
+++ b/plugins/inputs/burrow/burrow.go
@@ -116,6 +116,7 @@ type (
 		Start      apiStatusResponseLagItem `json:"start"`
 		End        apiStatusResponseLagItem `json:"end"`
 		CurrentLag int64                    `json:"current_lag"`
+		Owner      string                   `json:"owner"`
 	}

 	// response: lag field item
@@ -447,6 +448,7 @@ func (b *burrow) genGroupLagMetrics(r *apiResponse, cluster, group string, acc t
 				"group":     group,
 				"topic":     partition.Topic,
 				"partition": strconv.FormatInt(int64(partition.Partition), 10),
+				"owner":     partition.Owner,
 			},
 		)
 	}
--- a/plugins/inputs/burrow/burrow_test.go
+++ b/plugins/inputs/burrow/burrow_test.go
@@ -129,9 +129,9 @@ func TestBurrowPartition(t *testing.T) {
 		},
 	}
 	tags := []map[string]string{
-		{"cluster": "clustername1", "group": "group1", "topic": "topicA", "partition": "0"},
-		{"cluster": "clustername1", "group": "group1", "topic": "topicA", "partition": "1"},
-		{"cluster": "clustername1", "group": "group1", "topic": "topicA", "partition": "2"},
+		{"cluster": "clustername1", "group": "group1", "topic": "topicA", "partition": "0", "owner": "kafka1"},
+		{"cluster": "clustername1", "group": "group1", "topic": "topicA", "partition": "1", "owner": "kafka2"},
+		{"cluster": "clustername1", "group": "group1", "topic": "topicA", "partition": "2", "owner": "kafka3"},
 	}

 	require.Empty(t, acc.Errors)
--- a/plugins/inputs/burrow/testdata/v3_kafka_clustername1_consumer_group1_lag.json
+++ b/plugins/inputs/burrow/testdata/v3_kafka_clustername1_consumer_group1_lag.json
@@ -10,7 +10,7 @@
      {
        "topic": "topicA",
        "partition": 0,
-        "owner": "kafka",
+        "owner": "kafka1",
        "status": "OK",
        "start": {
          "offset": 431323195,
@@ -28,7 +28,7 @@
      {
        "topic": "topicA",
        "partition": 1,
-        "owner": "kafka",
+        "owner": "kafka2",
        "status": "OK",
        "start": {
          "offset": 431322962,
@@ -46,7 +46,7 @@
      {
        "topic": "topicA",
        "partition": 2,
-        "owner": "kafka",
+        "owner": "kafka3",
        "status": "OK",
        "start": {
          "offset": 428636563,
--- a/plugins/inputs/conntrack/conntrack_test.go
+++ b/plugins/inputs/conntrack/conntrack_test.go
@@ -3,14 +3,15 @@
 package conntrack

 import (
-	"github.com/influxdata/telegraf/testutil"
-	"github.com/stretchr/testify/assert"
 	"io/ioutil"
 	"os"
 	"path"
 	"strconv"
 	"strings"
 	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/assert"
 )

 func restoreDflts(savedFiles, savedDirs []string) {
@@ -39,6 +40,7 @@ func TestDefaultsUsed(t *testing.T) {

 	tmpFile, err := ioutil.TempFile(tmpdir, "ip_conntrack_count")
 	assert.NoError(t, err)
+	defer os.Remove(tmpFile.Name())

 	dfltDirs = []string{tmpdir}
 	fname := path.Base(tmpFile.Name())
@@ -63,6 +65,8 @@ func TestConfigsUsed(t *testing.T) {
 	cntFile, err := ioutil.TempFile(tmpdir, "nf_conntrack_count")
 	maxFile, err := ioutil.TempFile(tmpdir, "nf_conntrack_max")
 	assert.NoError(t, err)
+	defer os.Remove(cntFile.Name())
+	defer os.Remove(maxFile.Name())

 	dfltDirs = []string{tmpdir}
 	cntFname := path.Base(cntFile.Name())
--- a/plugins/inputs/docker/README.md
+++ b/plugins/inputs/docker/README.md
@@ -124,6 +124,7 @@ docker API.
    - server_version
    - container_image
    - container_name
+    - container_status
    - container_version
  - fields:
    - total_pgmafault
@@ -167,6 +168,7 @@ docker API.
    - server_version
    - container_image
    - container_name
+    - container_status
    - container_version
    - cpu
  - fields:
@@ -186,6 +188,7 @@ docker API.
    - server_version
    - container_image
    - container_name
+    - container_status
    - container_version
    - network
  - fields:
@@ -205,6 +208,7 @@ docker API.
    - server_version
    - container_image
    - container_name
+    - container_status
    - container_version
    - device
  - fields:
@@ -226,11 +230,27 @@ docker API.
    - server_version
    - container_image
    - container_name
+    - container_status
    - container_version
  - fields:
  	- health_status (string)
  	- failing_streak (integer)

+- docker_container_status
+  - tags:
+    - engine_host
+    - server_version
+    - container_image
+    - container_name
+    - container_status
+    - container_version
+  - fields:
+    - oomkilled (boolean)
+    - pid (integer)
+    - exitcode (integer)
+    - started_at (integer)
+    - finished_at (integer)
+
 - docker_swarm
  - tags:
    - service_id
@@ -245,12 +265,12 @@ docker API.
 ```
 docker,engine_host=debian-stretch-docker,server_version=17.09.0-ce n_containers=6i,n_containers_paused=0i,n_containers_running=1i,n_containers_stopped=5i,n_cpus=2i,n_goroutines=41i,n_images=2i,n_listener_events=0i,n_used_file_descriptors=27i 1524002041000000000
 docker,engine_host=debian-stretch-docker,server_version=17.09.0-ce,unit=bytes memory_total=2101661696i 1524002041000000000
-docker_container_mem,container_image=telegraf,container_name=zen_ritchie,container_version=unknown,engine_host=debian-stretch-docker,server_version=17.09.0-ce active_anon=8327168i,active_file=2314240i,cache=27402240i,container_id="adc4ba9593871bf2ab95f3ffde70d1b638b897bb225d21c2c9c84226a10a8cf4",hierarchical_memory_limit=9223372036854771712i,inactive_anon=0i,inactive_file=25088000i,limit=2101661696i,mapped_file=20582400i,max_usage=36646912i,pgfault=4193i,pgmajfault=214i,pgpgin=9243i,pgpgout=520i,rss=8327168i,rss_huge=0i,total_active_anon=8327168i,total_active_file=2314240i,total_cache=27402240i,total_inactive_anon=0i,total_inactive_file=25088000i,total_mapped_file=20582400i,total_pgfault=4193i,total_pgmajfault=214i,total_pgpgin=9243i,total_pgpgout=520i,total_rss=8327168i,total_rss_huge=0i,total_unevictable=0i,total_writeback=0i,unevictable=0i,usage=36528128i,usage_percent=0.4342225020025297,writeback=0i 1524002042000000000
-docker_container_cpu,container_image=telegraf,container_name=zen_ritchie,container_version=unknown,cpu=cpu-total,engine_host=debian-stretch-docker,server_version=17.09.0-ce container_id="adc4ba9593871bf2ab95f3ffde70d1b638b897bb225d21c2c9c84226a10a8cf4",throttling_periods=0i,throttling_throttled_periods=0i,throttling_throttled_time=0i,usage_in_kernelmode=40000000i,usage_in_usermode=100000000i,usage_percent=0,usage_system=6394210000000i,usage_total=117319068i 1524002042000000000
-docker_container_cpu,container_image=telegraf,container_name=zen_ritchie,container_version=unknown,cpu=cpu0,engine_host=debian-stretch-docker,server_version=17.09.0-ce container_id="adc4ba9593871bf2ab95f3ffde70d1b638b897bb225d21c2c9c84226a10a8cf4",usage_total=20825265i 1524002042000000000
-docker_container_cpu,container_image=telegraf,container_name=zen_ritchie,container_version=unknown,cpu=cpu1,engine_host=debian-stretch-docker,server_version=17.09.0-ce container_id="adc4ba9593871bf2ab95f3ffde70d1b638b897bb225d21c2c9c84226a10a8cf4",usage_total=96493803i 1524002042000000000
-docker_container_net,container_image=telegraf,container_name=zen_ritchie,container_version=unknown,engine_host=debian-stretch-docker,network=eth0,server_version=17.09.0-ce container_id="adc4ba9593871bf2ab95f3ffde70d1b638b897bb225d21c2c9c84226a10a8cf4",rx_bytes=1576i,rx_dropped=0i,rx_errors=0i,rx_packets=20i,tx_bytes=0i,tx_dropped=0i,tx_errors=0i,tx_packets=0i 1524002042000000000
-docker_container_blkio,container_image=telegraf,container_name=zen_ritchie,container_version=unknown,device=254:0,engine_host=debian-stretch-docker,server_version=17.09.0-ce container_id="adc4ba9593871bf2ab95f3ffde70d1b638b897bb225d21c2c9c84226a10a8cf4",io_service_bytes_recursive_async=27398144i,io_service_bytes_recursive_read=27398144i,io_service_bytes_recursive_sync=0i,io_service_bytes_recursive_total=27398144i,io_service_bytes_recursive_write=0i,io_serviced_recursive_async=529i,io_serviced_recursive_read=529i,io_serviced_recursive_sync=0i,io_serviced_recursive_total=529i,io_serviced_recursive_write=0i 1524002042000000000
-docker_container_health,container_image=telegraf,container_name=zen_ritchie,container_version=unknown,engine_host=debian-stretch-docker,server_version=17.09.0-ce failing_streak=0i,health_status="healthy" 1524007529000000000
+docker_container_mem,container_image=telegraf,container_name=zen_ritchie,container_status=running,container_version=unknown,engine_host=debian-stretch-docker,server_version=17.09.0-ce active_anon=8327168i,active_file=2314240i,cache=27402240i,container_id="adc4ba9593871bf2ab95f3ffde70d1b638b897bb225d21c2c9c84226a10a8cf4",hierarchical_memory_limit=9223372036854771712i,inactive_anon=0i,inactive_file=25088000i,limit=2101661696i,mapped_file=20582400i,max_usage=36646912i,pgfault=4193i,pgmajfault=214i,pgpgin=9243i,pgpgout=520i,rss=8327168i,rss_huge=0i,total_active_anon=8327168i,total_active_file=2314240i,total_cache=27402240i,total_inactive_anon=0i,total_inactive_file=25088000i,total_mapped_file=20582400i,total_pgfault=4193i,total_pgmajfault=214i,total_pgpgin=9243i,total_pgpgout=520i,total_rss=8327168i,total_rss_huge=0i,total_unevictable=0i,total_writeback=0i,unevictable=0i,usage=36528128i,usage_percent=0.4342225020025297,writeback=0i 1524002042000000000
+docker_container_cpu,container_image=telegraf,container_name=zen_ritchie,container_status=running,container_version=unknown,cpu=cpu-total,engine_host=debian-stretch-docker,server_version=17.09.0-ce container_id="adc4ba9593871bf2ab95f3ffde70d1b638b897bb225d21c2c9c84226a10a8cf4",throttling_periods=0i,throttling_throttled_periods=0i,throttling_throttled_time=0i,usage_in_kernelmode=40000000i,usage_in_usermode=100000000i,usage_percent=0,usage_system=6394210000000i,usage_total=117319068i 1524002042000000000
+docker_container_cpu,container_image=telegraf,container_name=zen_ritchie,container_status=running,container_version=unknown,cpu=cpu0,engine_host=debian-stretch-docker,server_version=17.09.0-ce container_id="adc4ba9593871bf2ab95f3ffde70d1b638b897bb225d21c2c9c84226a10a8cf4",usage_total=20825265i 1524002042000000000
+docker_container_cpu,container_image=telegraf,container_name=zen_ritchie,container_status=running,container_version=unknown,cpu=cpu1,engine_host=debian-stretch-docker,server_version=17.09.0-ce container_id="adc4ba9593871bf2ab95f3ffde70d1b638b897bb225d21c2c9c84226a10a8cf4",usage_total=96493803i 1524002042000000000
+docker_container_net,container_image=telegraf,container_name=zen_ritchie,container_status=running,container_version=unknown,engine_host=debian-stretch-docker,network=eth0,server_version=17.09.0-ce container_id="adc4ba9593871bf2ab95f3ffde70d1b638b897bb225d21c2c9c84226a10a8cf4",rx_bytes=1576i,rx_dropped=0i,rx_errors=0i,rx_packets=20i,tx_bytes=0i,tx_dropped=0i,tx_errors=0i,tx_packets=0i 1524002042000000000
+docker_container_blkio,container_image=telegraf,container_name=zen_ritchie,container_status=running,container_version=unknown,device=254:0,engine_host=debian-stretch-docker,server_version=17.09.0-ce container_id="adc4ba9593871bf2ab95f3ffde70d1b638b897bb225d21c2c9c84226a10a8cf4",io_service_bytes_recursive_async=27398144i,io_service_bytes_recursive_read=27398144i,io_service_bytes_recursive_sync=0i,io_service_bytes_recursive_total=27398144i,io_service_bytes_recursive_write=0i,io_serviced_recursive_async=529i,io_serviced_recursive_read=529i,io_serviced_recursive_sync=0i,io_serviced_recursive_total=529i,io_serviced_recursive_write=0i 1524002042000000000
+docker_container_health,container_image=telegraf,container_name=zen_ritchie,container_status=running,container_version=unknown,engine_host=debian-stretch-docker,server_version=17.09.0-ce failing_streak=0i,health_status="healthy" 1524007529000000000
 docker_swarm,service_id=xaup2o9krw36j2dy1mjx1arjw,service_mode=replicated,service_name=test tasks_desired=3,tasks_running=3 1508968160000000000
 ```
--- a/plugins/inputs/docker/docker.go
+++ b/plugins/inputs/docker/docker.go
@@ -435,6 +435,23 @@ func (d *Docker) gatherContainer(
 			}
 		}
 	}
+	if info.State != nil {
+		tags["container_status"] = info.State.Status
+		statefields := map[string]interface{}{
+			"oomkilled": info.State.OOMKilled,
+			"pid":       info.State.Pid,
+			"exitcode":  info.State.ExitCode,
+		}
+		container_time, err := time.Parse(time.RFC3339, info.State.StartedAt)
+		if err == nil && !container_time.IsZero() {
+			statefields["started_at"] = container_time.UnixNano()
+		}
+		container_time, err = time.Parse(time.RFC3339, info.State.FinishedAt)
+		if err == nil && !container_time.IsZero() {
+			statefields["finished_at"] = container_time.UnixNano()
+		}
+		acc.AddFields("docker_container_status", statefields, tags, time.Now())
+	}

 	if info.State.Health != nil {
 		healthfields := map[string]interface{}{
--- a/plugins/inputs/docker/docker_test.go
+++ b/plugins/inputs/docker/docker_test.go
@@ -653,6 +653,7 @@ func TestDockerGatherInfo(t *testing.T) {
 			"label1":            "test_value_1",
 			"label2":            "test_value_2",
 			"server_version":    "17.09.0-ce",
+			"container_status":  "running",
 		},
 	)
 	acc.AssertContainsTaggedFields(t,
@@ -676,6 +677,7 @@ func TestDockerGatherInfo(t *testing.T) {
 			"label1":            "test_value_1",
 			"label2":            "test_value_2",
 			"server_version":    "17.09.0-ce",
+			"container_status":  "running",
 		},
 	)
 }
--- a/plugins/inputs/docker/docker_testdata.go
+++ b/plugins/inputs/docker/docker_testdata.go
@@ -484,6 +484,12 @@ var containerInspect = types.ContainerJSON{
 				FailingStreak: 1,
 				Status:        "Unhealthy",
 			},
+			Status:     "running",
+			OOMKilled:  false,
+			Pid:        1234,
+			ExitCode:   0,
+			StartedAt:  "2018-06-14T05:48:53.266176036Z",
+			FinishedAt: "0001-01-01T00:00:00Z",
 		},
 	},
 }
--- a/plugins/inputs/jolokia2/README.md
+++ b/plugins/inputs/jolokia2/README.md
@@ -172,8 +172,14 @@ Both `jolokia2_agent` and `jolokia2_proxy` plugins support default configuration

 ### Example Configurations:

- [Java JVM](/plugins/inputs/jolokia2/examples/java.conf)
- [Kafka](/plugins/inputs/jolokia2/examples/kafka.conf)
+- [ActiveMQ](/plugins/inputs/jolokia2/examples/activemq.conf)
+- [BitBucket](/plugins/inputs/jolokia2/examples/bitbucket.conf)
 - [Cassandra](/plugins/inputs/jolokia2/examples/cassandra.conf)
+- [Hadoop-HDFS](/plugins/inputs/jolokia2/examples/hadoop-hdfs.conf)
+- [Java JVM](/plugins/inputs/jolokia2/examples/java.conf)
+- [JBoss](/plugins/inputs/jolokia2/examples/jboss.conf)
+- [Kafka](/plugins/inputs/jolokia2/examples/kafka.conf)
+- [Tomcat](/plugins/inputs/jolokia2/examples/tomcat.conf)
+- [Weblogic](/plugins/inputs/jolokia2/examples/weblogic.conf)

 Please help improve this list and contribute new configuration files by opening an issue or pull request.
--- a/plugins/inputs/jolokia2/examples/activemq.conf
+++ b/plugins/inputs/jolokia2/examples/activemq.conf
@@ -0,0 +1,57 @@
+## Jolokia is bundled with ActiveMQ
+
+[[inputs.jolokia2_agent]]
+  urls = ["http://localhost:8161/api/jolokia"]
+  name_prefix = "activemq."
+  username = "admin"
+  password = "admin"
+
+  ### JVM Generic
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "OperatingSystem"
+    mbean = "java.lang:type=OperatingSystem"
+    paths = ["ProcessCpuLoad","SystemLoadAverage","SystemCpuLoad"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "jvm_runtime"
+    mbean = "java.lang:type=Runtime"
+    paths = ["Uptime"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "jvm_memory"
+    mbean = "java.lang:type=Memory"
+    paths = ["HeapMemoryUsage", "NonHeapMemoryUsage", "ObjectPendingFinalizationCount"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name     = "jvm_garbage_collector"
+    mbean    = "java.lang:name=*,type=GarbageCollector"
+    paths    = ["CollectionTime", "CollectionCount"]
+    tag_keys = ["name"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name       = "jvm_memory_pool"
+    mbean      = "java.lang:name=*,type=MemoryPool"
+    paths      = ["Usage", "PeakUsage", "CollectionUsage"]
+    tag_keys   = ["name"]
+    tag_prefix = "pool_"
+
+  ### ACTIVEMQ
+
+  [[inputs.jolokia2_agent.metric]]
+    name     = "queue"
+    mbean    = "org.apache.activemq:brokerName=*,destinationName=*,destinationType=Queue,type=Broker"
+    paths    = ["QueueSize","EnqueueCount","ConsumerCount","DispatchCount","DequeueCount","ProducerCount","InFlightCount"]
+    tag_keys = ["brokerName","destinationName"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name     = "topic"
+    mbean    = "org.apache.activemq:brokerName=*,destinationName=*,destinationType=Topic,type=Broker"
+    paths    = ["ProducerCount","DequeueCount","ConsumerCount","QueueSize","EnqueueCount"]
+    tag_keys = ["brokerName","destinationName"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name     = "broker"
+    mbean    = "org.apache.activemq:brokerName=*,type=Broker"
+    paths    = ["TotalConsumerCount","TotalMessageCount","TotalEnqueueCount","TotalDequeueCount","MemoryLimit","MemoryPercentUsage","StoreLimit","StorePercentUsage","TempPercentUsage","TempLimit"]
+    tag_keys = ["brokerName"]
--- a/plugins/inputs/jolokia2/examples/bitbucket.conf
+++ b/plugins/inputs/jolokia2/examples/bitbucket.conf
@@ -0,0 +1,39 @@
+[[inputs.jolokia2_agent]]
+  urls = ["http://localhost:8778/jolokia"]
+  name_prefix = "bitbucket."
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "jvm_operatingsystem"
+    mbean = "java.lang:type=OperatingSystem"
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "jvm_runtime"
+    mbean = "java.lang:type=Runtime"
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "jvm_thread"
+    mbean = "java.lang:type=Threading"
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "jvm_memory"
+    mbean = "java.lang:type=Memory"
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "jvm_class_loading"
+    mbean = "java.lang:type=ClassLoading"
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "jvm_memory_pool"
+    mbean = "java.lang:type=MemoryPool,name=*"
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "webhooks"
+    mbean = "com.atlassian.webhooks:name=*"
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "atlassian"
+    mbean = "com.atlassian.bitbucket:name=*"
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "thread_pools"
+    mbean = "com.atlassian.bitbucket.thread-pools:name=*"
--- a/plugins/inputs/jolokia2/examples/hadooop-hdfs.conf
+++ b/plugins/inputs/jolokia2/examples/hadooop-hdfs.conf
@@ -0,0 +1,85 @@
+################
+# NAMENODE     #
+################
+[[inputs.jolokia2_agent]]
+  urls = ["http://localhost:8778/jolokia"]
+  name_prefix = "hadoop.hdfs.namenode."
+
+  [[inputs.jolokia2_agent.metric]]
+    name = "FSNamesystem"
+    mbean = "Hadoop:name=FSNamesystem,service=NameNode"
+    paths = ["CapacityTotal", "CapacityRemaining", "CapacityUsedNonDFS", "NumLiveDataNodes", "NumDeadDataNodes", "NumInMaintenanceDeadDataNodes", "NumDecomDeadDataNodes"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name = "FSNamesystemState"
+    mbean = "Hadoop:name=FSNamesystemState,service=NameNode"
+    paths = ["VolumeFailuresTotal", "UnderReplicatedBlocks", "BlocksTotal"]
+  
+  [[inputs.jolokia2_agent.metric]]
+    name = "OperatingSystem"
+    mbean = "java.lang:type=OperatingSystem"
+    paths = ["ProcessCpuLoad", "SystemLoadAverage", "SystemCpuLoad"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name = "jvm_runtime"
+    mbean = "java.lang:type=Runtime"
+    paths = ["Uptime"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name = "jvm_memory"
+    mbean = "java.lang:type=Memory"
+    paths = ["HeapMemoryUsage", "NonHeapMemoryUsage", "ObjectPendingFinalizationCount"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name = "jvm_garbage_collector"
+    mbean = "java.lang:name=*,type=GarbageCollector"
+    paths = ["CollectionTime", "CollectionCount"]
+    tag_keys = ["name"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name = "jvm_memory_pool"
+    mbean = "java.lang:name=*,type=MemoryPool"
+    paths = ["Usage", "PeakUsage", "CollectionUsage"]
+    tag_keys = ["name"]
+    tag_prefix = "pool_"
+
+
+################
+# DATANODE     #
+################
+[[inputs.jolokia2_agent]]
+  urls = ["http://localhost:7778/jolokia"]
+  name_prefix = "hadoop.hdfs.datanode."
+
+  [[inputs.jolokia2_agent.metric]]
+    name = "FSDatasetState"
+    mbean = "Hadoop:name=FSDatasetState,service=DataNode"
+    paths = ["Capacity", "DfsUsed", "Remaining", "NumBlocksFailedToUnCache", "NumBlocksFailedToCache", "NumBlocksCached"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name = "OperatingSystem"
+    mbean = "java.lang:type=OperatingSystem"
+    paths = ["ProcessCpuLoad", "SystemLoadAverage", "SystemCpuLoad"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name = "jvm_runtime"
+    mbean = "java.lang:type=Runtime"
+    paths = ["Uptime"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name = "jvm_memory"
+    mbean = "java.lang:type=Memory"
+    paths = ["HeapMemoryUsage", "NonHeapMemoryUsage", "ObjectPendingFinalizationCount"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name = "jvm_garbage_collector"
+    mbean = "java.lang:name=*,type=GarbageCollector"
+    paths = ["CollectionTime", "CollectionCount"]
+    tag_keys = ["name"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name = "jvm_memory_pool"
+    mbean = "java.lang:name=*,type=MemoryPool"
+    paths = ["Usage", "PeakUsage", "CollectionUsage"]
+    tag_keys = ["name"]
+    tag_prefix = "pool_"
--- a/plugins/inputs/jolokia2/examples/jboss.conf
+++ b/plugins/inputs/jolokia2/examples/jboss.conf
@@ -0,0 +1,59 @@
+[[inputs.jolokia2_agent]]
+  urls = ["http://localhost:8080/jolokia"]
+  name_prefix = "jboss."
+
+  ### JVM Generic
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "OperatingSystem"
+    mbean = "java.lang:type=OperatingSystem"
+    paths = ["ProcessCpuLoad","SystemLoadAverage","SystemCpuLoad"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "jvm_runtime"
+    mbean = "java.lang:type=Runtime"
+    paths = ["Uptime"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "jvm_memory"
+    mbean = "java.lang:type=Memory"
+    paths = ["HeapMemoryUsage", "NonHeapMemoryUsage", "ObjectPendingFinalizationCount"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name     = "jvm_garbage_collector"
+    mbean    = "java.lang:name=*,type=GarbageCollector"
+    paths    = ["CollectionTime", "CollectionCount"]
+    tag_keys = ["name"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name       = "jvm_memory_pool"
+    mbean      = "java.lang:name=*,type=MemoryPool"
+    paths      = ["Usage", "PeakUsage", "CollectionUsage"]
+    tag_keys   = ["name"]
+    tag_prefix = "pool_"
+
+  ### JBOSS
+
+  [[inputs.jolokia2_agent.metric]]
+    name     = "connectors.http"
+    mbean    = "jboss.as:https-listener=*,server=*,subsystem=undertow"
+    paths    = ["bytesReceived","bytesSent","errorCount","requestCount"]
+    tag_keys = ["server","https-listener"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name     = "connectors.http"
+    mbean    = "jboss.as:http-listener=*,server=*,subsystem=undertow"
+    paths    = ["bytesReceived","bytesSent","errorCount","requestCount"]
+    tag_keys = ["server","http-listener"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name     = "datasource.jdbc"
+    mbean    = "jboss.as:data-source=*,statistics=jdbc,subsystem=datasources"
+    paths    = ["PreparedStatementCacheAccessCount","PreparedStatementCacheHitCount","PreparedStatementCacheMissCount"]
+    tag_keys = ["data-source"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name     = "datasource.pool"
+    mbean    = "jboss.as:data-source=*,statistics=pool,subsystem=datasources"
+    paths    = ["AvailableCount","ActiveCount","MaxUsedCount"]
+    tag_keys = ["data-source"]
--- a/plugins/inputs/jolokia2/examples/tomcat.conf
+++ b/plugins/inputs/jolokia2/examples/tomcat.conf
@@ -0,0 +1,65 @@
+[[inputs.jolokia2_agent]]
+  urls = ["http://localhost:8080/jolokia"]
+  name_prefix = "tomcat."
+
+  ### JVM Generic
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "OperatingSystem"
+    mbean = "java.lang:type=OperatingSystem"
+    paths = ["ProcessCpuLoad","SystemLoadAverage","SystemCpuLoad"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "jvm_runtime"
+    mbean = "java.lang:type=Runtime"
+    paths = ["Uptime"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "jvm_memory"
+    mbean = "java.lang:type=Memory"
+    paths = ["HeapMemoryUsage", "NonHeapMemoryUsage", "ObjectPendingFinalizationCount"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name     = "jvm_garbage_collector"
+    mbean    = "java.lang:name=*,type=GarbageCollector"
+    paths    = ["CollectionTime", "CollectionCount"]
+    tag_keys = ["name"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name       = "jvm_memory_pool"
+    mbean      = "java.lang:name=*,type=MemoryPool"
+    paths      = ["Usage", "PeakUsage", "CollectionUsage"]
+    tag_keys   = ["name"]
+    tag_prefix = "pool_"
+
+  ### TOMCAT
+
+  [[inputs.jolokia2_agent.metric]]
+    name     = "GlobalRequestProcessor"
+    mbean    = "Catalina:name=*,type=GlobalRequestProcessor"
+    paths    = ["requestCount","bytesReceived","bytesSent","processingTime","errorCount"]
+    tag_keys = ["name"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name     = "JspMonitor"
+    mbean    = "Catalina:J2EEApplication=*,J2EEServer=*,WebModule=*,name=jsp,type=JspMonitor"
+    paths    = ["jspReloadCount","jspCount","jspUnloadCount"]
+    tag_keys = ["J2EEApplication","J2EEServer","WebModule"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name     = "ThreadPool"
+    mbean    = "Catalina:name=*,type=ThreadPool"
+    paths    = ["maxThreads","currentThreadCount","currentThreadsBusy"]
+    tag_keys = ["name"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name     = "Servlet"
+    mbean    = "Catalina:J2EEApplication=*,J2EEServer=*,WebModule=*,j2eeType=Servlet,name=*"
+    paths    = ["processingTime","errorCount","requestCount"]
+    tag_keys = ["name","J2EEApplication","J2EEServer","WebModule"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name     = "Cache"
+    mbean    = "Catalina:context=*,host=*,name=Cache,type=WebResourceRoot"
+    paths    = ["hitCount","lookupCount"]
+    tag_keys = ["context","host"]
--- a/plugins/inputs/jolokia2/examples/weblogic.conf
+++ b/plugins/inputs/jolokia2/examples/weblogic.conf
@@ -0,0 +1,56 @@
+[[inputs.jolokia2_agent]]
+  urls = ["http://localhost:8080/jolokia"]
+  name_prefix = "weblogic."
+
+  ### JVM Generic
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "OperatingSystem"
+    mbean = "java.lang:type=OperatingSystem"
+    paths = ["ProcessCpuLoad","SystemLoadAverage","SystemCpuLoad"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "jvm_runtime"
+    mbean = "java.lang:type=Runtime"
+    paths = ["Uptime"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "jvm_memory"
+    mbean = "java.lang:type=Memory"
+    paths = ["HeapMemoryUsage", "NonHeapMemoryUsage", "ObjectPendingFinalizationCount"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name     = "jvm_garbage_collector"
+    mbean    = "java.lang:name=*,type=GarbageCollector"
+    paths    = ["CollectionTime", "CollectionCount"]
+    tag_keys = ["name"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name       = "jvm_memory_pool"
+    mbean      = "java.lang:name=*,type=MemoryPool"
+    paths      = ["Usage", "PeakUsage", "CollectionUsage"]
+    tag_keys   = ["name"]
+    tag_prefix = "pool_"
+
+  ### WLS
+
+  [[inputs.jolokia2_agent.metric]]
+    name       = "JTARuntime"
+    mbean      = "com.bea:Name=JTARuntime,ServerRuntime=*,Type=JTARuntime"
+    paths      = ["SecondsActiveTotalCount","TransactionRolledBackTotalCount","TransactionRolledBackSystemTotalCount","TransactionRolledBackAppTotalCount","TransactionRolledBackResourceTotalCount","TransactionHeuristicsTotalCount","TransactionAbandonedTotalCount","TransactionTotalCount","TransactionRolledBackTimeoutTotalCount","ActiveTransactionsTotalCount","TransactionCommittedTotalCount"]
+    tag_keys   = ["ServerRuntime"]
+    tag_prefix = "wls_"
+
+  [[inputs.jolokia2_agent.metric]]
+    name       = "ThreadPoolRuntime"
+    mbean      = "com.bea:Name=ThreadPoolRuntime,ServerRuntime=*,Type=ThreadPoolRuntime"
+    paths      = ["StuckThreadCount","CompletedRequestCount","ExecuteThreadTotalCount","ExecuteThreadIdleCount","StandbyThreadCount","Throughput","HoggingThreadCount","PendingUserRequestCount"]
+    tag_keys   = ["ServerRuntime"]
+    tag_prefix = "wls_"
+
+  [[inputs.jolokia2_agent.metric]]
+    name       = "JMSRuntime"
+    mbean      = "com.bea:Name=*.jms,ServerRuntime=*,Type=JMSRuntime"
+    paths      = ["ConnectionsCurrentCount","ConnectionsHighCount","ConnectionsTotalCount","JMSServersCurrentCount","JMSServersHighCount","JMSServersTotalCount"]
+    tag_keys   = ["name","ServerRuntime"]
+    tag_prefix = "wls_"
--- a/plugins/inputs/mysql/mysql_test.go
+++ b/plugins/inputs/mysql/mysql_test.go
@@ -49,7 +49,7 @@ func TestMysqlGetDSNTag(t *testing.T) {
 		},
 		{
 			"tcp(localhost)/",
-			"localhost",
+			"localhost:3306",
 		},
 		{
 			"root:passwd@tcp(192.168.1.1:3306)/?tls=false",
--- a/plugins/inputs/nats_consumer/nats_consumer.go
+++ b/plugins/inputs/nats_consumer/nats_consumer.go
@@ -8,7 +8,7 @@ import (
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"github.com/influxdata/telegraf/plugins/parsers"
-	"github.com/nats-io/nats"
+	nats "github.com/nats-io/go-nats"
 )

 type natsError struct {
--- a/plugins/inputs/nats_consumer/nats_consumer_test.go
+++ b/plugins/inputs/nats_consumer/nats_consumer_test.go
@@ -5,7 +5,7 @@ import (

 	"github.com/influxdata/telegraf/plugins/parsers"
 	"github.com/influxdata/telegraf/testutil"
-	"github.com/nats-io/nats"
+	nats "github.com/nats-io/go-nats"
 	"github.com/stretchr/testify/assert"
 )

--- a/plugins/inputs/nvidia_smi/README.md
+++ b/plugins/inputs/nvidia_smi/README.md
@@ -17,16 +17,17 @@ This plugin uses a query on the [`nvidia-smi`](https://developer.nvidia.com/nvid
 ### Metrics
 - measurement: `nvidia_smi`
  - tags
-    - `name` (type of GPU e.g. `GeForce GTX 170 Ti`)
+    - `name` (type of GPU e.g. `GeForce GTX 1070 Ti`)
    - `compute_mode` (The compute mode of the GPU e.g. `Default`)
    - `index` (The port index where the GPU is connected to the motherboard e.g. `1`)
    - `pstate` (Overclocking state for the GPU e.g. `P0`)
    - `uuid` (A unique identifier for the GPU e.g. `GPU-f9ba66fc-a7f5-94c5-da19-019ef2f9c665`)
  - fields
    - `fan_speed` (integer, percentage)
-    - `memory_free` (integer, KB)
-    - `memory_used` (integer, KB)
-    - `memory_total` (integer, KB)
+    - `memory_free` (integer, MiB)
+    - `memory_used` (integer, MiB)
+    - `memory_total` (integer, MiB)
+    - `power_draw` (float, W)
    - `temperature_gpu` (integer, degrees C)
    - `utilization_gpu` (integer, percentage)
    - `utilization_memory` (integer, percentage)
--- a/plugins/inputs/nvidia_smi/nvidia_smi.go
+++ b/plugins/inputs/nvidia_smi/nvidia_smi.go
@@ -16,20 +16,21 @@ import (

 var (
 	measurement = "nvidia_smi"
-	metrics     = "fan.speed,memory.total,memory.used,memory.free,pstate,temperature.gpu,name,uuid,compute_mode,utilization.gpu,utilization.memory,index"
+	metrics     = "fan.speed,memory.total,memory.used,memory.free,pstate,temperature.gpu,name,uuid,compute_mode,utilization.gpu,utilization.memory,index,power.draw"
 	metricNames = [][]string{
-		[]string{"fan_speed", "field"},
-		[]string{"memory_total", "field"},
-		[]string{"memory_used", "field"},
-		[]string{"memory_free", "field"},
+		[]string{"fan_speed", "integer"},
+		[]string{"memory_total", "integer"},
+		[]string{"memory_used", "integer"},
+		[]string{"memory_free", "integer"},
 		[]string{"pstate", "tag"},
-		[]string{"temperature_gpu", "field"},
+		[]string{"temperature_gpu", "integer"},
 		[]string{"name", "tag"},
 		[]string{"uuid", "tag"},
 		[]string{"compute_mode", "tag"},
-		[]string{"utilization_gpu", "field"},
-		[]string{"utilization_memory", "field"},
+		[]string{"utilization_gpu", "integer"},
+		[]string{"utilization_memory", "integer"},
 		[]string{"index", "tag"},
+		[]string{"power_draw", "float"},
 	}
 )

@@ -127,7 +128,7 @@ func parseLine(line string) (map[string]string, map[string]interface{}, error) {
 		for i, m := range metricNames {
 			col := strings.TrimSpace(met[i])

-			// First handle the tags
+			// Handle the tags
 			if m[1] == "tag" {
 				tags[m[0]] = col
 				continue
@@ -137,12 +138,23 @@ func parseLine(line string) (map[string]string, map[string]interface{}, error) {
 				continue
 			}

-			// Then parse the integers out of the fields
-			out, err := strconv.ParseInt(col, 10, 64)
-			if err != nil {
-				return tags, fields, err
+			// Parse the integers
+			if m[1] == "integer" {
+				out, err := strconv.ParseInt(col, 10, 64)
+				if err != nil {
+					return tags, fields, err
+				}
+				fields[m[0]] = out
+			}
+
+			// Parse the floats
+			if m[1] == "float" {
+				out, err := strconv.ParseFloat(col, 64)
+				if err != nil {
+					return tags, fields, err
+				}
+				fields[m[0]] = out
 			}
-			fields[m[0]] = out
 		}

 		// Return the tags and fields
--- a/plugins/inputs/nvidia_smi/nvidia_smi_test.go
+++ b/plugins/inputs/nvidia_smi/nvidia_smi_test.go
@@ -7,7 +7,7 @@ import (
 )

 func TestParseLineStandard(t *testing.T) {
-	line := "85, 8114, 553, 7561, P2, 61, GeForce GTX 1070 Ti, GPU-d1911b8a-f5c8-5e66-057c-486561269de8, Default, 100, 93, 1\n"
+	line := "85, 8114, 553, 7561, P2, 61, GeForce GTX 1070 Ti, GPU-d1911b8a-f5c8-5e66-057c-486561269de8, Default, 100, 93, 1, 0.0\n"
 	tags, fields, err := parseLine(line)
 	if err != nil {
 		t.Fail()
@@ -37,7 +37,7 @@ func TestParseLineBad(t *testing.T) {
 }

 func TestParseLineNotSupported(t *testing.T) {
-	line := "[Not Supported], 7606, 0, 7606, P0, 38, Tesla P4, GPU-xxx, Default, 0, 0, 0\n"
+	line := "[Not Supported], 7606, 0, 7606, P0, 38, Tesla P4, GPU-xxx, Default, 0, 0, 0, 0.0\n"
 	_, fields, err := parseLine(line)
 	require.NoError(t, err)
 	require.Equal(t, nil, fields["fan_speed"])
--- a/plugins/inputs/openldap/README.md
+++ b/plugins/inputs/openldap/README.md
@@ -14,7 +14,7 @@ To use this plugin you must enable the [monitoring](https://www.openldap.org/dev
  # ldaps, starttls, or no encryption. default is an empty string, disabling all encryption.
  # note that port will likely need to be changed to 636 for ldaps
  # valid options: "" | "starttls" | "ldaps"
-  ssl = ""
+  tls = ""

  # skip peer certificate verification. Default is false.
  insecure_skip_verify = false
--- a/plugins/inputs/openldap/openldap.go
+++ b/plugins/inputs/openldap/openldap.go
@@ -15,9 +15,11 @@ import (
 type Openldap struct {
 	Host               string
 	Port               int
-	Ssl                string
+	SSL                string `toml:"ssl"` // Deprecated in 1.7; use TLS
+	TLS                string `toml:"tls"`
 	InsecureSkipVerify bool
-	SslCa              string
+	SSLCA              string `toml:"ssl_ca"` // Deprecated in 1.7; use TLSCA
+	TLSCA              string `toml:"tls_ca"`
 	BindDn             string
 	BindPassword       string
 	ReverseMetricNames bool
@@ -30,7 +32,7 @@ const sampleConfig string = `
  # ldaps, starttls, or no encryption. default is an empty string, disabling all encryption.
  # note that port will likely need to be changed to 636 for ldaps
  # valid options: "" | "starttls" | "ldaps"
-  ssl = ""
+  tls = ""

  # skip peer certificate verification. Default is false.
  insecure_skip_verify = false
@@ -70,9 +72,11 @@ func NewOpenldap() *Openldap {
 	return &Openldap{
 		Host:               "localhost",
 		Port:               389,
-		Ssl:                "",
+		SSL:                "",
+		TLS:                "",
 		InsecureSkipVerify: false,
-		SslCa:              "",
+		SSLCA:              "",
+		TLSCA:              "",
 		BindDn:             "",
 		BindPassword:       "",
 		ReverseMetricNames: false,
@@ -81,12 +85,19 @@ func NewOpenldap() *Openldap {

 // gather metrics
 func (o *Openldap) Gather(acc telegraf.Accumulator) error {
+	if o.TLS == "" {
+		o.TLS = o.SSL
+	}
+	if o.TLSCA == "" {
+		o.TLSCA = o.SSLCA
+	}
+
 	var err error
 	var l *ldap.Conn
-	if o.Ssl != "" {
+	if o.TLS != "" {
 		// build tls config
 		clientTLSConfig := tls.ClientConfig{
-			SSLCA:              o.SslCa,
+			TLSCA:              o.TLSCA,
 			InsecureSkipVerify: o.InsecureSkipVerify,
 		}
 		tlsConfig, err := clientTLSConfig.TLSConfig()
@@ -94,13 +105,13 @@ func (o *Openldap) Gather(acc telegraf.Accumulator) error {
 			acc.AddError(err)
 			return nil
 		}
-		if o.Ssl == "ldaps" {
+		if o.TLS == "ldaps" {
 			l, err = ldap.DialTLS("tcp", fmt.Sprintf("%s:%d", o.Host, o.Port), tlsConfig)
 			if err != nil {
 				acc.AddError(err)
 				return nil
 			}
-		} else if o.Ssl == "starttls" {
+		} else if o.TLS == "starttls" {
 			l, err = ldap.Dial("tcp", fmt.Sprintf("%s:%d", o.Host, o.Port))
 			if err != nil {
 				acc.AddError(err)
@@ -108,7 +119,7 @@ func (o *Openldap) Gather(acc telegraf.Accumulator) error {
 			}
 			err = l.StartTLS(tlsConfig)
 		} else {
-			acc.AddError(fmt.Errorf("Invalid setting for ssl: %s", o.Ssl))
+			acc.AddError(fmt.Errorf("Invalid setting for ssl: %s", o.TLS))
 			return nil
 		}
 	} else {
--- a/plugins/inputs/openldap/openldap_test.go
+++ b/plugins/inputs/openldap/openldap_test.go
@@ -1,10 +1,11 @@
 package openldap

 import (
-	"gopkg.in/ldap.v2"
 	"strconv"
 	"testing"

+	"gopkg.in/ldap.v2"
+
 	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -74,7 +75,7 @@ func TestOpenldapStartTLS(t *testing.T) {
 	o := &Openldap{
 		Host:               testutil.GetLocalHost(),
 		Port:               389,
-		Ssl:                "starttls",
+		SSL:                "starttls",
 		InsecureSkipVerify: true,
 	}

@@ -92,7 +93,7 @@ func TestOpenldapLDAPS(t *testing.T) {
 	o := &Openldap{
 		Host:               testutil.GetLocalHost(),
 		Port:               636,
-		Ssl:                "ldaps",
+		SSL:                "ldaps",
 		InsecureSkipVerify: true,
 	}

@@ -110,7 +111,7 @@ func TestOpenldapInvalidSSL(t *testing.T) {
 	o := &Openldap{
 		Host:               testutil.GetLocalHost(),
 		Port:               636,
-		Ssl:                "invalid",
+		SSL:                "invalid",
 		InsecureSkipVerify: true,
 	}

@@ -129,7 +130,7 @@ func TestOpenldapBind(t *testing.T) {
 	o := &Openldap{
 		Host:               testutil.GetLocalHost(),
 		Port:               389,
-		Ssl:                "",
+		SSL:                "",
 		InsecureSkipVerify: true,
 		BindDn:             "cn=manager,cn=config",
 		BindPassword:       "secret",
@@ -157,7 +158,7 @@ func TestOpenldapReverseMetrics(t *testing.T) {
 	o := &Openldap{
 		Host:               testutil.GetLocalHost(),
 		Port:               389,
-		Ssl:                "",
+		SSL:                "",
 		InsecureSkipVerify: true,
 		BindDn:             "cn=manager,cn=config",
 		BindPassword:       "secret",
--- a/plugins/inputs/pf/README.md
+++ b/plugins/inputs/pf/README.md
@@ -31,6 +31,21 @@ telegraf ALL=(root) NOPASSWD: /sbin/pfctl -s info
    - searches (integer, count)
    - inserts (integer, count)
    - removals (integer, count)
+    - match (integer, count)
+    - bad-offset (integer, count)
+    - fragment (integer, count)
+    - short (integer, count)
+    - normalize (integer, count)
+    - memory (integer, count)
+    - bad-timestamp (integer, count)
+    - congestion (integer, count)
+    - ip-option (integer, count)
+    - proto-cksum (integer, count)
+    - state-mismatch (integer, count)
+    - state-insert (integer, count)
+    - state-limit (integer, count)
+    - src-limit (integer, count)
+    - synproxy (integer, count)

 ### Example Output:

--- a/plugins/inputs/pf/pf.go
+++ b/plugins/inputs/pf/pf.go
@@ -67,7 +67,7 @@ func errMissingData(tag string) error {

 type pfctlOutputStanza struct {
 	HeaderRE  *regexp.Regexp
-	ParseFunc func([]string, telegraf.Accumulator) error
+	ParseFunc func([]string, map[string]interface{}) error
 	Found     bool
 }

@@ -76,11 +76,16 @@ var pfctlOutputStanzas = []*pfctlOutputStanza{
 		HeaderRE:  regexp.MustCompile("^State Table"),
 		ParseFunc: parseStateTable,
 	},
+	&pfctlOutputStanza{
+		HeaderRE:  regexp.MustCompile("^Counters"),
+		ParseFunc: parseCounterTable,
+	},
 }

 var anyTableHeaderRE = regexp.MustCompile("^[A-Z]")

 func (pf *PF) parsePfctlOutput(pfoutput string, acc telegraf.Accumulator) error {
+	fields := make(map[string]interface{})
 	scanner := bufio.NewScanner(strings.NewReader(pfoutput))
 	for scanner.Scan() {
 		line := scanner.Text()
@@ -91,10 +96,14 @@ func (pf *PF) parsePfctlOutput(pfoutput string, acc telegraf.Accumulator) error
 				line = scanner.Text()
 				for !anyTableHeaderRE.MatchString(line) {
 					stanzaLines = append(stanzaLines, line)
-					scanner.Scan()
-					line = scanner.Text()
+					more := scanner.Scan()
+					if more {
+						line = scanner.Text()
+					} else {
+						break
+					}
 				}
-				if perr := s.ParseFunc(stanzaLines, acc); perr != nil {
+				if perr := s.ParseFunc(stanzaLines, fields); perr != nil {
 					return perr
 				}
 				s.Found = true
@@ -106,6 +115,8 @@ func (pf *PF) parsePfctlOutput(pfoutput string, acc telegraf.Accumulator) error
 			return errParseHeader
 		}
 	}
+
+	acc.AddFields(measurement, fields, make(map[string]string))
 	return nil
 }

@@ -124,11 +135,40 @@ var StateTable = []*Entry{

 var stateTableRE = regexp.MustCompile(`^  (.*?)\s+(\d+)`)

-func parseStateTable(lines []string, acc telegraf.Accumulator) error {
+func parseStateTable(lines []string, fields map[string]interface{}) error {
+	return storeFieldValues(lines, stateTableRE, fields, StateTable)
+}
+
+var CounterTable = []*Entry{
+	&Entry{"match", "match", -1},
+	&Entry{"bad-offset", "bad-offset", -1},
+	&Entry{"fragment", "fragment", -1},
+	&Entry{"short", "short", -1},
+	&Entry{"normalize", "normalize", -1},
+	&Entry{"memory", "memory", -1},
+	&Entry{"bad-timestamp", "bad-timestamp", -1},
+	&Entry{"congestion", "congestion", -1},
+	&Entry{"ip-option", "ip-option", -1},
+	&Entry{"proto-cksum", "proto-cksum", -1},
+	&Entry{"state-mismatch", "state-mismatch", -1},
+	&Entry{"state-insert", "state-insert", -1},
+	&Entry{"state-limit", "state-limit", -1},
+	&Entry{"src-limit", "src-limit", -1},
+	&Entry{"synproxy", "synproxy", -1},
+}
+
+var counterTableRE = regexp.MustCompile(`^  (.*?)\s+(\d+)`)
+
+func parseCounterTable(lines []string, fields map[string]interface{}) error {
+	return storeFieldValues(lines, counterTableRE, fields, CounterTable)
+}
+
+func storeFieldValues(lines []string, regex *regexp.Regexp, fields map[string]interface{}, entryTable []*Entry) error {
+
 	for _, v := range lines {
-		entries := stateTableRE.FindStringSubmatch(v)
+		entries := regex.FindStringSubmatch(v)
 		if entries != nil {
-			for _, f := range StateTable {
+			for _, f := range entryTable {
 				if f.PfctlTitle == entries[1] {
 					var err error
 					if f.Value, err = strconv.ParseInt(entries[2], 10, 64); err != nil {
@@ -139,15 +179,13 @@ func parseStateTable(lines []string, acc telegraf.Accumulator) error {
 		}
 	}

-	fields := make(map[string]interface{})
-	for _, v := range StateTable {
+	for _, v := range entryTable {
 		if v.Value == -1 {
 			return errMissingData(v.PfctlTitle)
 		}
 		fields[v.Field] = v.Value
 	}

-	acc.AddFields(measurement, fields, make(map[string]string))
 	return nil
 }

--- a/plugins/inputs/pf/pf_test.go
+++ b/plugins/inputs/pf/pf_test.go
@@ -152,10 +152,25 @@ Counters
 			measurements: []measurementResult{
 				measurementResult{
 					fields: map[string]interface{}{
-						"entries":  int64(2),
-						"searches": int64(11325),
-						"inserts":  int64(5),
-						"removals": int64(3)},
+						"entries":        int64(2),
+						"searches":       int64(11325),
+						"inserts":        int64(5),
+						"removals":       int64(3),
+						"match":          int64(11226),
+						"bad-offset":     int64(0),
+						"fragment":       int64(0),
+						"short":          int64(0),
+						"normalize":      int64(0),
+						"memory":         int64(0),
+						"bad-timestamp":  int64(0),
+						"congestion":     int64(0),
+						"ip-option":      int64(0),
+						"proto-cksum":    int64(0),
+						"state-mismatch": int64(0),
+						"state-insert":   int64(0),
+						"state-limit":    int64(0),
+						"src-limit":      int64(0),
+						"synproxy":       int64(0)},
 					tags: map[string]string{},
 				},
 			},
@@ -197,10 +212,25 @@ Counters
 			measurements: []measurementResult{
 				measurementResult{
 					fields: map[string]interface{}{
-						"entries":  int64(649),
-						"searches": int64(18421725761),
-						"inserts":  int64(156762508),
-						"removals": int64(156761859)},
+						"entries":        int64(649),
+						"searches":       int64(18421725761),
+						"inserts":        int64(156762508),
+						"removals":       int64(156761859),
+						"match":          int64(473002784),
+						"bad-offset":     int64(0),
+						"fragment":       int64(2729),
+						"short":          int64(107),
+						"normalize":      int64(1685),
+						"memory":         int64(101),
+						"bad-timestamp":  int64(0),
+						"congestion":     int64(0),
+						"ip-option":      int64(152301),
+						"proto-cksum":    int64(108),
+						"state-mismatch": int64(24393),
+						"state-insert":   int64(92),
+						"state-limit":    int64(0),
+						"src-limit":      int64(0),
+						"synproxy":       int64(0)},
 					tags: map[string]string{},
 				},
 			},
--- a/plugins/inputs/ping/ping.go
+++ b/plugins/inputs/ping/ping.go
@@ -175,7 +175,7 @@ func (p *Ping) args(url string) []string {
 	}
 	if p.Timeout > 0 {
 		switch runtime.GOOS {
-		case "darwin":
+		case "darwin", "freebsd", "netbsd", "openbsd":
 			args = append(args, "-W", strconv.FormatFloat(p.Timeout*1000, 'f', -1, 64))
 		case "linux":
 			args = append(args, "-W", strconv.FormatFloat(p.Timeout, 'f', -1, 64))
@@ -186,7 +186,7 @@ func (p *Ping) args(url string) []string {
 	}
 	if p.Deadline > 0 {
 		switch runtime.GOOS {
-		case "darwin":
+		case "darwin", "freebsd", "netbsd", "openbsd":
 			args = append(args, "-t", strconv.Itoa(p.Deadline))
 		case "linux":
 			args = append(args, "-w", strconv.Itoa(p.Deadline))
@@ -197,10 +197,10 @@ func (p *Ping) args(url string) []string {
 	}
 	if p.Interface != "" {
 		switch runtime.GOOS {
+		case "darwin", "freebsd", "netbsd", "openbsd":
+			args = append(args, "-S", p.Interface)
 		case "linux":
 			args = append(args, "-I", p.Interface)
-		case "freebsd", "darwin":
-			args = append(args, "-S", p.Interface)
 		default:
 			// Not sure the best option here, just assume GNU ping?
 			args = append(args, "-I", p.Interface)
--- a/plugins/inputs/procstat/README.md
+++ b/plugins/inputs/procstat/README.md
@@ -1,6 +1,8 @@
 # Procstat Input Plugin

 The procstat plugin can be used to monitor the system resource usage of one or more processes.
+The procstat_lookup metric displays the query information, 
+specifically the number of PIDs returned on a search

 Processes can be selected for monitoring using one of several methods:
 - pidfile
--- a/plugins/inputs/procstat/pgrep.go
+++ b/plugins/inputs/procstat/pgrep.go
@@ -6,6 +6,8 @@ import (
 	"os/exec"
 	"strconv"
 	"strings"
+
+	"github.com/influxdata/telegraf/internal"
 )

 // Implemention of PIDGatherer that execs pgrep to find processes
@@ -62,6 +64,12 @@ func find(path string, args []string) ([]PID, error) {

 func run(path string, args []string) (string, error) {
 	out, err := exec.Command(path, args...).Output()
+
+	//if exit code 1, ie no processes found, do not return error
+	if i, _ := internal.ExitStatus(err); i == 1 {
+		return "", nil
+	}
+
 	if err != nil {
 		return "", fmt.Errorf("Error running %s: %s", path, err)
 	}
--- a/plugins/inputs/procstat/procstat.go
+++ b/plugins/inputs/procstat/procstat.go
@@ -97,7 +97,7 @@ func (p *Procstat) Gather(acc telegraf.Accumulator) error {
 		p.createProcess = defaultProcess
 	}

-	procs, err := p.updateProcesses(p.procs)
+	procs, err := p.updateProcesses(acc, p.procs)
 	if err != nil {
 		acc.AddError(fmt.Errorf("E! Error: procstat getting process, exe: [%s] pidfile: [%s] pattern: [%s] user: [%s] %s",
 			p.Exe, p.PidFile, p.Pattern, p.User, err.Error()))
@@ -230,8 +230,8 @@ func (p *Procstat) addMetrics(proc Process, acc telegraf.Accumulator) {
 }

 // Update monitored Processes
-func (p *Procstat) updateProcesses(prevInfo map[PID]Process) (map[PID]Process, error) {
-	pids, tags, err := p.findPids()
+func (p *Procstat) updateProcesses(acc telegraf.Accumulator, prevInfo map[PID]Process) (map[PID]Process, error) {
+	pids, tags, err := p.findPids(acc)
 	if err != nil {
 		return nil, err
 	}
@@ -281,9 +281,9 @@ func (p *Procstat) getPIDFinder() (PIDFinder, error) {
 }

 // Get matching PIDs and their initial tags
-func (p *Procstat) findPids() ([]PID, map[string]string, error) {
+func (p *Procstat) findPids(acc telegraf.Accumulator) ([]PID, map[string]string, error) {
 	var pids []PID
-	var tags map[string]string
+	tags := make(map[string]string)
 	var err error

 	f, err := p.getPIDFinder()
@@ -313,7 +313,18 @@ func (p *Procstat) findPids() ([]PID, map[string]string, error) {
 		err = fmt.Errorf("Either exe, pid_file, user, pattern, systemd_unit, or cgroup must be specified")
 	}

-	return pids, tags, err
+	rTags := make(map[string]string)
+	for k, v := range tags {
+		rTags[k] = v
+	}
+
+	//adds a metric with info on the pgrep query
+	fields := make(map[string]interface{})
+	tags["pid_finder"] = p.PidFinder
+	fields["pid_count"] = len(pids)
+	acc.AddFields("procstat_lookup", fields, tags)
+
+	return pids, rTags, err
 }

 // execCommand is so tests can mock out exec.Command usage.
--- a/plugins/inputs/procstat/procstat_test.go
+++ b/plugins/inputs/procstat/procstat_test.go
@@ -343,7 +343,8 @@ func TestGather_systemdUnitPIDs(t *testing.T) {
 		createPIDFinder: pidFinder([]PID{}, nil),
 		SystemdUnit:     "TestGather_systemdUnitPIDs",
 	}
-	pids, tags, err := p.findPids()
+	var acc testutil.Accumulator
+	pids, tags, err := p.findPids(&acc)
 	require.NoError(t, err)
 	assert.Equal(t, []PID{11408}, pids)
 	assert.Equal(t, "TestGather_systemdUnitPIDs", tags["systemd_unit"])
@@ -364,8 +365,20 @@ func TestGather_cgroupPIDs(t *testing.T) {
 		createPIDFinder: pidFinder([]PID{}, nil),
 		CGroup:          td,
 	}
-	pids, tags, err := p.findPids()
+	var acc testutil.Accumulator
+	pids, tags, err := p.findPids(&acc)
 	require.NoError(t, err)
 	assert.Equal(t, []PID{1234, 5678}, pids)
 	assert.Equal(t, td, tags["cgroup"])
 }
+
+func TestProcstatLookupMetric(t *testing.T) {
+	p := Procstat{
+		createPIDFinder: pidFinder([]PID{543}, nil),
+		Exe:             "-Gsys",
+	}
+	var acc testutil.Accumulator
+	err := acc.GatherError(p.Gather)
+	require.NoError(t, err)
+	require.Equal(t, len(p.procs)+1, len(acc.Metrics))
+}
--- a/plugins/inputs/reader/reader.go
+++ b/plugins/inputs/reader/reader.go
@@ -0,0 +1,117 @@
+package reader
+
+import (
+	"io/ioutil"
+	"log"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal/globpath"
+	"github.com/influxdata/telegraf/plugins/parsers"
+)
+
+type Reader struct {
+	Filepaths     []string `toml:"files"`
+	FromBeginning bool
+	DataFormat    string `toml:"data_format"`
+	ParserConfig  parsers.Config
+	Parser        parsers.Parser
+	Tags          []string
+
+	Filenames []string
+
+	//for grok parser
+	Patterns           []string
+	namedPatterns      []string
+	CustomPatterns     string
+	CustomPatternFiles []string
+}
+
+const sampleConfig = `## Files to parse.
+## These accept standard unix glob matching rules, but with the addition of
+## ** as a "super asterisk". ie:
+##   /var/log/**.log     -> recursively find all .log files in /var/log
+##   /var/log/*/*.log    -> find all .log files with a parent dir in /var/log
+##   /var/log/apache.log -> only tail the apache log file
+files = ["/var/log/apache/access.log"]
+
+## The dataformat to be read from files
+## Each data format has its own unique set of configuration options, read
+## more about them here:
+## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
+data_format = ""`
+
+// SampleConfig returns the default configuration of the Input
+func (r *Reader) SampleConfig() string {
+	return sampleConfig
+}
+
+func (r *Reader) Description() string {
+	return "reload and gather from file[s] on telegraf's interval"
+}
+
+func (r *Reader) Gather(acc telegraf.Accumulator) error {
+	r.refreshFilePaths()
+	for _, k := range r.Filenames {
+		metrics, err := r.readMetric(k)
+		if err != nil {
+			return err
+		}
+
+		for _, m := range metrics {
+			acc.AddFields(m.Name(), m.Fields(), m.Tags())
+		}
+	}
+	return nil
+}
+
+func (r *Reader) compileParser() {
+	if r.DataFormat == "" {
+		log.Printf("E! No data_format specified")
+		return
+	}
+	r.ParserConfig = parsers.Config{
+		DataFormat: r.DataFormat,
+		TagKeys:    r.Tags,
+
+		//grok settings
+		Patterns:           r.Patterns,
+		NamedPatterns:      r.namedPatterns,
+		CustomPatterns:     r.CustomPatterns,
+		CustomPatternFiles: r.CustomPatternFiles,
+	}
+	nParser, err := parsers.NewParser(&r.ParserConfig)
+	if err != nil {
+		log.Printf("E! Error building parser: %v", err)
+	}
+
+	r.Parser = nParser
+}
+
+func (r *Reader) refreshFilePaths() {
+	var allFiles []string
+	for _, filepath := range r.Filepaths {
+		g, err := globpath.Compile(filepath)
+		if err != nil {
+			log.Printf("E! Error Glob %s failed to compile, %s", filepath, err)
+			continue
+		}
+		files := g.Match()
+
+		for k := range files {
+			allFiles = append(allFiles, k)
+		}
+	}
+
+	r.Filenames = allFiles
+}
+
+//requires that Parser has been compiled
+func (r *Reader) readMetric(filename string) ([]telegraf.Metric, error) {
+	fileContents, err := ioutil.ReadFile(filename)
+	if err != nil {
+		log.Printf("E! File could not be opened: %v", filename)
+	}
+
+	return r.Parser.Parse(fileContents)
+
+}
--- a/plugins/inputs/reader/reader_test.go
+++ b/plugins/inputs/reader/reader_test.go
@@ -0,0 +1,58 @@
+package reader
+
+import (
+	"log"
+	"runtime"
+	"strings"
+	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestRefreshFilePaths(t *testing.T) {
+	testDir := getPluginDir()
+	r := Reader{
+		Filepaths: []string{testDir + "/logparser/grok/testdata/**.log"},
+	}
+
+	r.refreshFilePaths()
+	//log.Printf("filenames: %v", filenames)
+	assert.Equal(t, len(r.Filenames), 2)
+}
+func TestJSONParserCompile(t *testing.T) {
+	testDir := getPluginDir()
+	var acc testutil.Accumulator
+	r := Reader{
+		Filepaths:  []string{testDir + "/reader/testfiles/json_a.log"},
+		DataFormat: "json",
+		Tags:       []string{"parent_ignored_child"},
+	}
+	r.compileParser()
+	r.Gather(&acc)
+	log.Printf("acc: %v", acc.Metrics[0].Tags)
+	assert.Equal(t, map[string]string{"parent_ignored_child": "hi"}, acc.Metrics[0].Tags)
+	assert.Equal(t, 5, len(acc.Metrics[0].Fields))
+}
+
+func TestGrokParser(t *testing.T) {
+	testDir := getPluginDir()
+	var acc testutil.Accumulator
+	r := Reader{
+		Filepaths:  []string{testDir + "/reader/testfiles/grok_a.log"},
+		DataFormat: "grok",
+		Patterns:   []string{"%{COMMON_LOG_FORMAT}"},
+	}
+
+	r.compileParser()
+	err := r.Gather(&acc)
+	log.Printf("err: %v", err)
+	log.Printf("metric[0]_tags: %v, metric[0]_fields: %v", acc.Metrics[0].Tags, acc.Metrics[0].Fields)
+	log.Printf("metric[1]_tags: %v, metric[1]_fields: %v", acc.Metrics[1].Tags, acc.Metrics[1].Fields)
+	assert.Equal(t, 2, len(acc.Metrics))
+}
+
+func getPluginDir() string {
+	_, filename, _, _ := runtime.Caller(1)
+	return strings.Replace(filename, "/reader/reader_test.go", "", 1)
+}
--- a/plugins/inputs/reader/testfiles/grok_a.log
+++ b/plugins/inputs/reader/testfiles/grok_a.log
@@ -0,0 +1,2 @@
+127.0.0.1 user-identifier frank [10/Oct/2000:13:55:36 -0700] "GET /apache_pb.gif HTTP/1.0" 200 2326
+128.0.0.1 user-identifier tony [10/Oct/2000:13:55:36 -0800] "GET /apache_pb.gif HTTP/1.0" 300 45
--- a/plugins/inputs/reader/testfiles/json_a.log
+++ b/plugins/inputs/reader/testfiles/json_a.log
@@ -0,0 +1,14 @@
+{
+		"parent": {
+			"child": 3.0,
+			"ignored_child": "hi"
+		},
+		"ignored_null": null,
+		"integer": 4,
+		"list": [3, 4],
+		"ignored_parent": {
+			"another_ignored_null": null,
+			"ignored_string": "hello, world!"
+		},
+		"another_list": [4]
+	}
--- a/plugins/inputs/redis/README.md
+++ b/plugins/inputs/redis/README.md
@@ -14,6 +14,13 @@
  ## If no servers are specified, then localhost is used as the host.
  ## If no port is specified, 6379 is used
  servers = ["tcp://localhost:6379"]
+
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
+  # insecure_skip_verify = true
 ```

 ### Measurements & Fields:
--- a/plugins/inputs/redis/redis.go
+++ b/plugins/inputs/redis/redis.go
@@ -13,11 +13,13 @@ import (

 	"github.com/go-redis/redis"
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )

 type Redis struct {
 	Servers []string
+	tls.ClientConfig

 	clients     []Client
 	initialized bool
@@ -56,6 +58,13 @@ var sampleConfig = `
  ## If no servers are specified, then localhost is used as the host.
  ## If no port is specified, 6379 is used
  servers = ["tcp://localhost:6379"]
+
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
+  # insecure_skip_verify = true
 `

 func (r *Redis) SampleConfig() string {
@@ -109,12 +118,18 @@ func (r *Redis) init(acc telegraf.Accumulator) error {
 			address = u.Host
 		}

+		tlsConfig, err := r.ClientConfig.TLSConfig()
+		if err != nil {
+			return err
+		}
+
 		client := redis.NewClient(
 			&redis.Options{
-				Addr:     address,
-				Password: password,
-				Network:  u.Scheme,
-				PoolSize: 1,
+				Addr:      address,
+				Password:  password,
+				Network:   u.Scheme,
+				PoolSize:  1,
+				TLSConfig: tlsConfig,
 			},
 		)

--- a/plugins/inputs/snmp/snmp.go
+++ b/plugins/inputs/snmp/snmp.go
@@ -218,10 +218,20 @@ func (t *Table) initBuild() error {
 	if err != nil {
 		return err
 	}
+
 	if t.Name == "" {
 		t.Name = oidText
 	}
-	t.Fields = append(t.Fields, fields...)
+
+	knownOIDs := map[string]bool{}
+	for _, f := range t.Fields {
+		knownOIDs[f.Oid] = true
+	}
+	for _, f := range fields {
+		if !knownOIDs[f.Oid] {
+			t.Fields = append(t.Fields, f)
+		}
+	}

 	return nil
 }
--- a/plugins/inputs/snmp/snmp_mocks_generate.go
+++ b/plugins/inputs/snmp/snmp_mocks_generate.go
@@ -21,7 +21,7 @@ var mockedCommands = [][]string{
 	{"snmptranslate", "-Td", "-Ob", "-m", "all", "1.0.0.1.1"},
 	{"snmptranslate", "-Td", "-Ob", "-m", "all", ".1.0.0.0.1.1"},
 	{"snmptranslate", "-Td", "-Ob", "-m", "all", ".1.0.0.0.1.1.0"},
-	{"snmptranslate", "-Td", "-Ob", "-m", "all", ".1.0.0.0.1.4"},
+	{"snmptranslate", "-Td", "-Ob", "-m", "all", ".1.0.0.0.1.5"},
 	{"snmptranslate", "-Td", "-Ob", "-m", "all", ".1.2.3"},
 	{"snmptranslate", "-Td", "-Ob", ".iso.2.3"},
 	{"snmptranslate", "-Td", "-Ob", "-m", "all", ".999"},
@@ -30,6 +30,7 @@ var mockedCommands = [][]string{
 	{"snmptranslate", "-Td", "-Ob", "TEST::testTable"},
 	{"snmptranslate", "-Td", "-Ob", "TEST::connections"},
 	{"snmptranslate", "-Td", "-Ob", "TEST::latency"},
+	{"snmptranslate", "-Td", "-Ob", "TEST::description"},
 	{"snmptranslate", "-Td", "-Ob", "TEST::hostname"},
 	{"snmptranslate", "-Td", "-Ob", "IF-MIB::ifPhysAddress.1"},
 	{"snmptranslate", "-Td", "-Ob", "BRIDGE-MIB::dot1dTpFdbAddress.1"},
--- a/plugins/inputs/snmp/snmp_mocks_test.go
+++ b/plugins/inputs/snmp/snmp_mocks_test.go
@@ -67,7 +67,7 @@ var mockedCommandResults = map[string]mockedCommandResult{
 	"snmptranslate\x00-Td\x00-Ob\x00-m\x00all\x001.0.0.1.1":                   mockedCommandResult{stdout: "TEST::hostname\nhostname OBJECT-TYPE\n  -- FROM\tTEST\n  SYNTAX\tOCTET STRING\n  MAX-ACCESS\tread-only\n  STATUS\tcurrent\n::= { iso(1) 0 testOID(0) 1 1 }\n", stderr: "", exitError: false},
 	"snmptranslate\x00-Td\x00-Ob\x00-m\x00all\x00.1.0.0.0.1.1":                mockedCommandResult{stdout: "TEST::server\nserver OBJECT-TYPE\n  -- FROM\tTEST\n  SYNTAX\tOCTET STRING\n  MAX-ACCESS\tread-only\n  STATUS\tcurrent\n::= { iso(1) 0 testOID(0) testTable(0) testTableEntry(1) 1 }\n", stderr: "", exitError: false},
 	"snmptranslate\x00-Td\x00-Ob\x00-m\x00all\x00.1.0.0.0.1.1.0":              mockedCommandResult{stdout: "TEST::server.0\nserver OBJECT-TYPE\n  -- FROM\tTEST\n  SYNTAX\tOCTET STRING\n  MAX-ACCESS\tread-only\n  STATUS\tcurrent\n::= { iso(1) 0 testOID(0) testTable(0) testTableEntry(1) server(1) 0 }\n", stderr: "", exitError: false},
-	"snmptranslate\x00-Td\x00-Ob\x00-m\x00all\x00.1.0.0.0.1.4":                mockedCommandResult{stdout: "TEST::testTableEntry.4\ntestTableEntry OBJECT-TYPE\n  -- FROM\tTEST\n  MAX-ACCESS\tnot-accessible\n  STATUS\tcurrent\n  INDEX\t\t{ server }\n::= { iso(1) 0 testOID(0) testTable(0) testTableEntry(1) 4 }\n", stderr: "", exitError: false},
+	"snmptranslate\x00-Td\x00-Ob\x00-m\x00all\x00.1.0.0.0.1.5":                mockedCommandResult{stdout: "TEST::testTableEntry.5\ntestTableEntry OBJECT-TYPE\n  -- FROM\tTEST\n  MAX-ACCESS\tnot-accessible\n  STATUS\tcurrent\n  INDEX\t\t{ server }\n::= { iso(1) 0 testOID(0) testTable(0) testTableEntry(1) 5 }\n", stderr: "", exitError: false},
 	"snmptranslate\x00-Td\x00-Ob\x00-m\x00all\x00.1.2.3":                      mockedCommandResult{stdout: "iso.2.3\niso OBJECT-TYPE\n  -- FROM\t#-1\n::= { iso(1) 2 3 }\n", stderr: "", exitError: false},
 	"snmptranslate\x00-Td\x00-Ob\x00.iso.2.3":                                 mockedCommandResult{stdout: "iso.2.3\niso OBJECT-TYPE\n  -- FROM\t#-1\n::= { iso(1) 2 3 }\n", stderr: "", exitError: false},
 	"snmptranslate\x00-Td\x00-Ob\x00-m\x00all\x00.999":                        mockedCommandResult{stdout: ".999\n [TRUNCATED]\n", stderr: "", exitError: false},
@@ -76,10 +76,11 @@ var mockedCommandResults = map[string]mockedCommandResult{
 	"snmptranslate\x00-Td\x00-Ob\x00TEST::testTable":                          mockedCommandResult{stdout: "TEST::testTable\ntestTable OBJECT-TYPE\n  -- FROM\tTEST\n  MAX-ACCESS\tnot-accessible\n  STATUS\tcurrent\n::= { iso(1) 0 testOID(0) 0 }\n", stderr: "", exitError: false},
 	"snmptranslate\x00-Td\x00-Ob\x00TEST::connections":                        mockedCommandResult{stdout: "TEST::connections\nconnections OBJECT-TYPE\n  -- FROM\tTEST\n  SYNTAX\tINTEGER\n  MAX-ACCESS\tread-only\n  STATUS\tcurrent\n::= { iso(1) 0 testOID(0) testTable(0) testTableEntry(1) 2 }\n", stderr: "", exitError: false},
 	"snmptranslate\x00-Td\x00-Ob\x00TEST::latency":                            mockedCommandResult{stdout: "TEST::latency\nlatency OBJECT-TYPE\n  -- FROM\tTEST\n  SYNTAX\tOCTET STRING\n  MAX-ACCESS\tread-only\n  STATUS\tcurrent\n::= { iso(1) 0 testOID(0) testTable(0) testTableEntry(1) 3 }\n", stderr: "", exitError: false},
+	"snmptranslate\x00-Td\x00-Ob\x00TEST::description":                        mockedCommandResult{stdout: "TEST::description\ndescription OBJECT-TYPE\n  -- FROM\tTEST\n  SYNTAX\tOCTET STRING\n  MAX-ACCESS\tread-only\n  STATUS\tcurrent\n::= { iso(1) 0 testOID(0) testTable(0) testTableEntry(1) 4 }\n", stderr: "", exitError: false},
 	"snmptranslate\x00-Td\x00-Ob\x00TEST::hostname":                           mockedCommandResult{stdout: "TEST::hostname\nhostname OBJECT-TYPE\n  -- FROM\tTEST\n  SYNTAX\tOCTET STRING\n  MAX-ACCESS\tread-only\n  STATUS\tcurrent\n::= { iso(1) 0 testOID(0) 1 1 }\n", stderr: "", exitError: false},
 	"snmptranslate\x00-Td\x00-Ob\x00IF-MIB::ifPhysAddress.1":                  mockedCommandResult{stdout: "IF-MIB::ifPhysAddress.1\nifPhysAddress OBJECT-TYPE\n  -- FROM\tIF-MIB\n  -- TEXTUAL CONVENTION PhysAddress\n  SYNTAX\tOCTET STRING\n  DISPLAY-HINT\t\"1x:\"\n  MAX-ACCESS\tread-only\n  STATUS\tcurrent\n  DESCRIPTION\t\"The interface's address at its protocol sub-layer.  For\n            example, for an 802.x interface, this object normally\n            contains a MAC address.  The interface's media-specific MIB\n            must define the bit and byte ordering and the format of the\n            value of this object.  For interfaces which do not have such\n            an address (e.g., a serial line), this object should contain\n            an octet string of zero length.\"\n::= { iso(1) org(3) dod(6) internet(1) mgmt(2) mib-2(1) interfaces(2) ifTable(2) ifEntry(1) ifPhysAddress(6) 1 }\n", stderr: "", exitError: false},
 	"snmptranslate\x00-Td\x00-Ob\x00BRIDGE-MIB::dot1dTpFdbAddress.1":          mockedCommandResult{stdout: "BRIDGE-MIB::dot1dTpFdbAddress.1\ndot1dTpFdbAddress OBJECT-TYPE\n  -- FROM\tBRIDGE-MIB\n  -- TEXTUAL CONVENTION MacAddress\n  SYNTAX\tOCTET STRING (6) \n  DISPLAY-HINT\t\"1x:\"\n  MAX-ACCESS\tread-only\n  STATUS\tcurrent\n  DESCRIPTION\t\"A unicast MAC address for which the bridge has\n        forwarding and/or filtering information.\"\n::= { iso(1) org(3) dod(6) internet(1) mgmt(2) mib-2(1) dot1dBridge(17) dot1dTp(4) dot1dTpFdbTable(3) dot1dTpFdbEntry(1) dot1dTpFdbAddress(1) 1 }\n", stderr: "", exitError: false},
 	"snmptranslate\x00-Td\x00-Ob\x00TCP-MIB::tcpConnectionLocalAddress.1":     mockedCommandResult{stdout: "TCP-MIB::tcpConnectionLocalAddress.1\ntcpConnectionLocalAddress OBJECT-TYPE\n  -- FROM\tTCP-MIB\n  -- TEXTUAL CONVENTION InetAddress\n  SYNTAX\tOCTET STRING (0..255) \n  MAX-ACCESS\tnot-accessible\n  STATUS\tcurrent\n  DESCRIPTION\t\"The local IP address for this TCP connection.  The type\n            of this address is determined by the value of\n            tcpConnectionLocalAddressType.\n\n            As this object is used in the index for the\n            tcpConnectionTable, implementors should be\n            careful not to create entries that would result in OIDs\n            with more than 128 subidentifiers; otherwise the information\n            cannot be accessed by using SNMPv1, SNMPv2c, or SNMPv3.\"\n::= { iso(1) org(3) dod(6) internet(1) mgmt(2) mib-2(1) tcp(6) tcpConnectionTable(19) tcpConnectionEntry(1) tcpConnectionLocalAddress(2) 1 }\n", stderr: "", exitError: false},
 	"snmptranslate\x00-Td\x00TEST::testTable.1":                               mockedCommandResult{stdout: "TEST::testTableEntry\ntestTableEntry OBJECT-TYPE\n  -- FROM\tTEST\n  MAX-ACCESS\tnot-accessible\n  STATUS\tcurrent\n  INDEX\t\t{ server }\n::= { iso(1) 0 testOID(0) testTable(0) 1 }\n", stderr: "", exitError: false},
-	"snmptable\x00-Ch\x00-Cl\x00-c\x00public\x00127.0.0.1\x00TEST::testTable": mockedCommandResult{stdout: "server connections latency \nTEST::testTable: No entries\n", stderr: "", exitError: false},
+	"snmptable\x00-Ch\x00-Cl\x00-c\x00public\x00127.0.0.1\x00TEST::testTable": mockedCommandResult{stdout: "server connections latency description \nTEST::testTable: No entries\n", stderr: "", exitError: false},
 }
--- a/plugins/inputs/snmp/snmp_test.go
+++ b/plugins/inputs/snmp/snmp_test.go
@@ -72,7 +72,7 @@ var tsc = &testSNMPConnection{
 		".1.0.0.0.1.3.1":     "0.456",
 		".1.0.0.0.1.3.2":     "0.000",
 		".1.0.0.0.1.3.3":     "9.999",
-		".1.0.0.0.1.4.0":     123456,
+		".1.0.0.0.1.5.0":     123456,
 		".1.0.0.1.1":         "baz",
 		".1.0.0.1.2":         234,
 		".1.0.0.1.3":         []byte("byte slice"),
@@ -159,19 +159,23 @@ func TestFieldInit(t *testing.T) {

 func TestTableInit(t *testing.T) {
 	tbl := Table{
-		Oid:    ".1.0.0.0",
-		Fields: []Field{{Oid: ".999", Name: "foo"}},
+		Oid: ".1.0.0.0",
+		Fields: []Field{
+			{Oid: ".999", Name: "foo"},
+			{Oid: "TEST::description", Name: "description", IsTag: true},
+		},
 	}
 	err := tbl.init()
 	require.NoError(t, err)

 	assert.Equal(t, "testTable", tbl.Name)

-	assert.Len(t, tbl.Fields, 4)
+	assert.Len(t, tbl.Fields, 5)
 	assert.Contains(t, tbl.Fields, Field{Oid: ".999", Name: "foo", initialized: true})
 	assert.Contains(t, tbl.Fields, Field{Oid: ".1.0.0.0.1.1", Name: "server", IsTag: true, initialized: true})
 	assert.Contains(t, tbl.Fields, Field{Oid: ".1.0.0.0.1.2", Name: "connections", initialized: true})
 	assert.Contains(t, tbl.Fields, Field{Oid: ".1.0.0.0.1.3", Name: "latency", initialized: true})
+	assert.Contains(t, tbl.Fields, Field{Oid: ".1.0.0.0.1.4", Name: "description", IsTag: true, initialized: true})
 }

 func TestSnmpInit(t *testing.T) {
@@ -187,10 +191,11 @@ func TestSnmpInit(t *testing.T) {
 	err := s.init()
 	require.NoError(t, err)

-	assert.Len(t, s.Tables[0].Fields, 3)
+	assert.Len(t, s.Tables[0].Fields, 4)
 	assert.Contains(t, s.Tables[0].Fields, Field{Oid: ".1.0.0.0.1.1", Name: "server", IsTag: true, initialized: true})
 	assert.Contains(t, s.Tables[0].Fields, Field{Oid: ".1.0.0.0.1.2", Name: "connections", initialized: true})
 	assert.Contains(t, s.Tables[0].Fields, Field{Oid: ".1.0.0.0.1.3", Name: "latency", initialized: true})
+	assert.Contains(t, s.Tables[0].Fields, Field{Oid: ".1.0.0.0.1.4", Name: "description", initialized: true})

 	assert.Equal(t, Field{
 		Oid:         ".1.0.0.1.1",
@@ -579,7 +584,7 @@ func TestGather(t *testing.T) {
 				Fields: []Field{
 					{
 						Name: "myOtherField",
-						Oid:  ".1.0.0.0.1.4",
+						Oid:  ".1.0.0.0.1.5",
 					},
 				},
 			},
--- a/plugins/inputs/snmp/testdata/test.mib
+++ b/plugins/inputs/snmp/testdata/test.mib
@@ -22,6 +22,7 @@ TestTableEntry ::=
 		server OCTET STRING,
 		connections  INTEGER,
 		latency  OCTET STRING,
+		description OCTET STRING,
 	}

 server OBJECT-TYPE
@@ -42,6 +43,12 @@ latency OBJECT-TYPE
 	STATUS current
 	::= { testTableEntry 3 }

+description OBJECT-TYPE
+	SYNTAX OCTET STRING
+	MAX-ACCESS read-only
+	STATUS current
+	::= { testTableEntry 4 }
+
 hostname OBJECT-TYPE
 	SYNTAX OCTET STRING
 	MAX-ACCESS read-only
--- a/plugins/inputs/socket_listener/socket_listener_test.go
+++ b/plugins/inputs/socket_listener/socket_listener_test.go
@@ -3,9 +3,11 @@ package socket_listener
 import (
 	"bytes"
 	"crypto/tls"
+	"io/ioutil"
 	"log"
 	"net"
 	"os"
+	"path/filepath"
 	"testing"
 	"time"

@@ -50,14 +52,17 @@ func TestSocketListener_tcp_tls(t *testing.T) {
 }

 func TestSocketListener_unix_tls(t *testing.T) {
-	defer testEmptyLog(t)()
+	tmpdir, err := ioutil.TempDir("", "telegraf")
+	require.NoError(t, err)
+	defer os.RemoveAll(tmpdir)
+	sock := filepath.Join(tmpdir, "socket_listener.TestSocketListener_unix_tls.sock")

 	sl := newSocketListener()
-	sl.ServiceAddress = "unix:///tmp/telegraf_test.sock"
+	sl.ServiceAddress = "unix://" + sock
 	sl.ServerConfig = *pki.TLSServerConfig()

 	acc := &testutil.Accumulator{}
-	err := sl.Start(acc)
+	err = sl.Start(acc)
 	require.NoError(t, err)
 	defer sl.Stop()

@@ -65,7 +70,7 @@ func TestSocketListener_unix_tls(t *testing.T) {
 	tlsCfg.InsecureSkipVerify = true
 	require.NoError(t, err)

-	secureClient, err := tls.Dial("unix", "/tmp/telegraf_test.sock", tlsCfg)
+	secureClient, err := tls.Dial("unix", sock, tlsCfg)
 	require.NoError(t, err)

 	testSocketListener(t, sl, secureClient)
@@ -108,38 +113,48 @@ func TestSocketListener_udp(t *testing.T) {
 }

 func TestSocketListener_unix(t *testing.T) {
+	tmpdir, err := ioutil.TempDir("", "telegraf")
+	require.NoError(t, err)
+	defer os.RemoveAll(tmpdir)
+	sock := filepath.Join(tmpdir, "socket_listener.TestSocketListener_unix.sock")
+
 	defer testEmptyLog(t)()

-	os.Create("/tmp/telegraf_test.sock")
+	os.Create(sock)
 	sl := newSocketListener()
-	sl.ServiceAddress = "unix:///tmp/telegraf_test.sock"
+	sl.ServiceAddress = "unix://" + sock
 	sl.ReadBufferSize = 1024

 	acc := &testutil.Accumulator{}
-	err := sl.Start(acc)
+	err = sl.Start(acc)
 	require.NoError(t, err)
 	defer sl.Stop()

-	client, err := net.Dial("unix", "/tmp/telegraf_test.sock")
+	client, err := net.Dial("unix", sock)
 	require.NoError(t, err)

 	testSocketListener(t, sl, client)
 }

 func TestSocketListener_unixgram(t *testing.T) {
+	tmpdir, err := ioutil.TempDir("", "telegraf")
+	require.NoError(t, err)
+	defer os.RemoveAll(tmpdir)
+	sock := filepath.Join(tmpdir, "socket_listener.TestSocketListener_unixgram.sock")
+
 	defer testEmptyLog(t)()

-	os.Create("/tmp/telegraf_test.sock")
+	os.Create(sock)
 	sl := newSocketListener()
-	sl.ServiceAddress = "unixgram:///tmp/telegraf_test.sock"
+	sl.ServiceAddress = "unixgram://" + sock
 	sl.ReadBufferSize = 1024

 	acc := &testutil.Accumulator{}
-	err := sl.Start(acc)
+	err = sl.Start(acc)
 	require.NoError(t, err)
 	defer sl.Stop()

-	client, err := net.Dial("unixgram", "/tmp/telegraf_test.sock")
+	client, err := net.Dial("unixgram", sock)
 	require.NoError(t, err)

 	testSocketListener(t, sl, client)
--- a/plugins/inputs/solr/README.md
+++ b/plugins/inputs/solr/README.md
@@ -5,7 +5,7 @@ The [solr](http://lucene.apache.org/solr/) plugin collects stats via the

 More about [performance statistics](https://cwiki.apache.org/confluence/display/solr/Performance+Statistics+Reference)

-Tested from 3.5 to 6.*
+Tested from 3.5 to 7.*

 ### Configuration:

--- a/plugins/inputs/solr/solr.go
+++ b/plugins/inputs/solr/solr.go
@@ -113,20 +113,7 @@ type Hitratio interface{}
 // Cache is an exported type that
 // contains cache metrics
 type Cache struct {
-	Stats struct {
-		CumulativeEvictions int64    `json:"cumulative_evictions"`
-		CumulativeHitratio  Hitratio `json:"cumulative_hitratio"`
-		CumulativeHits      int64    `json:"cumulative_hits"`
-		CumulativeInserts   int64    `json:"cumulative_inserts"`
-		CumulativeLookups   int64    `json:"cumulative_lookups"`
-		Evictions           int64    `json:"evictions"`
-		Hitratio            Hitratio `json:"hitratio"`
-		Hits                int64    `json:"hits"`
-		Inserts             int64    `json:"inserts"`
-		Lookups             int64    `json:"lookups"`
-		Size                int64    `json:"size"`
-		WarmupTime          int64    `json:"warmupTime"`
-	} `json:"stats"`
+	Stats map[string]interface{} `json:"stats"`
 }

 // NewSolr return a new instance of Solr
@@ -424,21 +411,30 @@ func addCacheMetricsToAcc(acc telegraf.Accumulator, core string, mBeansData *MBe
 		return err
 	}
 	for name, metrics := range cacheMetrics {
-		cumulativeHits := getFloat(metrics.Stats.CumulativeHitratio)
-		hitratio := getFloat(metrics.Stats.Hitratio)
-		coreFields := map[string]interface{}{
-			"cumulative_evictions": metrics.Stats.CumulativeEvictions,
-			"cumulative_hitratio":  cumulativeHits,
-			"cumulative_hits":      metrics.Stats.CumulativeHits,
-			"cumulative_inserts":   metrics.Stats.CumulativeInserts,
-			"cumulative_lookups":   metrics.Stats.CumulativeLookups,
-			"evictions":            metrics.Stats.Evictions,
-			"hitratio":             hitratio,
-			"hits":                 metrics.Stats.Hits,
-			"inserts":              metrics.Stats.Inserts,
-			"lookups":              metrics.Stats.Lookups,
-			"size":                 metrics.Stats.Size,
-			"warmup_time":          metrics.Stats.WarmupTime,
+		coreFields := make(map[string]interface{})
+		for key, value := range metrics.Stats {
+			splitKey := strings.Split(key, ".")
+			newKey := splitKey[len(splitKey)-1]
+			switch newKey {
+			case "cumulative_evictions",
+				"cumulative_hits",
+				"cumulative_inserts",
+				"cumulative_lookups",
+				"eviction",
+				"hits",
+				"inserts",
+				"lookups",
+				"size",
+				"evictions":
+				coreFields[newKey] = getInt(value)
+			case "hitratio",
+				"cumulative_hitratio":
+				coreFields[newKey] = getFloat(value)
+			case "warmupTime":
+				coreFields["warmup_time"] = getInt(value)
+			default:
+				continue
+			}
 		}
 		acc.AddFields(
 			"solr_cache",
--- a/plugins/inputs/solr/solr_test.go
+++ b/plugins/inputs/solr/solr_test.go
@@ -43,6 +43,17 @@ func TestGatherStats(t *testing.T) {
 		map[string]string{"core": "main", "handler": "filterCache"})
 }

+func TestSolr7MbeansStats(t *testing.T) {
+	ts := createMockSolr7Server()
+	solr := NewSolr()
+	solr.Servers = []string{ts.URL}
+	var acc testutil.Accumulator
+	require.NoError(t, solr.Gather(&acc))
+	acc.AssertContainsTaggedFields(t, "solr_cache",
+		solr7CacheExpected,
+		map[string]string{"core": "main", "handler": "documentCache"})
+}
+
 func TestSolr3GatherStats(t *testing.T) {
 	ts := createMockSolr3Server()
 	solr := NewSolr()
@@ -150,3 +161,18 @@ func createMockSolr3Server() *httptest.Server {
 		}
 	}))
 }
+
+func createMockSolr7Server() *httptest.Server {
+	return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if strings.Contains(r.URL.Path, "/solr/admin/cores") {
+			w.WriteHeader(http.StatusOK)
+			fmt.Fprintln(w, statusResponse)
+		} else if strings.Contains(r.URL.Path, "solr/main/admin") {
+			w.WriteHeader(http.StatusOK)
+			fmt.Fprintln(w, mBeansSolr7Response)
+		} else {
+			w.WriteHeader(http.StatusNotFound)
+			fmt.Fprintln(w, "nope")
+		}
+	}))
+}
--- a/plugins/inputs/solr/testdata7_test.go
+++ b/plugins/inputs/solr/testdata7_test.go
@@ -0,0 +1,60 @@
+package solr
+
+const mBeansSolr7Response = `
+{
+   "responseHeader":{
+      "status":0,
+      "QTime":2
+   },
+   "solr-mbeans":[
+      "CORE",
+      {
+
+      },
+      "QUERYHANDLER",
+      {
+
+      },
+      "UPDATEHANDLER",
+      {
+
+      },
+      "CACHE",
+      {
+         "documentCache":{
+            "class":"org.apache.solr.search.LRUCache",
+            "description":"LRU Cache(maxSize=16384, initialSize=4096)",
+            "stats":{
+               "CACHE.searcher.documentCache.evictions": 141485,
+               "CACHE.searcher.documentCache.cumulative_lookups": 265132,
+               "CACHE.searcher.documentCache.hitratio": 0.44,
+               "CACHE.searcher.documentCache.size": 8192,
+               "CACHE.searcher.documentCache.cumulative_hitratio": 0.42,
+               "CACHE.searcher.documentCache.lookups": 1234,
+               "CACHE.searcher.documentCache.warmupTime": 1,
+               "CACHE.searcher.documentCache.inserts": 987,
+               "CACHE.searcher.documentCache.hits": 1111,
+               "CACHE.searcher.documentCache.cumulative_hits": 115364,
+               "CACHE.searcher.documentCache.cumulative_inserts": 149768,
+               "CACHE.searcher.documentCache.cumulative_evictions": 141486
+            }
+         }
+      }
+   ]
+}
+`
+
+var solr7CacheExpected = map[string]interface{}{
+	"evictions":            int64(141485),
+	"cumulative_evictions": int64(141486),
+	"cumulative_hitratio":  float64(0.42),
+	"cumulative_hits":      int64(115364),
+	"cumulative_inserts":   int64(149768),
+	"cumulative_lookups":   int64(265132),
+	"hitratio":             float64(0.44),
+	"hits":                 int64(1111),
+	"inserts":              int64(987),
+	"lookups":              int64(1234),
+	"size":                 int64(8192),
+	"warmup_time":          int64(1),
+}
--- a/plugins/inputs/syslog/README.md
+++ b/plugins/inputs/syslog/README.md
@@ -0,0 +1,98 @@
+# Syslog Input Plugin
+
+The syslog plugin listens for syslog messages transmitted over
+[UDP](https://tools.ietf.org/html/rfc5426) or
+[TCP](https://tools.ietf.org/html/rfc5425).
+
+Syslog messages should be formatted according to
+[RFC 5424](https://tools.ietf.org/html/rfc5424).
+
+### Configuration
+
+```toml
+[[inputs.syslog]]
+  ## Specify an ip or hostname with port - eg., tcp://localhost:6514, tcp://10.0.0.1:6514
+  ## Protocol, address and port to host the syslog receiver.
+  ## If no host is specified, then localhost is used.
+  ## If no port is specified, 6514 is used (RFC5425#section-4.1).
+  server = "tcp://:6514"
+
+  ## TLS Config
+  # tls_allowed_cacerts = ["/etc/telegraf/ca.pem"]
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+
+  ## Period between keep alive probes.
+  ## 0 disables keep alive probes.
+  ## Defaults to the OS configuration.
+  ## Only applies to stream sockets (e.g. TCP).
+  # keep_alive_period = "5m"
+
+  ## Maximum number of concurrent connections (default = 0).
+  ## 0 means unlimited.
+  ## Only applies to stream sockets (e.g. TCP).
+  # max_connections = 1024
+
+  ## Read timeout (default = 500ms).
+  ## 0 means unlimited.
+  # read_timeout = 500ms
+
+  ## Whether to parse in best effort mode or not (default = false).
+  ## By default best effort parsing is off.
+  # best_effort = false
+
+  ## Character to prepend to SD-PARAMs (default = "_").
+  ## A syslog message can contain multiple parameters and multiple identifiers within structured data section.
+  ## Eg., [id1 name1="val1" name2="val2"][id2 name1="val1" nameA="valA"]
+  ## For each combination a field is created.
+  ## Its name is created concatenating identifier, sdparam_separator, and parameter name.
+  # sdparam_separator = "_"
+```
+
+#### Best Effort
+
+The [`best_effort`](https://github.com/influxdata/go-syslog#best-effort-mode)
+option instructs the parser to extract partial but valid info from syslog
+messages.  If unset only full messages will be collected.
+
+### Metrics
+
+- syslog
+  - tags
+    - severity (string)
+    - facility (string)
+    - hostname (string)
+    - appname (string)
+  - fields
+    - version (integer)
+    - severity_code (integer)
+    - facility_code (integer)
+    - timestamp (integer)
+    - procid (string)
+    - msgid (string)
+    - sdid (bool)
+    - *Structured Data* (string)
+
+### Rsyslog Integration
+
+Rsyslog can be configured to forward logging messages to Telegraf by configuring
+[remote logging](https://www.rsyslog.com/doc/v8-stable/configuration/actions.html#remote-machine).
+
+Most system are setup with a configuration split between `/etc/rsyslog.conf`
+and the files in the `/etc/rsyslog.d/` directory, it is recommended to add the
+new configuration into the config directory to simplify updates to the main
+config file.
+
+Add the following lines to `/etc/rsyslog.d/50-telegraf.conf` making
+adjustments to the target address as needed:
+```
+$ActionQueueType LinkedList # use asynchronous processing
+$ActionQueueFileName srvrfwd # set file name, also enables disk mode
+$ActionResumeRetryCount -1 # infinite retries on insert failure
+$ActionQueueSaveOnShutdown on # save in-memory data if rsyslog shuts down
+
+# forward over tcp with octet framing according to RFC 5425
+*.* @@(o)127.0.0.1:6514;RSYSLOG_SyslogProtocol23Format
+```
+
+To complete TLS setup please refer to [rsyslog docs](https://www.rsyslog.com/doc/v8-stable/tutorials/tls.html).
--- a/plugins/inputs/syslog/rfc5425_test.go
+++ b/plugins/inputs/syslog/rfc5425_test.go
@@ -0,0 +1,539 @@
+package syslog
+
+import (
+	"crypto/tls"
+	"fmt"
+	"io/ioutil"
+	"net"
+	"os"
+	"path/filepath"
+	"testing"
+	"time"
+
+	"github.com/google/go-cmp/cmp"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/require"
+)
+
+var (
+	pki = testutil.NewPKI("../../../testutil/pki")
+)
+
+type testCase5425 struct {
+	name           string
+	data           []byte
+	wantBestEffort []testutil.Metric
+	wantStrict     []testutil.Metric
+	werr           int // how many errors we expect in the strict mode?
+}
+
+func getTestCasesForRFC5425() []testCase5425 {
+	testCases := []testCase5425{
+		{
+			name: "1st/avg/ok",
+			data: []byte(`188 <29>1 2016-02-21T04:32:57+00:00 web1 someservice 2341 2 [origin][meta sequence="14125553" service="someservice"] "GET /v1/ok HTTP/1.1" 200 145 "-" "hacheck 0.9.0" 24306 127.0.0.1:40124 575`),
+			wantStrict: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "syslog",
+					Fields: map[string]interface{}{
+						"version":       uint16(1),
+						"timestamp":     time.Unix(1456029177, 0).UnixNano(),
+						"procid":        "2341",
+						"msgid":         "2",
+						"message":       `"GET /v1/ok HTTP/1.1" 200 145 "-" "hacheck 0.9.0" 24306 127.0.0.1:40124 575`,
+						"origin":        true,
+						"meta_sequence": "14125553",
+						"meta_service":  "someservice",
+						"severity_code": 5,
+						"facility_code": 3,
+					},
+					Tags: map[string]string{
+						"severity": "notice",
+						"facility": "daemon",
+						"hostname": "web1",
+						"appname":  "someservice",
+					},
+					Time: defaultTime,
+				},
+			},
+			wantBestEffort: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "syslog",
+					Fields: map[string]interface{}{
+						"version":       uint16(1),
+						"timestamp":     time.Unix(1456029177, 0).UnixNano(),
+						"procid":        "2341",
+						"msgid":         "2",
+						"message":       `"GET /v1/ok HTTP/1.1" 200 145 "-" "hacheck 0.9.0" 24306 127.0.0.1:40124 575`,
+						"origin":        true,
+						"meta_sequence": "14125553",
+						"meta_service":  "someservice",
+						"severity_code": 5,
+						"facility_code": 3,
+					},
+					Tags: map[string]string{
+						"severity": "notice",
+						"facility": "daemon",
+						"hostname": "web1",
+						"appname":  "someservice",
+					},
+					Time: defaultTime,
+				},
+			},
+		},
+		{
+			name: "1st/min/ok//2nd/min/ok",
+			data: []byte("16 <1>2 - - - - - -17 <4>11 - - - - - -"),
+			wantStrict: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "syslog",
+					Fields: map[string]interface{}{
+						"version":       uint16(2),
+						"severity_code": 1,
+						"facility_code": 0,
+					},
+					Tags: map[string]string{
+						"severity": "alert",
+						"facility": "kern",
+					},
+					Time: defaultTime,
+				},
+				testutil.Metric{
+					Measurement: "syslog",
+					Fields: map[string]interface{}{
+						"version":       uint16(11),
+						"severity_code": 4,
+						"facility_code": 0,
+					},
+					Tags: map[string]string{
+						"severity": "warning",
+						"facility": "kern",
+					},
+					Time: defaultTime.Add(time.Nanosecond),
+				},
+			},
+			wantBestEffort: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "syslog",
+					Fields: map[string]interface{}{
+						"version":       uint16(2),
+						"severity_code": 1,
+						"facility_code": 0,
+					},
+					Tags: map[string]string{
+						"severity": "alert",
+						"facility": "kern",
+					},
+					Time: defaultTime,
+				},
+				testutil.Metric{
+					Measurement: "syslog",
+					Fields: map[string]interface{}{
+						"version":       uint16(11),
+						"severity_code": 4,
+						"facility_code": 0,
+					},
+					Tags: map[string]string{
+						"severity": "warning",
+						"facility": "kern",
+					},
+					Time: defaultTime.Add(time.Nanosecond),
+				},
+			},
+		},
+		{
+			name: "1st/utf8/ok",
+			data: []byte("23 <1>1 - - - - - - hellø"),
+			wantStrict: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "syslog",
+					Fields: map[string]interface{}{
+						"version":       uint16(1),
+						"message":       "hellø",
+						"severity_code": 1,
+						"facility_code": 0,
+					},
+					Tags: map[string]string{
+						"severity": "alert",
+						"facility": "kern",
+					},
+					Time: defaultTime,
+				},
+			},
+			wantBestEffort: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "syslog",
+					Fields: map[string]interface{}{
+						"version":       uint16(1),
+						"message":       "hellø",
+						"severity_code": 1,
+						"facility_code": 0,
+					},
+					Tags: map[string]string{
+						"severity": "alert",
+						"facility": "kern",
+					},
+					Time: defaultTime,
+				},
+			},
+		},
+		{
+			name: "1st/nl/ok", // newline
+			data: []byte("28 <1>3 - - - - - - hello\nworld"),
+			wantStrict: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "syslog",
+					Fields: map[string]interface{}{
+						"version":       uint16(3),
+						"message":       "hello\nworld",
+						"severity_code": 1,
+						"facility_code": 0,
+					},
+					Tags: map[string]string{
+						"severity": "alert",
+						"facility": "kern",
+					},
+					Time: defaultTime,
+				},
+			},
+			wantBestEffort: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "syslog",
+					Fields: map[string]interface{}{
+						"version":       uint16(3),
+						"message":       "hello\nworld",
+						"severity_code": 1,
+						"facility_code": 0,
+					},
+					Tags: map[string]string{
+						"severity": "alert",
+						"facility": "kern",
+					},
+					Time: defaultTime,
+				},
+			},
+		},
+		{
+			name:       "1st/uf/ko", // underflow (msglen less than provided octets)
+			data:       []byte("16 <1>2"),
+			wantStrict: nil,
+			wantBestEffort: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "syslog",
+					Fields: map[string]interface{}{
+						"version":       uint16(2),
+						"severity_code": 1,
+						"facility_code": 0,
+					},
+					Tags: map[string]string{
+						"severity": "alert",
+						"facility": "kern",
+					},
+					Time: defaultTime,
+				},
+			},
+			werr: 1,
+		},
+		{
+			name: "1st/min/ok",
+			data: []byte("16 <1>1 - - - - - -"),
+			wantStrict: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "syslog",
+					Fields: map[string]interface{}{
+						"version":       uint16(1),
+						"severity_code": 1,
+						"facility_code": 0,
+					},
+					Tags: map[string]string{
+						"severity": "alert",
+						"facility": "kern",
+					},
+					Time: defaultTime,
+				},
+			},
+			wantBestEffort: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "syslog",
+					Fields: map[string]interface{}{
+						"version":       uint16(1),
+						"severity_code": 1,
+						"facility_code": 0,
+					},
+					Tags: map[string]string{
+						"severity": "alert",
+						"facility": "kern",
+					},
+					Time: defaultTime,
+				},
+			},
+		},
+		{
+			name:       "1st/uf/mf", // The first "underflow" message breaks also the second one
+			data:       []byte("16 <1>217 <11>1 - - - - - -"),
+			wantStrict: nil,
+			wantBestEffort: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "syslog",
+					Fields: map[string]interface{}{
+						"version":       uint16(217),
+						"severity_code": 1,
+						"facility_code": 0,
+					},
+					Tags: map[string]string{
+						"severity": "alert",
+						"facility": "kern",
+					},
+					Time: defaultTime,
+				},
+			},
+			werr: 1,
+		},
+		// {
+		// 	name: "1st/of/ko", // overflow (msglen greather then max allowed octets)
+		// 	data: []byte(fmt.Sprintf("8193 <%d>%d %s %s %s %s %s 12 %s", maxP, maxV, maxTS, maxH, maxA, maxPID, maxMID, message7681)),
+		// 	want: []testutil.Metric{},
+		// },
+		{
+			name: "1st/max/ok",
+			data: []byte(fmt.Sprintf("8192 <%d>%d %s %s %s %s %s - %s", maxP, maxV, maxTS, maxH, maxA, maxPID, maxMID, message7681)),
+			wantStrict: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "syslog",
+					Fields: map[string]interface{}{
+						"version":       maxV,
+						"timestamp":     time.Unix(1514764799, 999999000).UnixNano(),
+						"message":       message7681,
+						"procid":        maxPID,
+						"msgid":         maxMID,
+						"facility_code": 23,
+						"severity_code": 7,
+					},
+					Tags: map[string]string{
+						"severity": "debug",
+						"facility": "local7",
+						"hostname": maxH,
+						"appname":  maxA,
+					},
+					Time: defaultTime,
+				},
+			},
+			wantBestEffort: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "syslog",
+					Fields: map[string]interface{}{
+						"version":       maxV,
+						"timestamp":     time.Unix(1514764799, 999999000).UnixNano(),
+						"message":       message7681,
+						"procid":        maxPID,
+						"msgid":         maxMID,
+						"facility_code": 23,
+						"severity_code": 7,
+					},
+					Tags: map[string]string{
+						"severity": "debug",
+						"facility": "local7",
+						"hostname": maxH,
+						"appname":  maxA,
+					},
+					Time: defaultTime,
+				},
+			},
+		},
+	}
+
+	return testCases
+}
+
+func newTCPSyslogReceiver(address string, keepAlive *internal.Duration, maxConn int, bestEffort bool) *Syslog {
+	d := &internal.Duration{
+		Duration: defaultReadTimeout,
+	}
+	s := &Syslog{
+		Address: address,
+		now: func() time.Time {
+			return defaultTime
+		},
+		ReadTimeout: d,
+		BestEffort:  bestEffort,
+		Separator:   "_",
+	}
+	if keepAlive != nil {
+		s.KeepAlivePeriod = keepAlive
+	}
+	if maxConn > 0 {
+		s.MaxConnections = maxConn
+	}
+
+	return s
+}
+
+func testStrictRFC5425(t *testing.T, protocol string, address string, wantTLS bool, keepAlive *internal.Duration) {
+	for _, tc := range getTestCasesForRFC5425() {
+		t.Run(tc.name, func(t *testing.T) {
+			// Creation of a strict mode receiver
+			receiver := newTCPSyslogReceiver(protocol+"://"+address, keepAlive, 0, false)
+			require.NotNil(t, receiver)
+			if wantTLS {
+				receiver.ServerConfig = *pki.TLSServerConfig()
+			}
+			require.Equal(t, receiver.KeepAlivePeriod, keepAlive)
+			acc := &testutil.Accumulator{}
+			require.NoError(t, receiver.Start(acc))
+			defer receiver.Stop()
+
+			// Connect
+			var conn net.Conn
+			var err error
+			if wantTLS {
+				config, e := pki.TLSClientConfig().TLSConfig()
+				require.NoError(t, e)
+				config.ServerName = "localhost"
+				conn, err = tls.Dial(protocol, address, config)
+			} else {
+				conn, err = net.Dial(protocol, address)
+				defer conn.Close()
+			}
+			require.NotNil(t, conn)
+			require.NoError(t, err)
+
+			// Clear
+			acc.ClearMetrics()
+			acc.Errors = make([]error, 0)
+
+			// Write
+			conn.Write(tc.data)
+
+			// Wait that the the number of data points is accumulated
+			// Since the receiver is running concurrently
+			if tc.wantStrict != nil {
+				acc.Wait(len(tc.wantStrict))
+			}
+			// Wait the parsing error
+			acc.WaitError(tc.werr)
+
+			// Verify
+			if len(acc.Errors) != tc.werr {
+				t.Fatalf("Got unexpected errors. want error = %v, errors = %v\n", tc.werr, acc.Errors)
+			}
+			var got []testutil.Metric
+			for _, metric := range acc.Metrics {
+				got = append(got, *metric)
+			}
+			if !cmp.Equal(tc.wantStrict, got) {
+				t.Fatalf("Got (+) / Want (-)\n %s", cmp.Diff(tc.wantStrict, got))
+			}
+		})
+	}
+}
+
+func testBestEffortRFC5425(t *testing.T, protocol string, address string, wantTLS bool, keepAlive *internal.Duration) {
+	for _, tc := range getTestCasesForRFC5425() {
+		t.Run(tc.name, func(t *testing.T) {
+			// Creation of a best effort mode receiver
+			receiver := newTCPSyslogReceiver(protocol+"://"+address, keepAlive, 0, true)
+			require.NotNil(t, receiver)
+			if wantTLS {
+				receiver.ServerConfig = *pki.TLSServerConfig()
+			}
+			require.Equal(t, receiver.KeepAlivePeriod, keepAlive)
+			acc := &testutil.Accumulator{}
+			require.NoError(t, receiver.Start(acc))
+			defer receiver.Stop()
+
+			// Connect
+			var conn net.Conn
+			var err error
+			if wantTLS {
+				config, e := pki.TLSClientConfig().TLSConfig()
+				require.NoError(t, e)
+				config.ServerName = "localhost"
+				conn, err = tls.Dial(protocol, address, config)
+			} else {
+				conn, err = net.Dial(protocol, address)
+				defer conn.Close()
+			}
+			require.NotNil(t, conn)
+			require.NoError(t, err)
+
+			// Clear
+			acc.ClearMetrics()
+			acc.Errors = make([]error, 0)
+
+			// Write
+			conn.Write(tc.data)
+
+			// Wait that the the number of data points is accumulated
+			// Since the receiver is running concurrently
+			if tc.wantBestEffort != nil {
+				acc.Wait(len(tc.wantBestEffort))
+			}
+
+			// Verify
+			var got []testutil.Metric
+			for _, metric := range acc.Metrics {
+				got = append(got, *metric)
+			}
+			if !cmp.Equal(tc.wantBestEffort, got) {
+				t.Fatalf("Got (+) / Want (-)\n %s", cmp.Diff(tc.wantBestEffort, got))
+			}
+		})
+	}
+}
+
+func TestStrict_tcp(t *testing.T) {
+	testStrictRFC5425(t, "tcp", address, false, nil)
+}
+
+func TestBestEffort_tcp(t *testing.T) {
+	testBestEffortRFC5425(t, "tcp", address, false, nil)
+}
+
+func TestStrict_tcp_tls(t *testing.T) {
+	testStrictRFC5425(t, "tcp", address, true, nil)
+}
+
+func TestBestEffort_tcp_tls(t *testing.T) {
+	testBestEffortRFC5425(t, "tcp", address, true, nil)
+}
+
+func TestStrictWithKeepAlive_tcp_tls(t *testing.T) {
+	testStrictRFC5425(t, "tcp", address, true, &internal.Duration{Duration: time.Minute})
+}
+
+func TestStrictWithZeroKeepAlive_tcp_tls(t *testing.T) {
+	testStrictRFC5425(t, "tcp", address, true, &internal.Duration{Duration: 0})
+}
+
+func TestStrict_unix(t *testing.T) {
+	tmpdir, err := ioutil.TempDir("", "telegraf")
+	require.NoError(t, err)
+	defer os.RemoveAll(tmpdir)
+	sock := filepath.Join(tmpdir, "syslog.TestStrict_unix.sock")
+	testStrictRFC5425(t, "unix", sock, false, nil)
+}
+
+func TestBestEffort_unix(t *testing.T) {
+	tmpdir, err := ioutil.TempDir("", "telegraf")
+	require.NoError(t, err)
+	defer os.RemoveAll(tmpdir)
+	sock := filepath.Join(tmpdir, "syslog.TestBestEffort_unix.sock")
+	testBestEffortRFC5425(t, "unix", sock, false, nil)
+}
+
+func TestStrict_unix_tls(t *testing.T) {
+	tmpdir, err := ioutil.TempDir("", "telegraf")
+	require.NoError(t, err)
+	defer os.RemoveAll(tmpdir)
+	sock := filepath.Join(tmpdir, "syslog.TestStrict_unix_tls.sock")
+	testStrictRFC5425(t, "unix", sock, true, nil)
+}
+
+func TestBestEffort_unix_tls(t *testing.T) {
+	tmpdir, err := ioutil.TempDir("", "telegraf")
+	require.NoError(t, err)
+	defer os.RemoveAll(tmpdir)
+	sock := filepath.Join(tmpdir, "syslog.TestBestEffort_unix_tls.sock")
+	testBestEffortRFC5425(t, "unix", sock, true, nil)
+}
--- a/plugins/inputs/syslog/rfc5426_test.go
+++ b/plugins/inputs/syslog/rfc5426_test.go
@@ -0,0 +1,408 @@
+package syslog
+
+import (
+	"fmt"
+	"io/ioutil"
+	"net"
+	"os"
+	"path/filepath"
+	"sync/atomic"
+	"testing"
+	"time"
+
+	"github.com/google/go-cmp/cmp"
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/require"
+)
+
+type testCase5426 struct {
+	name           string
+	data           []byte
+	wantBestEffort *testutil.Metric
+	wantStrict     *testutil.Metric
+	werr           bool
+}
+
+func getTestCasesForRFC5426() []testCase5426 {
+	testCases := []testCase5426{
+		{
+			name: "empty",
+			data: []byte(""),
+			werr: true,
+		},
+		{
+			name: "complete",
+			data: []byte("<1>1 - - - - - - A"),
+			wantBestEffort: &testutil.Metric{
+				Measurement: "syslog",
+				Fields: map[string]interface{}{
+					"version":       uint16(1),
+					"message":       "A",
+					"facility_code": 0,
+					"severity_code": 1,
+				},
+				Tags: map[string]string{
+					"severity": "alert",
+					"facility": "kern",
+				},
+				Time: defaultTime,
+			},
+			wantStrict: &testutil.Metric{
+				Measurement: "syslog",
+				Fields: map[string]interface{}{
+					"version":       uint16(1),
+					"message":       "A",
+					"facility_code": 0,
+					"severity_code": 1,
+				},
+				Tags: map[string]string{
+					"severity": "alert",
+					"facility": "kern",
+				},
+				Time: defaultTime,
+			},
+		},
+		{
+			name: "one/per/packet",
+			data: []byte("<1>3 - - - - - - A<1>4 - - - - - - B"),
+			wantBestEffort: &testutil.Metric{
+				Measurement: "syslog",
+				Fields: map[string]interface{}{
+					"version":       uint16(3),
+					"message":       "A<1>4 - - - - - - B",
+					"severity_code": 1,
+					"facility_code": 0,
+				},
+				Tags: map[string]string{
+					"severity": "alert",
+					"facility": "kern",
+				},
+				Time: defaultTime,
+			},
+			wantStrict: &testutil.Metric{
+				Measurement: "syslog",
+				Fields: map[string]interface{}{
+					"version":       uint16(3),
+					"message":       "A<1>4 - - - - - - B",
+					"severity_code": 1,
+					"facility_code": 0,
+				},
+				Tags: map[string]string{
+					"severity": "alert",
+					"facility": "kern",
+				},
+				Time: defaultTime,
+			},
+		},
+		{
+			name: "average",
+			data: []byte(`<29>1 2016-02-21T04:32:57+00:00 web1 someservice 2341 2 [origin][meta sequence="14125553" service="someservice"] "GET /v1/ok HTTP/1.1" 200 145 "-" "hacheck 0.9.0" 24306 127.0.0.1:40124 575`),
+			wantBestEffort: &testutil.Metric{
+				Measurement: "syslog",
+				Fields: map[string]interface{}{
+					"version":       uint16(1),
+					"timestamp":     time.Unix(1456029177, 0).UnixNano(),
+					"procid":        "2341",
+					"msgid":         "2",
+					"message":       `"GET /v1/ok HTTP/1.1" 200 145 "-" "hacheck 0.9.0" 24306 127.0.0.1:40124 575`,
+					"origin":        true,
+					"meta_sequence": "14125553",
+					"meta_service":  "someservice",
+					"severity_code": 5,
+					"facility_code": 3,
+				},
+				Tags: map[string]string{
+					"severity": "notice",
+					"facility": "daemon",
+					"hostname": "web1",
+					"appname":  "someservice",
+				},
+				Time: defaultTime,
+			},
+			wantStrict: &testutil.Metric{
+				Measurement: "syslog",
+				Fields: map[string]interface{}{
+					"version":       uint16(1),
+					"timestamp":     time.Unix(1456029177, 0).UnixNano(),
+					"procid":        "2341",
+					"msgid":         "2",
+					"message":       `"GET /v1/ok HTTP/1.1" 200 145 "-" "hacheck 0.9.0" 24306 127.0.0.1:40124 575`,
+					"origin":        true,
+					"meta_sequence": "14125553",
+					"meta_service":  "someservice",
+					"severity_code": 5,
+					"facility_code": 3,
+				},
+				Tags: map[string]string{
+					"severity": "notice",
+					"facility": "daemon",
+					"hostname": "web1",
+					"appname":  "someservice",
+				},
+				Time: defaultTime,
+			},
+		},
+		{
+			name: "max",
+			data: []byte(fmt.Sprintf("<%d>%d %s %s %s %s %s - %s", maxP, maxV, maxTS, maxH, maxA, maxPID, maxMID, message7681)),
+			wantBestEffort: &testutil.Metric{
+				Measurement: "syslog",
+				Fields: map[string]interface{}{
+					"version":       maxV,
+					"timestamp":     time.Unix(1514764799, 999999000).UnixNano(),
+					"message":       message7681,
+					"procid":        maxPID,
+					"msgid":         maxMID,
+					"severity_code": 7,
+					"facility_code": 23,
+				},
+				Tags: map[string]string{
+					"severity": "debug",
+					"facility": "local7",
+					"hostname": maxH,
+					"appname":  maxA,
+				},
+				Time: defaultTime,
+			},
+			wantStrict: &testutil.Metric{
+				Measurement: "syslog",
+				Fields: map[string]interface{}{
+					"version":       maxV,
+					"timestamp":     time.Unix(1514764799, 999999000).UnixNano(),
+					"message":       message7681,
+					"procid":        maxPID,
+					"msgid":         maxMID,
+					"severity_code": 7,
+					"facility_code": 23,
+				},
+				Tags: map[string]string{
+					"severity": "debug",
+					"facility": "local7",
+					"hostname": maxH,
+					"appname":  maxA,
+				},
+				Time: defaultTime,
+			},
+		},
+		{
+			name: "minimal/incomplete",
+			data: []byte("<1>2"),
+			wantBestEffort: &testutil.Metric{
+				Measurement: "syslog",
+				Fields: map[string]interface{}{
+					"version":       uint16(2),
+					"facility_code": 0,
+					"severity_code": 1,
+				},
+				Tags: map[string]string{
+					"severity": "alert",
+					"facility": "kern",
+				},
+				Time: defaultTime,
+			},
+			werr: true,
+		},
+	}
+
+	return testCases
+}
+
+func newUDPSyslogReceiver(address string, bestEffort bool) *Syslog {
+	return &Syslog{
+		Address: address,
+		now: func() time.Time {
+			return defaultTime
+		},
+		BestEffort: bestEffort,
+		Separator:  "_",
+	}
+}
+
+func testRFC5426(t *testing.T, protocol string, address string, bestEffort bool) {
+	for _, tc := range getTestCasesForRFC5426() {
+		t.Run(tc.name, func(t *testing.T) {
+			// Create receiver
+			receiver := newUDPSyslogReceiver(protocol+"://"+address, bestEffort)
+			acc := &testutil.Accumulator{}
+			require.NoError(t, receiver.Start(acc))
+			defer receiver.Stop()
+
+			// Clear
+			acc.ClearMetrics()
+			acc.Errors = make([]error, 0)
+
+			// Connect
+			conn, err := net.Dial(protocol, address)
+			require.NotNil(t, conn)
+			defer conn.Close()
+			require.Nil(t, err)
+
+			// Write
+			_, e := conn.Write(tc.data)
+			require.Nil(t, e)
+
+			// Waiting ...
+			if tc.wantStrict == nil && tc.werr || bestEffort && tc.werr {
+				acc.WaitError(1)
+			}
+			if tc.wantBestEffort != nil && bestEffort || tc.wantStrict != nil && !bestEffort {
+				acc.Wait(1) // RFC5426 mandates a syslog message per UDP packet
+			}
+
+			// Compare
+			var got *testutil.Metric
+			var want *testutil.Metric
+			if len(acc.Metrics) > 0 {
+				got = acc.Metrics[0]
+			}
+			if bestEffort {
+				want = tc.wantBestEffort
+			} else {
+				want = tc.wantStrict
+			}
+			if !cmp.Equal(want, got) {
+				t.Fatalf("Got (+) / Want (-)\n %s", cmp.Diff(want, got))
+			}
+		})
+	}
+}
+
+func TestBestEffort_udp(t *testing.T) {
+	testRFC5426(t, "udp", address, true)
+}
+
+func TestStrict_udp(t *testing.T) {
+	testRFC5426(t, "udp", address, false)
+}
+
+func TestBestEffort_unixgram(t *testing.T) {
+	tmpdir, err := ioutil.TempDir("", "telegraf")
+	require.NoError(t, err)
+	defer os.RemoveAll(tmpdir)
+	sock := filepath.Join(tmpdir, "syslog.TestBestEffort_unixgram.sock")
+	os.Create(sock)
+	testRFC5426(t, "unixgram", sock, true)
+}
+
+func TestStrict_unixgram(t *testing.T) {
+	tmpdir, err := ioutil.TempDir("", "telegraf")
+	require.NoError(t, err)
+	defer os.RemoveAll(tmpdir)
+	sock := filepath.Join(tmpdir, "syslog.TestStrict_unixgram.sock")
+	os.Create(sock)
+	testRFC5426(t, "unixgram", sock, false)
+}
+
+func TestTimeIncrement_udp(t *testing.T) {
+	var i int64
+	atomic.StoreInt64(&i, 0)
+	getNow := func() time.Time {
+		if atomic.LoadInt64(&i)%2 == 0 {
+			return time.Unix(1, 0)
+		}
+		return time.Unix(1, 1)
+	}
+
+	// Create receiver
+	receiver := &Syslog{
+		Address:    "udp://" + address,
+		now:        getNow,
+		BestEffort: false,
+		Separator:  "_",
+	}
+	acc := &testutil.Accumulator{}
+	require.NoError(t, receiver.Start(acc))
+	defer receiver.Stop()
+
+	// Connect
+	conn, err := net.Dial("udp", address)
+	require.NotNil(t, conn)
+	defer conn.Close()
+	require.Nil(t, err)
+
+	// Write
+	_, e := conn.Write([]byte("<1>1 - - - - - -"))
+	require.Nil(t, e)
+
+	// Wait
+	acc.Wait(1)
+
+	want := &testutil.Metric{
+		Measurement: "syslog",
+		Fields: map[string]interface{}{
+			"version":       uint16(1),
+			"facility_code": 0,
+			"severity_code": 1,
+		},
+		Tags: map[string]string{
+			"severity": "alert",
+			"facility": "kern",
+		},
+		Time: getNow(),
+	}
+
+	if !cmp.Equal(want, acc.Metrics[0]) {
+		t.Fatalf("Got (+) / Want (-)\n %s", cmp.Diff(want, acc.Metrics[0]))
+	}
+
+	// New one with different time
+	atomic.StoreInt64(&i, atomic.LoadInt64(&i)+1)
+
+	// Clear
+	acc.ClearMetrics()
+
+	// Write
+	_, e = conn.Write([]byte("<1>1 - - - - - -"))
+	require.Nil(t, e)
+
+	// Wait
+	acc.Wait(1)
+
+	want = &testutil.Metric{
+		Measurement: "syslog",
+		Fields: map[string]interface{}{
+			"version":       uint16(1),
+			"facility_code": 0,
+			"severity_code": 1,
+		},
+		Tags: map[string]string{
+			"severity": "alert",
+			"facility": "kern",
+		},
+		Time: getNow(),
+	}
+
+	if !cmp.Equal(want, acc.Metrics[0]) {
+		t.Fatalf("Got (+) / Want (-)\n %s", cmp.Diff(want, acc.Metrics[0]))
+	}
+
+	// New one with same time as previous one
+
+	// Clear
+	acc.ClearMetrics()
+
+	// Write
+	_, e = conn.Write([]byte("<1>1 - - - - - -"))
+	require.Nil(t, e)
+
+	// Wait
+	acc.Wait(1)
+
+	want = &testutil.Metric{
+		Measurement: "syslog",
+		Fields: map[string]interface{}{
+			"version":       uint16(1),
+			"facility_code": 0,
+			"severity_code": 1,
+		},
+		Tags: map[string]string{
+			"severity": "alert",
+			"facility": "kern",
+		},
+		Time: getNow().Add(time.Nanosecond),
+	}
+
+	if !cmp.Equal(want, acc.Metrics[0]) {
+		t.Fatalf("Got (+) / Want (-)\n %s", cmp.Diff(want, acc.Metrics[0]))
+	}
+}
--- a/plugins/inputs/syslog/syslog.go
+++ b/plugins/inputs/syslog/syslog.go
@@ -0,0 +1,419 @@
+package syslog
+
+import (
+	"crypto/tls"
+	"fmt"
+	"io"
+	"net"
+	"net/url"
+	"os"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/influxdata/go-syslog/rfc5424"
+	"github.com/influxdata/go-syslog/rfc5425"
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	tlsConfig "github.com/influxdata/telegraf/internal/tls"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+const defaultReadTimeout = time.Millisecond * 500
+const ipMaxPacketSize = 64 * 1024
+
+// Syslog is a syslog plugin
+type Syslog struct {
+	tlsConfig.ServerConfig
+	Address         string `toml:"server"`
+	KeepAlivePeriod *internal.Duration
+	ReadTimeout     *internal.Duration
+	MaxConnections  int
+	BestEffort      bool
+	Separator       string `toml:"sdparam_separator"`
+
+	now      func() time.Time
+	lastTime time.Time
+
+	mu sync.Mutex
+	wg sync.WaitGroup
+	io.Closer
+
+	isStream      bool
+	tcpListener   net.Listener
+	tlsConfig     *tls.Config
+	connections   map[string]net.Conn
+	connectionsMu sync.Mutex
+
+	udpListener net.PacketConn
+}
+
+var sampleConfig = `
+  ## Specify an ip or hostname with port - eg., tcp://localhost:6514, tcp://10.0.0.1:6514
+  ## Protocol, address and port to host the syslog receiver.
+  ## If no host is specified, then localhost is used.
+  ## If no port is specified, 6514 is used (RFC5425#section-4.1).
+  server = "tcp://:6514"
+
+  ## TLS Config
+  # tls_allowed_cacerts = ["/etc/telegraf/ca.pem"]
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+
+  ## Period between keep alive probes.
+  ## 0 disables keep alive probes.
+  ## Defaults to the OS configuration.
+  ## Only applies to stream sockets (e.g. TCP).
+  # keep_alive_period = "5m"
+
+  ## Maximum number of concurrent connections (default = 0).
+  ## 0 means unlimited.
+  ## Only applies to stream sockets (e.g. TCP).
+  # max_connections = 1024
+
+  ## Read timeout (default = 500ms).
+  ## 0 means unlimited.
+  # read_timeout = 500ms
+
+  ## Whether to parse in best effort mode or not (default = false).
+  ## By default best effort parsing is off.
+  # best_effort = false
+
+  ## Character to prepend to SD-PARAMs (default = "_").
+  ## A syslog message can contain multiple parameters and multiple identifiers within structured data section.
+  ## Eg., [id1 name1="val1" name2="val2"][id2 name1="val1" nameA="valA"]
+  ## For each combination a field is created.
+  ## Its name is created concatenating identifier, sdparam_separator, and parameter name.
+  # sdparam_separator = "_"
+`
+
+// SampleConfig returns sample configuration message
+func (s *Syslog) SampleConfig() string {
+	return sampleConfig
+}
+
+// Description returns the plugin description
+func (s *Syslog) Description() string {
+	return "Accepts syslog messages per RFC5425"
+}
+
+// Gather ...
+func (s *Syslog) Gather(_ telegraf.Accumulator) error {
+	return nil
+}
+
+// Start starts the service.
+func (s *Syslog) Start(acc telegraf.Accumulator) error {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+
+	scheme, host, err := getAddressParts(s.Address)
+	if err != nil {
+		return err
+	}
+	s.Address = host
+
+	switch scheme {
+	case "tcp", "tcp4", "tcp6", "unix", "unixpacket":
+		s.isStream = true
+	case "udp", "udp4", "udp6", "ip", "ip4", "ip6", "unixgram":
+		s.isStream = false
+	default:
+		return fmt.Errorf("unknown protocol '%s' in '%s'", scheme, s.Address)
+	}
+
+	if scheme == "unix" || scheme == "unixpacket" || scheme == "unixgram" {
+		os.Remove(s.Address)
+	}
+
+	if s.isStream {
+		l, err := net.Listen(scheme, s.Address)
+		if err != nil {
+			return err
+		}
+		s.Closer = l
+		s.tcpListener = l
+		s.tlsConfig, err = s.TLSConfig()
+		if err != nil {
+			return err
+		}
+
+		s.wg.Add(1)
+		go s.listenStream(acc)
+	} else {
+		l, err := net.ListenPacket(scheme, s.Address)
+		if err != nil {
+			return err
+		}
+		s.Closer = l
+		s.udpListener = l
+
+		s.wg.Add(1)
+		go s.listenPacket(acc)
+	}
+
+	if scheme == "unix" || scheme == "unixpacket" || scheme == "unixgram" {
+		s.Closer = unixCloser{path: s.Address, closer: s.Closer}
+	}
+
+	return nil
+}
+
+// Stop cleans up all resources
+func (s *Syslog) Stop() {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+
+	if s.Closer != nil {
+		s.Close()
+	}
+	s.wg.Wait()
+}
+
+// getAddressParts returns the address scheme and host
+// it also sets defaults for them when missing
+// when the input address does not specify the protocol it returns an error
+func getAddressParts(a string) (string, string, error) {
+	parts := strings.SplitN(a, "://", 2)
+	if len(parts) != 2 {
+		return "", "", fmt.Errorf("missing protocol within address '%s'", a)
+	}
+
+	u, _ := url.Parse(a)
+	switch u.Scheme {
+	case "unix", "unixpacket", "unixgram":
+		return parts[0], parts[1], nil
+	}
+
+	var host string
+	if u.Hostname() != "" {
+		host = u.Hostname()
+	}
+	host += ":"
+	if u.Port() == "" {
+		host += "6514"
+	} else {
+		host += u.Port()
+	}
+
+	return u.Scheme, host, nil
+}
+
+func (s *Syslog) listenPacket(acc telegraf.Accumulator) {
+	defer s.wg.Done()
+	b := make([]byte, ipMaxPacketSize)
+	p := rfc5424.NewParser()
+	for {
+		n, _, err := s.udpListener.ReadFrom(b)
+		if err != nil {
+			if !strings.HasSuffix(err.Error(), ": use of closed network connection") {
+				acc.AddError(err)
+			}
+			break
+		}
+
+		if s.ReadTimeout != nil && s.ReadTimeout.Duration > 0 {
+			s.udpListener.SetReadDeadline(time.Now().Add(s.ReadTimeout.Duration))
+		}
+
+		message, err := p.Parse(b[:n], &s.BestEffort)
+		if message != nil {
+			acc.AddFields("syslog", fields(*message, s), tags(*message), s.time())
+		}
+		if err != nil {
+			acc.AddError(err)
+		}
+	}
+}
+
+func (s *Syslog) listenStream(acc telegraf.Accumulator) {
+	defer s.wg.Done()
+
+	s.connections = map[string]net.Conn{}
+
+	for {
+		conn, err := s.tcpListener.Accept()
+		if err != nil {
+			if !strings.HasSuffix(err.Error(), ": use of closed network connection") {
+				acc.AddError(err)
+			}
+			break
+		}
+		var tcpConn, _ = conn.(*net.TCPConn)
+		if s.tlsConfig != nil {
+			conn = tls.Server(conn, s.tlsConfig)
+		}
+
+		s.connectionsMu.Lock()
+		if s.MaxConnections > 0 && len(s.connections) >= s.MaxConnections {
+			s.connectionsMu.Unlock()
+			conn.Close()
+			continue
+		}
+		s.connections[conn.RemoteAddr().String()] = conn
+		s.connectionsMu.Unlock()
+
+		if err := s.setKeepAlive(tcpConn); err != nil {
+			acc.AddError(fmt.Errorf("unable to configure keep alive (%s): %s", s.Address, err))
+		}
+
+		go s.handle(conn, acc)
+	}
+
+	s.connectionsMu.Lock()
+	for _, c := range s.connections {
+		c.Close()
+	}
+	s.connectionsMu.Unlock()
+}
+
+func (s *Syslog) removeConnection(c net.Conn) {
+	s.connectionsMu.Lock()
+	delete(s.connections, c.RemoteAddr().String())
+	s.connectionsMu.Unlock()
+}
+
+func (s *Syslog) handle(conn net.Conn, acc telegraf.Accumulator) {
+	defer func() {
+		s.removeConnection(conn)
+		conn.Close()
+	}()
+
+	if s.ReadTimeout != nil && s.ReadTimeout.Duration > 0 {
+		conn.SetReadDeadline(time.Now().Add(s.ReadTimeout.Duration))
+	}
+
+	var p *rfc5425.Parser
+	if s.BestEffort {
+		p = rfc5425.NewParser(conn, rfc5425.WithBestEffort())
+	} else {
+		p = rfc5425.NewParser(conn)
+	}
+
+	p.ParseExecuting(func(r *rfc5425.Result) {
+		s.store(*r, acc)
+	})
+}
+
+func (s *Syslog) setKeepAlive(c *net.TCPConn) error {
+	if s.KeepAlivePeriod == nil {
+		return nil
+	}
+
+	if s.KeepAlivePeriod.Duration == 0 {
+		return c.SetKeepAlive(false)
+	}
+	if err := c.SetKeepAlive(true); err != nil {
+		return err
+	}
+	return c.SetKeepAlivePeriod(s.KeepAlivePeriod.Duration)
+}
+
+func (s *Syslog) store(res rfc5425.Result, acc telegraf.Accumulator) {
+	if res.Error != nil {
+		acc.AddError(res.Error)
+	}
+	if res.MessageError != nil {
+		acc.AddError(res.MessageError)
+	}
+	if res.Message != nil {
+		msg := *res.Message
+		acc.AddFields("syslog", fields(msg, s), tags(msg), s.time())
+	}
+}
+
+func tags(msg rfc5424.SyslogMessage) map[string]string {
+	ts := map[string]string{}
+
+	// Not checking assuming a minimally valid message
+	ts["severity"] = *msg.SeverityShortLevel()
+	ts["facility"] = *msg.FacilityLevel()
+
+	if msg.Hostname() != nil {
+		ts["hostname"] = *msg.Hostname()
+	}
+
+	if msg.Appname() != nil {
+		ts["appname"] = *msg.Appname()
+	}
+
+	return ts
+}
+
+func fields(msg rfc5424.SyslogMessage, s *Syslog) map[string]interface{} {
+	// Not checking assuming a minimally valid message
+	flds := map[string]interface{}{
+		"version": msg.Version(),
+	}
+	flds["severity_code"] = int(*msg.Severity())
+	flds["facility_code"] = int(*msg.Facility())
+
+	if msg.Timestamp() != nil {
+		flds["timestamp"] = (*msg.Timestamp()).UnixNano()
+	}
+
+	if msg.ProcID() != nil {
+		flds["procid"] = *msg.ProcID()
+	}
+
+	if msg.MsgID() != nil {
+		flds["msgid"] = *msg.MsgID()
+	}
+
+	if msg.Message() != nil {
+		flds["message"] = *msg.Message()
+	}
+
+	if msg.StructuredData() != nil {
+		for sdid, sdparams := range *msg.StructuredData() {
+			if len(sdparams) == 0 {
+				// When SD-ID does not have params we indicate its presence with a bool
+				flds[sdid] = true
+				continue
+			}
+			for name, value := range sdparams {
+				// Using whitespace as separator since it is not allowed by the grammar within SDID
+				flds[sdid+s.Separator+name] = value
+			}
+		}
+	}
+
+	return flds
+}
+
+type unixCloser struct {
+	path   string
+	closer io.Closer
+}
+
+func (uc unixCloser) Close() error {
+	err := uc.closer.Close()
+	os.Remove(uc.path) // ignore error
+	return err
+}
+
+func (s *Syslog) time() time.Time {
+	t := s.now()
+	if t == s.lastTime {
+		t = t.Add(time.Nanosecond)
+	}
+	s.lastTime = t
+	return t
+}
+
+func getNanoNow() time.Time {
+	return time.Unix(0, time.Now().UnixNano())
+}
+
+func init() {
+	receiver := &Syslog{
+		Address: ":6514",
+		now:     getNanoNow,
+		ReadTimeout: &internal.Duration{
+			Duration: defaultReadTimeout,
+		},
+		Separator: "_",
+	}
+
+	inputs.Add("syslog", func() telegraf.Input { return receiver })
+}
--- a/plugins/inputs/syslog/syslog_test.go
+++ b/plugins/inputs/syslog/syslog_test.go
@@ -0,0 +1,68 @@
+package syslog
+
+import (
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/require"
+)
+
+const (
+	address = ":6514"
+)
+
+var defaultTime = time.Unix(0, 0)
+var maxP = uint8(191)
+var maxV = uint16(999)
+var maxTS = "2017-12-31T23:59:59.999999+00:00"
+var maxH = "abcdefghilmnopqrstuvzabcdefghilmnopqrstuvzabcdefghilmnopqrstuvzabcdefghilmnopqrstuvzabcdefghilmnopqrstuvzabcdefghilmnopqrstuvzabcdefghilmnopqrstuvzabcdefghilmnopqrstuvzabcdefghilmnopqrstuvzabcdefghilmnopqrstuvzabcdefghilmnopqrstuvzabcdefghilmnopqrstuvzabc"
+var maxA = "abcdefghilmnopqrstuvzabcdefghilmnopqrstuvzabcdef"
+var maxPID = "abcdefghilmnopqrstuvzabcdefghilmnopqrstuvzabcdefghilmnopqrstuvzabcdefghilmnopqrstuvzabcdefghilmnopqrstuvzabcdefghilmnopqrstuvzab"
+var maxMID = "abcdefghilmnopqrstuvzabcdefghilm"
+var message7681 = strings.Repeat("l", 7681)
+
+func TestAddress(t *testing.T) {
+	var err error
+	var rec *Syslog
+
+	rec = &Syslog{
+		Address: "localhost:6514",
+	}
+	err = rec.Start(&testutil.Accumulator{})
+	require.EqualError(t, err, "missing protocol within address 'localhost:6514'")
+	require.Error(t, err)
+
+	rec = &Syslog{
+		Address: "unsupported://example.com:6514",
+	}
+	err = rec.Start(&testutil.Accumulator{})
+	require.EqualError(t, err, "unknown protocol 'unsupported' in 'example.com:6514'")
+	require.Error(t, err)
+
+	tmpdir, err := ioutil.TempDir("", "telegraf")
+	defer os.RemoveAll(tmpdir)
+	require.NoError(t, err)
+	sock := filepath.Join(tmpdir, "syslog.TestAddress.sock")
+
+	rec = &Syslog{
+		Address: "unixgram://" + sock,
+	}
+	err = rec.Start(&testutil.Accumulator{})
+	require.NoError(t, err)
+	require.Equal(t, sock, rec.Address)
+	rec.Stop()
+
+	// Default port is 6514
+	rec = &Syslog{
+		Address: "tcp://localhost",
+	}
+	err = rec.Start(&testutil.Accumulator{})
+	require.NoError(t, err)
+	require.Equal(t, "localhost:6514", rec.Address)
+	rec.Stop()
+}
--- a/plugins/inputs/system/DISK_README.md
+++ b/plugins/inputs/system/DISK_README.md
@@ -16,7 +16,7 @@ https://en.wikipedia.org/wiki/Df_(Unix) for more details.
  # mount_points = ["/"]

  ## Ignore mount points by filesystem type.
-  ignore_fs = ["tmpfs", "devtmpfs", "devfs"]
+  ignore_fs = ["tmpfs", "devtmpfs", "devfs", "overlay", "aufs", "squashfs"]
 ```

 #### Docker container
--- a/plugins/inputs/system/disk.go
+++ b/plugins/inputs/system/disk.go
@@ -28,7 +28,7 @@ var diskSampleConfig = `
  # mount_points = ["/"]

  ## Ignore mount points by filesystem type.
-  ignore_fs = ["tmpfs", "devtmpfs", "devfs"]
+  ignore_fs = ["tmpfs", "devtmpfs", "devfs", "overlay", "aufs", "squashfs"]
 `

 func (_ *DiskStats) SampleConfig() string {
--- a/plugins/inputs/tengine/README.md
+++ b/plugins/inputs/tengine/README.md
@@ -0,0 +1,71 @@
+# Tengine Input Plugin
+
+The tengine plugin gathers metrics from the
+[Tengine Web Server](http://tengine.taobao.org/) via the
+[reqstat](http://tengine.taobao.org/document/http_reqstat.html) module.
+
+### Configuration:
+
+```toml
+# Read Tengine's basic status information (ngx_http_reqstat_module)
+[[inputs.tengine]]
+  ## An array of Tengine reqstat module URI to gather stats.
+  urls = ["http://127.0.0.1/us"]
+
+  ## HTTP response timeout (default: 5s)
+  # response_timeout = "5s"
+
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
+  # insecure_skip_verify = false
+```
+
+### Metrics:
+
+- Measurement
+  - tags:
+    - port
+    - server
+    - server_name
+  - fields:
+    - bytes_in (integer, total number of bytes received from client)
+    - bytes_out (integer, total number of bytes sent to client)
+    - conn_total (integer, total number of accepted connections)
+    - req_total (integer, total number of processed requests)
+    - http_2xx (integer, total number of 2xx requests)
+    - http_3xx (integer, total number of 3xx requests)
+    - http_4xx (integer, total number of 4xx requests)
+    - http_5xx (integer, total number of 5xx requests)
+    - http_other_status (integer, total number of other requests)
+    - rt (integer, accumulation or rt)
+    - ups_req (integer, total number of requests calling for upstream)
+    - ups_rt (integer, accumulation or upstream rt)
+    - ups_tries (integer, total number of times calling for upstream)
+    - http_200 (integer, total number of 200 requests)
+    - http_206 (integer, total number of 206 requests)
+    - http_302 (integer, total number of 302 requests)
+    - http_304 (integer, total number of 304 requests)
+    - http_403 (integer, total number of 403 requests)
+    - http_404 (integer, total number of 404 requests)
+    - http_416 (integer, total number of 416 requests)
+    - http_499 (integer, total number of 499 requests)
+    - http_500 (integer, total number of 500 requests)
+    - http_502 (integer, total number of 502 requests)
+    - http_503 (integer, total number of 503 requests)
+    - http_504 (integer, total number of 504 requests)
+    - http_508 (integer, total number of 508 requests)
+    - http_other_detail_status (integer, total number of requests of other status codes*http_ups_4xx total number of requests of upstream 4xx)
+    - http_ups_5xx (integer, total number of requests of upstream 5xx)
+
+### Example Output:
+
+```
+tengine,host=gcp-thz-api-5,port=80,server=localhost,server_name=localhost bytes_in=9129i,bytes_out=56334i,conn_total=14i,http_200=90i,http_206=0i,http_2xx=90i,http_302=0i,http_304=0i,http_3xx=0i,http_403=0i,http_404=0i,http_416=0i,http_499=0i,http_4xx=0i,http_500=0i,http_502=0i,http_503=0i,http_504=0i,http_508=0i,http_5xx=0i,http_other_detail_status=0i,http_other_status=0i,http_ups_4xx=0i,http_ups_5xx=0i,req_total=90i,rt=0i,ups_req=0i,ups_rt=0i,ups_tries=0i 1526546308000000000
+tengine,host=gcp-thz-api-5,port=80,server=localhost,server_name=28.79.190.35.bc.googleusercontent.com bytes_in=1500i,bytes_out=3009i,conn_total=4i,http_200=1i,http_206=0i,http_2xx=1i,http_302=0i,http_304=0i,http_3xx=0i,http_403=0i,http_404=1i,http_416=0i,http_499=0i,http_4xx=3i,http_500=0i,http_502=0i,http_503=0i,http_504=0i,http_508=0i,http_5xx=0i,http_other_detail_status=0i,http_other_status=0i,http_ups_4xx=0i,http_ups_5xx=0i,req_total=4i,rt=0i,ups_req=0i,ups_rt=0i,ups_tries=0i 1526546308000000000
+tengine,host=gcp-thz-api-5,port=80,server=localhost,server_name=www.google.com bytes_in=372i,bytes_out=786i,conn_total=1i,http_200=1i,http_206=0i,http_2xx=1i,http_302=0i,http_304=0i,http_3xx=0i,http_403=0i,http_404=0i,http_416=0i,http_499=0i,http_4xx=0i,http_500=0i,http_502=0i,http_503=0i,http_504=0i,http_508=0i,http_5xx=0i,http_other_detail_status=0i,http_other_status=0i,http_ups_4xx=0i,http_ups_5xx=0i,req_total=1i,rt=0i,ups_req=0i,ups_rt=0i,ups_tries=0i 1526546308000000000
+tengine,host=gcp-thz-api-5,port=80,server=localhost,server_name=35.190.79.28 bytes_in=4433i,bytes_out=10259i,conn_total=5i,http_200=3i,http_206=0i,http_2xx=3i,http_302=0i,http_304=0i,http_3xx=0i,http_403=0i,http_404=11i,http_416=0i,http_499=0i,http_4xx=11i,http_500=0i,http_502=0i,http_503=0i,http_504=0i,http_508=0i,http_5xx=0i,http_other_detail_status=0i,http_other_status=0i,http_ups_4xx=0i,http_ups_5xx=0i,req_total=14i,rt=0i,ups_req=0i,ups_rt=0i,ups_tries=0i 1526546308000000000
+tengine,host=gcp-thz-api-5,port=80,server=localhost,server_name=tenka-prod-api.txwy.tw bytes_in=3014397400i,bytes_out=14279992835i,conn_total=36844i,http_200=3177339i,http_206=0i,http_2xx=3177339i,http_302=0i,http_304=0i,http_3xx=0i,http_403=0i,http_404=123i,http_416=0i,http_499=0i,http_4xx=123i,http_500=17214i,http_502=4453i,http_503=80i,http_504=0i,http_508=0i,http_5xx=21747i,http_other_detail_status=0i,http_other_status=0i,http_ups_4xx=123i,http_ups_5xx=21747i,req_total=3199209i,rt=245874536i,ups_req=2685076i,ups_rt=245858217i,ups_tries=2685076i 1526546308000000000
+```
--- a/plugins/inputs/tengine/tengine.go
+++ b/plugins/inputs/tengine/tengine.go
@@ -0,0 +1,338 @@
+package tengine
+
+import (
+	"bufio"
+	"fmt"
+	"net"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+
+	"io"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+type Tengine struct {
+	Urls            []string
+	ResponseTimeout internal.Duration
+	tls.ClientConfig
+
+	client *http.Client
+}
+
+var sampleConfig = `
+  # An array of Tengine reqstat module URI to gather stats.
+  urls = ["http://127.0.0.1/us"]
+
+  # HTTP response timeout (default: 5s)
+  # response_timeout = "5s"
+
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.cer"
+  # tls_key = "/etc/telegraf/key.key"
+  ## Use TLS but skip chain & host verification
+  # insecure_skip_verify = false
+`
+
+func (n *Tengine) SampleConfig() string {
+	return sampleConfig
+}
+
+func (n *Tengine) Description() string {
+	return "Read Tengine's basic status information (ngx_http_reqstat_module)"
+}
+
+func (n *Tengine) Gather(acc telegraf.Accumulator) error {
+	var wg sync.WaitGroup
+
+	// Create an HTTP client that is re-used for each
+	// collection interval
+	if n.client == nil {
+		client, err := n.createHttpClient()
+		if err != nil {
+			return err
+		}
+		n.client = client
+	}
+
+	for _, u := range n.Urls {
+		addr, err := url.Parse(u)
+		if err != nil {
+			acc.AddError(fmt.Errorf("Unable to parse address '%s': %s", u, err))
+			continue
+		}
+
+		wg.Add(1)
+		go func(addr *url.URL) {
+			defer wg.Done()
+			acc.AddError(n.gatherUrl(addr, acc))
+		}(addr)
+	}
+
+	wg.Wait()
+	return nil
+}
+
+func (n *Tengine) createHttpClient() (*http.Client, error) {
+	tlsCfg, err := n.ClientConfig.TLSConfig()
+	if err != nil {
+		return nil, err
+	}
+
+	if n.ResponseTimeout.Duration < time.Second {
+		n.ResponseTimeout.Duration = time.Second * 5
+	}
+
+	client := &http.Client{
+		Transport: &http.Transport{
+			TLSClientConfig: tlsCfg,
+		},
+		Timeout: n.ResponseTimeout.Duration,
+	}
+
+	return client, nil
+}
+
+type TengineSatus struct {
+	host                     string
+	bytes_in                 uint64
+	bytes_out                uint64
+	conn_total               uint64
+	req_total                uint64
+	http_2xx                 uint64
+	http_3xx                 uint64
+	http_4xx                 uint64
+	http_5xx                 uint64
+	http_other_status        uint64
+	rt                       uint64
+	ups_req                  uint64
+	ups_rt                   uint64
+	ups_tries                uint64
+	http_200                 uint64
+	http_206                 uint64
+	http_302                 uint64
+	http_304                 uint64
+	http_403                 uint64
+	http_404                 uint64
+	http_416                 uint64
+	http_499                 uint64
+	http_500                 uint64
+	http_502                 uint64
+	http_503                 uint64
+	http_504                 uint64
+	http_508                 uint64
+	http_other_detail_status uint64
+	http_ups_4xx             uint64
+	http_ups_5xx             uint64
+}
+
+func (n *Tengine) gatherUrl(addr *url.URL, acc telegraf.Accumulator) error {
+	var tenginestatus TengineSatus
+	resp, err := n.client.Get(addr.String())
+	if err != nil {
+		return fmt.Errorf("error making HTTP request to %s: %s", addr.String(), err)
+	}
+	defer resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		return fmt.Errorf("%s returned HTTP status %s", addr.String(), resp.Status)
+	}
+	r := bufio.NewReader(resp.Body)
+
+	for {
+		line, err := r.ReadString('\n')
+
+		if err != nil || io.EOF == err {
+			break
+		}
+		line_split := strings.Split(strings.TrimSpace(line), ",")
+		if len(line_split) != 30 {
+			continue
+		}
+		tenginestatus.host = line_split[0]
+		if err != nil {
+			return err
+		}
+		tenginestatus.bytes_in, err = strconv.ParseUint(line_split[1], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.bytes_out, err = strconv.ParseUint(line_split[2], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.conn_total, err = strconv.ParseUint(line_split[3], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.req_total, err = strconv.ParseUint(line_split[4], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_2xx, err = strconv.ParseUint(line_split[5], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_3xx, err = strconv.ParseUint(line_split[6], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_4xx, err = strconv.ParseUint(line_split[7], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_5xx, err = strconv.ParseUint(line_split[8], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_other_status, err = strconv.ParseUint(line_split[9], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.rt, err = strconv.ParseUint(line_split[10], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.ups_req, err = strconv.ParseUint(line_split[11], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.ups_rt, err = strconv.ParseUint(line_split[12], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.ups_tries, err = strconv.ParseUint(line_split[13], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_200, err = strconv.ParseUint(line_split[14], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_206, err = strconv.ParseUint(line_split[15], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_302, err = strconv.ParseUint(line_split[16], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_304, err = strconv.ParseUint(line_split[17], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_403, err = strconv.ParseUint(line_split[18], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_404, err = strconv.ParseUint(line_split[19], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_416, err = strconv.ParseUint(line_split[20], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_499, err = strconv.ParseUint(line_split[21], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_500, err = strconv.ParseUint(line_split[22], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_502, err = strconv.ParseUint(line_split[23], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_503, err = strconv.ParseUint(line_split[24], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_504, err = strconv.ParseUint(line_split[25], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_508, err = strconv.ParseUint(line_split[26], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_other_detail_status, err = strconv.ParseUint(line_split[27], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_ups_4xx, err = strconv.ParseUint(line_split[28], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_ups_5xx, err = strconv.ParseUint(line_split[29], 10, 64)
+		if err != nil {
+			return err
+		}
+		tags := getTags(addr, tenginestatus.host)
+		fields := map[string]interface{}{
+			"bytes_in":                 tenginestatus.bytes_in,
+			"bytes_out":                tenginestatus.bytes_out,
+			"conn_total":               tenginestatus.conn_total,
+			"req_total":                tenginestatus.req_total,
+			"http_2xx":                 tenginestatus.http_2xx,
+			"http_3xx":                 tenginestatus.http_3xx,
+			"http_4xx":                 tenginestatus.http_4xx,
+			"http_5xx":                 tenginestatus.http_5xx,
+			"http_other_status":        tenginestatus.http_other_status,
+			"rt":                       tenginestatus.rt,
+			"ups_req":                  tenginestatus.ups_req,
+			"ups_rt":                   tenginestatus.ups_rt,
+			"ups_tries":                tenginestatus.ups_tries,
+			"http_200":                 tenginestatus.http_200,
+			"http_206":                 tenginestatus.http_206,
+			"http_302":                 tenginestatus.http_302,
+			"http_304":                 tenginestatus.http_304,
+			"http_403":                 tenginestatus.http_403,
+			"http_404":                 tenginestatus.http_404,
+			"http_416":                 tenginestatus.http_416,
+			"http_499":                 tenginestatus.http_499,
+			"http_500":                 tenginestatus.http_500,
+			"http_502":                 tenginestatus.http_502,
+			"http_503":                 tenginestatus.http_503,
+			"http_504":                 tenginestatus.http_504,
+			"http_508":                 tenginestatus.http_508,
+			"http_other_detail_status": tenginestatus.http_other_detail_status,
+			"http_ups_4xx":             tenginestatus.http_ups_4xx,
+			"http_ups_5xx":             tenginestatus.http_ups_5xx,
+		}
+		acc.AddFields("tengine", fields, tags)
+	}
+
+	return nil
+}
+
+// Get tag(s) for the tengine plugin
+func getTags(addr *url.URL, server_name string) map[string]string {
+	h := addr.Host
+	host, port, err := net.SplitHostPort(h)
+	if err != nil {
+		host = addr.Host
+		if addr.Scheme == "http" {
+			port = "80"
+		} else if addr.Scheme == "https" {
+			port = "443"
+		} else {
+			port = ""
+		}
+	}
+	return map[string]string{"server": host, "port": port, "server_name": server_name}
+}
+
+func init() {
+	inputs.Add("tengine", func() telegraf.Input {
+		return &Tengine{}
+	})
+}
--- a/plugins/inputs/tengine/tengine_test.go
+++ b/plugins/inputs/tengine/tengine_test.go
@@ -0,0 +1,97 @@
+package tengine
+
+import (
+	"fmt"
+	"net"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+const tengineSampleResponse = `127.0.0.1,784,1511,2,2,1,0,1,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0`
+
+// Verify that tengine tags are properly parsed based on the server
+func TestTengineTags(t *testing.T) {
+	urls := []string{"http://localhost/us", "http://localhost:80/us"}
+	var addr *url.URL
+	for _, url1 := range urls {
+		addr, _ = url.Parse(url1)
+		tagMap := getTags(addr, "127.0.0.1")
+		assert.Contains(t, tagMap["server"], "localhost")
+	}
+}
+
+func TestTengineGeneratesMetrics(t *testing.T) {
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		var rsp string
+		rsp = tengineSampleResponse
+		fmt.Fprintln(w, rsp)
+	}))
+	defer ts.Close()
+
+	n := &Tengine{
+		Urls: []string{fmt.Sprintf("%s/us", ts.URL)},
+	}
+
+	var acc_tengine testutil.Accumulator
+
+	err_tengine := acc_tengine.GatherError(n.Gather)
+
+	require.NoError(t, err_tengine)
+
+	fields_tengine := map[string]interface{}{
+		"bytes_in":                 uint64(784),
+		"bytes_out":                uint64(1511),
+		"conn_total":               uint64(2),
+		"req_total":                uint64(2),
+		"http_2xx":                 uint64(1),
+		"http_3xx":                 uint64(0),
+		"http_4xx":                 uint64(1),
+		"http_5xx":                 uint64(0),
+		"http_other_status":        uint64(0),
+		"rt":                       uint64(0),
+		"ups_req":                  uint64(0),
+		"ups_rt":                   uint64(0),
+		"ups_tries":                uint64(0),
+		"http_200":                 uint64(1),
+		"http_206":                 uint64(0),
+		"http_302":                 uint64(0),
+		"http_304":                 uint64(0),
+		"http_403":                 uint64(0),
+		"http_404":                 uint64(1),
+		"http_416":                 uint64(0),
+		"http_499":                 uint64(0),
+		"http_500":                 uint64(0),
+		"http_502":                 uint64(0),
+		"http_503":                 uint64(0),
+		"http_504":                 uint64(0),
+		"http_508":                 uint64(0),
+		"http_other_detail_status": uint64(0),
+		"http_ups_4xx":             uint64(0),
+		"http_ups_5xx":             uint64(0),
+	}
+
+	addr, err := url.Parse(ts.URL)
+	if err != nil {
+		panic(err)
+	}
+
+	host, port, err := net.SplitHostPort(addr.Host)
+	if err != nil {
+		host = addr.Host
+		if addr.Scheme == "http" {
+			port = "80"
+		} else if addr.Scheme == "https" {
+			port = "443"
+		} else {
+			port = ""
+		}
+	}
+	tags := map[string]string{"server": host, "port": port, "server_name": "127.0.0.1"}
+	acc_tengine.AssertContainsTaggedFields(t, "tengine", fields_tengine, tags)
+}
--- a/plugins/inputs/varnish/README.md
+++ b/plugins/inputs/varnish/README.md
@@ -20,7 +20,7 @@ This plugin gathers stats from [Varnish HTTP Cache](https://varnish-cache.org/)

   ## Optional name for the varnish instance (or working directory) to query
   ## Usually appened after -n in varnish cli
-   #name = instanceName
+   # instance_name = instanceName
 ```

 ### Measurements & Fields:
--- a/plugins/inputs/varnish/varnish.go
+++ b/plugins/inputs/varnish/varnish.go
@@ -48,7 +48,7 @@ var sampleConfig = `

  ## Optional name for the varnish instance (or working directory) to query
  ## Usually appened after -n in varnish cli
-  #name = instanceName
+  # instance_name = instanceName
 `

 func (s *Varnish) Description() string {
--- a/plugins/inputs/win_perf_counters/README.md
+++ b/plugins/inputs/win_perf_counters/README.md
@@ -1,20 +1,22 @@
 # win_perf_counters readme

-The way this plugin works is that on load of Telegraf,
-the plugin will be handed configuration from Telegraf.
-This configuration is parsed and then tested for validity such as
-if the Object, Instance and Counter existing.
-If it does not match at startup, it will not be fetched.
-Exceptions to this are in cases where you query for all instances "*".
-By default the plugin does not return _Total
-when it is querying for all (*) as this is redundant.
+This document presents the input plugin to read Performance Counters on Windows operating systems.
+
+The configuration is parsed and then tested for validity, such as
+whether the Object, Instance and Counter exist on Telegraf startup.
+
+Counter paths are refreshed periodically, see the [CountersRefreshInterval](#countersrefreshinterval)
+configuration parameter for more info.
+
+In case of query for all instances `["*"]`, the plugin does not return the instance `_Total`
+by default. See [IncludeTotal](#includetotal) for more info.

 ## Basics

 The examples contained in this file have been found on the internet
 as counters used when performance monitoring
- Active Directory and IIS in perticular.
- There are a lot other good objects to monitor, if you know what to look for.
+ Active Directory and IIS in particular.
+ There are a lot of other good objects to monitor, if you know what to look for.
 This file is likely to be updated in the future with more examples for
 useful configurations for separate scenarios.

@@ -29,9 +31,41 @@ Bool, if set to `true` will print out all matching performance objects.
 Example:
 `PrintValid=true`

+#### UseWildcardsExpansion
+
+If `UseWildcardsExpansion` is set to true, wildcards can be used in the
+instance name and the counter name.  When using localized Windows, counters
+will be also be localized.  Instance indexes will also be returned in the
+instance name.
+
+Partial wildcards (e.g. `chrome*`) are supported only in the instance name on Windows Vista and newer.
+
+If disabled, wildcards (not partial) in instance names can still be used, but
+instance indexes will not be returned in the instance names.
+
+Example:
+`UseWildcardsExpansion=true`
+
+#### CountersRefreshInterval
+
+Configured counters are matched against available counters at the interval
+specified by the `CountersRefreshInterval` parameter. The default value is `1m` (1 minute).
+
+If wildcards are used in instance or counter names, they are expanded at this point, if the `UseWildcardsExpansion` param is set to `true`.
+
+Setting the `CountersRefreshInterval` too low (order of seconds) can cause Telegraf to create
+a high CPU load.
+
+Set it to `0s` to disable periodic refreshing.
+
+Example:
+`CountersRefreshInterval=1m`
+
 #### PreVistaSupport

-Bool, if set to `true` will use the localized PerfCounter interface that is present before Vista for backwards compatability.
+_Deprecated. Necessary features on Windows Vista and newer are checked dynamically_
+
+Bool, if set to `true`, the plugin will use the localized PerfCounter interface that has been present since before Vista for backwards compatability.

 It is recommended NOT to use this on OSes starting with Vista and newer because it requires more configuration to use this than the newer interface present since Vista.

@@ -43,12 +77,12 @@ Example for Windows Server 2003, this would be set to true:
 See Entry below.

 ### Entry
-A new configuration entry consists of the TOML header to start with,
+A new configuration entry consists of the TOML header starting with,
 `[[inputs.win_perf_counters.object]]`.
-This must follow before other plugins configuration,
+This must follow before other plugin configurations,
 beneath the main win_perf_counters entry, `[[inputs.win_perf_counters]]`.

-Following this is 3 required key/value pairs and the three optional parameters and their usage.
+Following this are 3 required key/value pairs and three optional parameters and their usage.

 #### ObjectName
 **Required**
@@ -60,64 +94,70 @@ Example: `ObjectName = "LogicalDisk"`
 #### Instances
 **Required**

-Instances (this is an array) is the instances of a counter you would like returned,
+The instances key (this is an array) declares the instances of a counter you would like returned,
 it can be one or more values.

-Example, `Instances = ["C:","D:","E:"]` will return only for the instances
-C:, D: and E: where relevant. To get all instances of a Counter, use ["*"] only.
-By default any results containing _Total are stripped,
-unless this is specified as the wanted instance.
-Alternatively see the option IncludeTotal below.
+Example: `Instances = ["C:","D:","E:"]`

-Some Objects does not have instances to select from at all,
-here only one option is valid if you want data back,
+This will return only for the instances
+C:, D: and E: where relevant. To get all instances of a Counter, use `["*"]` only.
+By default any results containing `_Total` are stripped,
+unless this is specified as the wanted instance.
+Alternatively see the option `IncludeTotal` below.
+
+It is also possible to set partial wildcards, eg. `["chrome*"]`, if the `UseWildcardsExpansion` param is set to `true`
+
+Some Objects do not have instances to select from at all.
+Here only one option is valid if you want data back,
 and that is to specify `Instances = ["------"]`.

 #### Counters
 **Required**

-Counters (this is an array) is the counters of the ObjectName
+The Counters key (this is an array) declares the counters of the ObjectName
 you would like returned, it can also be one or more values.

 Example: `Counters = ["% Idle Time", "% Disk Read Time", "% Disk Write Time"]`
-This must be specified for every counter you want the results of,
-it is not possible to ask for all counters in the ObjectName.
+
+This must be specified for every counter you want the results of, or use
+`["*"]` for all the counters of the object, if the `UseWildcardsExpansion` param
+is set to `true`.

 #### Measurement
 *Optional*

-This key is optional, if it is not set it will be win_perf_counters.
-In InfluxDB this is the key by which the returned data is stored underneath,
-so for ordering your data in a good manner,
-this is a good key to set with where you want your IIS and Disk results stored,
-separate from Processor results.
+This key is optional. If it is not set it will be `win_perf_counters`.
+In InfluxDB this is the key underneath which the returned data is stored.
+So for ordering your data in a good manner,
+this is a good key to set with a value when you want your IIS and Disk results stored
+separately from Processor results.

-Example: `Measurement = "win_disk"
+Example: `Measurement = "win_disk"``

 #### IncludeTotal
 *Optional*

-This key is optional, it is a simple bool.
+This key is optional. It is a simple bool.
 If it is not set to true or included it is treated as false.
-This key only has an effect if Instances is set to "*"
-and you would also like all instances containg _Total returned,
-like "_Total", "0,_Total" and so on where applicable
+This key only has effect if the Instances key is set to `["*"]`
+and you would also like all instances containing `_Total` to be returned,
+like `_Total`, `0,_Total` and so on where applicable
 (Processor Information is one example).

 #### WarnOnMissing
 *Optional*

-This key is optional, it is a simple bool.
+This key is optional. It is a simple bool.
 If it is not set to true or included it is treated as false.
-This only has an effect on the first execution of the plugin,
-it will print out any ObjectName/Instance/Counter combinations
-asked for that does not match. Useful when debugging new configurations.
+This only has effect on the first execution of the plugin.
+It will print out any ObjectName/Instance/Counter combinations
+asked for that do not match. Useful when debugging new configurations.

 #### FailOnMissing
 *Internal*

-This key should not be used, it is for testing purposes only.
-It is a simple bool, if it is not set to true or included this is treaded as false.
+This key should not be used. It is for testing purposes only.
+It is a simple bool. If it is not set to true or included this is treated as false.
 If this is set to true, the plugin will abort and end prematurely
 if any of the combinations of ObjectName/Instances/Counters are invalid.

@@ -337,10 +377,14 @@ if any of the combinations of ObjectName/Instances/Counters are invalid.

 ## Troubleshooting

+If you are getting an error about an invalid counter, use the `typeperf` command to check the counter path
+on the command line.
+E.g. `typeperf "Process(chrome*)\% Processor Time"`
+
 If no metrics are emitted even with the default config, you may need to repair
 your performance counters.

-1. Launch Command Prompt as Administrator (right click Runs As Administrator).
+1. Launch the Command Prompt as Administrator (right click Runs As Administrator).
 1. Drop into the C:\WINDOWS\System32 directory by typing `C:` then `cd \Windows\System32`
 1. Rebuild your counter values, which may take a few moments so please be
   patient, by running:
--- a/plugins/inputs/win_perf_counters/pdh.go
+++ b/plugins/inputs/win_perf_counters/pdh.go
@@ -161,43 +161,6 @@ type (
 	PDH_HCOUNTER HANDLE // counter handle
 )

-// Union specialization for double values
-type PDH_FMT_COUNTERVALUE_DOUBLE struct {
-	CStatus     uint32
-	DoubleValue float64
-}
-
-// Union specialization for 64 bit integer values
-type PDH_FMT_COUNTERVALUE_LARGE struct {
-	CStatus    uint32
-	LargeValue int64
-}
-
-// Union specialization for long values
-type PDH_FMT_COUNTERVALUE_LONG struct {
-	CStatus   uint32
-	LongValue int32
-	padding   [4]byte
-}
-
-// Union specialization for double values, used by PdhGetFormattedCounterArrayDouble()
-type PDH_FMT_COUNTERVALUE_ITEM_DOUBLE struct {
-	SzName   *uint16 // pointer to a string
-	FmtValue PDH_FMT_COUNTERVALUE_DOUBLE
-}
-
-// Union specialization for 'large' values, used by PdhGetFormattedCounterArrayLarge()
-type PDH_FMT_COUNTERVALUE_ITEM_LARGE struct {
-	SzName   *uint16 // pointer to a string
-	FmtValue PDH_FMT_COUNTERVALUE_LARGE
-}
-
-// Union specialization for long values, used by PdhGetFormattedCounterArrayLong()
-type PDH_FMT_COUNTERVALUE_ITEM_LONG struct {
-	SzName   *uint16 // pointer to a string
-	FmtValue PDH_FMT_COUNTERVALUE_LONG
-}
-
 var (
 	// Library
 	libpdhDll *syscall.DLL
@@ -211,6 +174,8 @@ var (
 	pdh_GetFormattedCounterArrayW *syscall.Proc
 	pdh_OpenQuery                 *syscall.Proc
 	pdh_ValidatePathW             *syscall.Proc
+	pdh_ExpandWildCardPathW       *syscall.Proc
+	pdh_GetCounterInfoW           *syscall.Proc
 )

 func init() {
@@ -226,9 +191,11 @@ func init() {
 	pdh_GetFormattedCounterArrayW = libpdhDll.MustFindProc("PdhGetFormattedCounterArrayW")
 	pdh_OpenQuery = libpdhDll.MustFindProc("PdhOpenQuery")
 	pdh_ValidatePathW = libpdhDll.MustFindProc("PdhValidatePathW")
+	pdh_ExpandWildCardPathW = libpdhDll.MustFindProc("PdhExpandWildCardPathW")
+	pdh_GetCounterInfoW = libpdhDll.MustFindProc("PdhGetCounterInfoW")
 }

-// Adds the specified counter to the query. This is the internationalized version. Preferably, use the
+// PdhAddCounter adds the specified counter to the query. This is the internationalized version. Preferably, use the
 // function PdhAddEnglishCounter instead. hQuery is the query handle, which has been fetched by PdhOpenQuery.
 // szFullCounterPath is a full, internationalized counter path (this will differ per Windows language version).
 // dwUserData is a 'user-defined value', which becomes part of the counter information. To retrieve this value
@@ -277,7 +244,14 @@ func PdhAddCounter(hQuery PDH_HQUERY, szFullCounterPath string, dwUserData uintp
 	return uint32(ret)
 }

-// Adds the specified language-neutral counter to the query. See the PdhAddCounter function. This function only exists on
+// PdhAddEnglishCounterSupported returns true if PdhAddEnglishCounterW Win API function was found in pdh.dll.
+// PdhAddEnglishCounterW function is not supported on pre-Windows Vista systems
+
+func PdhAddEnglishCounterSupported() bool {
+	return pdh_AddEnglishCounterW != nil
+}
+
+// PdhAddEnglishCounter adds the specified language-neutral counter to the query. See the PdhAddCounter function. This function only exists on
 // Windows versions higher than Vista.
 func PdhAddEnglishCounter(hQuery PDH_HQUERY, szFullCounterPath string, dwUserData uintptr, phCounter *PDH_HCOUNTER) uint32 {
 	if pdh_AddEnglishCounterW == nil {
@@ -294,7 +268,7 @@ func PdhAddEnglishCounter(hQuery PDH_HQUERY, szFullCounterPath string, dwUserDat
 	return uint32(ret)
 }

-// Closes all counters contained in the specified query, closes all handles related to the query,
+// PdhCloseQuery closes all counters contained in the specified query, closes all handles related to the query,
 // and frees all memory associated with the query.
 func PdhCloseQuery(hQuery PDH_HQUERY) uint32 {
 	ret, _, _ := pdh_CloseQuery.Call(uintptr(hQuery))
@@ -329,7 +303,7 @@ func PdhCollectQueryData(hQuery PDH_HQUERY) uint32 {
 	return uint32(ret)
 }

-// Formats the given hCounter using a 'double'. The result is set into the specialized union struct pValue.
+// PdhGetFormattedCounterValueDouble formats the given hCounter using a 'double'. The result is set into the specialized union struct pValue.
 // This function does not directly translate to a Windows counterpart due to union specialization tricks.
 func PdhGetFormattedCounterValueDouble(hCounter PDH_HCOUNTER, lpdwType *uint32, pValue *PDH_FMT_COUNTERVALUE_DOUBLE) uint32 {
 	ret, _, _ := pdh_GetFormattedCounterValue.Call(
@@ -341,7 +315,7 @@ func PdhGetFormattedCounterValueDouble(hCounter PDH_HCOUNTER, lpdwType *uint32,
 	return uint32(ret)
 }

-// Returns an array of formatted counter values. Use this function when you want to format the counter values of a
+// PdhGetFormattedCounterArrayDouble returns an array of formatted counter values. Use this function when you want to format the counter values of a
 // counter that contains a wildcard character for the instance name. The itemBuffer must a slice of type PDH_FMT_COUNTERVALUE_ITEM_DOUBLE.
 // An example of how this function can be used:
 //
@@ -378,7 +352,7 @@ func PdhGetFormattedCounterValueDouble(hCounter PDH_HCOUNTER, lpdwType *uint32,
 //			time.Sleep(2000 * time.Millisecond)
 //		}
 //	}
-func PdhGetFormattedCounterArrayDouble(hCounter PDH_HCOUNTER, lpdwBufferSize *uint32, lpdwBufferCount *uint32, itemBuffer *PDH_FMT_COUNTERVALUE_ITEM_DOUBLE) uint32 {
+func PdhGetFormattedCounterArrayDouble(hCounter PDH_HCOUNTER, lpdwBufferSize *uint32, lpdwBufferCount *uint32, itemBuffer *byte) uint32 {
 	ret, _, _ := pdh_GetFormattedCounterArrayW.Call(
 		uintptr(hCounter),
 		uintptr(PDH_FMT_DOUBLE|PDH_FMT_NOCAP100),
@@ -389,7 +363,7 @@ func PdhGetFormattedCounterArrayDouble(hCounter PDH_HCOUNTER, lpdwBufferSize *ui
 	return uint32(ret)
 }

-// Creates a new query that is used to manage the collection of performance data.
+// PdhOpenQuery creates a new query that is used to manage the collection of performance data.
 // szDataSource is a null terminated string that specifies the name of the log file from which to
 // retrieve the performance data. If 0, performance data is collected from a real-time data source.
 // dwUserData is a user-defined value to associate with this query. To retrieve the user data later,
@@ -405,7 +379,51 @@ func PdhOpenQuery(szDataSource uintptr, dwUserData uintptr, phQuery *PDH_HQUERY)
 	return uint32(ret)
 }

-// Validates a path. Will return ERROR_SUCCESS when ok, or PDH_CSTATUS_BAD_COUNTERNAME when the path is
+//PdhExpandWildCardPath examines the specified computer or log file and returns those counter paths that match the given counter path which contains wildcard characters.
+//The general counter path format is as follows:
+//
+//\\computer\object(parent/instance#index)\counter
+//
+//The parent, instance, index, and counter components of the counter path may contain either a valid name or a wildcard character. The computer, parent, instance,
+// and index components are not necessary for all counters.
+//
+//The following is a list of the possible formats:
+//
+//\\computer\object(parent/instance#index)\counter
+//\\computer\object(parent/instance)\counter
+//\\computer\object(instance#index)\counter
+//\\computer\object(instance)\counter
+//\\computer\object\counter
+//\object(parent/instance#index)\counter
+//\object(parent/instance)\counter
+//\object(instance#index)\counter
+//\object(instance)\counter
+//\object\counter
+//Use an asterisk (*) as the wildcard character, for example, \object(*)\counter.
+//
+//If a wildcard character is specified in the parent name, all instances of the specified object that match the specified instance and counter fields will be returned.
+// For example, \object(*/instance)\counter.
+//
+//If a wildcard character is specified in the instance name, all instances of the specified object and parent object will be returned if all instance names
+// corresponding to the specified index match the wildcard character. For example, \object(parent/*)\counter. If the object does not contain an instance, an error occurs.
+//
+//If a wildcard character is specified in the counter name, all counters of the specified object are returned.
+//
+//Partial counter path string matches (for example, "pro*") are supported.
+func PdhExpandWildCardPath(szWildCardPath string, mszExpandedPathList *uint16, pcchPathListLength *uint32) uint32 {
+	ptxt, _ := syscall.UTF16PtrFromString(szWildCardPath)
+	flags := uint32(0) // expand instances and counters
+	ret, _, _ := pdh_ExpandWildCardPathW.Call(
+		uintptr(unsafe.Pointer(nil)), // search counters on local computer
+		uintptr(unsafe.Pointer(ptxt)),
+		uintptr(unsafe.Pointer(mszExpandedPathList)),
+		uintptr(unsafe.Pointer(pcchPathListLength)),
+		uintptr(unsafe.Pointer(&flags)))
+
+	return uint32(ret)
+}
+
+// PdhValidatePath validates a path. Will return ERROR_SUCCESS when ok, or PDH_CSTATUS_BAD_COUNTERNAME when the path is
 // erroneous.
 func PdhValidatePath(path string) uint32 {
 	ptxt, _ := syscall.UTF16PtrFromString(path)
@@ -414,13 +432,6 @@ func PdhValidatePath(path string) uint32 {
 	return uint32(ret)
 }

-func UTF16PtrToString(s *uint16) string {
-	if s == nil {
-		return ""
-	}
-	return syscall.UTF16ToString((*[1 << 29]uint16)(unsafe.Pointer(s))[0:])
-}
-
 func PdhFormatError(msgId uint32) string {
 	var flags uint32 = windows.FORMAT_MESSAGE_FROM_HMODULE | windows.FORMAT_MESSAGE_ARGUMENT_ARRAY | windows.FORMAT_MESSAGE_IGNORE_INSERTS
 	buf := make([]uint16, 300)
@@ -430,3 +441,25 @@ func PdhFormatError(msgId uint32) string {
 	}
 	return fmt.Sprintf("(pdhErr=%d) %s", msgId, err.Error())
 }
+
+//Retrieves information about a counter, such as data size, counter type, path, and user-supplied data values
+//hCounter [in]
+//Handle of the counter from which you want to retrieve information. The PdhAddCounter function returns this handle.
+//
+//bRetrieveExplainText [in]
+//Determines whether explain text is retrieved. If you set this parameter to TRUE, the explain text for the counter is retrieved. If you set this parameter to FALSE, the field in the returned buffer is NULL.
+//
+//pdwBufferSize [in, out]
+//Size of the lpBuffer buffer, in bytes. If zero on input, the function returns PDH_MORE_DATA and sets this parameter to the required buffer size. If the buffer is larger than the required size, the function sets this parameter to the actual size of the buffer that was used. If the specified size on input is greater than zero but less than the required size, you should not rely on the returned size to reallocate the buffer.
+//
+//lpBuffer [out]
+//Caller-allocated buffer that receives a PDH_COUNTER_INFO structure. The structure is variable-length, because the string data is appended to the end of the fixed-format portion of the structure. This is done so that all data is returned in a single buffer allocated by the caller. Set to NULL if pdwBufferSize is zero.
+func PdhGetCounterInfo(hCounter PDH_HCOUNTER, bRetrieveExplainText int, pdwBufferSize *uint32, lpBuffer *byte) uint32 {
+	ret, _, _ := pdh_GetCounterInfoW.Call(
+		uintptr(hCounter),
+		uintptr(bRetrieveExplainText),
+		uintptr(unsafe.Pointer(pdwBufferSize)),
+		uintptr(unsafe.Pointer(lpBuffer)))
+
+	return uint32(ret)
+}
--- a/plugins/inputs/win_perf_counters/pdh_386.go
+++ b/plugins/inputs/win_perf_counters/pdh_386.go
@@ -0,0 +1,121 @@
+// Copyright (c) 2010 The win Authors. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+//    notice, this list of conditions and the following disclaimer in the
+//    documentation and/or other materials provided with the distribution.
+// 3. The names of the authors may not be used to endorse or promote products
+//    derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+// OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+// NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+// THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// This is the official list of 'win' authors for copyright purposes.
+//
+// Alexander Neumann <an2048@googlemail.com>
+// Joseph Watson <jtwatson@linux-consulting.us>
+// Kevin Pors <krpors@gmail.com>
+
+// +build windows
+
+package win_perf_counters
+
+// Union specialization for double values
+type PDH_FMT_COUNTERVALUE_DOUBLE struct {
+	CStatus     uint32
+	padding     [4]byte
+	DoubleValue float64
+}
+
+// Union specialization for 64 bit integer values
+type PDH_FMT_COUNTERVALUE_LARGE struct {
+	CStatus    uint32
+	padding    [4]byte
+	LargeValue int64
+}
+
+// Union specialization for long values
+type PDH_FMT_COUNTERVALUE_LONG struct {
+	CStatus   uint32
+	LongValue int32
+	padding   [4]byte
+}
+
+type PDH_FMT_COUNTERVALUE_ITEM_DOUBLE struct {
+	SzName   *uint16
+	padding  [4]byte
+	FmtValue PDH_FMT_COUNTERVALUE_DOUBLE
+}
+
+// Union specialization for 'large' values, used by PdhGetFormattedCounterArrayLarge()
+type PDH_FMT_COUNTERVALUE_ITEM_LARGE struct {
+	SzName   *uint16 // pointer to a string
+	padding  [4]byte
+	FmtValue PDH_FMT_COUNTERVALUE_LARGE
+}
+
+// Union specialization for long values, used by PdhGetFormattedCounterArrayLong()
+type PDH_FMT_COUNTERVALUE_ITEM_LONG struct {
+	SzName   *uint16 // pointer to a string
+	padding  [4]byte
+	FmtValue PDH_FMT_COUNTERVALUE_LONG
+}
+
+//PDH_COUNTER_INFO structure contains information describing the properties of a counter. This information also includes the counter path.
+type PDH_COUNTER_INFO struct {
+	//Size of the structure, including the appended strings, in bytes.
+	DwLength uint32
+	//Counter type. For a list of counter types, see the Counter Types section of the <a "href=http://go.microsoft.com/fwlink/p/?linkid=84422">Windows Server 2003 Deployment Kit</a>.
+	//The counter type constants are defined in Winperf.h.
+	DwType uint32
+	//Counter version information. Not used.
+	CVersion uint32
+	//Counter status that indicates if the counter value is valid. For a list of possible values,
+	//see <a href="https://msdn.microsoft.com/en-us/library/windows/desktop/aa371894(v=vs.85).aspx">Checking PDH Interface Return Values</a>.
+	CStatus uint32
+	//Scale factor to use when computing the displayable value of the counter. The scale factor is a power of ten.
+	//The valid range of this parameter is PDH_MIN_SCALE (–7) (the returned value is the actual value times 10–⁷) to
+	//PDH_MAX_SCALE (+7) (the returned value is the actual value times 10⁺⁷). A value of zero will set the scale to one, so that the actual value is returned
+	LScale int32
+	//Default scale factor as suggested by the counter's provider.
+	LDefaultScale int32
+	//The value passed in the dwUserData parameter when calling PdhAddCounter.
+	DwUserData *uint32
+	//The value passed in the dwUserData parameter when calling PdhOpenQuery.
+	DwQueryUserData *uint32
+	//Null-terminated string that specifies the full counter path. The string follows this structure in memory.
+	SzFullPath *uint16 // pointer to a string
+	//Null-terminated string that contains the name of the computer specified in the counter path. Is NULL, if the path does not specify a computer.
+	//The string follows this structure in memory.
+	SzMachineName *uint16 // pointer to a string
+	//Null-terminated string that contains the name of the performance object specified in the counter path. The string follows this structure in memory.
+	SzObjectName *uint16 // pointer to a string
+	//Null-terminated string that contains the name of the object instance specified in the counter path. Is NULL, if the path does not specify an instance.
+	//The string follows this structure in memory.
+	SzInstanceName *uint16 // pointer to a string
+	//Null-terminated string that contains the name of the parent instance specified in the counter path. Is NULL, if the path does not specify a parent instance.
+	//The string follows this structure in memory.
+	SzParentInstance *uint16 // pointer to a string
+	//Instance index specified in the counter path. Is 0, if the path does not specify an instance index.
+	DwInstanceIndex uint32 // pointer to a string
+	//Null-terminated string that contains the counter name. The string follows this structure in memory.
+	SzCounterName *uint16 // pointer to a string
+	//padding
+	Padding [4]byte
+	//Help text that describes the counter. Is NULL if the source is a log file.
+	SzExplainText *uint16 // pointer to a string
+	//Start of the string data that is appended to the structure.
+	DataBuffer [1]uint32 // pointer to an extra space
+}
--- a/plugins/inputs/win_perf_counters/pdh_amd64.go
+++ b/plugins/inputs/win_perf_counters/pdh_amd64.go
@@ -0,0 +1,114 @@
+// Copyright (c) 2010 The win Authors. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+//    notice, this list of conditions and the following disclaimer in the
+//    documentation and/or other materials provided with the distribution.
+// 3. The names of the authors may not be used to endorse or promote products
+//    derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+// OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+// NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+// THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// This is the official list of 'win' authors for copyright purposes.
+//
+// Alexander Neumann <an2048@googlemail.com>
+// Joseph Watson <jtwatson@linux-consulting.us>
+// Kevin Pors <krpors@gmail.com>
+
+// +build windows
+
+package win_perf_counters
+
+// Union specialization for double values
+type PDH_FMT_COUNTERVALUE_DOUBLE struct {
+	CStatus     uint32
+	DoubleValue float64
+}
+
+// Union specialization for 64 bit integer values
+type PDH_FMT_COUNTERVALUE_LARGE struct {
+	CStatus    uint32
+	LargeValue int64
+}
+
+// Union specialization for long values
+type PDH_FMT_COUNTERVALUE_LONG struct {
+	CStatus   uint32
+	LongValue int32
+	padding   [4]byte
+}
+
+type PDH_FMT_COUNTERVALUE_ITEM_DOUBLE struct {
+	SzName   *uint16
+	FmtValue PDH_FMT_COUNTERVALUE_DOUBLE
+}
+
+// Union specialization for 'large' values, used by PdhGetFormattedCounterArrayLarge()
+type PDH_FMT_COUNTERVALUE_ITEM_LARGE struct {
+	SzName   *uint16 // pointer to a string
+	FmtValue PDH_FMT_COUNTERVALUE_LARGE
+}
+
+// Union specialization for long values, used by PdhGetFormattedCounterArrayLong()
+type PDH_FMT_COUNTERVALUE_ITEM_LONG struct {
+	SzName   *uint16 // pointer to a string
+	FmtValue PDH_FMT_COUNTERVALUE_LONG
+}
+
+//PDH_COUNTER_INFO structure contains information describing the properties of a counter. This information also includes the counter path.
+type PDH_COUNTER_INFO struct {
+	//Size of the structure, including the appended strings, in bytes.
+	DwLength uint32
+	//Counter type. For a list of counter types, see the Counter Types section of the <a "href=http://go.microsoft.com/fwlink/p/?linkid=84422">Windows Server 2003 Deployment Kit</a>.
+	//The counter type constants are defined in Winperf.h.
+	DwType uint32
+	//Counter version information. Not used.
+	CVersion uint32
+	//Counter status that indicates if the counter value is valid. For a list of possible values,
+	//see <a href="https://msdn.microsoft.com/en-us/library/windows/desktop/aa371894(v=vs.85).aspx">Checking PDH Interface Return Values</a>.
+	CStatus uint32
+	//Scale factor to use when computing the displayable value of the counter. The scale factor is a power of ten.
+	//The valid range of this parameter is PDH_MIN_SCALE (–7) (the returned value is the actual value times 10–⁷) to
+	//PDH_MAX_SCALE (+7) (the returned value is the actual value times 10⁺⁷). A value of zero will set the scale to one, so that the actual value is returned
+	LScale int32
+	//Default scale factor as suggested by the counter's provider.
+	LDefaultScale int32
+	//The value passed in the dwUserData parameter when calling PdhAddCounter.
+	DwUserData *uint32
+	//The value passed in the dwUserData parameter when calling PdhOpenQuery.
+	DwQueryUserData *uint32
+	//Null-terminated string that specifies the full counter path. The string follows this structure in memory.
+	SzFullPath *uint16 // pointer to a string
+	//Null-terminated string that contains the name of the computer specified in the counter path. Is NULL, if the path does not specify a computer.
+	//The string follows this structure in memory.
+	SzMachineName *uint16 // pointer to a string
+	//Null-terminated string that contains the name of the performance object specified in the counter path. The string follows this structure in memory.
+	SzObjectName *uint16 // pointer to a string
+	//Null-terminated string that contains the name of the object instance specified in the counter path. Is NULL, if the path does not specify an instance.
+	//The string follows this structure in memory.
+	SzInstanceName *uint16 // pointer to a string
+	//Null-terminated string that contains the name of the parent instance specified in the counter path. Is NULL, if the path does not specify a parent instance.
+	//The string follows this structure in memory.
+	SzParentInstance *uint16 // pointer to a string
+	//Instance index specified in the counter path. Is 0, if the path does not specify an instance index.
+	DwInstanceIndex uint32 // pointer to a string
+	//Null-terminated string that contains the counter name. The string follows this structure in memory.
+	SzCounterName *uint16 // pointer to a string
+	//Help text that describes the counter. Is NULL if the source is a log file.
+	SzExplainText *uint16 // pointer to a string
+	//Start of the string data that is appended to the structure.
+	DataBuffer [1]uint32 // pointer to an extra space
+}
--- a/plugins/inputs/win_perf_counters/performance_query.go
+++ b/plugins/inputs/win_perf_counters/performance_query.go
@@ -0,0 +1,218 @@
+// Go API over pdh syscalls
+// +build windows
+
+package win_perf_counters
+
+import (
+	"errors"
+	"syscall"
+	"unsafe"
+)
+
+//PerformanceQuery is abstraction for PDH_FMT_COUNTERVALUE_ITEM_DOUBLE
+type CounterValue struct {
+	InstanceName string
+	Value        float64
+}
+
+//PerformanceQuery provides wrappers around Windows performance counters API for easy usage in GO
+type PerformanceQuery interface {
+	Open() error
+	Close() error
+	AddCounterToQuery(counterPath string) (PDH_HCOUNTER, error)
+	AddEnglishCounterToQuery(counterPath string) (PDH_HCOUNTER, error)
+	GetCounterPath(counterHandle PDH_HCOUNTER) (string, error)
+	ExpandWildCardPath(counterPath string) ([]string, error)
+	GetFormattedCounterValueDouble(hCounter PDH_HCOUNTER) (float64, error)
+	GetFormattedCounterArrayDouble(hCounter PDH_HCOUNTER) ([]CounterValue, error)
+	CollectData() error
+	AddEnglishCounterSupported() bool
+}
+
+//PdhError represents error returned from Performance Counters API
+type PdhError struct {
+	ErrorCode uint32
+	errorText string
+}
+
+func (m *PdhError) Error() string {
+	return m.errorText
+}
+
+func NewPdhError(code uint32) error {
+	return &PdhError{
+		ErrorCode: code,
+		errorText: PdhFormatError(code),
+	}
+}
+
+//PerformanceQueryImpl is implementation of PerformanceQuery interface, which calls phd.dll functions
+type PerformanceQueryImpl struct {
+	query PDH_HQUERY
+}
+
+// Open creates a new counterPath that is used to manage the collection of performance data.
+// It returns counterPath handle used for subsequent calls for adding counters and querying data
+func (m *PerformanceQueryImpl) Open() error {
+	if m.query != 0 {
+		err := m.Close()
+		if err != nil {
+			return err
+		}
+	}
+	var handle PDH_HQUERY
+	ret := PdhOpenQuery(0, 0, &handle)
+	if ret != ERROR_SUCCESS {
+		return NewPdhError(ret)
+	}
+	m.query = handle
+	return nil
+}
+
+// Close closes the counterPath, releases associated counter handles and frees resources
+func (m *PerformanceQueryImpl) Close() error {
+	if m.query == 0 {
+		return errors.New("uninitialised query")
+	}
+	ret := PdhCloseQuery(m.query)
+	if ret != ERROR_SUCCESS {
+		return NewPdhError(ret)
+	}
+	m.query = 0
+	return nil
+}
+
+func (m *PerformanceQueryImpl) AddCounterToQuery(counterPath string) (PDH_HCOUNTER, error) {
+	var counterHandle PDH_HCOUNTER
+	if m.query == 0 {
+		return 0, errors.New("uninitialised query")
+	}
+	ret := PdhAddCounter(m.query, counterPath, 0, &counterHandle)
+	if ret != ERROR_SUCCESS {
+		return 0, NewPdhError(ret)
+	}
+	return counterHandle, nil
+}
+
+func (m *PerformanceQueryImpl) AddEnglishCounterToQuery(counterPath string) (PDH_HCOUNTER, error) {
+	var counterHandle PDH_HCOUNTER
+	if m.query == 0 {
+		return 0, errors.New("uninitialised query")
+	}
+	ret := PdhAddEnglishCounter(m.query, counterPath, 0, &counterHandle)
+	if ret != ERROR_SUCCESS {
+		return 0, NewPdhError(ret)
+	}
+	return counterHandle, nil
+}
+
+//GetCounterPath return counter information for given handle
+func (m *PerformanceQueryImpl) GetCounterPath(counterHandle PDH_HCOUNTER) (string, error) {
+	var bufSize uint32
+	var buff []byte
+
+	ret := PdhGetCounterInfo(counterHandle, 0, &bufSize, nil)
+	if ret == PDH_MORE_DATA {
+		buff = make([]byte, bufSize)
+		bufSize = uint32(len(buff))
+		ret = PdhGetCounterInfo(counterHandle, 0, &bufSize, &buff[0])
+		if ret == ERROR_SUCCESS {
+			ci := (*PDH_COUNTER_INFO)(unsafe.Pointer(&buff[0]))
+			return UTF16PtrToString(ci.SzFullPath), nil
+		}
+	}
+	return "", NewPdhError(ret)
+}
+
+// ExpandWildCardPath  examines local computer and returns those counter paths that match the given counter path which contains wildcard characters.
+func (m *PerformanceQueryImpl) ExpandWildCardPath(counterPath string) ([]string, error) {
+	var bufSize uint32
+	var buff []uint16
+
+	ret := PdhExpandWildCardPath(counterPath, nil, &bufSize)
+	if ret == PDH_MORE_DATA {
+		buff = make([]uint16, bufSize)
+		bufSize = uint32(len(buff))
+		ret = PdhExpandWildCardPath(counterPath, &buff[0], &bufSize)
+		if ret == ERROR_SUCCESS {
+			list := UTF16ToStringArray(buff)
+			return list, nil
+		}
+	}
+	return nil, NewPdhError(ret)
+}
+
+//GetFormattedCounterValueDouble computes a displayable value for the specified counter
+func (m *PerformanceQueryImpl) GetFormattedCounterValueDouble(hCounter PDH_HCOUNTER) (float64, error) {
+	var counterType uint32
+	var value PDH_FMT_COUNTERVALUE_DOUBLE
+	ret := PdhGetFormattedCounterValueDouble(hCounter, &counterType, &value)
+	if ret == ERROR_SUCCESS {
+		if value.CStatus == PDH_CSTATUS_VALID_DATA || value.CStatus == PDH_CSTATUS_NEW_DATA {
+			return value.DoubleValue, nil
+		} else {
+			return 0, NewPdhError(value.CStatus)
+		}
+	} else {
+		return 0, NewPdhError(ret)
+	}
+}
+
+func (m *PerformanceQueryImpl) GetFormattedCounterArrayDouble(hCounter PDH_HCOUNTER) ([]CounterValue, error) {
+	var buffSize uint32
+	var itemCount uint32
+	ret := PdhGetFormattedCounterArrayDouble(hCounter, &buffSize, &itemCount, nil)
+	if ret == PDH_MORE_DATA {
+		buff := make([]byte, buffSize)
+		ret = PdhGetFormattedCounterArrayDouble(hCounter, &buffSize, &itemCount, &buff[0])
+		if ret == ERROR_SUCCESS {
+			items := (*[1 << 20]PDH_FMT_COUNTERVALUE_ITEM_DOUBLE)(unsafe.Pointer(&buff[0]))[:itemCount]
+			values := make([]CounterValue, 0, itemCount)
+			for _, item := range items {
+				if item.FmtValue.CStatus == PDH_CSTATUS_VALID_DATA || item.FmtValue.CStatus == PDH_CSTATUS_NEW_DATA {
+					val := CounterValue{UTF16PtrToString(item.SzName), item.FmtValue.DoubleValue}
+					values = append(values, val)
+				}
+			}
+			return values, nil
+		}
+	}
+	return nil, NewPdhError(ret)
+}
+
+func (m *PerformanceQueryImpl) CollectData() error {
+	if m.query == 0 {
+		return errors.New("uninitialised query")
+	}
+	ret := PdhCollectQueryData(m.query)
+	if ret != ERROR_SUCCESS {
+		return NewPdhError(ret)
+	}
+	return nil
+}
+
+func (m *PerformanceQueryImpl) AddEnglishCounterSupported() bool {
+	return PdhAddEnglishCounterSupported()
+}
+
+// UTF16PtrToString converts Windows API LPTSTR (pointer to string) to go string
+func UTF16PtrToString(s *uint16) string {
+	if s == nil {
+		return ""
+	}
+	return syscall.UTF16ToString((*[1 << 29]uint16)(unsafe.Pointer(s))[0:])
+}
+
+// UTF16ToStringArray converts list of Windows API NULL terminated strings  to go string array
+func UTF16ToStringArray(buf []uint16) []string {
+	var strings []string
+	nextLineStart := 0
+	stringLine := UTF16PtrToString(&buf[0])
+	for stringLine != "" {
+		strings = append(strings, stringLine)
+		nextLineStart += len([]rune(stringLine)) + 1
+		remainingBuf := buf[nextLineStart:]
+		stringLine = UTF16PtrToString(&remainingBuf[0])
+	}
+	return strings
+}
--- a/plugins/inputs/win_perf_counters/win_perf_counters.go
+++ b/plugins/inputs/win_perf_counters/win_perf_counters.go
@@ -5,10 +5,13 @@ package win_perf_counters
 import (
 	"errors"
 	"fmt"
+	"log"
+	"regexp"
 	"strings"
-	"unsafe"
+	"time"

 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )

@@ -20,6 +23,12 @@ var sampleConfig = `
  ## agent, it will not be gathered.
  ## Settings:
  # PrintValid = false # Print All matching performance counters
+  # If UseWildcardsExpansion params is set to true, wildcards (partial wildcards in instance names and wildcards in counters names) in configured counter paths will be expanded
+  # and in case of localized Windows, counter paths will be also localized. It also returns instance indexes in instance names.
+  # If false, wildcards (not partial) in instance names will still be expanded, but instance indexes will not be returned in instance names.
+  #UseWildcardsExpansion = false
+  # Period after which counters will be reread from configuration and wildcards in counter paths expanded
+  CountersRefreshInterval="1m"

  [[inputs.win_perf_counters.object]]
    # Processor usage, alternative to native, reports on a per core.
@@ -53,7 +62,7 @@ var sampleConfig = `
    Measurement = "win_system"

  [[inputs.win_perf_counters.object]]
-    # Example query where the Instance portion must be removed to get data back,
+    # Example counterPath where the Instance portion must be removed to get data back,
    # such as from the Memory object.
    ObjectName = "Memory"
    Counters = [
@@ -61,17 +70,21 @@ var sampleConfig = `
      "Page Faults/sec", "Pages/sec", "Transition Faults/sec",
      "Pool Nonpaged Bytes", "Pool Paged Bytes"
    ]
-    Instances = ["------"] # Use 6 x - to remove the Instance bit from the query.
+    Instances = ["------"] # Use 6 x - to remove the Instance bit from the counterPath.
    Measurement = "win_mem"
 `

 type Win_PerfCounters struct {
-	PrintValid      bool
-	PreVistaSupport bool
-	Object          []perfobject
+	PrintValid bool
+	//deprecated: determined dynamically
+	PreVistaSupport         bool
+	Object                  []perfobject
+	CountersRefreshInterval internal.Duration
+	UseWildcardsExpansion   bool

-	configParsed bool
-	itemCache    []*item
+	lastRefreshed time.Time
+	counters      []*counter
+	query         PerformanceQuery
 }

 type perfobject struct {
@@ -84,56 +97,115 @@ type perfobject struct {
 	IncludeTotal  bool
 }

-type item struct {
-	query         string
+type counter struct {
+	counterPath   string
 	objectName    string
 	counter       string
 	instance      string
 	measurement   string
-	include_total bool
-	handle        PDH_HQUERY
+	includeTotal  bool
 	counterHandle PDH_HCOUNTER
 }

 var sanitizedChars = strings.NewReplacer("/sec", "_persec", "/Sec", "_persec",
 	" ", "_", "%", "Percent", `\`, "")

-func (m *Win_PerfCounters) AddItem(query string, objectName string, counter string, instance string,
-	measurement string, include_total bool) error {
+//General Counter path pattern is: \\computer\object(parent/instance#index)\counter
+//parent/instance#index part is skipped in single instance objects (e.g. Memory): \\computer\object\counter

-	var handle PDH_HQUERY
-	var counterHandle PDH_HCOUNTER
-	ret := PdhOpenQuery(0, 0, &handle)
-	if m.PreVistaSupport {
-		ret = PdhAddCounter(handle, query, 0, &counterHandle)
+var counterPathRE = regexp.MustCompile(`.*\\(.*)\\(.*)`)
+var objectInstanceRE = regexp.MustCompile(`(.*)\((.*)\)`)
+
+//extractObjectInstanceCounterFromQuery gets object name, instance name (if available) and counter name from counter path
+func extractObjectInstanceCounterFromQuery(query string) (object string, instance string, counter string, err error) {
+	pathParts := counterPathRE.FindAllStringSubmatch(query, -1)
+	if pathParts == nil || len(pathParts[0]) != 3 {
+		err = errors.New("Could not extract counter info from: " + query)
+		return
+	}
+	counter = pathParts[0][2]
+	//try to get instance name
+	objectInstanceParts := objectInstanceRE.FindAllStringSubmatch(pathParts[0][1], -1)
+	if objectInstanceParts == nil || len(objectInstanceParts[0]) != 3 {
+		object = pathParts[0][1]
 	} else {
-		ret = PdhAddEnglishCounter(handle, query, 0, &counterHandle)
+		object = objectInstanceParts[0][1]
+		instance = objectInstanceParts[0][2]
 	}
-
-	// Call PdhCollectQueryData one time to check existence of the counter
-	ret = PdhCollectQueryData(handle)
-	if ret != ERROR_SUCCESS {
-		PdhCloseQuery(handle)
-		return errors.New(PdhFormatError(ret))
-	}
-
-	newItem := &item{query, objectName, counter, instance, measurement,
-		include_total, handle, counterHandle}
-	m.itemCache = append(m.itemCache, newItem)
-
-	return nil
+	return
 }

 func (m *Win_PerfCounters) Description() string {
-	return "Input plugin to query Performance Counters on Windows operating systems"
+	return "Input plugin to counterPath Performance Counters on Windows operating systems"
 }

 func (m *Win_PerfCounters) SampleConfig() string {
 	return sampleConfig
 }

+//objectName string, counter string, instance string, measurement string, include_total bool
+func (m *Win_PerfCounters) AddItem(counterPath string, objectName string, instance string, counterName string, measurement string, includeTotal bool) error {
+	var err error
+	var counterHandle PDH_HCOUNTER
+	if !m.query.AddEnglishCounterSupported() {
+		counterHandle, err = m.query.AddCounterToQuery(counterPath)
+		if err != nil {
+			return err
+		}
+	} else {
+		counterHandle, err = m.query.AddEnglishCounterToQuery(counterPath)
+		if err != nil {
+			return err
+		}
+
+	}
+
+	if m.UseWildcardsExpansion {
+		origInstance := instance
+		counterPath, err = m.query.GetCounterPath(counterHandle)
+		if err != nil {
+			return err
+		}
+		counters, err := m.query.ExpandWildCardPath(counterPath)
+		if err != nil {
+			return err
+		}
+
+		for _, counterPath := range counters {
+			var err error
+			counterHandle, err := m.query.AddCounterToQuery(counterPath)
+
+			objectName, instance, counterName, err = extractObjectInstanceCounterFromQuery(counterPath)
+			if err != nil {
+				return err
+			}
+
+			if instance == "_Total" && origInstance == "*" && !includeTotal {
+				continue
+			}
+
+			newItem := &counter{counterPath, objectName, counterName, instance, measurement,
+				includeTotal, counterHandle}
+			m.counters = append(m.counters, newItem)
+
+			if m.PrintValid {
+				log.Printf("Valid: %s\n", counterPath)
+			}
+		}
+	} else {
+		newItem := &counter{counterPath, objectName, counterName, instance, measurement,
+			includeTotal, counterHandle}
+		m.counters = append(m.counters, newItem)
+		if m.PrintValid {
+			log.Printf("Valid: %s\n", counterPath)
+		}
+	}
+
+	return nil
+}
+
 func (m *Win_PerfCounters) ParseConfig() error {
-	var query string
+	var counterPath string

 	if len(m.Object) > 0 {
 		for _, PerfObject := range m.Object {
@@ -142,21 +214,16 @@ func (m *Win_PerfCounters) ParseConfig() error {
 					objectname := PerfObject.ObjectName

 					if instance == "------" {
-						query = "\\" + objectname + "\\" + counter
+						counterPath = "\\" + objectname + "\\" + counter
 					} else {
-						query = "\\" + objectname + "(" + instance + ")\\" + counter
+						counterPath = "\\" + objectname + "(" + instance + ")\\" + counter
 					}

-					err := m.AddItem(query, objectname, counter, instance,
-						PerfObject.Measurement, PerfObject.IncludeTotal)
+					err := m.AddItem(counterPath, objectname, instance, counter, PerfObject.Measurement, PerfObject.IncludeTotal)

-					if err == nil {
-						if m.PrintValid {
-							fmt.Printf("Valid: %s\n", query)
-						}
-					} else {
+					if err != nil {
 						if PerfObject.FailOnMissing || PerfObject.WarnOnMissing {
-							fmt.Printf("Invalid query: '%s'. Error: %s", query, err.Error())
+							log.Printf("Invalid counterPath: '%s'. Error: %s\n", counterPath, err.Error())
 						}
 						if PerfObject.FailOnMissing {
 							return err
@@ -165,32 +232,41 @@ func (m *Win_PerfCounters) ParseConfig() error {
 				}
 			}
 		}
-
 		return nil
 	} else {
-		err := errors.New("No performance objects configured!")
+		err := errors.New("no performance objects configured")
 		return err
 	}
-}

-func (m *Win_PerfCounters) GetParsedItemsForTesting() []*item {
-	return m.itemCache
 }

 func (m *Win_PerfCounters) Gather(acc telegraf.Accumulator) error {
 	// Parse the config once
-	if !m.configParsed {
-		err := m.ParseConfig()
-		m.configParsed = true
+	var err error
+
+	if m.lastRefreshed.IsZero() || (m.CountersRefreshInterval.Duration.Nanoseconds() > 0 && m.lastRefreshed.Add(m.CountersRefreshInterval.Duration).Before(time.Now())) {
+		if m.counters != nil {
+			m.counters = m.counters[:0]
+		}
+
+		err = m.query.Open()
 		if err != nil {
 			return err
 		}
-	}

-	var bufSize uint32
-	var bufCount uint32
-	var size uint32 = uint32(unsafe.Sizeof(PDH_FMT_COUNTERVALUE_ITEM_DOUBLE{}))
-	var emptyBuf [1]PDH_FMT_COUNTERVALUE_ITEM_DOUBLE // need at least 1 addressable null ptr.
+		err = m.ParseConfig()
+		if err != nil {
+			return err
+		}
+		//some counters need two data samples before computing a value
+		err = m.query.CollectData()
+		if err != nil {
+			return err
+		}
+		m.lastRefreshed = time.Now()
+
+		time.Sleep(time.Second)
+	}

 	type InstanceGrouping struct {
 		name       string
@@ -200,78 +276,79 @@ func (m *Win_PerfCounters) Gather(acc telegraf.Accumulator) error {

 	var collectFields = make(map[InstanceGrouping]map[string]interface{})

+	err = m.query.CollectData()
+	if err != nil {
+		return err
+	}
 	// For iterate over the known metrics and get the samples.
-	for _, metric := range m.itemCache {
+	for _, metric := range m.counters {
 		// collect
-		ret := PdhCollectQueryData(metric.handle)
-		if ret == ERROR_SUCCESS {
-			ret = PdhGetFormattedCounterArrayDouble(metric.counterHandle, &bufSize,
-				&bufCount, &emptyBuf[0]) // uses null ptr here according to MSDN.
-			if ret == PDH_MORE_DATA {
-				filledBuf := make([]PDH_FMT_COUNTERVALUE_ITEM_DOUBLE, bufCount*size)
-				if len(filledBuf) == 0 {
-					continue
+		if m.UseWildcardsExpansion {
+			value, err := m.query.GetFormattedCounterValueDouble(metric.counterHandle)
+			if err == nil {
+				measurement := sanitizedChars.Replace(metric.measurement)
+				if measurement == "" {
+					measurement = "win_perf_counters"
 				}
-				ret = PdhGetFormattedCounterArrayDouble(metric.counterHandle,
-					&bufSize, &bufCount, &filledBuf[0])
-				for i := 0; i < int(bufCount); i++ {
-					c := filledBuf[i]
-					var s string = UTF16PtrToString(c.SzName)

+				var instance = InstanceGrouping{measurement, metric.instance, metric.objectName}
+				if collectFields[instance] == nil {
+					collectFields[instance] = make(map[string]interface{})
+				}
+				collectFields[instance][sanitizedChars.Replace(metric.counter)] = float32(value)
+			} else {
+				//ignore invalid data from as some counters from process instances returns this sometimes
+				if phderr, ok := err.(*PdhError); ok && phderr.ErrorCode != PDH_INVALID_DATA && phderr.ErrorCode != PDH_CALC_NEGATIVE_VALUE {
+					return fmt.Errorf("error while getting value for counter %s: %v", metric.counterPath, err)
+				}
+			}
+		} else {
+			counterValues, err := m.query.GetFormattedCounterArrayDouble(metric.counterHandle)
+			if err == nil {
+				for _, cValue := range counterValues {
 					var add bool
-
-					if metric.include_total {
+					if metric.includeTotal {
 						// If IncludeTotal is set, include all.
 						add = true
-					} else if metric.instance == "*" && !strings.Contains(s, "_Total") {
+					} else if metric.instance == "*" && !strings.Contains(cValue.InstanceName, "_Total") {
 						// Catch if set to * and that it is not a '*_Total*' instance.
 						add = true
-					} else if metric.instance == s {
+					} else if metric.instance == cValue.InstanceName {
 						// Catch if we set it to total or some form of it
 						add = true
-					} else if strings.Contains(metric.instance, "#") && strings.HasPrefix(metric.instance, s) {
+					} else if strings.Contains(metric.instance, "#") && strings.HasPrefix(metric.instance, cValue.InstanceName) {
 						// If you are using a multiple instance identifier such as "w3wp#1"
 						// phd.dll returns only the first 2 characters of the identifier.
 						add = true
-						s = metric.instance
+						cValue.InstanceName = metric.instance
 					} else if metric.instance == "------" {
 						add = true
 					}

 					if add {
-						tags := make(map[string]string)
-						if s != "" {
-							tags["instance"] = s
-						}
-						tags["objectname"] = metric.objectName
-
 						measurement := sanitizedChars.Replace(metric.measurement)
 						if measurement == "" {
 							measurement = "win_perf_counters"
 						}
-						var instance = InstanceGrouping{measurement, s, metric.objectName}
+						var instance = InstanceGrouping{measurement, cValue.InstanceName, metric.objectName}

 						if collectFields[instance] == nil {
 							collectFields[instance] = make(map[string]interface{})
 						}
-						collectFields[instance][sanitizedChars.Replace(metric.counter)] = float32(c.FmtValue.DoubleValue)
+						collectFields[instance][sanitizedChars.Replace(metric.counter)] = float32(cValue.Value)
 					}
 				}
-
-				filledBuf = nil
-				// Need to at least set bufSize to zero, because if not, the function will not
-				// return PDH_MORE_DATA and will not set the bufSize.
-				bufCount = 0
-				bufSize = 0
 			}
 		}
 	}

 	for instance, fields := range collectFields {
 		var tags = map[string]string{
-			"instance":   instance.instance,
 			"objectname": instance.objectname,
 		}
+		if len(instance.instance) > 0 {
+			tags["instance"] = instance.instance
+		}
 		acc.AddFields(instance.name, fields, tags)
 	}

@@ -279,5 +356,7 @@ func (m *Win_PerfCounters) Gather(acc telegraf.Accumulator) error {
 }

 func init() {
-	inputs.Add("win_perf_counters", func() telegraf.Input { return &Win_PerfCounters{} })
+	inputs.Add("win_perf_counters", func() telegraf.Input {
+		return &Win_PerfCounters{query: &PerformanceQueryImpl{}, CountersRefreshInterval: internal.Duration{Duration: time.Second * 60}}
+	})
 }
--- a/plugins/inputs/win_perf_counters/win_perf_counters_integration_test.go
+++ b/plugins/inputs/win_perf_counters/win_perf_counters_integration_test.go
@@ -0,0 +1,615 @@
+// +build windows
+
+package win_perf_counters
+
+import (
+	"errors"
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"strings"
+)
+
+func TestWinPerformanceQueryImpl(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+	var query PerformanceQuery
+	var hCounter PDH_HCOUNTER
+	var err error
+	query = &PerformanceQueryImpl{}
+
+	err = query.Close()
+	require.Error(t, err, "uninitialized query must return errors")
+
+	_, err = query.AddCounterToQuery("")
+	require.Error(t, err, "uninitialized query must return errors")
+	assert.True(t, strings.Contains(err.Error(), "uninitialised"))
+
+	_, err = query.AddEnglishCounterToQuery("")
+	require.Error(t, err, "uninitialized query must return errors")
+	assert.True(t, strings.Contains(err.Error(), "uninitialised"))
+
+	err = query.CollectData()
+	require.Error(t, err, "uninitialized query must return errors")
+	assert.True(t, strings.Contains(err.Error(), "uninitialised"))
+
+	err = query.Open()
+	require.NoError(t, err)
+
+	counterPath := "\\Processor Information(_Total)\\% Processor Time"
+
+	hCounter, err = query.AddCounterToQuery(counterPath)
+	require.NoError(t, err)
+	assert.NotEqual(t, 0, hCounter)
+
+	err = query.Close()
+	require.NoError(t, err)
+
+	err = query.Open()
+	require.NoError(t, err)
+
+	hCounter, err = query.AddEnglishCounterToQuery(counterPath)
+	require.NoError(t, err)
+	assert.NotEqual(t, 0, hCounter)
+
+	cp, err := query.GetCounterPath(hCounter)
+	require.NoError(t, err)
+	assert.True(t, strings.HasSuffix(cp, counterPath))
+
+	err = query.CollectData()
+	require.NoError(t, err)
+	time.Sleep(time.Second)
+
+	err = query.CollectData()
+	require.NoError(t, err)
+
+	_, err = query.GetFormattedCounterValueDouble(hCounter)
+	require.NoError(t, err)
+
+	counterPath = "\\Process(*)\\% Processor Time"
+	paths, err := query.ExpandWildCardPath(counterPath)
+	require.NoError(t, err)
+	require.NotNil(t, paths)
+	assert.True(t, len(paths) > 1)
+
+	counterPath = "\\Process(_Total)\\*"
+	paths, err = query.ExpandWildCardPath(counterPath)
+	require.NoError(t, err)
+	require.NotNil(t, paths)
+	assert.True(t, len(paths) > 1)
+
+	err = query.Open()
+	require.NoError(t, err)
+
+	counterPath = "\\Process(*)\\% Processor Time"
+	hCounter, err = query.AddEnglishCounterToQuery(counterPath)
+	require.NoError(t, err)
+	assert.NotEqual(t, 0, hCounter)
+
+	err = query.CollectData()
+	require.NoError(t, err)
+	time.Sleep(time.Second)
+
+	err = query.CollectData()
+	require.NoError(t, err)
+
+	arr, err := query.GetFormattedCounterArrayDouble(hCounter)
+	require.NoError(t, err)
+	assert.True(t, len(arr) > 0, "Too")
+
+	err = query.Close()
+	require.NoError(t, err)
+
+}
+
+func TestWinPerfcountersConfigGet1(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	var instances = make([]string, 1)
+	var counters = make([]string, 1)
+	var perfobjects = make([]perfobject, 1)
+
+	objectname := "Processor Information"
+	instances[0] = "_Total"
+	counters[0] = "% Processor Time"
+
+	var measurement = "test"
+
+	PerfObject := perfobject{
+		ObjectName:    objectname,
+		Instances:     instances,
+		Counters:      counters,
+		Measurement:   measurement,
+		WarnOnMissing: false,
+		FailOnMissing: true,
+		IncludeTotal:  false,
+	}
+
+	perfobjects[0] = PerfObject
+
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects, query: &PerformanceQueryImpl{}}
+	m.query.Open()
+
+	err := m.ParseConfig()
+	require.NoError(t, err)
+}
+
+func TestWinPerfcountersConfigGet2(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	var instances = make([]string, 1)
+	var counters = make([]string, 1)
+	var perfobjects = make([]perfobject, 1)
+
+	objectname := "Processor Information"
+	instances[0] = "_Total"
+	counters[0] = "% Processor Time"
+
+	var measurement = "test"
+
+	PerfObject := perfobject{
+		ObjectName:    objectname,
+		Instances:     instances,
+		Counters:      counters,
+		Measurement:   measurement,
+		WarnOnMissing: false,
+		FailOnMissing: true,
+		IncludeTotal:  false,
+	}
+
+	perfobjects[0] = PerfObject
+
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects, query: &PerformanceQueryImpl{}}
+	m.query.Open()
+
+	err := m.ParseConfig()
+	require.NoError(t, err)
+
+	if len(m.counters) == 1 {
+		require.NoError(t, nil)
+	} else if len(m.counters) == 0 {
+		var errorstring1 = "No results returned from the counterPath: " + string(len(m.counters))
+		err2 := errors.New(errorstring1)
+		require.NoError(t, err2)
+	} else if len(m.counters) > 1 {
+		var errorstring1 = "Too many results returned from the counterPath: " + string(len(m.counters))
+		err2 := errors.New(errorstring1)
+		require.NoError(t, err2)
+	}
+}
+
+func TestWinPerfcountersConfigGet3(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	var instances = make([]string, 1)
+	var counters = make([]string, 2)
+	var perfobjects = make([]perfobject, 1)
+
+	objectname := "Processor Information"
+	instances[0] = "_Total"
+	counters[0] = "% Processor Time"
+	counters[1] = "% Idle Time"
+
+	var measurement = "test"
+
+	PerfObject := perfobject{
+		ObjectName:    objectname,
+		Instances:     instances,
+		Counters:      counters,
+		Measurement:   measurement,
+		WarnOnMissing: false,
+		FailOnMissing: true,
+		IncludeTotal:  false,
+	}
+
+	perfobjects[0] = PerfObject
+
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects, query: &PerformanceQueryImpl{}}
+	m.query.Open()
+
+	err := m.ParseConfig()
+	require.NoError(t, err)
+
+	if len(m.counters) == 2 {
+		require.NoError(t, nil)
+	} else if len(m.counters) < 2 {
+
+		var errorstring1 = "Too few results returned from the counterPath. " + string(len(m.counters))
+		err2 := errors.New(errorstring1)
+		require.NoError(t, err2)
+	} else if len(m.counters) > 2 {
+
+		var errorstring1 = "Too many results returned from the counterPath: " + string(len(m.counters))
+		err2 := errors.New(errorstring1)
+		require.NoError(t, err2)
+	}
+}
+
+func TestWinPerfcountersConfigGet4(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	var instances = make([]string, 2)
+	var counters = make([]string, 1)
+	var perfobjects = make([]perfobject, 1)
+
+	objectname := "Processor Information"
+	instances[0] = "_Total"
+	instances[1] = "0,1"
+	counters[0] = "% Processor Time"
+
+	var measurement = "test"
+
+	PerfObject := perfobject{
+		ObjectName:    objectname,
+		Instances:     instances,
+		Counters:      counters,
+		Measurement:   measurement,
+		WarnOnMissing: false,
+		FailOnMissing: true,
+		IncludeTotal:  false,
+	}
+
+	perfobjects[0] = PerfObject
+
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects, query: &PerformanceQueryImpl{}}
+	m.query.Open()
+
+	err := m.ParseConfig()
+	require.NoError(t, err)
+
+	if len(m.counters) == 2 {
+		require.NoError(t, nil)
+	} else if len(m.counters) < 2 {
+
+		var errorstring1 = "Too few results returned from the counterPath: " + string(len(m.counters))
+		err2 := errors.New(errorstring1)
+		require.NoError(t, err2)
+	} else if len(m.counters) > 2 {
+
+		var errorstring1 = "Too many results returned from the counterPath: " + string(len(m.counters))
+		err2 := errors.New(errorstring1)
+		require.NoError(t, err2)
+	}
+}
+
+func TestWinPerfcountersConfigGet5(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	var instances = make([]string, 2)
+	var counters = make([]string, 2)
+	var perfobjects = make([]perfobject, 1)
+
+	objectname := "Processor Information"
+	instances[0] = "_Total"
+	instances[1] = "0,1"
+	counters[0] = "% Processor Time"
+	counters[1] = "% Idle Time"
+
+	var measurement = "test"
+
+	PerfObject := perfobject{
+		ObjectName:    objectname,
+		Instances:     instances,
+		Counters:      counters,
+		Measurement:   measurement,
+		WarnOnMissing: false,
+		FailOnMissing: true,
+		IncludeTotal:  false,
+	}
+
+	perfobjects[0] = PerfObject
+
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects, query: &PerformanceQueryImpl{}}
+	m.query.Open()
+
+	err := m.ParseConfig()
+	require.NoError(t, err)
+
+	if len(m.counters) == 4 {
+		require.NoError(t, nil)
+	} else if len(m.counters) < 4 {
+		var errorstring1 = "Too few results returned from the counterPath: " +
+			string(len(m.counters))
+		err2 := errors.New(errorstring1)
+		require.NoError(t, err2)
+	} else if len(m.counters) > 4 {
+		var errorstring1 = "Too many results returned from the counterPath: " +
+			string(len(m.counters))
+		err2 := errors.New(errorstring1)
+		require.NoError(t, err2)
+	}
+}
+
+func TestWinPerfcountersConfigGet6(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	var instances = make([]string, 1)
+	var counters = make([]string, 1)
+	var perfobjects = make([]perfobject, 1)
+
+	objectname := "System"
+	instances[0] = "------"
+	counters[0] = "Context Switches/sec"
+
+	var measurement = "test"
+
+	PerfObject := perfobject{
+		ObjectName:    objectname,
+		Instances:     instances,
+		Counters:      counters,
+		Measurement:   measurement,
+		WarnOnMissing: false,
+		FailOnMissing: true,
+		IncludeTotal:  false,
+	}
+
+	perfobjects[0] = PerfObject
+
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects, query: &PerformanceQueryImpl{}}
+	m.query.Open()
+
+	err := m.ParseConfig()
+	require.NoError(t, err)
+}
+
+func TestWinPerfcountersConfigGet7(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	var instances = make([]string, 1)
+	var counters = make([]string, 3)
+	var perfobjects = make([]perfobject, 1)
+
+	objectname := "Processor Information"
+	instances[0] = "_Total"
+	counters[0] = "% Processor Time"
+	counters[1] = "% Processor TimeERROR"
+	counters[2] = "% Idle Time"
+
+	var measurement = "test"
+
+	PerfObject := perfobject{
+		objectname,
+		counters,
+		instances,
+		measurement,
+		false,
+		false,
+		false,
+	}
+
+	perfobjects[0] = PerfObject
+
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects, query: &PerformanceQueryImpl{}}
+	m.query.Open()
+
+	err := m.ParseConfig()
+	require.NoError(t, err)
+
+	if len(m.counters) == 2 {
+		require.NoError(t, nil)
+	} else if len(m.counters) < 2 {
+		var errorstring1 = "Too few results returned from the counterPath: " +
+			string(len(m.counters))
+		err2 := errors.New(errorstring1)
+		require.NoError(t, err2)
+	} else if len(m.counters) > 2 {
+		var errorstring1 = "Too many results returned from the counterPath: " +
+			string(len(m.counters))
+		err2 := errors.New(errorstring1)
+		require.NoError(t, err2)
+	}
+}
+
+func TestWinPerfcountersConfigError1(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	var instances = make([]string, 1)
+	var counters = make([]string, 1)
+	var perfobjects = make([]perfobject, 1)
+
+	objectname := "Processor InformationERROR"
+	instances[0] = "_Total"
+	counters[0] = "% Processor Time"
+
+	var measurement = "test"
+
+	PerfObject := perfobject{
+		ObjectName:    objectname,
+		Instances:     instances,
+		Counters:      counters,
+		Measurement:   measurement,
+		WarnOnMissing: false,
+		FailOnMissing: true,
+		IncludeTotal:  false,
+	}
+
+	perfobjects[0] = PerfObject
+
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects, query: &PerformanceQueryImpl{}}
+	m.query.Open()
+
+	err := m.ParseConfig()
+	require.Error(t, err)
+}
+
+func TestWinPerfcountersConfigError2(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	var instances = make([]string, 1)
+	var counters = make([]string, 1)
+	var perfobjects = make([]perfobject, 1)
+
+	objectname := "Processor"
+	instances[0] = "SuperERROR"
+	counters[0] = "% C1 Time"
+
+	var measurement = "test"
+
+	PerfObject := perfobject{
+		ObjectName:    objectname,
+		Instances:     instances,
+		Counters:      counters,
+		Measurement:   measurement,
+		WarnOnMissing: false,
+		FailOnMissing: true,
+		IncludeTotal:  false,
+	}
+
+	perfobjects[0] = PerfObject
+
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects, query: &PerformanceQueryImpl{}}
+	m.query.Open()
+
+	err := m.ParseConfig()
+	var acc testutil.Accumulator
+	err = m.Gather(&acc)
+	require.Error(t, err)
+}
+
+func TestWinPerfcountersConfigError3(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	var instances = make([]string, 1)
+	var counters = make([]string, 1)
+	var perfobjects = make([]perfobject, 1)
+
+	objectname := "Processor Information"
+	instances[0] = "_Total"
+	counters[0] = "% Processor TimeERROR"
+
+	var measurement = "test"
+
+	PerfObject := perfobject{
+		ObjectName:    objectname,
+		Instances:     instances,
+		Counters:      counters,
+		Measurement:   measurement,
+		WarnOnMissing: false,
+		FailOnMissing: true,
+		IncludeTotal:  false,
+	}
+
+	perfobjects[0] = PerfObject
+
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects, query: &PerformanceQueryImpl{}}
+	m.query.Open()
+
+	err := m.ParseConfig()
+	require.Error(t, err)
+}
+
+func TestWinPerfcountersCollect1(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+	var instances = make([]string, 1)
+	var counters = make([]string, 1)
+	var perfobjects = make([]perfobject, 1)
+
+	objectname := "Processor Information"
+	instances[0] = "_Total"
+	counters[0] = "Parking Status"
+
+	var expectedCounter = "Parking_Status"
+
+	var measurement = "test"
+
+	PerfObject := perfobject{
+		ObjectName:    objectname,
+		Instances:     instances,
+		Counters:      counters,
+		Measurement:   measurement,
+		WarnOnMissing: false,
+		FailOnMissing: true,
+		IncludeTotal:  false,
+	}
+
+	perfobjects[0] = PerfObject
+
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects, query: &PerformanceQueryImpl{}}
+	var acc testutil.Accumulator
+	err := m.Gather(&acc)
+	require.NoError(t, err)
+
+	time.Sleep(2000 * time.Millisecond)
+	err = m.Gather(&acc)
+	require.NoError(t, err)
+	assert.Len(t, acc.Metrics, 2)
+
+	for _, metric := range acc.Metrics {
+		_, ok := metric.Fields[expectedCounter]
+		assert.True(t, ok)
+	}
+
+}
+func TestWinPerfcountersCollect2(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	var instances = make([]string, 2)
+	var counters = make([]string, 1)
+	var perfobjects = make([]perfobject, 1)
+
+	objectname := "Processor Information"
+	instances[0] = "_Total"
+	instances[1] = "0,0"
+	counters[0] = "Performance Limit Flags"
+
+	var expectedCounter = "Performance_Limit_Flags"
+
+	var measurement = "test"
+
+	PerfObject := perfobject{
+		ObjectName:    objectname,
+		Instances:     instances,
+		Counters:      counters,
+		Measurement:   measurement,
+		WarnOnMissing: false,
+		FailOnMissing: true,
+		IncludeTotal:  false,
+	}
+
+	perfobjects[0] = PerfObject
+
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects, query: &PerformanceQueryImpl{}, UseWildcardsExpansion: true}
+	var acc testutil.Accumulator
+	err := m.Gather(&acc)
+	require.NoError(t, err)
+
+	time.Sleep(2000 * time.Millisecond)
+	err = m.Gather(&acc)
+	require.NoError(t, err)
+
+	assert.Len(t, acc.Metrics, 4)
+
+	for _, metric := range acc.Metrics {
+		_, ok := metric.Fields[expectedCounter]
+		assert.True(t, ok)
+	}
+
+}
--- a/plugins/inputs/win_perf_counters/win_perf_counters_test.go
+++ b/plugins/inputs/win_perf_counters/win_perf_counters_test.go
--- a/plugins/inputs/zipkin/cmd/thrift_serialize/thrift_serialize.go
+++ b/plugins/inputs/zipkin/cmd/thrift_serialize/thrift_serialize.go
@@ -32,7 +32,7 @@ import (
 	"log"

 	"github.com/apache/thrift/lib/go/thrift"
-	"github.com/openzipkin/zipkin-go-opentracing/_thrift/gen-go/zipkincore"
+	"github.com/openzipkin/zipkin-go-opentracing/thrift/gen-go/zipkincore"
 )

 var (
--- a/plugins/inputs/zipkin/codec/codec.go
+++ b/plugins/inputs/zipkin/codec/codec.go
@@ -4,7 +4,7 @@ import (
 	"time"

 	"github.com/influxdata/telegraf/plugins/inputs/zipkin/trace"
-	"github.com/openzipkin/zipkin-go-opentracing/_thrift/gen-go/zipkincore"
+	"github.com/openzipkin/zipkin-go-opentracing/thrift/gen-go/zipkincore"
 )

 //now is a mockable time for now
--- a/plugins/inputs/zipkin/codec/jsonV1/jsonV1.go
+++ b/plugins/inputs/zipkin/codec/jsonV1/jsonV1.go
@@ -7,7 +7,7 @@ import (
 	"time"

 	"github.com/influxdata/telegraf/plugins/inputs/zipkin/codec"
-	"github.com/openzipkin/zipkin-go-opentracing/_thrift/gen-go/zipkincore"
+	"github.com/openzipkin/zipkin-go-opentracing/thrift/gen-go/zipkincore"
 )

 // JSON decodes spans from  bodies `POST`ed to the spans endpoint
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Max U	640ae884ea	update readme to include procstat_lookup metric	2018-06-22 10:01:13 -07:00
Max U	542c030dc8	knock more errors from test files	2018-06-21 16:23:06 -07:00
Max U	504d978446	clean up some test cases	2018-06-21 16:12:26 -07:00
Max U	ec7f13111f	add more test files	2018-06-21 16:06:36 -07:00
Max U	4e24a1bbe3	add grok as a top level parser	2018-06-21 15:56:20 -07:00
Max U	9c4b52256d	tweak metric output	2018-06-21 13:13:46 -07:00
Max U	08a11d7bfd	change config file	2018-06-21 11:44:02 -07:00
Max U	e12eced211	input plugin that reads files each interval	2018-06-21 11:26:14 -07:00
Greg	1bd41ef3ce	Update vendoring to dep from gdm (#4314 )	2018-06-19 11:55:38 -07:00
Daniel Nelson	d7c756e9ff	Update changelog	2018-06-19 11:48:08 -07:00
maxunt	39206677f8	Add new measurement with results of pgrep lookup to procstat input (#4307 )	2018-06-19 11:47:13 -07:00
Daniel Nelson	b66eb2fec7	Update changelog	2018-06-18 18:09:31 -07:00
Piotr Popieluch	3ad10283ef	Add valuecounter aggregator plugin (#3523 )	2018-06-18 18:06:11 -07:00
Daniel Nelson	84e9a5c97e	Update changelog	2018-06-18 15:40:00 -07:00
Daniel Nelson	c98b58dacc	Update docker input documentation for container status	2018-06-18 15:38:21 -07:00
prashanthjbabu	98d86df797	Add container status tag to docker input (#4259 )	2018-06-18 15:33:14 -07:00
Daniel Nelson	4e9e57e210	Drop CI support for Go 1.8 (#4309 ) Go 1.8 is no longer a supported version and the circleci/golang images has been removed.	2018-06-17 18:50:14 -07:00
Daniel Nelson	7781507c01	Update changelog	2018-06-14 13:18:31 -07:00
maxunt	8482c40a91	Fix selection of tags under nested objects in the JSON parser (#4284 )	2018-06-14 13:17:32 -07:00
Daniel Nelson	0dda9b8319	Update changelog	2018-06-13 13:50:43 -07:00
Arkady Emelyanov	4e69d10ff7	Add owner tag on partitions in burrow input (#4281 )	2018-06-13 13:05:27 -07:00
Daniel Nelson	f689463e8e	Use linux/unix name only in `make install` closes: #4278	2018-06-12 18:37:50 -07:00
Vlasta Hajek	f217d12de5	Fix grammar issues in win_perf_counters readme	2018-06-12 16:54:48 -07:00
Daniel Nelson	886795063e	Fix typo	2018-06-12 16:50:14 -07:00
Daniel Nelson	30dc95fa78	Update changelog	2018-06-12 16:46:27 -07:00
Daniel Nelson	40fac0a9b4	Treat sigterm as a clean shutdown signal (#4277 )	2018-06-12 16:44:04 -07:00
Daniel Nelson	36df4c5ae5	Fix grammar in converter processor documentation	2018-06-12 16:12:08 -07:00
marcv81	70ffed3a4d	Fixed typos in nvidia_smi plugin doc (#4261 )	2018-06-12 14:28:56 -07:00
Daniel Nelson	bf59bcf721	Update changelog	2018-06-12 13:57:00 -07:00
Sambhav Kothari	a789f97feb	Add support for solr 7 to the solr input (#4271 )	2018-06-12 13:56:13 -07:00
Daniel Nelson	d2e00a3205	Set 1.7.0 release date	2018-06-12 11:41:58 -07:00
Daniel Nelson	daddd8bbac	Use nats-io/go-nats instead of nats-io/nats in tests	2018-06-11 16:13:59 -07:00
Daniel Nelson	d16530677d	Update changelog	2018-06-11 16:07:23 -07:00
marcv81	1ea18ffd0a	Add power draw field to nvidia_smi plugin (#4262 )	2018-06-11 16:06:26 -07:00
Daniel Nelson	dd2223ae1c	Use nats-io/go-nats instead of nats-io/nats	2018-06-11 15:24:45 -07:00
Daniel Nelson	90eebd88af	Update changelog	2018-06-11 14:55:12 -07:00
Pierre Tessier	d2e729dfaf	Remove tags with empty values from Wavefront output (#4266 )	2018-06-11 14:54:08 -07:00
Daniel Nelson	f64d612294	Reword converter description	2018-06-11 14:43:28 -07:00
Daniel Nelson	76ec90e66d	Update win_perf_counters README	2018-06-11 11:41:46 -07:00
Vlasta Hajek	1690f36b09	Add option to enable wildcard expansion (#4265 ) This is needed because wildcard expansion causes counters to be localized.	2018-06-11 11:10:53 -07:00
Vlasta Hajek	87f711a19a	Fix panic with unicode counter names in win_perf_counters (#4255 )	2018-06-08 12:41:21 -07:00
Daniel Nelson	58895d6b03	Update go-syslog version Fix go-syslog overquota errors since latest version no longer uses LFS.	2018-06-08 12:22:49 -07:00
Daniel Nelson	cd9ad77038	Update changelog	2018-06-07 12:38:17 -07:00
Daniel Nelson	8563238059	Update tengine docs	2018-06-07 12:35:46 -07:00
Daniel Nelson	11335f5fee	Restore tengine input plugin (#4160 ) This reverts commit `8826cdc423`.	2018-06-07 12:35:02 -07:00
Daniel Nelson	acba20af1a	Fix TLS and SSL config option parsing (#4247 )	2018-06-06 18:29:59 -07:00
Daniel Nelson	229b6bd944	Update changelog	2018-06-06 14:30:37 -07:00
Daniel Nelson	7fe6e2f5ae	Use same flags for all bsd family ping varients (#4241 )	2018-06-06 14:28:12 -07:00
Pierre Fersing	a4214abfc4	Ignore more boring filesystems from disk plugin (#4244 )	2018-06-06 13:44:26 -07:00
Daniel Nelson	5f0cbd1255	Update changelog	2018-06-05 17:14:29 -07:00
Leszek Charkiewicz	3ef4dff4ec	Add SSL/TLS support to Redis input (#4236 )	2018-06-05 17:12:30 -07:00
Piotr Popieluch	dfe7b5eec2	Don't skip metrics during startup in aggregate phase (#4230 )	2018-06-05 16:30:53 -07:00
Daniel Nelson	92a8f795f5	Set 1.6.4 release date	2018-06-05 12:11:15 -07:00
Daniel Nelson	b1d77ade55	Update master version to 1.8	2018-06-05 11:46:55 -07:00
Daniel Nelson	7103077b3f	Update sample config	2018-06-05 11:45:07 -07:00
Daniel Nelson	7332ce0e95	Add go-syslog to dependencies licenses list	2018-06-05 11:40:03 -07:00
Daniel Nelson	2be32f0a80	Update changelog	2018-06-04 18:35:47 -07:00
Daniel Nelson	701e157ef0	Revert "Update aerospike-client-go version to latest release (#4128 )" This reverts commit `1f29612918`.	2018-06-04 18:23:51 -07:00
Daniel Nelson	eb94bb29fd	Update changelog	2018-06-04 18:13:53 -07:00
Daniel Nelson	449bd5c3b9	Fix misnamed option in varnish sample config	2018-06-04 18:06:59 -07:00
Daniel Nelson	96abff0660	Update changelog	2018-06-04 18:02:00 -07:00
Phil Preston	9eab3572ff	Add counter fields to pf input (#4216 )	2018-06-04 18:01:14 -07:00
Daniel Nelson	be8b87000c	Remove test for empty metrics list from file output	2018-06-04 17:58:55 -07:00
Mathur	ff93c3c326	Update burrow README.md (#4231 )	2018-06-04 10:51:57 -07:00
Daniel Nelson	df1fe7a2b4	Use random name for test sockets to avoid intermittent failure	2018-06-03 20:19:39 -07:00
Daniel Nelson	a04cfee349	Fix incorrect option name in amqp sample configuration	2018-06-03 18:42:08 -07:00
Daniel Nelson	da6ad34fc8	Add option to disconnect after a message limit is reached in amqp output	2018-06-03 18:35:59 -07:00
Daniel Nelson	179bcfdcbb	Use list of brokers in amqp output and amqp_consumer	2018-06-03 18:35:59 -07:00
Daniel Nelson	e3f1d28908	Allow configuration of amqp exchange type, durability, and arguments	2018-06-03 18:35:59 -07:00
Dark	fcea745e99	Change config to match toml parsing rule. (#4225 )	2018-06-03 18:31:47 -07:00
Daniel Nelson	90bcb5bc3c	Update changelog	2018-06-03 15:59:00 -07:00
Mike Gent	312116c101	Add passive mode exchange declaration option to amqp consumer input (#3995 )	2018-06-03 15:52:59 -07:00
Mike Gent	2cc2913d81	Add static routing_key option to amqp output (#3994 )	2018-06-03 15:52:00 -07:00
Daniel Nelson	b556eb8b2f	Update changelog	2018-06-01 10:51:23 -07:00
Thanabodee Charoenpiriyakij	8b28f40cc0	Handle uint64 on cloudwatch output (#4219 )	2018-06-01 10:47:40 -07:00
Daniel Nelson	cabee8f8e0	Update changelog	2018-05-31 11:58:16 -07:00
Piotr Popieluch	e0071f365a	Print the enabled aggregator and processor plugins on startup (#4212 )	2018-05-31 11:56:49 -07:00
Patrick Hemmer	5ae2b02f5d	Fix snmp overriding of auto-configured table fields (#4208 ) Whenever the snmp plugin was configured with a table with automatic field discovery, if one of those fields was explicitly overridden in the config and the value of is_tag was changed, the field would be duplicated, once as a tag & once as a field. This change fixes the behavior so that if a field is explicitly configured, automatic table field discovery doesn't touch it.	2018-05-29 19:03:37 -07:00
Daniel Nelson	59f0a5354f	Log if connection is closed on write error	2018-05-29 16:10:27 -07:00
Vlasta Hajek	c8b68430f0	Fix struct alignment in win_perf_counters for 32-bit 386 arch (#4206 )	2018-05-29 11:34:00 -07:00
Daniel Nelson	1ac64596bf	Update syslog docs and add to changelog and readme	2018-05-25 14:33:57 -07:00
Leonardo Di Donato	b78984554c	Add syslog input plugin (#4181 )	2018-05-25 11:40:12 -07:00
Daniel Nelson	2def31bc3d	Update changelog	2018-05-24 18:34:08 -07:00
Vlasta Hajek	010e4f5b0b	Fix wildcard and other issues with win_perf_counters (#4189 )	2018-05-24 18:25:06 -07:00
Daniel Nelson	ce3b367dac	Add jolokia2 example configs to list in readme	2018-05-24 12:02:20 -07:00
Daniel Nelson	f3f753310f	Update changelog	2018-05-24 11:59:15 -07:00
Pierre Tessier	50d721ae05	Add additional examples for jolokia2 (#4191 )	2018-05-24 11:58:43 -07:00