Space Igloo

2016-05-04 11:16:18 -06:00
137 changed files with 2482 additions and 8810 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,2 @@
 CHANGELOG.md merge=union
-README.md merge=union
-plugins/inputs/all/all.go merge=union
-plugins/outputs/all/all.go merge=union
+
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,42 +0,0 @@
-## Directions
-
-GitHub Issues are reserved for actionable bug reports and feature requests.
-General questions should be sent to the [InfluxDB mailing list](https://groups.google.com/forum/#!forum/influxdb).
-
-Before opening an issue, search for similar bug reports or feature requests on GitHub Issues.
-If no similar issue can be found, fill out either the "Bug Report" or the "Feature Request" section below.
-Erase the other section and everything on and above this line.
-
-*Please note, the quickest way to fix a bug is to open a Pull Request.*
-
-## Bug report
-
-### System info:
-
-[Include Telegraf version, operating system name, and other relevant details]
-
-### Steps to reproduce:
-
-1. ...
-2. ...
-
-### Expected behavior:
-
-### Actual behavior:
-
-### Additional info:
-
-[Include gist of relevant config, logs, etc.]
-
-
-## Feature Request
-
-Opening a feature request kicks off a discussion.
-
-### Proposal:
-
-### Current behavior:
-
-### Desired behavior:
-
-### Use case: [Why is this important (helps with prioritizing requests)]
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,5 +0,0 @@
-### Required for all PRs:
-
- [ ] CHANGELOG.md updated
- [ ] Sign [CLA](https://influxdata.com/community/cla/) (if not already signed)
- [ ] README.md updated (if adding a new plugin)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,91 +1,4 @@
-## v1.0 beta 1 [2016-06-07]
-
-### Release Notes
-
- `flush_jitter` behavior has been changed. The random jitter will now be
-evaluated at every flush interval, rather than once at startup. This makes it
-consistent with the behavior of `collection_jitter`.
-
- All AWS plugins now utilize a standard mechanism for evaluating credentials.
-This allows all AWS plugins to support environment variables, shared credential
-files & profiles, and role assumptions. See the specific plugin README for
-details.
-
- The AWS CloudWatch input plugin can now declare a wildcard value for a metric
-dimension. This causes the plugin to read all metrics that contain the specified
-dimension key regardless of value. This is used to export collections of metrics
-without having to know the dimension values ahead of time.
-
- The AWS CloudWatch input plugin can now be configured with the `cache_ttl`
-attribute. This configures the TTL of the internal metric cache. This is useful
-in conjunction with wildcard dimension values as it will control the amount of
-time before a new metric is included by the plugin.
-
-### Features
- [#1262](https://github.com/influxdata/telegraf/pull/1261): Add graylog input pluging.
- [#1294](https://github.com/influxdata/telegraf/pull/1294): consul input plugin. Thanks @harnash
- [#1164](https://github.com/influxdata/telegraf/pull/1164): conntrack input plugin. Thanks @robinpercy!
- [#1165](https://github.com/influxdata/telegraf/pull/1165): vmstat input plugin. Thanks @jshim-xm!
- [#1247](https://github.com/influxdata/telegraf/pull/1247): rollbar input plugin. Thanks @francois2metz and @cduez!
- [#1208](https://github.com/influxdata/telegraf/pull/1208): Standardized AWS credentials evaluation & wildcard CloudWatch dimensions. Thanks @johnrengelman!
- [#1264](https://github.com/influxdata/telegraf/pull/1264): Add SSL config options to http_response plugin.
- [#1272](https://github.com/influxdata/telegraf/pull/1272): graphite parser: add ability to specify multiple tag keys, for consistency with influxdb parser.
- [#1265](https://github.com/influxdata/telegraf/pull/1265): Make dns lookups for chrony configurable. Thanks @zbindenren!
- [#1275](https://github.com/influxdata/telegraf/pull/1275): Allow wildcard filtering of varnish stats.
- [#1142](https://github.com/influxdata/telegraf/pull/1142): Support for glob patterns in exec plugin commands configuration.
- [#1278](https://github.com/influxdata/telegraf/pull/1278): RabbitMQ input: made url parameter optional by using DefaultURL (http://localhost:15672) if not specified
- [#1197](https://github.com/influxdata/telegraf/pull/1197): Limit AWS GetMetricStatistics requests to 10 per second.
- [#1278](https://github.com/influxdata/telegraf/pull/1278) & [#1288](https://github.com/influxdata/telegraf/pull/1288) & [#1295](https://github.com/influxdata/telegraf/pull/1295): RabbitMQ/Apache/InfluxDB inputs: made url(s) parameter optional by using reasonable input defaults if not specified
- [#1296](https://github.com/influxdata/telegraf/issues/1296): Refactor of flush_jitter argument.
- [#1213](https://github.com/influxdata/telegraf/issues/1213): Add inactive & active memory to mem plugin.
-
-### Bugfixes
-
- [#1252](https://github.com/influxdata/telegraf/pull/1252) & [#1279](https://github.com/influxdata/telegraf/pull/1279): Fix systemd service. Thanks @zbindenren & @PierreF!
- [#1221](https://github.com/influxdata/telegraf/pull/1221): Fix influxdb n_shards counter.
- [#1258](https://github.com/influxdata/telegraf/pull/1258): Fix potential kernel plugin integer parse error.
- [#1268](https://github.com/influxdata/telegraf/pull/1268): Fix potential influxdb input type assertion panic.
- [#1283](https://github.com/influxdata/telegraf/pull/1283): Still send processes metrics if a process exited during metric collection.
- [#1297](https://github.com/influxdata/telegraf/issues/1297): disk plugin panic when usage grab fails.
- [#1316](https://github.com/influxdata/telegraf/pull/1316): Removed leaked "database" tag on redis metrics. Thanks @PierreF!
- [#1323](https://github.com/influxdata/telegraf/issues/1323): Processes plugin: fix potential error with /proc/net/stat directory.
- [#1322](https://github.com/influxdata/telegraf/issues/1322): Fix rare RHEL 5.2 panic in gopsutil diskio gathering function.
-
-## v0.13.1 [2016-05-24]
-
-### Release Notes
-
- net_response and http_response plugins timeouts will now accept duration
-strings, ie, "2s" or "500ms".
- Input plugin Gathers will no longer be logged by default, but a Gather for
-_each_ plugin will be logged in Debug mode.
- Debug mode will no longer print every point added to the accumulator. This
-functionality can be duplicated using the `file` output plugin and printing
-to "stdout".
-
-### Features
-
- [#1173](https://github.com/influxdata/telegraf/pull/1173): varnish input plugin. Thanks @sfox-xmatters!
- [#1138](https://github.com/influxdata/telegraf/pull/1138): nstat input plugin. Thanks @Maksadbek!
- [#1139](https://github.com/influxdata/telegraf/pull/1139): instrumental output plugin. Thanks @jasonroelofs!
- [#1172](https://github.com/influxdata/telegraf/pull/1172): Ceph storage stats. Thanks @robinpercy!
- [#1233](https://github.com/influxdata/telegraf/pull/1233): Updated golint gopsutil dependency.
- [#1238](https://github.com/influxdata/telegraf/pull/1238): chrony input plugin. Thanks @zbindenren!
- [#479](https://github.com/influxdata/telegraf/issues/479): per-plugin execution time added to debug output.
- [#1249](https://github.com/influxdata/telegraf/issues/1249): influxdb output: added write_consistency argument.
-
-### Bugfixes
-
- [#1195](https://github.com/influxdata/telegraf/pull/1195): Docker panic on timeout. Thanks @zstyblik!
- [#1211](https://github.com/influxdata/telegraf/pull/1211): mongodb input. Fix possible panic. Thanks @kols!
- [#1215](https://github.com/influxdata/telegraf/pull/1215): Fix for possible gopsutil-dependent plugin hangs.
- [#1228](https://github.com/influxdata/telegraf/pull/1228): Fix service plugin host tag overwrite.
- [#1198](https://github.com/influxdata/telegraf/pull/1198): http_response: override request Host header properly
- [#1230](https://github.com/influxdata/telegraf/issues/1230): Fix Telegraf process hangup due to a single plugin hanging.
- [#1214](https://github.com/influxdata/telegraf/issues/1214): Use TCP timeout argument in net_response plugin.
- [#1243](https://github.com/influxdata/telegraf/pull/1243): Logfile not created on systemd.
-
-## v0.13 [2016-05-11]
+## v0.13 [unreleased]

 ### Release Notes

@@ -135,15 +48,7 @@ based on _prefix_ in addition to globs. This means that a filter like
  - disque: `host -> disque_host`
  - rethinkdb: `host -> rethinkdb_host`

- **Breaking Change**: The `win_perf_counters` input has been changed to
-sanitize field names, replacing `/Sec` and `/sec` with `_persec`, as well as
-spaces with underscores. This is needed because Graphite doesn't like slashes
-and spaces, and was failing to accept metrics that had them.
-The `/[sS]ec` -> `_persec` is just to make things clearer and uniform.
-
- **Breaking Change**: snmp plugin. The `host` tag of the snmp plugin has been
-changed to the `snmp_host` tag.
-
+- **Breaking Change**: The `win_perf_counters` input has been changed to sanitize field names, replacing `/Sec` and `/sec` with `_persec`, as well as spaces with underscores. This is needed because Graphite doesn't like slashes and spaces, and was failing to accept metrics that had them. The `/[sS]ec` -> `_persec` is just to make things clearer and uniform.
 - The `disk` input plugin can now be configured with the `HOST_MOUNT_PREFIX` environment variable.
 This value is prepended to any mountpaths discovered before retrieving stats.
 It is not included on the report path. This is necessary for reporting host disk stats when running from within a container.
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -212,8 +212,8 @@ func (s *Simple) Close() error {
 }

 func (s *Simple) Write(metrics []telegraf.Metric) error {
-    for _, metric := range metrics {
-        // write `metric` to the output sink here
+    for _, pt := range points {
+        // write `pt` to the output sink here
    }
    return nil
 }
--- a/7
+++ b/7
@@ -16,17 +16,16 @@ github.com/eapache/go-resiliency b86b1ec0dd4209a588dc1285cdd471e73525c0b3
 github.com/eapache/queue ded5959c0d4e360646dc9e9908cff48666781367
 github.com/eclipse/paho.mqtt.golang 0f7a459f04f13a41b7ed752d47944528d4bf9a86
 github.com/go-sql-driver/mysql 1fca743146605a172a266e1654e01e5cd5669bee
-github.com/gobwas/glob 49571a1557cd20e6a2410adc6421f85b66c730b5
+github.com/gobwas/glob d877f6352135181470c40c73ebb81aefa22115fa
 github.com/golang/protobuf 552c7b9542c194800fd493123b3798ef0a832032
 github.com/golang/snappy 427fb6fc07997f43afa32f35e850833760e489a7
 github.com/gonuts/go-shellquote e842a11b24c6abfb3dd27af69a17f482e4b483c2
 github.com/gorilla/context 1ea25387ff6f684839d82767c1733ff4d4d15d0a
 github.com/gorilla/mux c9e326e2bdec29039a3761c07bece13133863e1e
 github.com/hailocab/go-hostpool e80d13ce29ede4452c43dea11e79b9bc8a15b478
-github.com/hashicorp/consul 5aa90455ce78d4d41578bafc86305e6e6b28d7d2
 github.com/hpcloud/tail b2940955ab8b26e19d43a43c4da0475dd81bdb56
 github.com/influxdata/config b79f6829346b8d6e78ba73544b1e1038f1f1c9da
-github.com/influxdata/influxdb e094138084855d444195b252314dfee9eae34cab
+github.com/influxdata/influxdb 21db76b3374c733f37ed16ad93f3484020034351
 github.com/influxdata/toml af4df43894b16e3fd2b788d01bd27ad0776ef2d0
 github.com/klauspost/crc32 19b0b332c9e4516a6370a0456e6182c3b5036720
 github.com/lib/pq e182dc4027e2ded4b19396d638610f2653295f36
@@ -43,7 +42,7 @@ github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6
 github.com/prometheus/common e8eabff8812b05acf522b45fdcd725a785188e37
 github.com/prometheus/procfs 406e5b7bfd8201a36e2bb5f7bdae0b03380c2ce8
 github.com/samuel/go-zookeeper 218e9c81c0dd8b3b18172b2bbfad92cc7d6db55f
-github.com/shirou/gopsutil 586bb697f3ec9f8ec08ffefe18f521a64534037c
+github.com/shirou/gopsutil 1f32ce1bb380845be7f5d174ac641a2c592c0c42
 github.com/soniah/gosnmp b1b4f885b12c5dcbd021c5cee1c904110de6db7d
 github.com/streadway/amqp b4f3ceab0337f013208d31348b578d83c0064744
 github.com/stretchr/testify 1f4a1643a57e798696635ea4c126e9127adb7d3c
--- a/14
+++ b/14
@@ -14,21 +14,21 @@ windows: prepare-windows build-windows

 # Only run the build (no dependency grabbing)
 build:
-	go install -ldflags "-X main.version=$(VERSION)" ./...
+	go install -ldflags "-X main.Version=$(VERSION)" ./...

 build-windows:
 	go build -o telegraf.exe -ldflags \
-		"-X main.version=$(VERSION)" \
+		"-X main.Version=$(VERSION)" \
 		./cmd/telegraf/telegraf.go

 build-for-docker:
 	CGO_ENABLED=0 GOOS=linux go build -installsuffix cgo -o telegraf -ldflags \
-					"-s -X main.version=$(VERSION)" \
+					"-s -X main.Version=$(VERSION)" \
 					./cmd/telegraf/telegraf.go

 # Build with race detector
 dev: prepare
-	go build -race -ldflags "-X main.version=$(VERSION)" ./...
+	go build -race -ldflags "-X main.Version=$(VERSION)" ./...

 # run package script
 package:
@@ -64,6 +64,7 @@ endif
 	docker run --name memcached -p "11211:11211" -d memcached
 	docker run --name postgres -p "5432:5432" -d postgres
 	docker run --name rabbitmq -p "15672:15672" -p "5672:5672" -d rabbitmq:3-management
+	docker run --name opentsdb -p "4242:4242" -d petergrace/opentsdb-docker
 	docker run --name redis -p "6379:6379" -d redis
 	docker run --name aerospike -p "3000:3000" -d aerospike
 	docker run --name nsq -p "4150:4150" -d nsqio/nsq /nsqd
@@ -78,6 +79,7 @@ docker-run-circle:
 		-e ADVERTISED_PORT=9092 \
 		-p "2181:2181" -p "9092:9092" \
 		-d spotify/kafka
+	docker run --name opentsdb -p "4242:4242" -d petergrace/opentsdb-docker
 	docker run --name aerospike -p "3000:3000" -d aerospike
 	docker run --name nsq -p "4150:4150" -d nsqio/nsq /nsqd
 	docker run --name mqtt -p "1883:1883" -d ncarlier/mqtt
@@ -86,8 +88,8 @@ docker-run-circle:

 # Kill all docker containers, ignore errors
 docker-kill:
-	-docker kill nsq aerospike redis rabbitmq postgres memcached mysql kafka mqtt riemann snmp
-	-docker rm nsq aerospike redis rabbitmq postgres memcached mysql kafka mqtt riemann snmp
+	-docker kill nsq aerospike redis opentsdb rabbitmq postgres memcached mysql kafka mqtt riemann snmp
+	-docker rm nsq aerospike redis opentsdb rabbitmq postgres memcached mysql kafka mqtt riemann snmp

 # Run full unit tests using docker containers (includes setup and teardown)
 test: vet docker-kill docker-run
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Telegraf [![Circle CI](https://circleci.com/gh/influxdata/telegraf.svg?style=svg)](https://circleci.com/gh/influxdata/telegraf) [![Docker pulls](https://img.shields.io/docker/pulls/library/telegraf.svg)](https://hub.docker.com/_/telegraf/)
+# Telegraf [![Circle CI](https://circleci.com/gh/influxdata/telegraf.svg?style=svg)](https://circleci.com/gh/influxdata/telegraf)

 Telegraf is an agent written in Go for collecting metrics from the system it's
 running on, or from other services, and writing them into InfluxDB or other
@@ -20,12 +20,12 @@ new plugins.
 ### Linux deb and rpm Packages:

 Latest:
-* https://dl.influxdata.com/telegraf/releases/telegraf_1.0.0-beta1_amd64.deb
-* https://dl.influxdata.com/telegraf/releases/telegraf-1.0.0_beta1.x86_64.rpm
+* http://get.influxdb.org/telegraf/telegraf_0.12.1-1_amd64.deb
+* http://get.influxdb.org/telegraf/telegraf-0.12.1-1.x86_64.rpm

 Latest (arm):
-* https://dl.influxdata.com/telegraf/releases/telegraf_1.0.0-beta1_armhf.deb
-* https://dl.influxdata.com/telegraf/releases/telegraf-1.0.0_beta1.armhf.rpm
+* http://get.influxdb.org/telegraf/telegraf_0.12.1-1_armhf.deb
+* http://get.influxdb.org/telegraf/telegraf-0.12.1-1.armhf.rpm

 ##### Package Instructions:

@@ -46,14 +46,32 @@ to use this repo to install & update telegraf.
 ### Linux tarballs:

 Latest:
-* https://dl.influxdata.com/telegraf/releases/telegraf-1.0.0-beta1_linux_amd64.tar.gz
-* https://dl.influxdata.com/telegraf/releases/telegraf-1.0.0-beta1_linux_i386.tar.gz
-* https://dl.influxdata.com/telegraf/releases/telegraf-1.0.0-beta1_linux_armhf.tar.gz
+* http://get.influxdb.org/telegraf/telegraf-0.12.1-1_linux_amd64.tar.gz
+* http://get.influxdb.org/telegraf/telegraf-0.12.1-1_linux_i386.tar.gz
+* http://get.influxdb.org/telegraf/telegraf-0.12.1-1_linux_armhf.tar.gz
+
+##### tarball Instructions:
+
+To install the full directory structure with config file, run:
+
+```
+sudo tar -C / -zxvf ./telegraf-0.12.1-1_linux_amd64.tar.gz
+```
+
+To extract only the binary, run:
+
+```
+tar -zxvf telegraf-0.12.1-1_linux_amd64.tar.gz --strip-components=3 ./usr/bin/telegraf
+```

 ### FreeBSD tarball:

 Latest:
-* https://dl.influxdata.com/telegraf/releases/telegraf-1.0.0-beta1_freebsd_amd64.tar.gz
+* http://get.influxdb.org/telegraf/telegraf-0.12.1-1_freebsd_amd64.tar.gz
+
+##### tarball Instructions:
+
+See linux instructions above.

 ### Ansible Role:

@@ -69,7 +87,8 @@ brew install telegraf
 ### Windows Binaries (EXPERIMENTAL)

 Latest:
-* https://dl.influxdata.com/telegraf/releases/telegraf-1.0.0-beta1_windows_amd64.zip
+* http://get.influxdb.org/telegraf/telegraf-0.12.1-1_windows_amd64.zip
+* http://get.influxdb.org/telegraf/telegraf-0.12.1-1_windows_i386.zip

 ### From Source:

@@ -142,10 +161,6 @@ Currently implemented sources:
 * [apache](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/apache)
 * [bcache](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/bcache)
 * [cassandra](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/cassandra)
-* [ceph](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/ceph)
-* [chrony](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/chrony)
-* [consul](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/consul)
-* [conntrack](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/conntrack)
 * [couchbase](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/couchbase)
 * [couchdb](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/couchdb)
 * [disque](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/disque)
@@ -171,7 +186,6 @@ Currently implemented sources:
 * [net_response](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/net_response)
 * [nginx](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/nginx)
 * [nsq](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/nsq)
-* [nstat](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/nstat)
 * [ntpq](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/ntpq)
 * [phpfpm](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/phpfpm)
 * [phusion passenger](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/passenger)
@@ -191,7 +205,6 @@ Currently implemented sources:
 * [snmp](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/snmp)
 * [sql server](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/sqlserver) (microsoft)
 * [twemproxy](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/twemproxy)
-* [varnish](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/varnish)
 * [zfs](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/zfs)
 * [zookeeper](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/zookeeper)
 * [win_perf_counters ](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/win_perf_counters) (windows performance counters)
@@ -206,19 +219,16 @@ Currently implemented sources:
    * swap
    * processes
    * kernel (/proc/stat)
-    * kernel (/proc/vmstat)

 Telegraf can also collect metrics via the following service plugins:

 * [statsd](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/statsd)
-* [tail](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/tail)
 * [udp_listener](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/udp_listener)
 * [tcp_listener](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/tcp_listener)
 * [mqtt_consumer](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/mqtt_consumer)
 * [kafka_consumer](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/kafka_consumer)
 * [nats_consumer](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/nats_consumer)
 * [github_webhooks](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/github_webhooks)
-* [rollbar_webhooks](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/rollbar_webhooks)

 We'll be adding support for many more over the coming months. Read on if you
 want to add support for another service or third-party API.
@@ -233,8 +243,6 @@ want to add support for another service or third-party API.
 * [datadog](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/datadog)
 * [file](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/file)
 * [graphite](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/graphite)
-* [graylog](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/graylog)
-* [instrumental](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/instrumental)
 * [kafka](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/kafka)
 * [librato](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/librato)
 * [mqtt](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/mqtt)
--- a/agent/accumulator.go
+++ b/agent/accumulator.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"log"
 	"math"
+	"sync"
 	"time"

 	"github.com/influxdata/telegraf"
@@ -21,13 +22,13 @@ func NewAccumulator(
 }

 type accumulator struct {
+	sync.Mutex
+
 	metrics chan telegraf.Metric

 	defaultTags map[string]string

 	debug bool
-	// print every point added to the accumulator
-	trace bool

 	inputConfig *internal_models.InputConfig

@@ -83,17 +84,13 @@ func (ac *accumulator) AddFields(
 	if tags == nil {
 		tags = make(map[string]string)
 	}
-	// Apply plugin-wide tags if set
-	for k, v := range ac.inputConfig.Tags {
-		if _, ok := tags[k]; !ok {
-			tags[k] = v
-		}
-	}
 	// Apply daemon-wide tags if set
 	for k, v := range ac.defaultTags {
-		if _, ok := tags[k]; !ok {
-			tags[k] = v
-		}
+		tags[k] = v
+	}
+	// Apply plugin-wide tags if set
+	for k, v := range ac.inputConfig.Tags {
+		tags[k] = v
 	}
 	ac.inputConfig.Filter.FilterTags(tags)

@@ -151,7 +148,7 @@ func (ac *accumulator) AddFields(
 		log.Printf("Error adding point [%s]: %s\n", measurement, err.Error())
 		return
 	}
-	if ac.trace {
+	if ac.debug {
 		fmt.Println("> " + m.String())
 	}
 	ac.metrics <- m
@@ -165,14 +162,6 @@ func (ac *accumulator) SetDebug(debug bool) {
 	ac.debug = debug
 }

-func (ac *accumulator) Trace() bool {
-	return ac.trace
-}
-
-func (ac *accumulator) SetTrace(trace bool) {
-	ac.trace = trace
-}
-
 func (ac *accumulator) setDefaultTags(tags map[string]string) {
 	ac.defaultTags = tags
 }
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -1,15 +1,17 @@
 package agent

 import (
+	cryptorand "crypto/rand"
 	"fmt"
 	"log"
+	"math/big"
+	"math/rand"
 	"os"
 	"runtime"
 	"sync"
 	"time"

 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/internal/config"
 	"github.com/influxdata/telegraf/internal/models"
 )
@@ -100,39 +102,93 @@ func panicRecover(input *internal_models.RunningInput) {
 	}
 }

-// gatherer runs the inputs that have been configured with their own
+// gatherParallel runs the inputs that are using the same reporting interval
+// as the telegraf agent.
+func (a *Agent) gatherParallel(metricC chan telegraf.Metric) error {
+	var wg sync.WaitGroup
+
+	start := time.Now()
+	counter := 0
+	jitter := a.Config.Agent.CollectionJitter.Duration.Nanoseconds()
+	for _, input := range a.Config.Inputs {
+		if input.Config.Interval != 0 {
+			continue
+		}
+
+		wg.Add(1)
+		counter++
+		go func(input *internal_models.RunningInput) {
+			defer panicRecover(input)
+			defer wg.Done()
+
+			acc := NewAccumulator(input.Config, metricC)
+			acc.SetDebug(a.Config.Agent.Debug)
+			acc.setDefaultTags(a.Config.Tags)
+
+			if jitter != 0 {
+				nanoSleep := rand.Int63n(jitter)
+				d, err := time.ParseDuration(fmt.Sprintf("%dns", nanoSleep))
+				if err != nil {
+					log.Printf("Jittering collection interval failed for plugin %s",
+						input.Name)
+				} else {
+					time.Sleep(d)
+				}
+			}
+
+			if err := input.Input.Gather(acc); err != nil {
+				log.Printf("Error in input [%s]: %s", input.Name, err)
+			}
+
+		}(input)
+	}
+
+	if counter == 0 {
+		return nil
+	}
+
+	wg.Wait()
+
+	elapsed := time.Since(start)
+	if !a.Config.Agent.Quiet {
+		log.Printf("Gathered metrics, (%s interval), from %d inputs in %s\n",
+			a.Config.Agent.Interval.Duration, counter, elapsed)
+	}
+	return nil
+}
+
+// gatherSeparate runs the inputs that have been configured with their own
 // reporting interval.
-func (a *Agent) gatherer(
+func (a *Agent) gatherSeparate(
 	shutdown chan struct{},
 	input *internal_models.RunningInput,
-	interval time.Duration,
 	metricC chan telegraf.Metric,
 ) error {
 	defer panicRecover(input)

-	ticker := time.NewTicker(interval)
-	defer ticker.Stop()
+	ticker := time.NewTicker(input.Config.Interval)

 	for {
 		var outerr error
+		start := time.Now()

 		acc := NewAccumulator(input.Config, metricC)
 		acc.SetDebug(a.Config.Agent.Debug)
 		acc.setDefaultTags(a.Config.Tags)

-		internal.RandomSleep(a.Config.Agent.CollectionJitter.Duration, shutdown)
+		if err := input.Input.Gather(acc); err != nil {
+			log.Printf("Error in input [%s]: %s", input.Name, err)
+		}

-		start := time.Now()
-		gatherWithTimeout(shutdown, input, acc, interval)
 		elapsed := time.Since(start)
+		if !a.Config.Agent.Quiet {
+			log.Printf("Gathered metrics, (separate %s interval), from %s in %s\n",
+				input.Config.Interval, input.Name, elapsed)
+		}

 		if outerr != nil {
 			return outerr
 		}
-		if a.Config.Agent.Debug {
-			log.Printf("Input [%s] gathered metrics, (%s interval) in %s\n",
-				input.Name, interval, elapsed)
-		}

 		select {
 		case <-shutdown:
@@ -143,42 +199,6 @@ func (a *Agent) gatherer(
 	}
 }

-// gatherWithTimeout gathers from the given input, with the given timeout.
-//   when the given timeout is reached, gatherWithTimeout logs an error message
-//   but continues waiting for it to return. This is to avoid leaving behind
-//   hung processes, and to prevent re-calling the same hung process over and
-//   over.
-func gatherWithTimeout(
-	shutdown chan struct{},
-	input *internal_models.RunningInput,
-	acc *accumulator,
-	timeout time.Duration,
-) {
-	ticker := time.NewTicker(timeout)
-	defer ticker.Stop()
-	done := make(chan error)
-	go func() {
-		done <- input.Input.Gather(acc)
-	}()
-
-	for {
-		select {
-		case err := <-done:
-			if err != nil {
-				log.Printf("ERROR in input [%s]: %s", input.Name, err)
-			}
-			return
-		case <-ticker.C:
-			log.Printf("ERROR: input [%s] took longer to collect than "+
-				"collection interval (%s)",
-				input.Name, timeout)
-			continue
-		case <-shutdown:
-			return
-		}
-	}
-}
-
 // Test verifies that we can 'Gather' from all inputs with their configured
 // Config struct
 func (a *Agent) Test() error {
@@ -200,7 +220,7 @@ func (a *Agent) Test() error {

 	for _, input := range a.Config.Inputs {
 		acc := NewAccumulator(input.Config, metricC)
-		acc.SetTrace(true)
+		acc.SetDebug(true)
 		acc.setDefaultTags(a.Config.Tags)

 		fmt.Printf("* Plugin: %s, Collection 1\n", input.Name)
@@ -261,7 +281,6 @@ func (a *Agent) flusher(shutdown chan struct{}, metricC chan telegraf.Metric) er
 			a.flush()
 			return nil
 		case <-ticker.C:
-			internal.RandomSleep(a.Config.Agent.FlushJitter.Duration, shutdown)
 			a.flush()
 		case m := <-metricC:
 			for _, o := range a.Config.Outputs {
@@ -271,10 +290,35 @@ func (a *Agent) flusher(shutdown chan struct{}, metricC chan telegraf.Metric) er
 	}
 }

+// jitterInterval applies the the interval jitter to the flush interval using
+// crypto/rand number generator
+func jitterInterval(ininterval, injitter time.Duration) time.Duration {
+	var jitter int64
+	outinterval := ininterval
+	if injitter.Nanoseconds() != 0 {
+		maxjitter := big.NewInt(injitter.Nanoseconds())
+		if j, err := cryptorand.Int(cryptorand.Reader, maxjitter); err == nil {
+			jitter = j.Int64()
+		}
+		outinterval = time.Duration(jitter + ininterval.Nanoseconds())
+	}
+
+	if outinterval.Nanoseconds() < time.Duration(500*time.Millisecond).Nanoseconds() {
+		log.Printf("Flush interval %s too low, setting to 500ms\n", outinterval)
+		outinterval = time.Duration(500 * time.Millisecond)
+	}
+
+	return outinterval
+}
+
 // Run runs the agent daemon, gathering every Interval
 func (a *Agent) Run(shutdown chan struct{}) error {
 	var wg sync.WaitGroup

+	a.Config.Agent.FlushInterval.Duration = jitterInterval(
+		a.Config.Agent.FlushInterval.Duration,
+		a.Config.Agent.FlushJitter.Duration)
+
 	log.Printf("Agent Config: Interval:%s, Debug:%#v, Quiet:%#v, Hostname:%#v, "+
 		"Flush Interval:%s \n",
 		a.Config.Agent.Interval.Duration, a.Config.Agent.Debug, a.Config.Agent.Quiet,
@@ -304,6 +348,7 @@ func (a *Agent) Run(shutdown chan struct{}) error {
 		i := int64(a.Config.Agent.Interval.Duration)
 		time.Sleep(time.Duration(i - (time.Now().UnixNano() % i)))
 	}
+	ticker := time.NewTicker(a.Config.Agent.Interval.Duration)

 	wg.Add(1)
 	go func() {
@@ -314,21 +359,32 @@ func (a *Agent) Run(shutdown chan struct{}) error {
 		}
 	}()

-	wg.Add(len(a.Config.Inputs))
 	for _, input := range a.Config.Inputs {
-		interval := a.Config.Agent.Interval.Duration
-		// overwrite global interval if this plugin has it's own.
+		// Special handling for inputs that have their own collection interval
+		// configured. Default intervals are handled below with gatherParallel
 		if input.Config.Interval != 0 {
-			interval = input.Config.Interval
+			wg.Add(1)
+			go func(input *internal_models.RunningInput) {
+				defer wg.Done()
+				if err := a.gatherSeparate(shutdown, input, metricC); err != nil {
+					log.Printf(err.Error())
+				}
+			}(input)
 		}
-		go func(in *internal_models.RunningInput, interv time.Duration) {
-			defer wg.Done()
-			if err := a.gatherer(shutdown, in, interv, metricC); err != nil {
-				log.Printf(err.Error())
-			}
-		}(input, interval)
 	}

-	wg.Wait()
-	return nil
+	defer wg.Wait()
+
+	for {
+		if err := a.gatherParallel(metricC); err != nil {
+			log.Printf(err.Error())
+		}
+
+		select {
+		case <-shutdown:
+			return nil
+		case <-ticker.C:
+			continue
+		}
+	}
 }
--- a/agent/agent_test.go
+++ b/agent/agent_test.go
@@ -2,6 +2,7 @@ package agent

 import (
 	"testing"
+	"time"

 	"github.com/influxdata/telegraf/internal/config"

@@ -109,3 +110,75 @@ func TestAgent_LoadOutput(t *testing.T) {
 	a, _ = NewAgent(c)
 	assert.Equal(t, 3, len(a.Config.Outputs))
 }
+
+func TestAgent_ZeroJitter(t *testing.T) {
+	flushinterval := jitterInterval(time.Duration(10*time.Second),
+		time.Duration(0*time.Second))
+
+	actual := flushinterval.Nanoseconds()
+	exp := time.Duration(10 * time.Second).Nanoseconds()
+
+	if actual != exp {
+		t.Errorf("Actual %v, expected %v", actual, exp)
+	}
+}
+
+func TestAgent_ZeroInterval(t *testing.T) {
+	min := time.Duration(500 * time.Millisecond).Nanoseconds()
+	max := time.Duration(5 * time.Second).Nanoseconds()
+
+	for i := 0; i < 1000; i++ {
+		flushinterval := jitterInterval(time.Duration(0*time.Second),
+			time.Duration(5*time.Second))
+		actual := flushinterval.Nanoseconds()
+
+		if actual > max {
+			t.Errorf("Didn't expect interval %d to be > %d", actual, max)
+			break
+		}
+		if actual < min {
+			t.Errorf("Didn't expect interval %d to be < %d", actual, min)
+			break
+		}
+	}
+}
+
+func TestAgent_ZeroBoth(t *testing.T) {
+	flushinterval := jitterInterval(time.Duration(0*time.Second),
+		time.Duration(0*time.Second))
+
+	actual := flushinterval
+	exp := time.Duration(500 * time.Millisecond)
+
+	if actual != exp {
+		t.Errorf("Actual %v, expected %v", actual, exp)
+	}
+}
+
+func TestAgent_JitterMax(t *testing.T) {
+	max := time.Duration(32 * time.Second).Nanoseconds()
+
+	for i := 0; i < 1000; i++ {
+		flushinterval := jitterInterval(time.Duration(30*time.Second),
+			time.Duration(2*time.Second))
+		actual := flushinterval.Nanoseconds()
+		if actual > max {
+			t.Errorf("Didn't expect interval %d to be > %d", actual, max)
+			break
+		}
+	}
+}
+
+func TestAgent_JitterMin(t *testing.T) {
+	min := time.Duration(30 * time.Second).Nanoseconds()
+
+	for i := 0; i < 1000; i++ {
+		flushinterval := jitterInterval(time.Duration(30*time.Second),
+			time.Duration(2*time.Second))
+		actual := flushinterval.Nanoseconds()
+		if actual < min {
+			t.Errorf("Didn't expect interval %d to be < %d", actual, min)
+			break
+		}
+	}
+}
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -46,13 +46,9 @@ var fOutputFiltersLegacy = flag.String("outputfilter", "",
 var fConfigDirectoryLegacy = flag.String("configdirectory", "",
 	"directory containing additional *.conf files")

-// Telegraf version, populated linker.
-//   ie, -ldflags "-X main.version=`git describe --always --tags`"
-var (
-	version string
-	commit  string
-	branch  string
-)
+// Telegraf version
+//	-ldflags "-X main.Version=`git describe --always --tags`"
+var Version string

 const usage = `Telegraf, The plugin-driven server agent for collecting and reporting metrics.

@@ -136,7 +132,7 @@ func main() {
 		if len(args) > 0 {
 			switch args[0] {
 			case "version":
-				v := fmt.Sprintf("Telegraf - version %s", version)
+				v := fmt.Sprintf("Telegraf - Version %s", Version)
 				fmt.Println(v)
 				return
 			case "config":
@@ -162,7 +158,7 @@ func main() {
 		}

 		if *fVersion {
-			v := fmt.Sprintf("Telegraf - version %s", version)
+			v := fmt.Sprintf("Telegraf - Version %s", Version)
 			fmt.Println(v)
 			return
 		}
@@ -255,7 +251,7 @@ func main() {
 			}
 		}()

-		log.Printf("Starting Telegraf (version %s)\n", version)
+		log.Printf("Starting Telegraf (version %s)\n", Version)
 		log.Printf("Loaded outputs: %s", strings.Join(c.OutputNames(), " "))
 		log.Printf("Loaded inputs: %s", strings.Join(c.InputNames(), " "))
 		log.Printf("Tags enabled: %s", c.ListTags())
--- a/docs/DATA_FORMATS_INPUT.md
+++ b/docs/DATA_FORMATS_INPUT.md
@@ -186,59 +186,49 @@ name of the plugin.
 # Graphite:

 The Graphite data format translates graphite _dot_ buckets directly into
-telegraf measurement names, with a single value field, and without any tags.
-By default, the separator is left as ".", but this can be changed using the
-"separator" argument. For more advanced options,
-Telegraf supports specifying "templates" to translate
+telegraf measurement names, with a single value field, and without any tags. For
+more advanced options, Telegraf supports specifying "templates" to translate
 graphite buckets into Telegraf metrics.

-Templates are of the form:
+#### Separator:
+
+You can specify a separator to use for the parsed metrics.
+By default, it will leave the metrics with a "." separator.
+Setting `separator = "_"` will translate:

 ```
-"host.mytag.mytag.measurement.measurement.field*"
+cpu.usage.idle 99
+=> cpu_usage_idle value=99
 ```

-Where the following keywords exist:
-
-1. `measurement`: specifies that this section of the graphite bucket corresponds
-to the measurement name. This can be specified multiple times.
-2. `field`: specifies that this section of the graphite bucket corresponds
-to the field name. This can be specified multiple times.
-3. `measurement*`: specifies that all remaining elements of the graphite bucket
-correspond to the measurement name.
-4. `field*`: specifies that all remaining elements of the graphite bucket
-correspond to the field name.
-
-Any part of the template that is not a keyword is treated as a tag key. This
-can also be specified multiple times.
-
-NOTE: `field*` cannot be used in conjunction with `measurement*`!
-
-#### Measurement & Tag Templates:
+#### Measurement/Tag Templates:

 The most basic template is to specify a single transformation to apply to all
-incoming metrics. So the following template:
+incoming metrics. _measurement_ is a special keyword that tells Telegraf which
+parts of the graphite bucket to combine into the measurement name. It can have a
+trailing `*` to indicate that the remainder of the metric should be used.
+Other words are considered tag keys. So the following template:

 ```toml
 templates = [
-    "region.region.measurement*"
+    "region.measurement*"
 ]
 ```

 would result in the following Graphite -> Telegraf transformation.

 ```
-us.west.cpu.load 100
-=> cpu.load,region=us.west value=100
+us-west.cpu.load 100
+=> cpu.load,region=us-west value=100
 ```

 #### Field Templates:

+There is also a _field_ keyword, which can only be specified once.
 The field keyword tells Telegraf to give the metric that field name.
 So the following template:

 ```toml
-separator = "_"
 templates = [
    "measurement.measurement.field.field.region"
 ]
@@ -247,26 +237,24 @@ templates = [
 would result in the following Graphite -> Telegraf transformation.

 ```
-cpu.usage.idle.percent.eu-east 100
-=> cpu_usage,region=eu-east idle_percent=100
+cpu.usage.idle.percent.us-west 100
+=> cpu_usage,region=us-west idle_percent=100
 ```

-The field key can also be derived from all remaining elements of the graphite
-bucket by specifying `field*`:
-
+The field key can also be derived from the second "half" of the input metric-name by specifying ```field*```:
 ```toml
-separator = "_"
 templates = [
    "measurement.measurement.region.field*"
 ]
 ```

-which would result in the following Graphite -> Telegraf transformation.
+would result in the following Graphite -> Telegraf transformation.

 ```
-cpu.usage.eu-east.idle.percentage 100
-=> cpu_usage,region=eu-east idle_percentage=100
+cpu.usage.us-west.idle.percentage 100
+=> cpu_usage,region=us-west idle_percentage=100
 ```
+(This cannot be used in conjunction with "measurement*"!)

 #### Filter Templates:

@@ -283,8 +271,8 @@ templates = [
 which would result in the following transformation:

 ```
-cpu.load.eu-east 100
-=> cpu_load,region=eu-east value=100
+cpu.load.us-west 100
+=> cpu_load,region=us-west value=100

 mem.cached.localhost 256
 => mem_cached,host=localhost value=256
@@ -306,8 +294,8 @@ templates = [
 would result in the following Graphite -> Telegraf transformation.

 ```
-cpu.usage.idle.eu-east 100
-=> cpu_usage,region=eu-east,datacenter=1a idle=100
+cpu.usage.idle.us-west 100
+=> cpu_usage,region=us-west,datacenter=1a idle=100
 ```

 There are many more options available,
@@ -338,12 +326,12 @@ There are many more options available,
  ## similar to the line protocol format. There can be only one default template.
  ## Templates support below format:
  ## 1. filter + template
-  ## 2. filter + template + extra tag(s)
+  ## 2. filter + template + extra tag
  ## 3. filter + template with field key
  ## 4. default template
  templates = [
    "*.app env.service.resource.measurement",
-    "stats.* .host.measurement* region=eu-east,agent=sensu",
+    "stats.* .host.measurement* region=us-west,agent=sensu",
    "stats2.* .host.measurement.field",
    "measurement*"
  ]
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -75,15 +75,12 @@
  urls = ["http://localhost:8086"] # required
  ## The target database for metrics (telegraf will create it if not exists).
  database = "telegraf" # required
+  ## Retention policy to write to.
+  retention_policy = "default"
  ## Precision of writes, valid values are "ns", "us" (or "µs"), "ms", "s", "m", "h".
  ## note: using "s" precision greatly improves InfluxDB compression.
  precision = "s"

-  ## Retention policy to write to.
-  retention_policy = "default"
-  ## Write consistency (clusters only), can be: "any", "one", "quorom", "all"
-  write_consistency = "any"
-
  ## Write timeout (for the InfluxDB client), formatted as a string.
  ## If not provided, will default to 5s. 0s means no timeout (not recommended).
  timeout = "5s"
@@ -106,10 +103,10 @@
 # [[outputs.amon]]
 #   ## Amon Server Key
 #   server_key = "my-server-key" # required.
-#
+# 
 #   ## Amon Instance URL
 #   amon_instance = "https://youramoninstance" # required
-#
+# 
 #   ## Connection timeout.
 #   # timeout = "5s"

@@ -125,21 +122,21 @@
 #   ## Telegraf tag to use as a routing key
 #   ##  ie, if this tag exists, it's value will be used as the routing key
 #   routing_tag = "host"
-#
+# 
 #   ## InfluxDB retention policy
 #   # retention_policy = "default"
 #   ## InfluxDB database
 #   # database = "telegraf"
 #   ## InfluxDB precision
 #   # precision = "s"
-#
+# 
 #   ## Optional SSL Config
 #   # ssl_ca = "/etc/telegraf/ca.pem"
 #   # ssl_cert = "/etc/telegraf/cert.pem"
 #   # ssl_key = "/etc/telegraf/key.pem"
 #   ## Use SSL but skip chain & host verification
 #   # insecure_skip_verify = false
-#
+# 
 #   ## Data format to output.
 #   ## Each data format has it's own unique set of configuration options, read
 #   ## more about them here:
@@ -151,22 +148,16 @@
 # [[outputs.cloudwatch]]
 #   ## Amazon REGION
 #   region = 'us-east-1'
-#
+# 
 #   ## Amazon Credentials
 #   ## Credentials are loaded in the following order
-#   ## 1) Assumed credentials via STS if role_arn is specified
-#   ## 2) explicit credentials from 'access_key' and 'secret_key'
-#   ## 3) shared profile from 'profile'
-#   ## 4) environment variables
-#   ## 5) shared credentials file
-#   ## 6) EC2 Instance Profile
+#   ## 1) explicit credentials from 'access_key' and 'secret_key'
+#   ## 2) environment variables
+#   ## 3) shared credentials file
+#   ## 4) EC2 Instance Profile
 #   #access_key = ""
 #   #secret_key = ""
-#   #token = ""
-#   #role_arn = ""
-#   #profile = ""
-#   #shared_credential_file = ""
-#
+# 
 #   ## Namespace for the CloudWatch MetricDatums
 #   namespace = 'InfluxData/Telegraf'

@@ -175,7 +166,7 @@
 # [[outputs.datadog]]
 #   ## Datadog API key
 #   apikey = "my-secret-key" # required.
-#
+# 
 #   ## Connection timeout.
 #   # timeout = "5s"

@@ -184,7 +175,7 @@
 # [[outputs.file]]
 #   ## Files to write to, "stdout" is a specially handled file.
 #   files = ["stdout", "/tmp/metrics.out"]
-#
+# 
 #   ## Data format to output.
 #   ## Each data format has it's own unique set of configuration options, read
 #   ## more about them here:
@@ -205,27 +196,6 @@
 #   timeout = 2


-# # Send telegraf metrics to graylog(s)
-# [[outputs.graylog]]
-#   ## Udp endpoint for your graylog instance.
-#   servers = ["127.0.0.1:12201", "192.168.1.1:12201"]
-
-
-# # Configuration for sending metrics to an Instrumental project
-# [[outputs.instrumental]]
-#   ## Project API Token (required)
-#   api_token = "API Token" # required
-#   ## Prefix the metrics with a given name
-#   prefix = ""
-#   ## Stats output template (Graphite formatting)
-#   ## see https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md#graphite
-#   template = "host.tags.measurement.field"
-#   ## Timeout in seconds to connect
-#   timeout = "2s"
-#   ## Display Communcation to Instrumental
-#   debug = false
-
-
 # # Configuration for the Kafka server to send metrics to
 # [[outputs.kafka]]
 #   ## URLs of kafka brokers
@@ -235,14 +205,14 @@
 #   ## Telegraf tag to use as a routing key
 #   ##  ie, if this tag exists, it's value will be used as the routing key
 #   routing_tag = "host"
-#
+# 
 #   ## CompressionCodec represents the various compression codecs recognized by
 #   ## Kafka in messages.
 #   ##  0 : No compression
 #   ##  1 : Gzip compression
 #   ##  2 : Snappy compression
 #   compression_codec = 0
-#
+# 
 #   ##  RequiredAcks is used in Produce Requests to tell the broker how many
 #   ##  replica acknowledgements it must see before responding
 #   ##   0 : the producer never waits for an acknowledgement from the broker.
@@ -258,17 +228,17 @@
 #   ##       guarantee that no messages will be lost as long as at least one in
 #   ##       sync replica remains.
 #   required_acks = -1
-#
+# 
 #   ##  The total number of times to retry sending a message
 #   max_retry = 3
-#
+# 
 #   ## Optional SSL Config
 #   # ssl_ca = "/etc/telegraf/ca.pem"
 #   # ssl_cert = "/etc/telegraf/cert.pem"
 #   # ssl_key = "/etc/telegraf/key.pem"
 #   ## Use SSL but skip chain & host verification
 #   # insecure_skip_verify = false
-#
+# 
 #   ## Data format to output.
 #   ## Each data format has it's own unique set of configuration options, read
 #   ## more about them here:
@@ -280,22 +250,16 @@
 # [[outputs.kinesis]]
 #   ## Amazon REGION of kinesis endpoint.
 #   region = "ap-southeast-2"
-#
+# 
 #   ## Amazon Credentials
 #   ## Credentials are loaded in the following order
-#   ## 1) Assumed credentials via STS if role_arn is specified
-#   ## 2) explicit credentials from 'access_key' and 'secret_key'
-#   ## 3) shared profile from 'profile'
-#   ## 4) environment variables
-#   ## 5) shared credentials file
-#   ## 6) EC2 Instance Profile
+#   ## 1) explicit credentials from 'access_key' and 'secret_key'
+#   ## 2) environment variables
+#   ## 3) shared credentials file
+#   ## 4) EC2 Instance Profile
 #   #access_key = ""
 #   #secret_key = ""
-#   #token = ""
-#   #role_arn = ""
-#   #profile = ""
-#   #shared_credential_file = ""
-#
+# 
 #   ## Kinesis StreamName must exist prior to starting telegraf.
 #   streamname = "StreamName"
 #   ## PartitionKey as used for sharding data.
@@ -330,23 +294,23 @@
 # # Configuration for MQTT server to send metrics to
 # [[outputs.mqtt]]
 #   servers = ["localhost:1883"] # required.
-#
+# 
 #   ## MQTT outputs send metrics to this topic format
 #   ##    "<topic_prefix>/<hostname>/<pluginname>/"
 #   ##   ex: prefix/web01.example.com/mem
 #   topic_prefix = "telegraf"
-#
+# 
 #   ## username and password to connect MQTT server.
 #   # username = "telegraf"
 #   # password = "metricsmetricsmetricsmetrics"
-#
+# 
 #   ## Optional SSL Config
 #   # ssl_ca = "/etc/telegraf/ca.pem"
 #   # ssl_cert = "/etc/telegraf/cert.pem"
 #   # ssl_key = "/etc/telegraf/key.pem"
 #   ## Use SSL but skip chain & host verification
 #   # insecure_skip_verify = false
-#
+# 
 #   ## Data format to output.
 #   ## Each data format has it's own unique set of configuration options, read
 #   ## more about them here:
@@ -360,7 +324,7 @@
 #   server = "localhost:4150"
 #   ## NSQ topic for producer messages
 #   topic = "telegraf"
-#
+# 
 #   ## Data format to output.
 #   ## Each data format has it's own unique set of configuration options, read
 #   ## more about them here:
@@ -372,14 +336,14 @@
 # [[outputs.opentsdb]]
 #   ## prefix for metrics keys
 #   prefix = "my.specific.prefix."
-#
+# 
 #   ## Telnet Mode ##
 #   ## DNS name of the OpenTSDB server in telnet mode
 #   host = "opentsdb.example.com"
-#
+# 
 #   ## Port of the OpenTSDB server in telnet mode
 #   port = 4242
-#
+# 
 #   ## Debug true - Prints OpenTSDB communication
 #   debug = false

@@ -472,7 +436,6 @@
 # # Read Apache status information (mod_status)
 # [[inputs.apache]]
 #   ## An array of Apache status URI to gather stats.
-#   ## Default is "http://localhost/server-status?auto".
 #   urls = ["http://localhost/server-status?auto"]


@@ -481,7 +444,7 @@
 #   ## Bcache sets path
 #   ## If not specified, then default is:
 #   bcachePath = "/sys/fs/bcache"
-#
+# 
 #   ## By default, telegraf gather stats for all bcache devices
 #   ## Setting devices will restrict the stats to the specified
 #   ## bcache devices.
@@ -506,61 +469,33 @@
 #   ]


-# # Collects performance metrics from the MON and OSD nodes in a Ceph storage cluster.
-# [[inputs.ceph]]
-#   ## All configuration values are optional, defaults are shown below
-#
-#   ## location of ceph binary
-#   ceph_binary = "/usr/bin/ceph"
-#
-#   ## directory in which to look for socket files
-#   socket_dir = "/var/run/ceph"
-#
-#   ## prefix of MON and OSD socket files, used to determine socket type
-#   mon_prefix = "ceph-mon"
-#   osd_prefix = "ceph-osd"
-#
-#   ## suffix used to identify socket files
-#   socket_suffix = "asok"
-
-
 # # Pull Metric Statistics from Amazon CloudWatch
 # [[inputs.cloudwatch]]
 #   ## Amazon Region
 #   region = 'us-east-1'
-#
+# 
 #   ## Amazon Credentials
 #   ## Credentials are loaded in the following order
-#   ## 1) Assumed credentials via STS if role_arn is specified
-#   ## 2) explicit credentials from 'access_key' and 'secret_key'
-#   ## 3) shared profile from 'profile'
-#   ## 4) environment variables
-#   ## 5) shared credentials file
-#   ## 6) EC2 Instance Profile
+#   ## 1) explicit credentials from 'access_key' and 'secret_key'
+#   ## 2) environment variables
+#   ## 3) shared credentials file
+#   ## 4) EC2 Instance Profile
 #   #access_key = ""
 #   #secret_key = ""
-#   #token = ""
-#   #role_arn = ""
-#   #profile = ""
-#   #shared_credential_file = ""
-#
+# 
 #   ## Requested CloudWatch aggregation Period (required - must be a multiple of 60s)
 #   period = '1m'
-#
+# 
 #   ## Collection Delay (required - must account for metrics availability via CloudWatch API)
 #   delay = '1m'
-#
+# 
 #   ## Recomended: use metric 'interval' that is a multiple of 'period' to avoid
 #   ## gaps or overlap in pulled data
 #   interval = '1m'
-#
-#   ## Configure the TTL for the internal cache of metrics.
-#   ## Defaults to 1 hr if not specified
-#   #cache_ttl = '10m'
-#
+# 
 #   ## Metric Statistic Namespace (required)
 #   namespace = 'AWS/ELB'
-#
+# 
 #   ## Metrics to Pull (optional)
 #   ## Defaults to all Metrics in Namespace if nothing is provided
 #   ## Refreshes Namespace available metrics every 1h
@@ -573,23 +508,6 @@
 #   #    value = 'p-example'


-# # Gather health check statuses from services registered in Consul
-# [[inputs.consul]]
-#   ## Most of these values defaults to the one configured on a Consul's agent level.
-#   ## Optional Consul server address (default: "localhost")
-#   # address = "localhost"
-#   ## Optional URI scheme for the Consul server (default: "http")
-#   # scheme = "http"
-#   ## Optional ACL token used in every request (default: "")
-#   # token = ""
-#   ## Optional username used for request HTTP Basic Authentication (default: "")
-#   # username = ""
-#   ## Optional password used for HTTP Basic Authentication (default: "")
-#   # password = ""
-#   ## Optional data centre to query the health checks from (default: "")
-#   # datacentre = ""
-
-
 # # Read metrics from one or many couchbase clusters
 # [[inputs.couchbase]]
 #   ## specify servers via a url matching:
@@ -624,17 +542,17 @@
 # [[inputs.dns_query]]
 #   ## servers to query
 #   servers = ["8.8.8.8"] # required
-#
+# 
 #   ## Domains or subdomains to query. "."(root) is default
 #   domains = ["."] # optional
-#
+# 
 #   ## Query record type. Default is "A"
 #   ## Posible values: A, AAAA, CNAME, MX, NS, PTR, TXT, SOA, SPF, SRV.
 #   record_type = "A" # optional
-#
+# 
 #   ## Dns server port. 53 is default
 #   port = 53 # optional
-#
+# 
 #   ## Query timeout in seconds. Default is 2 seconds
 #   timeout = 2 # optional

@@ -670,11 +588,11 @@
 # [[inputs.elasticsearch]]
 #   ## specify a list of one or more Elasticsearch servers
 #   servers = ["http://localhost:9200"]
-#
+# 
 #   ## set local to false when you want to read the indices stats from all nodes
 #   ## within the cluster
 #   local = true
-#
+# 
 #   ## set cluster_health to true when you want to also obtain cluster level stats
 #   cluster_health = false

@@ -682,18 +600,14 @@
 # # Read metrics from one or more commands that can output to stdout
 # [[inputs.exec]]
 #   ## Commands array
-#   commands = [
-#     "/tmp/test.sh",
-#     "/usr/bin/mycollector --foo=bar",
-#     "/tmp/collect_*.sh"
-#   ]
-#
+#   commands = ["/tmp/test.sh", "/usr/bin/mycollector --foo=bar"]
+# 
 #   ## Timeout for each command to complete.
 #   timeout = "5s"
-#
+# 
 #   ## measurement name suffix (for separating different commands)
 #   name_suffix = "_mycollector"
-#
+# 
 #   ## Data format to consume.
 #   ## Each data format has it's own unique set of configuration options, read
 #   ## more about them here:
@@ -717,52 +631,15 @@
 #   md5 = false


-# # Read flattened metrics from one or more GrayLog HTTP endpoints
-# [[inputs.graylog]]
-#   ## API endpoint, currently supported API:
-#   ##
-#   ##   - multiple  (Ex http://<host>:12900/system/metrics/multiple)
-#   ##   - namespace (Ex http://<host>:12900/system/metrics/namespace/{namespace})
-#   ##
-#   ## For namespace endpoint, the metrics array will be ignored for that call.
-#   ## Endpoint can contain namespace and multiple type calls.
-#   ##
-#   ## Please check http://[graylog-server-ip]:12900/api-browser for full list
-#   ## of endpoints
-#   servers = [
-#     "http://[graylog-server-ip]:12900/system/metrics/multiple",
-#   ]
-#
-#   ## Metrics list
-#   ## List of metrics can be found on Graylog webservice documentation.
-#   ## Or by hitting the the web service api at:
-#   ##   http://[graylog-host]:12900/system/metrics
-#   metrics = [
-#     "jvm.cl.loaded",
-#     "jvm.memory.pools.Metaspace.committed"
-#   ]
-#
-#   ## Username and password
-#   username = ""
-#   password = ""
-#
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
-#   # insecure_skip_verify = false
-
-
 # # Read metrics of haproxy, via socket or csv stats page
 # [[inputs.haproxy]]
 #   ## An array of address to gather stats about. Specify an ip on hostname
 #   ## with optional port. ie localhost, 10.10.3.33:1936, etc.
-#
+# 
 #   ## If no servers are specified, then default to 127.0.0.1:1936
 #   servers = ["http://myhaproxy.com:1936", "http://anotherhaproxy.com:1936"]
-#   ## Or you can also use local socket
-#   ## servers = ["socket:/run/haproxy/admin.sock"]
+#   ## Or you can also use local socket(not work yet)
+#   ## servers = ["socket://run/haproxy/admin.sock"]


 # # HTTP/HTTPS request given an address a method and a timeout
@@ -770,7 +647,7 @@
 #   ## Server address (default http://localhost)
 #   address = "http://github.com"
 #   ## Set response_timeout (default 5 seconds)
-#   response_timeout = "5s"
+#   response_timeout = 5
 #   ## HTTP Request Method
 #   method = "GET"
 #   ## Whether to follow redirects from the server (defaults to false)
@@ -782,48 +659,41 @@
 #   # body = '''
 #   # {'fake':'data'}
 #   # '''
-#
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
-#   # insecure_skip_verify = false


 # # Read flattened metrics from one or more JSON HTTP endpoints
 # [[inputs.httpjson]]
 #   ## NOTE This plugin only reads numerical measurements, strings and booleans
 #   ## will be ignored.
-#
+# 
 #   ## a name for the service being polled
 #   name = "webserver_stats"
-#
+# 
 #   ## URL of each server in the service's cluster
 #   servers = [
 #     "http://localhost:9999/stats/",
 #     "http://localhost:9998/stats/",
 #   ]
-#
+# 
 #   ## HTTP method to use: GET or POST (case-sensitive)
 #   method = "GET"
-#
+# 
 #   ## List of tag names to extract from top-level of JSON server response
 #   # tag_keys = [
 #   #   "my_tag_1",
 #   #   "my_tag_2"
 #   # ]
-#
+# 
 #   ## HTTP parameters (all values must be strings)
 #   [inputs.httpjson.parameters]
 #     event_type = "cpu_spike"
 #     threshold = "0.75"
-#
+# 
 #   ## HTTP Header parameters (all values must be strings)
 #   # [inputs.httpjson.headers]
 #   #   X-Auth-Token = "my-xauth-token"
 #   #   apiVersion = "v1"
-#
+# 
 #   ## Optional SSL Config
 #   # ssl_ca = "/etc/telegraf/ca.pem"
 #   # ssl_cert = "/etc/telegraf/cert.pem"
@@ -837,9 +707,8 @@
 #   ## Works with InfluxDB debug endpoints out of the box,
 #   ## but other services can use this format too.
 #   ## See the influxdb plugin's README for more details.
-#
+# 
 #   ## Multiple URLs from which to read InfluxDB-formatted JSON
-#   ## Default is "http://localhost:8086/debug/vars".
 #   urls = [
 #     "http://localhost:8086/debug/vars"
 #   ]
@@ -859,7 +728,7 @@
 # [[inputs.jolokia]]
 #   ## This is the context root used to compose the jolokia url
 #   context = "/jolokia"
-#
+# 
 #   ## This specifies the mode used
 #   # mode = "proxy"
 #   #
@@ -869,8 +738,8 @@
 #   # [inputs.jolokia.proxy]
 #   #   host = "127.0.0.1"
 #   #   port = "8080"
-#
-#
+# 
+# 
 #   ## List of servers exposing jolokia read service
 #   [[inputs.jolokia.servers]]
 #     name = "as-server-01"
@@ -878,7 +747,7 @@
 #     port = "8080"
 #     # username = "myuser"
 #     # password = "mypassword"
-#
+# 
 #   ## List of metrics collected on above servers
 #   ## Each metric consists in a name, a jmx path and either
 #   ## a pass or drop slice attribute.
@@ -887,13 +756,13 @@
 #     name = "heap_memory_usage"
 #     mbean  = "java.lang:type=Memory"
 #     attribute = "HeapMemoryUsage"
-#
+# 
 #   ## This collect thread counts metrics.
 #   [[inputs.jolokia.metrics]]
 #     name = "thread_count"
 #     mbean  = "java.lang:type=Threading"
 #     attribute = "TotalStartedThreadCount,ThreadCount,DaemonThreadCount,PeakThreadCount"
-#
+# 
 #   ## This collect number of class loaded/unloaded counts metrics.
 #   [[inputs.jolokia.metrics]]
 #     name = "class_count"
@@ -979,8 +848,8 @@
 #   ##  [username[:password]@][protocol[(address)]]/[?tls=[true|false|skip-verify]]
 #   ##  see https://github.com/go-sql-driver/mysql#dsn-data-source-name
 #   ##  e.g.
-#   ##    db_user:passwd@tcp(127.0.0.1:3306)/?tls=false
-#   ##    db_user@tcp(127.0.0.1:3306)/?tls=false
+#   ##    root:passwd@tcp(127.0.0.1:3306)/?tls=false
+#   ##    root@tcp(127.0.0.1:3306)/?tls=false
 #   #
 #   ## If no servers are specified, then localhost is used as the host.
 #   servers = ["tcp(127.0.0.1:3306)/"]
@@ -1044,15 +913,14 @@
 #   protocol = "tcp"
 #   ## Server address (default localhost)
 #   address = "github.com:80"
-#   ## Set timeout
-#   timeout = "1s"
-#
+#   ## Set timeout (default 1.0 seconds)
+#   timeout = 1.0
+#   ## Set read timeout (default 1.0 seconds)
+#   read_timeout = 1.0
 #   ## Optional string sent to the server
 #   # send = "ssh"
 #   ## Optional expected string in answer
 #   # expect = "ssh"
-#   ## Set read timeout (only used if expecting a response)
-#   read_timeout = "1s"


 # # Read TCP metrics such as established, time wait and sockets counts.
@@ -1072,18 +940,6 @@
 #   endpoints = ["http://localhost:4151"]


-# # Collect kernel snmp counters and network interface statistics
-# [[inputs.nstat]]
-#   ## file paths for proc files. If empty default paths will be used:
-#   ##    /proc/net/netstat, /proc/net/snmp, /proc/net/snmp6
-#   ## These can also be overridden with env variables, see README.
-#   proc_net_netstat = ""
-#   proc_net_snmp    = ""
-#   proc_net_snmp6   = ""
-#   ## dump metrics with 0 values too
-#   dump_zeros       = true
-
-
 # # Get standard NTP query metrics, requires ntpq executable.
 # [[inputs.ntpq]]
 #   ## If false, set the -n ntpq flag. Can reduce metric gather time.
@@ -1160,7 +1016,7 @@
 #   ## to grab metrics for.
 #   ##
 #   address = "host=localhost user=postgres sslmode=disable"
-#
+# 
 #   ## A list of databases to pull metrics about. If not specified, metrics for all
 #   ## databases are gathered.
 #   # databases = ["app_production", "testing"]
@@ -1242,10 +1098,7 @@
 #   # pattern = "nginx"
 #   ## user as argument for pgrep (ie, pgrep -u <user>)
 #   # user = "nginx"
-#
-#   ## override for process_name
-#   ## This is optional; default is sourced from /proc/<pid>/status
-#   # process_name = "bar"
+# 
 #   ## Field name prefix
 #   prefix = ""
 #   ## comment this out if you want raw cpu_time stats
@@ -1256,7 +1109,7 @@
 # [[inputs.prometheus]]
 #   ## An array of urls to scrape metrics from.
 #   urls = ["http://localhost:9100/metrics"]
-#
+# 
 #   ## Use SSL but skip chain & host verification
 #   # insecure_skip_verify = false
 #   ## Use bearer token for authorization
@@ -1271,11 +1124,11 @@

 # # Read metrics from one or many RabbitMQ servers via the management API
 # [[inputs.rabbitmq]]
-#   # url = "http://localhost:15672"
+#   url = "http://localhost:15672" # required
 #   # name = "rmq-server-1" # optional tag
 #   # username = "guest"
 #   # password = "guest"
-#
+# 
 #   ## A list of nodes to pull metrics about. If not specified, metrics for
 #   ## all nodes are gathered.
 #   # nodes = ["rabbit@node1", "rabbit@node2"]
@@ -1339,7 +1192,7 @@
 #     collect = ["mybulk", "sysservices", "sysdescr"]
 #     # Simple list of OIDs to get, in addition to "collect"
 #     get_oids = []
-#
+# 
 #   [[inputs.snmp.host]]
 #     address = "192.168.2.3:161"
 #     community = "public"
@@ -1351,31 +1204,31 @@
 #         "ifNumber",
 #         ".1.3.6.1.2.1.1.3.0",
 #     ]
-#
+# 
 #   [[inputs.snmp.get]]
 #     name = "ifnumber"
 #     oid = "ifNumber"
-#
+# 
 #   [[inputs.snmp.get]]
 #     name = "interface_speed"
 #     oid = "ifSpeed"
 #     instance = "0"
-#
+# 
 #   [[inputs.snmp.get]]
 #     name = "sysuptime"
 #     oid = ".1.3.6.1.2.1.1.3.0"
 #     unit = "second"
-#
+# 
 #   [[inputs.snmp.bulk]]
 #     name = "mybulk"
 #     max_repetition = 127
 #     oid = ".1.3.6.1.2.1.1"
-#
+# 
 #   [[inputs.snmp.bulk]]
 #     name = "ifoutoctets"
 #     max_repetition = 127
 #     oid = "ifOutOctets"
-#
+# 
 #   [[inputs.snmp.host]]
 #     address = "192.168.2.13:161"
 #     #address = "127.0.0.1:161"
@@ -1388,19 +1241,19 @@
 #     [[inputs.snmp.host.table]]
 #       name = "iftable3"
 #       include_instances = ["enp5s0", "eth1"]
-#
+# 
 #   # SNMP TABLEs
 #   # table without mapping neither subtables
 #   [[inputs.snmp.table]]
 #     name = "iftable1"
 #     oid = ".1.3.6.1.2.1.31.1.1.1"
-#
+# 
 #   # table without mapping but with subtables
 #   [[inputs.snmp.table]]
 #     name = "iftable2"
 #     oid = ".1.3.6.1.2.1.31.1.1.1"
 #     sub_tables = [".1.3.6.1.2.1.2.2.1.13"]
-#
+# 
 #   # table with mapping but without subtables
 #   [[inputs.snmp.table]]
 #     name = "iftable3"
@@ -1408,7 +1261,7 @@
 #     # if empty. get all instances
 #     mapping_table = ".1.3.6.1.2.1.31.1.1.1.1"
 #     # if empty, get all subtables
-#
+# 
 #   # table with both mapping and subtables
 #   [[inputs.snmp.table]]
 #     name = "iftable4"
@@ -1447,37 +1300,25 @@
 #   pools = ["redis_pool", "mc_pool"]


-# # A plugin to collect stats from Varnish HTTP Cache
-# [[inputs.varnish]]
-#   ## The default location of the varnishstat binary can be overridden with:
-#   binary = "/usr/bin/varnishstat"
-#
-#   ## By default, telegraf gather stats for 3 metric points.
-#   ## Setting stats will override the defaults shown below.
-#   ## Glob matching can be used, ie, stats = ["MAIN.*"]
-#   ## stats may also be set to ["*"], which will collect all stats
-#   stats = ["MAIN.cache_hit", "MAIN.cache_miss", "MAIN.uptime"]
-
-
-# # Read metrics of ZFS from arcstats, zfetchstats, vdev_cache_stats, and pools
+# # Read metrics of ZFS from arcstats, zfetchstats and vdev_cache_stats
 # [[inputs.zfs]]
-#   ## ZFS kstat path. Ignored on FreeBSD
+#   ## ZFS kstat path
 #   ## If not specified, then default is:
-#   # kstatPath = "/proc/spl/kstat/zfs"
-#
+#   kstatPath = "/proc/spl/kstat/zfs"
+# 
 #   ## By default, telegraf gather all zfs stats
 #   ## If not specified, then default is:
-#   # kstatMetrics = ["arcstats", "zfetchstats", "vdev_cache_stats"]
-#
+#   kstatMetrics = ["arcstats", "zfetchstats", "vdev_cache_stats"]
+# 
 #   ## By default, don't gather zpool stats
-#   # poolMetrics = false
+#   poolMetrics = false


 # # Reads 'mntr' stats from one or many zookeeper servers
 # [[inputs.zookeeper]]
 #   ## An array of address to gather stats about. Specify an ip or hostname
 #   ## with port. ie localhost:2181, 10.0.0.1:2181, etc.
-#
+# 
 #   ## If no servers are specified, then localhost is used as the host.
 #   ## If no port is specified, 2181 is used
 #   servers = [":2181"]
@@ -1506,7 +1347,7 @@
 #   consumer_group = "telegraf_metrics_consumers"
 #   ## Offset (must be either "oldest" or "newest")
 #   offset = "oldest"
-#
+# 
 #   ## Data format to consume.
 #   ## Each data format has it's own unique set of configuration options, read
 #   ## more about them here:
@@ -1519,32 +1360,32 @@
 #   servers = ["localhost:1883"]
 #   ## MQTT QoS, must be 0, 1, or 2
 #   qos = 0
-#
+# 
 #   ## Topics to subscribe to
 #   topics = [
 #     "telegraf/host01/cpu",
 #     "telegraf/+/mem",
 #     "sensors/#",
 #   ]
-#
+# 
 #   # if true, messages that can't be delivered while the subscriber is offline
 #   # will be delivered when it comes back (such as on service restart).
 #   # NOTE: if true, client_id MUST be set
 #   persistent_session = false
 #   # If empty, a random client ID will be generated.
 #   client_id = ""
-#
+# 
 #   ## username and password to connect MQTT server.
 #   # username = "telegraf"
 #   # password = "metricsmetricsmetricsmetrics"
-#
+# 
 #   ## Optional SSL Config
 #   # ssl_ca = "/etc/telegraf/ca.pem"
 #   # ssl_cert = "/etc/telegraf/cert.pem"
 #   # ssl_key = "/etc/telegraf/key.pem"
 #   ## Use SSL but skip chain & host verification
 #   # insecure_skip_verify = false
-#
+# 
 #   ## Data format to consume.
 #   ## Each data format has it's own unique set of configuration options, read
 #   ## more about them here:
@@ -1562,7 +1403,7 @@
 #   subjects = ["telegraf"]
 #   ## name a queue group
 #   queue_group = "telegraf_consumers"
-#
+# 
 #   ## Data format to consume.
 #   ## Each data format has it's own unique set of configuration options, read
 #   ## more about them here:
@@ -1570,12 +1411,6 @@
 #   data_format = "influx"


-# # A Rollbar Webhook Event collector
-# [[inputs.rollbar_webhooks]]
-#   ## Address and port to host Webhook listener on
-#   service_address = ":1619"
-
-
 # # Statsd Server
 # [[inputs.statsd]]
 #   ## Address and port to host UDP listener on
@@ -1590,24 +1425,24 @@
 #   delete_timings = true
 #   ## Percentiles to calculate for timing & histogram stats
 #   percentiles = [90]
-#
+# 
 #   ## separator to use between elements of a statsd metric
 #   metric_separator = "_"
-#
+# 
 #   ## Parses tags in the datadog statsd format
 #   ## http://docs.datadoghq.com/guides/dogstatsd/
 #   parse_data_dog_tags = false
-#
+# 
 #   ## Statsd data translation templates, more info can be read here:
 #   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#graphite
 #   # templates = [
 #   #     "cpu.* measurement*"
 #   # ]
-#
+# 
 #   ## Number of UDP messages allowed to queue up, once filled,
 #   ## the statsd server will start dropping packets
 #   allowed_pending_messages = 10000
-#
+# 
 #   ## Number of timing/histogram values to track per-measurement in the
 #   ## calculation of percentiles. Raising this limit increases the accuracy
 #   ## of percentiles but also increases the memory usage and cpu time.
@@ -1628,7 +1463,7 @@
 #   files = ["/var/mymetrics.out"]
 #   ## Read file from beginning.
 #   from_beginning = false
-#
+# 
 #   ## Data format to consume.
 #   ## Each data format has it's own unique set of configuration options, read
 #   ## more about them here:
@@ -1640,14 +1475,14 @@
 # [[inputs.tcp_listener]]
 #   ## Address and port to host TCP listener on
 #   service_address = ":8094"
-#
+# 
 #   ## Number of TCP messages allowed to queue up. Once filled, the
 #   ## TCP listener will start dropping packets.
 #   allowed_pending_messages = 10000
-#
+# 
 #   ## Maximum number of concurrent TCP connections to allow
 #   max_tcp_connections = 250
-#
+# 
 #   ## Data format to consume.
 #   ## Each data format has it's own unique set of configuration options, read
 #   ## more about them here:
@@ -1659,11 +1494,11 @@
 # [[inputs.udp_listener]]
 #   ## Address and port to host UDP listener on
 #   service_address = ":8092"
-#
+# 
 #   ## Number of UDP messages allowed to queue up. Once filled, the
 #   ## UDP listener will start dropping packets.
 #   allowed_pending_messages = 10000
-#
+# 
 #   ## Data format to consume.
 #   ## Each data format has it's own unique set of configuration options, read
 #   ## more about them here:
--- a/internal/config/aws/credentials.go
+++ b/internal/config/aws/credentials.go
@@ -1,49 +0,0 @@
-package aws
-
-import (
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/client"
-	"github.com/aws/aws-sdk-go/aws/credentials"
-	"github.com/aws/aws-sdk-go/aws/credentials/stscreds"
-	"github.com/aws/aws-sdk-go/aws/session"
-)
-
-type CredentialConfig struct {
-	Region    string
-	AccessKey string
-	SecretKey string
-	RoleARN   string
-	Profile   string
-	Filename  string
-	Token     string
-}
-
-func (c *CredentialConfig) Credentials() client.ConfigProvider {
-	if c.RoleARN != "" {
-		return c.assumeCredentials()
-	} else {
-		return c.rootCredentials()
-	}
-}
-
-func (c *CredentialConfig) rootCredentials() client.ConfigProvider {
-	config := &aws.Config{
-		Region: aws.String(c.Region),
-	}
-	if c.AccessKey != "" || c.SecretKey != "" {
-		config.Credentials = credentials.NewStaticCredentials(c.AccessKey, c.SecretKey, c.Token)
-	} else if c.Profile != "" || c.Filename != "" {
-		config.Credentials = credentials.NewSharedCredentials(c.Filename, c.Profile)
-	}
-
-	return session.New(config)
-}
-
-func (c *CredentialConfig) assumeCredentials() client.ConfigProvider {
-	rootCredentials := c.rootCredentials()
-	config := &aws.Config{
-		Region: aws.String(c.Region),
-	}
-	config.Credentials = stscreds.NewCredentials(rootCredentials, c.RoleARN)
-	return session.New(config)
-}
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -58,6 +58,7 @@ func NewConfig() *Config {
 			Interval:      internal.Duration{Duration: 10 * time.Second},
 			RoundInterval: true,
 			FlushInterval: internal.Duration{Duration: 10 * time.Second},
+			FlushJitter:   internal.Duration{Duration: 5 * time.Second},
 		},

 		Tags:          make(map[string]string),
@@ -356,7 +357,7 @@ func printConfig(name string, p printer, op string, commented bool) {
 				fmt.Print("\n")
 				continue
 			}
-			fmt.Print(strings.TrimRight(comment+line, " ") + "\n")
+			fmt.Print(comment + line + "\n")
 		}
 	}
 }
--- a/internal/errchan/errchan.go
+++ b/internal/errchan/errchan.go
@@ -1,37 +0,0 @@
-package errchan
-
-import (
-	"fmt"
-	"strings"
-)
-
-type ErrChan struct {
-	C chan error
-}
-
-// New returns an error channel of max length 'n'
-// errors can be sent to the ErrChan.C channel, and will be returned when
-// ErrChan.Error() is called.
-func New(n int) *ErrChan {
-	return &ErrChan{
-		C: make(chan error, n),
-	}
-}
-
-// Error closes the ErrChan.C channel and returns an error if there are any
-// non-nil errors, otherwise returns nil.
-func (e *ErrChan) Error() error {
-	close(e.C)
-
-	var out string
-	for err := range e.C {
-		if err != nil {
-			out += "[" + err.Error() + "], "
-		}
-	}
-
-	if out != "" {
-		return fmt.Errorf("Errors encountered: " + strings.TrimRight(out, ", "))
-	}
-	return nil
-}
--- a/internal/internal.go
+++ b/internal/internal.go
@@ -10,15 +10,11 @@ import (
 	"fmt"
 	"io/ioutil"
 	"log"
-	"math/big"
 	"os"
 	"os/exec"
-	"strconv"
 	"strings"
 	"time"
 	"unicode"
-
-	"github.com/gobwas/glob"
 )

 const alphanum string = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
@@ -36,25 +32,12 @@ type Duration struct {

 // UnmarshalTOML parses the duration from the TOML config file
 func (d *Duration) UnmarshalTOML(b []byte) error {
-	var err error
-	// Parse string duration, ie, "1s"
-	d.Duration, err = time.ParseDuration(string(b[1 : len(b)-1]))
-	if err == nil {
-		return nil
+	dur, err := time.ParseDuration(string(b[1 : len(b)-1]))
+	if err != nil {
+		return err
 	}

-	// First try parsing as integer seconds
-	sI, err := strconv.ParseInt(string(b), 10, 64)
-	if err == nil {
-		d.Duration = time.Second * time.Duration(sI)
-		return nil
-	}
-	// Second try parsing as float seconds
-	sF, err := strconv.ParseFloat(string(b), 64)
-	if err == nil {
-		d.Duration = time.Second * time.Duration(sF)
-		return nil
-	}
+	d.Duration = dur

 	return nil
 }
@@ -208,48 +191,3 @@ func WaitTimeout(c *exec.Cmd, timeout time.Duration) error {
 		return TimeoutErr
 	}
 }
-
-// CompileFilter takes a list of glob "filters", ie:
-//   ["MAIN.*", "CPU.*", "NET"]
-// and compiles them into a glob object. This glob object can
-// then be used to match keys to the filter.
-func CompileFilter(filters []string) (glob.Glob, error) {
-	var out glob.Glob
-
-	// return if there is nothing to compile
-	if len(filters) == 0 {
-		return out, nil
-	}
-
-	var err error
-	if len(filters) == 1 {
-		out, err = glob.Compile(filters[0])
-	} else {
-		out, err = glob.Compile("{" + strings.Join(filters, ",") + "}")
-	}
-	return out, err
-}
-
-// RandomSleep will sleep for a random amount of time up to max.
-// If the shutdown channel is closed, it will return before it has finished
-// sleeping.
-func RandomSleep(max time.Duration, shutdown chan struct{}) {
-	if max == 0 {
-		return
-	}
-	maxSleep := big.NewInt(max.Nanoseconds())
-
-	var sleepns int64
-	if j, err := rand.Int(rand.Reader, maxSleep); err == nil {
-		sleepns = j.Int64()
-	}
-
-	t := time.NewTimer(time.Nanosecond * time.Duration(sleepns))
-	select {
-	case <-t.C:
-		return
-	case <-shutdown:
-		t.Stop()
-		return
-	}
-}
--- a/internal/internal_test.go
+++ b/internal/internal_test.go
@@ -106,59 +106,3 @@ func TestRunError(t *testing.T) {

 	assert.Error(t, err)
 }
-
-func TestCompileFilter(t *testing.T) {
-	f, err := CompileFilter([]string{})
-	assert.NoError(t, err)
-	assert.Nil(t, f)
-
-	f, err = CompileFilter([]string{"cpu"})
-	assert.NoError(t, err)
-	assert.True(t, f.Match("cpu"))
-	assert.False(t, f.Match("cpu0"))
-	assert.False(t, f.Match("mem"))
-
-	f, err = CompileFilter([]string{"cpu*"})
-	assert.NoError(t, err)
-	assert.True(t, f.Match("cpu"))
-	assert.True(t, f.Match("cpu0"))
-	assert.False(t, f.Match("mem"))
-
-	f, err = CompileFilter([]string{"cpu", "mem"})
-	assert.NoError(t, err)
-	assert.True(t, f.Match("cpu"))
-	assert.False(t, f.Match("cpu0"))
-	assert.True(t, f.Match("mem"))
-
-	f, err = CompileFilter([]string{"cpu", "mem", "net*"})
-	assert.NoError(t, err)
-	assert.True(t, f.Match("cpu"))
-	assert.False(t, f.Match("cpu0"))
-	assert.True(t, f.Match("mem"))
-	assert.True(t, f.Match("network"))
-}
-
-func TestRandomSleep(t *testing.T) {
-	// test that zero max returns immediately
-	s := time.Now()
-	RandomSleep(time.Duration(0), make(chan struct{}))
-	elapsed := time.Since(s)
-	assert.True(t, elapsed < time.Millisecond)
-
-	// test that max sleep is respected
-	s = time.Now()
-	RandomSleep(time.Millisecond*50, make(chan struct{}))
-	elapsed = time.Since(s)
-	assert.True(t, elapsed < time.Millisecond*50)
-
-	// test that shutdown is respected
-	s = time.Now()
-	shutdown := make(chan struct{})
-	go func() {
-		time.Sleep(time.Millisecond * 100)
-		close(shutdown)
-	}()
-	RandomSleep(time.Second, shutdown)
-	elapsed = time.Since(s)
-	assert.True(t, elapsed < time.Millisecond*150)
-}
--- a/internal/limiter/limiter.go
+++ b/internal/limiter/limiter.go
@@ -1,59 +0,0 @@
-package limiter
-
-import (
-	"sync"
-	"time"
-)
-
-// NewRateLimiter returns a rate limiter that will will emit from the C
-// channel only 'n' times every 'rate' seconds.
-func NewRateLimiter(n int, rate time.Duration) *rateLimiter {
-	r := &rateLimiter{
-		C:        make(chan bool),
-		rate:     rate,
-		n:        n,
-		shutdown: make(chan bool),
-	}
-	r.wg.Add(1)
-	go r.limiter()
-	return r
-}
-
-type rateLimiter struct {
-	C    chan bool
-	rate time.Duration
-	n    int
-
-	shutdown chan bool
-	wg       sync.WaitGroup
-}
-
-func (r *rateLimiter) Stop() {
-	close(r.shutdown)
-	r.wg.Wait()
-	close(r.C)
-}
-
-func (r *rateLimiter) limiter() {
-	defer r.wg.Done()
-	ticker := time.NewTicker(r.rate)
-	defer ticker.Stop()
-	counter := 0
-	for {
-		select {
-		case <-r.shutdown:
-			return
-		case <-ticker.C:
-			counter = 0
-		default:
-			if counter < r.n {
-				select {
-				case r.C <- true:
-					counter++
-				case <-r.shutdown:
-					return
-				}
-			}
-		}
-	}
-}
--- a/internal/limiter/limiter_test.go
+++ b/internal/limiter/limiter_test.go
@@ -1,54 +0,0 @@
-package limiter
-
-import (
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestRateLimiter(t *testing.T) {
-	r := NewRateLimiter(5, time.Second)
-	ticker := time.NewTicker(time.Millisecond * 75)
-
-	// test that we can only get 5 receives from the rate limiter
-	counter := 0
-outer:
-	for {
-		select {
-		case <-r.C:
-			counter++
-		case <-ticker.C:
-			break outer
-		}
-	}
-
-	assert.Equal(t, 5, counter)
-	r.Stop()
-	// verify that the Stop function closes the channel.
-	_, ok := <-r.C
-	assert.False(t, ok)
-}
-
-func TestRateLimiterMultipleIterations(t *testing.T) {
-	r := NewRateLimiter(5, time.Millisecond*50)
-	ticker := time.NewTicker(time.Millisecond * 250)
-
-	// test that we can get 15 receives from the rate limiter
-	counter := 0
-outer:
-	for {
-		select {
-		case <-ticker.C:
-			break outer
-		case <-r.C:
-			counter++
-		}
-	}
-
-	assert.True(t, counter > 10)
-	r.Stop()
-	// verify that the Stop function closes the channel.
-	_, ok := <-r.C
-	assert.False(t, ok)
-}
--- a/internal/models/filter.go
+++ b/internal/models/filter.go
@@ -2,11 +2,11 @@ package internal_models

 import (
 	"fmt"
+	"strings"

 	"github.com/gobwas/glob"

 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal"
 )

 // TagFilter is the name of a tag, and the values on which to filter
@@ -42,41 +42,41 @@ type Filter struct {
 // Compile all Filter lists into glob.Glob objects.
 func (f *Filter) CompileFilter() error {
 	var err error
-	f.nameDrop, err = internal.CompileFilter(f.NameDrop)
+	f.nameDrop, err = compileFilter(f.NameDrop)
 	if err != nil {
 		return fmt.Errorf("Error compiling 'namedrop', %s", err)
 	}
-	f.namePass, err = internal.CompileFilter(f.NamePass)
+	f.namePass, err = compileFilter(f.NamePass)
 	if err != nil {
 		return fmt.Errorf("Error compiling 'namepass', %s", err)
 	}

-	f.fieldDrop, err = internal.CompileFilter(f.FieldDrop)
+	f.fieldDrop, err = compileFilter(f.FieldDrop)
 	if err != nil {
 		return fmt.Errorf("Error compiling 'fielddrop', %s", err)
 	}
-	f.fieldPass, err = internal.CompileFilter(f.FieldPass)
+	f.fieldPass, err = compileFilter(f.FieldPass)
 	if err != nil {
 		return fmt.Errorf("Error compiling 'fieldpass', %s", err)
 	}

-	f.tagExclude, err = internal.CompileFilter(f.TagExclude)
+	f.tagExclude, err = compileFilter(f.TagExclude)
 	if err != nil {
 		return fmt.Errorf("Error compiling 'tagexclude', %s", err)
 	}
-	f.tagInclude, err = internal.CompileFilter(f.TagInclude)
+	f.tagInclude, err = compileFilter(f.TagInclude)
 	if err != nil {
 		return fmt.Errorf("Error compiling 'taginclude', %s", err)
 	}

 	for i, _ := range f.TagDrop {
-		f.TagDrop[i].filter, err = internal.CompileFilter(f.TagDrop[i].Filter)
+		f.TagDrop[i].filter, err = compileFilter(f.TagDrop[i].Filter)
 		if err != nil {
 			return fmt.Errorf("Error compiling 'tagdrop', %s", err)
 		}
 	}
 	for i, _ := range f.TagPass {
-		f.TagPass[i].filter, err = internal.CompileFilter(f.TagPass[i].Filter)
+		f.TagPass[i].filter, err = compileFilter(f.TagPass[i].Filter)
 		if err != nil {
 			return fmt.Errorf("Error compiling 'tagpass', %s", err)
 		}
@@ -84,6 +84,20 @@ func (f *Filter) CompileFilter() error {
 	return nil
 }

+func compileFilter(filter []string) (glob.Glob, error) {
+	if len(filter) == 0 {
+		return nil, nil
+	}
+	var g glob.Glob
+	var err error
+	if len(filter) == 1 {
+		g, err = glob.Compile(filter[0])
+	} else {
+		g, err = glob.Compile("{" + strings.Join(filter, ",") + "}")
+	}
+	return g, err
+}
+
 func (f *Filter) ShouldMetricPass(metric telegraf.Metric) bool {
 	if f.ShouldNamePass(metric.Name()) && f.ShouldTagsPass(metric.Tags()) {
 		return true
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -5,11 +5,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/apache"
 	_ "github.com/influxdata/telegraf/plugins/inputs/bcache"
 	_ "github.com/influxdata/telegraf/plugins/inputs/cassandra"
-	_ "github.com/influxdata/telegraf/plugins/inputs/ceph"
-	_ "github.com/influxdata/telegraf/plugins/inputs/chrony"
 	_ "github.com/influxdata/telegraf/plugins/inputs/cloudwatch"
-	_ "github.com/influxdata/telegraf/plugins/inputs/conntrack"
-	_ "github.com/influxdata/telegraf/plugins/inputs/consul"
 	_ "github.com/influxdata/telegraf/plugins/inputs/couchbase"
 	_ "github.com/influxdata/telegraf/plugins/inputs/couchdb"
 	_ "github.com/influxdata/telegraf/plugins/inputs/disque"
@@ -20,10 +16,10 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/exec"
 	_ "github.com/influxdata/telegraf/plugins/inputs/filestat"
 	_ "github.com/influxdata/telegraf/plugins/inputs/github_webhooks"
-	_ "github.com/influxdata/telegraf/plugins/inputs/graylog"
 	_ "github.com/influxdata/telegraf/plugins/inputs/haproxy"
 	_ "github.com/influxdata/telegraf/plugins/inputs/http_response"
 	_ "github.com/influxdata/telegraf/plugins/inputs/httpjson"
+	_ "github.com/influxdata/telegraf/plugins/inputs/igloo"
 	_ "github.com/influxdata/telegraf/plugins/inputs/influxdb"
 	_ "github.com/influxdata/telegraf/plugins/inputs/ipmi_sensor"
 	_ "github.com/influxdata/telegraf/plugins/inputs/jolokia"
@@ -40,7 +36,6 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/net_response"
 	_ "github.com/influxdata/telegraf/plugins/inputs/nginx"
 	_ "github.com/influxdata/telegraf/plugins/inputs/nsq"
-	_ "github.com/influxdata/telegraf/plugins/inputs/nstat"
 	_ "github.com/influxdata/telegraf/plugins/inputs/ntpq"
 	_ "github.com/influxdata/telegraf/plugins/inputs/passenger"
 	_ "github.com/influxdata/telegraf/plugins/inputs/phpfpm"
@@ -56,7 +51,6 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/redis"
 	_ "github.com/influxdata/telegraf/plugins/inputs/rethinkdb"
 	_ "github.com/influxdata/telegraf/plugins/inputs/riak"
-	_ "github.com/influxdata/telegraf/plugins/inputs/rollbar_webhooks"
 	_ "github.com/influxdata/telegraf/plugins/inputs/sensors"
 	_ "github.com/influxdata/telegraf/plugins/inputs/snmp"
 	_ "github.com/influxdata/telegraf/plugins/inputs/sqlserver"
@@ -68,7 +62,6 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/trig"
 	_ "github.com/influxdata/telegraf/plugins/inputs/twemproxy"
 	_ "github.com/influxdata/telegraf/plugins/inputs/udp_listener"
-	_ "github.com/influxdata/telegraf/plugins/inputs/varnish"
 	_ "github.com/influxdata/telegraf/plugins/inputs/win_perf_counters"
 	_ "github.com/influxdata/telegraf/plugins/inputs/zfs"
 	_ "github.com/influxdata/telegraf/plugins/inputs/zookeeper"
--- a/plugins/inputs/apache/README.md
+++ b/plugins/inputs/apache/README.md
@@ -1,7 +1,7 @@
 # Telegraf plugin: Apache

 #### Plugin arguments:
- **urls** []string: List of apache-status URLs to collect from. Default is "http://localhost/server-status?auto".
+- **urls** []string: List of apache-status URLs to collect from.

 #### Description

--- a/plugins/inputs/apache/apache.go
+++ b/plugins/inputs/apache/apache.go
@@ -21,7 +21,6 @@ type Apache struct {

 var sampleConfig = `
  ## An array of Apache status URI to gather stats.
-  ## Default is "http://localhost/server-status?auto".
  urls = ["http://localhost/server-status?auto"]
 `

@@ -34,10 +33,6 @@ func (n *Apache) Description() string {
 }

 func (n *Apache) Gather(acc telegraf.Accumulator) error {
-	if len(n.Urls) == 0 {
-		n.Urls = []string{"http://localhost/server-status?auto"}
-	}
-
 	var wg sync.WaitGroup
 	var outerr error

--- a/plugins/inputs/ceph/README.md
+++ b/plugins/inputs/ceph/README.md
@@ -1,109 +0,0 @@
-# Ceph Storage Input Plugin
-
-Collects performance metrics from the MON and OSD nodes in a Ceph storage cluster.  
-
-The plugin works by scanning the configured SocketDir for OSD and MON socket files.  When it finds
-a MON socket, it runs **ceph --admin-daemon $file perfcounters_dump**. For OSDs it runs **ceph --admin-daemon $file perf dump** 
-
-The resulting JSON is parsed and grouped into collections, based on top-level key.  Top-level keys are
-used as collection tags, and all sub-keys are flattened. For example:
-
-```
- { 
-   "paxos": { 
-     "refresh": 9363435,
-     "refresh_latency": { 
-       "avgcount": 9363435,
-       "sum": 5378.794002000
-     }
-   }
- }
-```
-
-Would be parsed into the following metrics, all of which would be tagged with collection=paxos:
-
- - refresh = 9363435
- - refresh_latency.avgcount: 9363435
- - refresh_latency.sum: 5378.794002000
-
-
-### Configuration:
-
-```
-# Collects performance metrics from the MON and OSD nodes in a Ceph storage cluster.
-[[inputs.ceph]]
-  ## All configuration values are optional, defaults are shown below
-
-  ## location of ceph binary
-  ceph_binary = "/usr/bin/ceph"
-
-  ## directory in which to look for socket files
-  socket_dir = "/var/run/ceph"
-
-  ## prefix of MON and OSD socket files, used to determine socket type
-  mon_prefix = "ceph-mon"
-  osd_prefix = "ceph-osd"
-
-  ## suffix used to identify socket files
-  socket_suffix = "asok"
-```
-
-### Measurements & Fields:
-
-All fields are collected under the **ceph** measurement and stored as float64s. For a full list of fields, see the sample perf dumps in ceph_test.go. 
-
-
-### Tags:
-
-All measurements will have the following tags:
-
- type: either 'osd' or 'mon' to indicate which type of node was queried
- id: a unique string identifier, parsed from the socket file name for the node
- collection: the top-level key under which these fields were reported. Possible values are:
-  - for MON nodes:
-    - cluster
-    - leveldb
-    - mon
-    - paxos
-    - throttle-mon_client_bytes
-    - throttle-mon_daemon_bytes
-    - throttle-msgr_dispatch_throttler-mon
-  - for OSD nodes:
-    - WBThrottle
-    - filestore
-    - leveldb
-    - mutex-FileJournal::completions_lock
-    - mutex-FileJournal::finisher_lock
-    - mutex-FileJournal::write_lock
-    - mutex-FileJournal::writeq_lock
-    - mutex-JOS::ApplyManager::apply_lock
-    - mutex-JOS::ApplyManager::com_lock
-    - mutex-JOS::SubmitManager::lock
-    - mutex-WBThrottle::lock
-    - objecter
-    - osd
-    - recoverystate_perf
-    - throttle-filestore_bytes
-    - throttle-filestore_ops
-    - throttle-msgr_dispatch_throttler-client
-    - throttle-msgr_dispatch_throttler-cluster
-    - throttle-msgr_dispatch_throttler-hb_back_server
-    - throttle-msgr_dispatch_throttler-hb_front_serve
-    - throttle-msgr_dispatch_throttler-hbclient
-    - throttle-msgr_dispatch_throttler-ms_objecter
-    - throttle-objecter_bytes
-    - throttle-objecter_ops
-    - throttle-osd_client_bytes
-    - throttle-osd_client_messages
- 
-
-### Example Output:
-
-<pre>
-telegraf -test -config /etc/telegraf/telegraf.conf -config-directory /etc/telegraf/telegraf.d  -input-filter ceph
-* Plugin: ceph, Collection 1
-> ceph,collection=paxos, id=node-2,role=openstack,type=mon accept_timeout=0,begin=14931264,begin_bytes.avgcount=14931264,begin_bytes.sum=180309683362,begin_keys.avgcount=0,begin_keys.sum=0,begin_latency.avgcount=14931264,begin_latency.sum=9293.29589,collect=1,collect_bytes.avgcount=1,collect_bytes.sum=24,collect_keys.avgcount=1,collect_keys.sum=1,collect_latency.avgcount=1,collect_latency.sum=0.00028,collect_timeout=0,collect_uncommitted=0,commit=14931264,commit_bytes.avgcount=0,commit_bytes.sum=0,commit_keys.avgcount=0,commit_keys.sum=0,commit_latency.avgcount=0,commit_latency.sum=0,lease_ack_timeout=0,lease_timeout=0,new_pn=0,new_pn_latency.avgcount=0,new_pn_latency.sum=0,refresh=14931264,refresh_latency.avgcount=14931264,refresh_latency.sum=8706.98498,restart=4,share_state=0,share_state_bytes.avgcount=0,share_state_bytes.sum=0,share_state_keys.avgcount=0,share_state_keys.sum=0,start_leader=0,start_peon=1,store_state=14931264,store_state_bytes.avgcount=14931264,store_state_bytes.sum=353119959211,store_state_keys.avgcount=14931264,store_state_keys.sum=289807523,store_state_latency.avgcount=14931264,store_state_latency.sum=10952.835724 1462821234814535148
-> ceph,collection=throttle-mon_client_bytes,id=node-2,type=mon get=1413017,get_or_fail_fail=0,get_or_fail_success=0,get_sum=71211705,max=104857600,put=1413013,put_sum=71211459,take=0,take_sum=0,val=246,wait.avgcount=0,wait.sum=0 1462821234814737219
-> ceph,collection=throttle-mon_daemon_bytes,id=node-2,type=mon get=4058121,get_or_fail_fail=0,get_or_fail_success=0,get_sum=6027348117,max=419430400,put=4058121,put_sum=6027348117,take=0,take_sum=0,val=0,wait.avgcount=0,wait.sum=0 1462821234814815661
-> ceph,collection=throttle-msgr_dispatch_throttler-mon,id=node-2,type=mon get=54276277,get_or_fail_fail=0,get_or_fail_success=0,get_sum=370232877040,max=104857600,put=54276277,put_sum=370232877040,take=0,take_sum=0,val=0,wait.avgcount=0,wait.sum=0 1462821234814872064
-</pre>
--- a/plugins/inputs/ceph/ceph.go
+++ b/plugins/inputs/ceph/ceph.go
@@ -1,249 +0,0 @@
-package ceph
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/plugins/inputs"
-	"io/ioutil"
-	"log"
-	"os/exec"
-	"path/filepath"
-	"strings"
-)
-
-const (
-	measurement = "ceph"
-	typeMon     = "monitor"
-	typeOsd     = "osd"
-	osdPrefix   = "ceph-osd"
-	monPrefix   = "ceph-mon"
-	sockSuffix  = "asok"
-)
-
-type Ceph struct {
-	CephBinary   string
-	OsdPrefix    string
-	MonPrefix    string
-	SocketDir    string
-	SocketSuffix string
-}
-
-func (c *Ceph) setDefaults() {
-	if c.CephBinary == "" {
-		c.CephBinary = "/usr/bin/ceph"
-	}
-
-	if c.OsdPrefix == "" {
-		c.OsdPrefix = osdPrefix
-	}
-
-	if c.MonPrefix == "" {
-		c.MonPrefix = monPrefix
-	}
-
-	if c.SocketDir == "" {
-		c.SocketDir = "/var/run/ceph"
-	}
-
-	if c.SocketSuffix == "" {
-		c.SocketSuffix = sockSuffix
-	}
-}
-
-func (c *Ceph) Description() string {
-	return "Collects performance metrics from the MON and OSD nodes in a Ceph storage cluster."
-}
-
-var sampleConfig = `
-  ## All configuration values are optional, defaults are shown below
-
-  ## location of ceph binary
-  ceph_binary = "/usr/bin/ceph"
-
-  ## directory in which to look for socket files
-  socket_dir = "/var/run/ceph"
-
-  ## prefix of MON and OSD socket files, used to determine socket type
-  mon_prefix = "ceph-mon"
-  osd_prefix = "ceph-osd"
-
-  ## suffix used to identify socket files
-  socket_suffix = "asok"
-`
-
-func (c *Ceph) SampleConfig() string {
-	return sampleConfig
-}
-
-func (c *Ceph) Gather(acc telegraf.Accumulator) error {
-	c.setDefaults()
-	sockets, err := findSockets(c)
-	if err != nil {
-		return fmt.Errorf("failed to find sockets at path '%s': %v", c.SocketDir, err)
-	}
-
-	for _, s := range sockets {
-		dump, err := perfDump(c.CephBinary, s)
-		if err != nil {
-			log.Printf("error reading from socket '%s': %v", s.socket, err)
-			continue
-		}
-		data, err := parseDump(dump)
-		if err != nil {
-			log.Printf("error parsing dump from socket '%s': %v", s.socket, err)
-			continue
-		}
-		for tag, metrics := range *data {
-			acc.AddFields(measurement,
-				map[string]interface{}(metrics),
-				map[string]string{"type": s.sockType, "id": s.sockId, "collection": tag})
-		}
-	}
-	return nil
-}
-
-func init() {
-	inputs.Add(measurement, func() telegraf.Input { return &Ceph{} })
-}
-
-var perfDump = func(binary string, socket *socket) (string, error) {
-	cmdArgs := []string{"--admin-daemon", socket.socket}
-	if socket.sockType == typeOsd {
-		cmdArgs = append(cmdArgs, "perf", "dump")
-	} else if socket.sockType == typeMon {
-		cmdArgs = append(cmdArgs, "perfcounters_dump")
-	} else {
-		return "", fmt.Errorf("ignoring unknown socket type: %s", socket.sockType)
-	}
-
-	cmd := exec.Command(binary, cmdArgs...)
-	var out bytes.Buffer
-	cmd.Stdout = &out
-	err := cmd.Run()
-	if err != nil {
-		return "", fmt.Errorf("error running ceph dump: %s", err)
-	}
-
-	return out.String(), nil
-}
-
-var findSockets = func(c *Ceph) ([]*socket, error) {
-	listing, err := ioutil.ReadDir(c.SocketDir)
-	if err != nil {
-		return []*socket{}, fmt.Errorf("Failed to read socket directory '%s': %v", c.SocketDir, err)
-	}
-	sockets := make([]*socket, 0, len(listing))
-	for _, info := range listing {
-		f := info.Name()
-		var sockType string
-		var sockPrefix string
-		if strings.HasPrefix(f, c.MonPrefix) {
-			sockType = typeMon
-			sockPrefix = monPrefix
-		}
-		if strings.HasPrefix(f, c.OsdPrefix) {
-			sockType = typeOsd
-			sockPrefix = osdPrefix
-
-		}
-		if sockType == typeOsd || sockType == typeMon {
-			path := filepath.Join(c.SocketDir, f)
-			sockets = append(sockets, &socket{parseSockId(f, sockPrefix, c.SocketSuffix), sockType, path})
-		}
-	}
-	return sockets, nil
-}
-
-func parseSockId(fname, prefix, suffix string) string {
-	s := fname
-	s = strings.TrimPrefix(s, prefix)
-	s = strings.TrimSuffix(s, suffix)
-	s = strings.Trim(s, ".-_")
-	return s
-}
-
-type socket struct {
-	sockId   string
-	sockType string
-	socket   string
-}
-
-type metric struct {
-	pathStack []string // lifo stack of name components
-	value     float64
-}
-
-// Pops names of pathStack to build the flattened name for a metric
-func (m *metric) name() string {
-	buf := bytes.Buffer{}
-	for i := len(m.pathStack) - 1; i >= 0; i-- {
-		if buf.Len() > 0 {
-			buf.WriteString(".")
-		}
-		buf.WriteString(m.pathStack[i])
-	}
-	return buf.String()
-}
-
-type metricMap map[string]interface{}
-
-type taggedMetricMap map[string]metricMap
-
-// Parses a raw JSON string into a taggedMetricMap
-// Delegates the actual parsing to newTaggedMetricMap(..)
-func parseDump(dump string) (*taggedMetricMap, error) {
-	data := make(map[string]interface{})
-	err := json.Unmarshal([]byte(dump), &data)
-	if err != nil {
-		return nil, fmt.Errorf("failed to parse json: '%s': %v", dump, err)
-	}
-
-	tmm := newTaggedMetricMap(data)
-
-	if err != nil {
-		return nil, fmt.Errorf("failed to tag dataset: '%v': %v", tmm, err)
-	}
-
-	return tmm, nil
-}
-
-// Builds a TaggedMetricMap out of a generic string map.
-// The top-level key is used as a tag and all sub-keys are flattened into metrics
-func newTaggedMetricMap(data map[string]interface{}) *taggedMetricMap {
-	tmm := make(taggedMetricMap)
-	for tag, datapoints := range data {
-		mm := make(metricMap)
-		for _, m := range flatten(datapoints) {
-			mm[m.name()] = m.value
-		}
-		tmm[tag] = mm
-	}
-	return &tmm
-}
-
-// Recursively flattens any k-v hierarchy present in data.
-// Nested keys are flattened into ordered slices associated with a metric value.
-// The key slices are treated as stacks, and are expected to be reversed and concatenated
-// when passed as metrics to the accumulator. (see (*metric).name())
-func flatten(data interface{}) []*metric {
-	var metrics []*metric
-
-	switch val := data.(type) {
-	case float64:
-		metrics = []*metric{&metric{make([]string, 0, 1), val}}
-	case map[string]interface{}:
-		metrics = make([]*metric, 0, len(val))
-		for k, v := range val {
-			for _, m := range flatten(v) {
-				m.pathStack = append(m.pathStack, k)
-				metrics = append(metrics, m)
-			}
-		}
-	default:
-		log.Printf("Ignoring unexpected type '%T' for value %v", val, val)
-	}
-
-	return metrics
-}
--- a/plugins/inputs/ceph/ceph_test.go
+++ b/plugins/inputs/ceph/ceph_test.go
@@ -1,682 +0,0 @@
-package ceph
-
-import (
-	"fmt"
-	"github.com/influxdata/telegraf/testutil"
-	"github.com/stretchr/testify/assert"
-	"io/ioutil"
-	"os"
-	"path"
-	"strconv"
-	"strings"
-	"testing"
-)
-
-const (
-	epsilon = float64(0.00000001)
-)
-
-func TestParseSockId(t *testing.T) {
-	s := parseSockId(sockFile(osdPrefix, 1), osdPrefix, sockSuffix)
-	assert.Equal(t, s, "1")
-}
-
-func TestParseMonDump(t *testing.T) {
-	dump, err := parseDump(monPerfDump)
-	assert.NoError(t, err)
-	assert.InEpsilon(t, 5678670180, (*dump)["cluster"]["osd_kb_used"], epsilon)
-	assert.InEpsilon(t, 6866.540527000, (*dump)["paxos"]["store_state_latency.sum"], epsilon)
-}
-
-func TestParseOsdDump(t *testing.T) {
-	dump, err := parseDump(osdPerfDump)
-	assert.NoError(t, err)
-	assert.InEpsilon(t, 552132.109360000, (*dump)["filestore"]["commitcycle_interval.sum"], epsilon)
-	assert.Equal(t, float64(0), (*dump)["mutex-FileJournal::finisher_lock"]["wait.avgcount"])
-}
-
-func TestGather(t *testing.T) {
-	saveFind := findSockets
-	saveDump := perfDump
-	defer func() {
-		findSockets = saveFind
-		perfDump = saveDump
-	}()
-
-	findSockets = func(c *Ceph) ([]*socket, error) {
-		return []*socket{&socket{"osd.1", typeOsd, ""}}, nil
-	}
-
-	perfDump = func(binary string, s *socket) (string, error) {
-		return osdPerfDump, nil
-	}
-
-	acc := &testutil.Accumulator{}
-	c := &Ceph{}
-	c.Gather(acc)
-
-}
-
-func TestFindSockets(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "socktest")
-	assert.NoError(t, err)
-	defer func() {
-		err := os.Remove(tmpdir)
-		assert.NoError(t, err)
-	}()
-	c := &Ceph{
-		CephBinary: "foo",
-		SocketDir:  tmpdir,
-	}
-
-	c.setDefaults()
-
-	for _, st := range sockTestParams {
-		createTestFiles(tmpdir, st)
-
-		sockets, err := findSockets(c)
-		assert.NoError(t, err)
-
-		for i := 1; i <= st.osds; i++ {
-			assertFoundSocket(t, tmpdir, typeOsd, i, sockets)
-		}
-
-		for i := 1; i <= st.mons; i++ {
-			assertFoundSocket(t, tmpdir, typeMon, i, sockets)
-		}
-		cleanupTestFiles(tmpdir, st)
-	}
-}
-
-func assertFoundSocket(t *testing.T, dir, sockType string, i int, sockets []*socket) {
-	var prefix string
-	if sockType == typeOsd {
-		prefix = osdPrefix
-	} else {
-		prefix = monPrefix
-	}
-	expected := path.Join(dir, sockFile(prefix, i))
-	found := false
-	for _, s := range sockets {
-		fmt.Printf("Checking %s\n", s.socket)
-		if s.socket == expected {
-			found = true
-			assert.Equal(t, s.sockType, sockType, "Unexpected socket type for '%s'", s)
-			assert.Equal(t, s.sockId, strconv.Itoa(i))
-		}
-	}
-	assert.True(t, found, "Did not find socket: %s", expected)
-}
-
-func sockFile(prefix string, i int) string {
-	return strings.Join([]string{prefix, strconv.Itoa(i), sockSuffix}, ".")
-}
-
-func createTestFiles(dir string, st *SockTest) {
-	writeFile := func(prefix string, i int) {
-		f := sockFile(prefix, i)
-		fpath := path.Join(dir, f)
-		ioutil.WriteFile(fpath, []byte(""), 0777)
-	}
-	tstFileApply(st, writeFile)
-}
-
-func cleanupTestFiles(dir string, st *SockTest) {
-	rmFile := func(prefix string, i int) {
-		f := sockFile(prefix, i)
-		fpath := path.Join(dir, f)
-		err := os.Remove(fpath)
-		if err != nil {
-			fmt.Printf("Error removing test file %s: %v\n", fpath, err)
-		}
-	}
-	tstFileApply(st, rmFile)
-}
-
-func tstFileApply(st *SockTest, fn func(prefix string, i int)) {
-	for i := 1; i <= st.osds; i++ {
-		fn(osdPrefix, i)
-	}
-	for i := 1; i <= st.mons; i++ {
-		fn(monPrefix, i)
-	}
-}
-
-type SockTest struct {
-	osds int
-	mons int
-}
-
-var sockTestParams = []*SockTest{
-	&SockTest{
-		osds: 2,
-		mons: 2,
-	},
-	&SockTest{
-		mons: 1,
-	},
-	&SockTest{
-		osds: 1,
-	},
-	&SockTest{},
-}
-
-var monPerfDump = `
-{ "cluster": { "num_mon": 2,
-      "num_mon_quorum": 2,
-      "num_osd": 26,
-      "num_osd_up": 26,
-      "num_osd_in": 26,
-      "osd_epoch": 3306,
-      "osd_kb": 11487846448,
-      "osd_kb_used": 5678670180,
-      "osd_kb_avail": 5809176268,
-      "num_pool": 12,
-      "num_pg": 768,
-      "num_pg_active_clean": 768,
-      "num_pg_active": 768,
-      "num_pg_peering": 0,
-      "num_object": 397616,
-      "num_object_degraded": 0,
-      "num_object_unfound": 0,
-      "num_bytes": 2917848227467,
-      "num_mds_up": 0,
-      "num_mds_in": 0,
-      "num_mds_failed": 0,
-      "mds_epoch": 1},
-  "leveldb": { "leveldb_get": 321950312,
-      "leveldb_transaction": 18729922,
-      "leveldb_compact": 0,
-      "leveldb_compact_range": 74141,
-      "leveldb_compact_queue_merge": 0,
-      "leveldb_compact_queue_len": 0},
-  "mon": {},
-  "paxos": { "start_leader": 0,
-      "start_peon": 1,
-      "restart": 4,
-      "refresh": 9363435,
-      "refresh_latency": { "avgcount": 9363435,
-          "sum": 5378.794002000},
-      "begin": 9363435,
-      "begin_keys": { "avgcount": 0,
-          "sum": 0},
-      "begin_bytes": { "avgcount": 9363435,
-          "sum": 110468605489},
-      "begin_latency": { "avgcount": 9363435,
-          "sum": 5850.060682000},
-      "commit": 9363435,
-      "commit_keys": { "avgcount": 0,
-          "sum": 0},
-      "commit_bytes": { "avgcount": 0,
-          "sum": 0},
-      "commit_latency": { "avgcount": 0,
-          "sum": 0.000000000},
-      "collect": 1,
-      "collect_keys": { "avgcount": 1,
-          "sum": 1},
-      "collect_bytes": { "avgcount": 1,
-          "sum": 24},
-      "collect_latency": { "avgcount": 1,
-          "sum": 0.000280000},
-      "collect_uncommitted": 0,
-      "collect_timeout": 0,
-      "accept_timeout": 0,
-      "lease_ack_timeout": 0,
-      "lease_timeout": 0,
-      "store_state": 9363435,
-      "store_state_keys": { "avgcount": 9363435,
-          "sum": 176572789},
-      "store_state_bytes": { "avgcount": 9363435,
-          "sum": 216355887217},
-      "store_state_latency": { "avgcount": 9363435,
-          "sum": 6866.540527000},
-      "share_state": 0,
-      "share_state_keys": { "avgcount": 0,
-          "sum": 0},
-      "share_state_bytes": { "avgcount": 0,
-          "sum": 0},
-      "new_pn": 0,
-      "new_pn_latency": { "avgcount": 0,
-          "sum": 0.000000000}},
-  "throttle-mon_client_bytes": { "val": 246,
-      "max": 104857600,
-      "get": 896030,
-      "get_sum": 45854374,
-      "get_or_fail_fail": 0,
-      "get_or_fail_success": 0,
-      "take": 0,
-      "take_sum": 0,
-      "put": 896026,
-      "put_sum": 45854128,
-      "wait": { "avgcount": 0,
-          "sum": 0.000000000}},
-  "throttle-mon_daemon_bytes": { "val": 0,
-      "max": 419430400,
-      "get": 2773768,
-      "get_sum": 3627676976,
-      "get_or_fail_fail": 0,
-      "get_or_fail_success": 0,
-      "take": 0,
-      "take_sum": 0,
-      "put": 2773768,
-      "put_sum": 3627676976,
-      "wait": { "avgcount": 0,
-          "sum": 0.000000000}},
-  "throttle-msgr_dispatch_throttler-mon": { "val": 0,
-      "max": 104857600,
-      "get": 34504949,
-      "get_sum": 226860281124,
-      "get_or_fail_fail": 0,
-      "get_or_fail_success": 0,
-      "take": 0,
-      "take_sum": 0,
-      "put": 34504949,
-      "put_sum": 226860281124,
-      "wait": { "avgcount": 0,
-          "sum": 0.000000000}}}
-`
-
-var osdPerfDump = `
-{ "WBThrottle": { "bytes_dirtied": 28405539,
-      "bytes_wb": 0,
-      "ios_dirtied": 93,
-      "ios_wb": 0,
-      "inodes_dirtied": 86,
-      "inodes_wb": 0},
-  "filestore": { "journal_queue_max_ops": 0,
-      "journal_queue_ops": 0,
-      "journal_ops": 1108008,
-      "journal_queue_max_bytes": 0,
-      "journal_queue_bytes": 0,
-      "journal_bytes": 73233416196,
-      "journal_latency": { "avgcount": 1108008,
-          "sum": 290.981036000},
-      "journal_wr": 1091866,
-      "journal_wr_bytes": { "avgcount": 1091866,
-          "sum": 74925682688},
-      "journal_full": 0,
-      "committing": 0,
-      "commitcycle": 110389,
-      "commitcycle_interval": { "avgcount": 110389,
-          "sum": 552132.109360000},
-      "commitcycle_latency": { "avgcount": 110389,
-          "sum": 178.657804000},
-      "op_queue_max_ops": 50,
-      "op_queue_ops": 0,
-      "ops": 1108008,
-      "op_queue_max_bytes": 104857600,
-      "op_queue_bytes": 0,
-      "bytes": 73226768148,
-      "apply_latency": { "avgcount": 1108008,
-          "sum": 947.742722000},
-      "queue_transaction_latency_avg": { "avgcount": 1108008,
-          "sum": 0.511327000}},
-  "leveldb": { "leveldb_get": 4361221,
-      "leveldb_transaction": 4351276,
-      "leveldb_compact": 0,
-      "leveldb_compact_range": 0,
-      "leveldb_compact_queue_merge": 0,
-      "leveldb_compact_queue_len": 0},
-  "mutex-FileJournal::completions_lock": { "wait": { "avgcount": 0,
-          "sum": 0.000000000}},
-  "mutex-FileJournal::finisher_lock": { "wait": { "avgcount": 0,
-          "sum": 0.000000000}},
-  "mutex-FileJournal::write_lock": { "wait": { "avgcount": 0,
-          "sum": 0.000000000}},
-  "mutex-FileJournal::writeq_lock": { "wait": { "avgcount": 0,
-          "sum": 0.000000000}},
-  "mutex-JOS::ApplyManager::apply_lock": { "wait": { "avgcount": 0,
-          "sum": 0.000000000}},
-  "mutex-JOS::ApplyManager::com_lock": { "wait": { "avgcount": 0,
-          "sum": 0.000000000}},
-  "mutex-JOS::SubmitManager::lock": { "wait": { "avgcount": 0,
-          "sum": 0.000000000}},
-  "mutex-WBThrottle::lock": { "wait": { "avgcount": 0,
-          "sum": 0.000000000}},
-  "objecter": { "op_active": 0,
-      "op_laggy": 0,
-      "op_send": 0,
-      "op_send_bytes": 0,
-      "op_resend": 0,
-      "op_ack": 0,
-      "op_commit": 0,
-      "op": 0,
-      "op_r": 0,
-      "op_w": 0,
-      "op_rmw": 0,
-      "op_pg": 0,
-      "osdop_stat": 0,
-      "osdop_create": 0,
-      "osdop_read": 0,
-      "osdop_write": 0,
-      "osdop_writefull": 0,
-      "osdop_append": 0,
-      "osdop_zero": 0,
-      "osdop_truncate": 0,
-      "osdop_delete": 0,
-      "osdop_mapext": 0,
-      "osdop_sparse_read": 0,
-      "osdop_clonerange": 0,
-      "osdop_getxattr": 0,
-      "osdop_setxattr": 0,
-      "osdop_cmpxattr": 0,
-      "osdop_rmxattr": 0,
-      "osdop_resetxattrs": 0,
-      "osdop_tmap_up": 0,
-      "osdop_tmap_put": 0,
-      "osdop_tmap_get": 0,
-      "osdop_call": 0,
-      "osdop_watch": 0,
-      "osdop_notify": 0,
-      "osdop_src_cmpxattr": 0,
-      "osdop_pgls": 0,
-      "osdop_pgls_filter": 0,
-      "osdop_other": 0,
-      "linger_active": 0,
-      "linger_send": 0,
-      "linger_resend": 0,
-      "poolop_active": 0,
-      "poolop_send": 0,
-      "poolop_resend": 0,
-      "poolstat_active": 0,
-      "poolstat_send": 0,
-      "poolstat_resend": 0,
-      "statfs_active": 0,
-      "statfs_send": 0,
-      "statfs_resend": 0,
-      "command_active": 0,
-      "command_send": 0,
-      "command_resend": 0,
-      "map_epoch": 3300,
-      "map_full": 0,
-      "map_inc": 3293,
-      "osd_sessions": 0,
-      "osd_session_open": 0,
-      "osd_session_close": 0,
-      "osd_laggy": 0},
-  "osd": { "opq": 0,
-      "op_wip": 0,
-      "op": 23939,
-      "op_in_bytes": 1245903961,
-      "op_out_bytes": 29103083856,
-      "op_latency": { "avgcount": 23939,
-          "sum": 440.192015000},
-      "op_process_latency": { "avgcount": 23939,
-          "sum": 30.170685000},
-      "op_r": 23112,
-      "op_r_out_bytes": 29103056146,
-      "op_r_latency": { "avgcount": 23112,
-          "sum": 19.373526000},
-      "op_r_process_latency": { "avgcount": 23112,
-          "sum": 14.625928000},
-      "op_w": 549,
-      "op_w_in_bytes": 1245804358,
-      "op_w_rlat": { "avgcount": 549,
-          "sum": 17.022299000},
-      "op_w_latency": { "avgcount": 549,
-          "sum": 418.494610000},
-      "op_w_process_latency": { "avgcount": 549,
-          "sum": 13.316555000},
-      "op_rw": 278,
-      "op_rw_in_bytes": 99603,
-      "op_rw_out_bytes": 27710,
-      "op_rw_rlat": { "avgcount": 278,
-          "sum": 2.213785000},
-      "op_rw_latency": { "avgcount": 278,
-          "sum": 2.323879000},
-      "op_rw_process_latency": { "avgcount": 278,
-          "sum": 2.228202000},
-      "subop": 1074774,
-      "subop_in_bytes": 26841811636,
-      "subop_latency": { "avgcount": 1074774,
-          "sum": 745.509160000},
-      "subop_w": 0,
-      "subop_w_in_bytes": 26841811636,
-      "subop_w_latency": { "avgcount": 1074774,
-          "sum": 745.509160000},
-      "subop_pull": 0,
-      "subop_pull_latency": { "avgcount": 0,
-          "sum": 0.000000000},
-      "subop_push": 0,
-      "subop_push_in_bytes": 0,
-      "subop_push_latency": { "avgcount": 0,
-          "sum": 0.000000000},
-      "pull": 0,
-      "push": 28,
-      "push_out_bytes": 103483392,
-      "push_in": 0,
-      "push_in_bytes": 0,
-      "recovery_ops": 15,
-      "loadavg": 202,
-      "buffer_bytes": 0,
-      "numpg": 18,
-      "numpg_primary": 8,
-      "numpg_replica": 10,
-      "numpg_stray": 0,
-      "heartbeat_to_peers": 10,
-      "heartbeat_from_peers": 0,
-      "map_messages": 7413,
-      "map_message_epochs": 9792,
-      "map_message_epoch_dups": 10105,
-      "messages_delayed_for_map": 83,
-      "stat_bytes": 102123175936,
-      "stat_bytes_used": 49961820160,
-      "stat_bytes_avail": 52161355776,
-      "copyfrom": 0,
-      "tier_promote": 0,
-      "tier_flush": 0,
-      "tier_flush_fail": 0,
-      "tier_try_flush": 0,
-      "tier_try_flush_fail": 0,
-      "tier_evict": 0,
-      "tier_whiteout": 0,
-      "tier_dirty": 230,
-      "tier_clean": 0,
-      "tier_delay": 0,
-      "agent_wake": 0,
-      "agent_skip": 0,
-      "agent_flush": 0,
-      "agent_evict": 0},
-  "recoverystate_perf": { "initial_latency": { "avgcount": 473,
-          "sum": 0.027207000},
-      "started_latency": { "avgcount": 1480,
-          "sum": 9854902.397648000},
-      "reset_latency": { "avgcount": 1953,
-          "sum": 0.096206000},
-      "start_latency": { "avgcount": 1953,
-          "sum": 0.059947000},
-      "primary_latency": { "avgcount": 765,
-          "sum": 4688922.186935000},
-      "peering_latency": { "avgcount": 704,
-          "sum": 1668.652135000},
-      "backfilling_latency": { "avgcount": 0,
-          "sum": 0.000000000},
-      "waitremotebackfillreserved_latency": { "avgcount": 0,
-          "sum": 0.000000000},
-      "waitlocalbackfillreserved_latency": { "avgcount": 0,
-          "sum": 0.000000000},
-      "notbackfilling_latency": { "avgcount": 0,
-          "sum": 0.000000000},
-      "repnotrecovering_latency": { "avgcount": 462,
-          "sum": 5158922.114600000},
-      "repwaitrecoveryreserved_latency": { "avgcount": 15,
-          "sum": 0.008275000},
-      "repwaitbackfillreserved_latency": { "avgcount": 1,
-          "sum": 0.000095000},
-      "RepRecovering_latency": { "avgcount": 16,
-          "sum": 2274.944727000},
-      "activating_latency": { "avgcount": 514,
-          "sum": 261.008520000},
-      "waitlocalrecoveryreserved_latency": { "avgcount": 20,
-          "sum": 0.175422000},
-      "waitremoterecoveryreserved_latency": { "avgcount": 20,
-          "sum": 0.682778000},
-      "recovering_latency": { "avgcount": 20,
-          "sum": 0.697551000},
-      "recovered_latency": { "avgcount": 511,
-          "sum": 0.011038000},
-      "clean_latency": { "avgcount": 503,
-          "sum": 4686961.154278000},
-      "active_latency": { "avgcount": 506,
-          "sum": 4687223.640464000},
-      "replicaactive_latency": { "avgcount": 446,
-          "sum": 5161197.078966000},
-      "stray_latency": { "avgcount": 794,
-          "sum": 4805.105128000},
-      "getinfo_latency": { "avgcount": 704,
-          "sum": 1138.477937000},
-      "getlog_latency": { "avgcount": 678,
-          "sum": 0.036393000},
-      "waitactingchange_latency": { "avgcount": 69,
-          "sum": 59.172893000},
-      "incomplete_latency": { "avgcount": 0,
-          "sum": 0.000000000},
-      "getmissing_latency": { "avgcount": 609,
-          "sum": 0.012288000},
-      "waitupthru_latency": { "avgcount": 576,
-          "sum": 530.106999000}},
-  "throttle-filestore_bytes": { "val": 0,
-      "max": 0,
-      "get": 0,
-      "get_sum": 0,
-      "get_or_fail_fail": 0,
-      "get_or_fail_success": 0,
-      "take": 0,
-      "take_sum": 0,
-      "put": 0,
-      "put_sum": 0,
-      "wait": { "avgcount": 0,
-          "sum": 0.000000000}},
-  "throttle-filestore_ops": { "val": 0,
-      "max": 0,
-      "get": 0,
-      "get_sum": 0,
-      "get_or_fail_fail": 0,
-      "get_or_fail_success": 0,
-      "take": 0,
-      "take_sum": 0,
-      "put": 0,
-      "put_sum": 0,
-      "wait": { "avgcount": 0,
-          "sum": 0.000000000}},
-  "throttle-msgr_dispatch_throttler-client": { "val": 0,
-      "max": 104857600,
-      "get": 130730,
-      "get_sum": 1246039872,
-      "get_or_fail_fail": 0,
-      "get_or_fail_success": 0,
-      "take": 0,
-      "take_sum": 0,
-      "put": 130730,
-      "put_sum": 1246039872,
-      "wait": { "avgcount": 0,
-          "sum": 0.000000000}},
-  "throttle-msgr_dispatch_throttler-cluster": { "val": 0,
-      "max": 104857600,
-      "get": 1108033,
-      "get_sum": 71277949992,
-      "get_or_fail_fail": 0,
-      "get_or_fail_success": 0,
-      "take": 0,
-      "take_sum": 0,
-      "put": 1108033,
-      "put_sum": 71277949992,
-      "wait": { "avgcount": 0,
-          "sum": 0.000000000}},
-  "throttle-msgr_dispatch_throttler-hb_back_server": { "val": 0,
-      "max": 104857600,
-      "get": 18320575,
-      "get_sum": 861067025,
-      "get_or_fail_fail": 0,
-      "get_or_fail_success": 0,
-      "take": 0,
-      "take_sum": 0,
-      "put": 18320575,
-      "put_sum": 861067025,
-      "wait": { "avgcount": 0,
-          "sum": 0.000000000}},
-  "throttle-msgr_dispatch_throttler-hb_front_server": { "val": 0,
-      "max": 104857600,
-      "get": 18320575,
-      "get_sum": 861067025,
-      "get_or_fail_fail": 0,
-      "get_or_fail_success": 0,
-      "take": 0,
-      "take_sum": 0,
-      "put": 18320575,
-      "put_sum": 861067025,
-      "wait": { "avgcount": 0,
-          "sum": 0.000000000}},
-  "throttle-msgr_dispatch_throttler-hbclient": { "val": 0,
-      "max": 104857600,
-      "get": 40479394,
-      "get_sum": 1902531518,
-      "get_or_fail_fail": 0,
-      "get_or_fail_success": 0,
-      "take": 0,
-      "take_sum": 0,
-      "put": 40479394,
-      "put_sum": 1902531518,
-      "wait": { "avgcount": 0,
-          "sum": 0.000000000}},
-  "throttle-msgr_dispatch_throttler-ms_objecter": { "val": 0,
-      "max": 104857600,
-      "get": 0,
-      "get_sum": 0,
-      "get_or_fail_fail": 0,
-      "get_or_fail_success": 0,
-      "take": 0,
-      "take_sum": 0,
-      "put": 0,
-      "put_sum": 0,
-      "wait": { "avgcount": 0,
-          "sum": 0.000000000}},
-  "throttle-objecter_bytes": { "val": 0,
-      "max": 104857600,
-      "get": 0,
-      "get_sum": 0,
-      "get_or_fail_fail": 0,
-      "get_or_fail_success": 0,
-      "take": 0,
-      "take_sum": 0,
-      "put": 0,
-      "put_sum": 0,
-      "wait": { "avgcount": 0,
-          "sum": 0.000000000}},
-  "throttle-objecter_ops": { "val": 0,
-      "max": 1024,
-      "get": 0,
-      "get_sum": 0,
-      "get_or_fail_fail": 0,
-      "get_or_fail_success": 0,
-      "take": 0,
-      "take_sum": 0,
-      "put": 0,
-      "put_sum": 0,
-      "wait": { "avgcount": 0,
-          "sum": 0.000000000}},
-  "throttle-osd_client_bytes": { "val": 0,
-      "max": 524288000,
-      "get": 24241,
-      "get_sum": 1241992581,
-      "get_or_fail_fail": 0,
-      "get_or_fail_success": 0,
-      "take": 0,
-      "take_sum": 0,
-      "put": 25958,
-      "put_sum": 1241992581,
-      "wait": { "avgcount": 0,
-          "sum": 0.000000000}},
-  "throttle-osd_client_messages": { "val": 0,
-      "max": 100,
-      "get": 49214,
-      "get_sum": 49214,
-      "get_or_fail_fail": 0,
-      "get_or_fail_success": 0,
-      "take": 0,
-      "take_sum": 0,
-      "put": 49214,
-      "put_sum": 49214,
-      "wait": { "avgcount": 0,
-          "sum": 0.000000000}}}
-`
--- a/plugins/inputs/chrony/README.md
+++ b/plugins/inputs/chrony/README.md
@@ -1,92 +0,0 @@
-# chrony Input Plugin
-
-Get standard chrony metrics, requires chronyc executable.
-
-Below is the documentation of the various headers returned by `chronyc tracking`.
-
- Reference ID - This is the refid and name (or IP address) if available, of the
-server to which the computer is currently synchronised. If this is 127.127.1.1
-it means the computer is not synchronised to any external source and that you
-have the ‘local’ mode operating (via the local command in chronyc (see section local),
-or the local directive in the ‘/etc/chrony.conf’ file (see section local)).
- Stratum - The stratum indicates how many hops away from a computer with an attached
-reference clock we are. Such a computer is a stratum-1 computer, so the computer in the
-example is two hops away (i.e. a.b.c is a stratum-2 and is synchronised from a stratum-1).
- Ref time - This is the time (UTC) at which the last measurement from the reference
-source was processed.
- System time - In normal operation, chronyd never steps the system clock, because any
-jump in the timescale can have adverse consequences for certain application programs.
-Instead, any error in the system clock is corrected by slightly speeding up or slowing
-down the system clock until the error has been removed, and then returning to the system
-clock’s normal speed. A consequence of this is that there will be a period when the
-system clock (as read by other programs using the gettimeofday() system call, or by the
-date command in the shell) will be different from chronyd's estimate of the current true
-time (which it reports to NTP clients when it is operating in server mode). The value
-reported on this line is the difference due to this effect.
- Last offset - This is the estimated local offset on the last clock update.
- RMS offset - This is a long-term average of the offset value.
- Frequency - The ‘frequency’ is the rate by which the system’s clock would be
-wrong if chronyd was not correcting it. It is expressed in ppm (parts per million).
-For example, a value of 1ppm would mean that when the system’s clock thinks it has
-advanced 1 second, it has actually advanced by 1.000001 seconds relative to true time.
- Residual freq - This shows the ‘residual frequency’ for the currently selected
-reference source. This reflects any difference between what the measurements from the
-reference source indicate the frequency should be and the frequency currently being used.
-The reason this is not always zero is that a smoothing procedure is applied to the
-frequency. Each time a measurement from the reference source is obtained and a new
-residual frequency computed, the estimated accuracy of this residual is compared with the
-estimated accuracy (see ‘skew’ next) of the existing frequency value. A weighted average
-is computed for the new frequency, with weights depending on these accuracies. If the
-measurements from the reference source follow a consistent trend, the residual will be
-driven to zero over time.
- Skew - This is the estimated error bound on the frequency.
- Root delay - This is the total of the network path delays to the stratum-1 computer
-from which the computer is ultimately synchronised. In certain extreme situations, this
-value can be negative. (This can arise in a symmetric peer arrangement where the computers’
-frequencies are not tracking each other and the network delay is very short relative to the
-turn-around time at each computer.)
- Root dispersion - This is the total dispersion accumulated through all the computers
-back to the stratum-1 computer from which the computer is ultimately synchronised.
-Dispersion is due to system clock resolution, statistical measurement variations etc.
- Leap status - This is the leap status, which can be Normal, Insert second,
-Delete second or Not synchronised.
-
-### Configuration:
-
-```toml
-# Get standard chrony metrics, requires chronyc executable.
-[[inputs.chrony]]
-  ## If true, chronyc tries to perform a DNS lookup for the time server.
-  # dns_lookup = false
-```
-
-### Measurements & Fields:
-
- chrony
-    - last_offset (float, seconds)
-    - rms_offset (float, seconds)
-    - frequency (float, ppm)
-    - residual_freq (float, ppm)
-    - skew (float, ppm)
-    - root_delay (float, seconds)
-    - root_dispersion (float, seconds)
-    - update_interval (float, seconds)
-
-### Tags:
-
- All measurements have the following tags:
-    - reference_id
-    - stratum
-    - leap_status
-
-### Example Output:
-
-```
-$ telegraf -config telegraf.conf -input-filter chrony -test
-* Plugin: chrony, Collection 1
-> chrony,leap_status=normal,reference_id=192.168.1.1,stratum=3 frequency=-35.657,last_offset=-0.000013616,residual_freq=-0,rms_offset=0.000027073,root_delay=0.000644,root_dispersion=0.003444,skew=0.001,update_interval=1031.2 1463750789687639161
-```
-
-
-
-
--- a/plugins/inputs/chrony/chrony.go
+++ b/plugins/inputs/chrony/chrony.go
@@ -1,129 +0,0 @@
-// +build linux
-
-package chrony
-
-import (
-	"errors"
-	"fmt"
-	"os/exec"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal"
-	"github.com/influxdata/telegraf/plugins/inputs"
-)
-
-var (
-	execCommand = exec.Command // execCommand is used to mock commands in tests.
-)
-
-type Chrony struct {
-	DNSLookup bool `toml:"dns_lookup"`
-	path      string
-}
-
-func (*Chrony) Description() string {
-	return "Get standard chrony metrics, requires chronyc executable."
-}
-
-func (*Chrony) SampleConfig() string {
-	return `
-  ## If true, chronyc tries to perform a DNS lookup for the time server.
-  # dns_lookup = false
-  `
-}
-
-func (c *Chrony) Gather(acc telegraf.Accumulator) error {
-	if len(c.path) == 0 {
-		return errors.New("chronyc not found: verify that chrony is installed and that chronyc is in your PATH")
-	}
-
-	flags := []string{}
-	if !c.DNSLookup {
-		flags = append(flags, "-n")
-	}
-	flags = append(flags, "tracking")
-
-	cmd := execCommand(c.path, flags...)
-	out, err := internal.CombinedOutputTimeout(cmd, time.Second*5)
-	if err != nil {
-		return fmt.Errorf("failed to run command %s: %s - %s", strings.Join(cmd.Args, " "), err, string(out))
-	}
-	fields, tags, err := processChronycOutput(string(out))
-	if err != nil {
-		return err
-	}
-	acc.AddFields("chrony", fields, tags)
-	return nil
-}
-
-// processChronycOutput takes in a string output from the chronyc command, like:
-//
-//     Reference ID    : 192.168.1.22 (ntp.example.com)
-//     Stratum         : 3
-//     Ref time (UTC)  : Thu May 12 14:27:07 2016
-//     System time     : 0.000020390 seconds fast of NTP time
-//     Last offset     : +0.000012651 seconds
-//     RMS offset      : 0.000025577 seconds
-//     Frequency       : 16.001 ppm slow
-//     Residual freq   : -0.000 ppm
-//     Skew            : 0.006 ppm
-//     Root delay      : 0.001655 seconds
-//     Root dispersion : 0.003307 seconds
-//     Update interval : 507.2 seconds
-//     Leap status     : Normal
-//
-// The value on the left side of the colon is used as field name, if the first field on
-// the right side is a float. If it cannot be parsed as float, it is a tag name.
-//
-// Ref time is ignored and all names are converted to snake case.
-//
-// It returns (<fields>, <tags>)
-func processChronycOutput(out string) (map[string]interface{}, map[string]string, error) {
-	tags := map[string]string{}
-	fields := map[string]interface{}{}
-	lines := strings.Split(strings.TrimSpace(out), "\n")
-	for _, line := range lines {
-		stats := strings.Split(line, ":")
-		if len(stats) < 2 {
-			return nil, nil, fmt.Errorf("unexpected output from chronyc, expected ':' in %s", out)
-		}
-		name := strings.ToLower(strings.Replace(strings.TrimSpace(stats[0]), " ", "_", -1))
-		// ignore reference time
-		if strings.Contains(name, "time") {
-			continue
-		}
-		valueFields := strings.Fields(stats[1])
-		if len(valueFields) == 0 {
-			return nil, nil, fmt.Errorf("unexpected output from chronyc: %s", out)
-		}
-		if strings.Contains(strings.ToLower(name), "stratum") {
-			tags["stratum"] = valueFields[0]
-			continue
-		}
-		value, err := strconv.ParseFloat(valueFields[0], 64)
-		if err != nil {
-			tags[name] = strings.ToLower(valueFields[0])
-			continue
-		}
-		if strings.Contains(stats[1], "slow") {
-			value = -value
-		}
-		fields[name] = value
-	}
-
-	return fields, tags, nil
-}
-
-func init() {
-	c := Chrony{}
-	path, _ := exec.LookPath("chronyc")
-	if len(path) > 0 {
-		c.path = path
-	}
-	inputs.Add("chrony", func() telegraf.Input {
-		return &c
-	})
-}
--- a/plugins/inputs/chrony/chrony_notlinux.go
+++ b/plugins/inputs/chrony/chrony_notlinux.go
@@ -1,3 +0,0 @@
-// +build !linux
-
-package chrony
--- a/plugins/inputs/chrony/chrony_test.go
+++ b/plugins/inputs/chrony/chrony_test.go
@@ -1,109 +0,0 @@
-// +build linux
-
-package chrony
-
-import (
-	"fmt"
-	"os"
-	"os/exec"
-	"testing"
-
-	"github.com/influxdata/telegraf/testutil"
-)
-
-func TestGather(t *testing.T) {
-	c := Chrony{
-		path: "chronyc",
-	}
-	// overwriting exec commands with mock commands
-	execCommand = fakeExecCommand
-	defer func() { execCommand = exec.Command }()
-	var acc testutil.Accumulator
-
-	err := c.Gather(&acc)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	tags := map[string]string{
-		"reference_id": "192.168.1.22",
-		"leap_status":  "normal",
-		"stratum":      "3",
-	}
-	fields := map[string]interface{}{
-		"last_offset":     0.000012651,
-		"rms_offset":      0.000025577,
-		"frequency":       -16.001,
-		"residual_freq":   0.0,
-		"skew":            0.006,
-		"root_delay":      0.001655,
-		"root_dispersion": 0.003307,
-		"update_interval": 507.2,
-	}
-
-	acc.AssertContainsTaggedFields(t, "chrony", fields, tags)
-
-	// test with dns lookup
-	c.DNSLookup = true
-	err = c.Gather(&acc)
-	if err != nil {
-		t.Fatal(err)
-	}
-	acc.AssertContainsTaggedFields(t, "chrony", fields, tags)
-
-}
-
-// fackeExecCommand is a helper function that mock
-// the exec.Command call (and call the test binary)
-func fakeExecCommand(command string, args ...string) *exec.Cmd {
-	cs := []string{"-test.run=TestHelperProcess", "--", command}
-	cs = append(cs, args...)
-	cmd := exec.Command(os.Args[0], cs...)
-	cmd.Env = []string{"GO_WANT_HELPER_PROCESS=1"}
-	return cmd
-}
-
-// TestHelperProcess isn't a real test. It's used to mock exec.Command
-// For example, if you run:
-// GO_WANT_HELPER_PROCESS=1 go test -test.run=TestHelperProcess -- chrony tracking
-// it returns below mockData.
-func TestHelperProcess(t *testing.T) {
-	if os.Getenv("GO_WANT_HELPER_PROCESS") != "1" {
-		return
-	}
-
-	lookup := "Reference ID    : 192.168.1.22 (ntp.example.com)\n"
-	noLookup := "Reference ID    : 192.168.1.22 (192.168.1.22)\n"
-	mockData := `Stratum         : 3
-Ref time (UTC)  : Thu May 12 14:27:07 2016
-System time     : 0.000020390 seconds fast of NTP time
-Last offset     : +0.000012651 seconds
-RMS offset      : 0.000025577 seconds
-Frequency       : 16.001 ppm slow
-Residual freq   : -0.000 ppm
-Skew            : 0.006 ppm
-Root delay      : 0.001655 seconds
-Root dispersion : 0.003307 seconds
-Update interval : 507.2 seconds
-Leap status     : Normal
-`
-
-	args := os.Args
-
-	// Previous arguments are tests stuff, that looks like :
-	// /tmp/go-build970079519/…/_test/integration.test -test.run=TestHelperProcess --
-	cmd, args := args[3], args[4:]
-
-	if cmd == "chronyc" {
-		if args[0] == "tracking" {
-			fmt.Fprint(os.Stdout, lookup+mockData)
-		} else {
-			fmt.Fprint(os.Stdout, noLookup+mockData)
-		}
-	} else {
-		fmt.Fprint(os.Stdout, "command not found")
-		os.Exit(1)
-
-	}
-	os.Exit(0)
-}
--- a/plugins/inputs/cloudwatch/README.md
+++ b/plugins/inputs/cloudwatch/README.md
@@ -6,12 +6,9 @@ This plugin will pull Metric Statistics from Amazon CloudWatch.

 This plugin uses a credential chain for Authentication with the CloudWatch
 API endpoint. In the following order the plugin will attempt to authenticate.
-1. Assumed credentials via STS if `role_arn` attribute is specified (source credentials are evaluated from subsequent rules)
-2. Explicit credentials from `access_key`, `secret_key`, and `token` attributes
-3. Shared profile from `profile` attribute
-4. [Environment Variables](https://github.com/aws/aws-sdk-go/wiki/configuring-sdk#environment-variables)
-5. [Shared Credentials](https://github.com/aws/aws-sdk-go/wiki/configuring-sdk#shared-credentials-file)
-6. [EC2 Instance Profile](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html)
+1. [IAMS Role](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html)
+2. [Environment Variables](https://github.com/aws/aws-sdk-go/wiki/configuring-sdk#environment-variables)
+3. [Shared Credentials](https://github.com/aws/aws-sdk-go/wiki/configuring-sdk#shared-credentials-file)

 ### Configuration:

@@ -27,7 +24,7 @@ API endpoint. In the following order the plugin will attempt to authenticate.
  delay = '1m'

  ## Override global run interval (optional - defaults to global interval)
-  ## Recomended: use metric 'interval' that is a multiple of 'period' to avoid
+  ## Recomended: use metric 'interval' that is a multiple of 'period' to avoid 
  ## gaps or overlap in pulled data
  interval = '1m'

@@ -39,15 +36,11 @@ API endpoint. In the following order the plugin will attempt to authenticate.
  ## Refreshes Namespace available metrics every 1h
  [[inputs.cloudwatch.metrics]]
    names = ['Latency', 'RequestCount']
-
+	
    ## Dimension filters for Metric (optional)
    [[inputs.cloudwatch.metrics.dimensions]]
      name = 'LoadBalancerName'
      value = 'p-example'
-
-    [[inputs.cloudwatch.metrics.dimensions]]
-      name = 'AvailabilityZone'
-      value = '*'
 ```
 #### Requirements and Terminology

@@ -59,39 +52,6 @@ Plugin Configuration utilizes [CloudWatch concepts](http://docs.aws.amazon.com/A
 - `names` must be valid CloudWatch [Metric](http://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/cloudwatch_concepts.html#Metric) names
 - `dimensions` must be valid CloudWatch [Dimension](http://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/cloudwatch_concepts.html#Dimension) name/value pairs

-Omitting or specifying a value of `'*'` for a dimension value configures all available metrics that contain a dimension with the specified name
-to be retrieved. If specifying >1 dimension, then the metric must contain *all* the configured dimensions where the the value of the
-wildcard dimension is ignored.
-
-Example:
-```
-[[inputs.cloudwatch.metrics]]
-  names = ['Latency']
-
-  ## Dimension filters for Metric (optional)
-  [[inputs.cloudwatch.metrics.dimensions]]
-    name = 'LoadBalancerName'
-    value = 'p-example'
-
-  [[inputs.cloudwatch.metrics.dimensions]]
-    name = 'AvailabilityZone'
-    value = '*'
-```
-
-If the following ELBs are available:
- name: `p-example`, availabilityZone: `us-east-1a`
- name: `p-example`, availabilityZone: `us-east-1b`
- name: `q-example`, availabilityZone: `us-east-1a`
- name: `q-example`, availabilityZone: `us-east-1b`
-
-
-Then 2 metrics will be output:
- name: `p-example`, availabilityZone: `us-east-1a`
- name: `p-example`, availabilityZone: `us-east-1b`
-
-If the `AvailabilityZone` wildcard dimension was omitted, then a single metric (name: `p-example`)
-would be exported containing the aggregate values of the ELB across availability zones.
-
 #### Restrictions and Limitations
 - CloudWatch metrics are not available instantly via the CloudWatch API. You should adjust your collection `delay` to account for this lag in metrics availability based on your [monitoring subscription level](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-cloudwatch-new.html)
 - CloudWatch API usage incurs cost - see [GetMetricStatistics Pricing](https://aws.amazon.com/cloudwatch/pricing/)
--- a/plugins/inputs/cloudwatch/cloudwatch.go
+++ b/plugins/inputs/cloudwatch/cloudwatch.go
@@ -3,36 +3,28 @@ package cloudwatch
 import (
 	"fmt"
 	"strings"
-	"sync"
 	"time"

 	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/session"

 	"github.com/aws/aws-sdk-go/service/cloudwatch"

 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
-	internalaws "github.com/influxdata/telegraf/internal/config/aws"
-	"github.com/influxdata/telegraf/internal/errchan"
-	"github.com/influxdata/telegraf/internal/limiter"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )

 type (
 	CloudWatch struct {
-		Region    string `toml:"region"`
-		AccessKey string `toml:"access_key"`
-		SecretKey string `toml:"secret_key"`
-		RoleARN   string `toml:"role_arn"`
-		Profile   string `toml:"profile"`
-		Filename  string `toml:"shared_credential_file"`
-		Token     string `toml:"token"`
-
+		Region      string            `toml:"region"`
+		AccessKey   string            `toml:"access_key"`
+		SecretKey   string            `toml:"secret_key"`
 		Period      internal.Duration `toml:"period"`
 		Delay       internal.Duration `toml:"delay"`
 		Namespace   string            `toml:"namespace"`
 		Metrics     []*Metric         `toml:"metrics"`
-		CacheTTL    internal.Duration `toml:"cache_ttl"`
 		client      cloudwatchClient
 		metricCache *MetricCache
 	}
@@ -66,18 +58,12 @@ func (c *CloudWatch) SampleConfig() string {

  ## Amazon Credentials
  ## Credentials are loaded in the following order
-  ## 1) Assumed credentials via STS if role_arn is specified
-  ## 2) explicit credentials from 'access_key' and 'secret_key'
-  ## 3) shared profile from 'profile'
-  ## 4) environment variables
-  ## 5) shared credentials file
-  ## 6) EC2 Instance Profile
+  ## 1) explicit credentials from 'access_key' and 'secret_key'
+  ## 2) environment variables
+  ## 3) shared credentials file
+  ## 4) EC2 Instance Profile
  #access_key = ""
  #secret_key = ""
-  #token = ""
-  #role_arn = ""
-  #profile = ""
-  #shared_credential_file = ""

  ## Requested CloudWatch aggregation Period (required - must be a multiple of 60s)
  period = '1m'
@@ -89,10 +75,6 @@ func (c *CloudWatch) SampleConfig() string {
  ## gaps or overlap in pulled data
  interval = '1m'

-  ## Configure the TTL for the internal cache of metrics.
-  ## Defaults to 1 hr if not specified
-  #cache_ttl = '10m'
-
  ## Metric Statistic Namespace (required)
  namespace = 'AWS/ELB'

@@ -124,40 +106,20 @@ func (c *CloudWatch) Gather(acc telegraf.Accumulator) error {
 	if c.Metrics != nil {
 		metrics = []*cloudwatch.Metric{}
 		for _, m := range c.Metrics {
-			if !hasWilcard(m.Dimensions) {
-				dimensions := make([]*cloudwatch.Dimension, len(m.Dimensions))
-				for k, d := range m.Dimensions {
-					fmt.Printf("Dimension [%s]:[%s]\n", d.Name, d.Value)
-					dimensions[k] = &cloudwatch.Dimension{
-						Name:  aws.String(d.Name),
-						Value: aws.String(d.Value),
-					}
-				}
-				for _, name := range m.MetricNames {
-					metrics = append(metrics, &cloudwatch.Metric{
-						Namespace:  aws.String(c.Namespace),
-						MetricName: aws.String(name),
-						Dimensions: dimensions,
-					})
-				}
-			} else {
-				allMetrics, err := c.fetchNamespaceMetrics()
-				if err != nil {
-					return err
-				}
-				for _, name := range m.MetricNames {
-					for _, metric := range allMetrics {
-						if isSelected(metric, m.Dimensions) {
-							metrics = append(metrics, &cloudwatch.Metric{
-								Namespace:  aws.String(c.Namespace),
-								MetricName: aws.String(name),
-								Dimensions: metric.Dimensions,
-							})
-						}
-					}
+			dimensions := make([]*cloudwatch.Dimension, len(m.Dimensions))
+			for k, d := range m.Dimensions {
+				dimensions[k] = &cloudwatch.Dimension{
+					Name:  aws.String(d.Name),
+					Value: aws.String(d.Value),
 				}
 			}
-
+			for _, name := range m.MetricNames {
+				metrics = append(metrics, &cloudwatch.Metric{
+					Namespace:  aws.String(c.Namespace),
+					MetricName: aws.String(name),
+					Dimensions: dimensions,
+				})
+			}
 		}
 	} else {
 		var err error
@@ -168,35 +130,30 @@ func (c *CloudWatch) Gather(acc telegraf.Accumulator) error {
 	}

 	metricCount := len(metrics)
-	errChan := errchan.New(metricCount)
+	var errChan = make(chan error, metricCount)

 	now := time.Now()

 	// limit concurrency or we can easily exhaust user connection limit
-	// see cloudwatch API request limits:
-	// http://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/cloudwatch_limits.html
-	lmtr := limiter.NewRateLimiter(10, time.Second)
-	defer lmtr.Stop()
-	var wg sync.WaitGroup
-	wg.Add(len(metrics))
-	for _, m := range metrics {
-		<-lmtr.C
-		go func(inm *cloudwatch.Metric) {
-			defer wg.Done()
-			c.gatherMetric(acc, inm, now, errChan.C)
-		}(m)
-	}
-	wg.Wait()
+	semaphore := make(chan byte, 64)

-	return errChan.Error()
+	for _, m := range metrics {
+		semaphore <- 0x1
+		go c.gatherMetric(acc, m, now, semaphore, errChan)
+	}
+
+	for i := 1; i <= metricCount; i++ {
+		err := <-errChan
+		if err != nil {
+			return err
+		}
+	}
+	return nil
 }

 func init() {
 	inputs.Add("cloudwatch", func() telegraf.Input {
-		ttl, _ := time.ParseDuration("1hr")
-		return &CloudWatch{
-			CacheTTL: internal.Duration{Duration: ttl},
-		}
+		return &CloudWatch{}
 	})
 }

@@ -204,18 +161,14 @@ func init() {
 * Initialize CloudWatch client
 */
 func (c *CloudWatch) initializeCloudWatch() error {
-	credentialConfig := &internalaws.CredentialConfig{
-		Region:    c.Region,
-		AccessKey: c.AccessKey,
-		SecretKey: c.SecretKey,
-		RoleARN:   c.RoleARN,
-		Profile:   c.Profile,
-		Filename:  c.Filename,
-		Token:     c.Token,
+	config := &aws.Config{
+		Region: aws.String(c.Region),
+	}
+	if c.AccessKey != "" || c.SecretKey != "" {
+		config.Credentials = credentials.NewStaticCredentials(c.AccessKey, c.SecretKey, "")
 	}
-	configProvider := credentialConfig.Credentials()

-	c.client = cloudwatch.New(configProvider)
+	c.client = cloudwatch.New(session.New(config))
 	return nil
 }

@@ -250,10 +203,11 @@ func (c *CloudWatch) fetchNamespaceMetrics() (metrics []*cloudwatch.Metric, err
 		more = token != nil
 	}

+	cacheTTL, _ := time.ParseDuration("1hr")
 	c.metricCache = &MetricCache{
 		Metrics: metrics,
 		Fetched: time.Now(),
-		TTL:     c.CacheTTL.Duration,
+		TTL:     cacheTTL,
 	}

 	return
@@ -262,16 +216,12 @@ func (c *CloudWatch) fetchNamespaceMetrics() (metrics []*cloudwatch.Metric, err
 /*
 * Gather given Metric and emit any error
 */
-func (c *CloudWatch) gatherMetric(
-	acc telegraf.Accumulator,
-	metric *cloudwatch.Metric,
-	now time.Time,
-	errChan chan error,
-) {
+func (c *CloudWatch) gatherMetric(acc telegraf.Accumulator, metric *cloudwatch.Metric, now time.Time, semaphore chan byte, errChan chan error) {
 	params := c.getStatisticsInput(metric, now)
 	resp, err := c.client.GetMetricStatistics(params)
 	if err != nil {
 		errChan <- err
+		<-semaphore
 		return
 	}

@@ -308,6 +258,7 @@ func (c *CloudWatch) gatherMetric(
 	}

 	errChan <- nil
+	<-semaphore
 }

 /*
@@ -358,32 +309,3 @@ func (c *CloudWatch) getStatisticsInput(metric *cloudwatch.Metric, now time.Time
 func (c *MetricCache) IsValid() bool {
 	return c.Metrics != nil && time.Since(c.Fetched) < c.TTL
 }
-
-func hasWilcard(dimensions []*Dimension) bool {
-	for _, d := range dimensions {
-		if d.Value == "" || d.Value == "*" {
-			return true
-		}
-	}
-	return false
-}
-
-func isSelected(metric *cloudwatch.Metric, dimensions []*Dimension) bool {
-	if len(metric.Dimensions) != len(dimensions) {
-		return false
-	}
-	for _, d := range dimensions {
-		selected := false
-		for _, d2 := range metric.Dimensions {
-			if d.Name == *d2.Name {
-				if d.Value == "" || d.Value == "*" || d.Value == *d2.Value {
-					selected = true
-				}
-			}
-		}
-		if !selected {
-			return false
-		}
-	}
-	return true
-}
--- a/plugins/inputs/conntrack/README.md
+++ b/plugins/inputs/conntrack/README.md
@@ -1,56 +0,0 @@
-# Conntrack Plugin
-
-Collects stats from Netfilter's conntrack-tools.
-
-The conntrack-tools provide a mechanism for tracking various aspects of
-network connections as they are processed by netfilter. At runtime, 
-conntrack exposes many of those connection statistics within /proc/sys/net.
-Depending on your kernel version, these files can be found in either
-/proc/sys/net/ipv4/netfilter or /proc/sys/net/netfilter and will be
-prefixed with either ip_ or nf_.  This plugin reads the files specified 
-in its configuration and publishes each one as a field, with the prefix
-normalized to ip_.  
-
-In order to simplify configuration in a heterogeneous environment, a superset
-of directory and filenames can be specified.  Any locations that don't exist
-will be ignored.
-
-For more information on conntrack-tools, see the 
-[Netfilter Documentation](http://conntrack-tools.netfilter.org/).
-
-
-### Configuration:
-
-```toml
- # Collects conntrack stats from the configured directories and files.
- [[inputs.conntrack]]
-   ## The following defaults would work with multiple versions of conntrack.
-   ## Note the nf_ and ip_ filename prefixes are mutually exclusive across
-   ## kernel versions, as are the directory locations.
-
-   ## Superset of filenames to look for within the conntrack dirs.
-   ## Missing files will be ignored.
-   files = ["ip_conntrack_count","ip_conntrack_max",
-            "nf_conntrack_count","nf_conntrack_max"]
-
-   ## Directories to search within for the conntrack files above.
-   ## Missing directrories will be ignored.
-   dirs = ["/proc/sys/net/ipv4/netfilter","/proc/sys/net/netfilter"]
-```
-
-### Measurements & Fields:
-
- conntrack
-    - ip_conntrack_count (int, count): the number of entries in the conntrack table 
-    - ip_conntrack_max (int, size): the max capacity of the conntrack table
-
-### Tags:
-
-This input does not use tags.
-
-### Example Output:
-
-```
-$ ./telegraf -config telegraf.conf -input-filter conntrack -test
-conntrack,host=myhost ip_conntrack_count=2,ip_conntrack_max=262144 1461620427667995735
-```
--- a/plugins/inputs/conntrack/conntrack.go
+++ b/plugins/inputs/conntrack/conntrack.go
@@ -1,119 +0,0 @@
-// +build linux
-
-package conntrack
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"strconv"
-	"strings"
-
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/plugins/inputs"
-	"log"
-	"path/filepath"
-)
-
-type Conntrack struct {
-	Path  string
-	Dirs  []string
-	Files []string
-}
-
-const (
-	inputName = "conntrack"
-)
-
-var dfltDirs = []string{
-	"/proc/sys/net/ipv4/netfilter",
-	"/proc/sys/net/netfilter",
-}
-
-var dfltFiles = []string{
-	"ip_conntrack_count",
-	"ip_conntrack_max",
-	"nf_conntrack_count",
-	"nf_conntrack_max",
-}
-
-func (c *Conntrack) setDefaults() {
-	if len(c.Dirs) == 0 {
-		c.Dirs = dfltDirs
-	}
-
-	if len(c.Files) == 0 {
-		c.Files = dfltFiles
-	}
-}
-
-func (c *Conntrack) Description() string {
-	return "Collects conntrack stats from the configured directories and files."
-}
-
-var sampleConfig = `
-   ## The following defaults would work with multiple versions of conntrack.
-   ## Note the nf_ and ip_ filename prefixes are mutually exclusive across
-   ## kernel versions, as are the directory locations.
-
-   ## Superset of filenames to look for within the conntrack dirs.
-   ## Missing files will be ignored.
-   files = ["ip_conntrack_count","ip_conntrack_max",
-            "nf_conntrack_count","nf_conntrack_max"]
-
-   ## Directories to search within for the conntrack files above.
-   ## Missing directrories will be ignored.
-   dirs = ["/proc/sys/net/ipv4/netfilter","/proc/sys/net/netfilter"]
-`
-
-func (c *Conntrack) SampleConfig() string {
-	return sampleConfig
-}
-
-func (c *Conntrack) Gather(acc telegraf.Accumulator) error {
-	c.setDefaults()
-
-	var metricKey string
-	fields := make(map[string]interface{})
-
-	for _, dir := range c.Dirs {
-		for _, file := range c.Files {
-			// NOTE: no system will have both nf_ and ip_ prefixes,
-			// so we're safe to branch on suffix only.
-			parts := strings.SplitN(file, "_", 2)
-			if len(parts) < 2 {
-				continue
-			}
-			metricKey = "ip_" + parts[1]
-
-			fName := filepath.Join(dir, file)
-			if _, err := os.Stat(fName); err != nil {
-				continue
-			}
-
-			contents, err := ioutil.ReadFile(fName)
-			if err != nil {
-				log.Printf("failed to read file '%s': %v", fName, err)
-			}
-
-			v := strings.TrimSpace(string(contents))
-			fields[metricKey], err = strconv.ParseFloat(v, 64)
-			if err != nil {
-				log.Printf("failed to parse metric, expected number but "+
-					" found '%s': %v", v, err)
-			}
-		}
-	}
-
-	if len(fields) == 0 {
-		return fmt.Errorf("Conntrack input failed to collect metrics. " +
-			"Is the conntrack kernel module loaded?")
-	}
-
-	acc.AddFields(inputName, fields, nil)
-	return nil
-}
-
-func init() {
-	inputs.Add(inputName, func() telegraf.Input { return &Conntrack{} })
-}
--- a/plugins/inputs/conntrack/conntrack_notlinux.go
+++ b/plugins/inputs/conntrack/conntrack_notlinux.go
@@ -1,3 +0,0 @@
-// +build !linux
-
-package conntrack
--- a/plugins/inputs/conntrack/conntrack_test.go
+++ b/plugins/inputs/conntrack/conntrack_test.go
@@ -1,90 +0,0 @@
-// +build linux
-
-package conntrack
-
-import (
-	"github.com/influxdata/telegraf/testutil"
-	"github.com/stretchr/testify/assert"
-	"io/ioutil"
-	"os"
-	"path"
-	"strconv"
-	"strings"
-	"testing"
-)
-
-func restoreDflts(savedFiles, savedDirs []string) {
-	dfltFiles = savedFiles
-	dfltDirs = savedDirs
-}
-
-func TestNoFilesFound(t *testing.T) {
-	defer restoreDflts(dfltFiles, dfltDirs)
-
-	dfltFiles = []string{"baz.txt"}
-	dfltDirs = []string{"./foo/bar"}
-	c := &Conntrack{}
-	acc := &testutil.Accumulator{}
-	err := c.Gather(acc)
-
-	assert.EqualError(t, err, "Conntrack input failed to collect metrics. "+
-		"Is the conntrack kernel module loaded?")
-}
-
-func TestDefaultsUsed(t *testing.T) {
-	defer restoreDflts(dfltFiles, dfltDirs)
-	tmpdir, err := ioutil.TempDir("", "tmp1")
-	assert.NoError(t, err)
-	defer os.Remove(tmpdir)
-
-	tmpFile, err := ioutil.TempFile(tmpdir, "ip_conntrack_count")
-	assert.NoError(t, err)
-
-	dfltDirs = []string{tmpdir}
-	fname := path.Base(tmpFile.Name())
-	dfltFiles = []string{fname}
-
-	count := 1234321
-	ioutil.WriteFile(tmpFile.Name(), []byte(strconv.Itoa(count)), 0660)
-	c := &Conntrack{}
-	acc := &testutil.Accumulator{}
-
-	c.Gather(acc)
-	acc.AssertContainsFields(t, inputName, map[string]interface{}{
-		fname: float64(count)})
-}
-
-func TestConfigsUsed(t *testing.T) {
-	defer restoreDflts(dfltFiles, dfltDirs)
-	tmpdir, err := ioutil.TempDir("", "tmp1")
-	assert.NoError(t, err)
-	defer os.Remove(tmpdir)
-
-	cntFile, err := ioutil.TempFile(tmpdir, "nf_conntrack_count")
-	maxFile, err := ioutil.TempFile(tmpdir, "nf_conntrack_max")
-	assert.NoError(t, err)
-
-	dfltDirs = []string{tmpdir}
-	cntFname := path.Base(cntFile.Name())
-	maxFname := path.Base(maxFile.Name())
-	dfltFiles = []string{cntFname, maxFname}
-
-	count := 1234321
-	max := 9999999
-	ioutil.WriteFile(cntFile.Name(), []byte(strconv.Itoa(count)), 0660)
-	ioutil.WriteFile(maxFile.Name(), []byte(strconv.Itoa(max)), 0660)
-	c := &Conntrack{}
-	acc := &testutil.Accumulator{}
-
-	c.Gather(acc)
-
-	fix := func(s string) string {
-		return strings.Replace(s, "nf_", "ip_", 1)
-	}
-
-	acc.AssertContainsFields(t, inputName,
-		map[string]interface{}{
-			fix(cntFname): float64(count),
-			fix(maxFname): float64(max),
-		})
-}
--- a/plugins/inputs/consul/README.md
+++ b/plugins/inputs/consul/README.md
@@ -1,46 +0,0 @@
-# Telegraf Input Plugin: Consul
-
-This plugin will collect statistics about all helath checks registered in the Consul. It uses [Consul API](https://www.consul.io/docs/agent/http/health.html#health_state)
-to query the data. It will not report the [telemetry](https://www.consul.io/docs/agent/telemetry.html) but Consul can report those stats already using StatsD protocol if needed.
-
-## Configuration:
-
-```
-# Gather health check statuses from services registered in Consul
-[[inputs.consul]]
-  ## Most of these values defaults to the one configured on a Consul's agent level.
-  ## Optional Consul server address (default: "")
-  # address = ""
-  ## Optional URI scheme for the Consul server (default: "")
-  # scheme = ""
-  ## Optional ACL token used in every request (default: "")
-  # token = ""
-  ## Optional username used for request HTTP Basic Authentication (default: "")
-  # username = ""
-  ## Optional password used for HTTP Basic Authentication (default: "")
-  # password = ""
-  ## Optional data centre to query the health checks from (default: "")
-  # datacentre = ""
-```
-
-## Measurements:
-
-### Consul:
-Tags:
- node: on which node check/service is registered on
- service_name: name of the service (this is the service name not the service ID)
-
-Fields:
- check_id
- check_name
- service_id
- status
-
-## Example output
-
-```
-$ telegraf --config ./telegraf.conf -input-filter consul -test
-* Plugin: consul, Collection 1
-> consul_health_checks,host=wolfpit,node=consul-server-node check_id="serfHealth",check_name="Serf Health Status",service_id="",status="passing" 1464698464486439902
-> consul_health_checks,host=wolfpit,node=consul-server-node,service_name=www.example.com check_id="service:www-example-com.test01",check_name="Service 'www.example.com' check",service_id="www-example-com.test01",status="critical" 1464698464486519036
-```
--- a/plugins/inputs/consul/consul.go
+++ b/plugins/inputs/consul/consul.go
@@ -1,136 +0,0 @@
-package consul
-
-import (
-	"net/http"
-
-	"github.com/hashicorp/consul/api"
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal"
-	"github.com/influxdata/telegraf/plugins/inputs"
-)
-
-type Consul struct {
-	Address    string
-	Scheme     string
-	Token      string
-	Username   string
-	Password   string
-	Datacentre string
-
-	// Path to CA file
-	SSLCA string `toml:"ssl_ca"`
-	// Path to host cert file
-	SSLCert string `toml:"ssl_cert"`
-	// Path to cert key file
-	SSLKey string `toml:"ssl_key"`
-	// Use SSL but skip chain & host verification
-	InsecureSkipVerify bool
-
-	// client used to connect to Consul agnet
-	client *api.Client
-}
-
-var sampleConfig = `
-  ## Most of these values defaults to the one configured on a Consul's agent level.
-  ## Optional Consul server address (default: "localhost")
-  # address = "localhost"
-  ## Optional URI scheme for the Consul server (default: "http")
-  # scheme = "http"
-  ## Optional ACL token used in every request (default: "")
-  # token = ""
-  ## Optional username used for request HTTP Basic Authentication (default: "")
-  # username = ""
-  ## Optional password used for HTTP Basic Authentication (default: "")
-  # password = ""
-  ## Optional data centre to query the health checks from (default: "")
-  # datacentre = ""
-`
-
-func (c *Consul) Description() string {
-	return "Gather health check statuses from services registered in Consul"
-}
-
-func (c *Consul) SampleConfig() string {
-	return sampleConfig
-}
-
-func (c *Consul) createAPIClient() (*api.Client, error) {
-	config := api.DefaultConfig()
-
-	if c.Address != "" {
-		config.Address = c.Address
-	}
-
-	if c.Scheme != "" {
-		config.Scheme = c.Scheme
-	}
-
-	if c.Datacentre != "" {
-		config.Datacenter = c.Datacentre
-	}
-
-	if c.Username != "" {
-		config.HttpAuth = &api.HttpBasicAuth{
-			Username: c.Username,
-			Password: c.Password,
-		}
-	}
-
-	tlsCfg, err := internal.GetTLSConfig(
-		c.SSLCert, c.SSLKey, c.SSLCA, c.InsecureSkipVerify)
-
-	if err != nil {
-		return nil, err
-	}
-
-	config.HttpClient.Transport = &http.Transport{
-		TLSClientConfig: tlsCfg,
-	}
-
-	return api.NewClient(config)
-}
-
-func (c *Consul) GatherHealthCheck(acc telegraf.Accumulator, checks []*api.HealthCheck) {
-	for _, check := range checks {
-		record := make(map[string]interface{})
-		tags := make(map[string]string)
-
-		record["check_id"] = check.CheckID
-		record["check_name"] = check.Name
-		record["service_id"] = check.ServiceID
-		record["status"] = check.Status
-
-		tags["node"] = check.Node
-		tags["service_name"] = check.ServiceName
-
-		acc.AddFields("consul_health_checks", record, tags)
-	}
-}
-
-func (c *Consul) Gather(acc telegraf.Accumulator) error {
-	if c.client == nil {
-		newClient, err := c.createAPIClient()
-
-		if err != nil {
-			return err
-		}
-
-		c.client = newClient
-	}
-
-	checks, _, err := c.client.Health().State("any", nil)
-
-	if err != nil {
-		return err
-	}
-
-	c.GatherHealthCheck(acc, checks)
-
-	return nil
-}
-
-func init() {
-	inputs.Add("consul", func() telegraf.Input {
-		return &Consul{}
-	})
-}
--- a/plugins/inputs/consul/consul_test.go
+++ b/plugins/inputs/consul/consul_test.go
@@ -1,42 +0,0 @@
-package consul
-
-import (
-	"testing"
-
-	"github.com/hashicorp/consul/api"
-	"github.com/influxdata/telegraf/testutil"
-)
-
-var sampleChecks = []*api.HealthCheck{
-	&api.HealthCheck{
-		Node:        "localhost",
-		CheckID:     "foo.health123",
-		Name:        "foo.health",
-		Status:      "passing",
-		Notes:       "lorem ipsum",
-		Output:      "OK",
-		ServiceID:   "foo.123",
-		ServiceName: "foo",
-	},
-}
-
-func TestGatherHealtCheck(t *testing.T) {
-	expectedFields := map[string]interface{}{
-		"check_id":   "foo.health123",
-		"check_name": "foo.health",
-		"status":     "passing",
-		"service_id": "foo.123",
-	}
-
-	expectedTags := map[string]string{
-		"node":         "localhost",
-		"service_name": "foo",
-	}
-
-	var acc testutil.Accumulator
-
-	consul := &Consul{}
-	consul.GatherHealthCheck(&acc, sampleChecks)
-
-	acc.AssertContainsTaggedFields(t, "consul_health_checks", expectedFields, expectedTags)
-}
--- a/plugins/inputs/docker/docker.go
+++ b/plugins/inputs/docker/docker.go
@@ -221,7 +221,7 @@ func (d *Docker) gatherContainer(
 	defer cancel()
 	r, err := d.client.ContainerStats(ctx, container.ID, false)
 	if err != nil {
-		return fmt.Errorf("Error getting docker stats: %s", err.Error())
+		log.Printf("Error getting docker stats: %s\n", err.Error())
 	}
 	defer r.Close()
 	dec := json.NewDecoder(r)
@@ -307,11 +307,7 @@ func gatherContainerStats(
 	for i, percpu := range stat.CPUStats.CPUUsage.PercpuUsage {
 		percputags := copyTags(tags)
 		percputags["cpu"] = fmt.Sprintf("cpu%d", i)
-		fields := map[string]interface{}{
-			"usage_total":  percpu,
-			"container_id": id,
-		}
-		acc.AddFields("docker_container_cpu", fields, percputags, now)
+		acc.AddFields("docker_container_cpu", map[string]interface{}{"usage_total": percpu}, percputags, now)
 	}

 	for network, netstats := range stat.Networks {
@@ -470,8 +466,6 @@ func parseSize(sizeStr string) (int64, error) {

 func init() {
 	inputs.Add("docker", func() telegraf.Input {
-		return &Docker{
-			Timeout: internal.Duration{Duration: time.Second * 5},
-		}
+		return &Docker{}
 	})
 }
--- a/plugins/inputs/docker/docker_test.go
+++ b/plugins/inputs/docker/docker_test.go
@@ -111,15 +111,13 @@ func TestDockerGatherContainerStats(t *testing.T) {

 	cputags["cpu"] = "cpu0"
 	cpu0fields := map[string]interface{}{
-		"usage_total":  uint64(1),
-		"container_id": "123456789",
+		"usage_total": uint64(1),
 	}
 	acc.AssertContainsTaggedFields(t, "docker_container_cpu", cpu0fields, cputags)

 	cputags["cpu"] = "cpu1"
 	cpu1fields := map[string]interface{}{
-		"usage_total":  uint64(1002),
-		"container_id": "123456789",
+		"usage_total": uint64(1002),
 	}
 	acc.AssertContainsTaggedFields(t, "docker_container_cpu", cpu1fields, cputags)
 }
@@ -374,8 +372,7 @@ func TestDockerGatherInfo(t *testing.T) {
 	acc.AssertContainsTaggedFields(t,
 		"docker_container_cpu",
 		map[string]interface{}{
-			"usage_total":  uint64(1231652),
-			"container_id": "b7dfbb9478a6ae55e237d4d74f8bbb753f0817192b5081334dc78476296e2173",
+			"usage_total": uint64(1231652),
 		},
 		map[string]string{
 			"container_name":  "etcd2",
--- a/plugins/inputs/elasticsearch/README.md
+++ b/plugins/inputs/elasticsearch/README.md
@@ -1,307 +1,320 @@
-# Elasticsearch input plugin
+# Elasticsearch plugin
+
+#### Plugin arguments:
+- **servers** []string: list of one or more Elasticsearch servers
+- **local** boolean: If false, it will read the indices stats from all nodes
+- **cluster_health** boolean: If true, it will also obtain cluster level stats
+
+#### Description

 The [elasticsearch](https://www.elastic.co/) plugin queries endpoints to obtain
 [node](https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-nodes-stats.html)
 and optionally [cluster](https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-health.html) stats.

-### Configuration:
+Example:

 ```
-[[inputs.elasticsearch]]
-  servers = ["http://localhost:9200"]
-  local = true
-  cluster_health = true
+    [elasticsearch]
+
+    servers = ["http://localhost:9200"]
+
+    local = true
+
+    cluster_health = true
 ```

-### Measurements & Fields:
+# Measurements
+#### cluster measurements (utilizes fields instead of single values):
+
+contains `status`, `timed_out`, `number_of_nodes`, `number_of_data_nodes`,
+`active_primary_shards`, `active_shards`, `relocating_shards`,
+`initializing_shards`, `unassigned_shards` fields
+- elasticsearch_cluster_health
+
+contains `status`, `number_of_shards`, `number_of_replicas`,
+`active_primary_shards`, `active_shards`, `relocating_shards`,
+`initializing_shards`, `unassigned_shards` fields
+- elasticsearch_indices
+
+#### node measurements:

 field data circuit breaker measurement names:
- elasticsearch_breakers
-  - fielddata_estimated_size_in_bytes value=0
-  - fielddata_overhead value=1.03
-  - fielddata_tripped value=0
-  - fielddata_limit_size_in_bytes value=623326003
-  - request_estimated_size_in_bytes value=0
-  - request_overhead value=1.0
-  - request_tripped value=0
-  - request_limit_size_in_bytes value=415550668
-  - parent_overhead value=1.0
-  - parent_tripped value=0
-  - parent_limit_size_in_bytes value=727213670
-  - parent_estimated_size_in_bytes value=0
+- elasticsearch_breakers_fielddata_estimated_size_in_bytes value=0
+- elasticsearch_breakers_fielddata_overhead value=1.03
+- elasticsearch_breakers_fielddata_tripped value=0
+- elasticsearch_breakers_fielddata_limit_size_in_bytes value=623326003
+- elasticsearch_breakers_request_estimated_size_in_bytes value=0
+- elasticsearch_breakers_request_overhead value=1.0
+- elasticsearch_breakers_request_tripped value=0
+- elasticsearch_breakers_request_limit_size_in_bytes value=415550668
+- elasticsearch_breakers_parent_overhead value=1.0
+- elasticsearch_breakers_parent_tripped value=0
+- elasticsearch_breakers_parent_limit_size_in_bytes value=727213670
+- elasticsearch_breakers_parent_estimated_size_in_bytes value=0

 File system information, data path, free disk space, read/write measurement names:
- elasticsearch_fs
-  - timestamp value=1436460392946
-  - total_free_in_bytes value=16909316096
-  - total_available_in_bytes value=15894814720
-  - total_total_in_bytes value=19507089408
+- elasticsearch_fs_timestamp value=1436460392946
+- elasticsearch_fs_total_free_in_bytes value=16909316096
+- elasticsearch_fs_total_available_in_bytes value=15894814720
+- elasticsearch_fs_total_total_in_bytes value=19507089408

 indices size, document count, indexing and deletion times, search times,
 field cache size, merges and flushes measurement names:
- elasticsearch_indices
-  - id_cache_memory_size_in_bytes value=0
-  - completion_size_in_bytes value=0
-  - suggest_total value=0
-  - suggest_time_in_millis value=0
-  - suggest_current value=0
-  - query_cache_memory_size_in_bytes value=0
-  - query_cache_evictions value=0
-  - query_cache_hit_count value=0
-  - query_cache_miss_count value=0
-  - store_size_in_bytes value=37715234
-  - store_throttle_time_in_millis value=215
-  - merges_current_docs value=0
-  - merges_current_size_in_bytes value=0
-  - merges_total value=133
-  - merges_total_time_in_millis value=21060
-  - merges_total_docs value=203672
-  - merges_total_size_in_bytes value=142900226
-  - merges_current value=0
-  - filter_cache_memory_size_in_bytes value=7384
-  - filter_cache_evictions value=0
-  - indexing_index_total value=84790
-  - indexing_index_time_in_millis value=29680
-  - indexing_index_current value=0
-  - indexing_noop_update_total value=0
-  - indexing_throttle_time_in_millis value=0
-  - indexing_delete_tota value=13879
-  - indexing_delete_time_in_millis value=1139
-  - indexing_delete_current value=0
-  - get_exists_time_in_millis value=0
-  - get_missing_total value=1
-  - get_missing_time_in_millis value=2
-  - get_current value=0
-  - get_total value=1
-  - get_time_in_millis value=2
-  - get_exists_total value=0
-  - refresh_total value=1076
-  - refresh_total_time_in_millis value=20078
-  - percolate_current value=0
-  - percolate_memory_size_in_bytes value=-1
-  - percolate_queries value=0
-  - percolate_total value=0
-  - percolate_time_in_millis value=0
-  - translog_operations value=17702
-  - translog_size_in_bytes value=17
-  - recovery_current_as_source value=0
-  - recovery_current_as_target value=0
-  - recovery_throttle_time_in_millis value=0
-  - docs_count value=29652
-  - docs_deleted value=5229
-  - flush_total_time_in_millis value=2401
-  - flush_total value=115
-  - fielddata_memory_size_in_bytes value=12996
-  - fielddata_evictions value=0
-  - search_fetch_current value=0
-  - search_open_contexts value=0
-  - search_query_total value=1452
-  - search_query_time_in_millis value=5695
-  - search_query_current value=0
-  - search_fetch_total value=414
-  - search_fetch_time_in_millis value=146
-  - warmer_current value=0
-  - warmer_total value=2319
-  - warmer_total_time_in_millis value=448
-  - segments_count value=134
-  - segments_memory_in_bytes value=1285212
-  - segments_index_writer_memory_in_bytes value=0
-  - segments_index_writer_max_memory_in_bytes value=172368955
-  - segments_version_map_memory_in_bytes value=611844
-  - segments_fixed_bit_set_memory_in_bytes value=0
+- elasticsearch_indices_id_cache_memory_size_in_bytes value=0
+- elasticsearch_indices_completion_size_in_bytes value=0
+- elasticsearch_indices_suggest_total value=0
+- elasticsearch_indices_suggest_time_in_millis value=0
+- elasticsearch_indices_suggest_current value=0
+- elasticsearch_indices_query_cache_memory_size_in_bytes value=0
+- elasticsearch_indices_query_cache_evictions value=0
+- elasticsearch_indices_query_cache_hit_count value=0
+- elasticsearch_indices_query_cache_miss_count value=0
+- elasticsearch_indices_store_size_in_bytes value=37715234
+- elasticsearch_indices_store_throttle_time_in_millis value=215
+- elasticsearch_indices_merges_current_docs value=0
+- elasticsearch_indices_merges_current_size_in_bytes value=0
+- elasticsearch_indices_merges_total value=133
+- elasticsearch_indices_merges_total_time_in_millis value=21060
+- elasticsearch_indices_merges_total_docs value=203672
+- elasticsearch_indices_merges_total_size_in_bytes value=142900226
+- elasticsearch_indices_merges_current value=0
+- elasticsearch_indices_filter_cache_memory_size_in_bytes value=7384
+- elasticsearch_indices_filter_cache_evictions value=0
+- elasticsearch_indices_indexing_index_total value=84790
+- elasticsearch_indices_indexing_index_time_in_millis value=29680
+- elasticsearch_indices_indexing_index_current value=0
+- elasticsearch_indices_indexing_noop_update_total value=0
+- elasticsearch_indices_indexing_throttle_time_in_millis value=0
+- elasticsearch_indices_indexing_delete_tota value=13879
+- elasticsearch_indices_indexing_delete_time_in_millis value=1139
+- elasticsearch_indices_indexing_delete_current value=0
+- elasticsearch_indices_get_exists_time_in_millis value=0
+- elasticsearch_indices_get_missing_total value=1
+- elasticsearch_indices_get_missing_time_in_millis value=2
+- elasticsearch_indices_get_current value=0
+- elasticsearch_indices_get_total value=1
+- elasticsearch_indices_get_time_in_millis value=2
+- elasticsearch_indices_get_exists_total value=0
+- elasticsearch_indices_refresh_total value=1076
+- elasticsearch_indices_refresh_total_time_in_millis value=20078
+- elasticsearch_indices_percolate_current value=0
+- elasticsearch_indices_percolate_memory_size_in_bytes value=-1
+- elasticsearch_indices_percolate_queries value=0
+- elasticsearch_indices_percolate_total value=0
+- elasticsearch_indices_percolate_time_in_millis value=0
+- elasticsearch_indices_translog_operations value=17702
+- elasticsearch_indices_translog_size_in_bytes value=17
+- elasticsearch_indices_recovery_current_as_source value=0
+- elasticsearch_indices_recovery_current_as_target value=0
+- elasticsearch_indices_recovery_throttle_time_in_millis value=0
+- elasticsearch_indices_docs_count value=29652
+- elasticsearch_indices_docs_deleted value=5229
+- elasticsearch_indices_flush_total_time_in_millis value=2401
+- elasticsearch_indices_flush_total value=115
+- elasticsearch_indices_fielddata_memory_size_in_bytes value=12996
+- elasticsearch_indices_fielddata_evictions value=0
+- elasticsearch_indices_search_fetch_current value=0
+- elasticsearch_indices_search_open_contexts value=0
+- elasticsearch_indices_search_query_total value=1452
+- elasticsearch_indices_search_query_time_in_millis value=5695
+- elasticsearch_indices_search_query_current value=0
+- elasticsearch_indices_search_fetch_total value=414
+- elasticsearch_indices_search_fetch_time_in_millis value=146
+- elasticsearch_indices_warmer_current value=0
+- elasticsearch_indices_warmer_total value=2319
+- elasticsearch_indices_warmer_total_time_in_millis value=448
+- elasticsearch_indices_segments_count value=134
+- elasticsearch_indices_segments_memory_in_bytes value=1285212
+- elasticsearch_indices_segments_index_writer_memory_in_bytes value=0
+- elasticsearch_indices_segments_index_writer_max_memory_in_bytes value=172368955
+- elasticsearch_indices_segments_version_map_memory_in_bytes value=611844
+- elasticsearch_indices_segments_fixed_bit_set_memory_in_bytes value=0

 HTTP connection measurement names:
- elasticsearch_http
-  - current_open value=3
-  - total_opened value=3
+- elasticsearch_http_current_open value=3
+- elasticsearch_http_total_opened value=3

 JVM stats, memory pool information, garbage collection, buffer pools measurement names:
- elasticsearch_jvm
-  - timestamp value=1436460392945
-  - uptime_in_millis value=202245
-  - mem_non_heap_used_in_bytes value=39634576
-  - mem_non_heap_committed_in_bytes value=40841216
-  - mem_pools_young_max_in_bytes value=279183360
-  - mem_pools_young_peak_used_in_bytes value=71630848
-  - mem_pools_young_peak_max_in_bytes value=279183360
-  - mem_pools_young_used_in_bytes value=32685760
-  - mem_pools_survivor_peak_used_in_bytes value=8912888
-  - mem_pools_survivor_peak_max_in_bytes value=34865152
-  - mem_pools_survivor_used_in_bytes value=8912880
-  - mem_pools_survivor_max_in_bytes value=34865152
-  - mem_pools_old_peak_max_in_bytes value=724828160
-  - mem_pools_old_used_in_bytes value=11110928
-  - mem_pools_old_max_in_bytes value=724828160
-  - mem_pools_old_peak_used_in_bytes value=14354608
-  - mem_heap_used_in_bytes value=52709568
-  - mem_heap_used_percent value=5
-  - mem_heap_committed_in_bytes value=259522560
-  - mem_heap_max_in_bytes value=1038876672
-  - threads_peak_count value=45
-  - threads_count value=44
-  - gc_collectors_young_collection_count value=2
-  - gc_collectors_young_collection_time_in_millis value=98
-  - gc_collectors_old_collection_count value=1
-  - gc_collectors_old_collection_time_in_millis value=24
-  - buffer_pools_direct_count value=40
-  - buffer_pools_direct_used_in_bytes value=6304239
-  - buffer_pools_direct_total_capacity_in_bytes value=6304239
-  - buffer_pools_mapped_count value=0
-  - buffer_pools_mapped_used_in_bytes value=0
-  - buffer_pools_mapped_total_capacity_in_bytes value=0
+- elasticsearch_jvm_timestamp value=1436460392945
+- elasticsearch_jvm_uptime_in_millis value=202245
+- elasticsearch_jvm_mem_non_heap_used_in_bytes value=39634576
+- elasticsearch_jvm_mem_non_heap_committed_in_bytes value=40841216
+- elasticsearch_jvm_mem_pools_young_max_in_bytes value=279183360
+- elasticsearch_jvm_mem_pools_young_peak_used_in_bytes value=71630848
+- elasticsearch_jvm_mem_pools_young_peak_max_in_bytes value=279183360
+- elasticsearch_jvm_mem_pools_young_used_in_bytes value=32685760
+- elasticsearch_jvm_mem_pools_survivor_peak_used_in_bytes value=8912888
+- elasticsearch_jvm_mem_pools_survivor_peak_max_in_bytes value=34865152
+- elasticsearch_jvm_mem_pools_survivor_used_in_bytes value=8912880
+- elasticsearch_jvm_mem_pools_survivor_max_in_bytes value=34865152
+- elasticsearch_jvm_mem_pools_old_peak_max_in_bytes value=724828160
+- elasticsearch_jvm_mem_pools_old_used_in_bytes value=11110928
+- elasticsearch_jvm_mem_pools_old_max_in_bytes value=724828160
+- elasticsearch_jvm_mem_pools_old_peak_used_in_bytes value=14354608
+- elasticsearch_jvm_mem_heap_used_in_bytes value=52709568
+- elasticsearch_jvm_mem_heap_used_percent value=5
+- elasticsearch_jvm_mem_heap_committed_in_bytes value=259522560
+- elasticsearch_jvm_mem_heap_max_in_bytes value=1038876672
+- elasticsearch_jvm_threads_peak_count value=45
+- elasticsearch_jvm_threads_count value=44
+- elasticsearch_jvm_gc_collectors_young_collection_count value=2
+- elasticsearch_jvm_gc_collectors_young_collection_time_in_millis value=98
+- elasticsearch_jvm_gc_collectors_old_collection_count value=1
+- elasticsearch_jvm_gc_collectors_old_collection_time_in_millis value=24
+- elasticsearch_jvm_buffer_pools_direct_count value=40
+- elasticsearch_jvm_buffer_pools_direct_used_in_bytes value=6304239
+- elasticsearch_jvm_buffer_pools_direct_total_capacity_in_bytes value=6304239
+- elasticsearch_jvm_buffer_pools_mapped_count value=0
+- elasticsearch_jvm_buffer_pools_mapped_used_in_bytes value=0
+- elasticsearch_jvm_buffer_pools_mapped_total_capacity_in_bytes value=0

 TCP information measurement names:
- elasticsearch_network
-  - tcp_in_errs value=0
-  - tcp_passive_opens value=16
-  - tcp_curr_estab value=29
-  - tcp_in_segs value=113
-  - tcp_out_segs value=97
-  - tcp_retrans_segs value=0
-  - tcp_attempt_fails value=0
-  - tcp_active_opens value=13
-  - tcp_estab_resets value=0
-  - tcp_out_rsts value=0
+- elasticsearch_network_tcp_in_errs value=0
+- elasticsearch_network_tcp_passive_opens value=16
+- elasticsearch_network_tcp_curr_estab value=29
+- elasticsearch_network_tcp_in_segs value=113
+- elasticsearch_network_tcp_out_segs value=97
+- elasticsearch_network_tcp_retrans_segs value=0
+- elasticsearch_network_tcp_attempt_fails value=0
+- elasticsearch_network_tcp_active_opens value=13
+- elasticsearch_network_tcp_estab_resets value=0
+- elasticsearch_network_tcp_out_rsts value=0

 Operating system stats, load average, cpu, mem, swap measurement names:
- elasticsearch_os
-  - swap_used_in_bytes value=0
-  - swap_free_in_bytes value=487997440
-  - timestamp value=1436460392944
-  - uptime_in_millis value=25092
-  - cpu_sys value=0
-  - cpu_user value=0
-  - cpu_idle value=99
-  - cpu_usage value=0
-  - cpu_stolen value=0
-  - mem_free_percent value=74
-  - mem_used_percent value=25
-  - mem_actual_free_in_bytes value=1565470720
-  - mem_actual_used_in_bytes value=534159360
-  - mem_free_in_bytes value=477761536
-  - mem_used_in_bytes value=1621868544
+- elasticsearch_os_swap_used_in_bytes value=0
+- elasticsearch_os_swap_free_in_bytes value=487997440
+- elasticsearch_os_timestamp value=1436460392944
+- elasticsearch_os_uptime_in_millis value=25092
+- elasticsearch_os_cpu_sys value=0
+- elasticsearch_os_cpu_user value=0
+- elasticsearch_os_cpu_idle value=99
+- elasticsearch_os_cpu_usage value=0
+- elasticsearch_os_cpu_stolen value=0
+- elasticsearch_os_mem_free_percent value=74
+- elasticsearch_os_mem_used_percent value=25
+- elasticsearch_os_mem_actual_free_in_bytes value=1565470720
+- elasticsearch_os_mem_actual_used_in_bytes value=534159360
+- elasticsearch_os_mem_free_in_bytes value=477761536
+- elasticsearch_os_mem_used_in_bytes value=1621868544

 Process statistics, memory consumption, cpu usage, open file descriptors measurement names:
- elasticsearch_process
-  - mem_resident_in_bytes value=246382592
-  - mem_share_in_bytes value=18747392
-  - mem_total_virtual_in_bytes value=4747890688
-  - timestamp value=1436460392945
-  - open_file_descriptors value=160
-  - cpu_total_in_millis value=15480
-  - cpu_percent value=2
-  - cpu_sys_in_millis value=1870
-  - cpu_user_in_millis value=13610
+- elasticsearch_process_mem_resident_in_bytes value=246382592
+- elasticsearch_process_mem_share_in_bytes value=18747392
+- elasticsearch_process_mem_total_virtual_in_bytes value=4747890688
+- elasticsearch_process_timestamp value=1436460392945
+- elasticsearch_process_open_file_descriptors value=160
+- elasticsearch_process_cpu_total_in_millis value=15480
+- elasticsearch_process_cpu_percent value=2
+- elasticsearch_process_cpu_sys_in_millis value=1870
+- elasticsearch_process_cpu_user_in_millis value=13610

 Statistics about each thread pool, including current size, queue and rejected tasks measurement names:
- elasticsearch_thread_pool
-  - merge_threads value=6
-  - merge_queue value=4
-  - merge_active value=5
-  - merge_rejected value=2
-  - merge_largest value=5
-  - merge_completed value=1
-  - bulk_threads value=4
-  - bulk_queue value=5
-  - bulk_active value=7
-  - bulk_rejected value=3
-  - bulk_largest value=1
-  - bulk_completed value=4
-  - warmer_threads value=2
-  - warmer_queue value=7
-  - warmer_active value=3
-  - warmer_rejected value=2
-  - warmer_largest value=3
-  - warmer_completed value=1
-  - get_largest value=2
-  - get_completed value=1
-  - get_threads value=1
-  - get_queue value=8
-  - get_active value=4
-  - get_rejected value=3
-  - index_threads value=6
-  - index_queue value=8
-  - index_active value=4
-  - index_rejected value=2
-  - index_largest value=3
-  - index_completed value=6
-  - suggest_threads value=2
-  - suggest_queue value=7
-  - suggest_active value=2
-  - suggest_rejected value=1
-  - suggest_largest value=8
-  - suggest_completed value=3
-  - fetch_shard_store_queue value=7
-  - fetch_shard_store_active value=4
-  - fetch_shard_store_rejected value=2
-  - fetch_shard_store_largest value=4
-  - fetch_shard_store_completed value=1
-  - fetch_shard_store_threads value=1
-  - management_threads value=2
-  - management_queue value=3
-  - management_active value=1
-  - management_rejected value=6
-  - management_largest value=2
-  - management_completed value=22
-  - percolate_queue value=23
-  - percolate_active value=13
-  - percolate_rejected value=235
-  - percolate_largest value=23
-  - percolate_completed value=33
-  - percolate_threads value=123
-  - listener_active value=4
-  - listener_rejected value=8
-  - listener_largest value=1
-  - listener_completed value=1
-  - listener_threads value=1
-  - listener_queue value=2
-  - search_rejected value=7
-  - search_largest value=2
-  - search_completed value=4
-  - search_threads value=5
-  - search_queue value=7
-  - search_active value=2
-  - fetch_shard_started_threads value=3
-  - fetch_shard_started_queue value=1
-  - fetch_shard_started_active value=5
-  - fetch_shard_started_rejected value=6
-  - fetch_shard_started_largest value=4
-  - fetch_shard_started_completed value=54
-  - refresh_rejected value=4
-  - refresh_largest value=8
-  - refresh_completed value=3
-  - refresh_threads value=23
-  - refresh_queue value=7
-  - refresh_active value=3
-  - optimize_threads value=3
-  - optimize_queue value=4
-  - optimize_active value=1
-  - optimize_rejected value=2
-  - optimize_largest value=7
-  - optimize_completed value=3
-  - snapshot_largest value=1
-  - snapshot_completed value=0
-  - snapshot_threads value=8
-  - snapshot_queue value=5
-  - snapshot_active value=6
-  - snapshot_rejected value=2
-  - generic_threads value=1
-  - generic_queue value=4
-  - generic_active value=6
-  - generic_rejected value=3
-  - generic_largest value=2
-  - generic_completed value=27
-  - flush_threads value=3
-  - flush_queue value=8
-  - flush_active value=0
-  - flush_rejected value=1
-  - flush_largest value=5
-  - flush_completed value=3
+- elasticsearch_thread_pool_merge_threads value=6
+- elasticsearch_thread_pool_merge_queue value=4
+- elasticsearch_thread_pool_merge_active value=5
+- elasticsearch_thread_pool_merge_rejected value=2
+- elasticsearch_thread_pool_merge_largest value=5
+- elasticsearch_thread_pool_merge_completed value=1
+- elasticsearch_thread_pool_bulk_threads value=4
+- elasticsearch_thread_pool_bulk_queue value=5
+- elasticsearch_thread_pool_bulk_active value=7
+- elasticsearch_thread_pool_bulk_rejected value=3
+- elasticsearch_thread_pool_bulk_largest value=1
+- elasticsearch_thread_pool_bulk_completed value=4
+- elasticsearch_thread_pool_warmer_threads value=2
+- elasticsearch_thread_pool_warmer_queue value=7
+- elasticsearch_thread_pool_warmer_active value=3
+- elasticsearch_thread_pool_warmer_rejected value=2
+- elasticsearch_thread_pool_warmer_largest value=3
+- elasticsearch_thread_pool_warmer_completed value=1
+- elasticsearch_thread_pool_get_largest value=2
+- elasticsearch_thread_pool_get_completed value=1
+- elasticsearch_thread_pool_get_threads value=1
+- elasticsearch_thread_pool_get_queue value=8
+- elasticsearch_thread_pool_get_active value=4
+- elasticsearch_thread_pool_get_rejected value=3
+- elasticsearch_thread_pool_index_threads value=6
+- elasticsearch_thread_pool_index_queue value=8
+- elasticsearch_thread_pool_index_active value=4
+- elasticsearch_thread_pool_index_rejected value=2
+- elasticsearch_thread_pool_index_largest value=3
+- elasticsearch_thread_pool_index_completed value=6
+- elasticsearch_thread_pool_suggest_threads value=2
+- elasticsearch_thread_pool_suggest_queue value=7
+- elasticsearch_thread_pool_suggest_active value=2
+- elasticsearch_thread_pool_suggest_rejected value=1
+- elasticsearch_thread_pool_suggest_largest value=8
+- elasticsearch_thread_pool_suggest_completed value=3
+- elasticsearch_thread_pool_fetch_shard_store_queue value=7
+- elasticsearch_thread_pool_fetch_shard_store_active value=4
+- elasticsearch_thread_pool_fetch_shard_store_rejected value=2
+- elasticsearch_thread_pool_fetch_shard_store_largest value=4
+- elasticsearch_thread_pool_fetch_shard_store_completed value=1
+- elasticsearch_thread_pool_fetch_shard_store_threads value=1
+- elasticsearch_thread_pool_management_threads value=2
+- elasticsearch_thread_pool_management_queue value=3
+- elasticsearch_thread_pool_management_active value=1
+- elasticsearch_thread_pool_management_rejected value=6
+- elasticsearch_thread_pool_management_largest value=2
+- elasticsearch_thread_pool_management_completed value=22
+- elasticsearch_thread_pool_percolate_queue value=23
+- elasticsearch_thread_pool_percolate_active value=13
+- elasticsearch_thread_pool_percolate_rejected value=235
+- elasticsearch_thread_pool_percolate_largest value=23
+- elasticsearch_thread_pool_percolate_completed value=33
+- elasticsearch_thread_pool_percolate_threads value=123
+- elasticsearch_thread_pool_listener_active value=4
+- elasticsearch_thread_pool_listener_rejected value=8
+- elasticsearch_thread_pool_listener_largest value=1
+- elasticsearch_thread_pool_listener_completed value=1
+- elasticsearch_thread_pool_listener_threads value=1
+- elasticsearch_thread_pool_listener_queue value=2
+- elasticsearch_thread_pool_search_rejected value=7
+- elasticsearch_thread_pool_search_largest value=2
+- elasticsearch_thread_pool_search_completed value=4
+- elasticsearch_thread_pool_search_threads value=5
+- elasticsearch_thread_pool_search_queue value=7
+- elasticsearch_thread_pool_search_active value=2
+- elasticsearch_thread_pool_fetch_shard_started_threads value=3
+- elasticsearch_thread_pool_fetch_shard_started_queue value=1
+- elasticsearch_thread_pool_fetch_shard_started_active value=5
+- elasticsearch_thread_pool_fetch_shard_started_rejected value=6
+- elasticsearch_thread_pool_fetch_shard_started_largest value=4
+- elasticsearch_thread_pool_fetch_shard_started_completed value=54
+- elasticsearch_thread_pool_refresh_rejected value=4
+- elasticsearch_thread_pool_refresh_largest value=8
+- elasticsearch_thread_pool_refresh_completed value=3
+- elasticsearch_thread_pool_refresh_threads value=23
+- elasticsearch_thread_pool_refresh_queue value=7
+- elasticsearch_thread_pool_refresh_active value=3
+- elasticsearch_thread_pool_optimize_threads value=3
+- elasticsearch_thread_pool_optimize_queue value=4
+- elasticsearch_thread_pool_optimize_active value=1
+- elasticsearch_thread_pool_optimize_rejected value=2
+- elasticsearch_thread_pool_optimize_largest value=7
+- elasticsearch_thread_pool_optimize_completed value=3
+- elasticsearch_thread_pool_snapshot_largest value=1
+- elasticsearch_thread_pool_snapshot_completed value=0
+- elasticsearch_thread_pool_snapshot_threads value=8
+- elasticsearch_thread_pool_snapshot_queue value=5
+- elasticsearch_thread_pool_snapshot_active value=6
+- elasticsearch_thread_pool_snapshot_rejected value=2
+- elasticsearch_thread_pool_generic_threads value=1
+- elasticsearch_thread_pool_generic_queue value=4
+- elasticsearch_thread_pool_generic_active value=6
+- elasticsearch_thread_pool_generic_rejected value=3
+- elasticsearch_thread_pool_generic_largest value=2
+- elasticsearch_thread_pool_generic_completed value=27
+- elasticsearch_thread_pool_flush_threads value=3
+- elasticsearch_thread_pool_flush_queue value=8
+- elasticsearch_thread_pool_flush_active value=0
+- elasticsearch_thread_pool_flush_rejected value=1
+- elasticsearch_thread_pool_flush_largest value=5
+- elasticsearch_thread_pool_flush_completed value=3

 Transport statistics about sent and received bytes in cluster communication measurement names:
- elasticsearch_transport
-  - server_open value=13
-  - rx_count value=6
-  - rx_size_in_bytes value=1380
-  - tx_count value=6
-  - tx_size_in_bytes value=1380
+- elasticsearch_transport_server_open value=13
+- elasticsearch_transport_rx_count value=6
+- elasticsearch_transport_rx_size_in_bytes value=1380
+- elasticsearch_transport_tx_count value=6
+- elasticsearch_transport_tx_size_in_bytes value=1380
--- a/plugins/inputs/elasticsearch/elasticsearch.go
+++ b/plugins/inputs/elasticsearch/elasticsearch.go
@@ -2,13 +2,14 @@ package elasticsearch

 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
+	"strings"
 	"sync"
 	"time"

 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	jsonparser "github.com/influxdata/telegraf/plugins/parsers/json"
 )
@@ -101,7 +102,7 @@ func (e *Elasticsearch) Description() string {
 // Gather reads the stats from Elasticsearch and writes it to the
 // Accumulator.
 func (e *Elasticsearch) Gather(acc telegraf.Accumulator) error {
-	errChan := errchan.New(len(e.Servers))
+	errChan := make(chan error, len(e.Servers))
 	var wg sync.WaitGroup
 	wg.Add(len(e.Servers))

@@ -115,7 +116,7 @@ func (e *Elasticsearch) Gather(acc telegraf.Accumulator) error {
 				url = s + statsPath
 			}
 			if err := e.gatherNodeStats(url, acc); err != nil {
-				errChan.C <- err
+				errChan <- err
 				return
 			}
 			if e.ClusterHealth {
@@ -125,7 +126,17 @@ func (e *Elasticsearch) Gather(acc telegraf.Accumulator) error {
 	}

 	wg.Wait()
-	return errChan.Error()
+	close(errChan)
+	// Get all errors and return them as one giant error
+	errStrings := []string{}
+	for err := range errChan {
+		errStrings = append(errStrings, err.Error())
+	}
+
+	if len(errStrings) == 0 {
+		return nil
+	}
+	return errors.New(strings.Join(errStrings, "\n"))
 }

 func (e *Elasticsearch) gatherNodeStats(url string, acc telegraf.Accumulator) error {
--- a/plugins/inputs/exec/README.md
+++ b/plugins/inputs/exec/README.md
@@ -6,20 +6,14 @@ Please also see: [Telegraf Input Data Formats](https://github.com/influxdata/tel

 #### Configuration

-In this example a script called ```/tmp/test.sh```, a script called ```/tmp/test2.sh```, and
-all scripts matching glob pattern ```/tmp/collect_*.sh``` are configured for ```[[inputs.exec]]```
-in JSON format. Glob patterns are matched on every run, so adding new scripts that match the pattern
-will cause them to be picked up immediately.
+In this example a script called ```/tmp/test.sh``` and a script called ```/tmp/test2.sh```
+are configured for ```[[inputs.exec]]``` in JSON format.

-```toml
+```
 # Read flattened metrics from one or more commands that output JSON to stdout
 [[inputs.exec]]
  # Shell/commands array
-  # Full command line to executable with parameters, or a glob pattern to run all matching files.
-  commands = ["/tmp/test.sh", "/tmp/test2.sh", "/tmp/collect_*.sh"]
-
-  ## Timeout for each command to complete.
-  timeout = "5s"
+  commands = ["/tmp/test.sh", "/tmp/test2.sh"]

  # Data format to consume.
  # NOTE json only reads numerical measurements, strings and booleans are ignored.
@@ -27,6 +21,26 @@ will cause them to be picked up immediately.

  # measurement name suffix (for separating different commands)
  name_suffix = "_mycollector"
+
+  ## Below configuration will be used for data_format = "graphite", can be ignored for other data_format
+  ## If matching multiple measurement files, this string will be used to join the matched values.
+  #separator = "."
+
+  ## Each template line requires a template pattern.  It can have an optional
+  ## filter before the template and separated by spaces.  It can also have optional extra
+  ## tags following the template.  Multiple tags should be separated by commas and no spaces
+  ## similar to the line protocol format.  The can be only one default template.
+  ## Templates support below format:
+  ## 1. filter + template
+  ## 2. filter + template + extra tag
+  ## 3. filter + template with field key
+  ## 4. default template
+  #templates = [
+  #  "*.app env.service.resource.measurement",
+  #  "stats.* .host.measurement* region=us-west,agent=sensu",
+  #  "stats2.* .host.measurement.field",
+  #  "measurement*"
+  #]
 ```

 Other options for modifying the measurement names are:
@@ -65,7 +79,7 @@ in influx line-protocol format.

 #### Configuration

-```toml
+```
 [[inputs.exec]]
  # Shell/commands array
  # compatible with old version
@@ -73,9 +87,6 @@ in influx line-protocol format.
  # command = "/usr/bin/line_protocol_collector"
  commands = ["/usr/bin/line_protocol_collector","/tmp/test2.sh"]

-  ## Timeout for each command to complete.
-  timeout = "5s"
-
  # Data format to consume.
  # NOTE json only reads numerical measurements, strings and booleans are ignored.
  data_format = "influx"
@@ -109,16 +120,12 @@ We can also change the data_format to "graphite" to use the metrics collecting s
 In this example a script called /tmp/test.sh and a script called /tmp/test2.sh are configured for [[inputs.exec]] in graphite format.

 #### Configuration
-
-```toml
+```
 # Read flattened metrics from one or more commands that output JSON to stdout
 [[inputs.exec]]
  # Shell/commands array
  commands = ["/tmp/test.sh","/tmp/test2.sh"]

-  ## Timeout for each command to complete.
-  timeout = "5s"
-
  # Data format to consume.
  # NOTE json only reads numerical measurements, strings and booleans are ignored.
  data_format = "graphite"
@@ -173,3 +180,4 @@ sensu.metric.net.server0.eth0.rx_dropped 0 1444234982
 The templates configuration will be used to parse the graphite metrics to support influxdb/opentsdb tagging store engines.

 More detail information about templates, please refer to [The graphite Input](https://github.com/influxdata/influxdb/blob/master/services/graphite/README.md)
+
--- a/plugins/inputs/exec/exec.go
+++ b/plugins/inputs/exec/exec.go
@@ -4,8 +4,6 @@ import (
 	"bytes"
 	"fmt"
 	"os/exec"
-	"path/filepath"
-	"strings"
 	"sync"
 	"syscall"
 	"time"
@@ -14,7 +12,6 @@ import (

 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
-	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"github.com/influxdata/telegraf/plugins/parsers"
 	"github.com/influxdata/telegraf/plugins/parsers/nagios"
@@ -22,11 +19,7 @@ import (

 const sampleConfig = `
  ## Commands array
-  commands = [
-    "/tmp/test.sh",
-    "/usr/bin/mycollector --foo=bar",
-    "/tmp/collect_*.sh"
-  ]
+  commands = ["/tmp/test.sh", "/usr/bin/mycollector --foo=bar"]

  ## Timeout for each command to complete.
  timeout = "5s"
@@ -157,41 +150,23 @@ func (e *Exec) Gather(acc telegraf.Accumulator) error {
 		e.Command = ""
 	}

-	commands := make([]string, 0, len(e.Commands))
-	for _, pattern := range e.Commands {
-		cmdAndArgs := strings.SplitN(pattern, " ", 2)
-		if len(cmdAndArgs) == 0 {
-			continue
-		}
+	e.errChan = make(chan error, len(e.Commands))

-		matches, err := filepath.Glob(cmdAndArgs[0])
-		if err != nil {
-			return err
-		}
-
-		if len(matches) == 0 {
-			// There were no matches with the glob pattern, so let's assume
-			// that the command is in PATH and just run it as it is
-			commands = append(commands, pattern)
-		} else {
-			// There were matches, so we'll append each match together with
-			// the arguments to the commands slice
-			for _, match := range matches {
-				commands = append(
-					commands, strings.Join([]string{match, cmdAndArgs[1]}, " "))
-			}
-		}
-	}
-
-	errChan := errchan.New(len(commands))
-	e.errChan = errChan.C
-
-	e.wg.Add(len(commands))
-	for _, command := range commands {
+	e.wg.Add(len(e.Commands))
+	for _, command := range e.Commands {
 		go e.ProcessCommand(command, acc)
 	}
 	e.wg.Wait()
-	return errChan.Error()
+
+	select {
+	default:
+		close(e.errChan)
+		return nil
+	case err := <-e.errChan:
+		close(e.errChan)
+		return err
+	}
+
 }

 func init() {
--- a/plugins/inputs/exec/exec_test.go
+++ b/plugins/inputs/exec/exec_test.go
@@ -169,51 +169,3 @@ func TestLineProtocolParseMultiple(t *testing.T) {
 		acc.AssertContainsTaggedFields(t, "cpu", fields, tags)
 	}
 }
-
-func TestExecCommandWithGlob(t *testing.T) {
-	parser, _ := parsers.NewValueParser("metric", "string", nil)
-	e := NewExec()
-	e.Commands = []string{"/bin/ech* metric_value"}
-	e.SetParser(parser)
-
-	var acc testutil.Accumulator
-	err := e.Gather(&acc)
-	require.NoError(t, err)
-
-	fields := map[string]interface{}{
-		"value": "metric_value",
-	}
-	acc.AssertContainsFields(t, "metric", fields)
-}
-
-func TestExecCommandWithoutGlob(t *testing.T) {
-	parser, _ := parsers.NewValueParser("metric", "string", nil)
-	e := NewExec()
-	e.Commands = []string{"/bin/echo metric_value"}
-	e.SetParser(parser)
-
-	var acc testutil.Accumulator
-	err := e.Gather(&acc)
-	require.NoError(t, err)
-
-	fields := map[string]interface{}{
-		"value": "metric_value",
-	}
-	acc.AssertContainsFields(t, "metric", fields)
-}
-
-func TestExecCommandWithoutGlobAndPath(t *testing.T) {
-	parser, _ := parsers.NewValueParser("metric", "string", nil)
-	e := NewExec()
-	e.Commands = []string{"echo metric_value"}
-	e.SetParser(parser)
-
-	var acc testutil.Accumulator
-	err := e.Gather(&acc)
-	require.NoError(t, err)
-
-	fields := map[string]interface{}{
-		"value": "metric_value",
-	}
-	acc.AssertContainsFields(t, "metric", fields)
-}
--- a/plugins/inputs/github_webhooks/github_webhooks.go
+++ b/plugins/inputs/github_webhooks/github_webhooks.go
@@ -91,12 +91,193 @@ func (gh *GithubWebhooks) eventHandler(w http.ResponseWriter, r *http.Request) {
 	w.WriteHeader(http.StatusOK)
 }

-func generateEvent(data []byte, event Event) (Event, error) {
-	err := json.Unmarshal(data, event)
+func newCommitComment(data []byte) (Event, error) {
+	commitCommentStruct := CommitCommentEvent{}
+	err := json.Unmarshal(data, &commitCommentStruct)
 	if err != nil {
 		return nil, err
 	}
-	return event, nil
+	return commitCommentStruct, nil
+}
+
+func newCreate(data []byte) (Event, error) {
+	createStruct := CreateEvent{}
+	err := json.Unmarshal(data, &createStruct)
+	if err != nil {
+		return nil, err
+	}
+	return createStruct, nil
+}
+
+func newDelete(data []byte) (Event, error) {
+	deleteStruct := DeleteEvent{}
+	err := json.Unmarshal(data, &deleteStruct)
+	if err != nil {
+		return nil, err
+	}
+	return deleteStruct, nil
+}
+
+func newDeployment(data []byte) (Event, error) {
+	deploymentStruct := DeploymentEvent{}
+	err := json.Unmarshal(data, &deploymentStruct)
+	if err != nil {
+		return nil, err
+	}
+	return deploymentStruct, nil
+}
+
+func newDeploymentStatus(data []byte) (Event, error) {
+	deploymentStatusStruct := DeploymentStatusEvent{}
+	err := json.Unmarshal(data, &deploymentStatusStruct)
+	if err != nil {
+		return nil, err
+	}
+	return deploymentStatusStruct, nil
+}
+
+func newFork(data []byte) (Event, error) {
+	forkStruct := ForkEvent{}
+	err := json.Unmarshal(data, &forkStruct)
+	if err != nil {
+		return nil, err
+	}
+	return forkStruct, nil
+}
+
+func newGollum(data []byte) (Event, error) {
+	gollumStruct := GollumEvent{}
+	err := json.Unmarshal(data, &gollumStruct)
+	if err != nil {
+		return nil, err
+	}
+	return gollumStruct, nil
+}
+
+func newIssueComment(data []byte) (Event, error) {
+	issueCommentStruct := IssueCommentEvent{}
+	err := json.Unmarshal(data, &issueCommentStruct)
+	if err != nil {
+		return nil, err
+	}
+	return issueCommentStruct, nil
+}
+
+func newIssues(data []byte) (Event, error) {
+	issuesStruct := IssuesEvent{}
+	err := json.Unmarshal(data, &issuesStruct)
+	if err != nil {
+		return nil, err
+	}
+	return issuesStruct, nil
+}
+
+func newMember(data []byte) (Event, error) {
+	memberStruct := MemberEvent{}
+	err := json.Unmarshal(data, &memberStruct)
+	if err != nil {
+		return nil, err
+	}
+	return memberStruct, nil
+}
+
+func newMembership(data []byte) (Event, error) {
+	membershipStruct := MembershipEvent{}
+	err := json.Unmarshal(data, &membershipStruct)
+	if err != nil {
+		return nil, err
+	}
+	return membershipStruct, nil
+}
+
+func newPageBuild(data []byte) (Event, error) {
+	pageBuildEvent := PageBuildEvent{}
+	err := json.Unmarshal(data, &pageBuildEvent)
+	if err != nil {
+		return nil, err
+	}
+	return pageBuildEvent, nil
+}
+
+func newPublic(data []byte) (Event, error) {
+	publicEvent := PublicEvent{}
+	err := json.Unmarshal(data, &publicEvent)
+	if err != nil {
+		return nil, err
+	}
+	return publicEvent, nil
+}
+
+func newPullRequest(data []byte) (Event, error) {
+	pullRequestStruct := PullRequestEvent{}
+	err := json.Unmarshal(data, &pullRequestStruct)
+	if err != nil {
+		return nil, err
+	}
+	return pullRequestStruct, nil
+}
+
+func newPullRequestReviewComment(data []byte) (Event, error) {
+	pullRequestReviewCommentStruct := PullRequestReviewCommentEvent{}
+	err := json.Unmarshal(data, &pullRequestReviewCommentStruct)
+	if err != nil {
+		return nil, err
+	}
+	return pullRequestReviewCommentStruct, nil
+}
+
+func newPush(data []byte) (Event, error) {
+	pushStruct := PushEvent{}
+	err := json.Unmarshal(data, &pushStruct)
+	if err != nil {
+		return nil, err
+	}
+	return pushStruct, nil
+}
+
+func newRelease(data []byte) (Event, error) {
+	releaseStruct := ReleaseEvent{}
+	err := json.Unmarshal(data, &releaseStruct)
+	if err != nil {
+		return nil, err
+	}
+	return releaseStruct, nil
+}
+
+func newRepository(data []byte) (Event, error) {
+	repositoryStruct := RepositoryEvent{}
+	err := json.Unmarshal(data, &repositoryStruct)
+	if err != nil {
+		return nil, err
+	}
+	return repositoryStruct, nil
+}
+
+func newStatus(data []byte) (Event, error) {
+	statusStruct := StatusEvent{}
+	err := json.Unmarshal(data, &statusStruct)
+	if err != nil {
+		return nil, err
+	}
+	return statusStruct, nil
+}
+
+func newTeamAdd(data []byte) (Event, error) {
+	teamAddStruct := TeamAddEvent{}
+	err := json.Unmarshal(data, &teamAddStruct)
+	if err != nil {
+		return nil, err
+	}
+	return teamAddStruct, nil
+}
+
+func newWatch(data []byte) (Event, error) {
+	watchStruct := WatchEvent{}
+	err := json.Unmarshal(data, &watchStruct)
+	if err != nil {
+		return nil, err
+	}
+	return watchStruct, nil
 }

 type newEventError struct {
@@ -107,51 +288,51 @@ func (e *newEventError) Error() string {
 	return e.s
 }

-func NewEvent(data []byte, name string) (Event, error) {
-	log.Printf("New %v event received", name)
-	switch name {
+func NewEvent(r []byte, t string) (Event, error) {
+	log.Printf("New %v event recieved", t)
+	switch t {
 	case "commit_comment":
-		return generateEvent(data, &CommitCommentEvent{})
+		return newCommitComment(r)
 	case "create":
-		return generateEvent(data, &CreateEvent{})
+		return newCreate(r)
 	case "delete":
-		return generateEvent(data, &DeleteEvent{})
+		return newDelete(r)
 	case "deployment":
-		return generateEvent(data, &DeploymentEvent{})
+		return newDeployment(r)
 	case "deployment_status":
-		return generateEvent(data, &DeploymentStatusEvent{})
+		return newDeploymentStatus(r)
 	case "fork":
-		return generateEvent(data, &ForkEvent{})
+		return newFork(r)
 	case "gollum":
-		return generateEvent(data, &GollumEvent{})
+		return newGollum(r)
 	case "issue_comment":
-		return generateEvent(data, &IssueCommentEvent{})
+		return newIssueComment(r)
 	case "issues":
-		return generateEvent(data, &IssuesEvent{})
+		return newIssues(r)
 	case "member":
-		return generateEvent(data, &MemberEvent{})
+		return newMember(r)
 	case "membership":
-		return generateEvent(data, &MembershipEvent{})
+		return newMembership(r)
 	case "page_build":
-		return generateEvent(data, &PageBuildEvent{})
+		return newPageBuild(r)
 	case "public":
-		return generateEvent(data, &PublicEvent{})
+		return newPublic(r)
 	case "pull_request":
-		return generateEvent(data, &PullRequestEvent{})
+		return newPullRequest(r)
 	case "pull_request_review_comment":
-		return generateEvent(data, &PullRequestReviewCommentEvent{})
+		return newPullRequestReviewComment(r)
 	case "push":
-		return generateEvent(data, &PushEvent{})
+		return newPush(r)
 	case "release":
-		return generateEvent(data, &ReleaseEvent{})
+		return newRelease(r)
 	case "repository":
-		return generateEvent(data, &RepositoryEvent{})
+		return newRepository(r)
 	case "status":
-		return generateEvent(data, &StatusEvent{})
+		return newStatus(r)
 	case "team_add":
-		return generateEvent(data, &TeamAddEvent{})
+		return newTeamAdd(r)
 	case "watch":
-		return generateEvent(data, &WatchEvent{})
+		return newWatch(r)
 	}
-	return nil, &newEventError{"Not a recognized event type"}
+	return nil, &newEventError{"Not a recgonized event type"}
 }
--- a/plugins/inputs/github_webhooks/github_webhooks_test.go
+++ b/plugins/inputs/github_webhooks/github_webhooks_test.go
@@ -7,89 +7,231 @@ import (
 	"testing"
 )

-func GithubWebhookRequest(event string, jsonString string, t *testing.T) {
+func TestCommitCommentEvent(t *testing.T) {
 	gh := NewGithubWebhooks()
+	jsonString := CommitCommentEventJSON()
 	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
-	req.Header.Add("X-Github-Event", event)
+	req.Header.Add("X-Github-Event", "commit_comment")
 	w := httptest.NewRecorder()
 	gh.eventHandler(w, req)
 	if w.Code != http.StatusOK {
-		t.Errorf("POST "+event+" returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
 	}
 }

-func TestCommitCommentEvent(t *testing.T) {
-	GithubWebhookRequest("commit_comment", CommitCommentEventJSON(), t)
-}
-
 func TestDeleteEvent(t *testing.T) {
-	GithubWebhookRequest("delete", DeleteEventJSON(), t)
+	gh := NewGithubWebhooks()
+	jsonString := DeleteEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "delete")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
 }

 func TestDeploymentEvent(t *testing.T) {
-	GithubWebhookRequest("deployment", DeploymentEventJSON(), t)
+	gh := NewGithubWebhooks()
+	jsonString := DeploymentEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "deployment")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
 }

 func TestDeploymentStatusEvent(t *testing.T) {
-	GithubWebhookRequest("deployment_status", DeploymentStatusEventJSON(), t)
+	gh := NewGithubWebhooks()
+	jsonString := DeploymentStatusEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "deployment_status")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
 }

 func TestForkEvent(t *testing.T) {
-	GithubWebhookRequest("fork", ForkEventJSON(), t)
+	gh := NewGithubWebhooks()
+	jsonString := ForkEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "fork")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
 }

 func TestGollumEvent(t *testing.T) {
-	GithubWebhookRequest("gollum", GollumEventJSON(), t)
+	gh := NewGithubWebhooks()
+	jsonString := GollumEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "gollum")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
 }

 func TestIssueCommentEvent(t *testing.T) {
-	GithubWebhookRequest("issue_comment", IssueCommentEventJSON(), t)
+	gh := NewGithubWebhooks()
+	jsonString := IssueCommentEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "issue_comment")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
 }

 func TestIssuesEvent(t *testing.T) {
-	GithubWebhookRequest("issues", IssuesEventJSON(), t)
+	gh := NewGithubWebhooks()
+	jsonString := IssuesEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "issues")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
 }

 func TestMemberEvent(t *testing.T) {
-	GithubWebhookRequest("member", MemberEventJSON(), t)
+	gh := NewGithubWebhooks()
+	jsonString := MemberEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "member")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
 }

 func TestMembershipEvent(t *testing.T) {
-	GithubWebhookRequest("membership", MembershipEventJSON(), t)
+	gh := NewGithubWebhooks()
+	jsonString := MembershipEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "membership")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
 }

 func TestPageBuildEvent(t *testing.T) {
-	GithubWebhookRequest("page_build", PageBuildEventJSON(), t)
+	gh := NewGithubWebhooks()
+	jsonString := PageBuildEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "page_build")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
 }

 func TestPublicEvent(t *testing.T) {
-	GithubWebhookRequest("public", PublicEventJSON(), t)
+	gh := NewGithubWebhooks()
+	jsonString := PublicEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "public")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
 }

 func TestPullRequestReviewCommentEvent(t *testing.T) {
-	GithubWebhookRequest("pull_request_review_comment", PullRequestReviewCommentEventJSON(), t)
+	gh := NewGithubWebhooks()
+	jsonString := PullRequestReviewCommentEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "pull_request_review_comment")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
 }

 func TestPushEvent(t *testing.T) {
-	GithubWebhookRequest("push", PushEventJSON(), t)
+	gh := NewGithubWebhooks()
+	jsonString := PushEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "push")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
 }

 func TestReleaseEvent(t *testing.T) {
-	GithubWebhookRequest("release", ReleaseEventJSON(), t)
+	gh := NewGithubWebhooks()
+	jsonString := ReleaseEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "release")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
 }

 func TestRepositoryEvent(t *testing.T) {
-	GithubWebhookRequest("repository", RepositoryEventJSON(), t)
+	gh := NewGithubWebhooks()
+	jsonString := RepositoryEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "repository")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
 }

 func TestStatusEvent(t *testing.T) {
-	GithubWebhookRequest("status", StatusEventJSON(), t)
+	gh := NewGithubWebhooks()
+
+	jsonString := StatusEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "status")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
 }

 func TestTeamAddEvent(t *testing.T) {
-	GithubWebhookRequest("team_add", TeamAddEventJSON(), t)
+	gh := NewGithubWebhooks()
+	jsonString := TeamAddEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "team_add")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
 }

 func TestWatchEvent(t *testing.T) {
-	GithubWebhookRequest("watch", WatchEventJSON(), t)
+	gh := NewGithubWebhooks()
+	jsonString := WatchEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "watch")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
 }
--- a/plugins/inputs/graylog/README.md
+++ b/plugins/inputs/graylog/README.md
@@ -1,55 +0,0 @@
-# GrayLog plugin
-
-The Graylog plugin can collect data from remote Graylog service URLs.
-
-Plugin currently support two type of end points:-
-
- multiple  (Ex http://[graylog-server-ip]:12900/system/metrics/multiple)
- namespace (Ex http://[graylog-server-ip]:12900/system/metrics/namespace/{namespace})
-
-End Point can be a mixe of one  multiple end point  and several namespaces end points
-
-
-Note: if namespace end point specified metrics array will be ignored for that call.
-
-### Configuration:
-
-```toml
-# Read flattened metrics from one or more GrayLog HTTP endpoints
-[[inputs.graylog]]
-  ## API endpoint, currently supported API:
-  ##
-  ##   - multiple  (Ex http://<host>:12900/system/metrics/multiple)
-  ##   - namespace (Ex http://<host>:12900/system/metrics/namespace/{namespace})
-  ##
-  ## For namespace endpoint, the metrics array will be ignored for that call.
-  ## Endpoint can contain namespace and multiple type calls.
-  ##
-  ## Please check http://[graylog-server-ip]:12900/api-browser for full list
-  ## of endpoints
-  servers = [
-    "http://[graylog-server-ip]:12900/system/metrics/multiple",
-  ]
-
-  ## Metrics list
-  ## List of metrics can be found on Graylog webservice documentation.
-  ## Or by hitting the the web service api at:
-  ##   http://[graylog-host]:12900/system/metrics
-  metrics = [
-    "jvm.cl.loaded",
-    "jvm.memory.pools.Metaspace.committed"
-  ]
-
-  ## Username and password
-  username = ""
-  password = ""
-
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
-  # insecure_skip_verify = false
-```
-
-Please refer to GrayLog metrics api browser for full metric end points http://host:12900/api-browser
--- a/plugins/inputs/graylog/graylog.go
+++ b/plugins/inputs/graylog/graylog.go
@@ -1,312 +0,0 @@
-package graylog
-
-import (
-	"bytes"
-	"encoding/base64"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"net"
-	"net/http"
-	"net/url"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal"
-	"github.com/influxdata/telegraf/plugins/inputs"
-)
-
-type ResponseMetrics struct {
-	total   int
-	Metrics []Metric `json:"metrics"`
-}
-
-type Metric struct {
-	FullName string                 `json:"full_name"`
-	Name     string                 `json:"name"`
-	Type     string                 `json:"type"`
-	Fields   map[string]interface{} `json:"metric"`
-}
-
-type GrayLog struct {
-	Servers  []string
-	Metrics  []string
-	Username string
-	Password string
-
-	// Path to CA file
-	SSLCA string `toml:"ssl_ca"`
-	// Path to host cert file
-	SSLCert string `toml:"ssl_cert"`
-	// Path to cert key file
-	SSLKey string `toml:"ssl_key"`
-	// Use SSL but skip chain & host verification
-	InsecureSkipVerify bool
-
-	client HTTPClient
-}
-
-type HTTPClient interface {
-	// Returns the result of an http request
-	//
-	// Parameters:
-	// req: HTTP request object
-	//
-	// Returns:
-	// http.Response:  HTTP respons object
-	// error        :  Any error that may have occurred
-	MakeRequest(req *http.Request) (*http.Response, error)
-
-	SetHTTPClient(client *http.Client)
-	HTTPClient() *http.Client
-}
-
-type Messagebody struct {
-	Metrics []string `json:"metrics"`
-}
-
-type RealHTTPClient struct {
-	client *http.Client
-}
-
-func (c *RealHTTPClient) MakeRequest(req *http.Request) (*http.Response, error) {
-	return c.client.Do(req)
-}
-
-func (c *RealHTTPClient) SetHTTPClient(client *http.Client) {
-	c.client = client
-}
-
-func (c *RealHTTPClient) HTTPClient() *http.Client {
-	return c.client
-}
-
-var sampleConfig = `
-  ## API endpoint, currently supported API:
-  ##
-  ##   - multiple  (Ex http://<host>:12900/system/metrics/multiple)
-  ##   - namespace (Ex http://<host>:12900/system/metrics/namespace/{namespace})
-  ##
-  ## For namespace endpoint, the metrics array will be ignored for that call.
-  ## Endpoint can contain namespace and multiple type calls.
-  ##
-  ## Please check http://[graylog-server-ip]:12900/api-browser for full list
-  ## of endpoints
-  servers = [
-    "http://[graylog-server-ip]:12900/system/metrics/multiple",
-  ]
-
-  ## Metrics list
-  ## List of metrics can be found on Graylog webservice documentation.
-  ## Or by hitting the the web service api at:
-  ##   http://[graylog-host]:12900/system/metrics
-  metrics = [
-    "jvm.cl.loaded",
-    "jvm.memory.pools.Metaspace.committed"
-  ]
-
-  ## Username and password
-  username = ""
-  password = ""
-
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
-  # insecure_skip_verify = false
-`
-
-func (h *GrayLog) SampleConfig() string {
-	return sampleConfig
-}
-
-func (h *GrayLog) Description() string {
-	return "Read flattened metrics from one or more GrayLog HTTP endpoints"
-}
-
-// Gathers data for all servers.
-func (h *GrayLog) Gather(acc telegraf.Accumulator) error {
-	var wg sync.WaitGroup
-
-	if h.client.HTTPClient() == nil {
-		tlsCfg, err := internal.GetTLSConfig(
-			h.SSLCert, h.SSLKey, h.SSLCA, h.InsecureSkipVerify)
-		if err != nil {
-			return err
-		}
-		tr := &http.Transport{
-			ResponseHeaderTimeout: time.Duration(3 * time.Second),
-			TLSClientConfig:       tlsCfg,
-		}
-		client := &http.Client{
-			Transport: tr,
-			Timeout:   time.Duration(4 * time.Second),
-		}
-		h.client.SetHTTPClient(client)
-	}
-
-	errorChannel := make(chan error, len(h.Servers))
-
-	for _, server := range h.Servers {
-		wg.Add(1)
-		go func(server string) {
-			defer wg.Done()
-			if err := h.gatherServer(acc, server); err != nil {
-				errorChannel <- err
-			}
-		}(server)
-	}
-
-	wg.Wait()
-	close(errorChannel)
-
-	// Get all errors and return them as one giant error
-	errorStrings := []string{}
-	for err := range errorChannel {
-		errorStrings = append(errorStrings, err.Error())
-	}
-
-	if len(errorStrings) == 0 {
-		return nil
-	}
-	return errors.New(strings.Join(errorStrings, "\n"))
-}
-
-// Gathers data from a particular server
-// Parameters:
-//     acc      : The telegraf Accumulator to use
-//     serverURL: endpoint to send request to
-//     service  : the service being queried
-//
-// Returns:
-//     error: Any error that may have occurred
-func (h *GrayLog) gatherServer(
-	acc telegraf.Accumulator,
-	serverURL string,
-) error {
-	resp, _, err := h.sendRequest(serverURL)
-	if err != nil {
-		return err
-	}
-	requestURL, err := url.Parse(serverURL)
-	host, port, _ := net.SplitHostPort(requestURL.Host)
-	var dat ResponseMetrics
-	if err != nil {
-		return err
-	}
-	if err := json.Unmarshal([]byte(resp), &dat); err != nil {
-		return err
-	}
-	for _, m_item := range dat.Metrics {
-		fields := make(map[string]interface{})
-		tags := map[string]string{
-			"server": host,
-			"port":   port,
-			"name":   m_item.Name,
-			"type":   m_item.Type,
-		}
-		h.flatten(m_item.Fields, fields, "")
-		acc.AddFields(m_item.FullName, fields, tags)
-	}
-	return nil
-}
-
-// Flatten JSON hierarchy to produce field name and field value
-// Parameters:
-//    item: Item map to flatten
-//    fields: Map to store generated fields.
-//    id: Prefix for top level metric (empty string "")
-// Returns:
-//    void
-func (h *GrayLog) flatten(item map[string]interface{}, fields map[string]interface{}, id string) {
-	if id != "" {
-		id = id + "_"
-	}
-	for k, i := range item {
-		switch i.(type) {
-		case int:
-			fields[id+k] = i.(float64)
-		case float64:
-			fields[id+k] = i.(float64)
-		case map[string]interface{}:
-			h.flatten(i.(map[string]interface{}), fields, id+k)
-		default:
-		}
-	}
-}
-
-// Sends an HTTP request to the server using the GrayLog object's HTTPClient.
-// Parameters:
-//     serverURL: endpoint to send request to
-//
-// Returns:
-//     string: body of the response
-//     error : Any error that may have occurred
-func (h *GrayLog) sendRequest(serverURL string) (string, float64, error) {
-	headers := map[string]string{
-		"Content-Type": "application/json",
-		"Accept":       "application/json",
-	}
-	method := "GET"
-	content := bytes.NewBufferString("")
-	headers["Authorization"] = "Basic " + base64.URLEncoding.EncodeToString([]byte(h.Username+":"+h.Password))
-	// Prepare URL
-	requestURL, err := url.Parse(serverURL)
-	if err != nil {
-		return "", -1, fmt.Errorf("Invalid server URL \"%s\"", serverURL)
-	}
-	if strings.Contains(requestURL.String(), "multiple") {
-		m := &Messagebody{Metrics: h.Metrics}
-		http_body, err := json.Marshal(m)
-		if err != nil {
-			return "", -1, fmt.Errorf("Invalid list of Metrics %s", h.Metrics)
-		}
-		method = "POST"
-		content = bytes.NewBuffer(http_body)
-	}
-	req, err := http.NewRequest(method, requestURL.String(), content)
-	if err != nil {
-		return "", -1, err
-	}
-	// Add header parameters
-	for k, v := range headers {
-		req.Header.Add(k, v)
-	}
-	start := time.Now()
-	resp, err := h.client.MakeRequest(req)
-	if err != nil {
-		return "", -1, err
-	}
-
-	defer resp.Body.Close()
-	responseTime := time.Since(start).Seconds()
-
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return string(body), responseTime, err
-	}
-
-	// Process response
-	if resp.StatusCode != http.StatusOK {
-		err = fmt.Errorf("Response from url \"%s\" has status code %d (%s), expected %d (%s)",
-			requestURL.String(),
-			resp.StatusCode,
-			http.StatusText(resp.StatusCode),
-			http.StatusOK,
-			http.StatusText(http.StatusOK))
-		return string(body), responseTime, err
-	}
-	return string(body), responseTime, err
-}
-
-func init() {
-	inputs.Add("graylog", func() telegraf.Input {
-		return &GrayLog{
-			client: &RealHTTPClient{},
-		}
-	})
-}
--- a/plugins/inputs/graylog/graylog_test.go
+++ b/plugins/inputs/graylog/graylog_test.go
@@ -1,199 +0,0 @@
-package graylog
-
-import (
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/influxdata/telegraf/testutil"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-const validJSON = `
-  {
-    "total": 3,
-    "metrics": [
-      {
-        "full_name": "jvm.cl.loaded",
-        "metric": {
-          "value": 18910
-        },
-        "name": "loaded",
-        "type": "gauge"
-      },
-      {
-        "full_name": "jvm.memory.pools.Metaspace.committed",
-        "metric": {
-          "value": 108040192
-        },
-        "name": "committed",
-        "type": "gauge"
-      },
-      {
-        "full_name": "org.graylog2.shared.journal.KafkaJournal.writeTime",
-        "metric": {
-          "time": {
-            "min": 99
-          },
-          "rate": {
-            "total": 10,
-            "mean": 2
-          },
-          "duration_unit": "microseconds",
-          "rate_unit": "events/second"
-        },
-        "name": "writeTime",
-        "type": "hdrtimer"
-      }
-    ]
-  }`
-
-var validTags = map[string]map[string]string{
-	"jvm.cl.loaded": {
-		"name":   "loaded",
-		"type":   "gauge",
-		"port":   "12900",
-		"server": "localhost",
-	},
-	"jvm.memory.pools.Metaspace.committed": {
-		"name":   "committed",
-		"type":   "gauge",
-		"port":   "12900",
-		"server": "localhost",
-	},
-	"org.graylog2.shared.journal.KafkaJournal.writeTime": {
-		"name":   "writeTime",
-		"type":   "hdrtimer",
-		"port":   "12900",
-		"server": "localhost",
-	},
-}
-
-var expectedFields = map[string]map[string]interface{}{
-	"jvm.cl.loaded": {
-		"value": float64(18910),
-	},
-	"jvm.memory.pools.Metaspace.committed": {
-		"value": float64(108040192),
-	},
-	"org.graylog2.shared.journal.KafkaJournal.writeTime": {
-		"time_min":   float64(99),
-		"rate_total": float64(10),
-		"rate_mean":  float64(2),
-	},
-}
-
-const invalidJSON = "I don't think this is JSON"
-
-const empty = ""
-
-type mockHTTPClient struct {
-	responseBody string
-	statusCode   int
-}
-
-// Mock implementation of MakeRequest. Usually returns an http.Response with
-// hard-coded responseBody and statusCode. However, if the request uses a
-// nonstandard method, it uses status code 405 (method not allowed)
-func (c *mockHTTPClient) MakeRequest(req *http.Request) (*http.Response, error) {
-	resp := http.Response{}
-	resp.StatusCode = c.statusCode
-
-	// basic error checking on request method
-	allowedMethods := []string{"GET", "HEAD", "POST", "PUT", "DELETE", "TRACE", "CONNECT"}
-	methodValid := false
-	for _, method := range allowedMethods {
-		if req.Method == method {
-			methodValid = true
-			break
-		}
-	}
-
-	if !methodValid {
-		resp.StatusCode = 405 // Method not allowed
-	}
-
-	resp.Body = ioutil.NopCloser(strings.NewReader(c.responseBody))
-	return &resp, nil
-}
-
-func (c *mockHTTPClient) SetHTTPClient(_ *http.Client) {
-}
-
-func (c *mockHTTPClient) HTTPClient() *http.Client {
-	return nil
-}
-
-// Generates a pointer to an HttpJson object that uses a mock HTTP client.
-// Parameters:
-//     response  : Body of the response that the mock HTTP client should return
-//     statusCode: HTTP status code the mock HTTP client should return
-//
-// Returns:
-//     *HttpJson: Pointer to an HttpJson object that uses the generated mock HTTP client
-func genMockGrayLog(response string, statusCode int) []*GrayLog {
-	return []*GrayLog{
-		&GrayLog{
-			client: &mockHTTPClient{responseBody: response, statusCode: statusCode},
-			Servers: []string{
-				"http://localhost:12900/system/metrics/multiple",
-			},
-			Metrics: []string{
-				"jvm.memory.pools.Metaspace.committed",
-				"jvm.cl.loaded",
-				"org.graylog2.shared.journal.KafkaJournal.writeTime",
-			},
-			Username: "test",
-			Password: "test",
-		},
-	}
-}
-
-// Test that the proper values are ignored or collected
-func TestNormalResponse(t *testing.T) {
-	graylog := genMockGrayLog(validJSON, 200)
-
-	for _, service := range graylog {
-		var acc testutil.Accumulator
-		err := service.Gather(&acc)
-		require.NoError(t, err)
-		for k, v := range expectedFields {
-			acc.AssertContainsTaggedFields(t, k, v, validTags[k])
-		}
-	}
-}
-
-// Test response to HTTP 500
-func TestHttpJson500(t *testing.T) {
-	graylog := genMockGrayLog(validJSON, 500)
-
-	var acc testutil.Accumulator
-	err := graylog[0].Gather(&acc)
-
-	assert.NotNil(t, err)
-	assert.Equal(t, 0, acc.NFields())
-}
-
-// Test response to malformed JSON
-func TestHttpJsonBadJson(t *testing.T) {
-	graylog := genMockGrayLog(invalidJSON, 200)
-
-	var acc testutil.Accumulator
-	err := graylog[0].Gather(&acc)
-
-	assert.NotNil(t, err)
-	assert.Equal(t, 0, acc.NFields())
-}
-
-// Test response to empty string as response objectgT
-func TestHttpJsonEmptyResponse(t *testing.T) {
-	graylog := genMockGrayLog(empty, 200)
-
-	var acc testutil.Accumulator
-	err := graylog[0].Gather(&acc)
-
-	assert.NotNil(t, err)
-	assert.Equal(t, 0, acc.NFields())
-}
--- a/plugins/inputs/haproxy/haproxy.go
+++ b/plugins/inputs/haproxy/haproxy.go
@@ -3,6 +3,8 @@ package haproxy
 import (
 	"encoding/csv"
 	"fmt"
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
 	"io"
 	"net"
 	"net/http"
@@ -11,10 +13,6 @@ import (
 	"strings"
 	"sync"
 	"time"
-
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal/errchan"
-	"github.com/influxdata/telegraf/plugins/inputs"
 )

 //CSV format: https://cbonte.github.io/haproxy-dconv/configuration-1.5.html#9.1
@@ -115,17 +113,20 @@ func (g *haproxy) Gather(acc telegraf.Accumulator) error {
 	}

 	var wg sync.WaitGroup
-	errChan := errchan.New(len(g.Servers))
-	wg.Add(len(g.Servers))
-	for _, server := range g.Servers {
+
+	var outerr error
+
+	for _, serv := range g.Servers {
+		wg.Add(1)
 		go func(serv string) {
 			defer wg.Done()
-			errChan.C <- g.gatherServer(serv, acc)
-		}(server)
+			outerr = g.gatherServer(serv, acc)
+		}(serv)
 	}

 	wg.Wait()
-	return errChan.Error()
+
+	return outerr
 }

 func (g *haproxy) gatherServerSocket(addr string, acc telegraf.Accumulator) error {
--- a/plugins/inputs/http_response/README.md
+++ b/plugins/inputs/http_response/README.md
@@ -5,30 +5,23 @@ This input plugin will test HTTP/HTTPS connections.
 ### Configuration:

 ```
-# HTTP/HTTPS request given an address a method and a timeout
+# List of UDP/TCP connections you want to check
 [[inputs.http_response]]
  ## Server address (default http://localhost)
  address = "http://github.com"
  ## Set response_timeout (default 5 seconds)
-  response_timeout = "5s"
+  response_timeout = 5
  ## HTTP Request Method
  method = "GET"
+  ## HTTP Request Headers
+  [inputs.http_response.headers]
+      Host = github.com
  ## Whether to follow redirects from the server (defaults to false)
  follow_redirects = true
-  ## HTTP Request Headers (all values must be strings)
-  # [inputs.http_response.headers]
-  #   Host = "github.com"
  ## Optional HTTP Request Body
-  # body = '''
-  # {'fake':'data'}
-  # '''
-
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
-  # insecure_skip_verify = false
+  body = '''
+  {'fake':'data'}
+  '''
 ```

 ### Measurements & Fields:
--- a/plugins/inputs/http_response/http_response.go
+++ b/plugins/inputs/http_response/http_response.go
@@ -9,7 +9,6 @@ import (
 	"time"

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

@@ -18,18 +17,9 @@ type HTTPResponse struct {
 	Address         string
 	Body            string
 	Method          string
-	ResponseTimeout internal.Duration
+	ResponseTimeout int
 	Headers         map[string]string
 	FollowRedirects bool
-
-	// Path to CA file
-	SSLCA string `toml:"ssl_ca"`
-	// Path to host cert file
-	SSLCert string `toml:"ssl_cert"`
-	// Path to cert key file
-	SSLKey string `toml:"ssl_key"`
-	// Use SSL but skip chain & host verification
-	InsecureSkipVerify bool
 }

 // Description returns the plugin Description
@@ -41,7 +31,7 @@ var sampleConfig = `
  ## Server address (default http://localhost)
  address = "http://github.com"
  ## Set response_timeout (default 5 seconds)
-  response_timeout = "5s"
+  response_timeout = 5
  ## HTTP Request Method
  method = "GET"
  ## Whether to follow redirects from the server (defaults to false)
@@ -53,13 +43,6 @@ var sampleConfig = `
  # body = '''
  # {'fake':'data'}
  # '''
-
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
-  # insecure_skip_verify = false
 `

 // SampleConfig returns the plugin SampleConfig
@@ -72,27 +55,27 @@ var ErrRedirectAttempted = errors.New("redirect")

 // CreateHttpClient creates an http client which will timeout at the specified
 // timeout period and can follow redirects if specified
-func (h *HTTPResponse) createHttpClient() (*http.Client, error) {
-	tlsCfg, err := internal.GetTLSConfig(
-		h.SSLCert, h.SSLKey, h.SSLCA, h.InsecureSkipVerify)
-	if err != nil {
-		return nil, err
-	}
-	tr := &http.Transport{
-		ResponseHeaderTimeout: h.ResponseTimeout.Duration,
-		TLSClientConfig:       tlsCfg,
-	}
+func CreateHttpClient(followRedirects bool, ResponseTimeout time.Duration) *http.Client {
 	client := &http.Client{
-		Transport: tr,
-		Timeout:   h.ResponseTimeout.Duration,
+		Timeout: time.Second * ResponseTimeout,
 	}

-	if h.FollowRedirects == false {
+	if followRedirects == false {
 		client.CheckRedirect = func(req *http.Request, via []*http.Request) error {
 			return ErrRedirectAttempted
 		}
 	}
-	return client, nil
+	return client
+}
+
+// CreateHeaders takes a map of header strings and puts them
+// into a http.Header Object
+func CreateHeaders(headers map[string]string) http.Header {
+	httpHeaders := make(http.Header)
+	for key := range headers {
+		httpHeaders.Add(key, headers[key])
+	}
+	return httpHeaders
 }

 // HTTPGather gathers all fields and returns any errors it encounters
@@ -100,10 +83,7 @@ func (h *HTTPResponse) HTTPGather() (map[string]interface{}, error) {
 	// Prepare fields
 	fields := make(map[string]interface{})

-	client, err := h.createHttpClient()
-	if err != nil {
-		return nil, err
-	}
+	client := CreateHttpClient(h.FollowRedirects, time.Duration(h.ResponseTimeout))

 	var body io.Reader
 	if h.Body != "" {
@@ -113,13 +93,7 @@ func (h *HTTPResponse) HTTPGather() (map[string]interface{}, error) {
 	if err != nil {
 		return nil, err
 	}
-
-	for key, val := range h.Headers {
-		request.Header.Add(key, val)
-		if key == "Host" {
-			request.Host = val
-		}
-	}
+	request.Header = CreateHeaders(h.Headers)

 	// Start Timer
 	start := time.Now()
@@ -143,8 +117,8 @@ func (h *HTTPResponse) HTTPGather() (map[string]interface{}, error) {
 // Gather gets all metric fields and tags and returns any errors it encounters
 func (h *HTTPResponse) Gather(acc telegraf.Accumulator) error {
 	// Set default values
-	if h.ResponseTimeout.Duration < time.Second {
-		h.ResponseTimeout.Duration = time.Second * 5
+	if h.ResponseTimeout < 1 {
+		h.ResponseTimeout = 5
 	}
 	// Check send and expected string
 	if h.Method == "" {
--- a/plugins/inputs/http_response/http_response_test.go
+++ b/plugins/inputs/http_response/http_response_test.go
@@ -2,18 +2,29 @@ package http_response

 import (
 	"fmt"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"testing"
 	"time"
-
-	"github.com/influxdata/telegraf/internal"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )

+func TestCreateHeaders(t *testing.T) {
+	fakeHeaders := map[string]string{
+		"Accept":        "text/plain",
+		"Content-Type":  "application/json",
+		"Cache-Control": "no-cache",
+	}
+	headers := CreateHeaders(fakeHeaders)
+	testHeaders := make(http.Header)
+	testHeaders.Add("Accept", "text/plain")
+	testHeaders.Add("Content-Type", "application/json")
+	testHeaders.Add("Cache-Control", "no-cache")
+	assert.Equal(t, testHeaders, headers)
+}
+
 func setUpTestMux() http.Handler {
 	mux := http.NewServeMux()
 	mux.HandleFunc("/redirect", func(w http.ResponseWriter, req *http.Request) {
@@ -52,33 +63,6 @@ func setUpTestMux() http.Handler {
 	return mux
 }

-func TestHeaders(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		cHeader := r.Header.Get("Content-Type")
-		assert.Equal(t, "Hello", r.Host)
-		assert.Equal(t, "application/json", cHeader)
-		w.WriteHeader(http.StatusOK)
-	}))
-	defer ts.Close()
-
-	h := &HTTPResponse{
-		Address:         ts.URL,
-		Method:          "GET",
-		ResponseTimeout: internal.Duration{Duration: time.Second * 2},
-		Headers: map[string]string{
-			"Content-Type": "application/json",
-			"Host":         "Hello",
-		},
-	}
-	fields, err := h.HTTPGather()
-	require.NoError(t, err)
-	assert.NotEmpty(t, fields)
-	if assert.NotNil(t, fields["http_response_code"]) {
-		assert.Equal(t, http.StatusOK, fields["http_response_code"])
-	}
-	assert.NotNil(t, fields["response_time"])
-}
-
 func TestFields(t *testing.T) {
 	mux := setUpTestMux()
 	ts := httptest.NewServer(mux)
@@ -88,7 +72,7 @@ func TestFields(t *testing.T) {
 		Address:         ts.URL + "/good",
 		Body:            "{ 'test': 'data'}",
 		Method:          "GET",
-		ResponseTimeout: internal.Duration{Duration: time.Second * 20},
+		ResponseTimeout: 20,
 		Headers: map[string]string{
 			"Content-Type": "application/json",
 		},
@@ -101,6 +85,7 @@ func TestFields(t *testing.T) {
 		assert.Equal(t, http.StatusOK, fields["http_response_code"])
 	}
 	assert.NotNil(t, fields["response_time"])
+
 }

 func TestRedirects(t *testing.T) {
@@ -112,7 +97,7 @@ func TestRedirects(t *testing.T) {
 		Address:         ts.URL + "/redirect",
 		Body:            "{ 'test': 'data'}",
 		Method:          "GET",
-		ResponseTimeout: internal.Duration{Duration: time.Second * 20},
+		ResponseTimeout: 20,
 		Headers: map[string]string{
 			"Content-Type": "application/json",
 		},
@@ -129,7 +114,7 @@ func TestRedirects(t *testing.T) {
 		Address:         ts.URL + "/badredirect",
 		Body:            "{ 'test': 'data'}",
 		Method:          "GET",
-		ResponseTimeout: internal.Duration{Duration: time.Second * 20},
+		ResponseTimeout: 20,
 		Headers: map[string]string{
 			"Content-Type": "application/json",
 		},
@@ -148,7 +133,7 @@ func TestMethod(t *testing.T) {
 		Address:         ts.URL + "/mustbepostmethod",
 		Body:            "{ 'test': 'data'}",
 		Method:          "POST",
-		ResponseTimeout: internal.Duration{Duration: time.Second * 20},
+		ResponseTimeout: 20,
 		Headers: map[string]string{
 			"Content-Type": "application/json",
 		},
@@ -165,7 +150,7 @@ func TestMethod(t *testing.T) {
 		Address:         ts.URL + "/mustbepostmethod",
 		Body:            "{ 'test': 'data'}",
 		Method:          "GET",
-		ResponseTimeout: internal.Duration{Duration: time.Second * 20},
+		ResponseTimeout: 20,
 		Headers: map[string]string{
 			"Content-Type": "application/json",
 		},
@@ -183,7 +168,7 @@ func TestMethod(t *testing.T) {
 		Address:         ts.URL + "/mustbepostmethod",
 		Body:            "{ 'test': 'data'}",
 		Method:          "head",
-		ResponseTimeout: internal.Duration{Duration: time.Second * 20},
+		ResponseTimeout: 20,
 		Headers: map[string]string{
 			"Content-Type": "application/json",
 		},
@@ -206,7 +191,7 @@ func TestBody(t *testing.T) {
 		Address:         ts.URL + "/musthaveabody",
 		Body:            "{ 'test': 'data'}",
 		Method:          "GET",
-		ResponseTimeout: internal.Duration{Duration: time.Second * 20},
+		ResponseTimeout: 20,
 		Headers: map[string]string{
 			"Content-Type": "application/json",
 		},
@@ -222,7 +207,7 @@ func TestBody(t *testing.T) {
 	h = &HTTPResponse{
 		Address:         ts.URL + "/musthaveabody",
 		Method:          "GET",
-		ResponseTimeout: internal.Duration{Duration: time.Second * 20},
+		ResponseTimeout: 20,
 		Headers: map[string]string{
 			"Content-Type": "application/json",
 		},
@@ -245,7 +230,7 @@ func TestTimeout(t *testing.T) {
 		Address:         ts.URL + "/twosecondnap",
 		Body:            "{ 'test': 'data'}",
 		Method:          "GET",
-		ResponseTimeout: internal.Duration{Duration: time.Second * 1},
+		ResponseTimeout: 1,
 		Headers: map[string]string{
 			"Content-Type": "application/json",
 		},
--- a/plugins/inputs/igloo/README.md
+++ b/plugins/inputs/igloo/README.md
@@ -0,0 +1,23 @@
+# igloo Input Plugin
+
+The igloo plugin "tails" a logfile and parses each log message.
+
+By default, the igloo plugin acts like the following unix tail command:
+
+```
+tail -F --lines=0 myfile.log
+```
+
+- `-F` means that it will follow the _name_ of the given file, so
+that it will be compatible with log-rotated files, and that it will retry on
+inaccessible files.
+- `--lines=0` means that it will start at the end of the file (unless
+the `from_beginning` option is set).
+
+see http://man7.org/linux/man-pages/man1/tail.1.html for more details.
+
+### Configuration:
+
+```toml
+```
+
--- a/plugins/inputs/igloo/igloo.go
+++ b/plugins/inputs/igloo/igloo.go
@@ -0,0 +1,331 @@
+package igloo
+
+import (
+	"fmt"
+	"log"
+	"regexp"
+	"sort"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/hpcloud/tail"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal/globpath"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+// format of timestamps
+const (
+	rfcFormat string = "%s-%s-%sT%s:%s:%s.%sZ"
+)
+
+var (
+	// regex for finding timestamps
+	tRe = regexp.MustCompile(`Timestamp=((\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2}),(\d+))`)
+)
+
+type Tail struct {
+	Files         []string
+	FromBeginning bool
+	TagKeys       []string
+	Counters      []string
+	NumFields     []string
+	StrFields     []string
+
+	numfieldsRe map[string]*regexp.Regexp
+	strfieldsRe map[string]*regexp.Regexp
+	countersRe  map[string]*regexp.Regexp
+	tagsRe      map[string]*regexp.Regexp
+
+	counters map[string]map[string]int64
+
+	tailers []*tail.Tail
+	wg      sync.WaitGroup
+	acc     telegraf.Accumulator
+
+	sync.Mutex
+}
+
+func NewTail() *Tail {
+	return &Tail{
+		FromBeginning: false,
+	}
+}
+
+const sampleConfig = `
+  ## logfiles 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" -> just tail the apache log file
+  ##
+  ## See https://github.com/gobwas/glob for more examples
+  ##
+  files = ["$HOME/sample.log"]
+  ## Read file from beginning.
+  from_beginning = false
+
+  ## Each log message is searched for these tag keys in TagKey=Value format.
+  ## Any that are found will be tagged on the resulting influx measurements.
+  tag_keys = [
+    "HostLocal",
+    "ProductName",
+    "OperationName",
+  ]
+
+  ## counters are keys which are treated as counters.
+  ##   so if counters = ["Result"], then this means that the following ocurrence
+  ##   on a log line:
+  ##     Result=Success
+  ##   would be treated as a counter: Result_Success, and it will be incremented
+  ##   for every occurrence, until Telegraf is restarted.
+  counters   = ["Result"]
+  ## num_fields are log line occurrences that are translated into numerical
+  ## fields. ie:
+  ##   Duration=1
+  num_fields = ["Duration", "Attempt"]
+  ## str_fields are log line occurences that are translated into string fields,
+  ## ie:
+  ##   ActivityGUID=0bb03bf4-ae1d-4487-bb6f-311653b35760
+  str_fields = ["ActivityGUID"]
+`
+
+func (t *Tail) SampleConfig() string {
+	return sampleConfig
+}
+
+func (t *Tail) Description() string {
+	return "Stream an igloo file, like the tail -f command"
+}
+
+func (t *Tail) Gather(acc telegraf.Accumulator) error {
+	return nil
+}
+
+func (t *Tail) buildRegexes() error {
+	t.numfieldsRe = make(map[string]*regexp.Regexp)
+	t.strfieldsRe = make(map[string]*regexp.Regexp)
+	t.tagsRe = make(map[string]*regexp.Regexp)
+	t.countersRe = make(map[string]*regexp.Regexp)
+	t.counters = make(map[string]map[string]int64)
+
+	for _, field := range t.NumFields {
+		re, err := regexp.Compile(field + `=([0-9\.]+)`)
+		if err != nil {
+			return err
+		}
+		t.numfieldsRe[field] = re
+	}
+
+	for _, field := range t.StrFields {
+		re, err := regexp.Compile(field + `=([0-9a-zA-Z\.\-]+)`)
+		if err != nil {
+			return err
+		}
+		t.strfieldsRe[field] = re
+	}
+
+	for _, field := range t.TagKeys {
+		re, err := regexp.Compile(field + `=([0-9a-zA-Z\.\-]+)`)
+		if err != nil {
+			return err
+		}
+		t.tagsRe[field] = re
+	}
+
+	for _, field := range t.Counters {
+		re, err := regexp.Compile("(" + field + ")" + `=([0-9a-zA-Z\.\-]+)`)
+		if err != nil {
+			return err
+		}
+		t.countersRe[field] = re
+	}
+
+	return nil
+}
+
+func (t *Tail) Start(acc telegraf.Accumulator) error {
+	t.Lock()
+	defer t.Unlock()
+
+	t.acc = acc
+	if err := t.buildRegexes(); err != nil {
+		return err
+	}
+
+	var seek tail.SeekInfo
+	if !t.FromBeginning {
+		seek.Whence = 2
+		seek.Offset = 0
+	}
+
+	var errS string
+	// Create a "tailer" for each file
+	for _, filepath := range t.Files {
+		g, err := globpath.Compile(filepath)
+		if err != nil {
+			log.Printf("ERROR Glob %s failed to compile, %s", filepath, err)
+		}
+		for file, _ := range g.Match() {
+			tailer, err := tail.TailFile(file,
+				tail.Config{
+					ReOpen:   true,
+					Follow:   true,
+					Location: &seek,
+				})
+			if err != nil {
+				errS += err.Error() + " "
+				continue
+			}
+			// create a goroutine for each "tailer"
+			go t.receiver(tailer)
+			t.tailers = append(t.tailers, tailer)
+		}
+	}
+
+	if errS != "" {
+		return fmt.Errorf(errS)
+	}
+	return nil
+}
+
+// this is launched as a goroutine to continuously watch a tailed logfile
+// for changes, parse any incoming msgs, and add to the accumulator.
+func (t *Tail) receiver(tailer *tail.Tail) {
+	t.wg.Add(1)
+	defer t.wg.Done()
+
+	var err error
+	var line *tail.Line
+	for line = range tailer.Lines {
+		if line.Err != nil {
+			log.Printf("ERROR tailing file %s, Error: %s\n",
+				tailer.Filename, err)
+			continue
+		}
+		err = t.Parse(line.Text)
+		if err != nil {
+			log.Printf("ERROR: %s", err)
+		}
+	}
+}
+
+func (t *Tail) Parse(line string) error {
+	// find the timestamp:
+	match := tRe.FindAllStringSubmatch(line, -1)
+	if len(match) < 1 {
+		return nil
+	}
+	if len(match[0]) < 9 {
+		return nil
+	}
+	// make an rfc3339 timestamp and parse it:
+	ts, err := time.Parse(time.RFC3339Nano,
+		fmt.Sprintf(rfcFormat, match[0][2], match[0][3], match[0][4], match[0][5], match[0][6], match[0][7], match[0][8]))
+	if err != nil {
+		return nil
+	}
+
+	fields := make(map[string]interface{})
+	tags := make(map[string]string)
+
+	// parse numerical fields:
+	for name, re := range t.numfieldsRe {
+		match := re.FindAllStringSubmatch(line, -1)
+		if len(match) < 1 {
+			continue
+		}
+		if len(match[0]) < 2 {
+			continue
+		}
+		num, err := strconv.ParseFloat(match[0][1], 64)
+		if err == nil {
+			fields[name] = num
+		}
+	}
+
+	// parse string fields:
+	for name, re := range t.strfieldsRe {
+		match := re.FindAllStringSubmatch(line, -1)
+		if len(match) < 1 {
+			continue
+		}
+		if len(match[0]) < 2 {
+			continue
+		}
+		fields[name] = match[0][1]
+	}
+
+	// parse tags:
+	for name, re := range t.tagsRe {
+		match := re.FindAllStringSubmatch(line, -1)
+		if len(match) < 1 {
+			continue
+		}
+		if len(match[0]) < 2 {
+			continue
+		}
+		tags[name] = match[0][1]
+	}
+
+	if len(t.countersRe) > 0 {
+		// Make a unique key for the measurement name/tags
+		var tg []string
+		for k, v := range tags {
+			tg = append(tg, fmt.Sprintf("%s=%s", k, v))
+		}
+		sort.Strings(tg)
+		hash := fmt.Sprintf("%s%s", strings.Join(tg, ""), "igloo")
+
+		// check if this hash already has a counter map
+		_, ok := t.counters[hash]
+		if !ok {
+			// doesnt have counter map, so make one
+			t.counters[hash] = make(map[string]int64)
+		}
+
+		// search for counter matches:
+		for _, re := range t.countersRe {
+			match := re.FindAllStringSubmatch(line, -1)
+			if len(match) < 1 {
+				continue
+			}
+			if len(match[0]) < 3 {
+				continue
+			}
+			counterName := match[0][1] + "_" + match[0][2]
+			// increment this counter
+			t.counters[hash][counterName] += 1
+			// add this counter to the output fields
+			fields[counterName] = t.counters[hash][counterName]
+		}
+	}
+
+	t.acc.AddFields("igloo", fields, tags, ts)
+	return nil
+}
+
+func (t *Tail) Stop() {
+	t.Lock()
+	defer t.Unlock()
+
+	for _, t := range t.tailers {
+		err := t.Stop()
+		if err != nil {
+			log.Printf("ERROR stopping tail on file %s\n", t.Filename)
+		}
+		t.Cleanup()
+	}
+	t.wg.Wait()
+}
+
+func init() {
+	inputs.Add("igloo", func() telegraf.Input {
+		return NewTail()
+	})
+}
--- a/plugins/inputs/influxdb/README.md
+++ b/plugins/inputs/influxdb/README.md
@@ -15,7 +15,6 @@ InfluxDB-formatted endpoints. See below for more information.
  ## See the influxdb plugin's README for more details.

  ## Multiple URLs from which to read InfluxDB-formatted JSON
-  ## Default is "http://localhost:8086/debug/vars".
  urls = [
    "http://localhost:8086/debug/vars"
  ]
@@ -23,78 +22,16 @@ InfluxDB-formatted endpoints. See below for more information.

 ### Measurements & Fields

- influxdb
-  - n_shards
 - influxdb_database
 - influxdb_httpd
 - influxdb_measurement
 - influxdb_memstats
-  - heap_inuse
-  - heap_released
-  - mspan_inuse
-  - total_alloc
-  - sys
-  - mallocs
-  - frees
-  - heap_idle
-  - pause_total_ns
-  - lookups
-  - heap_sys
-  - mcache_sys
-  - next_gc
-  - gcc_pu_fraction
-  - other_sys
-  - alloc
-  - stack_inuse
-  - stack_sys
-  - buck_hash_sys
-  - gc_sys
-  - num_gc
-  - heap_alloc
-  - heap_objects
-  - mspan_sys
-  - mcache_inuse
-  - last_gc
 - influxdb_shard
 - influxdb_subscriber
 - influxdb_tsm1_cache
 - influxdb_tsm1_wal
 - influxdb_write

-### Example Output:
-
-```
-telegraf -config ~/ws/telegraf.conf -input-filter influxdb -test
-* Plugin: influxdb, Collection 1
-> influxdb_database,database=_internal,host=tyrion,url=http://localhost:8086/debug/vars numMeasurements=10,numSeries=29 1463590500247354636
-> influxdb_httpd,bind=:8086,host=tyrion,url=http://localhost:8086/debug/vars req=7,reqActive=1,reqDurationNs=14227734 1463590500247354636
-> influxdb_measurement,database=_internal,host=tyrion,measurement=database,url=http://localhost:8086/debug/vars numSeries=1 1463590500247354636
-> influxdb_measurement,database=_internal,host=tyrion,measurement=httpd,url=http://localhost:8086/debug/vars numSeries=1 1463590500247354636
-> influxdb_measurement,database=_internal,host=tyrion,measurement=measurement,url=http://localhost:8086/debug/vars numSeries=10 1463590500247354636
-> influxdb_measurement,database=_internal,host=tyrion,measurement=runtime,url=http://localhost:8086/debug/vars numSeries=1 1463590500247354636
-> influxdb_measurement,database=_internal,host=tyrion,measurement=shard,url=http://localhost:8086/debug/vars numSeries=4 1463590500247354636
-> influxdb_measurement,database=_internal,host=tyrion,measurement=subscriber,url=http://localhost:8086/debug/vars numSeries=1 1463590500247354636
-> influxdb_measurement,database=_internal,host=tyrion,measurement=tsm1_cache,url=http://localhost:8086/debug/vars numSeries=4 1463590500247354636
-> influxdb_measurement,database=_internal,host=tyrion,measurement=tsm1_filestore,url=http://localhost:8086/debug/vars numSeries=2 1463590500247354636
-> influxdb_measurement,database=_internal,host=tyrion,measurement=tsm1_wal,url=http://localhost:8086/debug/vars numSeries=4 1463590500247354636
-> influxdb_measurement,database=_internal,host=tyrion,measurement=write,url=http://localhost:8086/debug/vars numSeries=1 1463590500247354636
-> influxdb_memstats,host=tyrion,url=http://localhost:8086/debug/vars alloc=7642384i,buck_hash_sys=1463471i,frees=1169558i,gc_sys=653312i,gcc_pu_fraction=0.00003825652361068311,heap_alloc=7642384i,heap_idle=9912320i,heap_inuse=9125888i,heap_objects=48276i,heap_released=0i,heap_sys=19038208i,last_gc=1463590480877651621i,lookups=90i,mallocs=1217834i,mcache_inuse=4800i,mcache_sys=16384i,mspan_inuse=70920i,mspan_sys=81920i,next_gc=11679787i,num_gc=141i,other_sys=1244233i,pause_total_ns=24034027i,stack_inuse=884736i,stack_sys=884736i,sys=23382264i,total_alloc=679012200i 1463590500277918755
-> influxdb_shard,database=_internal,engine=tsm1,host=tyrion,id=4,path=/Users/sparrc/.influxdb/data/_internal/monitor/4,retentionPolicy=monitor,url=http://localhost:8086/debug/vars fieldsCreate=65,seriesCreate=26,writePointsOk=7274,writeReq=280 1463590500247354636
-> influxdb_subscriber,host=tyrion,url=http://localhost:8086/debug/vars pointsWritten=7274 1463590500247354636
-> influxdb_tsm1_cache,database=_internal,host=tyrion,path=/Users/sparrc/.influxdb/data/_internal/monitor/1,retentionPolicy=monitor,url=http://localhost:8086/debug/vars WALCompactionTimeMs=0,cacheAgeMs=2809192,cachedBytes=0,diskBytes=0,memBytes=0,snapshotCount=0 1463590500247354636
-> influxdb_tsm1_cache,database=_internal,host=tyrion,path=/Users/sparrc/.influxdb/data/_internal/monitor/2,retentionPolicy=monitor,url=http://localhost:8086/debug/vars WALCompactionTimeMs=0,cacheAgeMs=2809184,cachedBytes=0,diskBytes=0,memBytes=0,snapshotCount=0 1463590500247354636
-> influxdb_tsm1_cache,database=_internal,host=tyrion,path=/Users/sparrc/.influxdb/data/_internal/monitor/3,retentionPolicy=monitor,url=http://localhost:8086/debug/vars WALCompactionTimeMs=0,cacheAgeMs=2809180,cachedBytes=0,diskBytes=0,memBytes=42368,snapshotCount=0 1463590500247354636
-> influxdb_tsm1_cache,database=_internal,host=tyrion,path=/Users/sparrc/.influxdb/data/_internal/monitor/4,retentionPolicy=monitor,url=http://localhost:8086/debug/vars WALCompactionTimeMs=0,cacheAgeMs=2799155,cachedBytes=0,diskBytes=0,memBytes=331216,snapshotCount=0 1463590500247354636
-> influxdb_tsm1_filestore,database=_internal,host=tyrion,path=/Users/sparrc/.influxdb/data/_internal/monitor/1,retentionPolicy=monitor,url=http://localhost:8086/debug/vars diskBytes=37892 1463590500247354636
-> influxdb_tsm1_filestore,database=_internal,host=tyrion,path=/Users/sparrc/.influxdb/data/_internal/monitor/2,retentionPolicy=monitor,url=http://localhost:8086/debug/vars diskBytes=52907 1463590500247354636
-> influxdb_tsm1_wal,database=_internal,host=tyrion,path=/Users/sparrc/.influxdb/wal/_internal/monitor/1,retentionPolicy=monitor,url=http://localhost:8086/debug/vars currentSegmentDiskBytes=0,oldSegmentsDiskBytes=0 1463590500247354636
-> influxdb_tsm1_wal,database=_internal,host=tyrion,path=/Users/sparrc/.influxdb/wal/_internal/monitor/2,retentionPolicy=monitor,url=http://localhost:8086/debug/vars currentSegmentDiskBytes=0,oldSegmentsDiskBytes=0 1463590500247354636
-> influxdb_tsm1_wal,database=_internal,host=tyrion,path=/Users/sparrc/.influxdb/wal/_internal/monitor/3,retentionPolicy=monitor,url=http://localhost:8086/debug/vars currentSegmentDiskBytes=0,oldSegmentsDiskBytes=65651 1463590500247354636
-> influxdb_tsm1_wal,database=_internal,host=tyrion,path=/Users/sparrc/.influxdb/wal/_internal/monitor/4,retentionPolicy=monitor,url=http://localhost:8086/debug/vars currentSegmentDiskBytes=495687,oldSegmentsDiskBytes=0 1463590500247354636
-> influxdb_write,host=tyrion,url=http://localhost:8086/debug/vars pointReq=7274,pointReqLocal=7274,req=280,subWriteOk=280,writeOk=280 1463590500247354636
-> influxdb_shard,host=tyrion n_shards=4i 1463590500247354636
-```
-
 ### InfluxDB-formatted endpoints

 The influxdb plugin can collect InfluxDB-formatted data from JSON endpoints.
@@ -109,3 +46,65 @@ With a configuration of:
    "http://192.168.2.1:8086/debug/vars"
  ]
 ```
+
+And if 127.0.0.1 responds with this JSON:
+
+```json
+{
+  "k1": {
+    "name": "fruit",
+    "tags": {
+      "kind": "apple"
+    },
+    "values": {
+      "inventory": 371,
+      "sold": 112
+    }
+  },
+  "k2": {
+    "name": "fruit",
+    "tags": {
+      "kind": "banana"
+    },
+    "values": {
+      "inventory": 1000,
+      "sold": 403
+    }
+  }
+}
+```
+
+And if 192.168.2.1 responds like so:
+
+```json
+{
+  "k3": {
+    "name": "transactions",
+    "tags": {},
+    "values": {
+      "total": 100,
+      "balance": 184.75
+    }
+  }
+}
+```
+
+Then the collected metrics will be:
+
+```
+influxdb_fruit,url='http://127.0.0.1:8086/debug/vars',kind='apple' inventory=371.0,sold=112.0
+influxdb_fruit,url='http://127.0.0.1:8086/debug/vars',kind='banana' inventory=1000.0,sold=403.0
+
+influxdb_transactions,url='http://192.168.2.1:8086/debug/vars' total=100.0,balance=184.75
+```
+
+There are two important details to note about the collected metrics:
+
+1. Even though the values in JSON are being displayed as integers,
+the metrics are reported as floats.
+JSON encoders usually don't print the fractional part for round floats.
+Because you cannot change the type of an existing field in InfluxDB,
+we assume all numbers are floats.
+
+2. The top-level keys' names (in the example above, `"k1"`, `"k2"`, and `"k3"`)
+are not considered when recording the metrics.
--- a/plugins/inputs/influxdb/influxdb.go
+++ b/plugins/inputs/influxdb/influxdb.go
@@ -28,7 +28,6 @@ func (*InfluxDB) SampleConfig() string {
  ## See the influxdb plugin's README for more details.

  ## Multiple URLs from which to read InfluxDB-formatted JSON
-  ## Default is "http://localhost:8086/debug/vars".
  urls = [
    "http://localhost:8086/debug/vars"
  ]
@@ -36,9 +35,6 @@ func (*InfluxDB) SampleConfig() string {
 }

 func (i *InfluxDB) Gather(acc telegraf.Accumulator) error {
-	if len(i.URLs) == 0 {
-		i.URLs = []string{"http://localhost:8086/debug/vars"}
-	}
 	errorChannel := make(chan error, len(i.URLs))

 	var wg sync.WaitGroup
@@ -124,9 +120,6 @@ func (i *InfluxDB) gatherURL(
 	acc telegraf.Accumulator,
 	url string,
 ) error {
-	shardCounter := 0
-	now := time.Now()
-
 	resp, err := client.Get(url)
 	if err != nil {
 		return err
@@ -161,45 +154,43 @@ func (i *InfluxDB) gatherURL(
 			return err
 		}

-		if keyStr, ok := key.(string); ok {
-			if keyStr == "memstats" {
-				var m memstats
-				if err := dec.Decode(&m); err != nil {
-					continue
-				}
-				acc.AddFields("influxdb_memstats",
-					map[string]interface{}{
-						"alloc":           m.Alloc,
-						"total_alloc":     m.TotalAlloc,
-						"sys":             m.Sys,
-						"lookups":         m.Lookups,
-						"mallocs":         m.Mallocs,
-						"frees":           m.Frees,
-						"heap_alloc":      m.HeapAlloc,
-						"heap_sys":        m.HeapSys,
-						"heap_idle":       m.HeapIdle,
-						"heap_inuse":      m.HeapInuse,
-						"heap_released":   m.HeapReleased,
-						"heap_objects":    m.HeapObjects,
-						"stack_inuse":     m.StackInuse,
-						"stack_sys":       m.StackSys,
-						"mspan_inuse":     m.MSpanInuse,
-						"mspan_sys":       m.MSpanSys,
-						"mcache_inuse":    m.MCacheInuse,
-						"mcache_sys":      m.MCacheSys,
-						"buck_hash_sys":   m.BuckHashSys,
-						"gc_sys":          m.GCSys,
-						"other_sys":       m.OtherSys,
-						"next_gc":         m.NextGC,
-						"last_gc":         m.LastGC,
-						"pause_total_ns":  m.PauseTotalNs,
-						"num_gc":          m.NumGC,
-						"gcc_pu_fraction": m.GCCPUFraction,
-					},
-					map[string]string{
-						"url": url,
-					})
+		if key.(string) == "memstats" {
+			var m memstats
+			if err := dec.Decode(&m); err != nil {
+				continue
 			}
+			acc.AddFields("influxdb_memstats",
+				map[string]interface{}{
+					"alloc":           m.Alloc,
+					"total_alloc":     m.TotalAlloc,
+					"sys":             m.Sys,
+					"lookups":         m.Lookups,
+					"mallocs":         m.Mallocs,
+					"frees":           m.Frees,
+					"heap_alloc":      m.HeapAlloc,
+					"heap_sys":        m.HeapSys,
+					"heap_idle":       m.HeapIdle,
+					"heap_inuse":      m.HeapInuse,
+					"heap_released":   m.HeapReleased,
+					"heap_objects":    m.HeapObjects,
+					"stack_inuse":     m.StackInuse,
+					"stack_sys":       m.StackSys,
+					"mspan_inuse":     m.MSpanInuse,
+					"mspan_sys":       m.MSpanSys,
+					"mcache_inuse":    m.MCacheInuse,
+					"mcache_sys":      m.MCacheSys,
+					"buck_hash_sys":   m.BuckHashSys,
+					"gc_sys":          m.GCSys,
+					"other_sys":       m.OtherSys,
+					"next_gc":         m.NextGC,
+					"last_gc":         m.LastGC,
+					"pause_total_ns":  m.PauseTotalNs,
+					"num_gc":          m.NumGC,
+					"gcc_pu_fraction": m.GCCPUFraction,
+				},
+				map[string]string{
+					"url": url,
+				})
 		}

 		// Attempt to parse a whole object into a point.
@@ -216,10 +207,6 @@ func (i *InfluxDB) gatherURL(
 			continue
 		}

-		if p.Name == "shard" {
-			shardCounter++
-		}
-
 		// Add a tag to indicate the source of the data.
 		p.Tags["url"] = url

@@ -227,18 +214,9 @@ func (i *InfluxDB) gatherURL(
 			"influxdb_"+p.Name,
 			p.Values,
 			p.Tags,
-			now,
 		)
 	}

-	acc.AddFields("influxdb",
-		map[string]interface{}{
-			"n_shards": shardCounter,
-		},
-		nil,
-		now,
-	)
-
 	return nil
 }

--- a/plugins/inputs/influxdb/influxdb_test.go
+++ b/plugins/inputs/influxdb/influxdb_test.go
@@ -27,7 +27,7 @@ func TestBasic(t *testing.T) {
 	var acc testutil.Accumulator
 	require.NoError(t, plugin.Gather(&acc))

-	require.Len(t, acc.Metrics, 3)
+	require.Len(t, acc.Metrics, 2)
 	fields := map[string]interface{}{
 		// JSON will truncate floats to integer representations.
 		// Since there's no distinction in JSON, we can't assume it's an int.
@@ -50,11 +50,6 @@ func TestBasic(t *testing.T) {
 		"url": fakeServer.URL + "/endpoint",
 	}
 	acc.AssertContainsTaggedFields(t, "influxdb_bar", fields, tags)
-
-	acc.AssertContainsTaggedFields(t, "influxdb",
-		map[string]interface{}{
-			"n_shards": 0,
-		}, map[string]string{})
 }

 func TestInfluxDB(t *testing.T) {
@@ -74,7 +69,7 @@ func TestInfluxDB(t *testing.T) {
 	var acc testutil.Accumulator
 	require.NoError(t, plugin.Gather(&acc))

-	require.Len(t, acc.Metrics, 34)
+	require.Len(t, acc.Metrics, 33)

 	fields := map[string]interface{}{
 		"heap_inuse":      int64(18046976),
@@ -109,11 +104,6 @@ func TestInfluxDB(t *testing.T) {
 		"url": fakeInfluxServer.URL + "/endpoint",
 	}
 	acc.AssertContainsTaggedFields(t, "influxdb_memstats", fields, tags)
-
-	acc.AssertContainsTaggedFields(t, "influxdb",
-		map[string]interface{}{
-			"n_shards": 1,
-		}, map[string]string{})
 }

 func TestErrorHandling(t *testing.T) {
--- a/plugins/inputs/mongodb/mongodb.go
+++ b/plugins/inputs/mongodb/mongodb.go
@@ -69,10 +69,10 @@ func (m *MongoDB) Gather(acc telegraf.Accumulator) error {
 			}
 		}
 		wg.Add(1)
-		go func(srv *Server) {
+		go func() {
 			defer wg.Done()
-			outerr = m.gatherServer(srv, acc)
-		}(m.getMongoServer(u))
+			outerr = m.gatherServer(m.getMongoServer(u), acc)
+		}()
 	}

 	wg.Wait()
--- a/plugins/inputs/mongodb/mongodb_server.go
+++ b/plugins/inputs/mongodb/mongodb_server.go
@@ -33,7 +33,7 @@ func (s *Server) gatherData(acc telegraf.Accumulator) error {
 	result_repl := &ReplSetStatus{}
 	err = s.Session.DB("admin").Run(bson.D{{"replSetGetStatus", 1}}, result_repl)
 	if err != nil {
-		log.Println("Not gathering replica set status, member not in replica set (" + err.Error() + ")")
+		log.Println("Not gathering replica set status, member not in replica set")
 	}

 	jumbo_chunks, _ := s.Session.DB("config").C("chunks").Find(bson.M{"jumbo": true}).Count()
--- a/plugins/inputs/mongodb/mongostat.go
+++ b/plugins/inputs/mongodb/mongostat.go
@@ -78,9 +78,9 @@ type ReplSetStatus struct {

 // ReplSetMember stores information related to a replica set member
 type ReplSetMember struct {
-	Name       string               `bson:"name"`
-	State      int64                `bson:"state"`
-	OptimeDate *bson.MongoTimestamp `bson:"optimeDate"`
+	Name   string               `bson:"name"`
+	State  int64                `bson:"state"`
+	Optime *bson.MongoTimestamp `bson:"optime"`
 }

 // WiredTiger stores information related to the WiredTiger storage engine.
@@ -663,9 +663,9 @@ func NewStatLine(oldMongo, newMongo MongoStatus, key string, all bool, sampleSec
 			}
 		}

-		if me.OptimeDate != nil && master.OptimeDate != nil && me.State == 2 {
+		if me.Optime != nil && master.Optime != nil && me.State == 2 {
 			// MongoTimestamp type is int64 where the first 32bits are the unix timestamp
-			lag := int64(*master.OptimeDate>>32 - *me.OptimeDate>>32)
+			lag := int64(*master.Optime>>32 - *me.Optime>>32)
 			if lag < 0 {
 				returnVal.ReplLag = 0
 			} else {
--- a/plugins/inputs/mqtt_consumer/README.md
+++ b/plugins/inputs/mqtt_consumer/README.md
@@ -21,12 +21,8 @@ The plugin expects messages in the
    "sensors/#",
  ]

-  # if true, messages that can't be delivered while the subscriber is offline
-  # will be delivered when it comes back (such as on service restart).
-  # NOTE: if true, client_id MUST be set
-  persistent_session = false
-  # If empty, a random client ID will be generated.
-  client_id = ""
+  ## Maximum number of metrics to buffer between collection intervals
+  metric_buffer = 100000

  ## username and password to connect MQTT server.
  # username = "telegraf"
--- a/plugins/inputs/mysql/README.md
+++ b/plugins/inputs/mysql/README.md
@@ -25,8 +25,8 @@ This plugin gathers the statistic data from MySQL server
  ##  [username[:password]@][protocol[(address)]]/[?tls=[true|false|skip-verify]]
  ##  see https://github.com/go-sql-driver/mysql#dsn-data-source-name
  ##  e.g.
-  ##    db_user:passwd@tcp(127.0.0.1:3306)/?tls=false
-  ##    db_user@tcp(127.0.0.1:3306)/?tls=false
+  ##    root:passwd@tcp(127.0.0.1:3306)/?tls=false
+  ##    root@tcp(127.0.0.1:3306)/?tls=false
  #
  ## If no servers are specified, then localhost is used as the host.
  servers = ["tcp(127.0.0.1:3306)/"]
--- a/plugins/inputs/mysql/mysql.go
+++ b/plugins/inputs/mysql/mysql.go
@@ -39,8 +39,8 @@ var sampleConfig = `
  ##  [username[:password]@][protocol[(address)]]/[?tls=[true|false|skip-verify]]
  ##  see https://github.com/go-sql-driver/mysql#dsn-data-source-name
  ##  e.g.
-  ##    db_user:passwd@tcp(127.0.0.1:3306)/?tls=false
-  ##    db_user@tcp(127.0.0.1:3306)/?tls=false
+  ##    root:passwd@tcp(127.0.0.1:3306)/?tls=false
+  ##    root@tcp(127.0.0.1:3306)/?tls=false
  #
  ## If no servers are specified, then localhost is used as the host.
  servers = ["tcp(127.0.0.1:3306)/"]
--- a/plugins/inputs/net_response/README.md
+++ b/plugins/inputs/net_response/README.md
@@ -6,30 +6,41 @@ It can also check response text.
 ### Configuration:

 ```
+# List of UDP/TCP connections you want to check
+[[inputs.net_response]]
+  protocol = "tcp"
+  # Server address (default IP localhost)
+  address = "github.com:80"
+  # Set timeout (default 1.0)
+  timeout = 1.0
+  # Set read timeout (default 1.0)
+  read_timeout = 1.0
+  # String sent to the server
+  send = "ssh"
+  # Expected string in answer
+  expect = "ssh"
+
 [[inputs.net_response]]
  protocol = "tcp"
  address = ":80"

-# TCP or UDP 'ping' given url and collect response time in seconds
 [[inputs.net_response]]
-  ## Protocol, must be "tcp" or "udp"
-  protocol = "tcp"
-  ## Server address (default localhost)
+  protocol = "udp"
+  # Server address (default IP localhost)
  address = "github.com:80"
-  ## Set timeout
-  timeout = "1s"
-
-  ## Optional string sent to the server
+  # Set timeout (default 1.0)
+  timeout = 1.0
+  # Set read timeout (default 1.0)
+  read_timeout = 1.0
+  # String sent to the server
  send = "ssh"
-  ## Optional expected string in answer
+  # Expected string in answer
  expect = "ssh"
-  ## Set read timeout (only used if expecting a response)
-  read_timeout = "1s"

 [[inputs.net_response]]
  protocol = "udp"
  address = "localhost:161"
-  timeout = "2s"
+  timeout = 2.0
 ```

 ### Measurements & Fields:
--- a/plugins/inputs/net_response/net_response.go
+++ b/plugins/inputs/net_response/net_response.go
@@ -9,15 +9,14 @@ import (
 	"time"

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

 // NetResponses struct
 type NetResponse struct {
 	Address     string
-	Timeout     internal.Duration
-	ReadTimeout internal.Duration
+	Timeout     float64
+	ReadTimeout float64
 	Send        string
 	Expect      string
 	Protocol    string
@@ -32,28 +31,29 @@ var sampleConfig = `
  protocol = "tcp"
  ## Server address (default localhost)
  address = "github.com:80"
-  ## Set timeout
-  timeout = "1s"
-
+  ## Set timeout (default 1.0 seconds)
+  timeout = 1.0
+  ## Set read timeout (default 1.0 seconds)
+  read_timeout = 1.0
  ## Optional string sent to the server
  # send = "ssh"
  ## Optional expected string in answer
  # expect = "ssh"
-  ## Set read timeout (only used if expecting a response)
-  read_timeout = "1s"
 `

 func (_ *NetResponse) SampleConfig() string {
 	return sampleConfig
 }

-func (n *NetResponse) TcpGather() (map[string]interface{}, error) {
+func (t *NetResponse) TcpGather() (map[string]interface{}, error) {
 	// Prepare fields
 	fields := make(map[string]interface{})
 	// Start Timer
 	start := time.Now()
+	// Resolving
+	tcpAddr, err := net.ResolveTCPAddr("tcp", t.Address)
 	// Connecting
-	conn, err := net.DialTimeout("tcp", n.Address, n.Timeout.Duration)
+	conn, err := net.DialTCP("tcp", nil, tcpAddr)
 	// Stop timer
 	responseTime := time.Since(start).Seconds()
 	// Handle error
@@ -62,16 +62,17 @@ func (n *NetResponse) TcpGather() (map[string]interface{}, error) {
 	}
 	defer conn.Close()
 	// Send string if needed
-	if n.Send != "" {
-		msg := []byte(n.Send)
+	if t.Send != "" {
+		msg := []byte(t.Send)
 		conn.Write(msg)
+		conn.CloseWrite()
 		// Stop timer
 		responseTime = time.Since(start).Seconds()
 	}
 	// Read string if needed
-	if n.Expect != "" {
+	if t.Expect != "" {
 		// Set read timeout
-		conn.SetReadDeadline(time.Now().Add(n.ReadTimeout.Duration))
+		conn.SetReadDeadline(time.Now().Add(time.Duration(t.ReadTimeout) * time.Second))
 		// Prepare reader
 		reader := bufio.NewReader(conn)
 		tp := textproto.NewReader(reader)
@@ -84,7 +85,7 @@ func (n *NetResponse) TcpGather() (map[string]interface{}, error) {
 			fields["string_found"] = false
 		} else {
 			// Looking for string in answer
-			RegEx := regexp.MustCompile(`.*` + n.Expect + `.*`)
+			RegEx := regexp.MustCompile(`.*` + t.Expect + `.*`)
 			find := RegEx.FindString(string(data))
 			if find != "" {
 				fields["string_found"] = true
@@ -98,13 +99,13 @@ func (n *NetResponse) TcpGather() (map[string]interface{}, error) {
 	return fields, nil
 }

-func (n *NetResponse) UdpGather() (map[string]interface{}, error) {
+func (u *NetResponse) UdpGather() (map[string]interface{}, error) {
 	// Prepare fields
 	fields := make(map[string]interface{})
 	// Start Timer
 	start := time.Now()
 	// Resolving
-	udpAddr, err := net.ResolveUDPAddr("udp", n.Address)
+	udpAddr, err := net.ResolveUDPAddr("udp", u.Address)
 	LocalAddr, err := net.ResolveUDPAddr("udp", "127.0.0.1:0")
 	// Connecting
 	conn, err := net.DialUDP("udp", LocalAddr, udpAddr)
@@ -114,11 +115,11 @@ func (n *NetResponse) UdpGather() (map[string]interface{}, error) {
 		return nil, err
 	}
 	// Send string
-	msg := []byte(n.Send)
+	msg := []byte(u.Send)
 	conn.Write(msg)
 	// Read string
 	// Set read timeout
-	conn.SetReadDeadline(time.Now().Add(n.ReadTimeout.Duration))
+	conn.SetReadDeadline(time.Now().Add(time.Duration(u.ReadTimeout) * time.Second))
 	// Read
 	buf := make([]byte, 1024)
 	_, _, err = conn.ReadFromUDP(buf)
@@ -129,7 +130,7 @@ func (n *NetResponse) UdpGather() (map[string]interface{}, error) {
 		return nil, err
 	} else {
 		// Looking for string in answer
-		RegEx := regexp.MustCompile(`.*` + n.Expect + `.*`)
+		RegEx := regexp.MustCompile(`.*` + u.Expect + `.*`)
 		find := RegEx.FindString(string(buf))
 		if find != "" {
 			fields["string_found"] = true
@@ -141,28 +142,28 @@ func (n *NetResponse) UdpGather() (map[string]interface{}, error) {
 	return fields, nil
 }

-func (n *NetResponse) Gather(acc telegraf.Accumulator) error {
+func (c *NetResponse) Gather(acc telegraf.Accumulator) error {
 	// Set default values
-	if n.Timeout.Duration == 0 {
-		n.Timeout.Duration = time.Second
+	if c.Timeout == 0 {
+		c.Timeout = 1.0
 	}
-	if n.ReadTimeout.Duration == 0 {
-		n.ReadTimeout.Duration = time.Second
+	if c.ReadTimeout == 0 {
+		c.ReadTimeout = 1.0
 	}
 	// Check send and expected string
-	if n.Protocol == "udp" && n.Send == "" {
+	if c.Protocol == "udp" && c.Send == "" {
 		return errors.New("Send string cannot be empty")
 	}
-	if n.Protocol == "udp" && n.Expect == "" {
+	if c.Protocol == "udp" && c.Expect == "" {
 		return errors.New("Expected string cannot be empty")
 	}
 	// Prepare host and port
-	host, port, err := net.SplitHostPort(n.Address)
+	host, port, err := net.SplitHostPort(c.Address)
 	if err != nil {
 		return err
 	}
 	if host == "" {
-		n.Address = "localhost:" + port
+		c.Address = "localhost:" + port
 	}
 	if port == "" {
 		return errors.New("Bad port")
@@ -171,11 +172,11 @@ func (n *NetResponse) Gather(acc telegraf.Accumulator) error {
 	tags := map[string]string{"server": host, "port": port}
 	var fields map[string]interface{}
 	// Gather data
-	if n.Protocol == "tcp" {
-		fields, err = n.TcpGather()
+	if c.Protocol == "tcp" {
+		fields, err = c.TcpGather()
 		tags["protocol"] = "tcp"
-	} else if n.Protocol == "udp" {
-		fields, err = n.UdpGather()
+	} else if c.Protocol == "udp" {
+		fields, err = c.UdpGather()
 		tags["protocol"] = "udp"
 	} else {
 		return errors.New("Bad protocol")
--- a/plugins/inputs/net_response/net_response_test.go
+++ b/plugins/inputs/net_response/net_response_test.go
@@ -5,9 +5,7 @@ import (
 	"regexp"
 	"sync"
 	"testing"
-	"time"

-	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/testutil"

 	"github.com/stretchr/testify/assert"
@@ -37,7 +35,7 @@ func TestTCPError(t *testing.T) {
 	// Error
 	err1 := c.Gather(&acc)
 	require.Error(t, err1)
-	assert.Contains(t, err1.Error(), "getsockopt: connection refused")
+	assert.Equal(t, "dial tcp 127.0.0.1:9999: getsockopt: connection refused", err1.Error())
 }

 func TestTCPOK1(t *testing.T) {
@@ -48,8 +46,8 @@ func TestTCPOK1(t *testing.T) {
 		Address:     "127.0.0.1:2004",
 		Send:        "test",
 		Expect:      "test",
-		ReadTimeout: internal.Duration{Duration: time.Second * 3},
-		Timeout:     internal.Duration{Duration: time.Second},
+		ReadTimeout: 3.0,
+		Timeout:     1.0,
 		Protocol:    "tcp",
 	}
 	// Start TCP server
@@ -88,8 +86,8 @@ func TestTCPOK2(t *testing.T) {
 		Address:     "127.0.0.1:2004",
 		Send:        "test",
 		Expect:      "test2",
-		ReadTimeout: internal.Duration{Duration: time.Second * 3},
-		Timeout:     internal.Duration{Duration: time.Second},
+		ReadTimeout: 3.0,
+		Timeout:     1.0,
 		Protocol:    "tcp",
 	}
 	// Start TCP server
@@ -143,8 +141,8 @@ func TestUDPOK1(t *testing.T) {
 		Address:     "127.0.0.1:2004",
 		Send:        "test",
 		Expect:      "test",
-		ReadTimeout: internal.Duration{Duration: time.Second * 3},
-		Timeout:     internal.Duration{Duration: time.Second},
+		ReadTimeout: 3.0,
+		Timeout:     1.0,
 		Protocol:    "udp",
 	}
 	// Start UDP server
--- a/plugins/inputs/nstat/README.md
+++ b/plugins/inputs/nstat/README.md
@@ -1,343 +0,0 @@
-## Nstat input plugin
-
-Plugin collects network metrics from `/proc/net/netstat`, `/proc/net/snmp` and `/proc/net/snmp6` files
-
-### Configuration
-
-The plugin firstly tries to read file paths from config values
-if it is empty, then it reads from env variables.
-* `PROC_NET_NETSTAT`
-* `PROC_NET_SNMP`
-* `PROC_NET_SNMP6`
-
-If these variables are also not set,
-then it tries to read the proc root from env - `PROC_ROOT`,
-and sets `/proc` as a root path if `PROC_ROOT` is also empty.
-
-Then appends default file paths:
-* `/net/netstat`
-* `/net/snmp`
-* `/net/snmp6`
-
-So if nothing is given, no paths in config and in env vars, the plugin takes the default paths.
-* `/proc/net/netstat`
-* `/proc/net/snmp`
-* `/proc/net/snmp6`
-
-The sample config file
-```toml
-[[inputs.nstat]]
-  ## file paths
-  ## e.g: /proc/net/netstat, /proc/net/snmp, /proc/net/snmp6
-  # proc_net_netstat    = 	""
-  # proc_net_snmp 		= 	""
-  # proc_net_snmp6 		= 	""
-  ## dump metrics with 0 values too
-  # dump_zeros			= 	true
-```
-
-### Measurements & Fields
-
- nstat
-    - Icmp6InCsumErrors
-    - Icmp6InDestUnreachs
-    - Icmp6InEchoReplies
-    - Icmp6InEchos
-    - Icmp6InErrors
-    - Icmp6InGroupMembQueries
-    - Icmp6InGroupMembReductions
-    - Icmp6InGroupMembResponses
-    - Icmp6InMLDv2Reports
-    - Icmp6InMsgs
-    - Icmp6InNeighborAdvertisements
-    - Icmp6InNeighborSolicits
-    - Icmp6InParmProblems
-    - Icmp6InPktTooBigs
-    - Icmp6InRedirects
-    - Icmp6InRouterAdvertisements
-    - Icmp6InRouterSolicits
-    - Icmp6InTimeExcds
-    - Icmp6OutDestUnreachs
-    - Icmp6OutEchoReplies
-    - Icmp6OutEchos
-    - Icmp6OutErrors
-    - Icmp6OutGroupMembQueries
-    - Icmp6OutGroupMembReductions
-    - Icmp6OutGroupMembResponses
-    - Icmp6OutMLDv2Reports
-    - Icmp6OutMsgs
-    - Icmp6OutNeighborAdvertisements
-    - Icmp6OutNeighborSolicits
-    - Icmp6OutParmProblems
-    - Icmp6OutPktTooBigs
-    - Icmp6OutRedirects
-    - Icmp6OutRouterAdvertisements
-    - Icmp6OutRouterSolicits
-    - Icmp6OutTimeExcds
-    - Icmp6OutType133
-    - Icmp6OutType135
-    - Icmp6OutType143
-    - IcmpInAddrMaskReps
-    - IcmpInAddrMasks
-    - IcmpInCsumErrors
-    - IcmpInDestUnreachs
-    - IcmpInEchoReps
-    - IcmpInEchos
-    - IcmpInErrors
-    - IcmpInMsgs
-    - IcmpInParmProbs
-    - IcmpInRedirects
-    - IcmpInSrcQuenchs
-    - IcmpInTimeExcds
-    - IcmpInTimestampReps
-    - IcmpInTimestamps
-    - IcmpMsgInType3
-    - IcmpMsgOutType3
-    - IcmpOutAddrMaskReps
-    - IcmpOutAddrMasks
-    - IcmpOutDestUnreachs
-    - IcmpOutEchoReps
-    - IcmpOutEchos
-    - IcmpOutErrors
-    - IcmpOutMsgs
-    - IcmpOutParmProbs
-    - IcmpOutRedirects
-    - IcmpOutSrcQuenchs
-    - IcmpOutTimeExcds
-    - IcmpOutTimestampReps
-    - IcmpOutTimestamps
-    - Ip6FragCreates
-    - Ip6FragFails
-    - Ip6FragOKs
-    - Ip6InAddrErrors
-    - Ip6InBcastOctets
-    - Ip6InCEPkts
-    - Ip6InDelivers
-    - Ip6InDiscards
-    - Ip6InECT0Pkts
-    - Ip6InECT1Pkts
-    - Ip6InHdrErrors
-    - Ip6InMcastOctets
-    - Ip6InMcastPkts
-    - Ip6InNoECTPkts
-    - Ip6InNoRoutes
-    - Ip6InOctets
-    - Ip6InReceives
-    - Ip6InTooBigErrors
-    - Ip6InTruncatedPkts
-    - Ip6InUnknownProtos
-    - Ip6OutBcastOctets
-    - Ip6OutDiscards
-    - Ip6OutForwDatagrams
-    - Ip6OutMcastOctets
-    - Ip6OutMcastPkts
-    - Ip6OutNoRoutes
-    - Ip6OutOctets
-    - Ip6OutRequests
-    - Ip6ReasmFails
-    - Ip6ReasmOKs
-    - Ip6ReasmReqds
-    - Ip6ReasmTimeout
-    - IpDefaultTTL
-    - IpExtInBcastOctets
-    - IpExtInBcastPkts
-    - IpExtInCEPkts
-    - IpExtInCsumErrors
-    - IpExtInECT0Pkts
-    - IpExtInECT1Pkts
-    - IpExtInMcastOctets
-    - IpExtInMcastPkts
-    - IpExtInNoECTPkts
-    - IpExtInNoRoutes
-    - IpExtInOctets
-    - IpExtInTruncatedPkts
-    - IpExtOutBcastOctets
-    - IpExtOutBcastPkts
-    - IpExtOutMcastOctets
-    - IpExtOutMcastPkts
-    - IpExtOutOctets
-    - IpForwDatagrams
-    - IpForwarding
-    - IpFragCreates
-    - IpFragFails
-    - IpFragOKs
-    - IpInAddrErrors
-    - IpInDelivers
-    - IpInDiscards
-    - IpInHdrErrors
-    - IpInReceives
-    - IpInUnknownProtos
-    - IpOutDiscards
-    - IpOutNoRoutes
-    - IpOutRequests
-    - IpReasmFails
-    - IpReasmOKs
-    - IpReasmReqds
-    - IpReasmTimeout
-    - TcpActiveOpens
-    - TcpAttemptFails
-    - TcpCurrEstab
-    - TcpEstabResets
-    - TcpExtArpFilter
-    - TcpExtBusyPollRxPackets
-    - TcpExtDelayedACKLocked
-    - TcpExtDelayedACKLost
-    - TcpExtDelayedACKs
-    - TcpExtEmbryonicRsts
-    - TcpExtIPReversePathFilter
-    - TcpExtListenDrops
-    - TcpExtListenOverflows
-    - TcpExtLockDroppedIcmps
-    - TcpExtOfoPruned
-    - TcpExtOutOfWindowIcmps
-    - TcpExtPAWSActive
-    - TcpExtPAWSEstab
-    - TcpExtPAWSPassive
-    - TcpExtPruneCalled
-    - TcpExtRcvPruned
-    - TcpExtSyncookiesFailed
-    - TcpExtSyncookiesRecv
-    - TcpExtSyncookiesSent
-    - TcpExtTCPACKSkippedChallenge
-    - TcpExtTCPACKSkippedFinWait2
-    - TcpExtTCPACKSkippedPAWS
-    - TcpExtTCPACKSkippedSeq
-    - TcpExtTCPACKSkippedSynRecv
-    - TcpExtTCPACKSkippedTimeWait
-    - TcpExtTCPAbortFailed
-    - TcpExtTCPAbortOnClose
-    - TcpExtTCPAbortOnData
-    - TcpExtTCPAbortOnLinger
-    - TcpExtTCPAbortOnMemory
-    - TcpExtTCPAbortOnTimeout
-    - TcpExtTCPAutoCorking
-    - TcpExtTCPBacklogDrop
-    - TcpExtTCPChallengeACK
-    - TcpExtTCPDSACKIgnoredNoUndo
-    - TcpExtTCPDSACKIgnoredOld
-    - TcpExtTCPDSACKOfoRecv
-    - TcpExtTCPDSACKOfoSent
-    - TcpExtTCPDSACKOldSent
-    - TcpExtTCPDSACKRecv
-    - TcpExtTCPDSACKUndo
-    - TcpExtTCPDeferAcceptDrop
-    - TcpExtTCPDirectCopyFromBacklog
-    - TcpExtTCPDirectCopyFromPrequeue
-    - TcpExtTCPFACKReorder
-    - TcpExtTCPFastOpenActive
-    - TcpExtTCPFastOpenActiveFail
-    - TcpExtTCPFastOpenCookieReqd
-    - TcpExtTCPFastOpenListenOverflow
-    - TcpExtTCPFastOpenPassive
-    - TcpExtTCPFastOpenPassiveFail
-    - TcpExtTCPFastRetrans
-    - TcpExtTCPForwardRetrans
-    - TcpExtTCPFromZeroWindowAdv
-    - TcpExtTCPFullUndo
-    - TcpExtTCPHPAcks
-    - TcpExtTCPHPHits
-    - TcpExtTCPHPHitsToUser
-    - TcpExtTCPHystartDelayCwnd
-    - TcpExtTCPHystartDelayDetect
-    - TcpExtTCPHystartTrainCwnd
-    - TcpExtTCPHystartTrainDetect
-    - TcpExtTCPKeepAlive
-    - TcpExtTCPLossFailures
-    - TcpExtTCPLossProbeRecovery
-    - TcpExtTCPLossProbes
-    - TcpExtTCPLossUndo
-    - TcpExtTCPLostRetransmit
-    - TcpExtTCPMD5NotFound
-    - TcpExtTCPMD5Unexpected
-    - TcpExtTCPMTUPFail
-    - TcpExtTCPMTUPSuccess
-    - TcpExtTCPMemoryPressures
-    - TcpExtTCPMinTTLDrop
-    - TcpExtTCPOFODrop
-    - TcpExtTCPOFOMerge
-    - TcpExtTCPOFOQueue
-    - TcpExtTCPOrigDataSent
-    - TcpExtTCPPartialUndo
-    - TcpExtTCPPrequeueDropped
-    - TcpExtTCPPrequeued
-    - TcpExtTCPPureAcks
-    - TcpExtTCPRcvCoalesce
-    - TcpExtTCPRcvCollapsed
-    - TcpExtTCPRenoFailures
-    - TcpExtTCPRenoRecovery
-    - TcpExtTCPRenoRecoveryFail
-    - TcpExtTCPRenoReorder
-    - TcpExtTCPReqQFullDoCookies
-    - TcpExtTCPReqQFullDrop
-    - TcpExtTCPRetransFail
-    - TcpExtTCPSACKDiscard
-    - TcpExtTCPSACKReneging
-    - TcpExtTCPSACKReorder
-    - TcpExtTCPSYNChallenge
-    - TcpExtTCPSackFailures
-    - TcpExtTCPSackMerged
-    - TcpExtTCPSackRecovery
-    - TcpExtTCPSackRecoveryFail
-    - TcpExtTCPSackShiftFallback
-    - TcpExtTCPSackShifted
-    - TcpExtTCPSchedulerFailed
-    - TcpExtTCPSlowStartRetrans
-    - TcpExtTCPSpuriousRTOs
-    - TcpExtTCPSpuriousRtxHostQueues
-    - TcpExtTCPSynRetrans
-    - TcpExtTCPTSReorder
-    - TcpExtTCPTimeWaitOverflow
-    - TcpExtTCPTimeouts
-    - TcpExtTCPToZeroWindowAdv
-    - TcpExtTCPWantZeroWindowAdv
-    - TcpExtTCPWinProbe
-    - TcpExtTW
-    - TcpExtTWKilled
-    - TcpExtTWRecycled
-    - TcpInCsumErrors
-    - TcpInErrs
-    - TcpInSegs
-    - TcpMaxConn
-    - TcpOutRsts
-    - TcpOutSegs
-    - TcpPassiveOpens
-    - TcpRetransSegs
-    - TcpRtoAlgorithm
-    - TcpRtoMax
-    - TcpRtoMin
-    - Udp6IgnoredMulti
-    - Udp6InCsumErrors
-    - Udp6InDatagrams
-    - Udp6InErrors
-    - Udp6NoPorts
-    - Udp6OutDatagrams
-    - Udp6RcvbufErrors
-    - Udp6SndbufErrors
-    - UdpIgnoredMulti
-    - UdpInCsumErrors
-    - UdpInDatagrams
-    - UdpInErrors
-    - UdpLite6InCsumErrors
-    - UdpLite6InDatagrams
-    - UdpLite6InErrors
-    - UdpLite6NoPorts
-    - UdpLite6OutDatagrams
-    - UdpLite6RcvbufErrors
-    - UdpLite6SndbufErrors
-    - UdpLiteIgnoredMulti
-    - UdpLiteInCsumErrors
-    - UdpLiteInDatagrams
-    - UdpLiteInErrors
-    - UdpLiteNoPorts
-    - UdpLiteOutDatagrams
-    - UdpLiteRcvbufErrors
-    - UdpLiteSndbufErrors
-    - UdpNoPorts
-    - UdpOutDatagrams
-    - UdpRcvbufErrors
-    - UdpSndbufErrors
-
-### Tags
- All measurements have the following tags
-    - host (host of the system)
-    - name (the type of the metric: snmp, snmp6 or netstat)
--- a/plugins/inputs/nstat/nstat.go
+++ b/plugins/inputs/nstat/nstat.go
@@ -1,233 +0,0 @@
-package nstat
-
-import (
-	"bytes"
-	"io/ioutil"
-	"os"
-	"strconv"
-
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/plugins/inputs"
-)
-
-var (
-	zeroByte    = []byte("0")
-	newLineByte = []byte("\n")
-	colonByte   = []byte(":")
-)
-
-// default file paths
-const (
-	NET_NETSTAT = "/net/netstat"
-	NET_SNMP    = "/net/snmp"
-	NET_SNMP6   = "/net/snmp6"
-	NET_PROC    = "/proc"
-)
-
-// env variable names
-const (
-	ENV_NETSTAT = "PROC_NET_NETSTAT"
-	ENV_SNMP    = "PROC_NET_SNMP"
-	ENV_SNMP6   = "PROC_NET_SNMP6"
-	ENV_ROOT    = "PROC_ROOT"
-)
-
-type Nstat struct {
-	ProcNetNetstat string `toml:"proc_net_netstat"`
-	ProcNetSNMP    string `toml:"proc_net_snmp"`
-	ProcNetSNMP6   string `toml:"proc_net_snmp6"`
-	DumpZeros      bool   `toml:"dump_zeros"`
-}
-
-var sampleConfig = `
-  ## file paths for proc files. If empty default paths will be used:
-  ##    /proc/net/netstat, /proc/net/snmp, /proc/net/snmp6
-  ## These can also be overridden with env variables, see README.
-  proc_net_netstat = ""
-  proc_net_snmp    = ""
-  proc_net_snmp6   = ""
-  ## dump metrics with 0 values too
-  dump_zeros       = true
-`
-
-func (ns *Nstat) Description() string {
-	return "Collect kernel snmp counters and network interface statistics"
-}
-
-func (ns *Nstat) SampleConfig() string {
-	return sampleConfig
-}
-
-func (ns *Nstat) Gather(acc telegraf.Accumulator) error {
-	// load paths, get from env if config values are empty
-	ns.loadPaths()
-
-	netstat, err := ioutil.ReadFile(ns.ProcNetNetstat)
-	if err != nil {
-		return err
-	}
-
-	// collect netstat data
-	err = ns.gatherNetstat(netstat, acc)
-	if err != nil {
-		return err
-	}
-
-	// collect SNMP data
-	snmp, err := ioutil.ReadFile(ns.ProcNetSNMP)
-	if err != nil {
-		return err
-	}
-	err = ns.gatherSNMP(snmp, acc)
-	if err != nil {
-		return err
-	}
-
-	// collect SNMP6 data
-	snmp6, err := ioutil.ReadFile(ns.ProcNetSNMP6)
-	if err != nil {
-		return err
-	}
-	err = ns.gatherSNMP6(snmp6, acc)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func (ns *Nstat) gatherNetstat(data []byte, acc telegraf.Accumulator) error {
-	metrics, err := loadUglyTable(data, ns.DumpZeros)
-	if err != nil {
-		return err
-	}
-	tags := map[string]string{
-		"name": "netstat",
-	}
-	acc.AddFields("nstat", metrics, tags)
-	return nil
-}
-
-func (ns *Nstat) gatherSNMP(data []byte, acc telegraf.Accumulator) error {
-	metrics, err := loadUglyTable(data, ns.DumpZeros)
-	if err != nil {
-		return err
-	}
-	tags := map[string]string{
-		"name": "snmp",
-	}
-	acc.AddFields("nstat", metrics, tags)
-	return nil
-}
-
-func (ns *Nstat) gatherSNMP6(data []byte, acc telegraf.Accumulator) error {
-	metrics, err := loadGoodTable(data, ns.DumpZeros)
-	if err != nil {
-		return err
-	}
-	tags := map[string]string{
-		"name": "snmp6",
-	}
-	acc.AddFields("nstat", metrics, tags)
-	return nil
-}
-
-// loadPaths can be used to read paths firstly from config
-// if it is empty then try read from env variables
-func (ns *Nstat) loadPaths() {
-	if ns.ProcNetNetstat == "" {
-		ns.ProcNetNetstat = proc(ENV_NETSTAT, NET_NETSTAT)
-	}
-	if ns.ProcNetSNMP == "" {
-		ns.ProcNetSNMP = proc(ENV_SNMP, NET_SNMP)
-	}
-	if ns.ProcNetSNMP6 == "" {
-		ns.ProcNetSNMP = proc(ENV_SNMP6, NET_SNMP6)
-	}
-}
-
-// loadGoodTable can be used to parse string heap that
-// headers and values are arranged in right order
-func loadGoodTable(table []byte, dumpZeros bool) (map[string]interface{}, error) {
-	entries := map[string]interface{}{}
-	fields := bytes.Fields(table)
-	var value int64
-	var err error
-	// iterate over two values each time
-	// first value is header, second is value
-	for i := 0; i < len(fields); i = i + 2 {
-		// counter is zero
-		if bytes.Equal(fields[i+1], zeroByte) {
-			if !dumpZeros {
-				continue
-			} else {
-				entries[string(fields[i])] = int64(0)
-				continue
-			}
-		}
-		// the counter is not zero, so parse it.
-		value, err = strconv.ParseInt(string(fields[i+1]), 10, 64)
-		if err == nil {
-			entries[string(fields[i])] = value
-		}
-	}
-	return entries, nil
-}
-
-// loadUglyTable can be used to parse string heap that
-// the headers and values are splitted with a newline
-func loadUglyTable(table []byte, dumpZeros bool) (map[string]interface{}, error) {
-	entries := map[string]interface{}{}
-	// split the lines by newline
-	lines := bytes.Split(table, newLineByte)
-	var value int64
-	var err error
-	// iterate over lines, take 2 lines each time
-	// first line contains header names
-	// second line contains values
-	for i := 0; i < len(lines); i = i + 2 {
-		if len(lines[i]) == 0 {
-			continue
-		}
-		headers := bytes.Fields(lines[i])
-		prefix := bytes.TrimSuffix(headers[0], colonByte)
-		metrics := bytes.Fields(lines[i+1])
-
-		for j := 1; j < len(headers); j++ {
-			// counter is zero
-			if bytes.Equal(metrics[j], zeroByte) {
-				if !dumpZeros {
-					continue
-				} else {
-					entries[string(append(prefix, headers[j]...))] = int64(0)
-					continue
-				}
-			}
-			// the counter is not zero, so parse it.
-			value, err = strconv.ParseInt(string(metrics[j]), 10, 64)
-			if err == nil {
-				entries[string(append(prefix, headers[j]...))] = value
-			}
-		}
-	}
-	return entries, nil
-}
-
-// proc can be used to read file paths from env
-func proc(env, path string) string {
-	// try to read full file path
-	if p := os.Getenv(env); p != "" {
-		return p
-	}
-	// try to read root path, or use default root path
-	root := os.Getenv(ENV_ROOT)
-	if root == "" {
-		root = NET_PROC
-	}
-	return root + path
-}
-
-func init() {
-	inputs.Add("nstat", func() telegraf.Input {
-		return &Nstat{}
-	})
-}
--- a/plugins/inputs/nstat/nstat_test.go
+++ b/plugins/inputs/nstat/nstat_test.go
@@ -1,56 +0,0 @@
-package nstat
-
-import "testing"
-
-func TestLoadUglyTable(t *testing.T) {
-	uglyStr := `IpExt: InNoRoutes InTruncatedPkts InMcastPkts InCEPkts
-	IpExt: 332 433718 0 2660494435`
-	parsed := map[string]interface{}{
-		"IpExtInNoRoutes":      int64(332),
-		"IpExtInTruncatedPkts": int64(433718),
-		"IpExtInMcastPkts":     int64(0),
-		"IpExtInCEPkts":        int64(2660494435),
-	}
-
-	got, err := loadUglyTable([]byte(uglyStr), true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(got) == 0 {
-		t.Fatalf("want %+v, got %+v", parsed, got)
-	}
-
-	for key := range parsed {
-		if parsed[key].(int64) != got[key].(int64) {
-			t.Fatalf("want %+v, got %+v", parsed[key], got[key])
-		}
-	}
-}
-
-func TestLoadGoodTable(t *testing.T) {
-	goodStr := `Ip6InReceives                   	11707
-				Ip6InTooBigErrors               	0
-				Ip6InDelivers                   	62
-				Ip6InMcastOctets                	1242966`
-
-	parsed := map[string]interface{}{
-		"Ip6InReceives":     int64(11707),
-		"Ip6InTooBigErrors": int64(0),
-		"Ip6InDelivers":     int64(62),
-		"Ip6InMcastOctets":  int64(1242966),
-	}
-	got, err := loadGoodTable([]byte(goodStr), true)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(got) == 0 {
-		t.Fatalf("want %+v, got %+v", parsed, got)
-	}
-
-	for key := range parsed {
-		if parsed[key].(int64) != got[key].(int64) {
-			t.Fatalf("want %+v, got %+v", parsed[key], got[key])
-		}
-	}
-}
--- a/plugins/inputs/ntpq/ntpq.go
+++ b/plugins/inputs/ntpq/ntpq.go
@@ -70,17 +70,7 @@ func (n *NTPQ) Gather(acc telegraf.Accumulator) error {
 	lineCounter := 0
 	scanner := bufio.NewScanner(bytes.NewReader(out))
 	for scanner.Scan() {
-		line := scanner.Text()
-
-		tags := make(map[string]string)
-		// if there is an ntpq state prefix, remove it and make it it's own tag
-		// see https://github.com/influxdata/telegraf/issues/1161
-		if strings.ContainsAny(string(line[0]), "*#o+x.-") {
-			tags["state_prefix"] = string(line[0])
-			line = strings.TrimLeft(line, "*#o+x.-")
-		}
-
-		fields := strings.Fields(line)
+		fields := strings.Fields(scanner.Text())
 		if len(fields) < 2 {
 			continue
 		}
@@ -107,6 +97,7 @@ func (n *NTPQ) Gather(acc telegraf.Accumulator) error {
 				}
 			}
 		} else {
+			tags := make(map[string]string)
 			mFields := make(map[string]interface{})

 			// Get tags from output
@@ -122,9 +113,6 @@ func (n *NTPQ) Gather(acc telegraf.Accumulator) error {
 				if index == -1 {
 					continue
 				}
-				if fields[index] == "-" {
-					continue
-				}

 				if key == "when" {
 					when := fields[index]
@@ -172,9 +160,6 @@ func (n *NTPQ) Gather(acc telegraf.Accumulator) error {
 				if index == -1 {
 					continue
 				}
-				if fields[index] == "-" {
-					continue
-				}

 				m, err := strconv.ParseFloat(fields[index], 64)
 				if err != nil {
--- a/plugins/inputs/ntpq/ntpq_test.go
+++ b/plugins/inputs/ntpq/ntpq_test.go
@@ -32,11 +32,10 @@ func TestSingleNTPQ(t *testing.T) {
 		"jitter": float64(17.462),
 	}
 	tags := map[string]string{
-		"remote":       "uschi5-ntp-002.",
-		"state_prefix": "*",
-		"refid":        "10.177.80.46",
-		"stratum":      "2",
-		"type":         "u",
+		"remote":  "*uschi5-ntp-002.",
+		"refid":   "10.177.80.46",
+		"stratum": "2",
+		"type":    "u",
 	}
 	acc.AssertContainsTaggedFields(t, "ntpq", fields, tags)
 }
@@ -61,11 +60,10 @@ func TestBadIntNTPQ(t *testing.T) {
 		"jitter": float64(17.462),
 	}
 	tags := map[string]string{
-		"remote":       "uschi5-ntp-002.",
-		"state_prefix": "*",
-		"refid":        "10.177.80.46",
-		"stratum":      "2",
-		"type":         "u",
+		"remote":  "*uschi5-ntp-002.",
+		"refid":   "10.177.80.46",
+		"stratum": "2",
+		"type":    "u",
 	}
 	acc.AssertContainsTaggedFields(t, "ntpq", fields, tags)
 }
@@ -90,11 +88,10 @@ func TestBadFloatNTPQ(t *testing.T) {
 		"jitter": float64(17.462),
 	}
 	tags := map[string]string{
-		"remote":       "uschi5-ntp-002.",
-		"state_prefix": "*",
-		"refid":        "10.177.80.46",
-		"stratum":      "2",
-		"type":         "u",
+		"remote":  "*uschi5-ntp-002.",
+		"refid":   "10.177.80.46",
+		"stratum": "2",
+		"type":    "u",
 	}
 	acc.AssertContainsTaggedFields(t, "ntpq", fields, tags)
 }
@@ -120,11 +117,10 @@ func TestDaysNTPQ(t *testing.T) {
 		"jitter": float64(17.462),
 	}
 	tags := map[string]string{
-		"remote":       "uschi5-ntp-002.",
-		"state_prefix": "*",
-		"refid":        "10.177.80.46",
-		"stratum":      "2",
-		"type":         "u",
+		"remote":  "*uschi5-ntp-002.",
+		"refid":   "10.177.80.46",
+		"stratum": "2",
+		"type":    "u",
 	}
 	acc.AssertContainsTaggedFields(t, "ntpq", fields, tags)
 }
@@ -150,11 +146,10 @@ func TestHoursNTPQ(t *testing.T) {
 		"jitter": float64(17.462),
 	}
 	tags := map[string]string{
-		"remote":       "uschi5-ntp-002.",
-		"state_prefix": "*",
-		"refid":        "10.177.80.46",
-		"stratum":      "2",
-		"type":         "u",
+		"remote":  "*uschi5-ntp-002.",
+		"refid":   "10.177.80.46",
+		"stratum": "2",
+		"type":    "u",
 	}
 	acc.AssertContainsTaggedFields(t, "ntpq", fields, tags)
 }
@@ -180,11 +175,10 @@ func TestMinutesNTPQ(t *testing.T) {
 		"jitter": float64(17.462),
 	}
 	tags := map[string]string{
-		"remote":       "uschi5-ntp-002.",
-		"state_prefix": "*",
-		"refid":        "10.177.80.46",
-		"stratum":      "2",
-		"type":         "u",
+		"remote":  "*uschi5-ntp-002.",
+		"refid":   "10.177.80.46",
+		"stratum": "2",
+		"type":    "u",
 	}
 	acc.AssertContainsTaggedFields(t, "ntpq", fields, tags)
 }
@@ -209,11 +203,10 @@ func TestBadWhenNTPQ(t *testing.T) {
 		"jitter": float64(17.462),
 	}
 	tags := map[string]string{
-		"remote":       "uschi5-ntp-002.",
-		"state_prefix": "*",
-		"refid":        "10.177.80.46",
-		"stratum":      "2",
-		"type":         "u",
+		"remote":  "*uschi5-ntp-002.",
+		"refid":   "10.177.80.46",
+		"stratum": "2",
+		"type":    "u",
 	}
 	acc.AssertContainsTaggedFields(t, "ntpq", fields, tags)
 }
@@ -285,10 +278,9 @@ func TestBadHeaderNTPQ(t *testing.T) {
 		"jitter": float64(17.462),
 	}
 	tags := map[string]string{
-		"remote":       "uschi5-ntp-002.",
-		"state_prefix": "*",
-		"refid":        "10.177.80.46",
-		"type":         "u",
+		"remote": "*uschi5-ntp-002.",
+		"refid":  "10.177.80.46",
+		"type":   "u",
 	}
 	acc.AssertContainsTaggedFields(t, "ntpq", fields, tags)
 }
@@ -314,10 +306,9 @@ func TestMissingDelayColumnNTPQ(t *testing.T) {
 		"jitter": float64(17.462),
 	}
 	tags := map[string]string{
-		"remote":       "uschi5-ntp-002.",
-		"state_prefix": "*",
-		"refid":        "10.177.80.46",
-		"type":         "u",
+		"remote": "*uschi5-ntp-002.",
+		"refid":  "10.177.80.46",
+		"type":   "u",
 	}
 	acc.AssertContainsTaggedFields(t, "ntpq", fields, tags)
 }
--- a/plugins/inputs/procstat/procstat.go
+++ b/plugins/inputs/procstat/procstat.go
@@ -15,12 +15,11 @@ import (
 )

 type Procstat struct {
-	PidFile     string `toml:"pid_file"`
-	Exe         string
-	Pattern     string
-	Prefix      string
-	ProcessName string
-	User        string
+	PidFile string `toml:"pid_file"`
+	Exe     string
+	Pattern string
+	Prefix  string
+	User    string

 	// pidmap maps a pid to a process object, so we don't recreate every gather
 	pidmap map[int32]*process.Process
@@ -46,9 +45,6 @@ var sampleConfig = `
  ## user as argument for pgrep (ie, pgrep -u <user>)
  # user = "nginx"

-  ## override for process_name
-  ## This is optional; default is sourced from /proc/<pid>/status
-  # process_name = "bar"
  ## Field name prefix
  prefix = ""
  ## comment this out if you want raw cpu_time stats
@@ -70,7 +66,7 @@ func (p *Procstat) Gather(acc telegraf.Accumulator) error {
 			p.Exe, p.PidFile, p.Pattern, p.User, err.Error())
 	} else {
 		for pid, proc := range p.pidmap {
-			p := NewSpecProcessor(p.ProcessName, p.Prefix, acc, proc, p.tagmap[pid])
+			p := NewSpecProcessor(p.Prefix, acc, proc, p.tagmap[pid])
 			p.pushMetrics()
 		}
 	}
--- a/plugins/inputs/procstat/spec_processor.go
+++ b/plugins/inputs/procstat/spec_processor.go
@@ -17,19 +17,13 @@ type SpecProcessor struct {
 }

 func NewSpecProcessor(
-	processName string,
 	prefix string,
 	acc telegraf.Accumulator,
 	p *process.Process,
 	tags map[string]string,
 ) *SpecProcessor {
-	if processName != "" {
-		tags["process_name"] = processName
-	} else {
-		name, err := p.Name()
-		if err == nil {
-			tags["process_name"] = name
-		}
+	if name, err := p.Name(); err == nil {
+		tags["process_name"] = name
 	}
 	return &SpecProcessor{
 		Prefix: prefix,
@@ -71,7 +65,7 @@ func (p *SpecProcessor) pushMetrics() {
 		fields[prefix+"write_bytes"] = io.WriteCount
 	}

-	cpu_time, err := p.proc.Times()
+	cpu_time, err := p.proc.CPUTimes()
 	if err == nil {
 		fields[prefix+"cpu_time_user"] = cpu_time.User
 		fields[prefix+"cpu_time_system"] = cpu_time.System
@@ -86,7 +80,7 @@ func (p *SpecProcessor) pushMetrics() {
 		fields[prefix+"cpu_time_guest_nice"] = cpu_time.GuestNice
 	}

-	cpu_perc, err := p.proc.Percent(time.Duration(0))
+	cpu_perc, err := p.proc.CPUPercent(time.Duration(0))
 	if err == nil && cpu_perc != 0 {
 		fields[prefix+"cpu_usage"] = cpu_perc
 	}
--- a/plugins/inputs/rabbitmq/rabbitmq.go
+++ b/plugins/inputs/rabbitmq/rabbitmq.go
@@ -5,11 +5,9 @@ import (
 	"fmt"
 	"net/http"
 	"strconv"
-	"sync"
 	"time"

 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )

@@ -104,7 +102,7 @@ type gatherFunc func(r *RabbitMQ, acc telegraf.Accumulator, errChan chan error)
 var gatherFunctions = []gatherFunc{gatherOverview, gatherNodes, gatherQueues}

 var sampleConfig = `
-  # url = "http://localhost:15672"
+  url = "http://localhost:15672" # required
  # name = "rmq-server-1" # optional tag
  # username = "guest"
  # password = "guest"
@@ -131,24 +129,23 @@ func (r *RabbitMQ) Gather(acc telegraf.Accumulator) error {
 		}
 	}

-	var wg sync.WaitGroup
-	wg.Add(len(gatherFunctions))
-	errChan := errchan.New(len(gatherFunctions))
-	for _, f := range gatherFunctions {
-		go func(gf gatherFunc) {
-			defer wg.Done()
-			gf(r, acc, errChan.C)
-		}(f)
-	}
-	wg.Wait()
+	var errChan = make(chan error, len(gatherFunctions))

-	return errChan.Error()
+	for _, f := range gatherFunctions {
+		go f(r, acc, errChan)
+	}
+
+	for i := 1; i <= len(gatherFunctions); i++ {
+		err := <-errChan
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
 }

 func (r *RabbitMQ) requestJSON(u string, target interface{}) error {
-	if r.URL == "" {
-		r.URL = DefaultURL
-	}
 	u = fmt.Sprintf("%s%s", r.URL, u)

 	req, err := http.NewRequest("GET", u, nil)
--- a/plugins/inputs/redis/redis.go
+++ b/plugins/inputs/redis/redis.go
@@ -74,7 +74,6 @@ var Tracking = map[string]string{
 	"used_cpu_user":               "used_cpu_user",
 	"used_cpu_sys_children":       "used_cpu_sys_children",
 	"used_cpu_user_children":      "used_cpu_user_children",
-	"role": "role",
 }

 var ErrProtocolError = errors.New("redis protocol error")
@@ -207,11 +206,6 @@ func gatherInfoOutput(
 			keyspace_misses = ival
 		}

-		if name == "role" {
-			tags["role"] = val
-			continue
-		}
-
 		if err == nil {
 			fields[metric] = ival
 			continue
@@ -241,14 +235,10 @@ func gatherKeyspaceLine(
 	name string,
 	line string,
 	acc telegraf.Accumulator,
-	global_tags map[string]string,
+	tags map[string]string,
 ) {
 	if strings.Contains(line, "keys=") {
 		fields := make(map[string]interface{})
-		tags := make(map[string]string)
-		for k, v := range global_tags {
-			tags[k] = v
-		}
 		tags["database"] = name
 		dbparts := strings.Split(line, ",")
 		for _, dbp := range dbparts {
--- a/plugins/inputs/redis/redis_test.go
+++ b/plugins/inputs/redis/redis_test.go
@@ -35,7 +35,6 @@ func TestRedis_ParseMetrics(t *testing.T) {
 	err := gatherInfoOutput(rdr, &acc, tags)
 	require.NoError(t, err)

-	tags = map[string]string{"host": "redis.net", "role": "master"}
 	fields := map[string]interface{}{
 		"uptime":                      uint64(238),
 		"clients":                     uint64(1),
@@ -71,14 +70,13 @@ func TestRedis_ParseMetrics(t *testing.T) {
 		"used_cpu_user_children":      float64(0.00),
 		"keyspace_hitrate":            float64(0.50),
 	}
-	keyspaceTags := map[string]string{"host": "redis.net", "role": "master", "database": "db0"}
 	keyspaceFields := map[string]interface{}{
 		"avg_ttl": uint64(0),
 		"expires": uint64(0),
 		"keys":    uint64(2),
 	}
 	acc.AssertContainsTaggedFields(t, "redis", fields, tags)
-	acc.AssertContainsTaggedFields(t, "redis_keyspace", keyspaceFields, keyspaceTags)
+	acc.AssertContainsTaggedFields(t, "redis_keyspace", keyspaceFields, tags)
 }

 const testOutput = `# Server
--- a/plugins/inputs/rollbar_webhooks/README.md
+++ b/plugins/inputs/rollbar_webhooks/README.md
@@ -1,47 +0,0 @@
-# rollbar_webhooks
-
-This is a Telegraf service plugin that listens for events kicked off by Rollbar Webhooks service and persists data from them into configured outputs. To set up the listener first generate the proper configuration:
-```sh
-$ telegraf -sample-config -input-filter rollbar_webhooks -output-filter influxdb > config.conf.new
-```
-Change the config file to point to the InfluxDB server you are using and adjust the settings to match your environment. Once that is complete:
-```sh
-$ cp config.conf.new /etc/telegraf/telegraf.conf
-$ sudo service telegraf start
-```
-Once the server is running you should configure your Rollbar's Webhooks to point at the `rollbar_webhooks` service. To do this go to `rollbar.com/` and click `Settings > Notifications > Webhook`. In the resulting page set `URL` to `http://<my_ip>:1619`, and click on `Enable Webhook Integration`.
-
-## Events
-
-The titles of the following sections are links to the full payloads and details for each event. The body contains what information from the event is persisted. The format is as follows:
-```
-# TAGS
-* 'tagKey' = `tagValue` type
-# FIELDS
-* 'fieldKey' = `fieldValue` type
-```
-The tag values and field values show the place on the incoming JSON object where the data is sourced from.
-
-See [webhook doc](https://rollbar.com/docs/webhooks/)
-
-#### `new_item` event
-
-**Tags:**
-* 'event' = `event.event_name` string
-* 'environment' = `event.data.item.environment` string
-* 'project_id = `event.data.item.project_id` int
-* 'language' = `event.data.item.last_occurence.language` string
-* 'level' = `event.data.item.last_occurence.level` string
-
-**Fields:**
-* 'id' = `event.data.item.id` int
-
-#### `deploy` event
-
-**Tags:**
-* 'event' = `event.event_name` string
-* 'environment' = `event.data.deploy.environment` string
-* 'project_id = `event.data.deploy.project_id` int
-
-**Fields:**
-* 'id' = `event.data.item.id` int
--- a/plugins/inputs/rollbar_webhooks/rollbar_webhooks.go
+++ b/plugins/inputs/rollbar_webhooks/rollbar_webhooks.go
@@ -1,119 +0,0 @@
-package rollbar_webhooks
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"net/http"
-	"sync"
-	"time"
-
-	"github.com/gorilla/mux"
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/plugins/inputs"
-)
-
-func init() {
-	inputs.Add("rollbar_webhooks", func() telegraf.Input { return NewRollbarWebhooks() })
-}
-
-type RollbarWebhooks struct {
-	ServiceAddress string
-	// Lock for the struct
-	sync.Mutex
-	// Events buffer to store events between Gather calls
-	events []Event
-}
-
-func NewRollbarWebhooks() *RollbarWebhooks {
-	return &RollbarWebhooks{}
-}
-
-func (rb *RollbarWebhooks) SampleConfig() string {
-	return `
-  ## Address and port to host Webhook listener on
-  service_address = ":1619"
-`
-}
-
-func (rb *RollbarWebhooks) Description() string {
-	return "A Rollbar Webhook Event collector"
-}
-
-func (rb *RollbarWebhooks) Gather(acc telegraf.Accumulator) error {
-	rb.Lock()
-	defer rb.Unlock()
-	for _, event := range rb.events {
-		acc.AddFields("rollbar_webhooks", event.Fields(), event.Tags(), time.Now())
-	}
-	rb.events = make([]Event, 0)
-	return nil
-}
-
-func (rb *RollbarWebhooks) Listen() {
-	r := mux.NewRouter()
-	r.HandleFunc("/", rb.eventHandler).Methods("POST")
-	err := http.ListenAndServe(fmt.Sprintf("%s", rb.ServiceAddress), r)
-	if err != nil {
-		log.Printf("Error starting server: %v", err)
-	}
-}
-
-func (rb *RollbarWebhooks) Start(_ telegraf.Accumulator) error {
-	go rb.Listen()
-	log.Printf("Started the rollbar_webhooks service on %s\n", rb.ServiceAddress)
-	return nil
-}
-
-func (rb *RollbarWebhooks) Stop() {
-	log.Println("Stopping the rbWebhooks service")
-}
-
-func (rb *RollbarWebhooks) eventHandler(w http.ResponseWriter, r *http.Request) {
-	defer r.Body.Close()
-	data, err := ioutil.ReadAll(r.Body)
-	if err != nil {
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-
-	dummyEvent := &DummyEvent{}
-	err = json.Unmarshal(data, dummyEvent)
-	if err != nil {
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-
-	event, err := NewEvent(dummyEvent, data)
-	if err != nil {
-		w.WriteHeader(http.StatusOK)
-		return
-	}
-
-	rb.Lock()
-	rb.events = append(rb.events, event)
-	rb.Unlock()
-
-	w.WriteHeader(http.StatusOK)
-}
-
-func generateEvent(event Event, data []byte) (Event, error) {
-	err := json.Unmarshal(data, event)
-	if err != nil {
-		return nil, err
-	}
-	return event, nil
-}
-
-func NewEvent(dummyEvent *DummyEvent, data []byte) (Event, error) {
-	switch dummyEvent.EventName {
-	case "new_item":
-		return generateEvent(&NewItem{}, data)
-	case "deploy":
-		return generateEvent(&Deploy{}, data)
-	default:
-		return nil, errors.New("Not implemented type: " + dummyEvent.EventName)
-	}
-}
--- a/plugins/inputs/rollbar_webhooks/rollbar_webhooks_events.go
+++ b/plugins/inputs/rollbar_webhooks/rollbar_webhooks_events.go
@@ -1,78 +0,0 @@
-package rollbar_webhooks
-
-import "strconv"
-
-type Event interface {
-	Tags() map[string]string
-	Fields() map[string]interface{}
-}
-
-type DummyEvent struct {
-	EventName string `json:"event_name"`
-}
-
-type NewItemDataItemLastOccurence struct {
-	Language string `json:"language"`
-	Level    string `json:"level"`
-}
-
-type NewItemDataItem struct {
-	Id            int                          `json:"id"`
-	Environment   string                       `json:"environment"`
-	ProjectId     int                          `json:"project_id"`
-	LastOccurence NewItemDataItemLastOccurence `json:"last_occurrence"`
-}
-
-type NewItemData struct {
-	Item NewItemDataItem `json:"item"`
-}
-
-type NewItem struct {
-	EventName string      `json:"event_name"`
-	Data      NewItemData `json:"data"`
-}
-
-func (ni *NewItem) Tags() map[string]string {
-	return map[string]string{
-		"event":       ni.EventName,
-		"environment": ni.Data.Item.Environment,
-		"project_id":  strconv.Itoa(ni.Data.Item.ProjectId),
-		"language":    ni.Data.Item.LastOccurence.Language,
-		"level":       ni.Data.Item.LastOccurence.Level,
-	}
-}
-
-func (ni *NewItem) Fields() map[string]interface{} {
-	return map[string]interface{}{
-		"id": ni.Data.Item.Id,
-	}
-}
-
-type DeployDataDeploy struct {
-	Id          int    `json:"id"`
-	Environment string `json:"environment"`
-	ProjectId   int    `json:"project_id"`
-}
-
-type DeployData struct {
-	Deploy DeployDataDeploy `json:"deploy"`
-}
-
-type Deploy struct {
-	EventName string     `json:"event_name"`
-	Data      DeployData `json:"data"`
-}
-
-func (ni *Deploy) Tags() map[string]string {
-	return map[string]string{
-		"event":       ni.EventName,
-		"environment": ni.Data.Deploy.Environment,
-		"project_id":  strconv.Itoa(ni.Data.Deploy.ProjectId),
-	}
-}
-
-func (ni *Deploy) Fields() map[string]interface{} {
-	return map[string]interface{}{
-		"id": ni.Data.Deploy.Id,
-	}
-}
--- a/plugins/inputs/rollbar_webhooks/rollbar_webhooks_events_json_test.go
+++ b/plugins/inputs/rollbar_webhooks/rollbar_webhooks_events_json_test.go
@@ -1,96 +0,0 @@
-package rollbar_webhooks
-
-func NewItemJSON() string {
-	return `
-	{
-	  "event_name": "new_item",
-	  "data": {
-		"item": {
-		  "public_item_id": null,
-		  "integrations_data": {},
-		  "last_activated_timestamp": 1382655421,
-		  "unique_occurrences": null,
-		  "id": 272716944,
-		  "environment": "production",
-		  "title": "testing aobg98wrwe",
-		  "last_occurrence_id": 481761639,
-		  "last_occurrence_timestamp": 1382655421,
-		  "platform": 0,
-		  "first_occurrence_timestamp": 1382655421,
-		  "project_id": 90,
-		  "resolved_in_version": null,
-		  "status": 1,
-		  "hash": "c595b2ae0af9b397bb6bdafd57104ac4d5f6b382",
-		  "last_occurrence": {
-			"body": {
-			  "message": {
-				"body": "testing aobg98wrwe"
-			  }
-			},
-			"uuid": "d2036647-e0b7-4cad-bc98-934831b9b6d1",
-			"language": "python",
-			"level": "error",
-			"timestamp": 1382655421,
-			"server": {
-			  "host": "dev",
-			  "argv": [
-				""
-			  ]
-			},
-			"environment": "production",
-			"framework": "unknown",
-			"notifier": {
-			  "version": "0.5.12",
-			  "name": "pyrollbar"
-			},
-			"metadata": {
-			  "access_token": "",
-			  "debug": {
-				"routes": {
-				  "start_time": 1382212080401,
-				  "counters": {
-					"post_item": 3274122
-				  }
-				}
-			  },
-			  "customer_timestamp": 1382655421,
-			  "api_server_hostname": "web6"
-			}
-		  },
-		  "framework": 0,
-		  "total_occurrences": 1,
-		  "level": 40,
-		  "counter": 4,
-		  "first_occurrence_id": 481761639,
-		  "activating_occurrence_id": 481761639
-		}
-	  }
-	}`
-}
-
-func DeployJSON() string {
-	return `
-    {
-      "event_name": "deploy",
-      "data": {
-        "deploy": {
-          "comment": "deploying webs",
-          "user_id": 1,
-          "finish_time": 1382656039,
-          "start_time": 1382656038,
-          "id": 187585,
-          "environment": "production",
-          "project_id": 90,
-          "local_username": "brian",
-          "revision": "e4b9b7db860b2e5ac799f8c06b9498b71ab270bb"
-        }
-      }
-    }`
-}
-
-func UnknowJSON() string {
-	return `
-    {
-      "event_name": "roger"
-    }`
-}
--- a/plugins/inputs/rollbar_webhooks/rollbar_webhooks_test.go
+++ b/plugins/inputs/rollbar_webhooks/rollbar_webhooks_test.go
@@ -1,74 +0,0 @@
-package rollbar_webhooks
-
-import (
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-
-	"github.com/influxdata/telegraf/testutil"
-)
-
-func postWebhooks(rb *RollbarWebhooks, eventBody string) *httptest.ResponseRecorder {
-	req, _ := http.NewRequest("POST", "/", strings.NewReader(eventBody))
-	w := httptest.NewRecorder()
-	w.Code = 500
-
-	rb.eventHandler(w, req)
-
-	return w
-}
-
-func TestNewItem(t *testing.T) {
-	var acc testutil.Accumulator
-	rb := NewRollbarWebhooks()
-	resp := postWebhooks(rb, NewItemJSON())
-	if resp.Code != http.StatusOK {
-		t.Errorf("POST new_item returned HTTP status code %v.\nExpected %v", resp.Code, http.StatusOK)
-	}
-	rb.Gather(&acc)
-
-	fields := map[string]interface{}{
-		"id": 272716944,
-	}
-
-	tags := map[string]string{
-		"event":       "new_item",
-		"environment": "production",
-		"project_id":  "90",
-		"language":    "python",
-		"level":       "error",
-	}
-
-	acc.AssertContainsTaggedFields(t, "rollbar_webhooks", fields, tags)
-}
-
-func TestDeploy(t *testing.T) {
-	var acc testutil.Accumulator
-	rb := NewRollbarWebhooks()
-	resp := postWebhooks(rb, DeployJSON())
-	if resp.Code != http.StatusOK {
-		t.Errorf("POST deploy returned HTTP status code %v.\nExpected %v", resp.Code, http.StatusOK)
-	}
-	rb.Gather(&acc)
-
-	fields := map[string]interface{}{
-		"id": 187585,
-	}
-
-	tags := map[string]string{
-		"event":       "deploy",
-		"environment": "production",
-		"project_id":  "90",
-	}
-
-	acc.AssertContainsTaggedFields(t, "rollbar_webhooks", fields, tags)
-}
-
-func TestUnknowItem(t *testing.T) {
-	rb := NewRollbarWebhooks()
-	resp := postWebhooks(rb, UnknowJSON())
-	if resp.Code != http.StatusOK {
-		t.Errorf("POST unknow returned HTTP status code %v.\nExpected %v", resp.Code, http.StatusOK)
-	}
-}
--- a/plugins/inputs/snmp/snmp.go
+++ b/plugins/inputs/snmp/snmp.go
@@ -26,6 +26,9 @@ type Snmp struct {
 	nameToOid   map[string]string
 	initNode    Node
 	subTableMap map[string]Subtable
+
+	// TODO change as unexportable
+	//OidInstanceMapping map[string]map[string]string
 }

 type Host struct {
@@ -50,8 +53,6 @@ type Host struct {
 	// array of processed oids
 	// to skip oid duplication
 	processedOids []string
-
-	OidInstanceMapping map[string]map[string]string
 }

 type Table struct {
@@ -115,6 +116,9 @@ type Node struct {
 	subnodes map[string]Node
 }

+// TODO move this var to snmp struct
+var OidInstanceMapping = make(map[string]map[string]string)
+
 var sampleConfig = `
  ## Use 'oids.txt' file to translate oids to names
  ## To generate 'oids.txt' you need to run:
@@ -392,7 +396,7 @@ func (s *Snmp) Gather(acc telegraf.Accumulator) error {
 		// TODO save mapping and computed oids
 		// to do it only the first time
 		// only if len(s.OidInstanceMapping) == 0
-		if len(host.OidInstanceMapping) >= 0 {
+		if len(OidInstanceMapping) >= 0 {
 			if err := host.SNMPMap(acc, s.nameToOid, s.subTableMap); err != nil {
 				log.Printf("SNMP Mapping error for host '%s': %s", host.Address, err)
 				continue
@@ -409,14 +413,7 @@ func (s *Snmp) Gather(acc telegraf.Accumulator) error {
 	return nil
 }

-func (h *Host) SNMPMap(
-	acc telegraf.Accumulator,
-	nameToOid map[string]string,
-	subTableMap map[string]Subtable,
-) error {
-	if h.OidInstanceMapping == nil {
-		h.OidInstanceMapping = make(map[string]map[string]string)
-	}
+func (h *Host) SNMPMap(acc telegraf.Accumulator, nameToOid map[string]string, subTableMap map[string]Subtable) error {
 	// Get snmp client
 	snmpClient, err := h.GetSNMPClient()
 	if err != nil {
@@ -526,11 +523,11 @@ func (h *Host) SNMPMap(

 								// Building mapping table
 								mapping := map[string]string{strings.Trim(key, "."): string(variable.Value.([]byte))}
-								_, exists := h.OidInstanceMapping[table.oid]
+								_, exists := OidInstanceMapping[table.oid]
 								if exists {
-									h.OidInstanceMapping[table.oid][strings.Trim(key, ".")] = string(variable.Value.([]byte))
+									OidInstanceMapping[table.oid][strings.Trim(key, ".")] = string(variable.Value.([]byte))
 								} else {
-									h.OidInstanceMapping[table.oid] = mapping
+									OidInstanceMapping[table.oid] = mapping
 								}

 								// Add table oid in bulk oid list
@@ -723,12 +720,7 @@ func (h *Host) GetSNMPClient() (*gosnmp.GoSNMP, error) {
 	return snmpClient, nil
 }

-func (h *Host) HandleResponse(
-	oids map[string]Data,
-	result *gosnmp.SnmpPacket,
-	acc telegraf.Accumulator,
-	initNode Node,
-) (string, error) {
+func (h *Host) HandleResponse(oids map[string]Data, result *gosnmp.SnmpPacket, acc telegraf.Accumulator, initNode Node) (string, error) {
 	var lastOid string
 	for _, variable := range result.Variables {
 		lastOid = variable.Name
@@ -749,7 +741,7 @@ func (h *Host) HandleResponse(
 				switch variable.Type {
 				// handle Metrics
 				case gosnmp.Boolean, gosnmp.Integer, gosnmp.Counter32, gosnmp.Gauge32,
-					gosnmp.TimeTicks, gosnmp.Counter64, gosnmp.Uinteger32, gosnmp.OctetString:
+					gosnmp.TimeTicks, gosnmp.Counter64, gosnmp.Uinteger32:
 					// Prepare tags
 					tags := make(map[string]string)
 					if oid.Unit != "" {
@@ -763,7 +755,7 @@ func (h *Host) HandleResponse(
 						strings.Split(string(variable.Name[1:]), "."))
 					// Set instance tag
 					// From mapping table
-					mapping, inMappingNoSubTable := h.OidInstanceMapping[oid_key]
+					mapping, inMappingNoSubTable := OidInstanceMapping[oid_key]
 					if inMappingNoSubTable {
 						// filter if the instance in not in
 						// OidInstanceMapping mapping map
@@ -792,7 +784,7 @@ func (h *Host) HandleResponse(
 						// Because the result oid is equal to inputs.snmp.get section
 						field_name = oid.Name
 					}
-					tags["snmp_host"], _, _ = net.SplitHostPort(h.Address)
+					tags["host"], _, _ = net.SplitHostPort(h.Address)
 					fields := make(map[string]interface{})
 					fields[string(field_name)] = variable.Value

--- a/plugins/inputs/snmp/snmp_test.go
+++ b/plugins/inputs/snmp/snmp_test.go
@@ -102,8 +102,8 @@ func TestSNMPGet1(t *testing.T) {
 			"oid1": uint(543846),
 		},
 		map[string]string{
-			"unit":      "octets",
-			"snmp_host": testutil.GetLocalHost(),
+			"unit": "octets",
+			"host": testutil.GetLocalHost(),
 		},
 	)
 }
@@ -140,8 +140,8 @@ func TestSNMPGet2(t *testing.T) {
 			"ifNumber": int(4),
 		},
 		map[string]string{
-			"instance":  "0",
-			"snmp_host": testutil.GetLocalHost(),
+			"instance": "0",
+			"host":     testutil.GetLocalHost(),
 		},
 	)
 }
@@ -180,9 +180,9 @@ func TestSNMPGet3(t *testing.T) {
 			"ifSpeed": uint(10000000),
 		},
 		map[string]string{
-			"unit":      "octets",
-			"instance":  "1",
-			"snmp_host": testutil.GetLocalHost(),
+			"unit":     "octets",
+			"instance": "1",
+			"host":     testutil.GetLocalHost(),
 		},
 	)
 }
@@ -222,9 +222,9 @@ func TestSNMPEasyGet4(t *testing.T) {
 			"ifSpeed": uint(10000000),
 		},
 		map[string]string{
-			"unit":      "octets",
-			"instance":  "1",
-			"snmp_host": testutil.GetLocalHost(),
+			"unit":     "octets",
+			"instance": "1",
+			"host":     testutil.GetLocalHost(),
 		},
 	)

@@ -234,8 +234,8 @@ func TestSNMPEasyGet4(t *testing.T) {
 			"ifNumber": int(4),
 		},
 		map[string]string{
-			"instance":  "0",
-			"snmp_host": testutil.GetLocalHost(),
+			"instance": "0",
+			"host":     testutil.GetLocalHost(),
 		},
 	)
 }
@@ -275,9 +275,9 @@ func TestSNMPEasyGet5(t *testing.T) {
 			"ifSpeed": uint(10000000),
 		},
 		map[string]string{
-			"unit":      "octets",
-			"instance":  "1",
-			"snmp_host": testutil.GetLocalHost(),
+			"unit":     "octets",
+			"instance": "1",
+			"host":     testutil.GetLocalHost(),
 		},
 	)

@@ -287,8 +287,8 @@ func TestSNMPEasyGet5(t *testing.T) {
 			"ifNumber": int(4),
 		},
 		map[string]string{
-			"instance":  "0",
-			"snmp_host": testutil.GetLocalHost(),
+			"instance": "0",
+			"host":     testutil.GetLocalHost(),
 		},
 	)
 }
@@ -320,8 +320,8 @@ func TestSNMPEasyGet6(t *testing.T) {
 			"ifNumber": int(4),
 		},
 		map[string]string{
-			"instance":  "0",
-			"snmp_host": testutil.GetLocalHost(),
+			"instance": "0",
+			"host":     testutil.GetLocalHost(),
 		},
 	)
 }
@@ -360,9 +360,9 @@ func TestSNMPBulk1(t *testing.T) {
 			"ifOutOctets": uint(543846),
 		},
 		map[string]string{
-			"unit":      "octets",
-			"instance":  "1",
-			"snmp_host": testutil.GetLocalHost(),
+			"unit":     "octets",
+			"instance": "1",
+			"host":     testutil.GetLocalHost(),
 		},
 	)

@@ -372,9 +372,9 @@ func TestSNMPBulk1(t *testing.T) {
 			"ifOutOctets": uint(26475179),
 		},
 		map[string]string{
-			"unit":      "octets",
-			"instance":  "2",
-			"snmp_host": testutil.GetLocalHost(),
+			"unit":     "octets",
+			"instance": "2",
+			"host":     testutil.GetLocalHost(),
 		},
 	)

@@ -384,9 +384,9 @@ func TestSNMPBulk1(t *testing.T) {
 			"ifOutOctets": uint(108963968),
 		},
 		map[string]string{
-			"unit":      "octets",
-			"instance":  "3",
-			"snmp_host": testutil.GetLocalHost(),
+			"unit":     "octets",
+			"instance": "3",
+			"host":     testutil.GetLocalHost(),
 		},
 	)

@@ -396,9 +396,9 @@ func TestSNMPBulk1(t *testing.T) {
 			"ifOutOctets": uint(12991453),
 		},
 		map[string]string{
-			"unit":      "octets",
-			"instance":  "36",
-			"snmp_host": testutil.GetLocalHost(),
+			"unit":     "octets",
+			"instance": "36",
+			"host":     testutil.GetLocalHost(),
 		},
 	)
 }
@@ -438,9 +438,9 @@ func dTestSNMPBulk2(t *testing.T) {
 			"ifOutOctets": uint(543846),
 		},
 		map[string]string{
-			"unit":      "octets",
-			"instance":  "1",
-			"snmp_host": testutil.GetLocalHost(),
+			"unit":     "octets",
+			"instance": "1",
+			"host":     testutil.GetLocalHost(),
 		},
 	)

@@ -450,9 +450,9 @@ func dTestSNMPBulk2(t *testing.T) {
 			"ifOutOctets": uint(26475179),
 		},
 		map[string]string{
-			"unit":      "octets",
-			"instance":  "2",
-			"snmp_host": testutil.GetLocalHost(),
+			"unit":     "octets",
+			"instance": "2",
+			"host":     testutil.GetLocalHost(),
 		},
 	)

@@ -462,9 +462,9 @@ func dTestSNMPBulk2(t *testing.T) {
 			"ifOutOctets": uint(108963968),
 		},
 		map[string]string{
-			"unit":      "octets",
-			"instance":  "3",
-			"snmp_host": testutil.GetLocalHost(),
+			"unit":     "octets",
+			"instance": "3",
+			"host":     testutil.GetLocalHost(),
 		},
 	)

@@ -474,9 +474,9 @@ func dTestSNMPBulk2(t *testing.T) {
 			"ifOutOctets": uint(12991453),
 		},
 		map[string]string{
-			"unit":      "octets",
-			"instance":  "36",
-			"snmp_host": testutil.GetLocalHost(),
+			"unit":     "octets",
+			"instance": "36",
+			"host":     testutil.GetLocalHost(),
 		},
 	)
 }
--- a/plugins/inputs/sysstat/sysstat.go
+++ b/plugins/inputs/sysstat/sysstat.go
@@ -140,7 +140,7 @@ func (s *Sysstat) Gather(acc telegraf.Accumulator) error {
 		if firstTimestamp.IsZero() {
 			firstTimestamp = time.Now()
 		} else {
-			s.interval = int(time.Since(firstTimestamp).Seconds() + 0.5)
+			s.interval = int(time.Since(firstTimestamp).Seconds())
 		}
 	}
 	ts := time.Now().Add(time.Duration(s.interval) * time.Second)
--- a/plugins/inputs/system/KERNEL_VMSTAT_README.md
+++ b/plugins/inputs/system/KERNEL_VMSTAT_README.md
@@ -1,225 +0,0 @@
-# Kernel VMStat Input Plugin
-
-The kernel_vmstat plugin gathers virtual memory statistics 
-by reading /proc/vmstat. For a full list of available fields see the 
-/proc/vmstat section of the [proc man page](http://man7.org/linux/man-pages/man5/proc.5.html).
-For a better idea of what each field represents, see the 
-[vmstat man page](http://linux.die.net/man/8/vmstat).
-
-
-```
-/proc/vmstat
-kernel/system statistics. Common entries include (from http://www.linuxinsight.com/proc_vmstat.html):
-
-Number of pages that are dirty, under writeback or unstable:
-
-nr_dirty 1550
-nr_writeback 0
-nr_unstable 0
-
-Number of pages allocated to page tables, mapped by files or allocated by the kernel slab allocator:
-
-nr_page_table_pages 699
-nr_mapped 139596
-nr_slab 42723
-
-Number of pageins and pageouts (since the last boot):
-
-pgpgin 33754195
-pgpgout 38985992
-
-Number of swapins and swapouts (since the last boot):
-
-pswpin 2473
-pswpout 2995
-
-Number of page allocations per zone (since the last boot):
-
-pgalloc_high 0
-pgalloc_normal 110123213
-pgalloc_dma32 0
-pgalloc_dma 415219
-
-Number of page frees, activations and deactivations (since the last boot):
-
-pgfree 110549163
-pgactivate 4509729
-pgdeactivate 2136215
-
-Number of minor and major page faults (since the last boot):
-
-pgfault 80663722
-pgmajfault 49813
-
-Number of page refills (per zone, since the last boot):
-
-pgrefill_high 0
-pgrefill_normal 5817500
-pgrefill_dma32 0
-pgrefill_dma 149176
-
-Number of page steals (per zone, since the last boot):
-
-pgsteal_high 0
-pgsteal_normal 10421346
-pgsteal_dma32 0
-pgsteal_dma 142196
-
-Number of pages scanned by the kswapd daemon (per zone, since the last boot):
-
-pgscan_kswapd_high 0
-pgscan_kswapd_normal 10491424
-pgscan_kswapd_dma32 0
-pgscan_kswapd_dma 156130
-
-Number of pages reclaimed directly (per zone, since the last boot):
-
-pgscan_direct_high 0
-pgscan_direct_normal 11904
-pgscan_direct_dma32 0
-pgscan_direct_dma 225
-
-Number of pages reclaimed via inode freeing (since the last boot):
-
-pginodesteal 11
-
-Number of slab objects scanned (since the last boot):
-
-slabs_scanned 8926976
-
-Number of pages reclaimed by kswapd (since the last boot):
-
-kswapd_steal 10551674
-
-Number of pages reclaimed by kswapd via inode freeing (since the last boot):
-
-kswapd_inodesteal 338730
-
-Number of kswapd's calls to page reclaim (since the last boot):
-
-pageoutrun 181908
-
-Number of direct reclaim calls (since the last boot):
-
-allocstall 160
-
-Miscellaneous statistics:
-
-pgrotated 3781
-nr_bounce 0
-```
-
-### Configuration:
-
-```toml
-# Get kernel statistics from /proc/vmstat
-[[inputs.kernel_vmstat]]
-  # no configuration
-```
-
-### Measurements & Fields:
-
- kernel_vmstat
-    - nr_free_pages (integer, `nr_free_pages`)
-    - nr_inactive_anon (integer, `nr_inactive_anon`)
-    - nr_active_anon (integer, `nr_active_anon`)
-    - nr_inactive_file (integer, `nr_inactive_file`)
-    - nr_active_file (integer, `nr_active_file`)
-    - nr_unevictable (integer, `nr_unevictable`)
-    - nr_mlock (integer, `nr_mlock`)
-    - nr_anon_pages (integer, `nr_anon_pages`)
-    - nr_mapped (integer, `nr_mapped`)
-    - nr_file_pages (integer, `nr_file_pages`)
-    - nr_dirty (integer, `nr_dirty`)
-    - nr_writeback (integer, `nr_writeback`)
-    - nr_slab_reclaimable (integer, `nr_slab_reclaimable`)
-    - nr_slab_unreclaimable (integer, `nr_slab_unreclaimable`)
-    - nr_page_table_pages (integer, `nr_page_table_pages`)
-    - nr_kernel_stack (integer, `nr_kernel_stack`)
-    - nr_unstable (integer, `nr_unstable`)
-    - nr_bounce (integer, `nr_bounce`)
-    - nr_vmscan_write (integer, `nr_vmscan_write`)
-    - nr_writeback_temp (integer, `nr_writeback_temp`)
-    - nr_isolated_anon (integer, `nr_isolated_anon`)
-    - nr_isolated_file (integer, `nr_isolated_file`)
-    - nr_shmem (integer, `nr_shmem`)
-    - numa_hit (integer, `numa_hit`)
-    - numa_miss (integer, `numa_miss`)
-    - numa_foreign (integer, `numa_foreign`)
-    - numa_interleave (integer, `numa_interleave`)
-    - numa_local (integer, `numa_local`)
-    - numa_other (integer, `numa_other`)
-    - nr_anon_transparent_hugepages (integer, `nr_anon_transparent_hugepages`)
-    - pgpgin (integer, `pgpgin`)
-    - pgpgout (integer, `pgpgout`)
-    - pswpin (integer, `pswpin`)
-    - pswpout (integer, `pswpout`)
-    - pgalloc_dma (integer, `pgalloc_dma`)
-    - pgalloc_dma32 (integer, `pgalloc_dma32`)
-    - pgalloc_normal (integer, `pgalloc_normal`)
-    - pgalloc_movable (integer, `pgalloc_movable`)
-    - pgfree (integer, `pgfree`)
-    - pgactivate (integer, `pgactivate`)
-    - pgdeactivate (integer, `pgdeactivate`)
-    - pgfault (integer, `pgfault`)
-    - pgmajfault (integer, `pgmajfault`)
-    - pgrefill_dma (integer, `pgrefill_dma`)
-    - pgrefill_dma32 (integer, `pgrefill_dma32`)
-    - pgrefill_normal (integer, `pgrefill_normal`)
-    - pgrefill_movable (integer, `pgrefill_movable`)
-    - pgsteal_dma (integer, `pgsteal_dma`)
-    - pgsteal_dma32 (integer, `pgsteal_dma32`)
-    - pgsteal_normal (integer, `pgsteal_normal`)
-    - pgsteal_movable (integer, `pgsteal_movable`)
-    - pgscan_kswapd_dma (integer, `pgscan_kswapd_dma`)
-    - pgscan_kswapd_dma32 (integer, `pgscan_kswapd_dma32`)
-    - pgscan_kswapd_normal (integer, `pgscan_kswapd_normal`)
-    - pgscan_kswapd_movable (integer, `pgscan_kswapd_movable`)
-    - pgscan_direct_dma (integer, `pgscan_direct_dma`)
-    - pgscan_direct_dma32 (integer, `pgscan_direct_dma32`)
-    - pgscan_direct_normal (integer, `pgscan_direct_normal`)
-    - pgscan_direct_movable (integer, `pgscan_direct_movable`)
-    - zone_reclaim_failed (integer, `zone_reclaim_failed`)
-    - pginodesteal (integer, `pginodesteal`)
-    - slabs_scanned (integer, `slabs_scanned`)
-    - kswapd_steal (integer, `kswapd_steal`)
-    - kswapd_inodesteal (integer, `kswapd_inodesteal`)
-    - kswapd_low_wmark_hit_quickly (integer, `kswapd_low_wmark_hit_quickly`)
-    - kswapd_high_wmark_hit_quickly (integer, `kswapd_high_wmark_hit_quickly`)
-    - kswapd_skip_congestion_wait (integer, `kswapd_skip_congestion_wait`)
-    - pageoutrun (integer, `pageoutrun`)
-    - allocstall (integer, `allocstall`)
-    - pgrotated (integer, `pgrotated`)
-    - compact_blocks_moved (integer, `compact_blocks_moved`)
-    - compact_pages_moved (integer, `compact_pages_moved`)
-    - compact_pagemigrate_failed (integer, `compact_pagemigrate_failed`)
-    - compact_stall (integer, `compact_stall`)
-    - compact_fail (integer, `compact_fail`)
-    - compact_success (integer, `compact_success`)
-    - htlb_buddy_alloc_success (integer, `htlb_buddy_alloc_success`)
-    - htlb_buddy_alloc_fail (integer, `htlb_buddy_alloc_fail`)
-    - unevictable_pgs_culled (integer, `unevictable_pgs_culled`)
-    - unevictable_pgs_scanned (integer, `unevictable_pgs_scanned`)
-    - unevictable_pgs_rescued (integer, `unevictable_pgs_rescued`)
-    - unevictable_pgs_mlocked (integer, `unevictable_pgs_mlocked`)
-    - unevictable_pgs_munlocked (integer, `unevictable_pgs_munlocked`)
-    - unevictable_pgs_cleared (integer, `unevictable_pgs_cleared`)
-    - unevictable_pgs_stranded (integer, `unevictable_pgs_stranded`)
-    - unevictable_pgs_mlockfreed (integer, `unevictable_pgs_mlockfreed`)
-    - thp_fault_alloc (integer, `thp_fault_alloc`)
-    - thp_fault_fallback (integer, `thp_fault_fallback`)
-    - thp_collapse_alloc (integer, `thp_collapse_alloc`)
-    - thp_collapse_alloc_failed (integer, `thp_collapse_alloc_failed`)
-    - thp_split (integer, `thp_split`)
-
-### Tags:
-
-None
-
-### Example Output:
-
-```
-$ telegraf -config ~/ws/telegraf.conf -input-filter kernel_vmstat -test
-* Plugin: kernel_vmstat, Collection 1
-> kernel_vmstat allocstall=81496i,compact_blocks_moved=238196i,compact_fail=135220i,compact_pagemigrate_failed=0i,compact_pages_moved=6370588i,compact_stall=142092i,compact_success=6872i,htlb_buddy_alloc_fail=0i,htlb_buddy_alloc_success=0i,kswapd_high_wmark_hit_quickly=25439i,kswapd_inodesteal=29770874i,kswapd_low_wmark_hit_quickly=8756i,kswapd_skip_congestion_wait=0i,kswapd_steal=291534428i,nr_active_anon=2515657i,nr_active_file=2244914i,nr_anon_pages=1358675i,nr_anon_transparent_hugepages=2034i,nr_bounce=0i,nr_dirty=5690i,nr_file_pages=5153546i,nr_free_pages=78730i,nr_inactive_anon=426259i,nr_inactive_file=2366791i,nr_isolated_anon=0i,nr_isolated_file=0i,nr_kernel_stack=579i,nr_mapped=558821i,nr_mlock=0i,nr_page_table_pages=11115i,nr_shmem=541689i,nr_slab_reclaimable=459806i,nr_slab_unreclaimable=47859i,nr_unevictable=0i,nr_unstable=0i,nr_vmscan_write=6206i,nr_writeback=0i,nr_writeback_temp=0i,numa_foreign=0i,numa_hit=5113399878i,numa_interleave=35793i,numa_local=5113399878i,numa_miss=0i,numa_other=0i,pageoutrun=505006i,pgactivate=375664931i,pgalloc_dma=0i,pgalloc_dma32=122480220i,pgalloc_movable=0i,pgalloc_normal=5233176719i,pgdeactivate=122735906i,pgfault=8699921410i,pgfree=5359765021i,pginodesteal=9188431i,pgmajfault=122210i,pgpgin=219717626i,pgpgout=3495885510i,pgrefill_dma=0i,pgrefill_dma32=1180010i,pgrefill_movable=0i,pgrefill_normal=119866676i,pgrotated=60620i,pgscan_direct_dma=0i,pgscan_direct_dma32=12256i,pgscan_direct_movable=0i,pgscan_direct_normal=31501600i,pgscan_kswapd_dma=0i,pgscan_kswapd_dma32=4480608i,pgscan_kswapd_movable=0i,pgscan_kswapd_normal=287857984i,pgsteal_dma=0i,pgsteal_dma32=4466436i,pgsteal_movable=0i,pgsteal_normal=318463755i,pswpin=2092i,pswpout=6206i,slabs_scanned=93775616i,thp_collapse_alloc=24857i,thp_collapse_alloc_failed=102214i,thp_fault_alloc=346219i,thp_fault_fallback=895453i,thp_split=9817i,unevictable_pgs_cleared=0i,unevictable_pgs_culled=1531i,unevictable_pgs_mlocked=6988i,unevictable_pgs_mlockfreed=0i,unevictable_pgs_munlocked=6988i,unevictable_pgs_rescued=5426i,unevictable_pgs_scanned=0i,unevictable_pgs_stranded=0i,zone_reclaim_failed=0i 1459455200071462843 
-```
--- a/plugins/inputs/system/MEM_README.md
+++ b/plugins/inputs/system/MEM_README.md
@@ -18,7 +18,7 @@ It is supposed to be used to monitor actual memory usage in a cross platform fas
 designed for informational purposes only.
 - **free**: memory not being used at all (zeroed) that is readily available; note
 that this doesn't reflect the actual memory available (use 'available' instead).
- **used_percent**: the percentage usage calculated as `used / total * 100`
+- **used_percent**: the percentage usage calculated as `(total - used) / total * 100`

 ## Measurements:
 #### Raw Memory measurements:
--- a/plugins/inputs/system/cpu.go
+++ b/plugins/inputs/system/cpu.go
@@ -11,7 +11,7 @@ import (

 type CPUStats struct {
 	ps        PS
-	lastStats []cpu.TimesStat
+	lastStats []cpu.CPUTimesStat

 	PerCPU   bool `toml:"percpu"`
 	TotalCPU bool `toml:"totalcpu"`
@@ -105,7 +105,7 @@ func (s *CPUStats) Gather(acc telegraf.Accumulator) error {
 	return nil
 }

-func totalCpuTime(t cpu.TimesStat) float64 {
+func totalCpuTime(t cpu.CPUTimesStat) float64 {
 	total := t.User + t.System + t.Nice + t.Iowait + t.Irq + t.Softirq + t.Steal +
 		t.Guest + t.GuestNice + t.Idle
 	return total
--- a/plugins/inputs/system/cpu_test.go
+++ b/plugins/inputs/system/cpu_test.go
@@ -15,7 +15,7 @@ func TestCPUStats(t *testing.T) {
 	defer mps.AssertExpectations(t)
 	var acc testutil.Accumulator

-	cts := cpu.TimesStat{
+	cts := cpu.CPUTimesStat{
 		CPU:       "cpu0",
 		User:      3.1,
 		System:    8.2,
@@ -29,7 +29,7 @@ func TestCPUStats(t *testing.T) {
 		GuestNice: 0.324,
 	}

-	cts2 := cpu.TimesStat{
+	cts2 := cpu.CPUTimesStat{
 		CPU:       "cpu0",
 		User:      11.4,     // increased by 8.3
 		System:    10.9,     // increased by 2.7
@@ -43,7 +43,7 @@ func TestCPUStats(t *testing.T) {
 		GuestNice: 2.524,    // increased by 2.2
 	}

-	mps.On("CPUTimes").Return([]cpu.TimesStat{cts}, nil)
+	mps.On("CPUTimes").Return([]cpu.CPUTimesStat{cts}, nil)

 	cs := NewCPUStats(&mps)

@@ -68,7 +68,7 @@ func TestCPUStats(t *testing.T) {
 	assertContainsTaggedFloat(t, &acc, "cpu", "time_guest_nice", 0.324, 0, cputags)

 	mps2 := MockPS{}
-	mps2.On("CPUTimes").Return([]cpu.TimesStat{cts2}, nil)
+	mps2.On("CPUTimes").Return([]cpu.CPUTimesStat{cts2}, nil)
 	cs.ps = &mps2

 	// Should have added cpu percentages too
--- a/plugins/inputs/system/disk_test.go
+++ b/plugins/inputs/system/disk_test.go
@@ -15,7 +15,7 @@ func TestDiskStats(t *testing.T) {
 	var acc testutil.Accumulator
 	var err error

-	duAll := []*disk.UsageStat{
+	duAll := []*disk.DiskUsageStat{
 		{
 			Path:        "/",
 			Fstype:      "ext4",
@@ -37,7 +37,7 @@ func TestDiskStats(t *testing.T) {
 			InodesUsed:  2000,
 		},
 	}
-	duFiltered := []*disk.UsageStat{
+	duFiltered := []*disk.DiskUsageStat{
 		{
 			Path:        "/",
 			Fstype:      "ext4",
@@ -108,7 +108,7 @@ func TestDiskStats(t *testing.T) {
 // 	var acc testutil.Accumulator
 // 	var err error

-// 	diskio1 := disk.IOCountersStat{
+// 	diskio1 := disk.DiskIOCountersStat{
 // 		ReadCount:    888,
 // 		WriteCount:   5341,
 // 		ReadBytes:    100000,
@@ -119,7 +119,7 @@ func TestDiskStats(t *testing.T) {
 // 		IoTime:       123552,
 // 		SerialNumber: "ab-123-ad",
 // 	}
-// 	diskio2 := disk.IOCountersStat{
+// 	diskio2 := disk.DiskIOCountersStat{
 // 		ReadCount:    444,
 // 		WriteCount:   2341,
 // 		ReadBytes:    200000,
@@ -132,7 +132,7 @@ func TestDiskStats(t *testing.T) {
 // 	}

 // 	mps.On("DiskIO").Return(
-// 		map[string]disk.IOCountersStat{"sda1": diskio1, "sdb1": diskio2},
+// 		map[string]disk.DiskIOCountersStat{"sda1": diskio1, "sdb1": diskio2},
 // 		nil)

 // 	err = (&DiskIOStats{ps: &mps}).Gather(&acc)
--- a/plugins/inputs/system/kernel.go
+++ b/plugins/inputs/system/kernel.go
@@ -44,35 +44,35 @@ func (k *Kernel) Gather(acc telegraf.Accumulator) error {
 	for i, field := range dataFields {
 		switch {
 		case bytes.Equal(field, interrupts):
-			m, err := strconv.ParseInt(string(dataFields[i+1]), 10, 64)
+			m, err := strconv.Atoi(string(dataFields[i+1]))
 			if err != nil {
 				return err
 			}
 			fields["interrupts"] = int64(m)
 		case bytes.Equal(field, context_switches):
-			m, err := strconv.ParseInt(string(dataFields[i+1]), 10, 64)
+			m, err := strconv.Atoi(string(dataFields[i+1]))
 			if err != nil {
 				return err
 			}
 			fields["context_switches"] = int64(m)
 		case bytes.Equal(field, processes_forked):
-			m, err := strconv.ParseInt(string(dataFields[i+1]), 10, 64)
+			m, err := strconv.Atoi(string(dataFields[i+1]))
 			if err != nil {
 				return err
 			}
 			fields["processes_forked"] = int64(m)
 		case bytes.Equal(field, boot_time):
-			m, err := strconv.ParseInt(string(dataFields[i+1]), 10, 64)
+			m, err := strconv.Atoi(string(dataFields[i+1]))
 			if err != nil {
 				return err
 			}
 			fields["boot_time"] = int64(m)
 		case bytes.Equal(field, disk_pages):
-			in, err := strconv.ParseInt(string(dataFields[i+1]), 10, 64)
+			in, err := strconv.Atoi(string(dataFields[i+1]))
 			if err != nil {
 				return err
 			}
-			out, err := strconv.ParseInt(string(dataFields[i+2]), 10, 64)
+			out, err := strconv.Atoi(string(dataFields[i+2]))
 			if err != nil {
 				return err
 			}
--- a/plugins/inputs/system/kernel_vmstat.go
+++ b/plugins/inputs/system/kernel_vmstat.go
@@ -1,78 +0,0 @@
-// +build linux
-
-package system
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"strconv"
-
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/plugins/inputs"
-)
-
-type KernelVmstat struct {
-	statFile string
-}
-
-func (k *KernelVmstat) Description() string {
-	return "Get kernel statistics from /proc/vmstat"
-}
-
-func (k *KernelVmstat) SampleConfig() string {
-	return ""
-}
-
-func (k *KernelVmstat) Gather(acc telegraf.Accumulator) error {
-	data, err := k.getProcVmstat()
-	if err != nil {
-		return err
-	}
-
-	fields := make(map[string]interface{})
-
-	dataFields := bytes.Fields(data)
-	for i, field := range dataFields {
-
-		// dataFields is an array of {"stat1_name", "stat1_value", "stat2_name",
-		// "stat2_value", ...}
-		// We only want the even number index as that contain the stat name.
-		if i%2 == 0 {
-			// Convert the stat value into an integer.
-			m, err := strconv.Atoi(string(dataFields[i+1]))
-			if err != nil {
-				return err
-			}
-
-			fields[string(field)] = int64(m)
-		}
-	}
-
-	acc.AddFields("kernel_vmstat", fields, map[string]string{})
-	return nil
-}
-
-func (k *KernelVmstat) getProcVmstat() ([]byte, error) {
-	if _, err := os.Stat(k.statFile); os.IsNotExist(err) {
-		return nil, fmt.Errorf("kernel_vmstat: %s does not exist!", k.statFile)
-	} else if err != nil {
-		return nil, err
-	}
-
-	data, err := ioutil.ReadFile(k.statFile)
-	if err != nil {
-		return nil, err
-	}
-
-	return data, nil
-}
-
-func init() {
-	inputs.Add("kernel_vmstat", func() telegraf.Input {
-		return &KernelVmstat{
-			statFile: "/proc/vmstat",
-		}
-	})
-}
--- a/plugins/inputs/system/kernel_vmstat_test.go
+++ b/plugins/inputs/system/kernel_vmstat_test.go
@@ -1,315 +0,0 @@
-// +build linux
-
-package system
-
-import (
-	"io/ioutil"
-	"os"
-	"testing"
-
-	"github.com/influxdata/telegraf/testutil"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestFullVmStatProcFile(t *testing.T) {
-	tmpfile := makeFakeStatFile([]byte(vmStatFile_Full))
-	defer os.Remove(tmpfile)
-
-	k := KernelVmstat{
-		statFile: tmpfile,
-	}
-
-	acc := testutil.Accumulator{}
-	err := k.Gather(&acc)
-	assert.NoError(t, err)
-
-	fields := map[string]interface{}{
-		"nr_free_pages":                 int64(78730),
-		"nr_inactive_anon":              int64(426259),
-		"nr_active_anon":                int64(2515657),
-		"nr_inactive_file":              int64(2366791),
-		"nr_active_file":                int64(2244914),
-		"nr_unevictable":                int64(0),
-		"nr_mlock":                      int64(0),
-		"nr_anon_pages":                 int64(1358675),
-		"nr_mapped":                     int64(558821),
-		"nr_file_pages":                 int64(5153546),
-		"nr_dirty":                      int64(5690),
-		"nr_writeback":                  int64(0),
-		"nr_slab_reclaimable":           int64(459806),
-		"nr_slab_unreclaimable":         int64(47859),
-		"nr_page_table_pages":           int64(11115),
-		"nr_kernel_stack":               int64(579),
-		"nr_unstable":                   int64(0),
-		"nr_bounce":                     int64(0),
-		"nr_vmscan_write":               int64(6206),
-		"nr_writeback_temp":             int64(0),
-		"nr_isolated_anon":              int64(0),
-		"nr_isolated_file":              int64(0),
-		"nr_shmem":                      int64(541689),
-		"numa_hit":                      int64(5113399878),
-		"numa_miss":                     int64(0),
-		"numa_foreign":                  int64(0),
-		"numa_interleave":               int64(35793),
-		"numa_local":                    int64(5113399878),
-		"numa_other":                    int64(0),
-		"nr_anon_transparent_hugepages": int64(2034),
-		"pgpgin":                        int64(219717626),
-		"pgpgout":                       int64(3495885510),
-		"pswpin":                        int64(2092),
-		"pswpout":                       int64(6206),
-		"pgalloc_dma":                   int64(0),
-		"pgalloc_dma32":                 int64(122480220),
-		"pgalloc_normal":                int64(5233176719),
-		"pgalloc_movable":               int64(0),
-		"pgfree":                        int64(5359765021),
-		"pgactivate":                    int64(375664931),
-		"pgdeactivate":                  int64(122735906),
-		"pgfault":                       int64(8699921410),
-		"pgmajfault":                    int64(122210),
-		"pgrefill_dma":                  int64(0),
-		"pgrefill_dma32":                int64(1180010),
-		"pgrefill_normal":               int64(119866676),
-		"pgrefill_movable":              int64(0),
-		"pgsteal_dma":                   int64(0),
-		"pgsteal_dma32":                 int64(4466436),
-		"pgsteal_normal":                int64(318463755),
-		"pgsteal_movable":               int64(0),
-		"pgscan_kswapd_dma":             int64(0),
-		"pgscan_kswapd_dma32":           int64(4480608),
-		"pgscan_kswapd_normal":          int64(287857984),
-		"pgscan_kswapd_movable":         int64(0),
-		"pgscan_direct_dma":             int64(0),
-		"pgscan_direct_dma32":           int64(12256),
-		"pgscan_direct_normal":          int64(31501600),
-		"pgscan_direct_movable":         int64(0),
-		"zone_reclaim_failed":           int64(0),
-		"pginodesteal":                  int64(9188431),
-		"slabs_scanned":                 int64(93775616),
-		"kswapd_steal":                  int64(291534428),
-		"kswapd_inodesteal":             int64(29770874),
-		"kswapd_low_wmark_hit_quickly":  int64(8756),
-		"kswapd_high_wmark_hit_quickly": int64(25439),
-		"kswapd_skip_congestion_wait":   int64(0),
-		"pageoutrun":                    int64(505006),
-		"allocstall":                    int64(81496),
-		"pgrotated":                     int64(60620),
-		"compact_blocks_moved":          int64(238196),
-		"compact_pages_moved":           int64(6370588),
-		"compact_pagemigrate_failed":    int64(0),
-		"compact_stall":                 int64(142092),
-		"compact_fail":                  int64(135220),
-		"compact_success":               int64(6872),
-		"htlb_buddy_alloc_success":      int64(0),
-		"htlb_buddy_alloc_fail":         int64(0),
-		"unevictable_pgs_culled":        int64(1531),
-		"unevictable_pgs_scanned":       int64(0),
-		"unevictable_pgs_rescued":       int64(5426),
-		"unevictable_pgs_mlocked":       int64(6988),
-		"unevictable_pgs_munlocked":     int64(6988),
-		"unevictable_pgs_cleared":       int64(0),
-		"unevictable_pgs_stranded":      int64(0),
-		"unevictable_pgs_mlockfreed":    int64(0),
-		"thp_fault_alloc":               int64(346219),
-		"thp_fault_fallback":            int64(895453),
-		"thp_collapse_alloc":            int64(24857),
-		"thp_collapse_alloc_failed":     int64(102214),
-		"thp_split":                     int64(9817),
-	}
-	acc.AssertContainsFields(t, "kernel_vmstat", fields)
-}
-
-func TestPartialVmStatProcFile(t *testing.T) {
-	tmpfile := makeFakeStatFile([]byte(vmStatFile_Partial))
-	defer os.Remove(tmpfile)
-
-	k := KernelVmstat{
-		statFile: tmpfile,
-	}
-
-	acc := testutil.Accumulator{}
-	err := k.Gather(&acc)
-	assert.NoError(t, err)
-
-	fields := map[string]interface{}{
-		"unevictable_pgs_culled":     int64(1531),
-		"unevictable_pgs_scanned":    int64(0),
-		"unevictable_pgs_rescued":    int64(5426),
-		"unevictable_pgs_mlocked":    int64(6988),
-		"unevictable_pgs_munlocked":  int64(6988),
-		"unevictable_pgs_cleared":    int64(0),
-		"unevictable_pgs_stranded":   int64(0),
-		"unevictable_pgs_mlockfreed": int64(0),
-		"thp_fault_alloc":            int64(346219),
-		"thp_fault_fallback":         int64(895453),
-		"thp_collapse_alloc":         int64(24857),
-		"thp_collapse_alloc_failed":  int64(102214),
-		"thp_split":                  int64(9817),
-	}
-	acc.AssertContainsFields(t, "kernel_vmstat", fields)
-}
-
-func TestInvalidVmStatProcFile1(t *testing.T) {
-	tmpfile := makeFakeStatFile([]byte(vmStatFile_Invalid))
-	defer os.Remove(tmpfile)
-
-	k := KernelVmstat{
-		statFile: tmpfile,
-	}
-
-	acc := testutil.Accumulator{}
-	err := k.Gather(&acc)
-	assert.Error(t, err)
-}
-
-func TestNoVmStatProcFile(t *testing.T) {
-	tmpfile := makeFakeStatFile([]byte(vmStatFile_Invalid))
-	os.Remove(tmpfile)
-
-	k := KernelVmstat{
-		statFile: tmpfile,
-	}
-
-	acc := testutil.Accumulator{}
-	err := k.Gather(&acc)
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "does not exist")
-}
-
-const vmStatFile_Full = `nr_free_pages 78730
-nr_inactive_anon 426259
-nr_active_anon 2515657
-nr_inactive_file 2366791
-nr_active_file 2244914
-nr_unevictable 0
-nr_mlock 0
-nr_anon_pages 1358675
-nr_mapped 558821
-nr_file_pages 5153546
-nr_dirty 5690
-nr_writeback 0
-nr_slab_reclaimable 459806
-nr_slab_unreclaimable 47859
-nr_page_table_pages 11115
-nr_kernel_stack 579
-nr_unstable 0
-nr_bounce 0
-nr_vmscan_write 6206
-nr_writeback_temp 0
-nr_isolated_anon 0
-nr_isolated_file 0
-nr_shmem 541689
-numa_hit 5113399878
-numa_miss 0
-numa_foreign 0
-numa_interleave 35793
-numa_local 5113399878
-numa_other 0
-nr_anon_transparent_hugepages 2034
-pgpgin 219717626
-pgpgout 3495885510
-pswpin 2092
-pswpout 6206
-pgalloc_dma 0
-pgalloc_dma32 122480220
-pgalloc_normal 5233176719
-pgalloc_movable 0
-pgfree 5359765021
-pgactivate 375664931
-pgdeactivate 122735906
-pgfault 8699921410
-pgmajfault 122210
-pgrefill_dma 0
-pgrefill_dma32 1180010
-pgrefill_normal 119866676
-pgrefill_movable 0
-pgsteal_dma 0
-pgsteal_dma32 4466436
-pgsteal_normal 318463755
-pgsteal_movable 0
-pgscan_kswapd_dma 0
-pgscan_kswapd_dma32 4480608
-pgscan_kswapd_normal 287857984
-pgscan_kswapd_movable 0
-pgscan_direct_dma 0
-pgscan_direct_dma32 12256
-pgscan_direct_normal 31501600
-pgscan_direct_movable 0
-zone_reclaim_failed 0
-pginodesteal 9188431
-slabs_scanned 93775616
-kswapd_steal 291534428
-kswapd_inodesteal 29770874
-kswapd_low_wmark_hit_quickly 8756
-kswapd_high_wmark_hit_quickly 25439
-kswapd_skip_congestion_wait 0
-pageoutrun 505006
-allocstall 81496
-pgrotated 60620
-compact_blocks_moved 238196
-compact_pages_moved 6370588
-compact_pagemigrate_failed 0
-compact_stall 142092
-compact_fail 135220
-compact_success 6872
-htlb_buddy_alloc_success 0
-htlb_buddy_alloc_fail 0
-unevictable_pgs_culled 1531
-unevictable_pgs_scanned 0
-unevictable_pgs_rescued 5426
-unevictable_pgs_mlocked 6988
-unevictable_pgs_munlocked 6988
-unevictable_pgs_cleared 0
-unevictable_pgs_stranded 0
-unevictable_pgs_mlockfreed 0
-thp_fault_alloc 346219
-thp_fault_fallback 895453
-thp_collapse_alloc 24857
-thp_collapse_alloc_failed 102214
-thp_split 9817`
-
-const vmStatFile_Partial = `unevictable_pgs_culled 1531
-unevictable_pgs_scanned 0
-unevictable_pgs_rescued 5426
-unevictable_pgs_mlocked 6988
-unevictable_pgs_munlocked 6988
-unevictable_pgs_cleared 0
-unevictable_pgs_stranded 0
-unevictable_pgs_mlockfreed 0
-thp_fault_alloc 346219
-thp_fault_fallback 895453
-thp_collapse_alloc 24857
-thp_collapse_alloc_failed 102214
-thp_split 9817`
-
-// invalid thp_split measurement
-const vmStatFile_Invalid = `unevictable_pgs_culled 1531
-unevictable_pgs_scanned 0
-unevictable_pgs_rescued 5426
-unevictable_pgs_mlocked 6988
-unevictable_pgs_munlocked 6988
-unevictable_pgs_cleared 0
-unevictable_pgs_stranded 0
-unevictable_pgs_mlockfreed 0
-thp_fault_alloc 346219
-thp_fault_fallback 895453
-thp_collapse_alloc 24857
-thp_collapse_alloc_failed 102214
-thp_split abcd`
-
-func makeFakeVmStatFile(content []byte) string {
-	tmpfile, err := ioutil.TempFile("", "kernel_vmstat_test")
-	if err != nil {
-		panic(err)
-	}
-
-	if _, err := tmpfile.Write(content); err != nil {
-		panic(err)
-	}
-	if err := tmpfile.Close(); err != nil {
-		panic(err)
-	}
-
-	return tmpfile.Name()
-}
--- a/plugins/inputs/system/memory.go
+++ b/plugins/inputs/system/memory.go
@@ -30,8 +30,6 @@ func (s *MemStats) Gather(acc telegraf.Accumulator) error {
 		"free":              vm.Free,
 		"cached":            vm.Cached,
 		"buffered":          vm.Buffers,
-		"active":            vm.Active,
-		"inactive":          vm.Inactive,
 		"used_percent":      100 * float64(vm.Used) / float64(vm.Total),
 		"available_percent": 100 * float64(vm.Available) / float64(vm.Total),
 	}
--- a/plugins/inputs/system/memory_test.go
+++ b/plugins/inputs/system/memory_test.go
@@ -19,8 +19,8 @@ func TestMemStats(t *testing.T) {
 		Available: 7600,
 		Used:      5000,
 		Free:      1235,
-		Active:    8134,
-		Inactive:  1124,
+		// Active:      8134,
+		// Inactive:    1124,
 		// Buffers:     771,
 		// Cached:      4312,
 		// Wired:       134,
@@ -52,8 +52,6 @@ func TestMemStats(t *testing.T) {
 		"free":              uint64(1235),
 		"cached":            uint64(0),
 		"buffered":          uint64(0),
-		"active":            uint64(8134),
-		"inactive":          uint64(1124),
 	}
 	acc.AssertContainsTaggedFields(t, "mem", memfields, make(map[string]string))

--- a/plugins/inputs/system/mock_PS.go
+++ b/plugins/inputs/system/mock_PS.go
@@ -15,55 +15,55 @@ type MockPS struct {
 	mock.Mock
 }

-func (m *MockPS) LoadAvg() (*load.AvgStat, error) {
+func (m *MockPS) LoadAvg() (*load.LoadAvgStat, error) {
 	ret := m.Called()

-	r0 := ret.Get(0).(*load.AvgStat)
+	r0 := ret.Get(0).(*load.LoadAvgStat)
 	r1 := ret.Error(1)

 	return r0, r1
 }

-func (m *MockPS) CPUTimes(perCPU, totalCPU bool) ([]cpu.TimesStat, error) {
+func (m *MockPS) CPUTimes(perCPU, totalCPU bool) ([]cpu.CPUTimesStat, error) {
 	ret := m.Called()

-	r0 := ret.Get(0).([]cpu.TimesStat)
+	r0 := ret.Get(0).([]cpu.CPUTimesStat)
 	r1 := ret.Error(1)

 	return r0, r1
 }

-func (m *MockPS) DiskUsage(mountPointFilter []string, fstypeExclude []string) ([]*disk.UsageStat, error) {
+func (m *MockPS) DiskUsage(mountPointFilter []string, fstypeExclude []string) ([]*disk.DiskUsageStat, error) {
 	ret := m.Called(mountPointFilter, fstypeExclude)

-	r0 := ret.Get(0).([]*disk.UsageStat)
+	r0 := ret.Get(0).([]*disk.DiskUsageStat)
 	r1 := ret.Error(1)

 	return r0, r1
 }

-func (m *MockPS) NetIO() ([]net.IOCountersStat, error) {
+func (m *MockPS) NetIO() ([]net.NetIOCountersStat, error) {
 	ret := m.Called()

-	r0 := ret.Get(0).([]net.IOCountersStat)
+	r0 := ret.Get(0).([]net.NetIOCountersStat)
 	r1 := ret.Error(1)

 	return r0, r1
 }

-func (m *MockPS) NetProto() ([]net.ProtoCountersStat, error) {
+func (m *MockPS) NetProto() ([]net.NetProtoCountersStat, error) {
 	ret := m.Called()

-	r0 := ret.Get(0).([]net.ProtoCountersStat)
+	r0 := ret.Get(0).([]net.NetProtoCountersStat)
 	r1 := ret.Error(1)

 	return r0, r1
 }

-func (m *MockPS) DiskIO() (map[string]disk.IOCountersStat, error) {
+func (m *MockPS) DiskIO() (map[string]disk.DiskIOCountersStat, error) {
 	ret := m.Called()

-	r0 := ret.Get(0).(map[string]disk.IOCountersStat)
+	r0 := ret.Get(0).(map[string]disk.DiskIOCountersStat)
 	r1 := ret.Error(1)

 	return r0, r1
@@ -87,10 +87,10 @@ func (m *MockPS) SwapStat() (*mem.SwapMemoryStat, error) {
 	return r0, r1
 }

-func (m *MockPS) NetConnections() ([]net.ConnectionStat, error) {
+func (m *MockPS) NetConnections() ([]net.NetConnectionStat, error) {
 	ret := m.Called()

-	r0 := ret.Get(0).([]net.ConnectionStat)
+	r0 := ret.Get(0).([]net.NetConnectionStat)
 	r1 := ret.Error(1)

 	return r0, r1
--- a/Show More
+++ b/Show More