WIP

2017-02-04 19:52:38 +00:00
433 changed files with 4407 additions and 24902 deletions
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,7 +1,7 @@
 ## Directions
 GitHub Issues are reserved for actionable bug reports and feature requests.
-General questions should be asked at the [InfluxData Community](https://community.influxdata.com) site.
+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.
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,5 +1,5 @@
 ### Required for all PRs:
- [ ] Signed [CLA](https://influxdata.com/community/cla/).
+- [ ] CHANGELOG.md updated (we recommend not updating this until the PR has been approved by a maintainer)
- [ ] Associated README.md updated.
+- [ ] Sign [CLA](https://influxdata.com/community/cla/) (if not already signed)
- [ ] Has appropriate unit tests.
+- [ ] README.md updated (if adding a new plugin)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,228 +1,7 @@
-## v1.4.5 [2017-12-01]
+## v1.3 [unreleased]
 ### Bugfixes
 - [#3500](https://github.com/influxdata/telegraf/issues/3500): Fix global variable collection when using interval_slow option in mysql input.
 - [#3486](https://github.com/influxdata/telegraf/issues/3486): Fix error getting net connections info in netstat input.
 - [#3529](https://github.com/influxdata/telegraf/issues/3529): Fix HOST_MOUNT_PREFIX in docker with disk input.
 ## v1.4.4 [2017-11-08]
 ### Bugfixes
 - [#3401](https://github.com/influxdata/telegraf/pull/3401): Use schema specified in mqtt_consumer input.
 - [#3419](https://github.com/influxdata/telegraf/issues/3419): Redact datadog API key in log output.
 - [#3311](https://github.com/influxdata/telegraf/issues/3311): Fix error getting pids in netstat input.
 - [#3339](https://github.com/influxdata/telegraf/issues/3339): Support HOST_VAR envvar to locate /var in system input.
 - [#3383](https://github.com/influxdata/telegraf/issues/3383): Use current time if docker container read time is zero value.
 ## v1.4.3 [2017-10-25]
 ### Bugfixes
 - [#3327](https://github.com/influxdata/telegraf/issues/3327): Fix container name filters in docker input.
 - [#3321](https://github.com/influxdata/telegraf/issues/3321): Fix snmpwalk address format in leofs input.
 - [#3329](https://github.com/influxdata/telegraf/issues/3329): Fix case sensitivity issue in sqlserver query.
 - [#3342](https://github.com/influxdata/telegraf/pull/3342): Fix CPU input plugin stuck after suspend on Linux.
 - [#3013](https://github.com/influxdata/telegraf/issues/3013): Fix mongodb input panic when restarting mongodb.
 - [#3224](https://github.com/influxdata/telegraf/pull/3224): Preserve url path prefix in influx output.
 - [#3354](https://github.com/influxdata/telegraf/pull/3354): Fix TELEGRAF_OPTS expansion in systemd service unit.
 - [#3357](https://github.com/influxdata/telegraf/issues/3357): Remove warning when JSON contains null value.
 - [#3375](https://github.com/influxdata/telegraf/issues/3375): Fix ACL token usage in consul input plugin.
 - [#3369](https://github.com/influxdata/telegraf/issues/3369): Fix unquoting error with Tomcat 6.
 - [#3373](https://github.com/influxdata/telegraf/issues/3373): Fix syscall panic in diskio on some Linux systems.
 ## v1.4.2 [2017-10-10]
 ### Bugfixes
 - [#3259](https://github.com/influxdata/telegraf/issues/3259): Fix error if int larger than 32-bit in /proc/vmstat.
 - [#3265](https://github.com/influxdata/telegraf/issues/3265): Fix parsing of JSON with a UTF8 BOM in httpjson.
 - [#2887](https://github.com/influxdata/telegraf/issues/2887): Allow JSON data format to contain zero metrics.
 - [#3284](https://github.com/influxdata/telegraf/issues/3284): Fix format of connection_timeout in mqtt_consumer.
 - [#3081](https://github.com/influxdata/telegraf/issues/3081): Fix case sensitivity error in sqlserver input.
 - [#3297](https://github.com/influxdata/telegraf/issues/3297): Add support for proxy environment variables to http_response.
 - [#1588](https://github.com/influxdata/telegraf/issues/1588): Add support for standard proxy env vars in outputs.
 - [#3282](https://github.com/influxdata/telegraf/issues/3282): Fix panic in cpu input if number of cpus changes.
 - [#2854](https://github.com/influxdata/telegraf/issues/2854): Use chunked transfer encoding in InfluxDB output.
 ## v1.4.1 [2017-09-26]
 ### Bugfixes
 - [#3167](https://github.com/influxdata/telegraf/issues/3167): Fix MQTT input exits if Broker is not available on startup.
 - [#3217](https://github.com/influxdata/telegraf/issues/3217): Fix optional field value conversions in fluentd input.
 - [#3227](https://github.com/influxdata/telegraf/issues/3227): Whitelist allowed char classes for opentsdb output.
 - [#3232](https://github.com/influxdata/telegraf/issues/3232): Fix counter and gauge metric types.
 - [#3235](https://github.com/influxdata/telegraf/issues/3235): Fix skipped line with empty target in iptables.
 - [#3175](https://github.com/influxdata/telegraf/issues/3175): Fix duplicate keys in perf counters sqlserver query.
 - [#3230](https://github.com/influxdata/telegraf/issues/3230): Fix panic in statsd p100 calculation.
 - [#3242](https://github.com/influxdata/telegraf/issues/3242): Fix arm64 packages contain 32-bit executable.
 ## v1.4 [2017-09-05]
 ### Release Notes
 - The `kafka_consumer` input has been updated to support Kafka 0.9 and
  above style consumer offset handling.  The previous version of this plugin
  supporting Kafka 0.8 and below is available as the `kafka_consumer_legacy`
  plugin.
 - In the `aerospike` input the `node_name` field has been changed to be a tag
  for both the `aerospike_node` and `aerospike_namespace` measurements.
 - The default prometheus_client port has been changed to 9273.
 ### New Plugins
 - [fail2ban](./plugins/inputs/fail2ban/README.md) - Thanks to @grugrut
 - [fluentd](./plugins/inputs/fluentd/README.md) - Thanks to @DanKans
 - [histogram](./plugins/aggregators/histogram/README.md) - Thanks to @vlamug
 - [minecraft](./plugins/inputs/minecraft/README.md) - Thanks to @adamperlin & @Ayrdrie
 - [openldap](./plugins/inputs/openldap/README.md) - Thanks to @cobaugh
 - [salesforce](./plugins/inputs/salesforce/README.md) - Thanks to @rody
 - [tomcat](./plugins/inputs/tomcat/README.md) - Thanks to @mlindes
 - [win_services](./plugins/inputs/win_services/README.md) - Thanks to @vlastahajek
 - [zipkin](./plugins/inputs/zipkin/README.md) - Thanks to @adamperlin & @Ayrdrie
 ### Features
 - [#2487](https://github.com/influxdata/telegraf/pull/2487): Add Kafka 0.9+ consumer support
 - [#2773](https://github.com/influxdata/telegraf/pull/2773): Add support for self-signed certs to InfluxDB input plugin
 - [#2293](https://github.com/influxdata/telegraf/pull/2293): Add TCP listener for statsd input
 - [#2581](https://github.com/influxdata/telegraf/pull/2581): Add Docker container environment variables as tags. Only whitelisted
 - [#2817](https://github.com/influxdata/telegraf/pull/2817): Add timeout option to IPMI sensor plugin
 - [#2883](https://github.com/influxdata/telegraf/pull/2883): Add support for an optional SSL/TLS configuration to nginx input plugin
 - [#2882](https://github.com/influxdata/telegraf/pull/2882): Add timezone support for logparser timestamps.
 - [#2814](https://github.com/influxdata/telegraf/pull/2814): Add result_type field for http_response input.
 - [#2734](https://github.com/influxdata/telegraf/pull/2734): Add include/exclude filters for docker containers.
 - [#2602](https://github.com/influxdata/telegraf/pull/2602): Add secure connection support to graphite output.
 - [#2908](https://github.com/influxdata/telegraf/pull/2908): Add min/max response time on linux/darwin to ping.
 - [#2929](https://github.com/influxdata/telegraf/pull/2929): Add HTTP Proxy support to influxdb output.
 - [#2933](https://github.com/influxdata/telegraf/pull/2933): Add standard SSL options to mysql input.
 - [#2875](https://github.com/influxdata/telegraf/pull/2875): Add input plugin for fail2ban.
 - [#2924](https://github.com/influxdata/telegraf/pull/2924): Support HOST_PROC in processes and linux_sysctl_fs inputs.
 - [#2960](https://github.com/influxdata/telegraf/pull/2960): Add Minecraft input plugin.
 - [#2963](https://github.com/influxdata/telegraf/pull/2963): Add support for RethinkDB 1.0 handshake protocol.
 - [#2943](https://github.com/influxdata/telegraf/pull/2943): Add optional usage_active and time_active CPU metrics.
 - [#2973](https://github.com/influxdata/telegraf/pull/2973): Change default prometheus_client port.
 - [#2661](https://github.com/influxdata/telegraf/pull/2661): Add fluentd input plugin.
 - [#2990](https://github.com/influxdata/telegraf/pull/2990): Add result_type field to net_response input plugin.
 - [#2571](https://github.com/influxdata/telegraf/pull/2571): Add read timeout to socket_listener
 - [#2612](https://github.com/influxdata/telegraf/pull/2612): Add input plugin for OpenLDAP.
 - [#3042](https://github.com/influxdata/telegraf/pull/3042): Add network option to dns_query.
 - [#3054](https://github.com/influxdata/telegraf/pull/3054): Add redis_version field to redis input.
 - [#3063](https://github.com/influxdata/telegraf/pull/3063): Add tls options to docker input.
 - [#2387](https://github.com/influxdata/telegraf/pull/2387): Add histogram aggregator plugin.
 - [#3080](https://github.com/influxdata/telegraf/pull/3080): Add zipkin input plugin.
 - [#3023](https://github.com/influxdata/telegraf/pull/3023): Add Windows Services input plugin.
 - [#3098](https://github.com/influxdata/telegraf/pull/3098): Add path tag to logparser containing path of logfile.
 - [#3075](https://github.com/influxdata/telegraf/pull/3075): Add salesforce input plugin.
 - [#3097](https://github.com/influxdata/telegraf/pull/3097): Add option to run varnish under sudo.
 - [#3119](https://github.com/influxdata/telegraf/pull/3119): Add weighted_io_time to diskio input.
 - [#2978](https://github.com/influxdata/telegraf/pull/2978): Add gzip content-encoding support to influxdb output.
 - [#3127](https://github.com/influxdata/telegraf/pull/3127): Allow using system plugin in Windows.
 - [#3112](https://github.com/influxdata/telegraf/pull/3112): Add tomcat input plugin.
 - [#3182](https://github.com/influxdata/telegraf/pull/3182): HTTP headers can be added to InfluxDB output.
 ### Bugfixes
 - [#2607](https://github.com/influxdata/telegraf/issues/2607): Improve logging of errors in Cassandra input.
 - [#2819](https://github.com/influxdata/telegraf/pull/2819): [enh] set db_version at 0 if query version fails
 - [#2749](https://github.com/influxdata/telegraf/pull/2749): Fixed sqlserver input to work with case sensitive server collation.
 - [#2716](https://github.com/influxdata/telegraf/pull/2716): Systemd does not see all shutdowns as failures
 - [#2782](https://github.com/influxdata/telegraf/pull/2782): Reuse transports in input plugins
 - [#2815](https://github.com/influxdata/telegraf/issues/2815): Inputs processes fails with "no such process".
 - [#1137](https://github.com/influxdata/telegraf/issues/1137): Fix multiple plugin loading in win_perf_counters.
 - [#2855](https://github.com/influxdata/telegraf/pull/2855):  MySQL input: log and continue on field parse error.
 - [#2885](https://github.com/influxdata/telegraf/pull/2885): Fix timeout option in Windows ping input sample configuration.
 - [#2911](https://github.com/influxdata/telegraf/issues/2911): Fix Kinesis output plugin in govcloud.
 - [#2917](https://github.com/influxdata/telegraf/issues/2917): Fix Aerospike input adds all nodes to a single series.
 - [#2452](https://github.com/influxdata/telegraf/pull/2452): Improve Prometheus Client output documentation.
 - [#2984](https://github.com/influxdata/telegraf/pull/2984): Display error message if prometheus output fails to listen.
 - [#2997](https://github.com/influxdata/telegraf/issues/2997): Fix elasticsearch output content type detection warning.
 - [#2914](https://github.com/influxdata/telegraf/issues/2914): Prevent possible deadlock when using aggregators.
 - [#2860](https://github.com/influxdata/telegraf/issues/2860): Fix combined tagdrop/tagpass filtering.
 - [#3036](https://github.com/influxdata/telegraf/pull/3036): Fix filtering when both pass and drop match an item.
 - [#2964](https://github.com/influxdata/telegraf/issues/2964): Only report cpu usage for online cpus in docker input.
 - [#3050](https://github.com/influxdata/telegraf/pull/3050): Start first aggregator period at startup time.
 - [#2906](https://github.com/influxdata/telegraf/issues/2906): Fix panic in logparser if file cannot be opened.
 - [#2886](https://github.com/influxdata/telegraf/issues/2886): Default to localhost if zookeeper has no servers set.
 - [#2457](https://github.com/influxdata/telegraf/issues/2457): Fix docker memory and cpu reporting in Windows.
 - [#3058](https://github.com/influxdata/telegraf/issues/3058): Allow iptable entries with trailing text.
 - [#1680](https://github.com/influxdata/telegraf/issues/1680): Sanitize password from couchbase metric.
 - [#3104](https://github.com/influxdata/telegraf/issues/3104): Converge to typed value in prometheus output.
 - [#2899](https://github.com/influxdata/telegraf/issues/2899): Skip compilcation of logparser and tail on solaris.
 - [#2951](https://github.com/influxdata/telegraf/issues/2951): Discard logging from tail library.
 - [#3126](https://github.com/influxdata/telegraf/pull/3126): Remove log message on ping timeout.
 - [#3144](https://github.com/influxdata/telegraf/issues/3144): Don't retry points beyond retention policy.
 - [#3015](https://github.com/influxdata/telegraf/issues/3015): Don't start Telegraf on install in Amazon Linux.
 - [#3153](https://github.com/influxdata/telegraf/issues/3053): Enable hddtemp input on all platforms.
 - [#3142](https://github.com/influxdata/telegraf/issues/3142): Escape backslash within string fields.
 - [#3162](https://github.com/influxdata/telegraf/issues/3162): Fix parsing of SHM remotes in ntpq input
 - [#3149](https://github.com/influxdata/telegraf/issues/3149): Don't fail parsing zpool stats if pool health is UNAVAIL on FreeBSD.
 - [#2672](https://github.com/influxdata/telegraf/issues/2672): Fix NSQ input plugin when used with version 1.0.0-compat.
 - [#2523](https://github.com/influxdata/telegraf/issues/2523): Added CloudWatch metric constraint validation.
 - [#3179](https://github.com/influxdata/telegraf/issues/3179): Skip non-numerical values in graphite format.
 - [#3187](https://github.com/influxdata/telegraf/issues/3187): Fix panic when handling string fields with escapes.
 ## v1.3.5 [2017-07-26]
 ### Bugfixes
 - [#3049](https://github.com/influxdata/telegraf/issues/3049): Fix prometheus output cannot be reloaded.
 - [#3037](https://github.com/influxdata/telegraf/issues/3037): Fix filestat reporting exists when cannot list directory.
 - [#2386](https://github.com/influxdata/telegraf/issues/2386): Fix ntpq parse issue when using dns_lookup.
 - [#2554](https://github.com/influxdata/telegraf/issues/2554): Fix panic when agent.interval = "0s".
 ## v1.3.4 [2017-07-12]
 ### Bugfixes
 - [#3001](https://github.com/influxdata/telegraf/issues/3001): Fix handling of escape characters within fields.
 - [#2988](https://github.com/influxdata/telegraf/issues/2988): Fix chrony plugin does not track system time offset.
 - [#3004](https://github.com/influxdata/telegraf/issues/3004): Do not allow metrics with trailing slashes.
 - [#3011](https://github.com/influxdata/telegraf/issues/3011): Prevent Write from being called concurrently.
 ## v1.3.3 [2017-06-28]
 ### Bugfixes
 - [#2915](https://github.com/influxdata/telegraf/issues/2915): Allow dos line endings in tail and logparser.
 - [#2937](https://github.com/influxdata/telegraf/issues/2937): Remove label value sanitization in prometheus output.
 - [#2948](https://github.com/influxdata/telegraf/issues/2948): Fix bug parsing default timestamps with modified precision.
 - [#2954](https://github.com/influxdata/telegraf/issues/2954): Fix panic in elasticsearch input if cannot determine master.
 ## v1.3.2 [2017-06-14]
 ### Bugfixes
 - [#2862](https://github.com/influxdata/telegraf/issues/2862): Fix InfluxDB UDP metric splitting.
 - [#2888](https://github.com/influxdata/telegraf/issues/2888): Fix mongodb/leofs urls without scheme.
 - [#2822](https://github.com/influxdata/telegraf/issues/2822): Fix inconsistent label dimensions in prometheus output.
 ## v1.3.1 [2017-05-31]
 ### Bugfixes
 - [#2749](https://github.com/influxdata/telegraf/pull/2749): Fixed sqlserver input to work with case sensitive server collation.
 - [#2782](https://github.com/influxdata/telegraf/pull/2782): Reuse transports in input plugins
 - [#2815](https://github.com/influxdata/telegraf/issues/2815): Inputs processes fails with "no such process".
 - [#2851](https://github.com/influxdata/telegraf/pull/2851): Fix InfluxDB output database quoting.
 - [#2856](https://github.com/influxdata/telegraf/issues/2856): Fix net input on older Linux kernels.
 - [#2848](https://github.com/influxdata/telegraf/pull/2848): Fix panic in mongo input.
 - [#2869](https://github.com/influxdata/telegraf/pull/2869): Fix length calculation of split metric buffer.
 ## v1.3 [2017-05-15]
 ### Release Notes
 - Users of the windows `ping` plugin will need to drop or migrate their
 measurements in order to continue using the plugin. The reason for this is that
 the windows plugin was outputting a different type than the linux plugin. This
 made it impossible to use the `ping` plugin for both windows and linux
 machines.
 - Ceph: the `ceph_pgmap_state` metric content has been modified to use a unique field `count`, with each state expressed as a `state` tag.
 Telegraf < 1.3:
@@ -248,18 +27,8 @@ The previous riemann output will still be available using
 `outputs.riemann_legacy` if needed, but that will eventually be deprecated.
 It is highly recommended that all users migrate to the new riemann output plugin.
 - Generic [socket_listener](./plugins/inputs/socket_listener) and
 [socket_writer](./plugins/outputs/socket_writer) plugins have been implemented
 for receiving and sending UDP, TCP, unix, & unix-datagram data. These plugins
 will replace udp_listener and tcp_listener, which are still available but will
 be deprecated eventually.
 ### Features
 - [#2721](https://github.com/influxdata/telegraf/pull/2721): Added SASL options for kafka output plugin.
 - [#2723](https://github.com/influxdata/telegraf/pull/2723): Added SSL configuration for input haproxy.
 - [#2494](https://github.com/influxdata/telegraf/pull/2494): Add interrupts input plugin.
 - [#2094](https://github.com/influxdata/telegraf/pull/2094): Add generic socket listener & writer.
 - [#2204](https://github.com/influxdata/telegraf/pull/2204): Extend http_response to support searching for a substring in response. Return 1 if found, else 0.
 - [#2137](https://github.com/influxdata/telegraf/pull/2137): Added userstats to mysql input plugin.
 - [#2179](https://github.com/influxdata/telegraf/pull/2179): Added more InnoDB metric to MySQL plugin.
@@ -272,71 +41,18 @@ be deprecated eventually.
 - [#2201](https://github.com/influxdata/telegraf/pull/2201): Add lock option to the IPtables input plugin.
 - [#2244](https://github.com/influxdata/telegraf/pull/2244): Support ipmi_sensor plugin querying local ipmi sensors.
 - [#2339](https://github.com/influxdata/telegraf/pull/2339): Increment gather_errors for all errors emitted by inputs.
 - [#2071](https://github.com/influxdata/telegraf/issues/2071): Use official docker SDK.
 - [#1678](https://github.com/influxdata/telegraf/pull/1678): Add AMQP consumer input plugin
 - [#2512](https://github.com/influxdata/telegraf/pull/2512): Added pprof tool.
 - [#2501](https://github.com/influxdata/telegraf/pull/2501): Support DEAD(X) state in system input plugin.
 - [#2522](https://github.com/influxdata/telegraf/pull/2522): Add support for mongodb client certificates.
 - [#1948](https://github.com/influxdata/telegraf/pull/1948): Support adding SNMP table indexes as tags.
 - [#2332](https://github.com/influxdata/telegraf/pull/2332): Add Elasticsearch 5.x output
 - [#2587](https://github.com/influxdata/telegraf/pull/2587): Add json timestamp units configurability
 - [#2597](https://github.com/influxdata/telegraf/issues/2597): Add support for Linux sysctl-fs metrics.
 - [#2425](https://github.com/influxdata/telegraf/pull/2425): Support to include/exclude docker container labels as tags
 - [#1667](https://github.com/influxdata/telegraf/pull/1667): dmcache input plugin
 - [#2637](https://github.com/influxdata/telegraf/issues/2637): Add support for precision in http_listener
 - [#2636](https://github.com/influxdata/telegraf/pull/2636): Add `message_len_max` option to `kafka_consumer` input
 - [#1100](https://github.com/influxdata/telegraf/issues/1100): Add collectd parser
 - [#1820](https://github.com/influxdata/telegraf/issues/1820): easier plugin testing without outputs
 - [#2493](https://github.com/influxdata/telegraf/pull/2493): Check signature in the GitHub webhook plugin
 - [#2038](https://github.com/influxdata/telegraf/issues/2038): Add papertrail support to webhooks
 - [#2253](https://github.com/influxdata/telegraf/pull/2253): Change jolokia plugin to use bulk requests.
 - [#2575](https://github.com/influxdata/telegraf/issues/2575) Add diskio input for Darwin
 - [#2705](https://github.com/influxdata/telegraf/pull/2705): Kinesis output: add use_random_partitionkey option
 - [#2635](https://github.com/influxdata/telegraf/issues/2635): add tcp keep-alive to socket_listener & socket_writer
 - [#2031](https://github.com/influxdata/telegraf/pull/2031): Add Kapacitor input plugin
 - [#2732](https://github.com/influxdata/telegraf/pull/2732): Use go 1.8.1
 - [#2712](https://github.com/influxdata/telegraf/issues/2712): Documentation for rabbitmq input plugin
 - [#2141](https://github.com/influxdata/telegraf/pull/2141): Logparser handles newly-created files.
 ### Bugfixes
 - [#2633](https://github.com/influxdata/telegraf/pull/2633): ipmi_sensor: allow @ symbol in password
 - [#2077](https://github.com/influxdata/telegraf/issues/2077): SQL Server Input - Arithmetic overflow error converting numeric to data type int.
 - [#2262](https://github.com/influxdata/telegraf/issues/2262): Flush jitter can inhibit metric collection.
 - [#2287](https://github.com/influxdata/telegraf/issues/2287): Kubernetes input: Handle null startTime for stopped pods
 - [#1636](https://github.com/influxdata/telegraf/issues/1636): procstat - stop caching PIDs.
 - [#2318](https://github.com/influxdata/telegraf/issues/2318): haproxy input - Add missing fields.
 - [#2287](https://github.com/influxdata/telegraf/issues/2287): Kubernetes input: Handle null startTime for stopped pods.
 - [#2356](https://github.com/influxdata/telegraf/issues/2356): cpu input panic when /proc/stat is empty.
 - [#2341](https://github.com/influxdata/telegraf/issues/2341): telegraf swallowing panics in --test mode.
 - [#2358](https://github.com/influxdata/telegraf/pull/2358): Create pidfile with 644 permissions & defer file deletion.
 - [#2360](https://github.com/influxdata/telegraf/pull/2360): Fixed install/remove of telegraf on non-systemd Debian/Ubuntu systems
 - [#2282](https://github.com/influxdata/telegraf/issues/2282): Reloading telegraf freezes prometheus output.
 - [#2390](https://github.com/influxdata/telegraf/issues/2390): Empty tag value causes error on InfluxDB output.
 - [#2380](https://github.com/influxdata/telegraf/issues/2380): buffer_size field value is negative number from "internal" plugin.
 - [#2414](https://github.com/influxdata/telegraf/issues/2414): Missing error handling in the MySQL plugin leads to segmentation violation.
 - [#2462](https://github.com/influxdata/telegraf/pull/2462): Fix type conflict in windows ping plugin.
 - [#2178](https://github.com/influxdata/telegraf/issues/2178): logparser: regexp with lookahead.
 - [#2466](https://github.com/influxdata/telegraf/issues/2466): Telegraf can crash in LoadDirectory on 0600 files.
 - [#2215](https://github.com/influxdata/telegraf/issues/2215): Iptables input: document better that rules without a comment are ignored.
 - [#2483](https://github.com/influxdata/telegraf/pull/2483): Fix win_perf_counters capping values at 100.
 - [#2498](https://github.com/influxdata/telegraf/pull/2498): Exporting Ipmi.Path to be set by config.
 - [#2500](https://github.com/influxdata/telegraf/pull/2500): Remove warning if parse empty content
 - [#2520](https://github.com/influxdata/telegraf/pull/2520): Update default value for Cloudwatch rate limit
 - [#2513](https://github.com/influxdata/telegraf/issues/2513): create /etc/telegraf/telegraf.d directory in tarball.
 - [#2541](https://github.com/influxdata/telegraf/issues/2541): Return error on unsupported serializer data format.
 - [#1827](https://github.com/influxdata/telegraf/issues/1827): Fix Windows Performance Counters multi instance identifier
 - [#2576](https://github.com/influxdata/telegraf/pull/2576): Add write timeout to Riemann output
 - [#2596](https://github.com/influxdata/telegraf/pull/2596): fix timestamp parsing on prometheus plugin
 - [#2610](https://github.com/influxdata/telegraf/pull/2610): Fix deadlock when output cannot write
 - [#2410](https://github.com/influxdata/telegraf/issues/2410): Fix connection leak in postgresql.
 - [#2628](https://github.com/influxdata/telegraf/issues/2628): Set default measurement name for snmp input.
 - [#2649](https://github.com/influxdata/telegraf/pull/2649): Improve performance of diskio with many disks
 - [#2671](https://github.com/influxdata/telegraf/issues/2671): The internal input plugin uses the wrong units for `heap_objects`
 - [#2684](https://github.com/influxdata/telegraf/pull/2684): Fix ipmi_sensor config is shared between all plugin instances
 - [#2450](https://github.com/influxdata/telegraf/issues/2450): Network statistics not collected when system has alias interfaces
 - [#1911](https://github.com/influxdata/telegraf/issues/1911): Sysstat plugin needs LANG=C or similar locale
 - [#2528](https://github.com/influxdata/telegraf/issues/2528): File output closes standard streams on reload.
 - [#2603](https://github.com/influxdata/telegraf/issues/2603): AMQP output disconnect blocks all outputs
 - [#2706](https://github.com/influxdata/telegraf/issues/2706): Improve documentation for redis input plugin
 ## v1.2.1 [2017-02-01]
@@ -396,6 +112,7 @@ plugins, not just statsd.
 - [#1980](https://github.com/influxdata/telegraf/issues/1980): Hide username/password from elasticsearch error log messages.
 - [#2097](https://github.com/influxdata/telegraf/issues/2097): Configurable HTTP timeouts in Jolokia plugin
 - [#2255](https://github.com/influxdata/telegraf/pull/2255): Allow changing jolokia attribute delimiter
 - [#2094](https://github.com/influxdata/telegraf/pull/2094): Add generic socket listener & writer.
 ### Bugfixes
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -124,7 +124,7 @@ You should also add the following to your SampleConfig() return:
 ```toml
  ## Data format to consume.
-  ## Each data format has its own unique set of configuration options, read
+  ## Each data format has it's own unique set of configuration options, read
  ## more about them here:
  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
  data_format = "influx"
@@ -254,7 +254,7 @@ You should also add the following to your SampleConfig() return:
 ```toml
  ## Data format to output.
-  ## Each data format has its own unique set of configuration options, read
+  ## Each data format has it's own unique set of configuration options, read
  ## more about them here:
  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
  data_format = "influx"
--- a/53
+++ b/53
@@ -1,89 +1,66 @@
-collectd.org 2ce144541b8903101fb8f1483cc0497a68798122
+github.com/Shopify/sarama 574d3147eee384229bf96a5d12c207fe7b5234f3
 github.com/Sirupsen/logrus 61e43dc76f7ee59a82bdf3d71033dc12bea4c77d
 github.com/aerospike/aerospike-client-go 95e1ad7791bdbca44707fedbb29be42024900d9c
 github.com/amir/raidman c74861fe6a7bb8ede0a010ce4485bdbb4fc4c985
-github.com/apache/thrift 4aaa92ece8503a6da9bc6701604f69acf2b99d07
+github.com/aws/aws-sdk-go 7524cb911daddd6e5c9195def8e59ae892bef8d9
 github.com/aws/aws-sdk-go c861d27d0304a79f727e9a8a4e2ac1e74602fdc0
 github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
 github.com/bsm/sarama-cluster ccdc0803695fbce22f1706d04ded46cd518fd832
 github.com/cenkalti/backoff b02f2bbce11d7ea6b97f282ef1771b0fe2f65ef3
 github.com/couchbase/go-couchbase bfe555a140d53dc1adf390f1a1d4b0fd4ceadb28
 github.com/couchbase/gomemcached 4a25d2f4e1dea9ea7dd76dfd943407abf9b07d29
 github.com/couchbase/goutils 5823a0cbaaa9008406021dc5daf80125ea30bba6
 github.com/davecgh/go-spew 346938d642f2ec3594ed81d874461961cd0faa76
-github.com/docker/docker f5ec1e2936dcbe7b5001c2b817188b095c700c27
+github.com/docker/distribution fb0bebc4b64e3881cc52a2478d749845ed76d2a8
-github.com/docker/go-connections 990a1a1a70b0da4c4cb70e117971a4f0babfbf1a
+github.com/docker/engine-api 4290f40c056686fcaa5c9caf02eac1dde9315adf
 github.com/docker/go-connections 9670439d95da2651d9dfc7acc5d2ed92d3f25ee6
 github.com/docker/go-units 0dadbb0345b35ec7ef35e228dabb8de89a65bf52
 github.com/eapache/go-resiliency b86b1ec0dd4209a588dc1285cdd471e73525c0b3
 github.com/eapache/go-xerial-snappy bb955e01b9346ac19dc29eb16586c90ded99a98c
 github.com/eapache/queue 44cc805cf13205b55f69e14bcb69867d1ae92f98
 github.com/eclipse/paho.mqtt.golang d4f545eb108a2d19f9b1a735689dbfb719bc21fb
 github.com/go-logfmt/logfmt 390ab7935ee28ec6b286364bba9b4dd6410cb3d5
 github.com/go-sql-driver/mysql 2e00b5cd70399450106cec6431c2e2ce3cae5034
 github.com/gobwas/glob bea32b9cd2d6f55753d94a28e959b13f0244797a
 github.com/go-ini/ini 9144852efba7c4daf409943ee90767da62d55438
 github.com/gogo/protobuf 7b6c6391c4ff245962047fc1e2c6e08b1cdfa0e8
 github.com/golang/protobuf 8ee79997227bf9b34611aee7946ae64735e6fd93
 github.com/golang/snappy 7db9049039a047d955fe8c19b83c8ff5abd765c7
 github.com/go-ole/go-ole be49f7c07711fcb603cff39e1de7c67926dc0ba7
 github.com/google/go-cmp f94e52cad91c65a63acc1e75d4be223ea22e99bc
 github.com/gorilla/mux 392c28fe23e1c45ddba891b0320b3b5df220beea
 github.com/go-sql-driver/mysql 2e00b5cd70399450106cec6431c2e2ce3cae5034
 github.com/hailocab/go-hostpool e80d13ce29ede4452c43dea11e79b9bc8a15b478
 github.com/hashicorp/consul 63d2fc68239b996096a1c55a0d4b400ea4c2583f
-github.com/influxdata/tail a395bf99fe07c233f41fba0735fa2b13b58588ea
+github.com/hpcloud/tail 915e5feba042395f5fda4dbe9c0e99aeab3088b3
-github.com/influxdata/toml 5d1d907f22ead1cd47adde17ceec5bda9cacaf8f
+github.com/influxdata/config 8ec4638a81500c20be24855812bc8498ebe2dc92
 github.com/influxdata/toml ad49a5c2936f96b8f5943c3fdba47630ccf45a0d
 github.com/influxdata/wlog 7c63b0a71ef8300adc255344d275e10e5c3a71ec
-github.com/jackc/pgx b84338d7d62598f75859b2b146d830b22f1b9ec8
+github.com/jackc/pgx c8080fc4a1bfa44bf90383ad0fdce2f68b7d313c
 github.com/jmespath/go-jmespath bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d
 github.com/kardianos/osext c2c54e542fb797ad986b31721e1baedf214ca413
 github.com/kardianos/service 6d3a0ee7d3425d9d835debc51a0ca1ffa28f4893
 github.com/kballard/go-shellquote d8ec1a69a250a17bb0e419c386eac1f3711dc142
 github.com/klauspost/crc32 cb6bfca970f6908083f26f39a79009d608efd5cd
 github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c
 github.com/Microsoft/go-winio ce2922f643c8fd76b46cadc7f404a06282678b34
 github.com/miekg/dns 99f84ae56e75126dd77e5de4fae2ea034a468ca1
 github.com/naoina/go-stringutil 6b638e95a32d0c1131db0e7fe83775cbea4a0d0b
 github.com/nats-io/go-nats ea9585611a4ab58a205b9b125ebd74c389a6b898
 github.com/nats-io/nats ea9585611a4ab58a205b9b125ebd74c389a6b898
 github.com/nats-io/nuid 289cccf02c178dc782430d534e3c1f5b72af807f
 github.com/nsqio/go-nsq a53d495e81424aaf7a7665a9d32a97715c40e953
 github.com/opencontainers/runc 89ab7f2ccc1e45ddf6485eaa802c35dcf321dfc8
 github.com/opentracing-contrib/go-observer a52f2342449246d5bcc273e65cbdcfa5f7d6c63c
 github.com/opentracing/opentracing-go 06f47b42c792fef2796e9681353e1d908c417827
 github.com/openzipkin/zipkin-go-opentracing 1cafbdfde94fbf2b373534764e0863aa3bd0bf7b
 github.com/pierrec/lz4 5c9560bfa9ace2bf86080bf40d46b34ae44604df
 github.com/pierrec/xxHash 5a004441f897722c627870a981d02b29924215fa
 github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d
 github.com/pmezard/go-difflib/difflib 792786c7400a136282c1664665ae0a8db921c6c2
 github.com/prometheus/client_golang c317fb74746eac4fc65fe3909195f4cf67c5562a
 github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6
 github.com/prometheus/common dd2f054febf4a6c00f2343686efb775948a8bff4
 github.com/prometheus/procfs 1878d9fbb537119d24b21ca07effd591627cd160
 github.com/rcrowley/go-metrics 1f30fe9094a513ce4c700b9a54458bbb0c96996c
 github.com/samuel/go-zookeeper 1d7be4effb13d2d908342d349d71a284a7542693
-github.com/satori/go.uuid 5bf94b69c6b68ee1b541973bb8e1144db23a194b
+github.com/shirou/gopsutil 77b5d0080adb6f028e457906f1944d9fcca34442
 github.com/shirou/gopsutil 384a55110aa5ae052eb93ea94940548c1e305a99
 github.com/shirou/w32 3c9377fc6748f222729a8270fe2775d149a249ad
 github.com/Shopify/sarama c01858abb625b73a3af51d0798e4ad42c8147093
 github.com/Sirupsen/logrus 61e43dc76f7ee59a82bdf3d71033dc12bea4c77d
 github.com/soniah/gosnmp 5ad50dc75ab389f8a1c9f8a67d3a1cd85f67ed15
 github.com/StackExchange/wmi f3e2bae1e0cb5aef83e319133eabfee30013a4a5
 github.com/streadway/amqp 63795daa9a446c920826655f26ba31c81c860fd6
 github.com/stretchr/objx 1a9d0bb9f541897e62256577b352fdbc1fb4fd94
 github.com/stretchr/testify 4d4bfba8f1d1027c4fdbe371823030df51419987
-github.com/vjeantet/grok d73e972b60935c7fec0b4ffbc904ed39ecaf7efe
+github.com/vjeantet/grok 83bfdfdfd1a8146795b28e547a8e3c8b28a466c2
 github.com/wvanbergen/kafka bc265fedb9ff5b5c5d3c0fdcef4a819b3523d3ee
 github.com/wvanbergen/kazoo-go 968957352185472eacb69215fa3dbfcfdbac1096
 github.com/yuin/gopher-lua 66c871e454fcf10251c61bf8eff02d0978cae75a
 github.com/zensqlmonitor/go-mssqldb ffe5510c6fa5e15e6d983210ab501c815b56b363
 golang.org/x/crypto dc137beb6cce2043eb6b5f223ab8bf51c32459f4
 golang.org/x/net f2499483f923065a842d38eb4c7f1927e6fc6e6d
 golang.org/x/sys 739734461d1c916b6c72a63d7efda2b27edb369f
 golang.org/x/text 506f9d5c962f284575e88337e7d9296d27e729d3
-gopkg.in/asn1-ber.v1 4e86f4367175e39f69d9358a5f17b4dda270378d
+gopkg.in/dancannon/gorethink.v1 edc7a6a68e2d8015f5ffe1b2560eed989f8a45be
 gopkg.in/fatih/pool.v2 6e328e67893eb46323ad06f0e92cb9536babbabc
 gopkg.in/fsnotify.v1 a8a77c9133d2d6fd8334f3260d06f60e8d80a5fb
 gopkg.in/gorethink/gorethink.v3 7ab832f7b65573104a555d84a27992ae9ea1f659
 gopkg.in/ldap.v2 8168ee085ee43257585e50c6441aadf54ecb2c9f
 gopkg.in/mgo.v2 3f83fa5005286a7fe593b055f0d7771a7dce4655
 gopkg.in/olivere/elastic.v5 3113f9b9ad37509fe5f8a0e5e91c96fdc4435e26
 gopkg.in/tomb.v1 dd632973f1e7218eb1089048e0798ec9ae7dceb8
 gopkg.in/yaml.v2 4c78c975fe7c825c6d1466c42be594d1d6f3aba6
--- a/11
+++ b/11
@@ -0,0 +1,11 @@
 github.com/Microsoft/go-winio ce2922f643c8fd76b46cadc7f404a06282678b34
 github.com/StackExchange/wmi f3e2bae1e0cb5aef83e319133eabfee30013a4a5
 github.com/go-ole/go-ole be49f7c07711fcb603cff39e1de7c67926dc0ba7
 github.com/shirou/w32 3c9377fc6748f222729a8270fe2775d149a249ad
 golang.org/x/sys a646d33e2ee3172a661fc09bca23bb4889a41bc8
 github.com/go-ini/ini 9144852efba7c4daf409943ee90767da62d55438
 github.com/jmespath/go-jmespath bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d
 github.com/pmezard/go-difflib/difflib 792786c7400a136282c1664665ae0a8db921c6c2
 github.com/stretchr/objx 1a9d0bb9f541897e62256577b352fdbc1fb4fd94
 gopkg.in/fsnotify.v1 a8a77c9133d2d6fd8334f3260d06f60e8d80a5fb
 gopkg.in/tomb.v1 dd632973f1e7218eb1089048e0798ec9ae7dceb8
--- a/137
+++ b/137
@@ -1,73 +1,56 @@
-PREFIX := /usr/local
+VERSION := $(shell sh -c 'git describe --always --tags')
-VERSION := $(shell git describe --exact-match --tags 2>/dev/null)
+BRANCH := $(shell sh -c 'git rev-parse --abbrev-ref HEAD')
-BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
+COMMIT := $(shell sh -c 'git rev-parse --short HEAD')
 COMMIT := $(shell git rev-parse --short HEAD)
 ifdef GOBIN
 PATH := $(GOBIN):$(PATH)
 else
 PATH := $(subst :,/bin:,$(GOPATH))/bin:$(PATH)
 endif
-TELEGRAF := telegraf$(shell go tool dist env | grep -q 'GOOS=.windows.' && echo .exe)
+# Standard Telegraf build
 default: prepare build
-LDFLAGS := $(LDFLAGS) -X main.commit=$(COMMIT) -X main.branch=$(BRANCH)
+# Windows build
-ifdef VERSION
+windows: prepare-windows build-windows
 	LDFLAGS += -X main.version=$(VERSION)
 endif
 # Only run the build (no dependency grabbing)
 build:
 	go install -ldflags \
 		"-X main.version=$(VERSION) -X main.commit=$(COMMIT) -X main.branch=$(BRANCH)" ./...
-all:
+build-windows:
-	$(MAKE) deps
+	GOOS=windows GOARCH=amd64 go build -o telegraf.exe -ldflags \
-	$(MAKE) telegraf
+		"-X main.version=$(VERSION) -X main.commit=$(COMMIT) -X main.branch=$(BRANCH)" \
 		./cmd/telegraf/telegraf.go
-deps:
+build-for-docker:
-	go get github.com/sparrc/gdm
+	CGO_ENABLED=0 GOOS=linux go build -installsuffix cgo -o telegraf -ldflags \
-	gdm restore
+		"-s -X main.version=$(VERSION) -X main.commit=$(COMMIT) -X main.branch=$(BRANCH)" \
-
+		./cmd/telegraf/telegraf.go
 telegraf:
 	go build -i -o $(TELEGRAF) -ldflags "$(LDFLAGS)" ./cmd/telegraf/telegraf.go
 go-install:
 	go install -ldflags "-w -s $(LDFLAGS)" ./cmd/telegraf
 install: telegraf
 	mkdir -p $(DESTDIR)$(PREFIX)/bin/
 	cp $(TELEGRAF) $(DESTDIR)$(PREFIX)/bin/
 test:
 	go test -short ./...
 test-windows:
 	go test ./plugins/inputs/ping/...
 	go test ./plugins/inputs/win_perf_counters/...
 	go test ./plugins/inputs/win_services/...
 lint:
 	go vet ./...
 test-all: lint
 	go test ./...
 # run package script
 package:
 	./scripts/build.py --package --version="$(VERSION)" --platform=linux --arch=all --upload
-clean:
+# Get dependencies and use gdm to checkout changesets
-	-rm -f telegraf
+prepare:
-	-rm -f telegraf.exe
+	go get github.com/sparrc/gdm
 	gdm restore
-# Run all docker containers necessary for integration tests
+# Use the windows godeps file to prepare dependencies
 prepare-windows:
 	go get github.com/sparrc/gdm
 	gdm restore
 	gdm restore -f Godeps_windows
 # Run all docker containers necessary for unit tests
 docker-run:
 	docker run --name aerospike -p "3000:3000" -d aerospike/aerospike-server:3.9.0
 	docker run --name zookeeper -p "2181:2181" -d wurstmeister/zookeeper
 	docker run --name kafka \
-		--link zookeeper:zookeeper \
+		-e ADVERTISED_HOST=localhost \
-		-e KAFKA_ADVERTISED_HOST_NAME=localhost \
+		-e ADVERTISED_PORT=9092 \
-		-e KAFKA_ADVERTISED_PORT=9092 \
+		-p "2181:2181" -p "9092:9092" \
-		-e KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181 \
+		-d spotify/kafka
 		-e KAFKA_CREATE_TOPICS="test:1:1" \
 		-p "9092:9092" \
 		-d wurstmeister/kafka
 	docker run --name elasticsearch -p "9200:9200" -p "9300:9300" -d elasticsearch:5
 	docker run --name mysql -p "3306:3306" -e MYSQL_ALLOW_EMPTY_PASSWORD=yes -d mysql
 	docker run --name memcached -p "11211:11211" -d memcached
 	docker run --name postgres -p "5432:5432" -d postgres
@@ -77,41 +60,37 @@ docker-run:
 	docker run --name mqtt -p "1883:1883" -d ncarlier/mqtt
 	docker run --name riemann -p "5555:5555" -d stealthly/docker-riemann
 	docker run --name nats -p "4222:4222" -d nats
 	docker run --name openldap \
 		-e SLAPD_CONFIG_ROOTDN="cn=manager,cn=config" \
 		-e SLAPD_CONFIG_ROOTPW="secret" \
 		-p "389:389" -p "636:636" \
 		-d cobaugh/openldap-alpine
-# Run docker containers necessary for integration tests; skipping services provided
+# Run docker containers necessary for CircleCI unit tests
 # by CircleCI
 docker-run-circle:
 	docker run --name aerospike -p "3000:3000" -d aerospike/aerospike-server:3.9.0
 	docker run --name zookeeper -p "2181:2181" -d wurstmeister/zookeeper
 	docker run --name kafka \
-		--link zookeeper:zookeeper \
+		-e ADVERTISED_HOST=localhost \
-		-e KAFKA_ADVERTISED_HOST_NAME=localhost \
+		-e ADVERTISED_PORT=9092 \
-		-e KAFKA_ADVERTISED_PORT=9092 \
+		-p "2181:2181" -p "9092:9092" \
-		-e KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181 \
+		-d spotify/kafka
 		-e KAFKA_CREATE_TOPICS="test:1:1" \
 		-p "9092:9092" \
 		-d wurstmeister/kafka
 	docker run --name elasticsearch -p "9200:9200" -p "9300:9300" -d elasticsearch:5
 	docker run --name nsq -p "4150:4150" -d nsqio/nsq /nsqd
 	docker run --name mqtt -p "1883:1883" -d ncarlier/mqtt
 	docker run --name riemann -p "5555:5555" -d stealthly/docker-riemann
 	docker run --name nats -p "4222:4222" -d nats
 	docker run --name openldap \
 		-e SLAPD_CONFIG_ROOTDN="cn=manager,cn=config" \
 		-e SLAPD_CONFIG_ROOTPW="secret" \
 		-p "389:389" -p "636:636" \
 		-d cobaugh/openldap-alpine
 # Kill all docker containers, ignore errors
 docker-kill:
-	-docker kill aerospike elasticsearch kafka memcached mqtt mysql nats nsq \
+	-docker kill nsq aerospike redis rabbitmq postgres memcached mysql kafka mqtt riemann nats
-		openldap postgres rabbitmq redis riemann zookeeper
+	-docker rm nsq aerospike redis rabbitmq postgres memcached mysql kafka mqtt riemann nats
 	-docker rm aerospike elasticsearch kafka memcached mqtt mysql nats nsq \
 		openldap postgres rabbitmq redis riemann zookeeper
-.PHONY: deps telegraf telegraf.exe install test test-windows lint test-all \
+# Run full unit tests using docker containers (includes setup and teardown)
-	package clean docker-run docker-run-circle docker-kill
+test: vet docker-kill docker-run
 	# Sleeping for kafka leadership election, TSDB setup, etc.
 	sleep 60
 	# SUCCESS, running tests
 	go test -race ./...
 # Run "short" unit tests
 test-short: vet
 	go test -short ./...
 vet:
 	go vet ./...
 .PHONY: test test-short vet build default
--- a/README.md
+++ b/README.md
@@ -20,20 +20,20 @@ For more information on Processor and Aggregator plugins please [read this](./do
 New plugins are designed to be easy to contribute,
 we'll eagerly accept pull
 requests and will manage the set of plugins that Telegraf supports.
-
+See the [contributing guide](CONTRIBUTING.md) for instructions on writing
-## Contributing
+new plugins.
 There are many ways to contribute:
 - Fix and [report bugs](https://github.com/influxdata/telegraf/issues/new)
 - [Improve documentation](https://github.com/influxdata/telegraf/issues?q=is%3Aopen+label%3Adocumentation)
 - [Review code and feature proposals](https://github.com/influxdata/telegraf/pulls)
 - Answer questions on github and on the [Community Site](https://community.influxdata.com/)
 - [Contribute plugins](CONTRIBUTING.md)
 ## Installation:
-You can download the binaries directly from the [downloads](https://www.influxdata.com/downloads) page
+You can either download the binaries directly from the
-or from the [releases](https://github.com/influxdata/telegraf/releases) section.
+[downloads](https://www.influxdata.com/downloads) page.
 A few alternate installs are available here as well:
 ### FreeBSD tarball:
 Latest:
 * https://dl.influxdata.com/telegraf/releases/telegraf-VERSION_freebsd_amd64.tar.gz
 ### Ansible Role:
@@ -41,14 +41,13 @@ Ansible role: https://github.com/rossmcdonald/telegraf
 ### From Source:
-Telegraf requires golang version 1.8+, the Makefile requires GNU make.
+Telegraf manages dependencies via [gdm](https://github.com/sparrc/gdm),
-
+which gets installed via the Makefile
-Dependencies are managed with [gdm](https://github.com/sparrc/gdm),
+if you don't have it already. You also must build with golang version 1.5+.
 which is installed by the Makefile if you don't have it already.
 1. [Install Go](https://golang.org/doc/install)
 2. [Setup your GOPATH](https://golang.org/doc/code.html#GOPATH)
-3. Run `go get -d github.com/influxdata/telegraf`
+3. Run `go get github.com/influxdata/telegraf`
 4. Run `cd $GOPATH/src/github.com/influxdata/telegraf`
 5. Run `make`
@@ -57,37 +56,37 @@ which is installed by the Makefile if you don't have it already.
 See usage with:
 ```
-./telegraf --help
+telegraf --help
 ```
 #### Generate a telegraf config file:
 ```
-./telegraf config > telegraf.conf
+telegraf config > telegraf.conf
 ```
-#### Generate config with only cpu input & influxdb output plugins defined:
+#### Generate config with only cpu input & influxdb output plugins defined
 ```
-./telegraf --input-filter cpu --output-filter influxdb config
+telegraf --input-filter cpu --output-filter influxdb config
 ```
-#### Run a single telegraf collection, outputing metrics to stdout:
+#### Run a single telegraf collection, outputing metrics to stdout
 ```
-./telegraf --config telegraf.conf --test
+telegraf --config telegraf.conf -test
 ```
-#### Run telegraf with all plugins defined in config file:
+#### Run telegraf with all plugins defined in config file
 ```
-./telegraf --config telegraf.conf
+telegraf --config telegraf.conf
 ```
-#### Run telegraf, enabling the cpu & memory input, and influxdb output plugins:
+#### Run telegraf, enabling the cpu & memory input, and influxdb output plugins
 ```
-./telegraf --config telegraf.conf --input-filter cpu:mem --output-filter influxdb
+telegraf --config telegraf.conf -input-filter cpu:mem -output-filter influxdb
 ```
@@ -98,48 +97,39 @@ configuration options.
 ## Input Plugins
 * [aerospike](./plugins/inputs/aerospike)
 * [amqp_consumer](./plugins/inputs/amqp_consumer) (rabbitmq)
 * [apache](./plugins/inputs/apache)
 * [aws cloudwatch](./plugins/inputs/cloudwatch)
 * [aerospike](./plugins/inputs/aerospike)
 * [apache](./plugins/inputs/apache)
 * [bcache](./plugins/inputs/bcache)
 * [cassandra](./plugins/inputs/cassandra)
 * [ceph](./plugins/inputs/ceph)
 * [cgroup](./plugins/inputs/cgroup)
 * [chrony](./plugins/inputs/chrony)
 * [consul](./plugins/inputs/consul)
 * [conntrack](./plugins/inputs/conntrack)
 * [couchbase](./plugins/inputs/couchbase)
 * [couchdb](./plugins/inputs/couchdb)
 * [disque](./plugins/inputs/disque)
 * [dmcache](./plugins/inputs/dmcache)
 * [dns query time](./plugins/inputs/dns_query)
 * [docker](./plugins/inputs/docker)
 * [dovecot](./plugins/inputs/dovecot)
 * [elasticsearch](./plugins/inputs/elasticsearch)
 * [exec](./plugins/inputs/exec) (generic executable plugin, support JSON, influx, graphite and nagios)
 * [fail2ban](./plugins/inputs/fail2ban)
 * [filestat](./plugins/inputs/filestat)
 * [fluentd](./plugins/inputs/fluentd)
 * [graylog](./plugins/inputs/graylog)
 * [haproxy](./plugins/inputs/haproxy)
 * [hddtemp](./plugins/inputs/hddtemp)
 * [http_response](./plugins/inputs/http_response)
 * [httpjson](./plugins/inputs/httpjson) (generic JSON-emitting http service plugin)
 * [internal](./plugins/inputs/internal)
 * [influxdb](./plugins/inputs/influxdb)
 * [interrupts](./plugins/inputs/interrupts)
 * [ipmi_sensor](./plugins/inputs/ipmi_sensor)
 * [iptables](./plugins/inputs/iptables)
 * [jolokia](./plugins/inputs/jolokia)
 * [kapacitor](./plugins/inputs/kapacitor)
 * [kubernetes](./plugins/inputs/kubernetes)
 * [leofs](./plugins/inputs/leofs)
 * [lustre2](./plugins/inputs/lustre2)
 * [mailchimp](./plugins/inputs/mailchimp)
 * [memcached](./plugins/inputs/memcached)
 * [mesos](./plugins/inputs/mesos)
 * [minecraft](./plugins/inputs/minecraft)
 * [mongodb](./plugins/inputs/mongodb)
 * [mysql](./plugins/inputs/mysql)
 * [net_response](./plugins/inputs/net_response)
@@ -147,7 +137,6 @@ configuration options.
 * [nsq](./plugins/inputs/nsq)
 * [nstat](./plugins/inputs/nstat)
 * [ntpq](./plugins/inputs/ntpq)
 * [openldap](./plugins/inputs/openldap)
 * [phpfpm](./plugins/inputs/phpfpm)
 * [phusion passenger](./plugins/inputs/passenger)
 * [ping](./plugins/inputs/ping)
@@ -155,25 +144,22 @@ configuration options.
 * [postgresql_extensible](./plugins/inputs/postgresql_extensible)
 * [powerdns](./plugins/inputs/powerdns)
 * [procstat](./plugins/inputs/procstat)
-* [prometheus](./plugins/inputs/prometheus) (can be used for [Caddy server](./plugins/inputs/prometheus/README.md#usage-for-caddy-http-server))
+* [prometheus](./plugins/inputs/prometheus)
 * [puppetagent](./plugins/inputs/puppetagent)
 * [rabbitmq](./plugins/inputs/rabbitmq)
 * [raindrops](./plugins/inputs/raindrops)
 * [redis](./plugins/inputs/redis)
 * [rethinkdb](./plugins/inputs/rethinkdb)
 * [riak](./plugins/inputs/riak)
 * [salesforce](./plugins/inputs/salesforce)
 * [sensors](./plugins/inputs/sensors)
 * [snmp](./plugins/inputs/snmp)
 * [snmp_legacy](./plugins/inputs/snmp_legacy)
 * [sql server](./plugins/inputs/sqlserver) (microsoft)
 * [tomcat](./plugins/inputs/tomcat)
 * [twemproxy](./plugins/inputs/twemproxy)
 * [varnish](./plugins/inputs/varnish)
 * [zfs](./plugins/inputs/zfs)
 * [zookeeper](./plugins/inputs/zookeeper)
-* [win_perf_counters](./plugins/inputs/win_perf_counters) (windows performance counters)
+* [win_perf_counters ](./plugins/inputs/win_perf_counters) (windows performance counters)
 * [win_services](./plugins/inputs/win_services)
 * [sysstat](./plugins/inputs/sysstat)
 * [system](./plugins/inputs/system)
    * cpu
@@ -186,7 +172,6 @@ configuration options.
    * processes
    * kernel (/proc/stat)
    * kernel (/proc/vmstat)
    * linux_sysctl_fs (/proc/sys/fs)
 Telegraf can also collect metrics via the following service plugins:
@@ -199,25 +184,13 @@ Telegraf can also collect metrics via the following service plugins:
 * [statsd](./plugins/inputs/statsd)
 * [socket_listener](./plugins/inputs/socket_listener)
 * [tail](./plugins/inputs/tail)
-* [tcp_listener](./plugins/inputs/socket_listener)
+* [tcp_listener](./plugins/inputs/tcp_listener)
-* [udp_listener](./plugins/inputs/socket_listener)
+* [udp_listener](./plugins/inputs/udp_listener)
 * [webhooks](./plugins/inputs/webhooks)
  * [filestack](./plugins/inputs/webhooks/filestack)
  * [github](./plugins/inputs/webhooks/github)
  * [mandrill](./plugins/inputs/webhooks/mandrill)
  * [rollbar](./plugins/inputs/webhooks/rollbar)
  * [papertrail](./plugins/inputs/webhooks/papertrail)
 * [zipkin](./plugins/inputs/zipkin)
 Telegraf is able to parse the following input data formats into metrics, these
 formats may be used with input plugins supporting the `data_format` option:
 * [InfluxDB Line Protocol](./docs/DATA_FORMATS_INPUT.md#influx)
 * [JSON](./docs/DATA_FORMATS_INPUT.md#json)
 * [Graphite](./docs/DATA_FORMATS_INPUT.md#graphite)
 * [Value](./docs/DATA_FORMATS_INPUT.md#value)
 * [Nagios](./docs/DATA_FORMATS_INPUT.md#nagios)
 * [Collectd](./docs/DATA_FORMATS_INPUT.md#collectd)
 ## Processor Plugins
@@ -226,7 +199,6 @@ formats may be used with input plugins supporting the `data_format` option:
 ## Aggregator Plugins
 * [minmax](./plugins/aggregators/minmax)
 * [histogram](./plugins/aggregators/histogram)
 ## Output Plugins
@@ -237,7 +209,6 @@ formats may be used with input plugins supporting the `data_format` option:
 * [aws cloudwatch](./plugins/outputs/cloudwatch)
 * [datadog](./plugins/outputs/datadog)
 * [discard](./plugins/outputs/discard)
 * [elasticsearch](./plugins/outputs/elasticsearch)
 * [file](./plugins/outputs/file)
 * [graphite](./plugins/outputs/graphite)
 * [graylog](./plugins/outputs/graylog)
@@ -249,8 +220,12 @@ formats may be used with input plugins supporting the `data_format` option:
 * [nsq](./plugins/outputs/nsq)
 * [opentsdb](./plugins/outputs/opentsdb)
 * [prometheus](./plugins/outputs/prometheus_client)
 * [socket_writer](./plugins/outputs/socket_writer)
 * [riemann](./plugins/outputs/riemann)
 * [riemann_legacy](./plugins/outputs/riemann_legacy)
-* [socket_writer](./plugins/outputs/socket_writer)
+
-* [tcp](./plugins/outputs/socket_writer)
+## Contributing
-* [udp](./plugins/outputs/socket_writer)
+
 Please see the
 [contributing guide](CONTRIBUTING.md)
 for details on contributing a plugin to Telegraf.
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -191,12 +191,6 @@ func (a *Agent) Test() error {
 	}()
 	for _, input := range a.Config.Inputs {
 		if _, ok := input.Input.(telegraf.ServiceInput); ok {
 			fmt.Printf("\nWARNING: skipping plugin [[%s]]: service inputs not supported in --test mode\n",
 				input.Name())
 			continue
 		}
 		acc := NewAccumulator(input, metricC)
 		acc.SetPrecision(a.Config.Agent.Precision.Duration,
 			a.Config.Agent.Interval.Duration)
@@ -215,7 +209,7 @@ func (a *Agent) Test() error {
 		// Special instructions for some inputs. cpu, for example, needs to be
 		// run twice in order to return cpu usage percentages.
 		switch input.Name() {
-		case "inputs.cpu", "inputs.mongodb", "inputs.procstat":
+		case "cpu", "mongodb", "procstat":
 			time.Sleep(500 * time.Millisecond)
 			fmt.Printf("* Plugin: %s, Collection 2\n", input.Name())
 			if err := input.Input.Gather(acc); err != nil {
@@ -247,7 +241,7 @@ func (a *Agent) flush() {
 }
 // flusher monitors the metrics input channel and flushes on the minimum interval
-func (a *Agent) flusher(shutdown chan struct{}, metricC chan telegraf.Metric, aggC chan telegraf.Metric) error {
+func (a *Agent) flusher(shutdown chan struct{}, metricC chan telegraf.Metric) error {
 	// Inelegant, but this sleep is to allow the Gather threads to run, so that
 	// the flusher will flush after metrics are collected.
 	time.Sleep(time.Millisecond * 300)
@@ -291,29 +285,6 @@ func (a *Agent) flusher(shutdown chan struct{}, metricC chan telegraf.Metric, ag
 		}
 	}()
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
 		for {
 			select {
 			case <-shutdown:
 				if len(aggC) > 0 {
 					// keep going until aggC is flushed
 					continue
 				}
 				return
 			case metric := <-aggC:
 				metrics := []telegraf.Metric{metric}
 				for _, processor := range a.Config.Processors {
 					metrics = processor.Apply(metrics...)
 				}
 				for _, m := range metrics {
 					outMetricC <- m
 				}
 			}
 		}
 	}()
 	ticker := time.NewTicker(a.Config.Agent.FlushInterval.Duration)
 	semaphore := make(chan struct{}, 1)
 	for {
@@ -362,9 +333,6 @@ func (a *Agent) Run(shutdown chan struct{}) error {
 	// channel shared between all input threads for accumulating metrics
 	metricC := make(chan telegraf.Metric, 100)
 	aggC := make(chan telegraf.Metric, 100)
 	now := time.Now()
 	// Start all ServicePlugins
 	for _, input := range a.Config.Inputs {
@@ -393,7 +361,7 @@ func (a *Agent) Run(shutdown chan struct{}) error {
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
-		if err := a.flusher(shutdown, metricC, aggC); err != nil {
+		if err := a.flusher(shutdown, metricC); err != nil {
 			log.Printf("E! Flusher routine failed, exiting: %s\n", err.Error())
 			close(shutdown)
 		}
@@ -403,10 +371,10 @@ func (a *Agent) Run(shutdown chan struct{}) error {
 	for _, aggregator := range a.Config.Aggregators {
 		go func(agg *models.RunningAggregator) {
 			defer wg.Done()
-			acc := NewAccumulator(agg, aggC)
+			acc := NewAccumulator(agg, metricC)
 			acc.SetPrecision(a.Config.Agent.Precision.Duration,
 				a.Config.Agent.Interval.Duration)
-			agg.Run(acc, now, shutdown)
+			agg.Run(acc, shutdown)
 		}(aggregator)
 	}
@@ -424,6 +392,5 @@ func (a *Agent) Run(shutdown chan struct{}) error {
 	}
 	wg.Wait()
 	a.Close()
 	return nil
 }
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,32 +0,0 @@
 version: "{build}"
 cache:
 - C:\Cache
 clone_folder: C:\gopath\src\github.com\influxdata\telegraf
 environment:
  GOPATH: C:\gopath
 platform: x64
 install:
  - IF NOT EXIST "C:\Cache" mkdir C:\Cache
  - IF NOT EXIST "C:\Cache\go1.8.1.msi" curl -o "C:\Cache\go1.8.1.msi" https://storage.googleapis.com/golang/go1.8.1.windows-amd64.msi
  - IF NOT EXIST "C:\Cache\gnuwin32-bin.zip" curl -o "C:\Cache\gnuwin32-bin.zip" https://dl.influxdata.com/telegraf/ci/make-3.81-bin.zip
  - IF NOT EXIST "C:\Cache\gnuwin32-dep.zip" curl -o "C:\Cache\gnuwin32-dep.zip" https://dl.influxdata.com/telegraf/ci/make-3.81-dep.zip
  - IF EXIST "C:\Go" rmdir /S /Q C:\Go
  - msiexec.exe /i "C:\Cache\go1.8.1.msi" /quiet
  - 7z x "C:\Cache\gnuwin32-bin.zip" -oC:\GnuWin32 -y
  - 7z x "C:\Cache\gnuwin32-dep.zip" -oC:\GnuWin32 -y
  - go version
  - go env
 build_script:
  - cmd: C:\GnuWin32\bin\make
 test_script:
  - cmd: C:\GnuWin32\bin\make test-windows
 artifacts:
  - path: telegraf.exe
--- a/circle.yml
+++ b/circle.yml
@@ -1,13 +1,12 @@
 machine:
  services:
    - docker
    - memcached
    - redis
    - rabbitmq-server
  post:
    - sudo service zookeeper stop
    - go version
    - sudo rm -rf /usr/local/go
-    - wget https://storage.googleapis.com/golang/go1.8.4.linux-amd64.tar.gz
+    - wget https://storage.googleapis.com/golang/go1.8rc3.linux-amd64.tar.gz
-    - sudo tar -C /usr/local -xzf go1.8.4.linux-amd64.tar.gz
+    - sudo tar -C /usr/local -xzf go1.8rc3.linux-amd64.tar.gz
    - go version
 dependencies:
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -4,10 +4,11 @@ import (
 	"flag"
 	"fmt"
 	"log"
 	"net/http"
 	_ "net/http/pprof" // Comment this line to disable pprof endpoint.
 	"os"
 	"os/signal"
 	"path"
 	"path/filepath"
 	"plugin"
 	"runtime"
 	"strings"
 	"syscall"
@@ -26,8 +27,6 @@ import (
 var fDebug = flag.Bool("debug", false,
 	"turn on debug logging")
 var pprofAddr = flag.String("pprof-addr", "",
 	"pprof address to listen on, not activate pprof if empty")
 var fQuiet = flag.Bool("quiet", false,
 	"run in quiet mode")
 var fTest = flag.Bool("test", false, "gather metrics, print them out, and exit")
@@ -51,15 +50,15 @@ var fAggregatorFilters = flag.String("aggregator-filter", "",
 var fProcessorFilters = flag.String("processor-filter", "",
 	"filter the processors to enable, separator is :")
 var fUsage = flag.String("usage", "",
-	"print usage for a plugin, ie, 'telegraf --usage mysql'")
+	"print usage for a plugin, ie, 'telegraf -usage mysql'")
 var fService = flag.String("service", "",
 	"operate on the service")
 var fPlugins = flag.String("plugins", "",
 	"path to directory containing external plugins")
 // Telegraf version, populated linker.
 //   ie, -ldflags "-X main.version=`git describe --always --tags`"
 var (
 	nextVersion = "1.4.0"
 	version string
 	commit  string
 	branch  string
@@ -93,7 +92,6 @@ The commands & flags are:
  --output-filter     filter the output plugins to enable, separator is :
  --usage             print usage for a plugin, ie, 'telegraf --usage mysql'
  --debug             print metrics as they're generated to stdout
  --pprof-addr        pprof address to listen on, format: localhost:6060 or :6060
  --quiet             run in quiet mode
 Examples:
@@ -105,16 +103,13 @@ Examples:
  telegraf --input-filter cpu --output-filter influxdb config
  # run a single telegraf collection, outputing metrics to stdout
-  telegraf --config telegraf.conf --test
+  telegraf --config telegraf.conf -test
  # run telegraf with all plugins defined in config file
  telegraf --config telegraf.conf
  # run telegraf, enabling the cpu & memory input, and influxdb output plugins
  telegraf --config telegraf.conf --input-filter cpu:mem --output-filter influxdb
  # run telegraf with pprof
  telegraf --config telegraf.conf --pprof-addr localhost:6060
 `
 var stop chan struct{}
@@ -146,23 +141,13 @@ func reloadLoop(
 				log.Fatal("E! " + err.Error())
 			}
 		}
-		if !*fTest && len(c.Outputs) == 0 {
+		if len(c.Outputs) == 0 {
 			log.Fatalf("E! Error: no outputs found, did you provide a valid config file?")
 		}
 		if len(c.Inputs) == 0 {
 			log.Fatalf("E! Error: no inputs found, did you provide a valid config file?")
 		}
 		if int64(c.Agent.Interval.Duration) <= 0 {
 			log.Fatalf("E! Agent interval must be positive, found %s",
 				c.Agent.Interval.Duration)
 		}
 		if int64(c.Agent.FlushInterval.Duration) <= 0 {
 			log.Fatalf("E! Agent flush_interval must be positive; found %s",
 				c.Agent.Interval.Duration)
 		}
 		ag, err := agent.NewAgent(c)
 		if err != nil {
 			log.Fatal("E! " + err.Error())
@@ -208,7 +193,7 @@ func reloadLoop(
 			}
 		}()
-		log.Printf("I! Starting Telegraf %s\n", displayVersion())
+		log.Printf("I! Starting Telegraf (version %s)\n", version)
 		log.Printf("I! Loaded outputs: %s", strings.Join(c.OutputNames(), " "))
 		log.Printf("I! Loaded inputs: %s", strings.Join(c.InputNames(), " "))
 		log.Printf("I! Tags enabled: %s", c.ListTags())
@@ -266,11 +251,34 @@ func (p *program) Stop(s service.Service) error {
 	return nil
 }
-func displayVersion() string {
+// loadExternalPlugins loads external plugins from shared libraries (.so, .dll, etc.)
-	if version == "" {
+// in the specified directory.
-		return fmt.Sprintf("v%s~pre%s", nextVersion, commit)
+func loadExternalPlugins(dir string) error {
 	return filepath.Walk(dir, func(pth string, info os.FileInfo, err error) error {
 		// Stop if there was an error.
 		if err != nil {
 			return err
 		}
-	return "v" + version
+
 		// Ignore directories.
 		if info.IsDir() {
 			return nil
 		}
 		// Ignore files that aren't shared libraries.
 		ext := strings.ToLower(path.Ext(pth))
 		if ext != ".so" && ext != ".dll" {
 			return nil
 		}
 		// Load plugin.
 		_, err = plugin.Open(pth)
 		if err != nil {
 			return fmt.Errorf("error opening [%s]: %s", pth, err)
 		}
 		return nil
 	})
 }
 func main() {
@@ -278,6 +286,18 @@ func main() {
 	flag.Parse()
 	args := flag.Args()
 	// Load external plugins, if requested.
 	if *fPlugins != "" {
 		pluginsDir, err := filepath.Abs(*fPlugins)
 		if err != nil {
 			log.Fatal("E! " + err.Error())
 		}
 		log.Printf("I! Loading external plugins from: %s\n", pluginsDir)
 		if err := loadExternalPlugins(*fPlugins); err != nil {
 			log.Fatal("E! " + err.Error())
 		}
 	}
 	inputFilters, outputFilters := []string{}, []string{}
 	if *fInputFilters != "" {
 		inputFilters = strings.Split(":"+strings.TrimSpace(*fInputFilters)+":", ":")
@@ -294,27 +314,10 @@ func main() {
 		processorFilters = strings.Split(":"+strings.TrimSpace(*fProcessorFilters)+":", ":")
 	}
 	if *pprofAddr != "" {
 		go func() {
 			pprofHostPort := *pprofAddr
 			parts := strings.Split(pprofHostPort, ":")
 			if len(parts) == 2 && parts[0] == "" {
 				pprofHostPort = fmt.Sprintf("localhost:%s", parts[1])
 			}
 			pprofHostPort = "http://" + pprofHostPort + "/debug/pprof"
 			log.Printf("I! Starting pprof HTTP server at: %s", pprofHostPort)
 			if err := http.ListenAndServe(*pprofAddr, nil); err != nil {
 				log.Fatal("E! " + err.Error())
 			}
 		}()
 	}
 	if len(args) > 0 {
 		switch args[0] {
 		case "version":
-			fmt.Printf("Telegraf %s (git: %s %s)\n", displayVersion(), branch, commit)
+			fmt.Printf("Telegraf v%s (git: %s %s)\n", version, branch, commit)
 			return
 		case "config":
 			config.PrintSampleConfig(
@@ -342,7 +345,7 @@ func main() {
 		}
 		return
 	case *fVersion:
-		fmt.Printf("Telegraf %s (git: %s %s)\n", displayVersion(), branch, commit)
+		fmt.Printf("Telegraf v%s (git: %s %s)\n", version, branch, commit)
 		return
 	case *fSampleConfig:
 		config.PrintSampleConfig(
--- a/docs/CONFIGURATION.md
+++ b/docs/CONFIGURATION.md
@@ -24,16 +24,6 @@ Environment variables can be used anywhere in the config file, simply prepend
 them with $. For strings the variable must be within quotes (ie, "$STR_VAR"),
 for numbers and booleans they should be plain (ie, $INT_VAR, $BOOL_VAR)
 ## Configuration file locations
 The location of the configuration file can be set via the `--config` command
 line flag. Telegraf will also pick up all files matching the pattern `*.conf` if
 the `-config-directory` command line flag is used.
 On most systems, the default locations are `/etc/telegraf/telegraf.conf` for
 the main configuration file and `/etc/telegraf/telegraf.d` for the directory of
 configuration files.
 # Global Tags
 Global tags can be specified in the `[global_tags]` section of the config file
@@ -66,14 +56,11 @@ interval. Maximum flush_interval will be flush_interval + flush_jitter
 This is primarily to avoid
 large write spikes for users running a large number of telegraf instances.
 ie, a jitter of 5s and flush_interval 10s means flushes will happen every 10-15s.
-* **precision**:
+* **precision**: By default, precision will be set to the same timestamp order
-   By default or when set to "0s", precision will be set to the same
+as the collection interval, with the maximum being 1s. Precision will NOT
-   timestamp order as the collection interval, with the maximum being 1s.
+be used for service inputs, such as logparser and statsd. Valid values are
-   Precision will NOT be used for service inputs. It is up to each individual
+"ns", "us" (or "µs"), "ms", "s".
-   service input to set the timestamp at the appropriate precision.
+* **logfile**: Specify the log file name. The empty string means to log to stdout.
   Valid time units are "ns", "us" (or "µs"), "ms", "s".
 * **logfile**: Specify the log file name. The empty string means to log to stderr.
 * **debug**: Run telegraf in debug mode.
 * **quiet**: Run telegraf in quiet mode (error messages only).
 * **hostname**: Override default hostname, if empty use os.Hostname().
@@ -127,41 +114,31 @@ is not specified then processor execution order will be random.
 Filters can be configured per input, output, processor, or aggregator,
 see below for examples.
-* **namepass**:
+* **namepass**: An array of strings that is used to filter metrics generated by the
-An array of glob pattern strings.  Only points whose measurement name matches
+current input. Each string in the array is tested as a glob match against
-a pattern in this list are emitted.
+measurement names and if it matches, the field is emitted.
-* **namedrop**:
+* **namedrop**: The inverse of pass, if a measurement name matches, it is not emitted.
-The inverse of `namepass`.  If a match is found the point is discarded. This
+* **fieldpass**: An array of strings that is used to filter metrics generated by the
-is tested on points after they have passed the `namepass` test.
+current input. Each string in the array is tested as a glob match against field names
-* **fieldpass**:
+and if it matches, the field is emitted. fieldpass is not available for outputs.
-An array of glob pattern strings.  Only fields whose field key matches a
+* **fielddrop**: The inverse of pass, if a field name matches, it is not emitted.
-pattern in this list are emitted.  Not available for outputs.
+fielddrop is not available for outputs.
-* **fielddrop**:
+* **tagpass**: tag names and arrays of strings that are used to filter
-The inverse of `fieldpass`.  Fields with a field key matching one of the
+measurements by the current input. Each string in the array is tested as a glob
-patterns will be discarded from the point.  This is tested on points after
+match against the tag name, and if it matches the measurement is emitted.
-they have passed the `fieldpass` test.  Not available for outputs.
+* **tagdrop**: The inverse of tagpass. If a tag matches, the measurement is not
-* **tagpass**:
+emitted. This is tested on measurements that have passed the tagpass test.
-A table mapping tag keys to arrays of glob pattern strings.  Only points
+* **tagexclude**: tagexclude can be used to exclude a tag from measurement(s).
-that contain a tag key in the table and a tag value matching one of its
+As opposed to tagdrop, which will drop an entire measurement based on it's
-patterns is emitted.
+tags, tagexclude simply strips the given tag keys from the measurement. This
-* **tagdrop**:
+can be used on inputs & outputs, but it is _recommended_ to be used on inputs,
-The inverse of `tagpass`.  If a match is found the point is discarded. This
+as it is more efficient to filter out tags at the ingestion point.
-is tested on points after they have passed the `tagpass` test.
+* **taginclude**: taginclude is the inverse of tagexclude. It will only include
-* **taginclude**:
+the tag keys in the final measurement.
 An array of glob pattern strings.  Only tags with a tag key matching one of
 the patterns are emitted.  In contrast to `tagpass`, which will pass an entire
 point based on its tag, `taginclude` removes all non matching tags from the
 point.  This filter can be used on both inputs & outputs, but it is
 _recommended_ to be used on inputs, as it is more efficient to filter out tags
 at the ingestion point.
 * **tagexclude**:
 The inverse of `taginclude`. Tags with a tag key matching one of the patterns
 will be discarded from the point.
-**NOTE** Due to the way TOML is parsed, `tagpass` and `tagdrop` parameters
+**NOTE** `tagpass` and `tagdrop` parameters must be defined at the _end_ of
-must be defined at the _end_ of the plugin definition, otherwise subsequent
+the plugin definition, otherwise subsequent plugin config options will be
-plugin config options will be interpreted as part of the tagpass/tagdrop
+interpreted as part of the tagpass/tagdrop map.
 tables.
 #### Input Configuration Examples
@@ -181,6 +158,7 @@ fields which begin with `time_`.
 [[outputs.influxdb]]
  url = "http://192.168.59.103:8086" # required.
  database = "telegraf" # required.
  precision = "s"
 # INPUTS
 [[inputs.cpu]]
@@ -319,18 +297,21 @@ to avoid measurement collisions:
 [[outputs.influxdb]]
  urls = [ "http://localhost:8086" ]
  database = "telegraf"
  precision = "s"
  # Drop all measurements that start with "aerospike"
  namedrop = ["aerospike*"]
 [[outputs.influxdb]]
  urls = [ "http://localhost:8086" ]
  database = "telegraf-aerospike-data"
  precision = "s"
  # Only accept aerospike data:
  namepass = ["aerospike*"]
 [[outputs.influxdb]]
  urls = [ "http://localhost:8086" ]
  database = "telegraf-cpu0-data"
  precision = "s"
  # Only store measurements where the tag "cpu" matches the value "cpu0"
  [outputs.influxdb.tagpass]
    cpu = ["cpu0"]
--- a/docs/DATA_FORMATS_INPUT.md
+++ b/docs/DATA_FORMATS_INPUT.md
@@ -7,7 +7,6 @@ Telegraf is able to parse the following input data formats into metrics:
 1. [Graphite](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#graphite)
 1. [Value](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#value), ie: 45 or "booyah"
 1. [Nagios](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#nagios) (exec input only)
 1. [Collectd](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#collectd)
 Telegraf metrics, like InfluxDB
 [points](https://docs.influxdata.com/influxdb/v0.10/write_protocols/line/),
@@ -41,7 +40,7 @@ example, in the exec plugin:
  name_suffix = "_mycollector"
  ## Data format to consume.
-  ## Each data format has its own unique set of configuration options, read
+  ## Each data format has it's own unique set of configuration options, read
  ## more about them here:
  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
  data_format = "json"
@@ -68,7 +67,7 @@ metrics are parsed directly into Telegraf metrics.
  name_suffix = "_mycollector"
  ## Data format to consume.
-  ## Each data format has its own unique set of configuration options, read
+  ## Each data format has it's own unique set of configuration options, read
  ## more about them here:
  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
  data_format = "influx"
@@ -118,7 +117,7 @@ For example, if you had this configuration:
  name_suffix = "_mycollector"
  ## Data format to consume.
-  ## Each data format has its own unique set of configuration options, read
+  ## Each data format has it's own unique set of configuration options, read
  ## more about them here:
  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
  data_format = "json"
@@ -162,7 +161,7 @@ For example, if the following configuration:
  name_suffix = "_mycollector"
  ## Data format to consume.
-  ## Each data format has its own unique set of configuration options, read
+  ## Each data format has it's own unique set of configuration options, read
  ## more about them here:
  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
  data_format = "json"
@@ -233,7 +232,7 @@ name of the plugin.
  name_override = "entropy_available"
  ## Data format to consume.
-  ## Each data format has its own unique set of configuration options, read
+  ## Each data format has it's own unique set of configuration options, read
  ## more about them here:
  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
  data_format = "value"
@@ -391,7 +390,7 @@ There are many more options available,
  name_suffix = "_mycollector"
  ## Data format to consume.
-  ## Each data format has its own unique set of configuration options, read
+  ## Each data format has it's own unique set of configuration options, read
  ## more about them here:
  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
  data_format = "graphite"
@@ -428,54 +427,14 @@ Note: Nagios Input Data Formats is only supported in `exec` input plugin.
 ```toml
 [[inputs.exec]]
  ## Commands array
-  commands = ["/usr/lib/nagios/plugins/check_load -w 5,6,7 -c 7,8,9"]
+  commands = ["/usr/lib/nagios/plugins/check_load", "-w 5,6,7 -c 7,8,9"]
  ## measurement name suffix (for separating different commands)
  name_suffix = "_mycollector"
  ## Data format to consume.
-  ## Each data format has its own unique set of configuration options, read
+  ## Each data format has it's own unique set of configuration options, read
  ## more about them here:
  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
  data_format = "nagios"
 ```
 # Collectd:
 The collectd format parses the collectd binary network protocol.  Tags are
 created for host, instance, type, and type instance.  All collectd values are
 added as float64 fields.
 For more information about the binary network protocol see
 [here](https://collectd.org/wiki/index.php/Binary_protocol).
 You can control the cryptographic settings with parser options.  Create an
 authentication file and set `collectd_auth_file` to the path of the file, then
 set the desired security level in `collectd_security_level`.
 Additional information including client setup can be found
 [here](https://collectd.org/wiki/index.php/Networking_introduction#Cryptographic_setup).
 You can also change the path to the typesdb or add additional typesdb using
 `collectd_typesdb`.
 #### Collectd Configuration:
 ```toml
 [[inputs.socket_listener]]
  service_address = "udp://127.0.0.1:25826"
  name_prefix = "collectd_"
  ## Data format to consume.
  ## Each data format has its own unique set of configuration options, read
  ## more about them here:
  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
  data_format = "collectd"
  ## Authentication file for cryptographic security levels
  collectd_auth_file = "/etc/collectd/auth_file"
  ## One of none (default), sign, or encrypt
  collectd_security_level = "encrypt"
  ## Path of to TypesDB specifications
  collectd_typesdb = ["/usr/share/collectd/types.db"]
 ```
--- a/docs/DATA_FORMATS_OUTPUT.md
+++ b/docs/DATA_FORMATS_OUTPUT.md
@@ -36,7 +36,7 @@ config option, for example, in the `file` output plugin:
  files = ["stdout"]
  ## Data format to output.
-  ## Each data format has its own unique set of configuration options, read
+  ## Each data format has it's own unique set of configuration options, read
  ## more about them here:
  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
  data_format = "influx"
@@ -60,7 +60,7 @@ metrics are serialized directly into InfluxDB line-protocol.
  files = ["stdout", "/tmp/metrics.out"]
  ## Data format to output.
-  ## Each data format has its own unique set of configuration options, read
+  ## Each data format has it's own unique set of configuration options, read
  ## more about them here:
  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
  data_format = "influx"
@@ -96,9 +96,6 @@ tars.cpu-total.us-east-1.cpu.usage_user 0.89 1455320690
 tars.cpu-total.us-east-1.cpu.usage_idle 98.09 1455320690
 ```
 Fields with string values will be skipped.  Boolean fields will be converted
 to 1 (true) or 0 (false).
 ### Graphite Configuration:
 ```toml
@@ -107,7 +104,7 @@ to 1 (true) or 0 (false).
  files = ["stdout", "/tmp/metrics.out"]
  ## Data format to output.
-  ## Each data format has its own unique set of configuration options, read
+  ## Each data format has it's own unique set of configuration options, read
  ## more about them here:
  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
  data_format = "graphite"
@@ -146,18 +143,8 @@ The JSON data format serialized Telegraf metrics in json format. The format is:
  files = ["stdout", "/tmp/metrics.out"]
  ## Data format to output.
-  ## Each data format has its own unique set of configuration options, read
+  ## Each data format has it's own unique set of configuration options, read
  ## more about them here:
  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
  data_format = "json"
  json_timestamp_units = "1ns"
 ```
 By default, the timestamp that is output in JSON data format serialized Telegraf
 metrics is in seconds. The precision of this timestamp can be adjusted for any output
 by adding the optional `json_timestamp_units` parameter to the configuration for
 that output. This parameter can be used to set the timestamp units to  nanoseconds (`ns`),
 microseconds (`us` or `µs`), milliseconds (`ms`), or seconds (`s`). Note that this
 parameter will be truncated to the nearest power of 10 that, so if the `json_timestamp_units`
 are set to `15ms` the timestamps for the JSON format serialized Telegraf metrics will be
 output in hundredths of a second (`10ms`).
--- a/docs/LICENSE_OF_DEPENDENCIES.md
+++ b/docs/LICENSE_OF_DEPENDENCIES.md
@@ -1,102 +1,33 @@
-# Licenses of dependencies
+# List
 - github.com/Shopify/sarama [MIT LICENSE](https://github.com/Shopify/sarama/blob/master/MIT-LICENSE)
 - github.com/Sirupsen/logrus [MIT LICENSE](https://github.com/Sirupsen/logrus/blob/master/LICENSE)
 - github.com/armon/go-metrics [MIT LICENSE](https://github.com/armon/go-metrics/blob/master/LICENSE)
 - github.com/boltdb/bolt [MIT LICENSE](https://github.com/boltdb/bolt/blob/master/LICENSE)
 - github.com/cenkalti/backoff [MIT LICENSE](https://github.com/cenkalti/backoff/blob/master/LICENSE)
 - github.com/dancannon/gorethink [APACHE LICENSE](https://github.com/dancannon/gorethink/blob/master/LICENSE)
 - github.com/eapache/go-resiliency [MIT LICENSE](https://github.com/eapache/go-resiliency/blob/master/LICENSE)
 - github.com/eapache/queue [MIT LICENSE](https://github.com/eapache/queue/blob/master/LICENSE)
 - github.com/fsouza/go-dockerclient [BSD LICENSE](https://github.com/fsouza/go-dockerclient/blob/master/LICENSE)
 - github.com/go-sql-driver/mysql [MPL LICENSE](https://github.com/go-sql-driver/mysql/blob/master/LICENSE)
 - github.com/gogo/protobuf [BSD LICENSE](https://github.com/gogo/protobuf/blob/master/LICENSE)
 - github.com/golang/protobuf [BSD LICENSE](https://github.com/golang/protobuf/blob/master/LICENSE)
 - github.com/golang/snappy [BSD LICENSE](https://github.com/golang/snappy/blob/master/LICENSE)
 - github.com/hashicorp/go-msgpack [BSD LICENSE](https://github.com/hashicorp/go-msgpack/blob/master/LICENSE)
 - github.com/hashicorp/raft [MPL LICENSE](https://github.com/hashicorp/raft/blob/master/LICENSE)
 - github.com/hashicorp/raft-boltdb [MPL LICENSE](https://github.com/hashicorp/raft-boltdb/blob/master/LICENSE)
 - github.com/kardianos/service [ZLIB LICENSE](https://github.com/kardianos/service/blob/master/LICENSE) (License not named but matches word for word with ZLib)
 - github.com/kballard/go-shellquote [MIT LICENSE](https://github.com/kballard/go-shellquote/blob/master/LICENSE)
 - github.com/lib/pq [MIT LICENSE](https://github.com/lib/pq/blob/master/LICENSE.md)
 - github.com/matttproud/golang_protobuf_extensions [APACHE LICENSE](https://github.com/matttproud/golang_protobuf_extensions/blob/master/LICENSE)
 - github.com/naoina/go-stringutil [MIT LICENSE](https://github.com/naoina/go-stringutil/blob/master/LICENSE)
 - github.com/naoina/toml [MIT LICENSE](https://github.com/naoina/toml/blob/master/LICENSE)
 - github.com/prometheus/client_golang [APACHE LICENSE](https://github.com/prometheus/client_golang/blob/master/LICENSE)
 - github.com/samuel/go-zookeeper [BSD LICENSE](https://github.com/samuel/go-zookeeper/blob/master/LICENSE)
 - github.com/stretchr/objx [MIT LICENSE](github.com/stretchr/objx)
 - github.com/stretchr/testify [MIT LICENSE](https://github.com/stretchr/testify/blob/master/LICENCE.txt)
 - github.com/wvanbergen/kafka [MIT LICENSE](https://github.com/wvanbergen/kafka/blob/master/LICENSE)
 - github.com/wvanbergen/kazoo-go [MIT LICENSE](https://github.com/wvanbergen/kazoo-go/blob/master/MIT-LICENSE)
 - gopkg.in/dancannon/gorethink.v1 [APACHE LICENSE](https://github.com/dancannon/gorethink/blob/v1.1.2/LICENSE)
 - gopkg.in/mgo.v2 [BSD LICENSE](https://github.com/go-mgo/mgo/blob/v2/LICENSE)
 - golang.org/x/crypto/ [BSD LICENSE](https://github.com/golang/crypto/blob/master/LICENSE)
 When distributed in a binary form, Telegraf may contain portions of the
 following works:
 - collectd.org [MIT](https://github.com/collectd/go-collectd/blob/master/LICENSE)
 - github.com/aerospike/aerospike-client-go [APACHE](https://github.com/aerospike/aerospike-client-go/blob/master/LICENSE)
 - github.com/amir/raidman [PUBLIC DOMAIN](https://github.com/amir/raidman/blob/master/UNLICENSE)
 - github.com/armon/go-metrics [MIT](https://github.com/armon/go-metrics/blob/master/LICENSE)
 - github.com/aws/aws-sdk-go [APACHE](https://github.com/aws/aws-sdk-go/blob/master/LICENSE.txt)
 - github.com/beorn7/perks [MIT](https://github.com/beorn7/perks/blob/master/LICENSE)
 - github.com/boltdb/bolt [MIT](https://github.com/boltdb/bolt/blob/master/LICENSE)
 - github.com/bsm/sarama-cluster [MIT](https://github.com/bsm/sarama-cluster/blob/master/LICENSE)
 - github.com/cenkalti/backoff [MIT](https://github.com/cenkalti/backoff/blob/master/LICENSE)
 - github.com/chuckpreslar/rcon [MIT](https://github.com/chuckpreslar/rcon#license)
 - github.com/couchbase/go-couchbase [MIT](https://github.com/couchbase/go-couchbase/blob/master/LICENSE)
 - github.com/couchbase/gomemcached [MIT](https://github.com/couchbase/gomemcached/blob/master/LICENSE)
 - github.com/couchbase/goutils [MIT](https://github.com/couchbase/go-couchbase/blob/master/LICENSE)
 - github.com/dancannon/gorethink [APACHE](https://github.com/dancannon/gorethink/blob/master/LICENSE)
 - github.com/davecgh/go-spew [ISC](https://github.com/davecgh/go-spew/blob/master/LICENSE)
 - github.com/docker/docker [APACHE](https://github.com/docker/docker/blob/master/LICENSE)
 - github.com/docker/cli [APACHE](https://github.com/docker/cli/blob/master/LICENSE)
 - github.com/eapache/go-resiliency [MIT](https://github.com/eapache/go-resiliency/blob/master/LICENSE)
 - github.com/eapache/go-xerial-snappy [MIT](https://github.com/eapache/go-xerial-snappy/blob/master/LICENSE)
 - github.com/eapache/queue [MIT](https://github.com/eapache/queue/blob/master/LICENSE)
 - github.com/eclipse/paho.mqtt.golang [ECLIPSE](https://github.com/eclipse/paho.mqtt.golang/blob/master/LICENSE)
 - github.com/fsouza/go-dockerclient [BSD](https://github.com/fsouza/go-dockerclient/blob/master/LICENSE)
 - github.com/gobwas/glob [MIT](https://github.com/gobwas/glob/blob/master/LICENSE)
 - github.com/google/go-cmp [BSD](https://github.com/google/go-cmp/blob/master/LICENSE)
 - github.com/gogo/protobuf [BSD](https://github.com/gogo/protobuf/blob/master/LICENSE)
 - github.com/golang/protobuf [BSD](https://github.com/golang/protobuf/blob/master/LICENSE)
 - github.com/golang/snappy [BSD](https://github.com/golang/snappy/blob/master/LICENSE)
 - github.com/go-logfmt/logfmt [MIT](https://github.com/go-logfmt/logfmt/blob/master/LICENSE)
 - github.com/gorilla/mux [BSD](https://github.com/gorilla/mux/blob/master/LICENSE)
 - github.com/go-ini/ini [APACHE](https://github.com/go-ini/ini/blob/master/LICENSE)
 - github.com/go-ole/go-ole [MPL](http://mattn.mit-license.org/2013)
 - github.com/go-sql-driver/mysql [MPL](https://github.com/go-sql-driver/mysql/blob/master/LICENSE)
 - github.com/hailocab/go-hostpool [MIT](https://github.com/hailocab/go-hostpool/blob/master/LICENSE)
 - github.com/hashicorp/consul [MPL](https://github.com/hashicorp/consul/blob/master/LICENSE)
 - github.com/hashicorp/go-msgpack [BSD](https://github.com/hashicorp/go-msgpack/blob/master/LICENSE)
 - github.com/hashicorp/raft-boltdb [MPL](https://github.com/hashicorp/raft-boltdb/blob/master/LICENSE)
 - github.com/hashicorp/raft [MPL](https://github.com/hashicorp/raft/blob/master/LICENSE)
 - github.com/influxdata/tail [MIT](https://github.com/influxdata/tail/blob/master/LICENSE.txt)
 - github.com/influxdata/toml [MIT](https://github.com/influxdata/toml/blob/master/LICENSE)
 - github.com/influxdata/wlog [MIT](https://github.com/influxdata/wlog/blob/master/LICENSE)
 - github.com/jackc/pgx [MIT](https://github.com/jackc/pgx/blob/master/LICENSE)
 - github.com/jmespath/go-jmespath [APACHE](https://github.com/jmespath/go-jmespath/blob/master/LICENSE)
 - github.com/kardianos/osext [BSD](https://github.com/kardianos/osext/blob/master/LICENSE)
 - github.com/kardianos/service [ZLIB](https://github.com/kardianos/service/blob/master/LICENSE) (License not named but matches word for word with ZLib)
 - github.com/kballard/go-shellquote [MIT](https://github.com/kballard/go-shellquote/blob/master/LICENSE)
 - github.com/lib/pq [MIT](https://github.com/lib/pq/blob/master/LICENSE.md)
 - github.com/matttproud/golang_protobuf_extensions [APACHE](https://github.com/matttproud/golang_protobuf_extensions/blob/master/LICENSE)
 - github.com/Microsoft/go-winio [MIT](https://github.com/Microsoft/go-winio/blob/master/LICENSE)
 - github.com/miekg/dns [BSD](https://github.com/miekg/dns/blob/master/LICENSE)
 - github.com/naoina/go-stringutil [MIT](https://github.com/naoina/go-stringutil/blob/master/LICENSE)
 - github.com/naoina/toml [MIT](https://github.com/naoina/toml/blob/master/LICENSE)
 - github.com/nats-io/go-nats [MIT](https://github.com/nats-io/go-nats/blob/master/LICENSE)
 - github.com/nats-io/nats [MIT](https://github.com/nats-io/nats/blob/master/LICENSE)
 - github.com/nats-io/nuid [MIT](https://github.com/nats-io/nuid/blob/master/LICENSE)
 - github.com/nsqio/go-nsq [MIT](https://github.com/nsqio/go-nsq/blob/master/LICENSE)
 - github.com/opentracing-contrib/go-observer [APACHE](https://github.com/opentracing-contrib/go-observer/blob/master/LICENSE)
 - github.com/opentracing/opentracing-go [MIT](https://github.com/opentracing/opentracing-go/blob/master/LICENSE)
 - github.com/openzipkin/zipkin-go-opentracing [MIT](https://github.com/openzipkin/zipkin-go-opentracing/blob/master/LICENSE)
 - github.com/pierrec/lz4 [BSD](https://github.com/pierrec/lz4/blob/master/LICENSE)
 - github.com/pierrec/xxHash [BSD](https://github.com/pierrec/xxHash/blob/master/LICENSE)
 - github.com/pkg/errors [BSD](https://github.com/pkg/errors/blob/master/LICENSE)
 - github.com/pmezard/go-difflib [BSD](https://github.com/pmezard/go-difflib/blob/master/LICENSE)
 - github.com/prometheus/client_golang [APACHE](https://github.com/prometheus/client_golang/blob/master/LICENSE)
 - github.com/prometheus/client_model [APACHE](https://github.com/prometheus/client_model/blob/master/LICENSE)
 - github.com/prometheus/common [APACHE](https://github.com/prometheus/common/blob/master/LICENSE)
 - github.com/prometheus/procfs [APACHE](https://github.com/prometheus/procfs/blob/master/LICENSE)
 - github.com/rcrowley/go-metrics [BSD](https://github.com/rcrowley/go-metrics/blob/master/LICENSE)
 - github.com/samuel/go-zookeeper [BSD](https://github.com/samuel/go-zookeeper/blob/master/LICENSE)
 - github.com/satori/go.uuid [MIT](https://github.com/satori/go.uuid/blob/master/LICENSE)
 - github.com/shirou/gopsutil [BSD](https://github.com/shirou/gopsutil/blob/master/LICENSE)
 - github.com/shirou/w32 [BSD](https://github.com/shirou/w32/blob/master/LICENSE)
 - github.com/Shopify/sarama [MIT](https://github.com/Shopify/sarama/blob/master/MIT-LICENSE)
 - github.com/Sirupsen/logrus [MIT](https://github.com/Sirupsen/logrus/blob/master/LICENSE)
 - github.com/StackExchange/wmi [MIT](https://github.com/StackExchange/wmi/blob/master/LICENSE)
 - github.com/stretchr/objx [MIT](https://github.com/stretchr/objx/blob/master/LICENSE.md)
 - github.com/soniah/gosnmp [BSD](https://github.com/soniah/gosnmp/blob/master/LICENSE)
 - github.com/streadway/amqp [BSD](https://github.com/streadway/amqp/blob/master/LICENSE)
 - github.com/stretchr/objx [MIT](https://github.com/stretchr/objx/blob/master/LICENSE.md)
 - github.com/stretchr/testify [MIT](https://github.com/stretchr/testify/blob/master/LICENCE.txt)
 - github.com/vjeantet/grok [APACHE](https://github.com/vjeantet/grok/blob/master/LICENSE)
 - github.com/wvanbergen/kafka [MIT](https://github.com/wvanbergen/kafka/blob/master/LICENSE)
 - github.com/wvanbergen/kazoo-go [MIT](https://github.com/wvanbergen/kazoo-go/blob/master/MIT-LICENSE)
 - github.com/yuin/gopher-lua [MIT](https://github.com/yuin/gopher-lua/blob/master/LICENSE)
 - github.com/zensqlmonitor/go-mssqldb [BSD](https://github.com/zensqlmonitor/go-mssqldb/blob/master/LICENSE.txt)
 - golang.org/x/crypto [BSD](https://github.com/golang/crypto/blob/master/LICENSE)
 - golang.org/x/net [BSD](https://go.googlesource.com/net/+/master/LICENSE)
 - golang.org/x/text [BSD](https://go.googlesource.com/text/+/master/LICENSE)
 - golang.org/x/sys [BSD](https://go.googlesource.com/sys/+/master/LICENSE)
 - gopkg.in/asn1-ber.v1 [MIT](https://github.com/go-asn1-ber/asn1-ber/blob/v1.2/LICENSE)
 - gopkg.in/dancannon/gorethink.v1 [APACHE](https://github.com/dancannon/gorethink/blob/v1.1.2/LICENSE)
 - gopkg.in/fatih/pool.v2 [MIT](https://github.com/fatih/pool/blob/v2.0.0/LICENSE)
 - gopkg.in/fsnotify.v1 [BSD](https://github.com/fsnotify/fsnotify/blob/v1.4.2/LICENSE)
 - gopkg.in/ldap.v2 [MIT](https://github.com/go-ldap/ldap/blob/v2.5.0/LICENSE)
 - gopkg.in/mgo.v2 [BSD](https://github.com/go-mgo/mgo/blob/v2/LICENSE)
 - gopkg.in/olivere/elastic.v5 [MIT](https://github.com/olivere/elastic/blob/v5.0.38/LICENSE)
 - gopkg.in/tomb.v1 [BSD](https://github.com/go-tomb/tomb/blob/v1/LICENSE)
 - gopkg.in/yaml.v2 [APACHE](https://github.com/go-yaml/yaml/blob/v2/LICENSE)
--- a/docs/PROFILING.md
+++ b/docs/PROFILING.md
@@ -1,24 +0,0 @@
 # Telegraf profiling
 Telegraf uses the standard package `net/http/pprof`. This package serves via its HTTP server runtime profiling data in the format expected by the pprof visualization tool.
 By default, the profiling is turned off.
 To enable profiling you need to specify address to config parameter `pprof-addr`, for example:
 ```
 telegraf --config telegraf.conf --pprof-addr localhost:6060
 ```
 There are several paths to get different profiling information:
 To look at the heap profile:
 `go tool pprof http://localhost:6060/debug/pprof/heap`
 or to look at a 30-second CPU profile:
 `go tool pprof http://localhost:6060/debug/pprof/profile?seconds=30`
 To view all available profiles, open `http://localhost:6060/debug/pprof/` in your browser.
--- a/docs/WINDOWS_SERVICE.md
+++ b/docs/WINDOWS_SERVICE.md
@@ -37,9 +37,3 @@ Telegraf can manage its own service through the --service flag:
 | `telegraf.exe --service start`     | Start the telegraf service    |
 | `telegraf.exe --service stop`      | Stop the telegraf service     |
 Trobleshooting  common error #1067
 When installing as service in Windows, always double check to specify full path of the config file, otherwise windows service will fail to start
 --config C:\"Program Files"\Telegraf\telegraf.conf
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
--- a/etc/telegraf_windows.conf
+++ b/etc/telegraf_windows.conf
@@ -117,8 +117,7 @@
    Instances = ["*"]
    Counters = [
      "% Idle Time",
-      "% Disk Time",
+      "% Disk Time","% Disk Read Time",
      "% Disk Read Time",
      "% Disk Write Time",
      "Current Disk Queue Length",
      "% Free Space",
--- a/filter/filter.go
+++ b/filter/filter.go
@@ -77,40 +77,3 @@ func compileFilterNoGlob(filters []string) Filter {
 	}
 	return &out
 }
 type IncludeExcludeFilter struct {
 	include Filter
 	exclude Filter
 }
 func NewIncludeExcludeFilter(
 	include []string,
 	exclude []string,
 ) (Filter, error) {
 	in, err := Compile(include)
 	if err != nil {
 		return nil, err
 	}
 	ex, err := Compile(exclude)
 	if err != nil {
 		return nil, err
 	}
 	return &IncludeExcludeFilter{in, ex}, nil
 }
 func (f *IncludeExcludeFilter) Match(s string) bool {
 	if f.include != nil {
 		if !f.include.Match(s) {
 			return false
 		}
 	}
 	if f.exclude != nil {
 		if f.exclude.Match(s) {
 			return false
 		}
 	}
 	return true
 }
--- a/internal/buffer/buffer.go
+++ b/internal/buffer/buffer.go
@@ -45,11 +45,9 @@ func (b *Buffer) Add(metrics ...telegraf.Metric) {
 		select {
 		case b.buf <- metrics[i]:
 		default:
 			b.mu.Lock()
 			MetricsDropped.Incr(1)
 			<-b.buf
 			b.buf <- metrics[i]
 			b.mu.Unlock()
 		}
 	}
 }
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"io/ioutil"
 	"log"
 	"math"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -26,6 +25,7 @@ import (
 	"github.com/influxdata/telegraf/plugins/processors"
 	"github.com/influxdata/telegraf/plugins/serializers"
 	"github.com/influxdata/config"
 	"github.com/influxdata/toml"
 	"github.com/influxdata/toml/ast"
 )
@@ -85,8 +85,8 @@ type AgentConfig struct {
 	//     ie, if Interval=10s then always collect on :00, :10, :20, etc.
 	RoundInterval bool
-	// By default or when set to "0s", precision will be set to the same
+	// By default, precision will be set to the same timestamp order as the
-	// timestamp order as the collection interval, with the maximum being 1s.
+	// collection interval, with the maximum being 1s.
 	//   ie, when interval = "10s", precision will be "1s"
 	//       when interval = "250ms", precision will be "1ms"
 	// Precision will NOT be used for service inputs. It is up to each individual
@@ -230,13 +230,10 @@ var header = `# Telegraf Configuration
  ## ie, a jitter of 5s and interval 10s means flushes will happen every 10-15s
  flush_jitter = "0s"
-  ## By default or when set to "0s", precision will be set to the same
+  ## By default, precision will be set to the same timestamp order as the
-  ## timestamp order as the collection interval, with the maximum being 1s.
+  ## collection interval, with the maximum being 1s.
-  ##   ie, when interval = "10s", precision will be "1s"
+  ## Precision will NOT be used for service inputs, such as logparser and statsd.
-  ##       when interval = "250ms", precision will be "1ms"
+  ## Valid values are "ns", "us" (or "µs"), "ms", "s".
  ## Precision will NOT be used for service inputs. It is up to each individual
  ## service input to set the timestamp at the appropriate precision.
  ## Valid time units are "ns", "us" (or "µs"), "ms", "s".
  precision = ""
  ## Logging configuration:
@@ -509,10 +506,6 @@ func PrintOutputConfig(name string) error {
 func (c *Config) LoadDirectory(path string) error {
 	walkfn := func(thispath string, info os.FileInfo, _ error) error {
 		if info == nil {
 			log.Printf("W! Telegraf is not permitted to read %s", thispath)
 			return nil
 		}
 		if info.IsDir() {
 			return nil
 		}
@@ -573,7 +566,7 @@ func (c *Config) LoadConfig(path string) error {
 			if !ok {
 				return fmt.Errorf("%s: invalid configuration", path)
 			}
-			if err = toml.UnmarshalTable(subTable, c.Tags); err != nil {
+			if err = config.UnmarshalTable(subTable, c.Tags); err != nil {
 				log.Printf("E! Could not parse [global_tags] config\n")
 				return fmt.Errorf("Error parsing %s, %s", path, err)
 			}
@@ -586,7 +579,7 @@ func (c *Config) LoadConfig(path string) error {
 		if !ok {
 			return fmt.Errorf("%s: invalid configuration", path)
 		}
-		if err = toml.UnmarshalTable(subTable, c.Agent); err != nil {
+		if err = config.UnmarshalTable(subTable, c.Agent); err != nil {
 			log.Printf("E! Could not parse [agent] config\n")
 			return fmt.Errorf("Error parsing %s, %s", path, err)
 		}
@@ -723,7 +716,7 @@ func (c *Config) addAggregator(name string, table *ast.Table) error {
 		return err
 	}
-	if err := toml.UnmarshalTable(table, aggregator); err != nil {
+	if err := config.UnmarshalTable(table, aggregator); err != nil {
 		return err
 	}
@@ -743,7 +736,7 @@ func (c *Config) addProcessor(name string, table *ast.Table) error {
 		return err
 	}
-	if err := toml.UnmarshalTable(table, processor); err != nil {
+	if err := config.UnmarshalTable(table, processor); err != nil {
 		return err
 	}
@@ -783,7 +776,7 @@ func (c *Config) addOutput(name string, table *ast.Table) error {
 		return err
 	}
-	if err := toml.UnmarshalTable(table, output); err != nil {
+	if err := config.UnmarshalTable(table, output); err != nil {
 		return err
 	}
@@ -824,7 +817,7 @@ func (c *Config) addInput(name string, table *ast.Table) error {
 		return err
 	}
-	if err := toml.UnmarshalTable(table, input); err != nil {
+	if err := config.UnmarshalTable(table, input); err != nil {
 		return err
 	}
@@ -916,7 +909,7 @@ func buildAggregator(name string, tbl *ast.Table) (*models.AggregatorConfig, err
 	conf.Tags = make(map[string]string)
 	if node, ok := tbl.Fields["tags"]; ok {
 		if subtbl, ok := node.(*ast.Table); ok {
-			if err := toml.UnmarshalTable(subtbl, conf.Tags); err != nil {
+			if err := config.UnmarshalTable(subtbl, conf.Tags); err != nil {
 				log.Printf("Could not parse tags for input %s\n", name)
 			}
 		}
@@ -1153,7 +1146,7 @@ func buildInput(name string, tbl *ast.Table) (*models.InputConfig, error) {
 	cp.Tags = make(map[string]string)
 	if node, ok := tbl.Fields["tags"]; ok {
 		if subtbl, ok := node.(*ast.Table); ok {
-			if err := toml.UnmarshalTable(subtbl, cp.Tags); err != nil {
+			if err := config.UnmarshalTable(subtbl, cp.Tags); err != nil {
 				log.Printf("E! Could not parse tags for input %s\n", name)
 			}
 		}
@@ -1233,34 +1226,6 @@ func buildParser(name string, tbl *ast.Table) (parsers.Parser, error) {
 		}
 	}
 	if node, ok := tbl.Fields["collectd_auth_file"]; ok {
 		if kv, ok := node.(*ast.KeyValue); ok {
 			if str, ok := kv.Value.(*ast.String); ok {
 				c.CollectdAuthFile = str.Value
 			}
 		}
 	}
 	if node, ok := tbl.Fields["collectd_security_level"]; ok {
 		if kv, ok := node.(*ast.KeyValue); ok {
 			if str, ok := kv.Value.(*ast.String); ok {
 				c.CollectdSecurityLevel = str.Value
 			}
 		}
 	}
 	if node, ok := tbl.Fields["collectd_typesdb"]; ok {
 		if kv, ok := node.(*ast.KeyValue); ok {
 			if ary, ok := kv.Value.(*ast.Array); ok {
 				for _, elem := range ary.Value {
 					if str, ok := elem.(*ast.String); ok {
 						c.CollectdTypesDB = append(c.CollectdTypesDB, str.Value)
 					}
 				}
 			}
 		}
 	}
 	c.MetricName = name
 	delete(tbl.Fields, "data_format")
@@ -1268,9 +1233,6 @@ func buildParser(name string, tbl *ast.Table) (parsers.Parser, error) {
 	delete(tbl.Fields, "templates")
 	delete(tbl.Fields, "tag_keys")
 	delete(tbl.Fields, "data_type")
 	delete(tbl.Fields, "collectd_auth_file")
 	delete(tbl.Fields, "collectd_security_level")
 	delete(tbl.Fields, "collectd_typesdb")
 	return parsers.NewParser(c)
 }
@@ -1279,7 +1241,7 @@ func buildParser(name string, tbl *ast.Table) (parsers.Parser, error) {
 // a serializers.Serializer object, and creates it, which can then be added onto
 // an Output object.
 func buildSerializer(name string, tbl *ast.Table) (serializers.Serializer, error) {
-	c := &serializers.Config{TimestampUnits: time.Duration(1 * time.Second)}
+	c := &serializers.Config{}
 	if node, ok := tbl.Fields["data_format"]; ok {
 		if kv, ok := node.(*ast.KeyValue); ok {
@@ -1309,26 +1271,9 @@ func buildSerializer(name string, tbl *ast.Table) (serializers.Serializer, error
 		}
 	}
 	if node, ok := tbl.Fields["json_timestamp_units"]; ok {
 		if kv, ok := node.(*ast.KeyValue); ok {
 			if str, ok := kv.Value.(*ast.String); ok {
 				timestampVal, err := time.ParseDuration(str.Value)
 				if err != nil {
 					return nil, fmt.Errorf("Unable to parse json_timestamp_units as a duration, %s", err)
 				}
 				// now that we have a duration, truncate it to the nearest
 				// power of ten (just in case)
 				nearest_exponent := int64(math.Log10(float64(timestampVal.Nanoseconds())))
 				new_nanoseconds := int64(math.Pow(10.0, float64(nearest_exponent)))
 				c.TimestampUnits = time.Duration(new_nanoseconds)
 			}
 		}
 	}
 	delete(tbl.Fields, "data_format")
 	delete(tbl.Fields, "prefix")
 	delete(tbl.Fields, "template")
 	delete(tbl.Fields, "json_timestamp_units")
 	return serializers.NewSerializer(c)
 }
--- a/internal/config/testdata/telegraf-agent.toml
+++ b/internal/config/testdata/telegraf-agent.toml
@@ -60,7 +60,7 @@
  # Kafka topic for producer messages
  topic = "telegraf"
  # Telegraf tag to use as a routing key
-  #  ie, if this tag exists, its value will be used as the routing key
+  #  ie, if this tag exists, it's value will be used as the routing key
  routing_tag = "host"
@@ -143,31 +143,19 @@
 [[inputs.diskio]]
  # no configuration
-# read metrics from a Kafka 0.9+ topic
+# read metrics from a Kafka topic
 [[inputs.kafka_consumer]]
-  ## kafka brokers
+  # topic(s) to consume
  brokers = ["localhost:9092"]
  ## topic(s) to consume
  topics = ["telegraf"]
  ## the name of the consumer group
  consumer_group = "telegraf_metrics_consumers"
  ## Offset (must be either "oldest" or "newest")
  offset = "oldest"
 # read metrics from a Kafka legacy topic
 [[inputs.kafka_consumer_legacy]]
  ## topic(s) to consume
  topics = ["telegraf"]
  # an array of Zookeeper connection strings
  zookeeper_peers = ["localhost:2181"]
-  ## the name of the consumer group
+  # the name of the consumer group
  consumer_group = "telegraf_metrics_consumers"
  # Maximum number of points to buffer between collection intervals
  point_buffer = 100000
-  ## Offset (must be either "oldest" or "newest")
+  # Offset (must be either "oldest" or "newest")
  offset = "oldest"
 # Read metrics from a LeoFS Server via SNMP
 [[inputs.leofs]]
  # An array of URI to gather stats about LeoFS.
--- a/internal/errchan/errchan.go
+++ b/internal/errchan/errchan.go
@@ -0,0 +1,37 @@
 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/globpath/globpath.go
+++ b/internal/globpath/globpath.go
@@ -45,7 +45,7 @@ func (g *GlobPath) Match() map[string]os.FileInfo {
 	if !g.hasMeta {
 		out := make(map[string]os.FileInfo)
 		info, err := os.Stat(g.path)
-		if err == nil {
+		if !os.IsNotExist(err) {
 			out[g.path] = info
 		}
 		return out
@@ -55,7 +55,7 @@ func (g *GlobPath) Match() map[string]os.FileInfo {
 		files, _ := filepath.Glob(g.path)
 		for _, file := range files {
 			info, err := os.Stat(file)
-			if err == nil {
+			if !os.IsNotExist(err) {
 				out[file] = info
 			}
 		}
--- a/internal/globpath/globpath_test.go
+++ b/internal/globpath/globpath_test.go
@@ -1,7 +1,6 @@
 package globpath
 import (
 	"os"
 	"runtime"
 	"strings"
 	"testing"
@@ -71,20 +70,3 @@ func getTestdataDir() string {
 	_, filename, _, _ := runtime.Caller(1)
 	return strings.Replace(filename, "globpath_test.go", "testdata", 1)
 }
 func TestMatch_ErrPermission(t *testing.T) {
 	tests := []struct {
 		input    string
 		expected map[string]os.FileInfo
 	}{
 		{"/root/foo", map[string]os.FileInfo{}},
 		{"/root/f*", map[string]os.FileInfo{}},
 	}
 	for _, test := range tests {
 		glob, err := Compile(test.input)
 		require.NoError(t, err)
 		actual := glob.Match()
 		require.Equal(t, test.expected, actual)
 	}
 }
--- a/internal/models/filter.go
+++ b/internal/models/filter.go
@@ -132,7 +132,6 @@ func (f *Filter) Apply(
 	return true
 }
 // IsActive checking if filter is active
 func (f *Filter) IsActive() bool {
 	return f.isActive
 }
@@ -140,66 +139,43 @@ func (f *Filter) IsActive() bool {
 // shouldNamePass returns true if the metric should pass, false if should drop
 // based on the drop/pass filter parameters
 func (f *Filter) shouldNamePass(key string) bool {
-
+	if f.namePass != nil {
 	pass := func(f *Filter) bool {
 		if f.namePass.Match(key) {
 			return true
 		}
 		return false
 	}
-	drop := func(f *Filter) bool {
+	if f.nameDrop != nil {
 		if f.nameDrop.Match(key) {
 			return false
 		}
 		return true
 	}
 	if f.namePass != nil && f.nameDrop != nil {
 		return pass(f) && drop(f)
 	} else if f.namePass != nil {
 		return pass(f)
 	} else if f.nameDrop != nil {
 		return drop(f)
 	}
 	return true
 }
 // shouldFieldPass returns true if the metric should pass, false if should drop
 // based on the drop/pass filter parameters
 func (f *Filter) shouldFieldPass(key string) bool {
-
+	if f.fieldPass != nil {
 	pass := func(f *Filter) bool {
 		if f.fieldPass.Match(key) {
 			return true
 		}
 		return false
 	}
-	drop := func(f *Filter) bool {
+	if f.fieldDrop != nil {
 		if f.fieldDrop.Match(key) {
 			return false
 		}
 		return true
 	}
 	if f.fieldPass != nil && f.fieldDrop != nil {
 		return pass(f) && drop(f)
 	} else if f.fieldPass != nil {
 		return pass(f)
 	} else if f.fieldDrop != nil {
 		return drop(f)
 	}
 	return true
 }
 // shouldTagsPass returns true if the metric should pass, false if should drop
 // based on the tagdrop/tagpass filter parameters
 func (f *Filter) shouldTagsPass(tags map[string]string) bool {
-
+	if f.TagPass != nil {
 	pass := func(f *Filter) bool {
 		for _, pat := range f.TagPass {
 			if pat.filter == nil {
 				continue
@@ -213,7 +189,7 @@ func (f *Filter) shouldTagsPass(tags map[string]string) bool {
 		return false
 	}
-	drop := func(f *Filter) bool {
+	if f.TagDrop != nil {
 		for _, pat := range f.TagDrop {
 			if pat.filter == nil {
 				continue
@@ -227,18 +203,6 @@ func (f *Filter) shouldTagsPass(tags map[string]string) bool {
 		return true
 	}
 	// Add additional logic in case where both parameters are set.
 	// see: https://github.com/influxdata/telegraf/issues/2860
 	if f.TagPass != nil && f.TagDrop != nil {
 		// return true only in case when tag pass and won't be dropped (true, true).
 		// in case when the same tag should be passed and dropped it will be dropped (true, false).
 		return pass(f) && drop(f)
 	} else if f.TagPass != nil {
 		return pass(f)
 	} else if f.TagDrop != nil {
 		return drop(f)
 	}
 	return true
 }
--- a/internal/models/filter_test.go
+++ b/internal/models/filter_test.go
@@ -357,88 +357,3 @@ func TestFilter_FilterTagsMatches(t *testing.T) {
 		"mytag": "foobar",
 	}, pretags)
 }
 // TestFilter_FilterNamePassAndDrop used for check case when
 // both parameters were defined
 // see: https://github.com/influxdata/telegraf/issues/2860
 func TestFilter_FilterNamePassAndDrop(t *testing.T) {
 	inputData := []string{"name1", "name2", "name3", "name4"}
 	expectedResult := []bool{false, true, false, false}
 	f := Filter{
 		NamePass: []string{"name1", "name2"},
 		NameDrop: []string{"name1", "name3"},
 	}
 	require.NoError(t, f.Compile())
 	for i, name := range inputData {
 		assert.Equal(t, f.shouldNamePass(name), expectedResult[i])
 	}
 }
 // TestFilter_FilterFieldPassAndDrop used for check case when
 // both parameters were defined
 // see: https://github.com/influxdata/telegraf/issues/2860
 func TestFilter_FilterFieldPassAndDrop(t *testing.T) {
 	inputData := []string{"field1", "field2", "field3", "field4"}
 	expectedResult := []bool{false, true, false, false}
 	f := Filter{
 		FieldPass: []string{"field1", "field2"},
 		FieldDrop: []string{"field1", "field3"},
 	}
 	require.NoError(t, f.Compile())
 	for i, field := range inputData {
 		assert.Equal(t, f.shouldFieldPass(field), expectedResult[i])
 	}
 }
 // TestFilter_FilterTagsPassAndDrop used for check case when
 // both parameters were defined
 // see: https://github.com/influxdata/telegraf/issues/2860
 func TestFilter_FilterTagsPassAndDrop(t *testing.T) {
 	inputData := []map[string]string{
 		{"tag1": "1", "tag2": "3"},
 		{"tag1": "1", "tag2": "2"},
 		{"tag1": "2", "tag2": "1"},
 		{"tag1": "4", "tag2": "1"},
 	}
 	expectedResult := []bool{false, true, false, false}
 	filterPass := []TagFilter{
 		TagFilter{
 			Name:   "tag1",
 			Filter: []string{"1", "4"},
 		},
 	}
 	filterDrop := []TagFilter{
 		TagFilter{
 			Name:   "tag1",
 			Filter: []string{"4"},
 		},
 		TagFilter{
 			Name:   "tag2",
 			Filter: []string{"3"},
 		},
 	}
 	f := Filter{
 		TagDrop: filterDrop,
 		TagPass: filterPass,
 	}
 	require.NoError(t, f.Compile())
 	for i, tag := range inputData {
 		assert.Equal(t, f.shouldTagsPass(tag), expectedResult[i])
 	}
 }
--- a/internal/models/makemetric.go
+++ b/internal/models/makemetric.go
@@ -3,7 +3,6 @@ package models
 import (
 	"log"
 	"math"
 	"strings"
 	"time"
 	"github.com/influxdata/telegraf"
@@ -78,27 +77,7 @@ func makemetric(
 		}
 	}
 	for k, v := range tags {
 		if strings.HasSuffix(k, `\`) {
 			log.Printf("D! Measurement [%s] tag [%s] "+
 				"ends with a backslash, skipping", measurement, k)
 			delete(tags, k)
 			continue
 		} else if strings.HasSuffix(v, `\`) {
 			log.Printf("D! Measurement [%s] tag [%s] has a value "+
 				"ending with a backslash, skipping", measurement, k)
 			delete(tags, k)
 			continue
 		}
 	}
 	for k, v := range fields {
 		if strings.HasSuffix(k, `\`) {
 			log.Printf("D! Measurement [%s] field [%s] "+
 				"ends with a backslash, skipping", measurement, k)
 			delete(fields, k)
 			continue
 		}
 		// Validate uint64 and float64 fields
 		// convert all int & uint types to int64
 		switch val := v.(type) {
@@ -149,8 +128,6 @@ func makemetric(
 				delete(fields, k)
 				continue
 			}
 		case string:
 			fields[k] = v
 		default:
 			fields[k] = v
 		}
--- a/internal/models/running_aggregator.go
+++ b/internal/models/running_aggregator.go
@@ -114,7 +114,6 @@ func (r *RunningAggregator) reset() {
 // for period ticks to tell it when to push and reset the aggregator.
 func (r *RunningAggregator) Run(
 	acc telegraf.Accumulator,
 	now time.Time,
 	shutdown chan struct{},
 ) {
 	// The start of the period is truncated to the nearest second.
@@ -133,6 +132,7 @@ func (r *RunningAggregator) Run(
 	// 2nd interval: 00:10 - 00:20.5
 	// etc.
 	//
 	now := time.Now()
 	r.periodStart = now.Truncate(time.Second)
 	truncation := now.Sub(r.periodStart)
 	r.periodEnd = r.periodStart.Add(r.Config.Period)
--- a/internal/models/running_aggregator_test.go
+++ b/internal/models/running_aggregator_test.go
@@ -24,7 +24,7 @@ func TestAdd(t *testing.T) {
 	})
 	assert.NoError(t, ra.Config.Filter.Compile())
 	acc := testutil.Accumulator{}
-	go ra.Run(&acc, time.Now(), make(chan struct{}))
+	go ra.Run(&acc, make(chan struct{}))
 	m := ra.MakeMetric(
 		"RITest",
@@ -55,7 +55,7 @@ func TestAddMetricsOutsideCurrentPeriod(t *testing.T) {
 	})
 	assert.NoError(t, ra.Config.Filter.Compile())
 	acc := testutil.Accumulator{}
-	go ra.Run(&acc, time.Now(), make(chan struct{}))
+	go ra.Run(&acc, make(chan struct{}))
 	// metric before current period
 	m := ra.MakeMetric(
@@ -113,7 +113,7 @@ func TestAddAndPushOnePeriod(t *testing.T) {
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
-		ra.Run(&acc, time.Now(), shutdown)
+		ra.Run(&acc, shutdown)
 	}()
 	m := ra.MakeMetric(
--- a/internal/models/running_input_test.go
+++ b/internal/models/running_input_test.go
@@ -9,7 +9,6 @@ import (
 	"github.com/influxdata/telegraf"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 func TestMakeMetricNoFields(t *testing.T) {
@@ -333,129 +332,6 @@ func TestMakeMetricNameSuffix(t *testing.T) {
 	)
 }
 func TestMakeMetric_TrailingSlash(t *testing.T) {
 	now := time.Now()
 	tests := []struct {
 		name                string
 		measurement         string
 		fields              map[string]interface{}
 		tags                map[string]string
 		expectedNil         bool
 		expectedMeasurement string
 		expectedFields      map[string]interface{}
 		expectedTags        map[string]string
 	}{
 		{
 			name:        "Measurement cannot have trailing slash",
 			measurement: `cpu\`,
 			fields: map[string]interface{}{
 				"value": int64(42),
 			},
 			tags:        map[string]string{},
 			expectedNil: true,
 		},
 		{
 			name:        "Field key with trailing slash dropped",
 			measurement: `cpu`,
 			fields: map[string]interface{}{
 				"value": int64(42),
 				`bad\`:  `xyzzy`,
 			},
 			tags:                map[string]string{},
 			expectedMeasurement: `cpu`,
 			expectedFields: map[string]interface{}{
 				"value": int64(42),
 			},
 			expectedTags: map[string]string{},
 		},
 		{
 			name:        "Field value with trailing slash okay",
 			measurement: `cpu`,
 			fields: map[string]interface{}{
 				"value": int64(42),
 				"ok":    `xyzzy\`,
 			},
 			tags:                map[string]string{},
 			expectedMeasurement: `cpu`,
 			expectedFields: map[string]interface{}{
 				"value": int64(42),
 				"ok":    `xyzzy\`,
 			},
 			expectedTags: map[string]string{},
 		},
 		{
 			name:        "Must have one field after dropped",
 			measurement: `cpu`,
 			fields: map[string]interface{}{
 				"bad": math.NaN(),
 			},
 			tags:        map[string]string{},
 			expectedNil: true,
 		},
 		{
 			name:        "Tag key with trailing slash dropped",
 			measurement: `cpu`,
 			fields: map[string]interface{}{
 				"value": int64(42),
 			},
 			tags: map[string]string{
 				`host\`: "localhost",
 				"a":     "x",
 			},
 			expectedMeasurement: `cpu`,
 			expectedFields: map[string]interface{}{
 				"value": int64(42),
 			},
 			expectedTags: map[string]string{
 				"a": "x",
 			},
 		},
 		{
 			name:        "Tag value with trailing slash dropped",
 			measurement: `cpu`,
 			fields: map[string]interface{}{
 				"value": int64(42),
 			},
 			tags: map[string]string{
 				`host`: `localhost\`,
 				"a":    "x",
 			},
 			expectedMeasurement: `cpu`,
 			expectedFields: map[string]interface{}{
 				"value": int64(42),
 			},
 			expectedTags: map[string]string{
 				"a": "x",
 			},
 		},
 	}
 	ri := NewRunningInput(&testInput{}, &InputConfig{
 		Name: "TestRunningInput",
 	})
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
 			m := ri.MakeMetric(
 				tc.measurement,
 				tc.fields,
 				tc.tags,
 				telegraf.Untyped,
 				now)
 			if tc.expectedNil {
 				require.Nil(t, m)
 			} else {
 				require.NotNil(t, m)
 				require.Equal(t, tc.expectedMeasurement, m.Name())
 				require.Equal(t, tc.expectedFields, m.Fields())
 				require.Equal(t, tc.expectedTags, m.Tags())
 			}
 		})
 	}
 }
 type testInput struct{}
 func (t *testInput) Description() string                   { return "" }
--- a/internal/models/running_output.go
+++ b/internal/models/running_output.go
@@ -2,7 +2,6 @@ package models
 import (
 	"log"
 	"sync"
 	"time"
 	"github.com/influxdata/telegraf"
@@ -35,9 +34,6 @@ type RunningOutput struct {
 	metrics     *buffer.Buffer
 	failMetrics *buffer.Buffer
 	// Guards against concurrent calls to the Output as described in #3009
 	sync.Mutex
 }
 func NewRunningOutput(
@@ -126,9 +122,9 @@ func (ro *RunningOutput) AddMetric(m telegraf.Metric) {
 // Write writes all cached points to this output.
 func (ro *RunningOutput) Write() error {
 	nFails, nMetrics := ro.failMetrics.Len(), ro.metrics.Len()
 	ro.BufferSize.Set(int64(nFails + nMetrics))
 	log.Printf("D! Output [%s] buffer fullness: %d / %d metrics. ",
 		ro.Name, nFails+nMetrics, ro.MetricBufferLimit)
 	ro.BufferSize.Incr(int64(nFails + nMetrics))
 	var err error
 	if !ro.failMetrics.IsEmpty() {
 		// how many batches of failed writes we need to write.
@@ -173,8 +169,6 @@ func (ro *RunningOutput) write(metrics []telegraf.Metric) error {
 	if nMetrics == 0 {
 		return nil
 	}
 	ro.Lock()
 	defer ro.Unlock()
 	start := time.Now()
 	err := ro.Output.Write(metrics)
 	elapsed := time.Since(start)
@@ -182,6 +176,7 @@ func (ro *RunningOutput) write(metrics []telegraf.Metric) error {
 		log.Printf("D! Output [%s] wrote batch of %d metrics in %s\n",
 			ro.Name, nMetrics, elapsed)
 		ro.MetricsWritten.Incr(int64(nMetrics))
 		ro.BufferSize.Incr(-int64(nMetrics))
 		ro.WriteTime.Incr(elapsed.Nanoseconds())
 	}
 	return err
--- a/internal/models/running_processor.go
+++ b/internal/models/running_processor.go
@@ -1,15 +1,11 @@
 package models
 import (
 	"sync"
 	"github.com/influxdata/telegraf"
 )
 type RunningProcessor struct {
 	Name      string
 	sync.Mutex
 	Processor telegraf.Processor
 	Config    *ProcessorConfig
 }
@@ -28,9 +24,6 @@ type ProcessorConfig struct {
 }
 func (rp *RunningProcessor) Apply(in ...telegraf.Metric) []telegraf.Metric {
 	rp.Lock()
 	defer rp.Unlock()
 	ret := []telegraf.Metric{}
 	for _, metric := range in {
--- a/logger/logger.go
+++ b/logger/logger.go
@@ -4,14 +4,11 @@ import (
 	"io"
 	"log"
 	"os"
 	"regexp"
 	"time"
 	"github.com/influxdata/wlog"
 )
 var prefixRegex = regexp.MustCompile("^[DIWE]!")
 // newTelegrafWriter returns a logging-wrapped writer.
 func newTelegrafWriter(w io.Writer) io.Writer {
 	return &telegrafLog{
@@ -24,13 +21,7 @@ type telegrafLog struct {
 }
 func (t *telegrafLog) Write(b []byte) (n int, err error) {
-	var line []byte
+	return t.writer.Write(append([]byte(time.Now().UTC().Format(time.RFC3339)+" "), b...))
 	if !prefixRegex.Match(b) {
 		line = append([]byte(time.Now().UTC().Format(time.RFC3339)+" I! "), b...)
 	} else {
 		line = append([]byte(time.Now().UTC().Format(time.RFC3339)+" "), b...)
 	}
 	return t.writer.Write(line)
 }
 // SetupLogging configures the logging output.
--- a/logger/logger_test.go
+++ b/logger/logger_test.go
@@ -51,19 +51,6 @@ func TestErrorWriteLogToFile(t *testing.T) {
 	assert.Equal(t, f[19:], []byte("Z E! TEST\n"))
 }
 func TestAddDefaultLogLevel(t *testing.T) {
 	tmpfile, err := ioutil.TempFile("", "")
 	assert.NoError(t, err)
 	defer func() { os.Remove(tmpfile.Name()) }()
 	SetupLogging(true, false, tmpfile.Name())
 	log.Printf("TEST")
 	f, err := ioutil.ReadFile(tmpfile.Name())
 	assert.NoError(t, err)
 	assert.Equal(t, f[19:], []byte("Z I! TEST\n"))
 }
 func BenchmarkTelegrafLogWrite(b *testing.B) {
 	var msg = []byte("test")
 	var buf bytes.Buffer
--- a/metric/escape.go
+++ b/metric/escape.go
@@ -20,14 +20,8 @@ var (
 	// stringFieldEscaper is for escaping string field values only.
 	// see https://docs.influxdata.com/influxdb/v1.0/write_protocols/line_protocol_tutorial/#special-characters-and-keywords
-	stringFieldEscaper = strings.NewReplacer(
+	stringFieldEscaper   = strings.NewReplacer(`"`, `\"`)
-		`"`, `\"`,
+	stringFieldUnEscaper = strings.NewReplacer(`\"`, `"`)
 		`\`, `\\`,
 	)
 	stringFieldUnEscaper = strings.NewReplacer(
 		`\"`, `"`,
 		`\\`, `\`,
 	)
 )
 func escape(s string, t string) string {
--- a/metric/metric.go
+++ b/metric/metric.go
@@ -6,7 +6,6 @@ import (
 	"hash/fnv"
 	"sort"
 	"strconv"
 	"strings"
 	"time"
 	"github.com/influxdata/telegraf"
@@ -21,14 +20,11 @@ func New(
 	t time.Time,
 	mType ...telegraf.ValueType,
 ) (telegraf.Metric, error) {
 	if len(name) == 0 {
 		return nil, fmt.Errorf("missing measurement name")
 	}
 	if len(fields) == 0 {
-		return nil, fmt.Errorf("%s: must have one or more fields", name)
+		return nil, fmt.Errorf("Metric cannot be made without any fields")
 	}
-	if strings.HasSuffix(name, `\`) {
+	if len(name) == 0 {
-		return nil, fmt.Errorf("%s: measurement name cannot end with a backslash", name)
+		return nil, fmt.Errorf("Metric cannot be made with an empty name")
 	}
 	var thisType telegraf.ValueType
@@ -48,25 +44,13 @@ func New(
 	// pre-allocate exact size of the tags slice
 	taglen := 0
 	for k, v := range tags {
-		if strings.HasSuffix(k, `\`) {
+		// TODO check that length of tag key & value are > 0
 			return nil, fmt.Errorf("%s: tag key cannot end with a backslash: %s", name, k)
 		}
 		if strings.HasSuffix(v, `\`) {
 			return nil, fmt.Errorf("%s: tag value cannot end with a backslash: %s", name, v)
 		}
 		if len(k) == 0 || len(v) == 0 {
 			continue
 		}
 		taglen += 2 + len(escape(k, "tagkey")) + len(escape(v, "tagval"))
 	}
 	m.tags = make([]byte, taglen)
 	i := 0
 	for k, v := range tags {
 		if len(k) == 0 || len(v) == 0 {
 			continue
 		}
 		m.tags[i] = ','
 		i++
 		i += copy(m.tags[i:], escape(k, "tagkey"))
@@ -78,10 +62,6 @@ func New(
 	// pre-allocate capacity of the fields slice
 	fieldlen := 0
 	for k, _ := range fields {
 		if strings.HasSuffix(k, `\`) {
 			return nil, fmt.Errorf("%s: field key cannot end with a backslash: %s", name, k)
 		}
 		// 10 bytes is completely arbitrary, but will at least prevent some
 		// amount of allocations. There's a small possibility this will create
 		// slightly more allocations for a metric that has many short fields.
@@ -102,31 +82,8 @@ func New(
 }
 // indexUnescapedByte finds the index of the first byte equal to b in buf that
-// is not escaped.  Does not allow the escape char to be escaped. Returns -1 if
+// is not escaped. Returns -1 if not found.
 // not found.
 func indexUnescapedByte(buf []byte, b byte) int {
 	var keyi int
 	for {
 		i := bytes.IndexByte(buf[keyi:], b)
 		if i == -1 {
 			return -1
 		} else if i == 0 {
 			break
 		}
 		keyi += i
 		if buf[keyi-1] != '\\' {
 			break
 		} else {
 			keyi++
 		}
 	}
 	return keyi
 }
 // indexUnescapedByteBackslashEscaping finds the index of the first byte equal
 // to b in buf that is not escaped.  Allows for the escape char `\` to be
 // escaped.  Returns -1 if not found.
 func indexUnescapedByteBackslashEscaping(buf []byte, b byte) int {
 	var keyi int
 	for {
 		i := bytes.IndexByte(buf[keyi:], b)
@@ -256,7 +213,7 @@ func (m *metric) SerializeTo(dst []byte) int {
 }
 func (m *metric) Split(maxSize int) []telegraf.Metric {
-	if m.Len() <= maxSize {
+	if m.Len() < maxSize {
 		return []telegraf.Metric{m}
 	}
 	var out []telegraf.Metric
@@ -286,7 +243,7 @@ func (m *metric) Split(maxSize int) []telegraf.Metric {
 		// if true, then we need to create a metric _not_ including the currently
 		// selected field
-		if len(m.fields[i:j])+len(fields)+constant >= maxSize {
+		if len(m.fields[i:j])+len(fields)+constant > maxSize {
 			// if false, then we'll create a metric including the currently
 			// selected field anyways. This means that the given maxSize is too
 			// small for a single field to fit.
@@ -324,7 +281,7 @@ func (m *metric) Fields() map[string]interface{} {
 		// end index of field value
 		var i3 int
 		if m.fields[i:][i2] == '"' {
-			i3 = indexUnescapedByteBackslashEscaping(m.fields[i:][i2+1:], '"')
+			i3 = indexUnescapedByte(m.fields[i:][i2+1:], '"')
 			if i3 == -1 {
 				i3 = len(m.fields[i:])
 			}
--- a/metric/metric_test.go
+++ b/metric/metric_test.go
@@ -10,7 +10,6 @@ import (
 	"github.com/influxdata/telegraf"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 func TestNewMetric(t *testing.T) {
@@ -31,7 +30,7 @@ func TestNewMetric(t *testing.T) {
 	assert.Equal(t, tags, m.Tags())
 	assert.Equal(t, fields, m.Fields())
 	assert.Equal(t, "cpu", m.Name())
-	assert.Equal(t, now.UnixNano(), m.Time().UnixNano())
+	assert.Equal(t, now, m.Time())
 	assert.Equal(t, now.UnixNano(), m.UnixNano())
 }
@@ -255,10 +254,6 @@ func TestNewMetric_Fields(t *testing.T) {
 		"bool":   true,
 		"false":  false,
 		"string": "test",
 		"quote_string":           `x"y`,
 		"backslash_quote_string": `x\"y`,
 		"backslash":              `x\y`,
 		"ends_with_backslash":    `x\`,
 	}
 	m, err := New("cpu", tags, fields, now)
 	assert.NoError(t, err)
@@ -371,7 +366,7 @@ func TestIndexUnescapedByte(t *testing.T) {
 		{
 			in:       []byte(`foo\\bar`),
 			b:        'b',
-			expected: -1,
+			expected: 5,
 		},
 		{
 			in:       []byte(`foobar`),
@@ -414,7 +409,7 @@ func TestNewGaugeMetric(t *testing.T) {
 	assert.Equal(t, tags, m.Tags())
 	assert.Equal(t, fields, m.Fields())
 	assert.Equal(t, "cpu", m.Name())
-	assert.Equal(t, now.UnixNano(), m.Time().UnixNano())
+	assert.Equal(t, now, m.Time())
 	assert.Equal(t, now.UnixNano(), m.UnixNano())
 }
@@ -436,7 +431,7 @@ func TestNewCounterMetric(t *testing.T) {
 	assert.Equal(t, tags, m.Tags())
 	assert.Equal(t, fields, m.Fields())
 	assert.Equal(t, "cpu", m.Name())
-	assert.Equal(t, now.UnixNano(), m.Time().UnixNano())
+	assert.Equal(t, now, m.Time())
 	assert.Equal(t, now.UnixNano(), m.UnixNano())
 }
@@ -463,7 +458,7 @@ func TestSplitMetric(t *testing.T) {
 	assert.Len(t, split70, 3)
 	split60 := m.Split(60)
-	assert.Len(t, split60, 5)
+	assert.Len(t, split60, 4)
 }
 // test splitting metric into various max lengths
@@ -583,42 +578,6 @@ func TestSplitMetric_OneField(t *testing.T) {
 	assert.Equal(t, "cpu,host=localhost float=100001 1480940990034083306\n", split[0].String())
 }
 func TestSplitMetric_ExactSize(t *testing.T) {
 	now := time.Unix(0, 1480940990034083306)
 	tags := map[string]string{
 		"host": "localhost",
 	}
 	fields := map[string]interface{}{
 		"float":  float64(100001),
 		"int":    int64(100001),
 		"bool":   true,
 		"false":  false,
 		"string": "test",
 	}
 	m, err := New("cpu", tags, fields, now)
 	assert.NoError(t, err)
 	actual := m.Split(m.Len())
 	// check that no copy was made
 	require.Equal(t, &m, &actual[0])
 }
 func TestSplitMetric_NoRoomForNewline(t *testing.T) {
 	now := time.Unix(0, 1480940990034083306)
 	tags := map[string]string{
 		"host": "localhost",
 	}
 	fields := map[string]interface{}{
 		"float": float64(100001),
 		"int":   int64(100001),
 		"bool":  true,
 		"false": false,
 	}
 	m, err := New("cpu", tags, fields, now)
 	assert.NoError(t, err)
 	actual := m.Split(m.Len() - 1)
 	require.Equal(t, 2, len(actual))
 }
 func TestNewMetricAggregate(t *testing.T) {
 	now := time.Now()
@@ -666,72 +625,3 @@ func TestNewMetricFailNaN(t *testing.T) {
 	_, err := New("cpu", tags, fields, now)
 	assert.NoError(t, err)
 }
 func TestEmptyTagValueOrKey(t *testing.T) {
 	now := time.Now()
 	tags := map[string]string{
 		"host":     "localhost",
 		"emptytag": "",
 		"":         "valuewithoutkey",
 	}
 	fields := map[string]interface{}{
 		"usage_idle": float64(99),
 	}
 	m, err := New("cpu", tags, fields, now)
 	assert.True(t, m.HasTag("host"))
 	assert.False(t, m.HasTag("emptytag"))
 	assert.Equal(t,
 		fmt.Sprintf("cpu,host=localhost usage_idle=99 %d\n", now.UnixNano()),
 		m.String())
 	assert.NoError(t, err)
 }
 func TestNewMetric_TrailingSlash(t *testing.T) {
 	now := time.Now()
 	tests := []struct {
 		name   string
 		tags   map[string]string
 		fields map[string]interface{}
 	}{
 		{
 			name: `cpu\`,
 			fields: map[string]interface{}{
 				"value": int64(42),
 			},
 		},
 		{
 			name: "cpu",
 			fields: map[string]interface{}{
 				`value\`: "x",
 			},
 		},
 		{
 			name: "cpu",
 			tags: map[string]string{
 				`host\`: "localhost",
 			},
 			fields: map[string]interface{}{
 				"value": int64(42),
 			},
 		},
 		{
 			name: "cpu",
 			tags: map[string]string{
 				"host": `localhost\`,
 			},
 			fields: map[string]interface{}{
 				"value": int64(42),
 			},
 		},
 	}
 	for _, tc := range tests {
 		_, err := New(tc.name, tc.tags, tc.fields, now)
 		assert.Error(t, err)
 	}
 }
--- a/metric/parse.go
+++ b/metric/parse.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
 	"strconv"
 	"time"
 	"github.com/influxdata/telegraf"
@@ -41,21 +40,10 @@ const (
 )
 func Parse(buf []byte) ([]telegraf.Metric, error) {
-	return ParseWithDefaultTimePrecision(buf, time.Now(), "")
+	return ParseWithDefaultTime(buf, time.Now())
 }
 func ParseWithDefaultTime(buf []byte, t time.Time) ([]telegraf.Metric, error) {
 	return ParseWithDefaultTimePrecision(buf, t, "")
 }
 func ParseWithDefaultTimePrecision(
 	buf []byte,
 	t time.Time,
 	precision string,
 ) ([]telegraf.Metric, error) {
 	if len(buf) == 0 {
 		return []telegraf.Metric{}, nil
 	}
 	if len(buf) <= 6 {
 		return []telegraf.Metric{}, makeError("buffer too short", buf, 0)
 	}
@@ -72,7 +60,7 @@ func ParseWithDefaultTimePrecision(
 			continue
 		}
-		m, err := parseMetric(buf[i:i+j], t, precision)
+		m, err := parseMetric(buf[i:i+j], t)
 		if err != nil {
 			i += j + 1 // increment i past the previous newline
 			errStr += " " + err.Error()
@@ -89,10 +77,7 @@ func ParseWithDefaultTimePrecision(
 	return metrics, nil
 }
-func parseMetric(buf []byte,
+func parseMetric(buf []byte, defaultTime time.Time) (telegraf.Metric, error) {
 	defaultTime time.Time,
 	precision string,
 ) (telegraf.Metric, error) {
 	var dTime string
 	// scan the first block which is measurement[,tag1=value1,tag2=value=2...]
 	pos, key, err := scanKey(buf, 0)
@@ -126,23 +111,9 @@ func parseMetric(buf []byte,
 		return nil, err
 	}
 	// apply precision multiplier
 	var nsec int64
 	multiplier := getPrecisionMultiplier(precision)
 	if len(ts) > 0 && multiplier > 1 {
 		tsint, err := parseIntBytes(ts, 10, 64)
 		if err != nil {
 			return nil, err
 		}
 		nsec := multiplier * tsint
 		ts = []byte(strconv.FormatInt(nsec, 10))
 	}
 	m := &metric{
 		fields: fields,
 		t:      ts,
 		nsec:   nsec,
 	}
 	// parse out the measurement name
@@ -654,21 +625,3 @@ func makeError(reason string, buf []byte, i int) error {
 	return fmt.Errorf("metric parsing error, reason: [%s], buffer: [%s], index: [%d]",
 		reason, buf, i)
 }
 // getPrecisionMultiplier will return a multiplier for the precision specified.
 func getPrecisionMultiplier(precision string) int64 {
 	d := time.Nanosecond
 	switch precision {
 	case "u":
 		d = time.Microsecond
 	case "ms":
 		d = time.Millisecond
 	case "s":
 		d = time.Second
 	case "m":
 		d = time.Minute
 	case "h":
 		d = time.Hour
 	}
 	return int64(d)
 }
--- a/metric/parse_test.go
+++ b/metric/parse_test.go
@@ -364,41 +364,6 @@ func TestParseNegativeTimestamps(t *testing.T) {
 	}
 }
 func TestParsePrecision(t *testing.T) {
 	for _, tt := range []struct {
 		line      string
 		precision string
 		expected  int64
 	}{
 		{"test v=42 1491847420", "s", 1491847420000000000},
 		{"test v=42 1491847420123", "ms", 1491847420123000000},
 		{"test v=42 1491847420123456", "u", 1491847420123456000},
 		{"test v=42 1491847420123456789", "ns", 1491847420123456789},
 		{"test v=42 1491847420123456789", "1s", 1491847420123456789},
 		{"test v=42 1491847420123456789", "asdf", 1491847420123456789},
 	} {
 		metrics, err := ParseWithDefaultTimePrecision(
 			[]byte(tt.line+"\n"), time.Now(), tt.precision)
 		assert.NoError(t, err)
 		assert.Equal(t, tt.expected, metrics[0].UnixNano())
 	}
 }
 func TestParsePrecisionUnsetTime(t *testing.T) {
 	for _, tt := range []struct {
 		line      string
 		precision string
 	}{
 		{"test v=42", "s"},
 		{"test v=42", "ns"},
 	} {
 		_, err := ParseWithDefaultTimePrecision(
 			[]byte(tt.line+"\n"), time.Now(), tt.precision)
 		assert.NoError(t, err)
 	}
 }
 func TestParseMaxKeyLength(t *testing.T) {
 	key := ""
 	for {
--- a/metric/reader.go
+++ b/metric/reader.go
@@ -57,7 +57,7 @@ func (r *reader) Read(p []byte) (n int, err error) {
 			// this for-loop is the sunny-day scenario, where we are given a
 			// buffer that is large enough to hold at least a single metric.
 			// all of the cases below it are edge-cases.
-			if r.metrics[r.iM].Len() <= len(p[i:]) {
+			if r.metrics[r.iM].Len() < len(p[i:]) {
 				i += r.metrics[r.iM].SerializeTo(p[i:])
 			} else {
 				break
@@ -76,7 +76,7 @@ func (r *reader) Read(p []byte) (n int, err error) {
 			if len(tmp) > 1 {
 				r.splitMetrics = tmp
 				r.state = split
-				if r.splitMetrics[0].Len() <= len(p) {
+				if r.splitMetrics[0].Len() < len(p) {
 					i += r.splitMetrics[0].SerializeTo(p)
 					r.iSM = 1
 				} else {
@@ -99,7 +99,7 @@ func (r *reader) Read(p []byte) (n int, err error) {
 		}
 	case split:
-		if r.splitMetrics[r.iSM].Len() <= len(p) {
+		if r.splitMetrics[r.iSM].Len() < len(p) {
 			// write the current split metric
 			i += r.splitMetrics[r.iSM].SerializeTo(p)
 			r.iSM++
@@ -131,10 +131,6 @@ func (r *reader) Read(p []byte) (n int, err error) {
 			r.iSM++
 			if r.iSM == len(r.splitMetrics) {
 				r.iM++
 				if r.iM == len(r.metrics) {
 					r.state = done
 					return i, io.EOF
 				}
 				r.state = normal
 			} else {
 				r.state = split
--- a/metric/reader_test.go
+++ b/metric/reader_test.go
@@ -4,13 +4,12 @@ import (
 	"io"
 	"io/ioutil"
 	"regexp"
 	"strings"
 	"testing"
 	"time"
 	"github.com/influxdata/telegraf"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 func BenchmarkMetricReader(b *testing.B) {
@@ -117,140 +116,6 @@ func TestMetricReader_OverflowMetric(t *testing.T) {
 	}
 }
 // Regression test for when a metric is the same size as the buffer.
 //
 // Previously EOF would not be set until the next call to Read.
 func TestMetricReader_MetricSizeEqualsBufferSize(t *testing.T) {
 	ts := time.Unix(1481032190, 0)
 	m1, _ := New("foo", map[string]string{},
 		map[string]interface{}{"a": int64(1)}, ts)
 	metrics := []telegraf.Metric{m1}
 	r := NewReader(metrics)
 	buf := make([]byte, m1.Len())
 	for {
 		n, err := r.Read(buf)
 		// Should never read 0 bytes unless at EOF, unless input buffer is 0 length
 		if n == 0 {
 			require.Equal(t, io.EOF, err)
 			break
 		}
 		// Lines should be terminated with a LF
 		if err == io.EOF {
 			require.Equal(t, uint8('\n'), buf[n-1])
 			break
 		}
 		require.NoError(t, err)
 	}
 }
 // Regression test for when a metric requires to be split and one of the
 // split metrics is exactly the size of the buffer.
 //
 // Previously an empty string would be returned on the next Read without error,
 // and then next Read call would panic.
 func TestMetricReader_SplitWithExactLengthSplit(t *testing.T) {
 	ts := time.Unix(1481032190, 0)
 	m1, _ := New("foo", map[string]string{},
 		map[string]interface{}{"a": int64(1), "bb": int64(2)}, ts)
 	metrics := []telegraf.Metric{m1}
 	r := NewReader(metrics)
 	buf := make([]byte, 30)
 	//  foo a=1i,bb=2i 1481032190000000000\n // len 35
 	//
 	// Requires this specific split order:
 	//  foo a=1i 1481032190000000000\n  // len 29
 	//  foo bb=2i 1481032190000000000\n // len 30
 	for {
 		n, err := r.Read(buf)
 		// Should never read 0 bytes unless at EOF, unless input buffer is 0 length
 		if n == 0 {
 			require.Equal(t, io.EOF, err)
 			break
 		}
 		// Lines should be terminated with a LF
 		if err == io.EOF {
 			require.Equal(t, uint8('\n'), buf[n-1])
 			break
 		}
 		require.NoError(t, err)
 	}
 }
 // Regresssion test for when a metric requires to be split and one of the
 // split metrics is larger than the buffer.
 //
 // Previously the metric index would be set incorrectly causing a panic.
 func TestMetricReader_SplitOverflowOversized(t *testing.T) {
 	ts := time.Unix(1481032190, 0)
 	m1, _ := New("foo", map[string]string{},
 		map[string]interface{}{
 			"a":   int64(1),
 			"bbb": int64(2),
 		}, ts)
 	metrics := []telegraf.Metric{m1}
 	r := NewReader(metrics)
 	buf := make([]byte, 30)
 	// foo a=1i,bbb=2i 1481032190000000000\n // len 36
 	//
 	// foo a=1i 1481032190000000000\n  // len 29
 	// foo bbb=2i 1481032190000000000\n // len 31
 	for {
 		n, err := r.Read(buf)
 		// Should never read 0 bytes unless at EOF, unless input buffer is 0 length
 		if n == 0 {
 			require.Equal(t, io.EOF, err)
 			break
 		}
 		// Lines should be terminated with a LF
 		if err == io.EOF {
 			require.Equal(t, uint8('\n'), buf[n-1])
 			break
 		}
 		require.NoError(t, err)
 	}
 }
 // Regresssion test for when a split metric exactly fits in the buffer.
 //
 // Previously the metric would be overflow split when not required.
 func TestMetricReader_SplitOverflowUneeded(t *testing.T) {
 	ts := time.Unix(1481032190, 0)
 	m1, _ := New("foo", map[string]string{},
 		map[string]interface{}{"a": int64(1), "b": int64(2)}, ts)
 	metrics := []telegraf.Metric{m1}
 	r := NewReader(metrics)
 	buf := make([]byte, 29)
 	// foo a=1i,b=2i 1481032190000000000\n // len 34
 	//
 	// foo a=1i 1481032190000000000\n  // len 29
 	// foo b=2i 1481032190000000000\n // len 29
 	for {
 		n, err := r.Read(buf)
 		// Should never read 0 bytes unless at EOF, unless input buffer is 0 length
 		if n == 0 {
 			require.Equal(t, io.EOF, err)
 			break
 		}
 		// Lines should be terminated with a LF
 		if err == io.EOF {
 			require.Equal(t, uint8('\n'), buf[n-1])
 			break
 		}
 		require.NoError(t, err)
 	}
 }
 func TestMetricReader_OverflowMultipleMetrics(t *testing.T) {
 	ts := time.Unix(1481032190, 0)
 	m, _ := New("foo", map[string]string{},
@@ -620,94 +485,3 @@ func TestMetricReader_SplitMetricChangingBuffer2(t *testing.T) {
 		assert.Equal(t, test.err, err, test.expRegex)
 	}
 }
 func TestReader_Read(t *testing.T) {
 	epoch := time.Unix(0, 0)
 	type args struct {
 		name   string
 		tags   map[string]string
 		fields map[string]interface{}
 		t      time.Time
 		mType  []telegraf.ValueType
 	}
 	tests := []struct {
 		name     string
 		args     args
 		expected []byte
 	}{
 		{
 			name: "escape backslashes in string field",
 			args: args{
 				name:   "cpu",
 				tags:   map[string]string{},
 				fields: map[string]interface{}{"value": `test\`},
 				t:      epoch,
 			},
 			expected: []byte(`cpu value="test\\" 0`),
 		},
 		{
 			name: "escape quote in string field",
 			args: args{
 				name:   "cpu",
 				tags:   map[string]string{},
 				fields: map[string]interface{}{"value": `test"`},
 				t:      epoch,
 			},
 			expected: []byte(`cpu value="test\"" 0`),
 		},
 		{
 			name: "escape quote and backslash in string field",
 			args: args{
 				name:   "cpu",
 				tags:   map[string]string{},
 				fields: map[string]interface{}{"value": `test\"`},
 				t:      epoch,
 			},
 			expected: []byte(`cpu value="test\\\"" 0`),
 		},
 		{
 			name: "escape multiple backslash in string field",
 			args: args{
 				name:   "cpu",
 				tags:   map[string]string{},
 				fields: map[string]interface{}{"value": `test\\`},
 				t:      epoch,
 			},
 			expected: []byte(`cpu value="test\\\\" 0`),
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			buf := make([]byte, 512)
 			m, err := New(tt.args.name, tt.args.tags, tt.args.fields, tt.args.t, tt.args.mType...)
 			require.NoError(t, err)
 			r := NewReader([]telegraf.Metric{m})
 			num, err := r.Read(buf)
 			if err != io.EOF {
 				require.NoError(t, err)
 			}
 			line := string(buf[:num])
 			// This is done so that we can use raw strings in the test spec
 			noeol := strings.TrimRight(line, "\n")
 			require.Equal(t, string(tt.expected), noeol)
 			require.Equal(t, len(tt.expected)+1, num)
 		})
 	}
 }
 func TestMetricRoundtrip(t *testing.T) {
 	const lp = `nstat,bu=linux,cls=server,dc=cer,env=production,host=hostname,name=netstat,sr=database IpExtInBcastOctets=12570626154i,IpExtInBcastPkts=95541226i,IpExtInCEPkts=0i,IpExtInCsumErrors=0i,IpExtInECT0Pkts=55674i,IpExtInECT1Pkts=0i,IpExtInMcastOctets=5928296i,IpExtInMcastPkts=174365i,IpExtInNoECTPkts=17965863529i,IpExtInNoRoutes=20i,IpExtInOctets=3334866321815i,IpExtInTruncatedPkts=0i,IpExtOutBcastOctets=0i,IpExtOutBcastPkts=0i,IpExtOutMcastOctets=0i,IpExtOutMcastPkts=0i,IpExtOutOctets=31397892391399i,TcpExtArpFilter=0i,TcpExtBusyPollRxPackets=0i,TcpExtDelayedACKLocked=14094i,TcpExtDelayedACKLost=302083i,TcpExtDelayedACKs=55486507i,TcpExtEmbryonicRsts=11879i,TcpExtIPReversePathFilter=0i,TcpExtListenDrops=1736i,TcpExtListenOverflows=0i,TcpExtLockDroppedIcmps=0i,TcpExtOfoPruned=0i,TcpExtOutOfWindowIcmps=8i,TcpExtPAWSActive=0i,TcpExtPAWSEstab=974i,TcpExtPAWSPassive=0i,TcpExtPruneCalled=0i,TcpExtRcvPruned=0i,TcpExtSyncookiesFailed=12593i,TcpExtSyncookiesRecv=0i,TcpExtSyncookiesSent=0i,TcpExtTCPACKSkippedChallenge=0i,TcpExtTCPACKSkippedFinWait2=0i,TcpExtTCPACKSkippedPAWS=806i,TcpExtTCPACKSkippedSeq=519i,TcpExtTCPACKSkippedSynRecv=0i,TcpExtTCPACKSkippedTimeWait=0i,TcpExtTCPAbortFailed=0i,TcpExtTCPAbortOnClose=22i,TcpExtTCPAbortOnData=36593i,TcpExtTCPAbortOnLinger=0i,TcpExtTCPAbortOnMemory=0i,TcpExtTCPAbortOnTimeout=674i,TcpExtTCPAutoCorking=494253233i,TcpExtTCPBacklogDrop=0i,TcpExtTCPChallengeACK=281i,TcpExtTCPDSACKIgnoredNoUndo=93354i,TcpExtTCPDSACKIgnoredOld=336i,TcpExtTCPDSACKOfoRecv=0i,TcpExtTCPDSACKOfoSent=7i,TcpExtTCPDSACKOldSent=302073i,TcpExtTCPDSACKRecv=215884i,TcpExtTCPDSACKUndo=7633i,TcpExtTCPDeferAcceptDrop=0i,TcpExtTCPDirectCopyFromBacklog=0i,TcpExtTCPDirectCopyFromPrequeue=0i,TcpExtTCPFACKReorder=1320i,TcpExtTCPFastOpenActive=0i,TcpExtTCPFastOpenActiveFail=0i,TcpExtTCPFastOpenCookieReqd=0i,TcpExtTCPFastOpenListenOverflow=0i,TcpExtTCPFastOpenPassive=0i,TcpExtTCPFastOpenPassiveFail=0i,TcpExtTCPFastRetrans=350681i,TcpExtTCPForwardRetrans=142168i,TcpExtTCPFromZeroWindowAdv=4317i,TcpExtTCPFullUndo=29502i,TcpExtTCPHPAcks=10267073000i,TcpExtTCPHPHits=5629837098i,TcpExtTCPHPHitsToUser=0i,TcpExtTCPHystartDelayCwnd=285127i,TcpExtTCPHystartDelayDetect=12318i,TcpExtTCPHystartTrainCwnd=69160570i,TcpExtTCPHystartTrainDetect=3315799i,TcpExtTCPLossFailures=109i,TcpExtTCPLossProbeRecovery=110819i,TcpExtTCPLossProbes=233995i,TcpExtTCPLossUndo=5276i,TcpExtTCPLostRetransmit=397i,TcpExtTCPMD5NotFound=0i,TcpExtTCPMD5Unexpected=0i,TcpExtTCPMemoryPressures=0i,TcpExtTCPMinTTLDrop=0i,TcpExtTCPOFODrop=0i,TcpExtTCPOFOMerge=7i,TcpExtTCPOFOQueue=15196i,TcpExtTCPOrigDataSent=29055119435i,TcpExtTCPPartialUndo=21320i,TcpExtTCPPrequeueDropped=0i,TcpExtTCPPrequeued=0i,TcpExtTCPPureAcks=1236441827i,TcpExtTCPRcvCoalesce=225590473i,TcpExtTCPRcvCollapsed=0i,TcpExtTCPRenoFailures=0i,TcpExtTCPRenoRecovery=0i,TcpExtTCPRenoRecoveryFail=0i,TcpExtTCPRenoReorder=0i,TcpExtTCPReqQFullDoCookies=0i,TcpExtTCPReqQFullDrop=0i,TcpExtTCPRetransFail=41i,TcpExtTCPSACKDiscard=0i,TcpExtTCPSACKReneging=0i,TcpExtTCPSACKReorder=4307i,TcpExtTCPSYNChallenge=244i,TcpExtTCPSackFailures=1698i,TcpExtTCPSackMerged=184668i,TcpExtTCPSackRecovery=97369i,TcpExtTCPSackRecoveryFail=381i,TcpExtTCPSackShiftFallback=2697079i,TcpExtTCPSackShifted=760299i,TcpExtTCPSchedulerFailed=0i,TcpExtTCPSlowStartRetrans=9276i,TcpExtTCPSpuriousRTOs=959i,TcpExtTCPSpuriousRtxHostQueues=2973i,TcpExtTCPSynRetrans=200970i,TcpExtTCPTSReorder=15221i,TcpExtTCPTimeWaitOverflow=0i,TcpExtTCPTimeouts=70127i,TcpExtTCPToZeroWindowAdv=4317i,TcpExtTCPWantZeroWindowAdv=2133i,TcpExtTW=24809813i,TcpExtTWKilled=0i,TcpExtTWRecycled=0i 1496460785000000000
 nstat,bu=linux,cls=server,dc=cer,env=production,host=hostname,name=snmp,sr=database IcmpInAddrMaskReps=0i,IcmpInAddrMasks=90i,IcmpInCsumErrors=0i,IcmpInDestUnreachs=284401i,IcmpInEchoReps=9i,IcmpInEchos=1761912i,IcmpInErrors=407i,IcmpInMsgs=2047767i,IcmpInParmProbs=0i,IcmpInRedirects=0i,IcmpInSrcQuenchs=0i,IcmpInTimeExcds=46i,IcmpInTimestampReps=0i,IcmpInTimestamps=1309i,IcmpMsgInType0=9i,IcmpMsgInType11=46i,IcmpMsgInType13=1309i,IcmpMsgInType17=90i,IcmpMsgInType3=284401i,IcmpMsgInType8=1761912i,IcmpMsgOutType0=1761912i,IcmpMsgOutType14=1248i,IcmpMsgOutType3=108709i,IcmpMsgOutType8=9i,IcmpOutAddrMaskReps=0i,IcmpOutAddrMasks=0i,IcmpOutDestUnreachs=108709i,IcmpOutEchoReps=1761912i,IcmpOutEchos=9i,IcmpOutErrors=0i,IcmpOutMsgs=1871878i,IcmpOutParmProbs=0i,IcmpOutRedirects=0i,IcmpOutSrcQuenchs=0i,IcmpOutTimeExcds=0i,IcmpOutTimestampReps=1248i,IcmpOutTimestamps=0i,IpDefaultTTL=64i,IpForwDatagrams=0i,IpForwarding=2i,IpFragCreates=0i,IpFragFails=0i,IpFragOKs=0i,IpInAddrErrors=0i,IpInDelivers=17658795773i,IpInDiscards=0i,IpInHdrErrors=0i,IpInReceives=17659269339i,IpInUnknownProtos=0i,IpOutDiscards=236976i,IpOutNoRoutes=1009i,IpOutRequests=23466783734i,IpReasmFails=0i,IpReasmOKs=0i,IpReasmReqds=0i,IpReasmTimeout=0i,TcpActiveOpens=23308977i,TcpAttemptFails=3757543i,TcpCurrEstab=280i,TcpEstabResets=184792i,TcpInCsumErrors=0i,TcpInErrs=232i,TcpInSegs=17536573089i,TcpMaxConn=-1i,TcpOutRsts=4051451i,TcpOutSegs=29836254873i,TcpPassiveOpens=176546974i,TcpRetransSegs=878085i,TcpRtoAlgorithm=1i,TcpRtoMax=120000i,TcpRtoMin=200i,UdpInCsumErrors=0i,UdpInDatagrams=24441661i,UdpInErrors=0i,UdpLiteInCsumErrors=0i,UdpLiteInDatagrams=0i,UdpLiteInErrors=0i,UdpLiteNoPorts=0i,UdpLiteOutDatagrams=0i,UdpLiteRcvbufErrors=0i,UdpLiteSndbufErrors=0i,UdpNoPorts=17660i,UdpOutDatagrams=51807896i,UdpRcvbufErrors=0i,UdpSndbufErrors=236922i 1496460785000000000
 `
 	metrics, err := Parse([]byte(lp))
 	require.NoError(t, err)
 	r := NewReader(metrics)
 	buf := make([]byte, 128)
 	_, err = r.Read(buf)
 	require.NoError(t, err)
 	metrics, err = Parse(buf)
 	require.NoError(t, err)
 }
--- a/plugins/aggregators/all/all.go
+++ b/plugins/aggregators/all/all.go
@@ -1,6 +1,5 @@
 package all
 import (
 	_ "github.com/influxdata/telegraf/plugins/aggregators/histogram"
 	_ "github.com/influxdata/telegraf/plugins/aggregators/minmax"
 )
--- a/plugins/aggregators/histogram/README.md
+++ b/plugins/aggregators/histogram/README.md
@@ -1,97 +0,0 @@
 # Histogram Aggregator Plugin
 The histogram aggregator plugin creates histograms containing the counts of
 field values within a range.
 Values added to a bucket are also added to the larger buckets in the
 distribution.  This creates a [cumulative histogram](https://en.wikipedia.org/wiki/Histogram#/media/File:Cumulative_vs_normal_histogram.svg).
 Like other Telegraf aggregators, the metric is emitted every `period` seconds.
 Bucket counts however are not reset between periods and will be non-strictly
 increasing while Telegraf is running.
 #### Design
 Each metric is passed to the aggregator and this aggregator searches
 histogram buckets for those fields, which have been specified in the
 config. If buckets are found, the aggregator will increment +1 to the appropriate
 bucket otherwise it will be added to the `+Inf` bucket.  Every `period`
 seconds this data will be forwarded to the outputs.
 The algorithm of hit counting to buckets was implemented on the base
 of the algorithm which is implemented in the Prometheus
 [client](https://github.com/prometheus/client_golang/blob/master/prometheus/histogram.go).
 ### Configuration
 ```toml
 # Configuration for aggregate histogram metrics
 [[aggregators.histogram]]
  ## The period in which to flush the aggregator.
  period = "30s"
  ## If true, the original metric will be dropped by the
  ## aggregator and will not get sent to the output plugins.
  drop_original = false
  ## Example config that aggregates all fields of the metric.
  # [[aggregators.histogram.config]]
  #   ## The set of buckets.
  #   buckets = [0.0, 15.6, 34.5, 49.1, 71.5, 80.5, 94.5, 100.0]
  #   ## The name of metric.
  #   measurement_name = "cpu"
  ## Example config that aggregates only specific fields of the metric.
  # [[aggregators.histogram.config]]
  #   ## The set of buckets.
  #   buckets = [0.0, 10.0, 20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0]
  #   ## The name of metric.
  #   measurement_name = "diskio"
  #   ## The concrete fields of metric
  #   fields = ["io_time", "read_time", "write_time"]
 ```
 The user is responsible for defining the bounds of the histogram bucket as
 well as the measurement name and fields to aggregate.
 Each histogram config section must contain a `buckets` and `measurement_name`
 option.  Optionally, if `fields` is set only the fields listed will be
 aggregated.  If `fields` is not set all fields are aggregated.
 The `buckets` option contains a list of floats which specify the bucket
 boundaries.  Each float value defines the inclusive upper bound of the bucket.
 The `+Inf` bucket is added automatically and does not need to be defined.
 ### Measurements & Fields:
 The postfix `bucket` will be added to each field key.
 - measurement1
    - field1_bucket
    - field2_bucket
 ### Tags:
 All measurements are given the tag `le`. This tag has the border value of
 bucket. It means that the metric value is less than or equal to the value of
 this tag.  For example, let assume that we have the metric value 10 and the
 following buckets: [5, 10, 30, 70, 100]. Then the tag `le` will have the value
 10, because the metrics value is passed into bucket with right border value
 `10`.
 ### Example Output:
 ```
 cpu,cpu=cpu1,host=localhost,le=0.0 usage_idle_bucket=0i 1486998330000000000
 cpu,cpu=cpu1,host=localhost,le=10.0 usage_idle_bucket=0i 1486998330000000000
 cpu,cpu=cpu1,host=localhost,le=20.0 usage_idle_bucket=1i 1486998330000000000
 cpu,cpu=cpu1,host=localhost,le=30.0 usage_idle_bucket=2i 1486998330000000000
 cpu,cpu=cpu1,host=localhost,le=40.0 usage_idle_bucket=2i 1486998330000000000
 cpu,cpu=cpu1,host=localhost,le=50.0 usage_idle_bucket=2i 1486998330000000000
 cpu,cpu=cpu1,host=localhost,le=60.0 usage_idle_bucket=2i 1486998330000000000
 cpu,cpu=cpu1,host=localhost,le=70.0 usage_idle_bucket=2i 1486998330000000000
 cpu,cpu=cpu1,host=localhost,le=80.0 usage_idle_bucket=2i 1486998330000000000
 cpu,cpu=cpu1,host=localhost,le=90.0 usage_idle_bucket=2i 1486998330000000000
 cpu,cpu=cpu1,host=localhost,le=100.0 usage_idle_bucket=2i 1486998330000000000
 cpu,cpu=cpu1,host=localhost,le=+Inf usage_idle_bucket=2i 1486998330000000000
 ```
--- a/plugins/aggregators/histogram/histogram.go
+++ b/plugins/aggregators/histogram/histogram.go
@@ -1,315 +0,0 @@
 package histogram
 import (
 	"sort"
 	"strconv"
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/aggregators"
 )
 // bucketTag is the tag, which contains right bucket border
 const bucketTag = "le"
 // bucketInf is the right bucket border for infinite values
 const bucketInf = "+Inf"
 // HistogramAggregator is aggregator with histogram configs and particular histograms for defined metrics
 type HistogramAggregator struct {
 	Configs []config `toml:"config"`
 	buckets bucketsByMetrics
 	cache   map[uint64]metricHistogramCollection
 }
 // config is the config, which contains name, field of metric and histogram buckets.
 type config struct {
 	Metric  string   `toml:"measurement_name"`
 	Fields  []string `toml:"fields"`
 	Buckets buckets  `toml:"buckets"`
 }
 // bucketsByMetrics contains the buckets grouped by metric and field name
 type bucketsByMetrics map[string]bucketsByFields
 // bucketsByFields contains the buckets grouped by field name
 type bucketsByFields map[string]buckets
 // buckets contains the right borders buckets
 type buckets []float64
 // metricHistogramCollection aggregates the histogram data
 type metricHistogramCollection struct {
 	histogramCollection map[string]counts
 	name                string
 	tags                map[string]string
 }
 // counts is the number of hits in the bucket
 type counts []int64
 // groupedByCountFields contains grouped fields by their count and fields values
 type groupedByCountFields struct {
 	name            string
 	tags            map[string]string
 	fieldsWithCount map[string]int64
 }
 // NewHistogramAggregator creates new histogram aggregator
 func NewHistogramAggregator() telegraf.Aggregator {
 	h := &HistogramAggregator{}
 	h.buckets = make(bucketsByMetrics)
 	h.resetCache()
 	return h
 }
 var sampleConfig = `
  ## The period in which to flush the aggregator.
  period = "30s"
  ## If true, the original metric will be dropped by the
  ## aggregator and will not get sent to the output plugins.
  drop_original = false
  ## Example config that aggregates all fields of the metric.
  # [[aggregators.histogram.config]]
  #   ## The set of buckets.
  #   buckets = [0.0, 15.6, 34.5, 49.1, 71.5, 80.5, 94.5, 100.0]
  #   ## The name of metric.
  #   measurement_name = "cpu"
  ## Example config that aggregates only specific fields of the metric.
  # [[aggregators.histogram.config]]
  #   ## The set of buckets.
  #   buckets = [0.0, 10.0, 20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0]
  #   ## The name of metric.
  #   measurement_name = "diskio"
  #   ## The concrete fields of metric
  #   fields = ["io_time", "read_time", "write_time"]
 `
 // SampleConfig returns sample of config
 func (h *HistogramAggregator) SampleConfig() string {
 	return sampleConfig
 }
 // Description returns description of aggregator plugin
 func (h *HistogramAggregator) Description() string {
 	return "Create aggregate histograms."
 }
 // Add adds new hit to the buckets
 func (h *HistogramAggregator) Add(in telegraf.Metric) {
 	bucketsByField := make(map[string][]float64)
 	for field := range in.Fields() {
 		buckets := h.getBuckets(in.Name(), field)
 		if buckets != nil {
 			bucketsByField[field] = buckets
 		}
 	}
 	if len(bucketsByField) == 0 {
 		return
 	}
 	id := in.HashID()
 	agr, ok := h.cache[id]
 	if !ok {
 		agr = metricHistogramCollection{
 			name:                in.Name(),
 			tags:                in.Tags(),
 			histogramCollection: make(map[string]counts),
 		}
 	}
 	for field, value := range in.Fields() {
 		if buckets, ok := bucketsByField[field]; ok {
 			if agr.histogramCollection[field] == nil {
 				agr.histogramCollection[field] = make(counts, len(buckets)+1)
 			}
 			if value, ok := convert(value); ok {
 				index := sort.SearchFloat64s(buckets, value)
 				agr.histogramCollection[field][index]++
 			}
 		}
 	}
 	h.cache[id] = agr
 }
 // Push returns histogram values for metrics
 func (h *HistogramAggregator) Push(acc telegraf.Accumulator) {
 	metricsWithGroupedFields := []groupedByCountFields{}
 	for _, aggregate := range h.cache {
 		for field, counts := range aggregate.histogramCollection {
 			h.groupFieldsByBuckets(&metricsWithGroupedFields, aggregate.name, field, copyTags(aggregate.tags), counts)
 		}
 	}
 	for _, metric := range metricsWithGroupedFields {
 		acc.AddFields(metric.name, makeFieldsWithCount(metric.fieldsWithCount), metric.tags)
 	}
 }
 // groupFieldsByBuckets groups fields by metric buckets which are represented as tags
 func (h *HistogramAggregator) groupFieldsByBuckets(
 	metricsWithGroupedFields *[]groupedByCountFields,
 	name string,
 	field string,
 	tags map[string]string,
 	counts []int64,
 ) {
 	count := int64(0)
 	for index, bucket := range h.getBuckets(name, field) {
 		count += counts[index]
 		tags[bucketTag] = strconv.FormatFloat(bucket, 'f', -1, 64)
 		h.groupField(metricsWithGroupedFields, name, field, count, copyTags(tags))
 	}
 	count += counts[len(counts)-1]
 	tags[bucketTag] = bucketInf
 	h.groupField(metricsWithGroupedFields, name, field, count, tags)
 }
 // groupField groups field by count value
 func (h *HistogramAggregator) groupField(
 	metricsWithGroupedFields *[]groupedByCountFields,
 	name string,
 	field string,
 	count int64,
 	tags map[string]string,
 ) {
 	for key, metric := range *metricsWithGroupedFields {
 		if name == metric.name && isTagsIdentical(tags, metric.tags) {
 			(*metricsWithGroupedFields)[key].fieldsWithCount[field] = count
 			return
 		}
 	}
 	fieldsWithCount := map[string]int64{
 		field: count,
 	}
 	*metricsWithGroupedFields = append(
 		*metricsWithGroupedFields,
 		groupedByCountFields{name: name, tags: tags, fieldsWithCount: fieldsWithCount},
 	)
 }
 // Reset does nothing, because we need to collect counts for a long time, otherwise if config parameter 'reset' has
 // small value, we will get a histogram with a small amount of the distribution.
 func (h *HistogramAggregator) Reset() {}
 // resetCache resets cached counts(hits) in the buckets
 func (h *HistogramAggregator) resetCache() {
 	h.cache = make(map[uint64]metricHistogramCollection)
 }
 // getBuckets finds buckets and returns them
 func (h *HistogramAggregator) getBuckets(metric string, field string) []float64 {
 	if buckets, ok := h.buckets[metric][field]; ok {
 		return buckets
 	}
 	for _, config := range h.Configs {
 		if config.Metric == metric {
 			if !isBucketExists(field, config) {
 				continue
 			}
 			if _, ok := h.buckets[metric]; !ok {
 				h.buckets[metric] = make(bucketsByFields)
 			}
 			h.buckets[metric][field] = sortBuckets(config.Buckets)
 		}
 	}
 	return h.buckets[metric][field]
 }
 // isBucketExists checks if buckets exists for the passed field
 func isBucketExists(field string, cfg config) bool {
 	if len(cfg.Fields) == 0 {
 		return true
 	}
 	for _, fl := range cfg.Fields {
 		if fl == field {
 			return true
 		}
 	}
 	return false
 }
 // sortBuckets sorts the buckets if it is needed
 func sortBuckets(buckets []float64) []float64 {
 	for i, bucket := range buckets {
 		if i < len(buckets)-1 && bucket >= buckets[i+1] {
 			sort.Float64s(buckets)
 			break
 		}
 	}
 	return buckets
 }
 // convert converts interface to concrete type
 func convert(in interface{}) (float64, bool) {
 	switch v := in.(type) {
 	case float64:
 		return v, true
 	case int64:
 		return float64(v), true
 	default:
 		return 0, false
 	}
 }
 // copyTags copies tags
 func copyTags(tags map[string]string) map[string]string {
 	copiedTags := map[string]string{}
 	for key, val := range tags {
 		copiedTags[key] = val
 	}
 	return copiedTags
 }
 // isTagsIdentical checks the identity of two list of tags
 func isTagsIdentical(originalTags, checkedTags map[string]string) bool {
 	if len(originalTags) != len(checkedTags) {
 		return false
 	}
 	for tagName, tagValue := range originalTags {
 		if tagValue != checkedTags[tagName] {
 			return false
 		}
 	}
 	return true
 }
 // makeFieldsWithCount assigns count value to all metric fields
 func makeFieldsWithCount(fieldsWithCountIn map[string]int64) map[string]interface{} {
 	fieldsWithCountOut := map[string]interface{}{}
 	for field, count := range fieldsWithCountIn {
 		fieldsWithCountOut[field+"_bucket"] = count
 	}
 	return fieldsWithCountOut
 }
 // init initializes histogram aggregator plugin
 func init() {
 	aggregators.Add("histogram", func() telegraf.Aggregator {
 		return NewHistogramAggregator()
 	})
 }
--- a/plugins/aggregators/histogram/histogram_test.go
+++ b/plugins/aggregators/histogram/histogram_test.go
@@ -1,210 +0,0 @@
 package histogram
 import (
 	"fmt"
 	"testing"
 	"time"
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/metric"
 	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
 )
 // NewTestHistogram creates new test histogram aggregation with specified config
 func NewTestHistogram(cfg []config) telegraf.Aggregator {
 	htm := &HistogramAggregator{Configs: cfg}
 	htm.buckets = make(bucketsByMetrics)
 	htm.resetCache()
 	return htm
 }
 // firstMetric1 is the first test metric
 var firstMetric1, _ = metric.New(
 	"first_metric_name",
 	map[string]string{"tag_name": "tag_value"},
 	map[string]interface{}{
 		"a": float64(15.3),
 		"b": float64(40),
 	},
 	time.Now(),
 )
 // firstMetric1 is the first test metric with other value
 var firstMetric2, _ = metric.New(
 	"first_metric_name",
 	map[string]string{"tag_name": "tag_value"},
 	map[string]interface{}{
 		"a": float64(15.9),
 		"c": float64(40),
 	},
 	time.Now(),
 )
 // secondMetric is the second metric
 var secondMetric, _ = metric.New(
 	"second_metric_name",
 	map[string]string{"tag_name": "tag_value"},
 	map[string]interface{}{
 		"a":        float64(105),
 		"ignoreme": "string",
 		"andme":    true,
 	},
 	time.Now(),
 )
 // BenchmarkApply runs benchmarks
 func BenchmarkApply(b *testing.B) {
 	histogram := NewHistogramAggregator()
 	for n := 0; n < b.N; n++ {
 		histogram.Add(firstMetric1)
 		histogram.Add(firstMetric2)
 		histogram.Add(secondMetric)
 	}
 }
 // TestHistogramWithPeriodAndOneField tests metrics for one period and for one field
 func TestHistogramWithPeriodAndOneField(t *testing.T) {
 	var cfg []config
 	cfg = append(cfg, config{Metric: "first_metric_name", Fields: []string{"a"}, Buckets: []float64{0.0, 10.0, 20.0, 30.0, 40.0}})
 	histogram := NewTestHistogram(cfg)
 	acc := &testutil.Accumulator{}
 	histogram.Add(firstMetric1)
 	histogram.Add(firstMetric2)
 	histogram.Push(acc)
 	if len(acc.Metrics) != 6 {
 		assert.Fail(t, "Incorrect number of metrics")
 	}
 	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(0)}, "0")
 	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(0)}, "10")
 	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2)}, "20")
 	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2)}, "30")
 	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2)}, "40")
 	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2)}, bucketInf)
 }
 // TestHistogramWithPeriodAndAllFields tests two metrics for one period and for all fields
 func TestHistogramWithPeriodAndAllFields(t *testing.T) {
 	var cfg []config
 	cfg = append(cfg, config{Metric: "first_metric_name", Buckets: []float64{0.0, 15.5, 20.0, 30.0, 40.0}})
 	cfg = append(cfg, config{Metric: "second_metric_name", Buckets: []float64{0.0, 4.0, 10.0, 23.0, 30.0}})
 	histogram := NewTestHistogram(cfg)
 	acc := &testutil.Accumulator{}
 	histogram.Add(firstMetric1)
 	histogram.Add(firstMetric2)
 	histogram.Add(secondMetric)
 	histogram.Push(acc)
 	if len(acc.Metrics) != 12 {
 		assert.Fail(t, "Incorrect number of metrics")
 	}
 	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(0), "b_bucket": int64(0), "c_bucket": int64(0)}, "0")
 	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(1), "b_bucket": int64(0), "c_bucket": int64(0)}, "15.5")
 	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2), "b_bucket": int64(0), "c_bucket": int64(0)}, "20")
 	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2), "b_bucket": int64(0), "c_bucket": int64(0)}, "30")
 	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2), "b_bucket": int64(1), "c_bucket": int64(1)}, "40")
 	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2), "b_bucket": int64(1), "c_bucket": int64(1)}, bucketInf)
 	assertContainsTaggedField(t, acc, "second_metric_name", map[string]interface{}{"a_bucket": int64(0), "ignoreme_bucket": int64(0), "andme_bucket": int64(0)}, "0")
 	assertContainsTaggedField(t, acc, "second_metric_name", map[string]interface{}{"a_bucket": int64(0), "ignoreme_bucket": int64(0), "andme_bucket": int64(0)}, "4")
 	assertContainsTaggedField(t, acc, "second_metric_name", map[string]interface{}{"a_bucket": int64(0), "ignoreme_bucket": int64(0), "andme_bucket": int64(0)}, "10")
 	assertContainsTaggedField(t, acc, "second_metric_name", map[string]interface{}{"a_bucket": int64(0), "ignoreme_bucket": int64(0), "andme_bucket": int64(0)}, "23")
 	assertContainsTaggedField(t, acc, "second_metric_name", map[string]interface{}{"a_bucket": int64(0), "ignoreme_bucket": int64(0), "andme_bucket": int64(0)}, "30")
 	assertContainsTaggedField(t, acc, "second_metric_name", map[string]interface{}{"a_bucket": int64(1), "ignoreme_bucket": int64(0), "andme_bucket": int64(0)}, bucketInf)
 }
 // TestHistogramDifferentPeriodsAndAllFields tests two metrics getting added with a push/reset in between (simulates
 // getting added in different periods) for all fields
 func TestHistogramDifferentPeriodsAndAllFields(t *testing.T) {
 	var cfg []config
 	cfg = append(cfg, config{Metric: "first_metric_name", Buckets: []float64{0.0, 10.0, 20.0, 30.0, 40.0}})
 	histogram := NewTestHistogram(cfg)
 	acc := &testutil.Accumulator{}
 	histogram.Add(firstMetric1)
 	histogram.Push(acc)
 	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(0), "b_bucket": int64(0)}, "0")
 	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(0), "b_bucket": int64(0)}, "10")
 	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(1), "b_bucket": int64(0)}, "20")
 	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(1), "b_bucket": int64(0)}, "30")
 	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(1), "b_bucket": int64(1)}, "40")
 	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(1), "b_bucket": int64(1)}, bucketInf)
 	acc.ClearMetrics()
 	histogram.Add(firstMetric2)
 	histogram.Push(acc)
 	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(0), "b_bucket": int64(0), "c_bucket": int64(0)}, "0")
 	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(0), "b_bucket": int64(0), "c_bucket": int64(0)}, "10")
 	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2), "b_bucket": int64(0), "c_bucket": int64(0)}, "20")
 	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2), "b_bucket": int64(0), "c_bucket": int64(0)}, "30")
 	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2), "b_bucket": int64(1), "c_bucket": int64(1)}, "40")
 	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2), "b_bucket": int64(1), "c_bucket": int64(1)}, bucketInf)
 }
 // TestWrongBucketsOrder tests the calling panic with incorrect order of buckets
 func TestWrongBucketsOrder(t *testing.T) {
 	defer func() {
 		if r := recover(); r != nil {
 			assert.Equal(
 				t,
 				"histogram buckets must be in increasing order: 90.00 >= 20.00, metrics: first_metric_name, field: a",
 				fmt.Sprint(r),
 			)
 		}
 	}()
 	var cfg []config
 	cfg = append(cfg, config{Metric: "first_metric_name", Buckets: []float64{0.0, 90.0, 20.0, 30.0, 40.0}})
 	histogram := NewTestHistogram(cfg)
 	histogram.Add(firstMetric2)
 }
 // assertContainsTaggedField is help functions to test histogram data
 func assertContainsTaggedField(t *testing.T, acc *testutil.Accumulator, metricName string, fields map[string]interface{}, le string) {
 	acc.Lock()
 	defer acc.Unlock()
 	for _, checkedMetric := range acc.Metrics {
 		// check metric name
 		if checkedMetric.Measurement != metricName {
 			continue
 		}
 		// check "le" tag
 		if checkedMetric.Tags[bucketTag] != le {
 			continue
 		}
 		// check fields
 		isFieldsIdentical := true
 		for field := range fields {
 			if _, ok := checkedMetric.Fields[field]; !ok {
 				isFieldsIdentical = false
 				break
 			}
 		}
 		if !isFieldsIdentical {
 			continue
 		}
 		// check fields with their counts
 		if assert.Equal(t, fields, checkedMetric.Fields) {
 			return
 		}
 		assert.Fail(t, fmt.Sprintf("incorrect fields %v of metric %s", fields, metricName))
 	}
 	assert.Fail(t, fmt.Sprintf("unknown measurement '%s' with tags: %v, fields: %v", metricName, map[string]string{"le": le}, fields))
 }
--- a/plugins/inputs/EXAMPLE_README.md
+++ b/plugins/inputs/EXAMPLE_README.md
@@ -1,8 +1,6 @@
 # Example Input Plugin
-The example plugin gathers metrics about example things.  This description
+The example plugin gathers metrics about example things
 explains at a high level what the plugin does and provides links to where
 additional information can be found.
 ### Configuration:
@@ -14,8 +12,7 @@ additional information can be found.
 ### Measurements & Fields:
-Here you should add an optional description and links to where the user can
+<optional description>
 get more information about the measurements.
 - measurement1
    - field1 (type, unit)
@@ -33,11 +30,8 @@ get more information about the measurements.
 ### Sample Queries:
-This section should contain some useful InfluxDB queries that can be used to
+These are some useful queries (to generate dashboards or other) to run against data from this plugin:
 get started with the plugin or to generate dashboards.  For each query listed,
 describe at a high level what data is returned.
 Get the max, mean, and min for the measurement in the last hour:
 ```
 SELECT max(field1), mean(field1), min(field1) FROM measurement1 WHERE tag1=bar AND time > now() - 1h GROUP BY tag
 ```
@@ -45,6 +39,7 @@ SELECT max(field1), mean(field1), min(field1) FROM measurement1 WHERE tag1=bar A
 ### Example Output:
 ```
 $ ./telegraf -config telegraf.conf -input-filter example -test
 measurement1,tag1=foo,tag2=bar field1=1i,field2=2.1 1453831884664956455
 measurement2,tag1=foo,tag2=bar,tag3=baz field3=1i 1453831884664956455
 ```
--- a/plugins/inputs/aerospike/README.md
+++ b/plugins/inputs/aerospike/README.md
--- a/plugins/inputs/aerospike/aerospike.go
+++ b/plugins/inputs/aerospike/aerospike.go
@@ -10,6 +10,7 @@ import (
 	"time"
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	as "github.com/aerospike/aerospike-client-go"
@@ -40,16 +41,17 @@ func (a *Aerospike) Gather(acc telegraf.Accumulator) error {
 	}
 	var wg sync.WaitGroup
 	errChan := errchan.New(len(a.Servers))
 	wg.Add(len(a.Servers))
 	for _, server := range a.Servers {
 		go func(serv string) {
 			defer wg.Done()
-			acc.AddError(a.gatherServer(serv, acc))
+			errChan.C <- a.gatherServer(serv, acc)
 		}(server)
 	}
 	wg.Wait()
-	return nil
+	return errChan.Error()
 }
 func (a *Aerospike) gatherServer(hostport string, acc telegraf.Accumulator) error {
@@ -73,9 +75,10 @@ func (a *Aerospike) gatherServer(hostport string, acc telegraf.Accumulator) erro
 	for _, n := range nodes {
 		tags := map[string]string{
 			"aerospike_host": hostport,
 		}
 		fields := map[string]interface{}{
 			"node_name": n.GetName(),
 		}
 		fields := make(map[string]interface{})
 		stats, err := as.RequestNodeStats(n)
 		if err != nil {
 			return err
@@ -85,7 +88,7 @@ func (a *Aerospike) gatherServer(hostport string, acc telegraf.Accumulator) erro
 			if err == nil {
 				fields[strings.Replace(k, "-", "_", -1)] = val
 			} else {
-				log.Printf("I! skipping aerospike field %v with int64 overflow: %q", k, v)
+				log.Printf("I! skipping aerospike field %v with int64 overflow", k)
 			}
 		}
 		acc.AddFields("aerospike_node", fields, tags, time.Now())
@@ -99,10 +102,11 @@ func (a *Aerospike) gatherServer(hostport string, acc telegraf.Accumulator) erro
 		for _, namespace := range namespaces {
 			nTags := map[string]string{
 				"aerospike_host": hostport,
 				"node_name":      n.GetName(),
 			}
 			nTags["namespace"] = namespace
-			nFields := make(map[string]interface{})
+			nFields := map[string]interface{}{
 				"node_name": n.GetName(),
 			}
 			info, err := as.RequestNodeInfo(n, "namespace/"+namespace)
 			if err != nil {
 				continue
@@ -117,7 +121,7 @@ func (a *Aerospike) gatherServer(hostport string, acc telegraf.Accumulator) erro
 				if err == nil {
 					nFields[strings.Replace(parts[0], "-", "_", -1)] = val
 				} else {
-					log.Printf("I! skipping aerospike field %v with int64 overflow: %q", parts[0], parts[1])
+					log.Printf("I! skipping aerospike field %v with int64 overflow", parts[0])
 				}
 			}
 			acc.AddFields("aerospike_namespace", nFields, nTags, time.Now())
--- a/plugins/inputs/aerospike/aerospike_test.go
+++ b/plugins/inputs/aerospike/aerospike_test.go
@@ -19,14 +19,12 @@ func TestAerospikeStatistics(t *testing.T) {
 	var acc testutil.Accumulator
-	err := acc.GatherError(a.Gather)
+	err := a.Gather(&acc)
 	require.NoError(t, err)
 	assert.True(t, acc.HasMeasurement("aerospike_node"))
 	assert.True(t, acc.HasTag("aerospike_node", "node_name"))
 	assert.True(t, acc.HasMeasurement("aerospike_namespace"))
-	assert.True(t, acc.HasTag("aerospike_namespace", "node_name"))
+	assert.True(t, acc.HasIntField("aerospike_node", "batch_error"))
 	assert.True(t, acc.HasInt64Field("aerospike_node", "batch_error"))
 }
 func TestAerospikeStatisticsPartialErr(t *testing.T) {
@@ -43,11 +41,12 @@ func TestAerospikeStatisticsPartialErr(t *testing.T) {
 	var acc testutil.Accumulator
-	require.Error(t, acc.GatherError(a.Gather))
+	err := a.Gather(&acc)
 	require.Error(t, err)
 	assert.True(t, acc.HasMeasurement("aerospike_node"))
 	assert.True(t, acc.HasMeasurement("aerospike_namespace"))
-	assert.True(t, acc.HasInt64Field("aerospike_node", "batch_error"))
+	assert.True(t, acc.HasIntField("aerospike_node", "batch_error"))
 }
 func TestAerospikeParseValue(t *testing.T) {
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -2,7 +2,6 @@ package all
 import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/aerospike"
 	_ "github.com/influxdata/telegraf/plugins/inputs/amqp_consumer"
 	_ "github.com/influxdata/telegraf/plugins/inputs/apache"
 	_ "github.com/influxdata/telegraf/plugins/inputs/bcache"
 	_ "github.com/influxdata/telegraf/plugins/inputs/cassandra"
@@ -15,15 +14,12 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/couchbase"
 	_ "github.com/influxdata/telegraf/plugins/inputs/couchdb"
 	_ "github.com/influxdata/telegraf/plugins/inputs/disque"
 	_ "github.com/influxdata/telegraf/plugins/inputs/dmcache"
 	_ "github.com/influxdata/telegraf/plugins/inputs/dns_query"
 	_ "github.com/influxdata/telegraf/plugins/inputs/docker"
 	_ "github.com/influxdata/telegraf/plugins/inputs/dovecot"
 	_ "github.com/influxdata/telegraf/plugins/inputs/elasticsearch"
 	_ "github.com/influxdata/telegraf/plugins/inputs/exec"
 	_ "github.com/influxdata/telegraf/plugins/inputs/fail2ban"
 	_ "github.com/influxdata/telegraf/plugins/inputs/filestat"
 	_ "github.com/influxdata/telegraf/plugins/inputs/fluentd"
 	_ "github.com/influxdata/telegraf/plugins/inputs/graylog"
 	_ "github.com/influxdata/telegraf/plugins/inputs/haproxy"
 	_ "github.com/influxdata/telegraf/plugins/inputs/hddtemp"
@@ -32,13 +28,10 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/httpjson"
 	_ "github.com/influxdata/telegraf/plugins/inputs/influxdb"
 	_ "github.com/influxdata/telegraf/plugins/inputs/internal"
 	_ "github.com/influxdata/telegraf/plugins/inputs/interrupts"
 	_ "github.com/influxdata/telegraf/plugins/inputs/ipmi_sensor"
 	_ "github.com/influxdata/telegraf/plugins/inputs/iptables"
 	_ "github.com/influxdata/telegraf/plugins/inputs/jolokia"
 	_ "github.com/influxdata/telegraf/plugins/inputs/kafka_consumer"
 	_ "github.com/influxdata/telegraf/plugins/inputs/kafka_consumer_legacy"
 	_ "github.com/influxdata/telegraf/plugins/inputs/kapacitor"
 	_ "github.com/influxdata/telegraf/plugins/inputs/kubernetes"
 	_ "github.com/influxdata/telegraf/plugins/inputs/leofs"
 	_ "github.com/influxdata/telegraf/plugins/inputs/logparser"
@@ -46,7 +39,6 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/mailchimp"
 	_ "github.com/influxdata/telegraf/plugins/inputs/memcached"
 	_ "github.com/influxdata/telegraf/plugins/inputs/mesos"
 	_ "github.com/influxdata/telegraf/plugins/inputs/minecraft"
 	_ "github.com/influxdata/telegraf/plugins/inputs/mongodb"
 	_ "github.com/influxdata/telegraf/plugins/inputs/mqtt_consumer"
 	_ "github.com/influxdata/telegraf/plugins/inputs/mysql"
@@ -57,7 +49,6 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/nsq_consumer"
 	_ "github.com/influxdata/telegraf/plugins/inputs/nstat"
 	_ "github.com/influxdata/telegraf/plugins/inputs/ntpq"
 	_ "github.com/influxdata/telegraf/plugins/inputs/openldap"
 	_ "github.com/influxdata/telegraf/plugins/inputs/passenger"
 	_ "github.com/influxdata/telegraf/plugins/inputs/phpfpm"
 	_ "github.com/influxdata/telegraf/plugins/inputs/ping"
@@ -72,7 +63,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/salesforce"
 	_ "github.com/influxdata/telegraf/plugins/inputs/sensors"
 	_ "github.com/influxdata/telegraf/plugins/inputs/snmp"
 	_ "github.com/influxdata/telegraf/plugins/inputs/snmp_legacy"
@@ -83,15 +73,12 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/system"
 	_ "github.com/influxdata/telegraf/plugins/inputs/tail"
 	_ "github.com/influxdata/telegraf/plugins/inputs/tcp_listener"
 	_ "github.com/influxdata/telegraf/plugins/inputs/tomcat"
 	_ "github.com/influxdata/telegraf/plugins/inputs/trig"
 	_ "github.com/influxdata/telegraf/plugins/inputs/twemproxy"
 	_ "github.com/influxdata/telegraf/plugins/inputs/udp_listener"
 	_ "github.com/influxdata/telegraf/plugins/inputs/varnish"
 	_ "github.com/influxdata/telegraf/plugins/inputs/webhooks"
 	_ "github.com/influxdata/telegraf/plugins/inputs/win_perf_counters"
 	_ "github.com/influxdata/telegraf/plugins/inputs/win_services"
 	_ "github.com/influxdata/telegraf/plugins/inputs/zfs"
 	_ "github.com/influxdata/telegraf/plugins/inputs/zipkin"
 	_ "github.com/influxdata/telegraf/plugins/inputs/zookeeper"
 )
--- a/plugins/inputs/amqp_consumer/README.md
+++ b/plugins/inputs/amqp_consumer/README.md
@@ -1,47 +0,0 @@
 # AMQP Consumer Input Plugin
 This plugin provides a consumer for use with AMQP 0-9-1, a promenent implementation of this protocol being [RabbitMQ](https://www.rabbitmq.com/).
 Metrics are read from a topic exchange using the configured queue and binding_key.
 Message payload should be formatted in one of the [Telegraf Data Formats](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md).
 For an introduction to AMQP see:
 - https://www.rabbitmq.com/tutorials/amqp-concepts.html
 - https://www.rabbitmq.com/getstarted.html
 The following defaults are known to work with RabbitMQ:
 ```toml
 # AMQP consumer plugin
 [[inputs.amqp_consumer]]
  ## AMQP url
  url = "amqp://localhost:5672/influxdb"
  ## AMQP exchange
  exchange = "telegraf"
  ## AMQP queue name
  queue = "telegraf"
  ## Binding Key
  binding_key = "#"
  ## Controls how many messages the server will try to keep on the network
  ## for consumers before receiving delivery acks.
  #prefetch_count = 50
  ## Auth method. PLAIN and EXTERNAL are supported.
  ## Using EXTERNAL requires enabling the rabbitmq_auth_mechanism_ssl plugin as
  ## described here: https://www.rabbitmq.com/plugins.html
  # auth_method = "PLAIN"
  ## Optional SSL Config
  # ssl_ca = "/etc/telegraf/ca.pem"
  # ssl_cert = "/etc/telegraf/cert.pem"
  # ssl_key = "/etc/telegraf/key.pem"
  ## Use SSL but skip chain & host verification
  # insecure_skip_verify = false
  ## Data format to consume.
  ## Each data format has its own unique set of configuration options, read
  ## more about them here:
  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
  data_format = "influx"
 ```
--- a/plugins/inputs/amqp_consumer/amqp_consumer.go
+++ b/plugins/inputs/amqp_consumer/amqp_consumer.go
@@ -1,280 +0,0 @@
 package amqp_consumer
 import (
 	"fmt"
 	"log"
 	"strings"
 	"sync"
 	"time"
 	"github.com/streadway/amqp"
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"github.com/influxdata/telegraf/plugins/parsers"
 )
 // AMQPConsumer is the top level struct for this plugin
 type AMQPConsumer struct {
 	URL string
 	// AMQP exchange
 	Exchange string
 	// Queue Name
 	Queue string
 	// Binding Key
 	BindingKey string `toml:"binding_key"`
 	// Controls how many messages the server will try to keep on the network
 	// for consumers before receiving delivery acks.
 	PrefetchCount int
 	// AMQP Auth method
 	AuthMethod string
 	// Path to CA file
 	SSLCA string `toml:"ssl_ca"`
 	// Path to host cert file
 	SSLCert string `toml:"ssl_cert"`
 	// Path to cert key file
 	SSLKey string `toml:"ssl_key"`
 	// Use SSL but skip chain & host verification
 	InsecureSkipVerify bool
 	parser parsers.Parser
 	conn   *amqp.Connection
 	wg     *sync.WaitGroup
 }
 type externalAuth struct{}
 func (a *externalAuth) Mechanism() string {
 	return "EXTERNAL"
 }
 func (a *externalAuth) Response() string {
 	return fmt.Sprintf("\000")
 }
 const (
 	DefaultAuthMethod    = "PLAIN"
 	DefaultPrefetchCount = 50
 )
 func (a *AMQPConsumer) SampleConfig() string {
 	return `
  ## AMQP url
  url = "amqp://localhost:5672/influxdb"
  ## AMQP exchange
  exchange = "telegraf"
  ## AMQP queue name
  queue = "telegraf"
  ## Binding Key
  binding_key = "#"
  ## Maximum number of messages server should give to the worker.
  prefetch_count = 50
  ## Auth method. PLAIN and EXTERNAL are supported
  ## Using EXTERNAL requires enabling the rabbitmq_auth_mechanism_ssl plugin as
  ## described here: https://www.rabbitmq.com/plugins.html
  # auth_method = "PLAIN"
  ## Optional SSL Config
  # ssl_ca = "/etc/telegraf/ca.pem"
  # ssl_cert = "/etc/telegraf/cert.pem"
  # ssl_key = "/etc/telegraf/key.pem"
  ## Use SSL but skip chain & host verification
  # insecure_skip_verify = false
  ## Data format to consume.
  ## Each data format has its own unique set of configuration options, read
  ## more about them here:
  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
  data_format = "influx"
 `
 }
 func (a *AMQPConsumer) Description() string {
 	return "AMQP consumer plugin"
 }
 func (a *AMQPConsumer) SetParser(parser parsers.Parser) {
 	a.parser = parser
 }
 // All gathering is done in the Start function
 func (a *AMQPConsumer) Gather(_ telegraf.Accumulator) error {
 	return nil
 }
 func (a *AMQPConsumer) createConfig() (*amqp.Config, error) {
 	// make new tls config
 	tls, err := internal.GetTLSConfig(
 		a.SSLCert, a.SSLKey, a.SSLCA, a.InsecureSkipVerify)
 	if err != nil {
 		return nil, err
 	}
 	// parse auth method
 	var sasl []amqp.Authentication // nil by default
 	if strings.ToUpper(a.AuthMethod) == "EXTERNAL" {
 		sasl = []amqp.Authentication{&externalAuth{}}
 	}
 	config := amqp.Config{
 		TLSClientConfig: tls,
 		SASL:            sasl, // if nil, it will be PLAIN
 	}
 	return &config, nil
 }
 // Start satisfies the telegraf.ServiceInput interface
 func (a *AMQPConsumer) Start(acc telegraf.Accumulator) error {
 	amqpConf, err := a.createConfig()
 	if err != nil {
 		return err
 	}
 	msgs, err := a.connect(amqpConf)
 	if err != nil {
 		return err
 	}
 	a.wg = &sync.WaitGroup{}
 	a.wg.Add(1)
 	go a.process(msgs, acc)
 	go func() {
 		err := <-a.conn.NotifyClose(make(chan *amqp.Error))
 		if err == nil {
 			return
 		}
 		log.Printf("I! AMQP consumer connection closed: %s; trying to reconnect", err)
 		for {
 			msgs, err := a.connect(amqpConf)
 			if err != nil {
 				log.Printf("E! AMQP connection failed: %s", err)
 				time.Sleep(10 * time.Second)
 				continue
 			}
 			a.wg.Add(1)
 			go a.process(msgs, acc)
 			break
 		}
 	}()
 	return nil
 }
 func (a *AMQPConsumer) connect(amqpConf *amqp.Config) (<-chan amqp.Delivery, error) {
 	conn, err := amqp.DialConfig(a.URL, *amqpConf)
 	if err != nil {
 		return nil, err
 	}
 	a.conn = conn
 	ch, err := conn.Channel()
 	if err != nil {
 		return nil, fmt.Errorf("Failed to open a channel: %s", err)
 	}
 	err = ch.ExchangeDeclare(
 		a.Exchange, // name
 		"topic",    // type
 		true,       // durable
 		false,      // auto-deleted
 		false,      // internal
 		false,      // no-wait
 		nil,        // arguments
 	)
 	if err != nil {
 		return nil, fmt.Errorf("Failed to declare an exchange: %s", err)
 	}
 	q, err := ch.QueueDeclare(
 		a.Queue, // queue
 		true,    // durable
 		false,   // delete when unused
 		false,   // exclusive
 		false,   // no-wait
 		nil,     // arguments
 	)
 	if err != nil {
 		return nil, fmt.Errorf("Failed to declare a queue: %s", err)
 	}
 	err = ch.QueueBind(
 		q.Name,       // queue
 		a.BindingKey, // binding-key
 		a.Exchange,   // exchange
 		false,
 		nil,
 	)
 	if err != nil {
 		return nil, fmt.Errorf("Failed to bind a queue: %s", err)
 	}
 	err = ch.Qos(
 		a.PrefetchCount,
 		0,     // prefetch-size
 		false, // global
 	)
 	if err != nil {
 		return nil, fmt.Errorf("Failed to set QoS: %s", err)
 	}
 	msgs, err := ch.Consume(
 		q.Name, // queue
 		"",     // consumer
 		false,  // auto-ack
 		false,  // exclusive
 		false,  // no-local
 		false,  // no-wait
 		nil,    // arguments
 	)
 	if err != nil {
 		return nil, fmt.Errorf("Failed establishing connection to queue: %s", err)
 	}
 	log.Println("I! Started AMQP consumer")
 	return msgs, err
 }
 // Read messages from queue and add them to the Accumulator
 func (a *AMQPConsumer) process(msgs <-chan amqp.Delivery, acc telegraf.Accumulator) {
 	defer a.wg.Done()
 	for d := range msgs {
 		metrics, err := a.parser.Parse(d.Body)
 		if err != nil {
 			log.Printf("E! %v: error parsing metric - %v", err, string(d.Body))
 		} else {
 			for _, m := range metrics {
 				acc.AddFields(m.Name(), m.Fields(), m.Tags(), m.Time())
 			}
 		}
 		d.Ack(false)
 	}
 	log.Printf("I! AMQP consumer queue closed")
 }
 func (a *AMQPConsumer) Stop() {
 	err := a.conn.Close()
 	if err != nil && err != amqp.ErrClosed {
 		log.Printf("E! Error closing AMQP connection: %s", err)
 		return
 	}
 	a.wg.Wait()
 	log.Println("I! Stopped AMQP service")
 }
 func init() {
 	inputs.Add("amqp_consumer", func() telegraf.Input {
 		return &AMQPConsumer{
 			AuthMethod:    DefaultAuthMethod,
 			PrefetchCount: DefaultPrefetchCount,
 		}
 	})
 }
--- a/plugins/inputs/apache/README.md
+++ b/plugins/inputs/apache/README.md
@@ -1,84 +1,55 @@
-# Apache Input Plugin
+# Telegraf plugin: Apache
-The Apache plugin collects server performance information using the [`mod_status`](https://httpd.apache.org/docs/2.4/mod/mod_status.html) module of the [Apache HTTP Server](https://httpd.apache.org/).
+#### Plugin arguments:
 - **urls** []string: List of apache-status URLs to collect from. Default is "http://localhost/server-status?auto".
 - **username** string: Username for HTTP basic authentication
 - **password** string: Password for HTTP basic authentication
 - **timeout** duration: time that the HTTP connection will remain waiting for response. Defalt 4 seconds ("4s")
-Typically, the `mod_status` module is configured to expose a page at the `/server-status?auto` location of the Apache server.  The [ExtendedStatus](https://httpd.apache.org/docs/2.4/mod/core.html#extendedstatus) option must be enabled in order to collect all available fields.  For information about how to configure your server reference the [module documenation](https://httpd.apache.org/docs/2.4/mod/mod_status.html#enable).
+##### Optional SSL Config
-### Configuration:
+- **ssl_ca** string: the full path for the SSL CA certicate
 - **ssl_cert** string: the full path for the SSL certificate
 - **ssl_key** string: the full path for the key file
 - **insecure_skip_verify** bool: if true HTTP client will skip all SSL verifications related to peer and host. Default to false
-```toml
+#### Description
 # Read Apache status information (mod_status)
 [[inputs.apache]]
  ## An array of URLs to gather from, must be directed at the machine
  ## readable version of the mod_status page including the auto query string.
  ## Default is "http://localhost/server-status?auto".
  urls = ["http://localhost/server-status?auto"]
-  ## Credentials for basic HTTP authentication.
+The Apache plugin collects from the /server-status?auto URL. See
-  # username = "myuser"
+[apache.org/server-status?auto](http://www.apache.org/server-status?auto) for an
-  # password = "mypassword"
+example. And
 [here](http://httpd.apache.org/docs/2.2/mod/mod_status.html) for the apache
 mod_status documentation.
-  ## Maximum time to receive response.
+# Measurements:
  # response_timeout = "5s"
-  ## Optional SSL Config
+Meta:
-  # ssl_ca = "/etc/telegraf/ca.pem"
+- tags: `port=<port>`, `server=url`
  # ssl_cert = "/etc/telegraf/cert.pem"
  # ssl_key = "/etc/telegraf/key.pem"
  ## Use SSL but skip chain & host verification
  # insecure_skip_verify = false
 ```
-### Measurements & Fields:
+- apache_TotalAccesses
 - apache_TotalkBytes
 - apache_CPULoad
 - apache_Uptime
 - apache_ReqPerSec
 - apache_BytesPerSec
 - apache_BytesPerReq
 - apache_BusyWorkers
 - apache_IdleWorkers
 - apache_ConnsTotal
 - apache_ConnsAsyncWriting
 - apache_ConnsAsyncKeepAlive
 - apache_ConnsAsyncClosing
- apache
+### Scoreboard measurements
  - BusyWorkers (float)
  - BytesPerReq (float)
  - BytesPerSec (float)
  - ConnsAsyncClosing (float)
  - ConnsAsyncKeepAlive (float)
  - ConnsAsyncWriting (float)
  - ConnsTotal (float)
  - CPUChildrenSystem (float)
  - CPUChildrenUser (float)
  - CPULoad (float)
  - CPUSystem (float)
  - CPUUser (float)
  - IdleWorkers (float)
  - Load1 (float)
  - Load5 (float)
  - Load15 (float)
  - ParentServerConfigGeneration (float)
  - ParentServerMPMGeneration (float)
  - ReqPerSec (float)
  - ServerUptimeSeconds (float)
  - TotalAccesses (float)
  - TotalkBytes (float)
  - Uptime (float)
-The following fields are collected from the `Scoreboard`, and represent the number of requests in the given state:
+- apache_scboard_waiting
-
+- apache_scboard_starting
- apache
+- apache_scboard_reading
-  - scboard_closing (float)
+- apache_scboard_sending
-  - scboard_dnslookup (float)
+- apache_scboard_keepalive
-  - scboard_finishing (float)
+- apache_scboard_dnslookup
-  - scboard_idle_cleanup (float)
+- apache_scboard_closing
-  - scboard_keepalive (float)
+- apache_scboard_logging
-  - scboard_logging (float)
+- apache_scboard_finishing
-  - scboard_open (float)
+- apache_scboard_idle_cleanup
-  - scboard_reading (float)
+- apache_scboard_open
  - scboard_sending (float)
  - scboard_starting (float)
  - scboard_waiting (float)
 ### Tags:
 - All measurements have the following tags:
    - port
    - server
 ### Example Output:
 ```
 apache,port=80,server=debian-stretch-apache BusyWorkers=1,BytesPerReq=0,BytesPerSec=0,CPUChildrenSystem=0,CPUChildrenUser=0,CPULoad=0.00995025,CPUSystem=0.01,CPUUser=0.01,ConnsAsyncClosing=0,ConnsAsyncKeepAlive=0,ConnsAsyncWriting=0,ConnsTotal=0,IdleWorkers=49,Load1=0.01,Load15=0,Load5=0,ParentServerConfigGeneration=3,ParentServerMPMGeneration=2,ReqPerSec=0.00497512,ServerUptimeSeconds=201,TotalAccesses=1,TotalkBytes=0,Uptime=201,scboard_closing=0,scboard_dnslookup=0,scboard_finishing=0,scboard_idle_cleanup=0,scboard_keepalive=0,scboard_logging=0,scboard_open=100,scboard_reading=0,scboard_sending=1,scboard_starting=0,scboard_waiting=49 1502489900000000000
 ```
--- a/plugins/inputs/apache/apache.go
+++ b/plugins/inputs/apache/apache.go
@@ -8,7 +8,6 @@ import (
 	"net/url"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
 	"github.com/influxdata/telegraf"
@@ -29,22 +28,18 @@ type Apache struct {
 	SSLKey string `toml:"ssl_key"`
 	// Use SSL but skip chain & host verification
 	InsecureSkipVerify bool
 	client *http.Client
 }
 var sampleConfig = `
-  ## An array of URLs to gather from, must be directed at the machine
+  ## An array of Apache status URI to gather stats.
  ## readable version of the mod_status page including the auto query string.
  ## Default is "http://localhost/server-status?auto".
  urls = ["http://localhost/server-status?auto"]
  ## user credentials for basic HTTP authentication
  username = "myuser"
  password = "mypassword"
-  ## Credentials for basic HTTP authentication.
+  ## Timeout to the complete conection and reponse time in seconds
-  # username = "myuser"
+  response_timeout = "25s" ## default to 5 seconds
  # password = "mypassword"
  ## Maximum time to receive response.
  # response_timeout = "5s"
  ## Optional SSL Config
  # ssl_ca = "/etc/telegraf/ca.pem"
@@ -70,51 +65,55 @@ func (n *Apache) Gather(acc telegraf.Accumulator) error {
 		n.ResponseTimeout.Duration = time.Second * 5
 	}
-	if n.client == nil {
+	var outerr error
-		client, err := n.createHttpClient()
+	var errch = make(chan error)
 		if err != nil {
 			return err
 		}
 		n.client = client
 	}
 	var wg sync.WaitGroup
 	wg.Add(len(n.Urls))
 	for _, u := range n.Urls {
 		addr, err := url.Parse(u)
 		if err != nil {
-			acc.AddError(fmt.Errorf("Unable to parse address '%s': %s", u, err))
+			return fmt.Errorf("Unable to parse address '%s': %s", u, err)
 			continue
 		}
 		go func(addr *url.URL) {
-			defer wg.Done()
+			errch <- n.gatherUrl(addr, acc)
 			acc.AddError(n.gatherUrl(addr, acc))
 		}(addr)
 	}
-	wg.Wait()
+	// Drain channel, waiting for all requests to finish and save last error.
-	return nil
+	for range n.Urls {
-}
+		if err := <-errch; err != nil {
-
+			outerr = err
-func (n *Apache) createHttpClient() (*http.Client, error) {
+		}
 	tlsCfg, err := internal.GetTLSConfig(
 		n.SSLCert, n.SSLKey, n.SSLCA, n.InsecureSkipVerify)
 	if err != nil {
 		return nil, err
 	}
-	client := &http.Client{
+	return outerr
 		Transport: &http.Transport{
 			TLSClientConfig: tlsCfg,
 		},
 		Timeout: n.ResponseTimeout.Duration,
 	}
 	return client, nil
 }
 func (n *Apache) gatherUrl(addr *url.URL, acc telegraf.Accumulator) error {
 	var tr *http.Transport
 	if addr.Scheme == "https" {
 		tlsCfg, err := internal.GetTLSConfig(
 			n.SSLCert, n.SSLKey, n.SSLCA, n.InsecureSkipVerify)
 		if err != nil {
 			return err
 		}
 		tr = &http.Transport{
 			ResponseHeaderTimeout: time.Duration(3 * time.Second),
 			TLSClientConfig:       tlsCfg,
 		}
 	} else {
 		tr = &http.Transport{
 			ResponseHeaderTimeout: time.Duration(3 * time.Second),
 		}
 	}
 	client := &http.Client{
 		Transport: tr,
 		Timeout:   n.ResponseTimeout.Duration,
 	}
 	req, err := http.NewRequest("GET", addr.String(), nil)
 	if err != nil {
 		return fmt.Errorf("error on new request to %s : %s\n", addr.String(), err)
@@ -124,7 +123,7 @@ func (n *Apache) gatherUrl(addr *url.URL, acc telegraf.Accumulator) error {
 		req.SetBasicAuth(n.Username, n.Password)
 	}
-	resp, err := n.client.Do(req)
+	resp, err := client.Do(req)
 	if err != nil {
 		return fmt.Errorf("error on request to %s : %s\n", addr.String(), err)
 	}
--- a/plugins/inputs/apache/apache_test.go
+++ b/plugins/inputs/apache/apache_test.go
@@ -41,7 +41,7 @@ func TestHTTPApache(t *testing.T) {
 	}
 	var acc testutil.Accumulator
-	err := acc.GatherError(a.Gather)
+	err := a.Gather(&acc)
 	require.NoError(t, err)
 	fields := map[string]interface{}{
--- a/plugins/inputs/bcache/README.md
+++ b/plugins/inputs/bcache/README.md
@@ -70,7 +70,7 @@ Using this configuration:
 When run with:
 ```
-./telegraf --config telegraf.conf --input-filter bcache --test
+./telegraf -config telegraf.conf -input-filter bcache -test
 ```
 It produces:
--- a/plugins/inputs/cassandra/cassandra.go
+++ b/plugins/inputs/cassandra/cassandra.go
@@ -7,6 +7,7 @@ import (
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"io/ioutil"
 	"log"
 	"net/http"
 	"net/url"
 	"strings"
@@ -122,8 +123,8 @@ func (j javaMetric) addTagsFields(out map[string]interface{}) {
 		}
 		j.acc.AddFields(tokens["class"]+tokens["type"], fields, tags)
 	} else {
-		j.acc.AddError(fmt.Errorf("Missing key 'value' in '%s' output response\n%v\n",
+		fmt.Printf("Missing key 'value' in '%s' output response\n%v\n",
-			j.metric, out))
+			j.metric, out)
 	}
 }
@@ -154,8 +155,8 @@ func (c cassandraMetric) addTagsFields(out map[string]interface{}) {
 				addCassandraMetric(k, c, v.(map[string]interface{}))
 			}
 		} else {
-			c.acc.AddError(fmt.Errorf("Missing key 'value' in '%s' output response\n%v\n",
+			fmt.Printf("Missing key 'value' in '%s' output response\n%v\n",
-				c.metric, out))
+				c.metric, out)
 			return
 		}
 	} else {
@@ -163,8 +164,8 @@ func (c cassandraMetric) addTagsFields(out map[string]interface{}) {
 			addCassandraMetric(r.(map[string]interface{})["mbean"].(string),
 				c, values.(map[string]interface{}))
 		} else {
-			c.acc.AddError(fmt.Errorf("Missing key 'value' in '%s' output response\n%v\n",
+			fmt.Printf("Missing key 'value' in '%s' output response\n%v\n",
-				c.metric, out))
+				c.metric, out)
 			return
 		}
 	}
@@ -273,8 +274,8 @@ func (c *Cassandra) Gather(acc telegraf.Accumulator) error {
 				m = newCassandraMetric(serverTokens["host"], metric, acc)
 			} else {
 				// unsupported metric type
-				acc.AddError(fmt.Errorf("E! Unsupported Cassandra metric [%s], skipping",
+				log.Printf("I! Unsupported Cassandra metric [%s], skipping",
-					metric))
+					metric)
 				continue
 			}
@@ -282,8 +283,7 @@ func (c *Cassandra) Gather(acc telegraf.Accumulator) error {
 			requestUrl, err := url.Parse("http://" + serverTokens["host"] + ":" +
 				serverTokens["port"] + context + metric)
 			if err != nil {
-				acc.AddError(err)
+				return err
 				continue
 			}
 			if serverTokens["user"] != "" && serverTokens["passwd"] != "" {
 				requestUrl.User = url.UserPassword(serverTokens["user"],
@@ -291,12 +291,8 @@ func (c *Cassandra) Gather(acc telegraf.Accumulator) error {
 			}
 			out, err := c.getAttr(requestUrl)
 			if err != nil {
 				acc.AddError(err)
 				continue
 			}
 			if out["status"] != 200.0 {
-				acc.AddError(fmt.Errorf("URL returned with status %v - %s\n", out["status"], requestUrl))
+				fmt.Printf("URL returned with status %v\n", out["status"])
 				continue
 			}
 			m.addTagsFields(out)
--- a/plugins/inputs/cassandra/cassandra_test.go
+++ b/plugins/inputs/cassandra/cassandra_test.go
@@ -151,7 +151,7 @@ func TestHttpJsonJavaMultiValue(t *testing.T) {
 	var acc testutil.Accumulator
 	acc.SetDebug(true)
-	err := acc.GatherError(cassandra.Gather)
+	err := cassandra.Gather(&acc)
 	assert.Nil(t, err)
 	assert.Equal(t, 2, len(acc.Metrics))
@@ -180,7 +180,7 @@ func TestHttpJsonJavaMultiType(t *testing.T) {
 	var acc testutil.Accumulator
 	acc.SetDebug(true)
-	err := acc.GatherError(cassandra.Gather)
+	err := cassandra.Gather(&acc)
 	assert.Nil(t, err)
 	assert.Equal(t, 2, len(acc.Metrics))
@@ -197,17 +197,16 @@ func TestHttpJsonJavaMultiType(t *testing.T) {
 }
 // Test that the proper values are ignored or collected
-func TestHttp404(t *testing.T) {
+func TestHttpJsonOn404(t *testing.T) {
-	jolokia := genJolokiaClientStub(invalidJSON, 404, Servers,
+	jolokia := genJolokiaClientStub(validJavaMultiValueJSON, 404, Servers,
 		[]string{HeapMetric})
 	var acc testutil.Accumulator
-	err := acc.GatherError(jolokia.Gather)
+	err := jolokia.Gather(&acc)
-	assert.Error(t, err)
+	assert.Nil(t, err)
 	assert.Equal(t, 0, len(acc.Metrics))
 	assert.Contains(t, err.Error(), "has status code 404")
 }
 // Test that the proper values are ignored or collected for class=Cassandra
@@ -215,7 +214,7 @@ func TestHttpJsonCassandraMultiValue(t *testing.T) {
 	cassandra := genJolokiaClientStub(validCassandraMultiValueJSON, 200, Servers, []string{ReadLatencyMetric})
 	var acc testutil.Accumulator
-	err := acc.GatherError(cassandra.Gather)
+	err := cassandra.Gather(&acc)
 	assert.Nil(t, err)
 	assert.Equal(t, 1, len(acc.Metrics))
@@ -247,7 +246,7 @@ func TestHttpJsonCassandraNestedMultiValue(t *testing.T) {
 	var acc testutil.Accumulator
 	acc.SetDebug(true)
-	err := acc.GatherError(cassandra.Gather)
+	err := cassandra.Gather(&acc)
 	assert.Nil(t, err)
 	assert.Equal(t, 2, len(acc.Metrics))
--- a/plugins/inputs/ceph/README.md
+++ b/plugins/inputs/ceph/README.md
@@ -200,7 +200,7 @@ All measurements will have the following tags:
 *Admin Socket Stats*
 <pre>
-telegraf --config /etc/telegraf/telegraf.conf --config-directory /etc/telegraf/telegraf.d --input-filter ceph --test
+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
--- a/plugins/inputs/ceph/ceph.go
+++ b/plugins/inputs/ceph/ceph.go
@@ -101,12 +101,12 @@ func (c *Ceph) gatherAdminSocketStats(acc telegraf.Accumulator) error {
 	for _, s := range sockets {
 		dump, err := perfDump(c.CephBinary, s)
 		if err != nil {
-			acc.AddError(fmt.Errorf("E! error reading from socket '%s': %v", s.socket, err))
+			log.Printf("E! error reading from socket '%s': %v", s.socket, err)
 			continue
 		}
 		data, err := parseDump(dump)
 		if err != nil {
-			acc.AddError(fmt.Errorf("E! error parsing dump from socket '%s': %v", s.socket, err))
+			log.Printf("E! error parsing dump from socket '%s': %v", s.socket, err)
 			continue
 		}
 		for tag, metrics := range data {
--- a/plugins/inputs/ceph/ceph_test.go
+++ b/plugins/inputs/ceph/ceph_test.go
@@ -26,7 +26,7 @@ func TestParseSockId(t *testing.T) {
 func TestParseMonDump(t *testing.T) {
 	dump, err := parseDump(monPerfDump)
 	assert.NoError(t, err)
-	assert.InEpsilon(t, int64(5678670180), dump["cluster"]["osd_kb_used"], epsilon)
+	assert.InEpsilon(t, 5678670180, dump["cluster"]["osd_kb_used"], epsilon)
 	assert.InEpsilon(t, 6866.540527000, dump["paxos"]["store_state_latency.sum"], epsilon)
 }
--- a/plugins/inputs/cgroup/cgroup_linux.go
+++ b/plugins/inputs/cgroup/cgroup_linux.go
@@ -22,11 +22,10 @@ func (g *CGroup) Gather(acc telegraf.Accumulator) error {
 	for dir := range list {
 		if dir.err != nil {
-			acc.AddError(dir.err)
+			return dir.err
 			continue
 		}
 		if err := g.gatherDir(dir.path, acc); err != nil {
-			acc.AddError(err)
+			return err
 		}
 	}
@@ -225,7 +224,7 @@ var fileFormats = [...]fileFormat{
 }
 func numberOrString(s string) interface{} {
-	i, err := strconv.ParseInt(s, 10, 64)
+	i, err := strconv.Atoi(s)
 	if err == nil {
 		return i
 	}
--- a/plugins/inputs/cgroup/cgroup_test.go
+++ b/plugins/inputs/cgroup/cgroup_test.go
@@ -24,24 +24,24 @@ var cg1 = &CGroup{
 func TestCgroupStatistics_1(t *testing.T) {
 	var acc testutil.Accumulator
-	err := acc.GatherError(cg1.Gather)
+	err := cg1.Gather(&acc)
 	require.NoError(t, err)
 	tags := map[string]string{
 		"path": "testdata/memory",
 	}
 	fields := map[string]interface{}{
-		"memory.stat.cache":           int64(1739362304123123123),
+		"memory.stat.cache":           1739362304123123123,
-		"memory.stat.rss":             int64(1775325184),
+		"memory.stat.rss":             1775325184,
-		"memory.stat.rss_huge":        int64(778043392),
+		"memory.stat.rss_huge":        778043392,
-		"memory.stat.mapped_file":     int64(421036032),
+		"memory.stat.mapped_file":     421036032,
-		"memory.stat.dirty":           int64(-307200),
+		"memory.stat.dirty":           -307200,
-		"memory.max_usage_in_bytes.0": int64(0),
+		"memory.max_usage_in_bytes.0": 0,
-		"memory.max_usage_in_bytes.1": int64(-1),
+		"memory.max_usage_in_bytes.1": -1,
-		"memory.max_usage_in_bytes.2": int64(2),
+		"memory.max_usage_in_bytes.2": 2,
-		"memory.limit_in_bytes":       int64(223372036854771712),
+		"memory.limit_in_bytes":       223372036854771712,
 		"memory.use_hierarchy":        "12-781",
-		"notify_on_release":           int64(0),
+		"notify_on_release":           0,
 	}
 	acc.AssertContainsTaggedFields(t, "cgroup", fields, tags)
 }
@@ -56,17 +56,17 @@ var cg2 = &CGroup{
 func TestCgroupStatistics_2(t *testing.T) {
 	var acc testutil.Accumulator
-	err := acc.GatherError(cg2.Gather)
+	err := cg2.Gather(&acc)
 	require.NoError(t, err)
 	tags := map[string]string{
 		"path": "testdata/cpu",
 	}
 	fields := map[string]interface{}{
-		"cpuacct.usage_percpu.0": int64(-1452543795404),
+		"cpuacct.usage_percpu.0": -1452543795404,
-		"cpuacct.usage_percpu.1": int64(1376681271659),
+		"cpuacct.usage_percpu.1": 1376681271659,
-		"cpuacct.usage_percpu.2": int64(1450950799997),
+		"cpuacct.usage_percpu.2": 1450950799997,
-		"cpuacct.usage_percpu.3": int64(-1473113374257),
+		"cpuacct.usage_percpu.3": -1473113374257,
 	}
 	acc.AssertContainsTaggedFields(t, "cgroup", fields, tags)
 }
@@ -81,14 +81,14 @@ var cg3 = &CGroup{
 func TestCgroupStatistics_3(t *testing.T) {
 	var acc testutil.Accumulator
-	err := acc.GatherError(cg3.Gather)
+	err := cg3.Gather(&acc)
 	require.NoError(t, err)
 	tags := map[string]string{
 		"path": "testdata/memory/group_1",
 	}
 	fields := map[string]interface{}{
-		"memory.limit_in_bytes": int64(223372036854771712),
+		"memory.limit_in_bytes": 223372036854771712,
 	}
 	acc.AssertContainsTaggedFields(t, "cgroup", fields, tags)
@@ -108,14 +108,14 @@ var cg4 = &CGroup{
 func TestCgroupStatistics_4(t *testing.T) {
 	var acc testutil.Accumulator
-	err := acc.GatherError(cg4.Gather)
+	err := cg4.Gather(&acc)
 	require.NoError(t, err)
 	tags := map[string]string{
 		"path": "testdata/memory/group_1/group_1_1",
 	}
 	fields := map[string]interface{}{
-		"memory.limit_in_bytes": int64(223372036854771712),
+		"memory.limit_in_bytes": 223372036854771712,
 	}
 	acc.AssertContainsTaggedFields(t, "cgroup", fields, tags)
@@ -140,14 +140,14 @@ var cg5 = &CGroup{
 func TestCgroupStatistics_5(t *testing.T) {
 	var acc testutil.Accumulator
-	err := acc.GatherError(cg5.Gather)
+	err := cg5.Gather(&acc)
 	require.NoError(t, err)
 	tags := map[string]string{
 		"path": "testdata/memory/group_1/group_1_1",
 	}
 	fields := map[string]interface{}{
-		"memory.limit_in_bytes": int64(223372036854771712),
+		"memory.limit_in_bytes": 223372036854771712,
 	}
 	acc.AssertContainsTaggedFields(t, "cgroup", fields, tags)
@@ -167,16 +167,16 @@ var cg6 = &CGroup{
 func TestCgroupStatistics_6(t *testing.T) {
 	var acc testutil.Accumulator
-	err := acc.GatherError(cg6.Gather)
+	err := cg6.Gather(&acc)
 	require.NoError(t, err)
 	tags := map[string]string{
 		"path": "testdata/memory",
 	}
 	fields := map[string]interface{}{
-		"memory.usage_in_bytes":      int64(3513667584),
+		"memory.usage_in_bytes":      3513667584,
 		"memory.use_hierarchy":       "12-781",
-		"memory.kmem.limit_in_bytes": int64(9223372036854771712),
+		"memory.kmem.limit_in_bytes": 9223372036854771712,
 	}
 	acc.AssertContainsTaggedFields(t, "cgroup", fields, tags)
 }
--- a/plugins/inputs/chrony/README.md
+++ b/plugins/inputs/chrony/README.md
@@ -63,7 +63,6 @@ Delete second or Not synchronised.
 ### Measurements & Fields:
 - chrony
    - system_time (float, seconds)
    - last_offset (float, seconds)
    - rms_offset (float, seconds)
    - frequency (float, ppm)
@@ -83,9 +82,9 @@ Delete second or Not synchronised.
 ### Example Output:
 ```
-$ telegraf --config telegraf.conf --input-filter chrony --test
+$ telegraf -config telegraf.conf -input-filter chrony -test
 * Plugin: chrony, Collection 1
-> chrony,leap_status=normal,reference_id=192.168.1.1,stratum=3 frequency=-35.657,system_time=0.000027073,last_offset=-0.000013616,residual_freq=-0,rms_offset=0.000027073,root_delay=0.000644,root_dispersion=0.003444,skew=0.001,update_interval=1031.2 1463750789687639161
+> 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,3 +1,5 @@
 // +build linux
 package chrony
 import (
@@ -90,7 +92,7 @@ func processChronycOutput(out string) (map[string]interface{}, map[string]string
 		}
 		name := strings.ToLower(strings.Replace(strings.TrimSpace(stats[0]), " ", "_", -1))
 		// ignore reference time
-		if strings.Contains(name, "ref_time") {
+		if strings.Contains(name, "time") {
 			continue
 		}
 		valueFields := strings.Fields(stats[1])
--- a/plugins/inputs/chrony/chrony_notlinux.go
+++ b/plugins/inputs/chrony/chrony_notlinux.go
@@ -0,0 +1,3 @@
 // +build !linux
 package chrony
--- a/plugins/inputs/chrony/chrony_test.go
+++ b/plugins/inputs/chrony/chrony_test.go
@@ -1,3 +1,5 @@
 // +build linux
 package chrony
 import (
@@ -29,7 +31,6 @@ func TestGather(t *testing.T) {
 		"stratum":      "3",
 	}
 	fields := map[string]interface{}{
 		"system_time":     0.000020390,
 		"last_offset":     0.000012651,
 		"rms_offset":      0.000025577,
 		"frequency":       -16.001,
--- a/plugins/inputs/cloudwatch/README.md
+++ b/plugins/inputs/cloudwatch/README.md
@@ -9,8 +9,8 @@ API endpoint. In the following order the plugin will attempt to authenticate.
 1. Assumed credentials via STS if `role_arn` attribute is specified (source credentials are evaluated from subsequent rules)
 2. Explicit credentials from `access_key`, `secret_key`, and `token` attributes
 3. Shared profile from `profile` attribute
-4. [Environment Variables](https://docs.aws.amazon.com/sdk-for-go/v1/developer-guide/configuring-sdk.html#environment-variables)
+4. [Environment Variables](https://github.com/aws/aws-sdk-go/wiki/configuring-sdk#environment-variables)
-5. [Shared Credentials](https://docs.aws.amazon.com/sdk-for-go/v1/developer-guide/configuring-sdk.html#shared-credentials-file)
+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)
 ### Configuration:
@@ -20,24 +20,9 @@ API endpoint. In the following order the plugin will attempt to authenticate.
  ## Amazon Region (required)
  region = "us-east-1"
  ## Amazon Credentials
  ## Credentials are loaded in the following order
  ## 1) Assumed credentials via STS if role_arn is specified
  ## 2) explicit credentials from 'access_key' and 'secret_key'
  ## 3) shared profile from 'profile'
  ## 4) environment variables
  ## 5) shared credentials file
  ## 6) EC2 Instance Profile
  #access_key = ""
  #secret_key = ""
  #token = ""
  #role_arn = ""
  #profile = ""
  #shared_credential_file = ""
  # The minimum period for Cloudwatch metrics is 1 minute (60s). However not all
  # metrics are made available to the 1 minute period. Some are collected at
-  # 3 minute, 5 minute, or larger intervals. See https://aws.amazon.com/cloudwatch/faqs/#monitoring.
+  # 3 minute and 5 minutes intervals. See https://aws.amazon.com/cloudwatch/faqs/#monitoring.
  # Note that if a period is configured that is smaller than the minimum for a
  # particular metric, that metric will not be returned by the Cloudwatch API
  # and will not be collected by Telegraf.
@@ -57,10 +42,9 @@ API endpoint. In the following order the plugin will attempt to authenticate.
  namespace = "AWS/ELB"
  ## Maximum requests per second. Note that the global default AWS rate limit is
-  ## 400 reqs/sec, so if you define multiple namespaces, these should add up to a
+  ## 10 reqs/sec, so if you define multiple namespaces, these should add up to a
-  ## maximum of 400. Optional - default value is 200.
+  ## maximum of 10. Optional - default value is 10.
-  ## See http://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/cloudwatch_limits.html
+  ratelimit = 10
  ratelimit = 200
  ## Metrics to Pull (optional)
  ## Defaults to all Metrics in Namespace if nothing is provided
@@ -72,6 +56,10 @@ API endpoint. In the following order the plugin will attempt to authenticate.
    [[inputs.cloudwatch.metrics.dimensions]]
      name = "LoadBalancerName"
      value = "p-example"
    [[inputs.cloudwatch.metrics.dimensions]]
      name = "AvailabilityZone"
      value = "*"
 ```
 #### Requirements and Terminology
@@ -145,6 +133,6 @@ Tag Dimension names are represented in [snake case](https://en.wikipedia.org/wik
 ### Example Output:
 ```
-$ ./telegraf --config telegraf.conf --input-filter cloudwatch --test
+$ ./telegraf -config telegraf.conf -input-filter cloudwatch -test
 > cloudwatch_aws_elb,load_balancer_name=p-example,region=us-east-1,unit=seconds latency_average=0.004810798017284538,latency_maximum=0.1100282669067383,latency_minimum=0.0006084442138671875,latency_sample_count=4029,latency_sum=19.382705211639404 1459542420000000000
 ```
--- a/plugins/inputs/cloudwatch/cloudwatch.go
+++ b/plugins/inputs/cloudwatch/cloudwatch.go
@@ -13,6 +13,7 @@ import (
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	internalaws "github.com/influxdata/telegraf/internal/config/aws"
 	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/internal/limiter"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
@@ -81,7 +82,7 @@ func (c *CloudWatch) SampleConfig() string {
  # The minimum period for Cloudwatch metrics is 1 minute (60s). However not all
  # metrics are made available to the 1 minute period. Some are collected at
-  # 3 minute, 5 minute, or larger intervals. See https://aws.amazon.com/cloudwatch/faqs/#monitoring.
+  # 3 minute and 5 minutes intervals. See https://aws.amazon.com/cloudwatch/faqs/#monitoring.
  # Note that if a period is configured that is smaller than the minimum for a
  # particular metric, that metric will not be returned by the Cloudwatch API
  # and will not be collected by Telegraf.
@@ -104,10 +105,9 @@ func (c *CloudWatch) SampleConfig() string {
  namespace = "AWS/ELB"
  ## Maximum requests per second. Note that the global default AWS rate limit is
-  ## 400 reqs/sec, so if you define multiple namespaces, these should add up to a
+  ## 10 reqs/sec, so if you define multiple namespaces, these should add up to a
-  ## maximum of 400. Optional - default value is 200.
+  ## maximum of 10. Optional - default value is 10.
-  ## See http://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/cloudwatch_limits.html
+  ratelimit = 10
  ratelimit = 200
  ## Metrics to Pull (optional)
  ## Defaults to all Metrics in Namespace if nothing is provided
@@ -185,6 +185,8 @@ func (c *CloudWatch) Gather(acc telegraf.Accumulator) error {
 	if err != nil {
 		return err
 	}
 	metricCount := len(metrics)
 	errChan := errchan.New(metricCount)
 	now := time.Now()
@@ -199,12 +201,12 @@ func (c *CloudWatch) Gather(acc telegraf.Accumulator) error {
 		<-lmtr.C
 		go func(inm *cloudwatch.Metric) {
 			defer wg.Done()
-			acc.AddError(c.gatherMetric(acc, inm, now))
+			c.gatherMetric(acc, inm, now, errChan.C)
 		}(m)
 	}
 	wg.Wait()
-	return nil
+	return errChan.Error()
 }
 func init() {
@@ -212,7 +214,7 @@ func init() {
 		ttl, _ := time.ParseDuration("1hr")
 		return &CloudWatch{
 			CacheTTL:  internal.Duration{Duration: ttl},
-			RateLimit: 200,
+			RateLimit: 10,
 		}
 	})
 }
@@ -282,11 +284,13 @@ func (c *CloudWatch) gatherMetric(
 	acc telegraf.Accumulator,
 	metric *cloudwatch.Metric,
 	now time.Time,
-) error {
+	errChan chan error,
 ) {
 	params := c.getStatisticsInput(metric, now)
 	resp, err := c.client.GetMetricStatistics(params)
 	if err != nil {
-		return err
+		errChan <- err
 		return
 	}
 	for _, point := range resp.Datapoints {
@@ -321,7 +325,7 @@ func (c *CloudWatch) gatherMetric(
 		acc.AddFields(formatMeasurement(c.Namespace), fields, tags, *point.Timestamp)
 	}
-	return nil
+	errChan <- nil
 }
 /*
--- a/plugins/inputs/cloudwatch/cloudwatch_test.go
+++ b/plugins/inputs/cloudwatch/cloudwatch_test.go
@@ -58,13 +58,13 @@ func TestGather(t *testing.T) {
 		Namespace: "AWS/ELB",
 		Delay:     internalDuration,
 		Period:    internalDuration,
-		RateLimit: 200,
+		RateLimit: 10,
 	}
 	var acc testutil.Accumulator
 	c.client = &mockGatherCloudWatchClient{}
-	acc.GatherError(c.Gather)
+	c.Gather(&acc)
 	fields := map[string]interface{}{}
 	fields["latency_minimum"] = 0.1
@@ -146,7 +146,7 @@ func TestSelectMetrics(t *testing.T) {
 		Namespace: "AWS/ELB",
 		Delay:     internalDuration,
 		Period:    internalDuration,
-		RateLimit: 200,
+		RateLimit: 10,
 		Metrics: []*Metric{
 			&Metric{
 				MetricNames: []string{"Latency", "RequestCount"},
@@ -207,13 +207,14 @@ func TestGenerateStatisticsInputParams(t *testing.T) {
 }
 func TestMetricsCacheTimeout(t *testing.T) {
 	ttl, _ := time.ParseDuration("5ms")
 	cache := &MetricCache{
 		Metrics: []*cloudwatch.Metric{},
 		Fetched: time.Now(),
-		TTL:     time.Minute,
+		TTL:     ttl,
 	}
 	assert.True(t, cache.IsValid())
-	cache.Fetched = time.Now().Add(-time.Minute)
+	time.Sleep(ttl)
 	assert.False(t, cache.IsValid())
 }
--- a/plugins/inputs/conntrack/README.md
+++ b/plugins/inputs/conntrack/README.md
@@ -51,6 +51,6 @@ This input does not use tags.
 ### Example Output:
 ```
-$ ./telegraf --config telegraf.conf --input-filter conntrack --test
+$ ./telegraf -config telegraf.conf -input-filter conntrack -test
 conntrack,host=myhost ip_conntrack_count=2,ip_conntrack_max=262144 1461620427667995735
 ```
--- a/plugins/inputs/conntrack/conntrack.go
+++ b/plugins/inputs/conntrack/conntrack.go
@@ -11,6 +11,7 @@ import (
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"log"
 	"path/filepath"
 )
@@ -92,15 +93,15 @@ func (c *Conntrack) Gather(acc telegraf.Accumulator) error {
 			contents, err := ioutil.ReadFile(fName)
 			if err != nil {
-				acc.AddError(fmt.Errorf("E! failed to read file '%s': %v", fName, err))
+				log.Printf("E! failed to read file '%s': %v", fName, err)
 				continue
 			}
 			v := strings.TrimSpace(string(contents))
 			fields[metricKey], err = strconv.ParseFloat(v, 64)
 			if err != nil {
-				acc.AddError(fmt.Errorf("E! failed to parse metric, expected number but "+
+				log.Printf("E! failed to parse metric, expected number but "+
-					" found '%s': %v", v, err))
+					" found '%s': %v", v, err)
 			}
 		}
 	}
--- a/plugins/inputs/consul/README.md
+++ b/plugins/inputs/consul/README.md
@@ -1,6 +1,6 @@
 # Telegraf Input Plugin: Consul
-This plugin will collect statistics about all health checks registered in the Consul. It uses [Consul API](https://www.consul.io/docs/agent/http/health.html#health_state)
+This plugin will collect statistics about all 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:
@@ -46,7 +46,7 @@ the health check at this sample.
 ## Example output
 ```
-$ telegraf --config ./telegraf.conf --input-filter consul --test
+$ telegraf --config ./telegraf.conf -input-filter consul -test
 * Plugin: consul, Collection 1
 > consul_health_checks,host=wolfpit,node=consul-server-node,check_id="serfHealth" check_name="Serf Health Status",service_id="",status="passing",passing=1i,critical=0i,warning=0i 1464698464486439902
 > consul_health_checks,host=wolfpit,node=consul-server-node,service_name=www.example.com,check_id="service:www-example-com.test01" check_name="Service 'www.example.com' check",service_id="www-example-com.test01",status="critical",passing=0i,critical=1i,warning=0i 1464698464486519036
--- a/plugins/inputs/consul/consul.go
+++ b/plugins/inputs/consul/consul.go
@@ -69,10 +69,6 @@ func (c *Consul) createAPIClient() (*api.Client, error) {
 		config.Datacenter = c.Datacentre
 	}
 	if c.Token != "" {
 		config.Token = c.Token
 	}
 	if c.Username != "" {
 		config.HttpAuth = &api.HttpBasicAuth{
 			Username: c.Username,
--- a/plugins/inputs/consul/consul_test.go
+++ b/plugins/inputs/consul/consul_test.go
@@ -20,7 +20,7 @@ var sampleChecks = []*api.HealthCheck{
 	},
 }
-func TestGatherHealthCheck(t *testing.T) {
+func TestGatherHealtCheck(t *testing.T) {
 	expectedFields := map[string]interface{}{
 		"check_name": "foo.health",
 		"status":     "passing",
--- a/plugins/inputs/couchbase/README.md
+++ b/plugins/inputs/couchbase/README.md
@@ -22,7 +22,7 @@
 ### couchbase_node
 Tags:
- cluster: sanitized string from `servers` configuration field e.g.: `http://user:password@couchbase-0.example.com:8091/endpoint` -> `http://couchbase-0.example.com:8091/endpoint`
+- cluster: whatever you called it in `servers` in the configuration, e.g.: `http://couchbase-0.example.com/`
 - hostname: Couchbase's name for the node and port, e.g., `172.16.10.187:8091`
 Fields:
@@ -48,7 +48,7 @@ Fields:
 ## Example output
 ```
-$ telegraf --config telegraf.conf --input-filter couchbase --test
+$ telegraf -config telegraf.conf -input-filter couchbase -test
 * Plugin: couchbase, Collection 1
 > couchbase_node,cluster=https://couchbase-0.example.com/,hostname=172.16.10.187:8091 memory_free=22927384576,memory_total=64424656896 1458381183695864929
 > couchbase_node,cluster=https://couchbase-0.example.com/,hostname=172.16.10.65:8091 memory_free=23520161792,memory_total=64424656896 1458381183695972112
--- a/plugins/inputs/couchbase/couchbase.go
+++ b/plugins/inputs/couchbase/couchbase.go
@@ -1,12 +1,10 @@
 package couchbase
 import (
 	"regexp"
 	"sync"
 	couchbase "github.com/couchbase/go-couchbase"
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"sync"
 )
 type Couchbase struct {
@@ -26,8 +24,6 @@ var sampleConfig = `
  servers = ["http://localhost:8091"]
 `
 var regexpURI = regexp.MustCompile(`(\S+://)?(\S+\:\S+@)`)
 func (r *Couchbase) SampleConfig() string {
 	return sampleConfig
 }
@@ -46,17 +42,19 @@ func (r *Couchbase) Gather(acc telegraf.Accumulator) error {
 	var wg sync.WaitGroup
 	var outerr error
 	for _, serv := range r.Servers {
 		wg.Add(1)
 		go func(serv string) {
 			defer wg.Done()
-			acc.AddError(r.gatherServer(serv, acc, nil))
+			outerr = r.gatherServer(serv, acc, nil)
 		}(serv)
 	}
 	wg.Wait()
-	return nil
+	return outerr
 }
 func (r *Couchbase) gatherServer(addr string, acc telegraf.Accumulator, pool *couchbase.Pool) error {
@@ -75,17 +73,15 @@ func (r *Couchbase) gatherServer(addr string, acc telegraf.Accumulator, pool *co
 		}
 		pool = &p
 	}
 	for i := 0; i < len(pool.Nodes); i++ {
 		node := pool.Nodes[i]
-		tags := map[string]string{"cluster": regexpURI.ReplaceAllString(addr, "${1}"), "hostname": node.Hostname}
+		tags := map[string]string{"cluster": addr, "hostname": node.Hostname}
 		fields := make(map[string]interface{})
 		fields["memory_free"] = node.MemoryFree
 		fields["memory_total"] = node.MemoryTotal
 		acc.AddFields("couchbase_node", fields, tags)
 	}
-
+	for bucketName, _ := range pool.BucketMap {
 	for bucketName := range pool.BucketMap {
 		tags := map[string]string{"cluster": addr, "bucket": bucketName}
 		bs := pool.BucketMap[bucketName].BasicStats
 		fields := make(map[string]interface{})
--- a/plugins/inputs/couchbase/couchbase_test.go
+++ b/plugins/inputs/couchbase/couchbase_test.go
--- a/plugins/inputs/couchdb/README.md
+++ b/plugins/inputs/couchdb/README.md
@@ -63,7 +63,7 @@ httpd statistics:
 ### Example output:
 ```
-➜  telegraf git:(master) ✗ ./telegraf --config ./config.conf  --input-filter couchdb --test
+➜  telegraf git:(master) ✗ ./telegraf -config ./config.conf  -input-filter couchdb -test
 * Plugin: couchdb,
 Collection 1
 > couchdb,server=http://localhost:5984/_stats couchdb_auth_cache_hits_current=0,
--- a/plugins/inputs/couchdb/couchdb.go
+++ b/plugins/inputs/couchdb/couchdb.go
@@ -2,11 +2,13 @@ package couchdb
 import (
 	"encoding/json"
 	"errors"
 	"fmt"
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"net/http"
 	"reflect"
 	"strings"
 	"sync"
 	"time"
 )
@@ -81,20 +83,34 @@ func (*CouchDB) SampleConfig() string {
 }
 func (c *CouchDB) Gather(accumulator telegraf.Accumulator) error {
 	errorChannel := make(chan error, len(c.HOSTs))
 	var wg sync.WaitGroup
 	for _, u := range c.HOSTs {
 		wg.Add(1)
 		go func(host string) {
 			defer wg.Done()
 			if err := c.fetchAndInsertData(accumulator, host); err != nil {
-				accumulator.AddError(fmt.Errorf("[host=%s]: %s", host, err))
+				errorChannel <- fmt.Errorf("[host=%s]: %s", host, err)
 			}
 		}(u)
 	}
 	wg.Wait()
 	close(errorChannel)
 	// If there weren't any errors, we can return nil now.
 	if len(errorChannel) == 0 {
 		return nil
 	}
 	// There were errors, so join them all together as one big error.
 	errorStrings := make([]string, 0, len(errorChannel))
 	for err := range errorChannel {
 		errorStrings = append(errorStrings, err.Error())
 	}
 	return errors.New(strings.Join(errorStrings, "\n"))
 }
 var tr = &http.Transport{
--- a/plugins/inputs/couchdb/couchdb_test.go
+++ b/plugins/inputs/couchdb/couchdb_test.go
@@ -316,5 +316,5 @@ func TestBasic(t *testing.T) {
 	}
 	var acc testutil.Accumulator
-	require.NoError(t, acc.GatherError(plugin.Gather))
+	require.NoError(t, plugin.Gather(&acc))
 }
--- a/plugins/inputs/disque/disque.go
+++ b/plugins/inputs/disque/disque.go
@@ -75,11 +75,12 @@ func (g *Disque) Gather(acc telegraf.Accumulator) error {
 	var wg sync.WaitGroup
 	var outerr error
 	for _, serv := range g.Servers {
 		u, err := url.Parse(serv)
 		if err != nil {
-			acc.AddError(fmt.Errorf("Unable to parse to address '%s': %s", serv, err))
+			return fmt.Errorf("Unable to parse to address '%s': %s", serv, err)
 			continue
 		} else if u.Scheme == "" {
 			// fallback to simple string based address (i.e. "10.0.0.1:10000")
 			u.Scheme = "tcp"
@@ -89,13 +90,13 @@ func (g *Disque) Gather(acc telegraf.Accumulator) error {
 		wg.Add(1)
 		go func(serv string) {
 			defer wg.Done()
-			acc.AddError(g.gatherServer(u, acc))
+			outerr = g.gatherServer(u, acc)
 		}(serv)
 	}
 	wg.Wait()
-	return nil
+	return outerr
 }
 const defaultPort = "7711"
--- a/plugins/inputs/disque/disque_test.go
+++ b/plugins/inputs/disque/disque_test.go
@@ -51,7 +51,7 @@ func TestDisqueGeneratesMetrics(t *testing.T) {
 	var acc testutil.Accumulator
-	err = acc.GatherError(r.Gather)
+	err = r.Gather(&acc)
 	require.NoError(t, err)
 	fields := map[string]interface{}{
@@ -117,7 +117,7 @@ func TestDisqueCanPullStatsFromMultipleServers(t *testing.T) {
 	var acc testutil.Accumulator
-	err = acc.GatherError(r.Gather)
+	err = r.Gather(&acc)
 	require.NoError(t, err)
 	fields := map[string]interface{}{
--- a/plugins/inputs/dmcache/README.md
+++ b/plugins/inputs/dmcache/README.md
@@ -1,47 +0,0 @@
 # DMCache Input Plugin
 This plugin provide a native collection for dmsetup based statistics for dm-cache.
 This plugin requires sudo, that is why you should setup and be sure that the telegraf is able to execute sudo without a password.
 `sudo /sbin/dmsetup status --target cache` is the full command that telegraf will run for debugging purposes.
 ### Configuration
 ```toml
 [[inputs.dmcache]]
  ## Whether to report per-device stats or not
  per_device = true
 ```
 ### Measurements & Fields:
 - dmcache
    - length
    - target
    - metadata_blocksize
    - metadata_used
    - metadata_total
    - cache_blocksize
    - cache_used
    - cache_total
    - read_hits
    - read_misses
    - write_hits
    - write_misses
    - demotions
    - promotions
    - dirty
 ### Tags:
 - All measurements have the following tags:
    - device
 ### Example Output:
 ```
 $ ./telegraf --test --config /etc/telegraf/telegraf.conf --input-filter dmcache
 * Plugin: inputs.dmcache, Collection 1
 > dmcache,device=example cache_blocksize=0i,read_hits=995134034411520i,read_misses=916807089127424i,write_hits=195107267543040i,metadata_used=12861440i,write_misses=563725346013184i,promotions=3265223720960i,dirty=0i,metadata_blocksize=0i,cache_used=1099511627776ii,cache_total=0i,length=0i,metadata_total=1073741824i,demotions=3265223720960i 1491482035000000000
 ```
--- a/plugins/inputs/dmcache/dmcache.go
+++ b/plugins/inputs/dmcache/dmcache.go
@@ -1,33 +0,0 @@
 package dmcache
 import (
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 type DMCache struct {
 	PerDevice        bool `toml:"per_device"`
 	getCurrentStatus func() ([]string, error)
 }
 var sampleConfig = `
  ## Whether to report per-device stats or not
  per_device = true
 `
 func (c *DMCache) SampleConfig() string {
 	return sampleConfig
 }
 func (c *DMCache) Description() string {
 	return "Provide a native collection for dmsetup based statistics for dm-cache"
 }
 func init() {
 	inputs.Add("dmcache", func() telegraf.Input {
 		return &DMCache{
 			PerDevice:        true,
 			getCurrentStatus: dmSetupStatus,
 		}
 	})
 }
--- a/plugins/inputs/dmcache/dmcache_linux.go
+++ b/plugins/inputs/dmcache/dmcache_linux.go
@@ -1,190 +0,0 @@
 // +build linux
 package dmcache
 import (
 	"os/exec"
 	"strconv"
 	"strings"
 	"errors"
 	"github.com/influxdata/telegraf"
 )
 const metricName = "dmcache"
 type cacheStatus struct {
 	device            string
 	length            int64
 	target            string
 	metadataBlocksize int64
 	metadataUsed      int64
 	metadataTotal     int64
 	cacheBlocksize    int64
 	cacheUsed         int64
 	cacheTotal        int64
 	readHits          int64
 	readMisses        int64
 	writeHits         int64
 	writeMisses       int64
 	demotions         int64
 	promotions        int64
 	dirty             int64
 }
 func (c *DMCache) Gather(acc telegraf.Accumulator) error {
 	outputLines, err := c.getCurrentStatus()
 	if err != nil {
 		return err
 	}
 	totalStatus := cacheStatus{}
 	for _, s := range outputLines {
 		status, err := parseDMSetupStatus(s)
 		if err != nil {
 			return err
 		}
 		if c.PerDevice {
 			tags := map[string]string{"device": status.device}
 			acc.AddFields(metricName, toFields(status), tags)
 		}
 		aggregateStats(&totalStatus, status)
 	}
 	acc.AddFields(metricName, toFields(totalStatus), map[string]string{"device": "all"})
 	return nil
 }
 func parseDMSetupStatus(line string) (cacheStatus, error) {
 	var err error
 	parseError := errors.New("Output from dmsetup could not be parsed")
 	status := cacheStatus{}
 	values := strings.Fields(line)
 	if len(values) < 15 {
 		return cacheStatus{}, parseError
 	}
 	status.device = strings.TrimRight(values[0], ":")
 	status.length, err = strconv.ParseInt(values[2], 10, 64)
 	if err != nil {
 		return cacheStatus{}, err
 	}
 	status.target = values[3]
 	status.metadataBlocksize, err = strconv.ParseInt(values[4], 10, 64)
 	if err != nil {
 		return cacheStatus{}, err
 	}
 	metadata := strings.Split(values[5], "/")
 	if len(metadata) != 2 {
 		return cacheStatus{}, parseError
 	}
 	status.metadataUsed, err = strconv.ParseInt(metadata[0], 10, 64)
 	if err != nil {
 		return cacheStatus{}, err
 	}
 	status.metadataTotal, err = strconv.ParseInt(metadata[1], 10, 64)
 	if err != nil {
 		return cacheStatus{}, err
 	}
 	status.cacheBlocksize, err = strconv.ParseInt(values[6], 10, 64)
 	if err != nil {
 		return cacheStatus{}, err
 	}
 	cache := strings.Split(values[7], "/")
 	if len(cache) != 2 {
 		return cacheStatus{}, parseError
 	}
 	status.cacheUsed, err = strconv.ParseInt(cache[0], 10, 64)
 	if err != nil {
 		return cacheStatus{}, err
 	}
 	status.cacheTotal, err = strconv.ParseInt(cache[1], 10, 64)
 	if err != nil {
 		return cacheStatus{}, err
 	}
 	status.readHits, err = strconv.ParseInt(values[8], 10, 64)
 	if err != nil {
 		return cacheStatus{}, err
 	}
 	status.readMisses, err = strconv.ParseInt(values[9], 10, 64)
 	if err != nil {
 		return cacheStatus{}, err
 	}
 	status.writeHits, err = strconv.ParseInt(values[10], 10, 64)
 	if err != nil {
 		return cacheStatus{}, err
 	}
 	status.writeMisses, err = strconv.ParseInt(values[11], 10, 64)
 	if err != nil {
 		return cacheStatus{}, err
 	}
 	status.demotions, err = strconv.ParseInt(values[12], 10, 64)
 	if err != nil {
 		return cacheStatus{}, err
 	}
 	status.promotions, err = strconv.ParseInt(values[13], 10, 64)
 	if err != nil {
 		return cacheStatus{}, err
 	}
 	status.dirty, err = strconv.ParseInt(values[14], 10, 64)
 	if err != nil {
 		return cacheStatus{}, err
 	}
 	return status, nil
 }
 func aggregateStats(totalStatus *cacheStatus, status cacheStatus) {
 	totalStatus.length += status.length
 	totalStatus.metadataBlocksize += status.metadataBlocksize
 	totalStatus.metadataUsed += status.metadataUsed
 	totalStatus.metadataTotal += status.metadataTotal
 	totalStatus.cacheBlocksize += status.cacheBlocksize
 	totalStatus.cacheUsed += status.cacheUsed
 	totalStatus.cacheTotal += status.cacheTotal
 	totalStatus.readHits += status.readHits
 	totalStatus.readMisses += status.readMisses
 	totalStatus.writeHits += status.writeHits
 	totalStatus.writeMisses += status.writeMisses
 	totalStatus.demotions += status.demotions
 	totalStatus.promotions += status.promotions
 	totalStatus.dirty += status.dirty
 }
 func toFields(status cacheStatus) map[string]interface{} {
 	fields := make(map[string]interface{})
 	fields["length"] = status.length
 	fields["metadata_blocksize"] = status.metadataBlocksize
 	fields["metadata_used"] = status.metadataUsed
 	fields["metadata_total"] = status.metadataTotal
 	fields["cache_blocksize"] = status.cacheBlocksize
 	fields["cache_used"] = status.cacheUsed
 	fields["cache_total"] = status.cacheTotal
 	fields["read_hits"] = status.readHits
 	fields["read_misses"] = status.readMisses
 	fields["write_hits"] = status.writeHits
 	fields["write_misses"] = status.writeMisses
 	fields["demotions"] = status.demotions
 	fields["promotions"] = status.promotions
 	fields["dirty"] = status.dirty
 	return fields
 }
 func dmSetupStatus() ([]string, error) {
 	out, err := exec.Command("/bin/sh", "-c", "sudo /sbin/dmsetup status --target cache").Output()
 	if err != nil {
 		return nil, err
 	}
 	if string(out) == "No devices found\n" {
 		return []string{}, nil
 	}
 	outString := strings.TrimRight(string(out), "\n")
 	status := strings.Split(outString, "\n")
 	return status, nil
 }
--- a/plugins/inputs/dmcache/dmcache_linux_test.go
+++ b/plugins/inputs/dmcache/dmcache_linux_test.go
@@ -1,171 +0,0 @@
 // +build linux
 package dmcache
 import (
 	"errors"
 	"testing"
 	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/require"
 )
 var (
 	measurement              = "dmcache"
 	badFormatOutput          = []string{"cs-1: 0 4883791872 cache 8 1018/1501122 512 7/464962 139 352643 "}
 	good2DevicesFormatOutput = []string{
 		"cs-1: 0 4883791872 cache 8 1018/1501122 512 7/464962 139 352643 15 46 0 7 0 1 writeback 2 migration_threshold 2048 mq 10 random_threshold 4 sequential_threshold 512 discard_promote_adjustment 1 read_promote_adjustment 4 write_promote_adjustment 8",
 		"cs-2: 0 4294967296 cache 8 72352/1310720 128 26/24327168 2409 286 265 524682 0 0 0 1 writethrough 2 migration_threshold 2048 mq 10 random_threshold 4 sequential_threshold 512 discard_promote_adjustment 1 read_promote_adjustment 4 write_promote_adjustment 8",
 	}
 )
 func TestPerDeviceGoodOutput(t *testing.T) {
 	var acc testutil.Accumulator
 	var plugin = &DMCache{
 		PerDevice: true,
 		getCurrentStatus: func() ([]string, error) {
 			return good2DevicesFormatOutput, nil
 		},
 	}
 	err := plugin.Gather(&acc)
 	require.NoError(t, err)
 	tags1 := map[string]string{
 		"device": "cs-1",
 	}
 	fields1 := map[string]interface{}{
 		"length":             int64(4883791872),
 		"metadata_blocksize": int64(8),
 		"metadata_used":      int64(1018),
 		"metadata_total":     int64(1501122),
 		"cache_blocksize":    int64(512),
 		"cache_used":         int64(7),
 		"cache_total":        int64(464962),
 		"read_hits":          int64(139),
 		"read_misses":        int64(352643),
 		"write_hits":         int64(15),
 		"write_misses":       int64(46),
 		"demotions":          int64(0),
 		"promotions":         int64(7),
 		"dirty":              int64(0),
 	}
 	acc.AssertContainsTaggedFields(t, measurement, fields1, tags1)
 	tags2 := map[string]string{
 		"device": "cs-2",
 	}
 	fields2 := map[string]interface{}{
 		"length":             int64(4294967296),
 		"metadata_blocksize": int64(8),
 		"metadata_used":      int64(72352),
 		"metadata_total":     int64(1310720),
 		"cache_blocksize":    int64(128),
 		"cache_used":         int64(26),
 		"cache_total":        int64(24327168),
 		"read_hits":          int64(2409),
 		"read_misses":        int64(286),
 		"write_hits":         int64(265),
 		"write_misses":       int64(524682),
 		"demotions":          int64(0),
 		"promotions":         int64(0),
 		"dirty":              int64(0),
 	}
 	acc.AssertContainsTaggedFields(t, measurement, fields2, tags2)
 	tags3 := map[string]string{
 		"device": "all",
 	}
 	fields3 := map[string]interface{}{
 		"length":             int64(9178759168),
 		"metadata_blocksize": int64(16),
 		"metadata_used":      int64(73370),
 		"metadata_total":     int64(2811842),
 		"cache_blocksize":    int64(640),
 		"cache_used":         int64(33),
 		"cache_total":        int64(24792130),
 		"read_hits":          int64(2548),
 		"read_misses":        int64(352929),
 		"write_hits":         int64(280),
 		"write_misses":       int64(524728),
 		"demotions":          int64(0),
 		"promotions":         int64(7),
 		"dirty":              int64(0),
 	}
 	acc.AssertContainsTaggedFields(t, measurement, fields3, tags3)
 }
 func TestNotPerDeviceGoodOutput(t *testing.T) {
 	var acc testutil.Accumulator
 	var plugin = &DMCache{
 		PerDevice: false,
 		getCurrentStatus: func() ([]string, error) {
 			return good2DevicesFormatOutput, nil
 		},
 	}
 	err := plugin.Gather(&acc)
 	require.NoError(t, err)
 	tags := map[string]string{
 		"device": "all",
 	}
 	fields := map[string]interface{}{
 		"length":             int64(9178759168),
 		"metadata_blocksize": int64(16),
 		"metadata_used":      int64(73370),
 		"metadata_total":     int64(2811842),
 		"cache_blocksize":    int64(640),
 		"cache_used":         int64(33),
 		"cache_total":        int64(24792130),
 		"read_hits":          int64(2548),
 		"read_misses":        int64(352929),
 		"write_hits":         int64(280),
 		"write_misses":       int64(524728),
 		"demotions":          int64(0),
 		"promotions":         int64(7),
 		"dirty":              int64(0),
 	}
 	acc.AssertContainsTaggedFields(t, measurement, fields, tags)
 }
 func TestNoDevicesOutput(t *testing.T) {
 	var acc testutil.Accumulator
 	var plugin = &DMCache{
 		PerDevice: true,
 		getCurrentStatus: func() ([]string, error) {
 			return []string{}, nil
 		},
 	}
 	err := plugin.Gather(&acc)
 	require.NoError(t, err)
 }
 func TestErrorDuringGettingStatus(t *testing.T) {
 	var acc testutil.Accumulator
 	var plugin = &DMCache{
 		PerDevice: true,
 		getCurrentStatus: func() ([]string, error) {
 			return nil, errors.New("dmsetup doesn't exist")
 		},
 	}
 	err := plugin.Gather(&acc)
 	require.Error(t, err)
 }
 func TestBadFormatOfStatus(t *testing.T) {
 	var acc testutil.Accumulator
 	var plugin = &DMCache{
 		PerDevice: true,
 		getCurrentStatus: func() ([]string, error) {
 			return badFormatOutput, nil
 		},
 	}
 	err := plugin.Gather(&acc)
 	require.Error(t, err)
 }
--- a/plugins/inputs/dmcache/dmcache_notlinux.go
+++ b/plugins/inputs/dmcache/dmcache_notlinux.go
@@ -1,15 +0,0 @@
 // +build !linux
 package dmcache
 import (
 	"github.com/influxdata/telegraf"
 )
 func (c *DMCache) Gather(acc telegraf.Accumulator) error {
 	return nil
 }
 func dmSetupStatus() ([]string, error) {
 	return []string{}, nil
 }
--- a/plugins/inputs/dns_query/README.md
+++ b/plugins/inputs/dns_query/README.md
@@ -8,23 +8,19 @@ The DNS plugin gathers dns query times in miliseconds - like [Dig](https://en.wi
 # Sample Config:
 [[inputs.dns_query]]
  ## servers to query
-  servers = ["8.8.8.8"]
+  servers = ["8.8.8.8"] # required
-  ## Network is the network protocol name.
+  ## Domains or subdomains to query. "." (root) is default
-  # network = "udp"
+  domains = ["."] # optional
-  ## Domains or subdomains to query.
+  ## Query record type. Posible values: A, AAAA, ANY, CNAME, MX,  NS, PTR, SOA, SPF, SRV, TXT. Default is "NS"
-  # domains = ["."]
+  record_type = "A" # optional
-  ## Query record type.
+  ## Dns server port. 53 is default
-  ## Posible values: A, AAAA, CNAME, MX, NS, PTR, TXT, SOA, SPF, SRV.
+  port = 53 # optional
  # record_type = "A"
-  ## Dns server port.
+  ## Query timeout in seconds. Default is 2 seconds
-  # port = 53
+  timeout = 2 # optional
  ## Query timeout in seconds.
  # timeout = 2
 ```
 For querying more than one record type make:
@@ -50,6 +46,6 @@ For querying more than one record type make:
 ### Example output:
 ```
-telegraf --input-filter dns_query --test
+./telegraf -config telegraf.conf -test -input-filter dns_query -test
 > dns_query,domain=mjasion.pl,record_type=A,server=8.8.8.8 query_time_ms=67.189842 1456082743585760680
 ```
--- a/plugins/inputs/dns_query/dns_query.go
+++ b/plugins/inputs/dns_query/dns_query.go
@@ -3,13 +3,13 @@ package dns_query
 import (
 	"errors"
 	"fmt"
 	"github.com/miekg/dns"
 	"net"
 	"strconv"
 	"time"
 	"github.com/miekg/dns"
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
@@ -17,9 +17,6 @@ type DnsQuery struct {
 	// Domains or subdomains to query
 	Domains []string
 	// Network protocl name
 	Network string
 	// Server to query
 	Servers []string
@@ -35,23 +32,20 @@ type DnsQuery struct {
 var sampleConfig = `
  ## servers to query
-  servers = ["8.8.8.8"]
+  servers = ["8.8.8.8"] # required
-  ## Network is the network protocol name.
+  ## Domains or subdomains to query. "."(root) is default
-  # network = "udp"
+  domains = ["."] # optional
-  ## Domains or subdomains to query.
+  ## Query record type. Default is "A"
  # domains = ["."]
  ## Query record type.
  ## Posible values: A, AAAA, CNAME, MX, NS, PTR, TXT, SOA, SPF, SRV.
-  # record_type = "A"
+  record_type = "A" # optional
-  ## Dns server port.
+  ## Dns server port. 53 is default
-  # port = 53
+  port = 53 # optional
-  ## Query timeout in seconds.
+  ## Query timeout in seconds. Default is 2 seconds
-  # timeout = 2
+  timeout = 2 # optional
 `
 func (d *DnsQuery) SampleConfig() string {
@@ -64,10 +58,11 @@ func (d *DnsQuery) Description() string {
 func (d *DnsQuery) Gather(acc telegraf.Accumulator) error {
 	d.setDefaultValues()
 	errChan := errchan.New(len(d.Domains) * len(d.Servers))
 	for _, domain := range d.Domains {
 		for _, server := range d.Servers {
 			dnsQueryTime, err := d.getDnsQueryTime(domain, server)
-			acc.AddError(err)
+			errChan.C <- err
 			tags := map[string]string{
 				"server":      server,
 				"domain":      domain,
@@ -79,14 +74,10 @@ func (d *DnsQuery) Gather(acc telegraf.Accumulator) error {
 		}
 	}
-	return nil
+	return errChan.Error()
 }
 func (d *DnsQuery) setDefaultValues() {
 	if d.Network == "" {
 		d.Network = "udp"
 	}
 	if len(d.RecordType) == 0 {
 		d.RecordType = "NS"
 	}
@@ -110,7 +101,6 @@ func (d *DnsQuery) getDnsQueryTime(domain string, server string) (float64, error
 	c := new(dns.Client)
 	c.ReadTimeout = time.Duration(d.Timeout) * time.Second
 	c.Net = d.Network
 	m := new(dns.Msg)
 	recordType, err := d.parseRecordType()
--- a/plugins/inputs/dns_query/dns_query_test.go
+++ b/plugins/inputs/dns_query/dns_query_test.go
@@ -24,7 +24,7 @@ func TestGathering(t *testing.T) {
 	}
 	var acc testutil.Accumulator
-	err := acc.GatherError(dnsConfig.Gather)
+	err := dnsConfig.Gather(&acc)
 	assert.NoError(t, err)
 	metric, ok := acc.Get("dns_query")
 	require.True(t, ok)
@@ -44,7 +44,7 @@ func TestGatheringMxRecord(t *testing.T) {
 	var acc testutil.Accumulator
 	dnsConfig.RecordType = "MX"
-	err := acc.GatherError(dnsConfig.Gather)
+	err := dnsConfig.Gather(&acc)
 	assert.NoError(t, err)
 	metric, ok := acc.Get("dns_query")
 	require.True(t, ok)
@@ -70,7 +70,7 @@ func TestGatheringRootDomain(t *testing.T) {
 	}
 	fields := map[string]interface{}{}
-	err := acc.GatherError(dnsConfig.Gather)
+	err := dnsConfig.Gather(&acc)
 	assert.NoError(t, err)
 	metric, ok := acc.Get("dns_query")
 	require.True(t, ok)
@@ -96,7 +96,7 @@ func TestMetricContainsServerAndDomainAndRecordTypeTags(t *testing.T) {
 	}
 	fields := map[string]interface{}{}
-	err := acc.GatherError(dnsConfig.Gather)
+	err := dnsConfig.Gather(&acc)
 	assert.NoError(t, err)
 	metric, ok := acc.Get("dns_query")
 	require.True(t, ok)
@@ -121,7 +121,7 @@ func TestGatheringTimeout(t *testing.T) {
 	channel := make(chan error, 1)
 	go func() {
-		channel <- acc.GatherError(dnsConfig.Gather)
+		channel <- dnsConfig.Gather(&acc)
 	}()
 	select {
 	case res := <-channel:
--- a/plugins/inputs/docker/README.md
+++ b/plugins/inputs/docker/README.md
@@ -1,62 +1,29 @@
 # Docker Input Plugin
-The docker plugin uses the Docker Engine API to gather metrics on running
+The docker plugin uses the docker remote API to gather metrics on running
-docker containers.
+docker containers. You can read Docker's documentation for their remote API
 [here](https://docs.docker.com/engine/reference/api/docker_remote_api_v1.20/#get-container-stats-based-on-resource-usage)
-The docker plugin uses the [Official Docker Client](https://github.com/moby/moby/tree/master/client)
+The docker plugin uses the excellent
-to gather stats from the [Engine API](https://docs.docker.com/engine/api/v1.20/).
+[docker engine-api](https://github.com/docker/engine-api) library to
-[Library Documentation](https://godoc.org/github.com/moby/moby/client)
+gather stats. Documentation for the library can be found
 [here](https://godoc.org/github.com/docker/engine-api) and documentation
 for the stat structure can be found
 [here](https://godoc.org/github.com/docker/engine-api/types#Stats)
 ### Configuration:
 ```
 # Read metrics about docker containers
 [[inputs.docker]]
-  ## Docker Endpoint
+  # Docker Endpoint
-  ##   To use TCP, set endpoint = "tcp://[ip]:[port]"
+  #   To use TCP, set endpoint = "tcp://[ip]:[port]"
-  ##   To use environment variables (ie, docker-machine), set endpoint = "ENV"
+  #   To use environment variables (ie, docker-machine), set endpoint = "ENV"
  endpoint = "unix:///var/run/docker.sock"
-
+  # Only collect metrics for these containers, collect all if empty
  ## Only collect metrics for these containers. Values will be appended to
  ## container_name_include.
  ## Deprecated (1.4.0), use container_name_include
  container_names = []
  ## Containers to include and exclude. Collect all if empty. Globs accepted.
  container_name_include = []
  container_name_exclude = []
  ## Timeout for docker list, info, and stats commands
  timeout = "5s"
  ## Whether to report for each container per-device blkio (8:0, 8:1...) and
  ## network (eth0, eth1, ...) stats or not
  perdevice = true
  ## Whether to report for each container total blkio and network stats or not
  total = false
  ## docker labels to include and exclude as tags.  Globs accepted.
  ## Note that an empty array for both will include all labels as tags
  docker_label_include = []
  docker_label_exclude = []
  ## Which environment variables should we use as a tag
  tag_env = ["JAVA_HOME", "HEAP_SIZE"]
  ## Optional SSL Config
  # ssl_ca = "/etc/telegraf/ca.pem"
  # ssl_cert = "/etc/telegraf/cert.pem"
  # ssl_key = "/etc/telegraf/key.pem"
  ## Use SSL but skip chain & host verification
  # insecure_skip_verify = false
 ```
 #### Environment Configuration
 When using the `"ENV"` endpoint, the connection is configured using the
 [cli Docker environment variables](https://godoc.org/github.com/moby/moby/client#NewEnvClient).
 ### Measurements & Fields:
 Every effort was made to preserve the names based on the JSON response from the
@@ -155,38 +122,36 @@ based on the availability of per-cpu stats on your system.
 ### Tags:
-#### Docker Engine tags
+
 - docker (memory_total)
    - unit=bytes
    - engine_host
 - docker (pool_blocksize)
    - unit=bytes
    - engine_host
 - docker_data
    - unit=bytes
    - engine_host
 - docker_metadata
    - unit=bytes
    - engine_host
-#### Docker Container tags
+- docker_container_mem specific:
 - Tags on all containers:
    - engine_host
    - container_image
    - container_name
    - container_version
 - docker_container_mem specific:
 - docker_container_cpu specific:
    - container_image
    - container_name
    - cpu
 - docker_container_net specific:
    - container_image
    - container_name
    - network
 - docker_container_blkio specific:
    - container_image
    - container_name
    - device
 ### Example Output:
 ```
-% ./telegraf --config ~/ws/telegraf.conf --input-filter docker --test
+% ./telegraf -config ~/ws/telegraf.conf -input-filter docker -test
 * Plugin: docker, Collection 1
 > docker n_cpus=8i 1456926671065383978
 > docker n_used_file_descriptors=15i 1456926671065383978
--- a/plugins/inputs/docker/client.go
+++ b/plugins/inputs/docker/client.go
@@ -1,67 +0,0 @@
 package docker
 import (
 	"context"
 	"crypto/tls"
 	"net/http"
 	"github.com/docker/docker/api/types"
 	docker "github.com/docker/docker/client"
 	"github.com/docker/go-connections/sockets"
 )
 var (
 	version        string
 	defaultHeaders = map[string]string{"User-Agent": "engine-api-cli-1.0"}
 )
 type Client interface {
 	Info(ctx context.Context) (types.Info, error)
 	ContainerList(ctx context.Context, options types.ContainerListOptions) ([]types.Container, error)
 	ContainerStats(ctx context.Context, containerID string, stream bool) (types.ContainerStats, error)
 	ContainerInspect(ctx context.Context, containerID string) (types.ContainerJSON, error)
 }
 func NewEnvClient() (Client, error) {
 	client, err := docker.NewEnvClient()
 	if err != nil {
 		return nil, err
 	}
 	return &SocketClient{client}, nil
 }
 func NewClient(host string, tlsConfig *tls.Config) (Client, error) {
 	proto, addr, _, err := docker.ParseHost(host)
 	if err != nil {
 		return nil, err
 	}
 	transport := &http.Transport{
 		TLSClientConfig: tlsConfig,
 	}
 	sockets.ConfigureTransport(transport, proto, addr)
 	httpClient := &http.Client{Transport: transport}
 	client, err := docker.NewClient(host, version, httpClient, defaultHeaders)
 	if err != nil {
 		return nil, err
 	}
 	return &SocketClient{client}, nil
 }
 type SocketClient struct {
 	client *docker.Client
 }
 func (c *SocketClient) Info(ctx context.Context) (types.Info, error) {
 	return c.client.Info(ctx)
 }
 func (c *SocketClient) ContainerList(ctx context.Context, options types.ContainerListOptions) ([]types.Container, error) {
 	return c.client.ContainerList(ctx, options)
 }
 func (c *SocketClient) ContainerStats(ctx context.Context, containerID string, stream bool) (types.ContainerStats, error) {
 	return c.client.ContainerStats(ctx, containerID, stream)
 }
 func (c *SocketClient) ContainerInspect(ctx context.Context, containerID string) (types.ContainerJSON, error) {
 	return c.client.ContainerInspect(ctx, containerID)
 }
--- a/plugins/inputs/docker/docker.go
+++ b/plugins/inputs/docker/docker.go
@@ -1,21 +1,21 @@
-package docker
+package system
 import (
 	"context"
 	"crypto/tls"
 	"encoding/json"
 	"fmt"
 	"io"
-	"net/http"
+	"log"
 	"regexp"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
-	"github.com/docker/docker/api/types"
+	"golang.org/x/net/context"
 	"github.com/docker/engine-api/client"
 	"github.com/docker/engine-api/types"
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/filter"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
@@ -24,31 +24,19 @@ import (
 type Docker struct {
 	Endpoint       string
 	ContainerNames []string
 	Timeout        internal.Duration
 	PerDevice      bool `toml:"perdevice"`
 	Total          bool `toml:"total"`
 	TagEnvironment []string `toml:"tag_env"`
 	LabelInclude   []string `toml:"docker_label_include"`
 	LabelExclude   []string `toml:"docker_label_exclude"`
-	ContainerInclude []string `toml:"container_name_include"`
+	client      DockerClient
 	ContainerExclude []string `toml:"container_name_exclude"`
 	SSLCA              string `toml:"ssl_ca"`
 	SSLCert            string `toml:"ssl_cert"`
 	SSLKey             string `toml:"ssl_key"`
 	InsecureSkipVerify bool
 	newEnvClient func() (Client, error)
 	newClient    func(string, *tls.Config) (Client, error)
 	client          Client
 	httpClient      *http.Client
 	engine_host string
-	filtersCreated  bool
+}
-	labelFilter     filter.Filter
+
-	containerFilter filter.Filter
+// DockerClient interface, useful for testing
 type DockerClient interface {
 	Info(ctx context.Context) (types.Info, error)
 	ContainerList(ctx context.Context, options types.ContainerListOptions) ([]types.Container, error)
 	ContainerStats(ctx context.Context, containerID string, stream bool) (io.ReadCloser, error)
 }
 // KB, MB, GB, TB, PB...human friendly
@@ -58,8 +46,6 @@ const (
 	GB = 1000 * MB
 	TB = 1000 * GB
 	PB = 1000 * TB
 	defaultEndpoint = "unix:///var/run/docker.sock"
 )
 var (
@@ -71,15 +57,8 @@ var sampleConfig = `
  ##   To use TCP, set endpoint = "tcp://[ip]:[port]"
  ##   To use environment variables (ie, docker-machine), set endpoint = "ENV"
  endpoint = "unix:///var/run/docker.sock"
  ## Only collect metrics for these containers, collect all if empty
  container_names = []
  ## Containers to include and exclude. Globs accepted.
  ## Note that an empty array for both will include all containers
  container_name_include = []
  container_name_exclude = []
  ## Timeout for docker list, info, and stats commands
  timeout = "5s"
@@ -88,66 +67,46 @@ var sampleConfig = `
  perdevice = true
  ## Whether to report for each container total blkio and network stats or not
  total = false
  ## Which environment variables should we use as a tag
  ##tag_env = ["JAVA_HOME", "HEAP_SIZE"]
  ## docker labels to include and exclude as tags.  Globs accepted.
  ## Note that an empty array for both will include all labels as tags
  docker_label_include = []
  docker_label_exclude = []
  ## Optional SSL Config
  # ssl_ca = "/etc/telegraf/ca.pem"
  # ssl_cert = "/etc/telegraf/cert.pem"
  # ssl_key = "/etc/telegraf/key.pem"
  ## Use SSL but skip chain & host verification
  # insecure_skip_verify = false
 `
 // Description returns input description
 func (d *Docker) Description() string {
 	return "Read metrics about docker containers"
 }
 // SampleConfig prints sampleConfig
 func (d *Docker) SampleConfig() string { return sampleConfig }
 // Gather starts stats collection
 func (d *Docker) Gather(acc telegraf.Accumulator) error {
 	if d.client == nil {
-		var c Client
+		var c *client.Client
 		var err error
 		defaultHeaders := map[string]string{"User-Agent": "engine-api-cli-1.0"}
 		if d.Endpoint == "ENV" {
-			c, err = d.newEnvClient()
+			c, err = client.NewEnvClient()
 			if err != nil {
 				return err
 			}
 		} else if d.Endpoint == "" {
 			c, err = client.NewClient("unix:///var/run/docker.sock", "", nil, defaultHeaders)
 			if err != nil {
 				return err
 			}
 		} else {
-			tlsConfig, err := internal.GetTLSConfig(
+			c, err = client.NewClient(d.Endpoint, "", nil, defaultHeaders)
 				d.SSLCert, d.SSLKey, d.SSLCA, d.InsecureSkipVerify)
 			if err != nil {
 				return err
 			}
 			c, err = d.newClient(d.Endpoint, tlsConfig)
 		}
 		if err != nil {
 			return err
 		}
 		d.client = c
 	}
 	// Create label filters if not already created
 	if !d.filtersCreated {
 		err := d.createLabelFilters()
 		if err != nil {
 			return err
 		}
 		err = d.createContainerFilters()
 		if err != nil {
 			return err
 		}
 		d.filtersCreated = true
 	}
 	// Get daemon info
 	err := d.gatherInfo(acc)
 	if err != nil {
-		acc.AddError(err)
+		fmt.Println(err.Error())
 	}
 	// List containers
@@ -167,8 +126,8 @@ func (d *Docker) Gather(acc telegraf.Accumulator) error {
 			defer wg.Done()
 			err := d.gatherContainer(c, acc)
 			if err != nil {
-				acc.AddError(fmt.Errorf("E! Error gathering container %s stats: %s\n",
+				log.Printf("E! Error gathering container %s stats: %s\n",
-					c.Names, err.Error()))
+					c.Names, err.Error())
 			}
 		}(container)
 	}
@@ -280,10 +239,11 @@ func (d *Docker) gatherContainer(
 		"container_image":   imageName,
 		"container_version": imageVersion,
 	}
-
+	if len(d.ContainerNames) > 0 {
-	if !d.containerFilter.Match(cname) {
+		if !sliceContains(cname, d.ContainerNames) {
 			return nil
 		}
 	}
 	ctx, cancel := context.WithTimeout(context.Background(), d.Timeout.Duration)
 	defer cancel()
@@ -291,41 +251,21 @@ func (d *Docker) gatherContainer(
 	if err != nil {
 		return fmt.Errorf("Error getting docker stats: %s", err.Error())
 	}
-	defer r.Body.Close()
+	defer r.Close()
-	dec := json.NewDecoder(r.Body)
+	dec := json.NewDecoder(r)
 	if err = dec.Decode(&v); err != nil {
 		if err == io.EOF {
 			return nil
 		}
 		return fmt.Errorf("Error decoding: %s", err.Error())
 	}
 	daemonOSType := r.OSType
 	// Add labels to tags
 	for k, label := range container.Labels {
 		if d.labelFilter.Match(k) {
 		tags[k] = label
 	}
 	}
-	// Add whitelisted environment variables to tags
+	gatherContainerStats(v, acc, tags, container.ID, d.PerDevice, d.Total)
 	if len(d.TagEnvironment) > 0 {
 		info, err := d.client.ContainerInspect(ctx, container.ID)
 		if err != nil {
 			return fmt.Errorf("Error inspecting docker container: %s", err.Error())
 		}
 		for _, envvar := range info.Config.Env {
 			for _, configvar := range d.TagEnvironment {
 				dock_env := strings.SplitN(envvar, "=", 2)
 				//check for presence of tag in whitelist
 				if len(dock_env) == 2 && len(strings.TrimSpace(dock_env[1])) != 0 && configvar == dock_env[0] {
 					tags[dock_env[0]] = dock_env[1]
 				}
 			}
 		}
 	}
 	gatherContainerStats(v, acc, tags, container.ID, d.PerDevice, d.Total, daemonOSType)
 	return nil
 }
@@ -337,73 +277,47 @@ func gatherContainerStats(
 	id string,
 	perDevice bool,
 	total bool,
 	daemonOSType string,
 ) {
-	tm := stat.Read
+	now := stat.Read
 	if tm.Before(time.Unix(0, 0)) {
 		tm = time.Now()
 	}
 	memfields := map[string]interface{}{
 		"max_usage":                 stat.MemoryStats.MaxUsage,
 		"usage":                     stat.MemoryStats.Usage,
 		"fail_count":                stat.MemoryStats.Failcnt,
 		"limit":                     stat.MemoryStats.Limit,
 		"total_pgmafault":           stat.MemoryStats.Stats["total_pgmajfault"],
 		"cache":                     stat.MemoryStats.Stats["cache"],
 		"mapped_file":               stat.MemoryStats.Stats["mapped_file"],
 		"total_inactive_file":       stat.MemoryStats.Stats["total_inactive_file"],
 		"pgpgout":                   stat.MemoryStats.Stats["pagpgout"],
 		"rss":                       stat.MemoryStats.Stats["rss"],
 		"total_mapped_file":         stat.MemoryStats.Stats["total_mapped_file"],
 		"writeback":                 stat.MemoryStats.Stats["writeback"],
 		"unevictable":               stat.MemoryStats.Stats["unevictable"],
 		"pgpgin":                    stat.MemoryStats.Stats["pgpgin"],
 		"total_unevictable":         stat.MemoryStats.Stats["total_unevictable"],
 		"pgmajfault":                stat.MemoryStats.Stats["pgmajfault"],
 		"total_rss":                 stat.MemoryStats.Stats["total_rss"],
 		"total_rss_huge":            stat.MemoryStats.Stats["total_rss_huge"],
 		"total_writeback":           stat.MemoryStats.Stats["total_write_back"],
 		"total_inactive_anon":       stat.MemoryStats.Stats["total_inactive_anon"],
 		"rss_huge":                  stat.MemoryStats.Stats["rss_huge"],
 		"hierarchical_memory_limit": stat.MemoryStats.Stats["hierarchical_memory_limit"],
 		"total_pgfault":             stat.MemoryStats.Stats["total_pgfault"],
 		"total_active_file":         stat.MemoryStats.Stats["total_active_file"],
 		"active_anon":               stat.MemoryStats.Stats["active_anon"],
 		"total_active_anon":         stat.MemoryStats.Stats["total_active_anon"],
 		"total_pgpgout":             stat.MemoryStats.Stats["total_pgpgout"],
 		"total_cache":               stat.MemoryStats.Stats["total_cache"],
 		"inactive_anon":             stat.MemoryStats.Stats["inactive_anon"],
 		"active_file":               stat.MemoryStats.Stats["active_file"],
 		"pgfault":                   stat.MemoryStats.Stats["pgfault"],
 		"inactive_file":             stat.MemoryStats.Stats["inactive_file"],
 		"total_pgpgin":              stat.MemoryStats.Stats["total_pgpgin"],
 		"usage_percent":             calculateMemPercent(stat),
 		"container_id":              id,
 	}
-
+	acc.AddFields("docker_container_mem", memfields, tags, now)
 	memstats := []string{
 		"active_anon",
 		"active_file",
 		"cache",
 		"hierarchical_memory_limit",
 		"inactive_anon",
 		"inactive_file",
 		"mapped_file",
 		"pgfault",
 		"pgmajfault",
 		"pgpgin",
 		"pgpgout",
 		"rss",
 		"rss_huge",
 		"total_active_anon",
 		"total_active_file",
 		"total_cache",
 		"total_inactive_anon",
 		"total_inactive_file",
 		"total_mapped_file",
 		"total_pgfault",
 		"total_pgmajfault",
 		"total_pgpgin",
 		"total_pgpgout",
 		"total_rss",
 		"total_rss_huge",
 		"total_unevictable",
 		"total_writeback",
 		"unevictable",
 		"writeback",
 	}
 	for _, field := range memstats {
 		if value, ok := stat.MemoryStats.Stats[field]; ok {
 			memfields[field] = value
 		}
 	}
 	if stat.MemoryStats.Failcnt != 0 {
 		memfields["fail_count"] = stat.MemoryStats.Failcnt
 	}
 	if daemonOSType != "windows" {
 		memfields["limit"] = stat.MemoryStats.Limit
 		memfields["usage"] = stat.MemoryStats.Usage
 		memfields["max_usage"] = stat.MemoryStats.MaxUsage
 		mem := calculateMemUsageUnixNoCache(stat.MemoryStats)
 		memLimit := float64(stat.MemoryStats.Limit)
 		memfields["usage_percent"] = calculateMemPercentUnixNoCache(memLimit, mem)
 	} else {
 		memfields["commit_bytes"] = stat.MemoryStats.Commit
 		memfields["commit_peak_bytes"] = stat.MemoryStats.CommitPeak
 		memfields["private_working_set"] = stat.MemoryStats.PrivateWorkingSet
 	}
 	acc.AddFields("docker_container_mem", memfields, tags, tm)
 	cpufields := map[string]interface{}{
 		"usage_total":                  stat.CPUStats.CPUUsage.TotalUsage,
@@ -413,40 +327,21 @@ func gatherContainerStats(
 		"throttling_periods":           stat.CPUStats.ThrottlingData.Periods,
 		"throttling_throttled_periods": stat.CPUStats.ThrottlingData.ThrottledPeriods,
 		"throttling_throttled_time":    stat.CPUStats.ThrottlingData.ThrottledTime,
 		"usage_percent":                calculateCPUPercent(stat),
 		"container_id":                 id,
 	}
 	if daemonOSType != "windows" {
 		previousCPU := stat.PreCPUStats.CPUUsage.TotalUsage
 		previousSystem := stat.PreCPUStats.SystemUsage
 		cpuPercent := calculateCPUPercentUnix(previousCPU, previousSystem, stat)
 		cpufields["usage_percent"] = cpuPercent
 	} else {
 		cpuPercent := calculateCPUPercentWindows(stat)
 		cpufields["usage_percent"] = cpuPercent
 	}
 	cputags := copyTags(tags)
 	cputags["cpu"] = "cpu-total"
-	acc.AddFields("docker_container_cpu", cpufields, cputags, tm)
+	acc.AddFields("docker_container_cpu", cpufields, cputags, now)
-	// If we have OnlineCPUs field, then use it to restrict stats gathering to only Online CPUs
+	for i, percpu := range stat.CPUStats.CPUUsage.PercpuUsage {
 	// (https://github.com/moby/moby/commit/115f91d7575d6de6c7781a96a082f144fd17e400)
 	var percpuusage []uint64
 	if stat.CPUStats.OnlineCPUs > 0 {
 		percpuusage = stat.CPUStats.CPUUsage.PercpuUsage[:stat.CPUStats.OnlineCPUs]
 	} else {
 		percpuusage = stat.CPUStats.CPUUsage.PercpuUsage
 	}
 	for i, percpu := range percpuusage {
 		percputags := copyTags(tags)
 		percputags["cpu"] = fmt.Sprintf("cpu%d", i)
 		fields := map[string]interface{}{
 			"usage_total":  percpu,
 			"container_id": id,
 		}
-		acc.AddFields("docker_container_cpu", fields, percputags, tm)
+		acc.AddFields("docker_container_cpu", fields, percputags, now)
 	}
 	totalNetworkStatMap := make(map[string]interface{})
@@ -466,7 +361,7 @@ func gatherContainerStats(
 		if perDevice {
 			nettags := copyTags(tags)
 			nettags["network"] = network
-			acc.AddFields("docker_container_net", netfields, nettags, tm)
+			acc.AddFields("docker_container_net", netfields, nettags, now)
 		}
 		if total {
 			for field, value := range netfields {
@@ -499,17 +394,37 @@ func gatherContainerStats(
 		nettags := copyTags(tags)
 		nettags["network"] = "total"
 		totalNetworkStatMap["container_id"] = id
-		acc.AddFields("docker_container_net", totalNetworkStatMap, nettags, tm)
+		acc.AddFields("docker_container_net", totalNetworkStatMap, nettags, now)
 	}
-	gatherBlockIOMetrics(stat, acc, tags, tm, id, perDevice, total)
+	gatherBlockIOMetrics(stat, acc, tags, now, id, perDevice, total)
 }
 func calculateMemPercent(stat *types.StatsJSON) float64 {
 	var memPercent = 0.0
 	if stat.MemoryStats.Limit > 0 {
 		memPercent = float64(stat.MemoryStats.Usage) / float64(stat.MemoryStats.Limit) * 100.0
 	}
 	return memPercent
 }
 func calculateCPUPercent(stat *types.StatsJSON) float64 {
 	var cpuPercent = 0.0
 	// calculate the change for the cpu and system usage of the container in between readings
 	cpuDelta := float64(stat.CPUStats.CPUUsage.TotalUsage) - float64(stat.PreCPUStats.CPUUsage.TotalUsage)
 	systemDelta := float64(stat.CPUStats.SystemUsage) - float64(stat.PreCPUStats.SystemUsage)
 	if systemDelta > 0.0 && cpuDelta > 0.0 {
 		cpuPercent = (cpuDelta / systemDelta) * float64(len(stat.CPUStats.CPUUsage.PercpuUsage)) * 100.0
 	}
 	return cpuPercent
 }
 func gatherBlockIOMetrics(
 	stat *types.StatsJSON,
 	acc telegraf.Accumulator,
 	tags map[string]string,
-	tm time.Time,
+	now time.Time,
 	id string,
 	perDevice bool,
 	total bool,
@@ -580,7 +495,7 @@ func gatherBlockIOMetrics(
 		if perDevice {
 			iotags := copyTags(tags)
 			iotags["device"] = device
-			acc.AddFields("docker_container_blkio", fields, iotags, tm)
+			acc.AddFields("docker_container_blkio", fields, iotags, now)
 		}
 		if total {
 			for field, value := range fields {
@@ -611,7 +526,7 @@ func gatherBlockIOMetrics(
 		totalStatMap["container_id"] = id
 		iotags := copyTags(tags)
 		iotags["device"] = "total"
-		acc.AddFields("docker_container_blkio", totalStatMap, iotags, tm)
+		acc.AddFields("docker_container_blkio", totalStatMap, iotags, now)
 	}
 }
@@ -653,38 +568,11 @@ func parseSize(sizeStr string) (int64, error) {
 	return int64(size), nil
 }
 func (d *Docker) createContainerFilters() error {
 	// Backwards compatibility for deprecated `container_names` parameter.
 	if len(d.ContainerNames) > 0 {
 		d.ContainerInclude = append(d.ContainerInclude, d.ContainerNames...)
 	}
 	filter, err := filter.NewIncludeExcludeFilter(d.ContainerInclude, d.ContainerExclude)
 	if err != nil {
 		return err
 	}
 	d.containerFilter = filter
 	return nil
 }
 func (d *Docker) createLabelFilters() error {
 	filter, err := filter.NewIncludeExcludeFilter(d.LabelInclude, d.LabelExclude)
 	if err != nil {
 		return err
 	}
 	d.labelFilter = filter
 	return nil
 }
 func init() {
 	inputs.Add("docker", func() telegraf.Input {
 		return &Docker{
 			PerDevice: true,
 			Timeout:   internal.Duration{Duration: time.Second * 5},
 			Endpoint:       defaultEndpoint,
 			newEnvClient:   NewEnvClient,
 			newClient:      NewClient,
 			filtersCreated: false,
 		}
 	})
 }
--- a/plugins/inputs/docker/docker_test.go
+++ b/plugins/inputs/docker/docker_test.go
@@ -1,68 +1,21 @@
-package docker
+package system
 import (
-	"context"
+	"io"
-	"crypto/tls"
+	"io/ioutil"
 	"strings"
 	"testing"
 	"time"
 	"golang.org/x/net/context"
 	"github.com/docker/engine-api/types"
 	"github.com/docker/engine-api/types/registry"
 	"github.com/influxdata/telegraf/testutil"
 	"github.com/docker/docker/api/types"
 	"github.com/stretchr/testify/require"
 )
 type MockClient struct {
 	InfoF             func(ctx context.Context) (types.Info, error)
 	ContainerListF    func(ctx context.Context, options types.ContainerListOptions) ([]types.Container, error)
 	ContainerStatsF   func(ctx context.Context, containerID string, stream bool) (types.ContainerStats, error)
 	ContainerInspectF func(ctx context.Context, containerID string) (types.ContainerJSON, error)
 }
 func (c *MockClient) Info(ctx context.Context) (types.Info, error) {
 	return c.InfoF(ctx)
 }
 func (c *MockClient) ContainerList(
 	ctx context.Context,
 	options types.ContainerListOptions,
 ) ([]types.Container, error) {
 	return c.ContainerListF(ctx, options)
 }
 func (c *MockClient) ContainerStats(
 	ctx context.Context,
 	containerID string,
 	stream bool,
 ) (types.ContainerStats, error) {
 	return c.ContainerStatsF(ctx, containerID, stream)
 }
 func (c *MockClient) ContainerInspect(
 	ctx context.Context,
 	containerID string,
 ) (types.ContainerJSON, error) {
 	return c.ContainerInspectF(ctx, containerID)
 }
 var baseClient = MockClient{
 	InfoF: func(context.Context) (types.Info, error) {
 		return info, nil
 	},
 	ContainerListF: func(context.Context, types.ContainerListOptions) ([]types.Container, error) {
 		return containerList, nil
 	},
 	ContainerStatsF: func(context.Context, string, bool) (types.ContainerStats, error) {
 		return containerStats(), nil
 	},
 	ContainerInspectF: func(context.Context, string) (types.ContainerJSON, error) {
 		return containerInspect, nil
 	},
 }
 func newClient(host string, tlsConfig *tls.Config) (Client, error) {
 	return &baseClient, nil
 }
 func TestDockerGatherContainerStats(t *testing.T) {
 	var acc testutil.Accumulator
 	stats := testStats()
@@ -71,8 +24,7 @@ func TestDockerGatherContainerStats(t *testing.T) {
 		"container_name":  "redis",
 		"container_image": "redis/image",
 	}
-
+	gatherContainerStats(stats, &acc, tags, "123456789", true, true)
 	gatherContainerStats(stats, &acc, tags, "123456789", true, true, "linux")
 	// test docker_container_net measurement
 	netfields := map[string]interface{}{
@@ -126,41 +78,41 @@ func TestDockerGatherContainerStats(t *testing.T) {
 	// test docker_container_mem measurement
 	memfields := map[string]interface{}{
 		"active_anon":               uint64(0),
 		"active_file":               uint64(1),
 		"cache":                     uint64(0),
 		"container_id":              "123456789",
 		"fail_count":                uint64(1),
 		"hierarchical_memory_limit": uint64(0),
 		"inactive_anon":             uint64(0),
 		"inactive_file":             uint64(3),
 		"limit":                     uint64(2000),
 		"mapped_file":               uint64(0),
 		"max_usage":                 uint64(1001),
 		"pgfault":                   uint64(2),
 		"pgmajfault":                uint64(0),
 		"pgpgin":                    uint64(0),
 		"pgpgout":                   uint64(0),
 		"rss_huge":                  uint64(0),
 		"rss":                       uint64(0),
 		"total_active_anon":         uint64(0),
 		"total_active_file":         uint64(0),
 		"total_cache":               uint64(0),
 		"total_inactive_anon":       uint64(0),
 		"total_inactive_file":       uint64(0),
 		"total_mapped_file":         uint64(0),
 		"total_pgfault":             uint64(0),
 		"total_pgmajfault":          uint64(0),
 		"total_pgpgin":              uint64(4),
 		"total_pgpgout":             uint64(0),
 		"total_rss_huge":            uint64(444),
 		"total_rss":                 uint64(44),
 		"total_unevictable":         uint64(0),
 		"total_writeback":           uint64(55),
 		"unevictable":               uint64(0),
 		"usage_percent":             float64(55.55),
 		"usage":                     uint64(1111),
 		"fail_count":                uint64(1),
 		"limit":                     uint64(2000),
 		"total_pgmafault":           uint64(0),
 		"cache":                     uint64(0),
 		"mapped_file":               uint64(0),
 		"total_inactive_file":       uint64(0),
 		"pgpgout":                   uint64(0),
 		"rss":                       uint64(0),
 		"total_mapped_file":         uint64(0),
 		"writeback":                 uint64(0),
 		"unevictable":               uint64(0),
 		"pgpgin":                    uint64(0),
 		"total_unevictable":         uint64(0),
 		"pgmajfault":                uint64(0),
 		"total_rss":                 uint64(44),
 		"total_rss_huge":            uint64(444),
 		"total_writeback":           uint64(55),
 		"total_inactive_anon":       uint64(0),
 		"rss_huge":                  uint64(0),
 		"hierarchical_memory_limit": uint64(0),
 		"total_pgfault":             uint64(0),
 		"total_active_file":         uint64(0),
 		"active_anon":               uint64(0),
 		"total_active_anon":         uint64(0),
 		"total_pgpgout":             uint64(0),
 		"total_cache":               uint64(0),
 		"inactive_anon":             uint64(0),
 		"active_file":               uint64(1),
 		"pgfault":                   uint64(2),
 		"inactive_file":             uint64(3),
 		"total_pgpgin":              uint64(4),
 		"usage_percent":             float64(55.55),
 		"container_id":              "123456789",
 	}
 	acc.AssertContainsTaggedFields(t, "docker_container_mem", memfields, tags)
@@ -194,368 +146,250 @@ func TestDockerGatherContainerStats(t *testing.T) {
 		"container_id": "123456789",
 	}
 	acc.AssertContainsTaggedFields(t, "docker_container_cpu", cpu1fields, cputags)
 	// Those tagged filed should not be present because of offline CPUs
 	cputags["cpu"] = "cpu2"
 	cpu2fields := map[string]interface{}{
 		"usage_total":  uint64(0),
 		"container_id": "123456789",
 	}
 	acc.AssertDoesNotContainsTaggedFields(t, "docker_container_cpu", cpu2fields, cputags)
 	cputags["cpu"] = "cpu3"
 	cpu3fields := map[string]interface{}{
 		"usage_total":  uint64(0),
 		"container_id": "123456789",
 	}
 	acc.AssertDoesNotContainsTaggedFields(t, "docker_container_cpu", cpu3fields, cputags)
 }
-func TestDocker_WindowsMemoryContainerStats(t *testing.T) {
+func testStats() *types.StatsJSON {
-	var acc testutil.Accumulator
+	stats := &types.StatsJSON{}
 	stats.Read = time.Now()
 	stats.Networks = make(map[string]types.NetworkStats)
-	d := Docker{
+	stats.CPUStats.CPUUsage.PercpuUsage = []uint64{1, 1002}
-		newClient: func(string, *tls.Config) (Client, error) {
+	stats.CPUStats.CPUUsage.UsageInUsermode = 100
-			return &MockClient{
+	stats.CPUStats.CPUUsage.TotalUsage = 500
-				InfoF: func(ctx context.Context) (types.Info, error) {
+	stats.CPUStats.CPUUsage.UsageInKernelmode = 200
-					return info, nil
+	stats.CPUStats.SystemUsage = 100
-				},
+	stats.CPUStats.ThrottlingData.Periods = 1
-				ContainerListF: func(ctx context.Context, options types.ContainerListOptions) ([]types.Container, error) {
+
-					return containerList, nil
+	stats.PreCPUStats.CPUUsage.TotalUsage = 400
-				},
+	stats.PreCPUStats.SystemUsage = 50
-				ContainerStatsF: func(ctx context.Context, containerID string, stream bool) (types.ContainerStats, error) {
+
-					return containerStatsWindows(), nil
+	stats.MemoryStats.Stats = make(map[string]uint64)
-				},
+	stats.MemoryStats.Stats["total_pgmajfault"] = 0
-				ContainerInspectF: func(ctx context.Context, containerID string) (types.ContainerJSON, error) {
+	stats.MemoryStats.Stats["cache"] = 0
-					return containerInspect, nil
+	stats.MemoryStats.Stats["mapped_file"] = 0
-				},
+	stats.MemoryStats.Stats["total_inactive_file"] = 0
-			}, nil
+	stats.MemoryStats.Stats["pagpgout"] = 0
-		},
+	stats.MemoryStats.Stats["rss"] = 0
 	stats.MemoryStats.Stats["total_mapped_file"] = 0
 	stats.MemoryStats.Stats["writeback"] = 0
 	stats.MemoryStats.Stats["unevictable"] = 0
 	stats.MemoryStats.Stats["pgpgin"] = 0
 	stats.MemoryStats.Stats["total_unevictable"] = 0
 	stats.MemoryStats.Stats["pgmajfault"] = 0
 	stats.MemoryStats.Stats["total_rss"] = 44
 	stats.MemoryStats.Stats["total_rss_huge"] = 444
 	stats.MemoryStats.Stats["total_write_back"] = 55
 	stats.MemoryStats.Stats["total_inactive_anon"] = 0
 	stats.MemoryStats.Stats["rss_huge"] = 0
 	stats.MemoryStats.Stats["hierarchical_memory_limit"] = 0
 	stats.MemoryStats.Stats["total_pgfault"] = 0
 	stats.MemoryStats.Stats["total_active_file"] = 0
 	stats.MemoryStats.Stats["active_anon"] = 0
 	stats.MemoryStats.Stats["total_active_anon"] = 0
 	stats.MemoryStats.Stats["total_pgpgout"] = 0
 	stats.MemoryStats.Stats["total_cache"] = 0
 	stats.MemoryStats.Stats["inactive_anon"] = 0
 	stats.MemoryStats.Stats["active_file"] = 1
 	stats.MemoryStats.Stats["pgfault"] = 2
 	stats.MemoryStats.Stats["inactive_file"] = 3
 	stats.MemoryStats.Stats["total_pgpgin"] = 4
 	stats.MemoryStats.MaxUsage = 1001
 	stats.MemoryStats.Usage = 1111
 	stats.MemoryStats.Failcnt = 1
 	stats.MemoryStats.Limit = 2000
 	stats.Networks["eth0"] = types.NetworkStats{
 		RxDropped: 1,
 		RxBytes:   2,
 		RxErrors:  3,
 		TxPackets: 4,
 		TxDropped: 1,
 		RxPackets: 2,
 		TxErrors:  3,
 		TxBytes:   4,
 	}
-	err := d.Gather(&acc)
+
-	require.NoError(t, err)
+	stats.Networks["eth1"] = types.NetworkStats{
 		RxDropped: 5,
 		RxBytes:   6,
 		RxErrors:  7,
 		TxPackets: 8,
 		TxDropped: 5,
 		RxPackets: 6,
 		TxErrors:  7,
 		TxBytes:   8,
 	}
 	sbr := types.BlkioStatEntry{
 		Major: 6,
 		Minor: 0,
 		Op:    "read",
 		Value: 100,
 	}
 	sr := types.BlkioStatEntry{
 		Major: 6,
 		Minor: 0,
 		Op:    "write",
 		Value: 101,
 	}
 	sr2 := types.BlkioStatEntry{
 		Major: 6,
 		Minor: 1,
 		Op:    "write",
 		Value: 201,
 	}
 	stats.BlkioStats.IoServiceBytesRecursive = append(
 		stats.BlkioStats.IoServiceBytesRecursive, sbr)
 	stats.BlkioStats.IoServicedRecursive = append(
 		stats.BlkioStats.IoServicedRecursive, sr)
 	stats.BlkioStats.IoServicedRecursive = append(
 		stats.BlkioStats.IoServicedRecursive, sr2)
 	return stats
 }
-func TestContainerLabels(t *testing.T) {
+type FakeDockerClient struct {
 	var tests = []struct {
 		name      string
 		container types.Container
 		include   []string
 		exclude   []string
 		expected  map[string]string
 	}{
 		{
 			name: "Nil filters matches all",
 			container: types.Container{
 				Labels: map[string]string{
 					"a": "x",
 				},
 			},
 			include: nil,
 			exclude: nil,
 			expected: map[string]string{
 				"a": "x",
 			},
 		},
 		{
 			name: "Empty filters matches all",
 			container: types.Container{
 				Labels: map[string]string{
 					"a": "x",
 				},
 			},
 			include: []string{},
 			exclude: []string{},
 			expected: map[string]string{
 				"a": "x",
 			},
 		},
 		{
 			name: "Must match include",
 			container: types.Container{
 				Labels: map[string]string{
 					"a": "x",
 					"b": "y",
 				},
 			},
 			include: []string{"a"},
 			exclude: []string{},
 			expected: map[string]string{
 				"a": "x",
 			},
 		},
 		{
 			name: "Must not match exclude",
 			container: types.Container{
 				Labels: map[string]string{
 					"a": "x",
 					"b": "y",
 				},
 			},
 			include: []string{},
 			exclude: []string{"b"},
 			expected: map[string]string{
 				"a": "x",
 			},
 		},
 		{
 			name: "Include Glob",
 			container: types.Container{
 				Labels: map[string]string{
 					"aa": "x",
 					"ab": "y",
 					"bb": "z",
 				},
 			},
 			include: []string{"a*"},
 			exclude: []string{},
 			expected: map[string]string{
 				"aa": "x",
 				"ab": "y",
 			},
 		},
 		{
 			name: "Exclude Glob",
 			container: types.Container{
 				Labels: map[string]string{
 					"aa": "x",
 					"ab": "y",
 					"bb": "z",
 				},
 			},
 			include: []string{},
 			exclude: []string{"a*"},
 			expected: map[string]string{
 				"bb": "z",
 			},
 		},
 		{
 			name: "Excluded Includes",
 			container: types.Container{
 				Labels: map[string]string{
 					"aa": "x",
 					"ab": "y",
 					"bb": "z",
 				},
 			},
 			include: []string{"a*"},
 			exclude: []string{"*b"},
 			expected: map[string]string{
 				"aa": "x",
 			},
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			var acc testutil.Accumulator
 			newClientFunc := func(host string, tlsConfig *tls.Config) (Client, error) {
 				client := baseClient
 				client.ContainerListF = func(context.Context, types.ContainerListOptions) ([]types.Container, error) {
 					return []types.Container{tt.container}, nil
 				}
 				return &client, nil
 			}
 			d := Docker{
 				newClient:    newClientFunc,
 				LabelInclude: tt.include,
 				LabelExclude: tt.exclude,
 			}
 			err := d.Gather(&acc)
 			require.NoError(t, err)
 			// Grab tags from a container metric
 			var actual map[string]string
 			for _, metric := range acc.Metrics {
 				if metric.Measurement == "docker_container_cpu" {
 					actual = metric.Tags
 				}
 			}
 			for k, v := range tt.expected {
 				require.Equal(t, v, actual[k])
 			}
 		})
 	}
 }
-func TestContainerNames(t *testing.T) {
+func (d FakeDockerClient) Info(ctx context.Context) (types.Info, error) {
-	var tests = []struct {
+	env := types.Info{
-		name       string
+		Containers:         108,
-		containers [][]string
+		ContainersRunning:  98,
-		include    []string
+		ContainersStopped:  6,
-		exclude    []string
+		ContainersPaused:   3,
-		expected   []string
+		OomKillDisable:     false,
-	}{
+		SystemTime:         "2016-02-24T00:55:09.15073105-05:00",
-		{
+		NEventsListener:    0,
-			name: "Nil filters matches all",
+		ID:                 "5WQQ:TFWR:FDNG:OKQ3:37Y4:FJWG:QIKK:623T:R3ME:QTKB:A7F7:OLHD",
-			containers: [][]string{
+		Debug:              false,
-				{"/etcd"},
+		LoggingDriver:      "json-file",
-				{"/etcd2"},
+		KernelVersion:      "4.3.0-1-amd64",
-			},
+		IndexServerAddress: "https://index.docker.io/v1/",
-			include:  nil,
+		MemTotal:           3840757760,
-			exclude:  nil,
+		Images:             199,
-			expected: []string{"etcd", "etcd2"},
+		CPUCfsQuota:        true,
-		},
+		Name:               "absol",
-		{
+		SwapLimit:          false,
-			name: "Empty filters matches all",
+		IPv4Forwarding:     true,
-			containers: [][]string{
+		ExperimentalBuild:  false,
-				{"/etcd"},
+		CPUCfsPeriod:       true,
-				{"/etcd2"},
+		RegistryConfig: &registry.ServiceConfig{
-			},
+			IndexConfigs: map[string]*registry.IndexInfo{
-			include:  []string{},
+				"docker.io": {
-			exclude:  []string{},
+					Name:     "docker.io",
-			expected: []string{"etcd", "etcd2"},
+					Mirrors:  []string{},
-		},
+					Official: true,
-		{
+					Secure:   true,
 			name: "Match all containers",
 			containers: [][]string{
 				{"/etcd"},
 				{"/etcd2"},
 			},
 			include:  []string{"*"},
 			exclude:  []string{},
 			expected: []string{"etcd", "etcd2"},
 		},
 		{
 			name: "Include prefix match",
 			containers: [][]string{
 				{"/etcd"},
 				{"/etcd2"},
 			},
 			include:  []string{"etc*"},
 			exclude:  []string{},
 			expected: []string{"etcd", "etcd2"},
 		},
 		{
 			name: "Exact match",
 			containers: [][]string{
 				{"/etcd"},
 				{"/etcd2"},
 			},
 			include:  []string{"etcd"},
 			exclude:  []string{},
 			expected: []string{"etcd"},
 		},
 		{
 			name: "Star matches zero length",
 			containers: [][]string{
 				{"/etcd"},
 				{"/etcd2"},
 			},
 			include:  []string{"etcd2*"},
 			exclude:  []string{},
 			expected: []string{"etcd2"},
 		},
 		{
 			name: "Exclude matches all",
 			containers: [][]string{
 				{"/etcd"},
 				{"/etcd2"},
 			},
 			include:  []string{},
 			exclude:  []string{"etc*"},
 			expected: []string{},
 		},
 		{
 			name: "Exclude single",
 			containers: [][]string{
 				{"/etcd"},
 				{"/etcd2"},
 			},
 			include:  []string{},
 			exclude:  []string{"etcd"},
 			expected: []string{"etcd2"},
 		},
 		{
 			name: "Exclude all",
 			containers: [][]string{
 				{"/etcd"},
 				{"/etcd2"},
 			},
 			include:  []string{"*"},
 			exclude:  []string{"*"},
 			expected: []string{},
 		},
 		{
 			name: "Exclude item matching include",
 			containers: [][]string{
 				{"acme"},
 				{"foo"},
 				{"acme-test"},
 			},
 			include:  []string{"acme*"},
 			exclude:  []string{"*test*"},
 			expected: []string{"acme"},
 		},
 		{
 			name: "Exclude item no wildcards",
 			containers: [][]string{
 				{"acme"},
 				{"acme-test"},
 			},
 			include:  []string{"acme*"},
 			exclude:  []string{"test"},
 			expected: []string{"acme", "acme-test"},
 				},
 			}, InsecureRegistryCIDRs: []*registry.NetIPNet{{IP: []byte{127, 0, 0, 0}, Mask: []byte{255, 0, 0, 0}}}, Mirrors: []string{}},
 		OperatingSystem:   "Linux Mint LMDE (containerized)",
 		BridgeNfIptables:  true,
 		HTTPSProxy:        "",
 		Labels:            []string{},
 		MemoryLimit:       false,
 		DriverStatus:      [][2]string{{"Pool Name", "docker-8:1-1182287-pool"}, {"Pool Blocksize", "65.54 kB"}, {"Backing Filesystem", "extfs"}, {"Data file", "/dev/loop0"}, {"Metadata file", "/dev/loop1"}, {"Data Space Used", "17.3 GB"}, {"Data Space Total", "107.4 GB"}, {"Data Space Available", "36.53 GB"}, {"Metadata Space Used", "20.97 MB"}, {"Metadata Space Total", "2.147 GB"}, {"Metadata Space Available", "2.127 GB"}, {"Udev Sync Supported", "true"}, {"Deferred Removal Enabled", "false"}, {"Data loop file", "/var/lib/docker/devicemapper/devicemapper/data"}, {"Metadata loop file", "/var/lib/docker/devicemapper/devicemapper/metadata"}, {"Library Version", "1.02.115 (2016-01-25)"}},
 		NFd:               19,
 		HTTPProxy:         "",
 		Driver:            "devicemapper",
 		NGoroutines:       39,
 		NCPU:              4,
 		DockerRootDir:     "/var/lib/docker",
 		NoProxy:           "",
 		BridgeNfIP6tables: true,
 	}
-	for _, tt := range tests {
+	return env, nil
-		t.Run(tt.name, func(t *testing.T) {
+}
 			var acc testutil.Accumulator
-			newClientFunc := func(host string, tlsConfig *tls.Config) (Client, error) {
+func (d FakeDockerClient) ContainerList(octx context.Context, options types.ContainerListOptions) ([]types.Container, error) {
-				client := baseClient
+	container1 := types.Container{
-				client.ContainerListF = func(context.Context, types.ContainerListOptions) ([]types.Container, error) {
+		ID:      "e2173b9478a6ae55e237d4d74f8bbb753f0817192b5081334dc78476296b7dfb",
-					var containers []types.Container
+		Names:   []string{"/etcd"},
-					for _, names := range tt.containers {
+		Image:   "quay.io/coreos/etcd:v2.2.2",
-						containers = append(containers, types.Container{
+		Command: "/etcd -name etcd0 -advertise-client-urls http://localhost:2379 -listen-client-urls http://0.0.0.0:2379",
-							Names: names,
+		Created: 1455941930,
-						})
+		Status:  "Up 4 hours",
 		Ports: []types.Port{
 			types.Port{
 				PrivatePort: 7001,
 				PublicPort:  0,
 				Type:        "tcp",
 			},
 			types.Port{
 				PrivatePort: 4001,
 				PublicPort:  0,
 				Type:        "tcp",
 			},
 			types.Port{
 				PrivatePort: 2380,
 				PublicPort:  0,
 				Type:        "tcp",
 			},
 			types.Port{
 				PrivatePort: 2379,
 				PublicPort:  2379,
 				Type:        "tcp",
 				IP:          "0.0.0.0",
 			},
 		},
 		SizeRw:     0,
 		SizeRootFs: 0,
 	}
 	container2 := types.Container{
 		ID:      "b7dfbb9478a6ae55e237d4d74f8bbb753f0817192b5081334dc78476296e2173",
 		Names:   []string{"/etcd2"},
 		Image:   "quay.io:4443/coreos/etcd:v2.2.2",
 		Command: "/etcd -name etcd2 -advertise-client-urls http://localhost:2379 -listen-client-urls http://0.0.0.0:2379",
 		Created: 1455941933,
 		Status:  "Up 4 hours",
 		Ports: []types.Port{
 			types.Port{
 				PrivatePort: 7002,
 				PublicPort:  0,
 				Type:        "tcp",
 			},
 			types.Port{
 				PrivatePort: 4002,
 				PublicPort:  0,
 				Type:        "tcp",
 			},
 			types.Port{
 				PrivatePort: 2381,
 				PublicPort:  0,
 				Type:        "tcp",
 			},
 			types.Port{
 				PrivatePort: 2382,
 				PublicPort:  2382,
 				Type:        "tcp",
 				IP:          "0.0.0.0",
 			},
 		},
 		SizeRw:     0,
 		SizeRootFs: 0,
 	}
 	containers := []types.Container{container1, container2}
 	return containers, nil
 				}
 				return &client, nil
 			}
-			d := Docker{
+	//#{e6a96c84ca91a5258b7cb752579fb68826b68b49ff957487695cd4d13c343b44 titilambert/snmpsim /bin/sh -c 'snmpsimd --agent-udpv4-endpoint=0.0.0.0:31161 --process-user=root --process-group=user' 1455724831 Up 4 hours [{31161 31161 udp 0.0.0.0}] 0 0 [/snmp] map[]}]2016/02/24 01:05:01 Gathered metrics, (3s interval), from 1 inputs in 1.233836656s
-				newClient:        newClientFunc,
+}
 				ContainerInclude: tt.include,
 				ContainerExclude: tt.exclude,
 			}
-			err := d.Gather(&acc)
+func (d FakeDockerClient) ContainerStats(ctx context.Context, containerID string, stream bool) (io.ReadCloser, error) {
-			require.NoError(t, err)
+	var stat io.ReadCloser
-
+	jsonStat := `{"read":"2016-02-24T11:42:27.472459608-05:00","memory_stats":{"stats":{},"limit":18935443456},"blkio_stats":{"io_service_bytes_recursive":[{"major":252,"minor":1,"op":"Read","value":753664},{"major":252,"minor":1,"op":"Write"},{"major":252,"minor":1,"op":"Sync"},{"major":252,"minor":1,"op":"Async","value":753664},{"major":252,"minor":1,"op":"Total","value":753664}],"io_serviced_recursive":[{"major":252,"minor":1,"op":"Read","value":26},{"major":252,"minor":1,"op":"Write"},{"major":252,"minor":1,"op":"Sync"},{"major":252,"minor":1,"op":"Async","value":26},{"major":252,"minor":1,"op":"Total","value":26}]},"cpu_stats":{"cpu_usage":{"percpu_usage":[17871,4959158,1646137,1231652,11829401,244656,369972,0],"usage_in_usermode":10000000,"total_usage":20298847},"system_cpu_usage":24052607520000000,"throttling_data":{}},"precpu_stats":{"cpu_usage":{"percpu_usage":[17871,4959158,1646137,1231652,11829401,244656,369972,0],"usage_in_usermode":10000000,"total_usage":20298847},"system_cpu_usage":24052599550000000,"throttling_data":{}}}`
-			// Set of expected names
+	stat = ioutil.NopCloser(strings.NewReader(jsonStat))
-			var expected = make(map[string]bool)
+	return stat, nil
 			for _, v := range tt.expected {
 				expected[v] = true
 			}
 			// Set of actual names
 			var actual = make(map[string]bool)
 			for _, metric := range acc.Metrics {
 				if name, ok := metric.Tags["container_name"]; ok {
 					actual[name] = true
 				}
 			}
 			require.Equal(t, expected, actual)
 		})
 	}
 }
 func TestDockerGatherInfo(t *testing.T) {
 	var acc testutil.Accumulator
-	d := Docker{
+	client := FakeDockerClient{}
-		newClient: newClient,
+	d := Docker{client: client}
-		TagEnvironment: []string{"ENVVAR1", "ENVVAR2", "ENVVAR3", "ENVVAR5",
+
-			"ENVVAR6", "ENVVAR7", "ENVVAR8", "ENVVAR9"},
+	err := d.Gather(&acc)
 	}
 	err := acc.GatherError(d.Gather)
 	require.NoError(t, err)
 	acc.AssertContainsTaggedFields(t,
@@ -598,34 +432,54 @@ func TestDockerGatherInfo(t *testing.T) {
 			"cpu":               "cpu3",
 			"container_version": "v2.2.2",
 			"engine_host":       "absol",
 			"ENVVAR1":           "loremipsum",
 			"ENVVAR2":           "dolorsitamet",
 			"ENVVAR3":           "=ubuntu:10.04",
 			"ENVVAR7":           "ENVVAR8=ENVVAR9",
 			"label1":            "test_value_1",
 			"label2":            "test_value_2",
 		},
 	)
 	acc.AssertContainsTaggedFields(t,
 		"docker_container_mem",
 		map[string]interface{}{
-			"container_id":  "b7dfbb9478a6ae55e237d4d74f8bbb753f0817192b5081334dc78476296e2173",
+			"total_pgpgout":             uint64(0),
 			"limit":         uint64(18935443456),
 			"max_usage":     uint64(0),
 			"usage":         uint64(0),
 			"usage_percent":             float64(0),
 			"rss":                       uint64(0),
 			"total_writeback":           uint64(0),
 			"active_anon":               uint64(0),
 			"total_pgmafault":           uint64(0),
 			"total_rss":                 uint64(0),
 			"total_unevictable":         uint64(0),
 			"active_file":               uint64(0),
 			"total_mapped_file":         uint64(0),
 			"pgpgin":                    uint64(0),
 			"total_active_file":         uint64(0),
 			"total_active_anon":         uint64(0),
 			"total_cache":               uint64(0),
 			"inactive_anon":             uint64(0),
 			"pgmajfault":                uint64(0),
 			"total_inactive_anon":       uint64(0),
 			"total_rss_huge":            uint64(0),
 			"rss_huge":                  uint64(0),
 			"hierarchical_memory_limit": uint64(0),
 			"pgpgout":                   uint64(0),
 			"unevictable":               uint64(0),
 			"total_inactive_file":       uint64(0),
 			"writeback":                 uint64(0),
 			"total_pgfault":             uint64(0),
 			"total_pgpgin":              uint64(0),
 			"cache":                     uint64(0),
 			"mapped_file":               uint64(0),
 			"inactive_file":             uint64(0),
 			"max_usage":                 uint64(0),
 			"fail_count":                uint64(0),
 			"pgfault":                   uint64(0),
 			"usage":                     uint64(0),
 			"limit":                     uint64(18935443456),
 			"container_id":              "b7dfbb9478a6ae55e237d4d74f8bbb753f0817192b5081334dc78476296e2173",
 		},
 		map[string]string{
 			"engine_host":       "absol",
 			"container_name":    "etcd2",
 			"container_image":   "quay.io:4443/coreos/etcd",
 			"container_version": "v2.2.2",
 			"ENVVAR1":           "loremipsum",
 			"ENVVAR2":           "dolorsitamet",
 			"ENVVAR3":           "=ubuntu:10.04",
 			"ENVVAR7":           "ENVVAR8=ENVVAR9",
 			"label1":            "test_value_1",
 			"label2":            "test_value_2",
 		},
 	)
 	//fmt.Print(info)
 }
--- a/plugins/inputs/docker/docker_testdata.go
+++ b/plugins/inputs/docker/docker_testdata.go
@@ -1,406 +0,0 @@
 package docker
 import (
 	"io/ioutil"
 	"strings"
 	"time"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/registry"
 )
 var info = types.Info{
 	Containers:         108,
 	ContainersRunning:  98,
 	ContainersStopped:  6,
 	ContainersPaused:   3,
 	OomKillDisable:     false,
 	SystemTime:         "2016-02-24T00:55:09.15073105-05:00",
 	NEventsListener:    0,
 	ID:                 "5WQQ:TFWR:FDNG:OKQ3:37Y4:FJWG:QIKK:623T:R3ME:QTKB:A7F7:OLHD",
 	Debug:              false,
 	LoggingDriver:      "json-file",
 	KernelVersion:      "4.3.0-1-amd64",
 	IndexServerAddress: "https://index.docker.io/v1/",
 	MemTotal:           3840757760,
 	Images:             199,
 	CPUCfsQuota:        true,
 	Name:               "absol",
 	SwapLimit:          false,
 	IPv4Forwarding:     true,
 	ExperimentalBuild:  false,
 	CPUCfsPeriod:       true,
 	RegistryConfig: &registry.ServiceConfig{
 		IndexConfigs: map[string]*registry.IndexInfo{
 			"docker.io": {
 				Name:     "docker.io",
 				Mirrors:  []string{},
 				Official: true,
 				Secure:   true,
 			},
 		}, InsecureRegistryCIDRs: []*registry.NetIPNet{{IP: []byte{127, 0, 0, 0}, Mask: []byte{255, 0, 0, 0}}}, Mirrors: []string{}},
 	OperatingSystem:   "Linux Mint LMDE (containerized)",
 	BridgeNfIptables:  true,
 	HTTPSProxy:        "",
 	Labels:            []string{},
 	MemoryLimit:       false,
 	DriverStatus:      [][2]string{{"Pool Name", "docker-8:1-1182287-pool"}, {"Pool Blocksize", "65.54 kB"}, {"Backing Filesystem", "extfs"}, {"Data file", "/dev/loop0"}, {"Metadata file", "/dev/loop1"}, {"Data Space Used", "17.3 GB"}, {"Data Space Total", "107.4 GB"}, {"Data Space Available", "36.53 GB"}, {"Metadata Space Used", "20.97 MB"}, {"Metadata Space Total", "2.147 GB"}, {"Metadata Space Available", "2.127 GB"}, {"Udev Sync Supported", "true"}, {"Deferred Removal Enabled", "false"}, {"Data loop file", "/var/lib/docker/devicemapper/devicemapper/data"}, {"Metadata loop file", "/var/lib/docker/devicemapper/devicemapper/metadata"}, {"Library Version", "1.02.115 (2016-01-25)"}},
 	NFd:               19,
 	HTTPProxy:         "",
 	Driver:            "devicemapper",
 	NGoroutines:       39,
 	NCPU:              4,
 	DockerRootDir:     "/var/lib/docker",
 	NoProxy:           "",
 	BridgeNfIP6tables: true,
 }
 var containerList = []types.Container{
 	types.Container{
 		ID:      "e2173b9478a6ae55e237d4d74f8bbb753f0817192b5081334dc78476296b7dfb",
 		Names:   []string{"/etcd"},
 		Image:   "quay.io/coreos/etcd:v2.2.2",
 		Command: "/etcd -name etcd0 -advertise-client-urls http://localhost:2379 -listen-client-urls http://0.0.0.0:2379",
 		Created: 1455941930,
 		Status:  "Up 4 hours",
 		Ports: []types.Port{
 			types.Port{
 				PrivatePort: 7001,
 				PublicPort:  0,
 				Type:        "tcp",
 			},
 			types.Port{
 				PrivatePort: 4001,
 				PublicPort:  0,
 				Type:        "tcp",
 			},
 			types.Port{
 				PrivatePort: 2380,
 				PublicPort:  0,
 				Type:        "tcp",
 			},
 			types.Port{
 				PrivatePort: 2379,
 				PublicPort:  2379,
 				Type:        "tcp",
 				IP:          "0.0.0.0",
 			},
 		},
 		Labels: map[string]string{
 			"label1": "test_value_1",
 			"label2": "test_value_2",
 		},
 		SizeRw:     0,
 		SizeRootFs: 0,
 	},
 	types.Container{
 		ID:      "b7dfbb9478a6ae55e237d4d74f8bbb753f0817192b5081334dc78476296e2173",
 		Names:   []string{"/etcd2"},
 		Image:   "quay.io:4443/coreos/etcd:v2.2.2",
 		Command: "/etcd -name etcd2 -advertise-client-urls http://localhost:2379 -listen-client-urls http://0.0.0.0:2379",
 		Created: 1455941933,
 		Status:  "Up 4 hours",
 		Ports: []types.Port{
 			types.Port{
 				PrivatePort: 7002,
 				PublicPort:  0,
 				Type:        "tcp",
 			},
 			types.Port{
 				PrivatePort: 4002,
 				PublicPort:  0,
 				Type:        "tcp",
 			},
 			types.Port{
 				PrivatePort: 2381,
 				PublicPort:  0,
 				Type:        "tcp",
 			},
 			types.Port{
 				PrivatePort: 2382,
 				PublicPort:  2382,
 				Type:        "tcp",
 				IP:          "0.0.0.0",
 			},
 		},
 		Labels: map[string]string{
 			"label1": "test_value_1",
 			"label2": "test_value_2",
 		},
 		SizeRw:     0,
 		SizeRootFs: 0,
 	},
 }
 func containerStats() types.ContainerStats {
 	var stat types.ContainerStats
 	jsonStat := `
 {
    "blkio_stats": {
        "io_service_bytes_recursive": [
            {
                "major": 252,
                "minor": 1,
                "op": "Read",
                "value": 753664
            },
            {
                "major": 252,
                "minor": 1,
                "op": "Write"
            },
            {
                "major": 252,
                "minor": 1,
                "op": "Sync"
            },
            {
                "major": 252,
                "minor": 1,
                "op": "Async",
                "value": 753664
            },
            {
                "major": 252,
                "minor": 1,
                "op": "Total",
                "value": 753664
            }
        ],
        "io_serviced_recursive": [
            {
                "major": 252,
                "minor": 1,
                "op": "Read",
                "value": 26
            },
            {
                "major": 252,
                "minor": 1,
                "op": "Write"
            },
            {
                "major": 252,
                "minor": 1,
                "op": "Sync"
            },
            {
                "major": 252,
                "minor": 1,
                "op": "Async",
                "value": 26
            },
            {
                "major": 252,
                "minor": 1,
                "op": "Total",
                "value": 26
            }
        ]
    },
    "cpu_stats": {
        "cpu_usage": {
            "percpu_usage": [
                17871,
                4959158,
                1646137,
                1231652,
                11829401,
                244656,
                369972,
                0
            ],
            "total_usage": 20298847,
            "usage_in_usermode": 10000000
        },
        "system_cpu_usage": 24052607520000000,
        "throttling_data": {}
    },
    "memory_stats": {
        "limit": 18935443456,
        "stats": {}
    },
    "precpu_stats": {
        "cpu_usage": {
            "percpu_usage": [
                17871,
                4959158,
                1646137,
                1231652,
                11829401,
                244656,
                369972,
                0
            ],
            "total_usage": 20298847,
            "usage_in_usermode": 10000000
        },
        "system_cpu_usage": 24052599550000000,
        "throttling_data": {}
    },
    "read": "2016-02-24T11:42:27.472459608-05:00"
 }`
 	stat.Body = ioutil.NopCloser(strings.NewReader(jsonStat))
 	return stat
 }
 func testStats() *types.StatsJSON {
 	stats := &types.StatsJSON{}
 	stats.Read = time.Now()
 	stats.Networks = make(map[string]types.NetworkStats)
 	stats.CPUStats.OnlineCPUs = 2
 	stats.CPUStats.CPUUsage.PercpuUsage = []uint64{1, 1002, 0, 0}
 	stats.CPUStats.CPUUsage.UsageInUsermode = 100
 	stats.CPUStats.CPUUsage.TotalUsage = 500
 	stats.CPUStats.CPUUsage.UsageInKernelmode = 200
 	stats.CPUStats.SystemUsage = 100
 	stats.CPUStats.ThrottlingData.Periods = 1
 	stats.PreCPUStats.CPUUsage.TotalUsage = 400
 	stats.PreCPUStats.SystemUsage = 50
 	stats.MemoryStats.Stats = make(map[string]uint64)
 	stats.MemoryStats.Stats["active_anon"] = 0
 	stats.MemoryStats.Stats["active_file"] = 1
 	stats.MemoryStats.Stats["cache"] = 0
 	stats.MemoryStats.Stats["hierarchical_memory_limit"] = 0
 	stats.MemoryStats.Stats["inactive_anon"] = 0
 	stats.MemoryStats.Stats["inactive_file"] = 3
 	stats.MemoryStats.Stats["mapped_file"] = 0
 	stats.MemoryStats.Stats["pgfault"] = 2
 	stats.MemoryStats.Stats["pgmajfault"] = 0
 	stats.MemoryStats.Stats["pgpgin"] = 0
 	stats.MemoryStats.Stats["pgpgout"] = 0
 	stats.MemoryStats.Stats["rss"] = 0
 	stats.MemoryStats.Stats["rss_huge"] = 0
 	stats.MemoryStats.Stats["total_active_anon"] = 0
 	stats.MemoryStats.Stats["total_active_file"] = 0
 	stats.MemoryStats.Stats["total_cache"] = 0
 	stats.MemoryStats.Stats["total_inactive_anon"] = 0
 	stats.MemoryStats.Stats["total_inactive_file"] = 0
 	stats.MemoryStats.Stats["total_mapped_file"] = 0
 	stats.MemoryStats.Stats["total_pgfault"] = 0
 	stats.MemoryStats.Stats["total_pgmajfault"] = 0
 	stats.MemoryStats.Stats["total_pgpgin"] = 4
 	stats.MemoryStats.Stats["total_pgpgout"] = 0
 	stats.MemoryStats.Stats["total_rss"] = 44
 	stats.MemoryStats.Stats["total_rss_huge"] = 444
 	stats.MemoryStats.Stats["total_unevictable"] = 0
 	stats.MemoryStats.Stats["total_writeback"] = 55
 	stats.MemoryStats.Stats["unevictable"] = 0
 	stats.MemoryStats.Stats["writeback"] = 0
 	stats.MemoryStats.MaxUsage = 1001
 	stats.MemoryStats.Usage = 1111
 	stats.MemoryStats.Failcnt = 1
 	stats.MemoryStats.Limit = 2000
 	stats.Networks["eth0"] = types.NetworkStats{
 		RxDropped: 1,
 		RxBytes:   2,
 		RxErrors:  3,
 		TxPackets: 4,
 		TxDropped: 1,
 		RxPackets: 2,
 		TxErrors:  3,
 		TxBytes:   4,
 	}
 	stats.Networks["eth1"] = types.NetworkStats{
 		RxDropped: 5,
 		RxBytes:   6,
 		RxErrors:  7,
 		TxPackets: 8,
 		TxDropped: 5,
 		RxPackets: 6,
 		TxErrors:  7,
 		TxBytes:   8,
 	}
 	sbr := types.BlkioStatEntry{
 		Major: 6,
 		Minor: 0,
 		Op:    "read",
 		Value: 100,
 	}
 	sr := types.BlkioStatEntry{
 		Major: 6,
 		Minor: 0,
 		Op:    "write",
 		Value: 101,
 	}
 	sr2 := types.BlkioStatEntry{
 		Major: 6,
 		Minor: 1,
 		Op:    "write",
 		Value: 201,
 	}
 	stats.BlkioStats.IoServiceBytesRecursive = append(
 		stats.BlkioStats.IoServiceBytesRecursive, sbr)
 	stats.BlkioStats.IoServicedRecursive = append(
 		stats.BlkioStats.IoServicedRecursive, sr)
 	stats.BlkioStats.IoServicedRecursive = append(
 		stats.BlkioStats.IoServicedRecursive, sr2)
 	return stats
 }
 func containerStatsWindows() types.ContainerStats {
 	var stat types.ContainerStats
 	jsonStat := `
 {
 	"read":"2017-01-11T08:32:46.2413794Z",
 	"preread":"0001-01-01T00:00:00Z",
 	"num_procs":64,
 	"cpu_stats":{
 		"cpu_usage":{
 			"total_usage":536718750,
 			"usage_in_kernelmode":390468750,
 			"usage_in_usermode":390468750
 		},
 		"throttling_data":{
 			"periods":0,
 			"throttled_periods":0,
 			"throttled_time":0
 		}
 	},
 	"precpu_stats":{
 		"cpu_usage":{
 			"total_usage":0,
 			"usage_in_kernelmode":0,
 			"usage_in_usermode":0
 		},
 		"throttling_data":{
 			"periods":0,
 			"throttled_periods":0,
 			"throttled_time":0
 		}
 	},
 	"memory_stats":{
 		"commitbytes":77160448,
 		"commitpeakbytes":105000960,
 		"privateworkingset":59961344
 	},
 	"name":"/gt_test_iis",
 }`
 	stat.Body = ioutil.NopCloser(strings.NewReader(jsonStat))
 	return stat
 }
 var containerInspect = types.ContainerJSON{
 	Config: &container.Config{
 		Env: []string{
 			"ENVVAR1=loremipsum",
 			"ENVVAR1FOO=loremipsum",
 			"ENVVAR2=dolorsitamet",
 			"ENVVAR3==ubuntu:10.04",
 			"ENVVAR4",
 			"ENVVAR5=",
 			"ENVVAR6= ",
 			"ENVVAR7=ENVVAR8=ENVVAR9",
 			"PATH=/bin:/sbin",
 		},
 	},
 }
--- a/plugins/inputs/docker/stats_helpers.go
+++ b/plugins/inputs/docker/stats_helpers.go
@@ -1,55 +0,0 @@
 // Helper functions copied from
 // https://github.com/docker/cli/blob/master/cli/command/container/stats_helpers.go
 package docker
 import "github.com/docker/docker/api/types"
 func calculateCPUPercentUnix(previousCPU, previousSystem uint64, v *types.StatsJSON) float64 {
 	var (
 		cpuPercent = 0.0
 		// calculate the change for the cpu usage of the container in between readings
 		cpuDelta = float64(v.CPUStats.CPUUsage.TotalUsage) - float64(previousCPU)
 		// calculate the change for the entire system between readings
 		systemDelta = float64(v.CPUStats.SystemUsage) - float64(previousSystem)
 		onlineCPUs  = float64(v.CPUStats.OnlineCPUs)
 	)
 	if onlineCPUs == 0.0 {
 		onlineCPUs = float64(len(v.CPUStats.CPUUsage.PercpuUsage))
 	}
 	if systemDelta > 0.0 && cpuDelta > 0.0 {
 		cpuPercent = (cpuDelta / systemDelta) * onlineCPUs * 100.0
 	}
 	return cpuPercent
 }
 func calculateCPUPercentWindows(v *types.StatsJSON) float64 {
 	// Max number of 100ns intervals between the previous time read and now
 	possIntervals := uint64(v.Read.Sub(v.PreRead).Nanoseconds()) // Start with number of ns intervals
 	possIntervals /= 100                                         // Convert to number of 100ns intervals
 	possIntervals *= uint64(v.NumProcs)                          // Multiple by the number of processors
 	// Intervals used
 	intervalsUsed := v.CPUStats.CPUUsage.TotalUsage - v.PreCPUStats.CPUUsage.TotalUsage
 	// Percentage avoiding divide-by-zero
 	if possIntervals > 0 {
 		return float64(intervalsUsed) / float64(possIntervals) * 100.0
 	}
 	return 0.00
 }
 // calculateMemUsageUnixNoCache calculate memory usage of the container.
 // Page cache is intentionally excluded to avoid misinterpretation of the output.
 func calculateMemUsageUnixNoCache(mem types.MemoryStats) float64 {
 	return float64(mem.Usage - mem.Stats["cache"])
 }
 func calculateMemPercentUnixNoCache(limit float64, usedNoCache float64) float64 {
 	// MemoryStats.Limit will never be 0 unless the container is not running and we haven't
 	// got any data from cgroup
 	if limit != 0 {
 		return usedNoCache / limit * 100.0
 	}
 	return 0
 }
--- a/Show More
+++ b/Show More