Dummy kernel plugin added for consistent config generation

Release 0.12
etc/telegraf.conf update for procstat change
2016-04-04 17:43:53 -06:00 · 2016-04-04 16:34:41 -06:00 · 2016-04-04 16:30:24 -06:00 · 2016-04-04 16:28:36 -06:00 · 2016-04-04 16:12:50 -06:00 · 2016-04-04 16:10:23 -06:00
368 changed files with 45513 additions and 11214 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 tivan
 .vagrant
-telegraf
+/telegraf
 .idea
+*~
+*#
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,29 +1,290 @@
+## v0.12.0 [2016-04-05]
+
+### Features
+- [#951](https://github.com/influxdata/telegraf/pull/951): Parse environment variables in the config file.
+- [#948](https://github.com/influxdata/telegraf/pull/948): Cleanup config file and make default package version include all plugins (but commented).
+- [#927](https://github.com/influxdata/telegraf/pull/927): Adds parsing of tags to the statsd input when using DataDog's dogstatsd extension
+- [#863](https://github.com/influxdata/telegraf/pull/863): AMQP output: allow external auth. Thanks @ekini!
+- [#707](https://github.com/influxdata/telegraf/pull/707): Improved prometheus plugin. Thanks @titilambert!
+- [#878](https://github.com/influxdata/telegraf/pull/878): Added json serializer. Thanks @ch3lo!
+- [#880](https://github.com/influxdata/telegraf/pull/880): Add the ability to specify the bearer token to the prometheus plugin. Thanks @jchauncey!
+- [#882](https://github.com/influxdata/telegraf/pull/882): Fixed SQL Server Plugin issues
+- [#849](https://github.com/influxdata/telegraf/issues/849): Adding ability to parse single values as an input data type.
+- [#844](https://github.com/influxdata/telegraf/pull/844): postgres_extensible plugin added. Thanks @menardorama!
+- [#866](https://github.com/influxdata/telegraf/pull/866): couchbase input plugin. Thanks @ljosa!
+- [#789](https://github.com/influxdata/telegraf/pull/789): Support multiple field specification and `field*` in graphite templates. Thanks @chrusty!
+- [#762](https://github.com/influxdata/telegraf/pull/762): Nagios parser for the exec plugin. Thanks @titilambert!
+- [#848](https://github.com/influxdata/telegraf/issues/848): Provide option to omit host tag from telegraf agent.
+- [#928](https://github.com/influxdata/telegraf/pull/928): Deprecating the statsd "convert_names" options, expose separator config.
+- [#919](https://github.com/influxdata/telegraf/pull/919): ipmi_sensor input plugin. Thanks @ebookbug!
+- [#945](https://github.com/influxdata/telegraf/pull/945): KAFKA output: codec, acks, and retry configuration. Thanks @framiere!
+
+### Bugfixes
+- [#890](https://github.com/influxdata/telegraf/issues/890): Create TLS config even if only ssl_ca is provided.
+- [#884](https://github.com/influxdata/telegraf/issues/884): Do not call write method if there are 0 metrics to write.
+- [#898](https://github.com/influxdata/telegraf/issues/898): Put database name in quotes, fixes special characters in the database name.
+- [#656](https://github.com/influxdata/telegraf/issues/656): No longer run `lsof` on linux to get netstat data, fixes permissions issue.
+- [#907](https://github.com/influxdata/telegraf/issues/907): Fix prometheus invalid label/measurement name key.
+- [#841](https://github.com/influxdata/telegraf/issues/841): Fix memcached unix socket panic.
+- [#873](https://github.com/influxdata/telegraf/issues/873): Fix SNMP plugin sometimes not returning metrics. Thanks @titiliambert!
+- [#934](https://github.com/influxdata/telegraf/pull/934): phpfpm: Fix fcgi uri path. Thanks @rudenkovk!
+- [#805](https://github.com/influxdata/telegraf/issues/805): Kafka consumer stops gathering after i/o timeout.
+- [#959](https://github.com/influxdata/telegraf/pull/959): reduce mongodb & prometheus collection timeouts. Thanks @PierreF!
+
+## v0.11.1 [2016-03-17]
+
+### Release Notes
+- Primarily this release was cut to fix [#859](https://github.com/influxdata/telegraf/issues/859)
+
+### Features
+- [#747](https://github.com/influxdata/telegraf/pull/747): Start telegraf on install & remove on uninstall. Thanks @pierref!
+- [#794](https://github.com/influxdata/telegraf/pull/794): Add service reload ability. Thanks @entertainyou!
+
+### Bugfixes
+- [#852](https://github.com/influxdata/telegraf/issues/852): Windows zip package fix
+- [#859](https://github.com/influxdata/telegraf/issues/859): httpjson plugin panic
+
+## v0.11.0 [2016-03-15]
+
+### Release Notes
+
+### Features
+- [#692](https://github.com/influxdata/telegraf/pull/770): Support InfluxDB retention policies
+- [#771](https://github.com/influxdata/telegraf/pull/771): Default timeouts for input plugns. Thanks @PierreF!
+- [#758](https://github.com/influxdata/telegraf/pull/758): UDP Listener input plugin, thanks @whatyouhide!
+- [#769](https://github.com/influxdata/telegraf/issues/769): httpjson plugin: allow specifying SSL configuration.
+- [#735](https://github.com/influxdata/telegraf/pull/735): SNMP Table feature. Thanks @titilambert!
+- [#754](https://github.com/influxdata/telegraf/pull/754): docker plugin: adding `docker info` metrics to output. Thanks @titilambert!
+- [#788](https://github.com/influxdata/telegraf/pull/788): -input-list and -output-list command-line options. Thanks @ebookbug!
+- [#778](https://github.com/influxdata/telegraf/pull/778): Adding a TCP input listener.
+- [#797](https://github.com/influxdata/telegraf/issues/797): Provide option for persistent MQTT consumer client sessions.
+- [#799](https://github.com/influxdata/telegraf/pull/799): Add number of threads for procstat input plugin. Thanks @titilambert!
+- [#776](https://github.com/influxdata/telegraf/pull/776): Add Zookeeper chroot option to kafka_consumer. Thanks @prune998!
+- [#811](https://github.com/influxdata/telegraf/pull/811): Add processes plugin for classifying total procs on system. Thanks @titilambert!
+- [#235](https://github.com/influxdata/telegraf/issues/235): Add number of users to the `system` input plugin.
+- [#826](https://github.com/influxdata/telegraf/pull/826): "kernel" linux plugin for /proc/stat metrics (context switches, interrupts, etc.)
+- [#847](https://github.com/influxdata/telegraf/pull/847): `ntpq`: Input plugin for running ntp query executable and gathering metrics.
+
+### Bugfixes
+- [#748](https://github.com/influxdata/telegraf/issues/748): Fix sensor plugin split on ":"
+- [#722](https://github.com/influxdata/telegraf/pull/722): Librato output plugin fixes. Thanks @chrusty!
+- [#745](https://github.com/influxdata/telegraf/issues/745): Fix Telegraf toml parse panic on large config files. Thanks @titilambert!
+- [#781](https://github.com/influxdata/telegraf/pull/781): Fix mqtt_consumer username not being set. Thanks @chaton78!
+- [#786](https://github.com/influxdata/telegraf/pull/786): Fix mqtt output username not being set. Thanks @msangoi!
+- [#773](https://github.com/influxdata/telegraf/issues/773): Fix duplicate measurements in snmp plugin. Thanks @titilambert!
+- [#708](https://github.com/influxdata/telegraf/issues/708): packaging: build ARM package
+- [#713](https://github.com/influxdata/telegraf/issues/713): packaging: insecure permissions error on log directory
+- [#816](https://github.com/influxdata/telegraf/issues/816): Fix phpfpm panic if fcgi endpoint unreachable.
+- [#828](https://github.com/influxdata/telegraf/issues/828): fix net_response plugin overwriting host tag.
+- [#821](https://github.com/influxdata/telegraf/issues/821): Remove postgres password from server tag. Thanks @menardorama!
+
+## v0.10.4.1
+
+### Release Notes
+- Bug in the build script broke deb and rpm packages.
+
+### Bugfixes
+- [#750](https://github.com/influxdata/telegraf/issues/750): deb package broken
+- [#752](https://github.com/influxdata/telegraf/issues/752): rpm package broken
+
+## v0.10.4 [2016-02-24]
+
+### Release Notes
+- The pass/drop parameters have been renamed to fielddrop/fieldpass parameters,
+to more accurately indicate their purpose.
+- There are also now namedrop/namepass parameters for passing/dropping based
+on the metric _name_.
+- Experimental windows builds now available.
+
+### Features
+- [#727](https://github.com/influxdata/telegraf/pull/727): riak input, thanks @jcoene!
+- [#694](https://github.com/influxdata/telegraf/pull/694): DNS Query input, thanks @mjasion!
+- [#724](https://github.com/influxdata/telegraf/pull/724): username matching for procstat input, thanks @zorel!
+- [#736](https://github.com/influxdata/telegraf/pull/736): Ignore dummy filesystems from disk plugin. Thanks @PierreF!
+- [#737](https://github.com/influxdata/telegraf/pull/737): Support multiple fields for statsd input. Thanks @mattheath!
+
+### Bugfixes
+- [#701](https://github.com/influxdata/telegraf/pull/701): output write count shouldnt print in quiet mode.
+- [#746](https://github.com/influxdata/telegraf/pull/746): httpjson plugin: Fix HTTP GET parameters.
+
+## v0.10.3 [2016-02-18]
+
+### Release Notes
+- Users of the `exec` and `kafka_consumer` (and the new `nats_consumer`
+and `mqtt_consumer` plugins) can now specify the incoming data
+format that they would like to parse. Currently supports: "json", "influx", and
+"graphite"
+- Users of message broker and file output plugins can now choose what data format
+they would like to output. Currently supports: "influx" and "graphite"
+- More info on parsing _incoming_ data formats can be found
+[here](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md)
+- More info on serializing _outgoing_ data formats can be found
+[here](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md)
+- Telegraf now has an option `flush_buffer_when_full` that will flush the
+metric buffer whenever it fills up for each output, rather than dropping
+points and only flushing on a set time interval. This will default to `true`
+and is in the `[agent]` config section.
+
+### Features
+- [#652](https://github.com/influxdata/telegraf/pull/652): CouchDB Input Plugin. Thanks @codehate!
+- [#655](https://github.com/influxdata/telegraf/pull/655): Support parsing arbitrary data formats. Currently limited to kafka_consumer and exec inputs.
+- [#671](https://github.com/influxdata/telegraf/pull/671): Dovecot input plugin. Thanks @mikif70!
+- [#680](https://github.com/influxdata/telegraf/pull/680): NATS consumer input plugin. Thanks @netixen!
+- [#676](https://github.com/influxdata/telegraf/pull/676): MQTT consumer input plugin.
+- [#683](https://github.com/influxdata/telegraf/pull/683): PostGRES input plugin: add pg_stat_bgwriter. Thanks @menardorama!
+- [#679](https://github.com/influxdata/telegraf/pull/679): File/stdout output plugin.
+- [#679](https://github.com/influxdata/telegraf/pull/679): Support for arbitrary output data formats.
+- [#695](https://github.com/influxdata/telegraf/pull/695): raindrops input plugin. Thanks @burdandrei!
+- [#650](https://github.com/influxdata/telegraf/pull/650): net_response input plugin. Thanks @titilambert!
+- [#699](https://github.com/influxdata/telegraf/pull/699): Flush based on buffer size rather than time.
+- [#682](https://github.com/influxdata/telegraf/pull/682): Mesos input plugin. Thanks @tripledes!
+
+### Bugfixes
+- [#443](https://github.com/influxdata/telegraf/issues/443): Fix Ping command timeout parameter on Linux.
+- [#662](https://github.com/influxdata/telegraf/pull/667): Change `[tags]` to `[global_tags]` to fix multiple-plugin tags bug.
+- [#642](https://github.com/influxdata/telegraf/issues/642): Riemann output plugin issues.
+- [#394](https://github.com/influxdata/telegraf/issues/394): Support HTTP POST. Thanks @gabelev!
+- [#715](https://github.com/influxdata/telegraf/pull/715): Fix influxdb precision config panic. Thanks @netixen!
+
+## v0.10.2 [2016-02-04]
+
+### Release Notes
+- Statsd timing measurements are now aggregated into a single measurement with
+fields.
+- Graphite output now inserts tags into the bucket in alphabetical order.
+- Normalized TLS/SSL support for output plugins: MQTT, AMQP, Kafka
+- `verify_ssl` config option was removed from Kafka because it was actually
+doing the opposite of what it claimed to do (yikes). It's been replaced by
+`insecure_skip_verify`
+
+### Features
+- [#575](https://github.com/influxdata/telegraf/pull/575): Support for collecting Windows Performance Counters. Thanks @TheFlyingCorpse!
+- [#564](https://github.com/influxdata/telegraf/issues/564): features for plugin writing simplification. Internal metric data type.
+- [#603](https://github.com/influxdata/telegraf/pull/603): Aggregate statsd timing measurements into fields. Thanks @marcinbunsch!
+- [#601](https://github.com/influxdata/telegraf/issues/601): Warn when overwriting cached metrics.
+- [#614](https://github.com/influxdata/telegraf/pull/614): PowerDNS input plugin. Thanks @Kasen!
+- [#617](https://github.com/influxdata/telegraf/pull/617): exec plugin: parse influx line protocol in addition to JSON.
+- [#628](https://github.com/influxdata/telegraf/pull/628): Windows perf counters: pre-vista support
+
+### Bugfixes
+- [#595](https://github.com/influxdata/telegraf/issues/595): graphite output should include tags to separate duplicate measurements.
+- [#599](https://github.com/influxdata/telegraf/issues/599): datadog plugin tags not working.
+- [#600](https://github.com/influxdata/telegraf/issues/600): datadog measurement/field name parsing is wrong.
+- [#602](https://github.com/influxdata/telegraf/issues/602): Fix statsd field name templating.
+- [#612](https://github.com/influxdata/telegraf/pull/612): Docker input panic fix if stats received are nil.
+- [#634](https://github.com/influxdata/telegraf/pull/634): Properly set host headers in httpjson. Thanks @reginaldosousa!
+
+## v0.10.1 [2016-01-27]
+
+### Release Notes
+
+- Telegraf now keeps a fixed-length buffer of metrics per-output. This buffer
+defaults to 10,000 metrics, and is adjustable. The buffer is cleared when a
+successful write to that output occurs.
+- The docker plugin has been significantly overhauled to add more metrics
+and allow for docker-machine (incl OSX) support.
+[See the readme](https://github.com/influxdata/telegraf/blob/master/plugins/inputs/docker/README.md)
+for the latest measurements, fields, and tags. There is also now support for
+specifying a docker endpoint to get metrics from.
+
+### Features
+- [#509](https://github.com/influxdata/telegraf/pull/509): Flatten JSON arrays with indices. Thanks @psilva261!
+- [#512](https://github.com/influxdata/telegraf/pull/512): Python 3 build script, add lsof dep to package. Thanks @Ormod!
+- [#475](https://github.com/influxdata/telegraf/pull/475): Add response time to httpjson plugin. Thanks @titilambert!
+- [#519](https://github.com/influxdata/telegraf/pull/519): Added a sensors input based on lm-sensors. Thanks @md14454!
+- [#467](https://github.com/influxdata/telegraf/issues/467): Add option to disable statsd measurement name conversion.
+- [#534](https://github.com/influxdata/telegraf/pull/534): NSQ input plugin. Thanks @allingeek!
+- [#494](https://github.com/influxdata/telegraf/pull/494): Graphite output plugin. Thanks @titilambert!
+- AMQP SSL support. Thanks @ekini!
+- [#539](https://github.com/influxdata/telegraf/pull/539): Reload config on SIGHUP. Thanks @titilambert!
+- [#522](https://github.com/influxdata/telegraf/pull/522): Phusion passenger input plugin. Thanks @kureikain!
+- [#541](https://github.com/influxdata/telegraf/pull/541): Kafka output TLS cert support. Thanks @Ormod!
+- [#551](https://github.com/influxdata/telegraf/pull/551): Statsd UDP read packet size now defaults to 1500 bytes, and is configurable.
+- [#552](https://github.com/influxdata/telegraf/pull/552): Support for collection interval jittering.
+- [#484](https://github.com/influxdata/telegraf/issues/484): Include usage percent with procstat metrics.
+- [#553](https://github.com/influxdata/telegraf/pull/553): Amazon CloudWatch output. thanks @skwong2!
+- [#503](https://github.com/influxdata/telegraf/pull/503): Support docker endpoint configuration.
+- [#563](https://github.com/influxdata/telegraf/pull/563): Docker plugin overhaul.
+- [#285](https://github.com/influxdata/telegraf/issues/285): Fixed-size buffer of points.
+- [#546](https://github.com/influxdata/telegraf/pull/546): SNMP Input plugin. Thanks @titilambert!
+- [#589](https://github.com/influxdata/telegraf/pull/589): Microsoft SQL Server input plugin. Thanks @zensqlmonitor!
+- [#573](https://github.com/influxdata/telegraf/pull/573): Github webhooks consumer input. Thanks @jackzampolin!
+- [#471](https://github.com/influxdata/telegraf/pull/471): httpjson request headers. Thanks @asosso!
+
+### Bugfixes
+- [#506](https://github.com/influxdata/telegraf/pull/506): Ping input doesn't return response time metric when timeout. Thanks @titilambert!
+- [#508](https://github.com/influxdata/telegraf/pull/508): Fix prometheus cardinality issue with the `net` plugin
+- [#499](https://github.com/influxdata/telegraf/issues/499) & [#502](https://github.com/influxdata/telegraf/issues/502): php fpm unix socket and other fixes, thanks @kureikain!
+- [#543](https://github.com/influxdata/telegraf/issues/543): Statsd Packet size sometimes truncated.
+- [#440](https://github.com/influxdata/telegraf/issues/440): Don't query filtered devices for disk stats.
+- [#463](https://github.com/influxdata/telegraf/issues/463): Docker plugin not working on AWS Linux
+- [#568](https://github.com/influxdata/telegraf/issues/568): Multiple output race condition.
+- [#585](https://github.com/influxdata/telegraf/pull/585): Log stack trace and continue on Telegraf panic. Thanks @wutaizeng!
+
+## v0.10.0 [2016-01-12]
+
+### Release Notes
+- Linux packages have been taken out of `opt`, the binary is now in `/usr/bin`
+and configuration files are in `/etc/telegraf`
+- **breaking change** `plugins` have been renamed to `inputs`. This was done because
+`plugins` is too generic, as there are now also "output plugins", and will likely
+be "aggregator plugins" and "filter plugins" in the future. Additionally,
+`inputs/` and `outputs/` directories have been placed in the root-level `plugins/`
+directory.
+- **breaking change** the `io` plugin has been renamed `diskio`
+- **breaking change** plugin measurements aggregated into a single measurement.
+- **breaking change** `jolokia` plugin: must use global tag/drop/pass parameters
+for configuration.
+- **breaking change** `twemproxy` plugin: `prefix` option removed.
+- **breaking change** `procstat` cpu measurements are now prepended with `cpu_time_`
+instead of only `cpu_`
+- **breaking change** some command-line flags have been renamed to separate words.
+`-configdirectory` -> `-config-directory`, `-filter` -> `-input-filter`,
+`-outputfilter` -> `-output-filter`
+- The prometheus plugin schema has not been changed (measurements have not been
+aggregated).
+
+### Packaging change note:
+
+RHEL/CentOS users upgrading from 0.2.x to 0.10.0 will probably have their
+configurations overwritten by the upgrade. There is a backup stored at
+/etc/telegraf/telegraf.conf.$(date +%s).backup.
+
+### Features
+- Plugin measurements aggregated into a single measurement.
+- Added ability to specify per-plugin tags
+- Added ability to specify per-plugin measurement suffix and prefix.
+(`name_prefix` and `name_suffix`)
+- Added ability to override base plugin measurement name. (`name_override`)
+
+### Bugfixes
+
 ## v0.2.5 [unreleased]

 ### Features
- [#427](https://github.com/influxdb/telegraf/pull/427): zfs plugin: pool stats added. Thanks @allenpetersen!
- [#428](https://github.com/influxdb/telegraf/pull/428): Amazon Kinesis output. Thanks @jimmystewpot!
- [#449](https://github.com/influxdb/telegraf/pull/449): influxdb plugin, thanks @mark-rushakoff
+- [#427](https://github.com/influxdata/telegraf/pull/427): zfs plugin: pool stats added. Thanks @allenpetersen!
+- [#428](https://github.com/influxdata/telegraf/pull/428): Amazon Kinesis output. Thanks @jimmystewpot!
+- [#449](https://github.com/influxdata/telegraf/pull/449): influxdb plugin, thanks @mark-rushakoff

 ### Bugfixes
- [#430](https://github.com/influxdb/telegraf/issues/430): Network statistics removed in elasticsearch 2.1. Thanks @jipperinbham!
- [#452](https://github.com/influxdb/telegraf/issues/452): Elasticsearch open file handles error. Thanks @jipperinbham!
+- [#430](https://github.com/influxdata/telegraf/issues/430): Network statistics removed in elasticsearch 2.1. Thanks @jipperinbham!
+- [#452](https://github.com/influxdata/telegraf/issues/452): Elasticsearch open file handles error. Thanks @jipperinbham!

 ## v0.2.4 [2015-12-08]

 ### Features
- [#412](https://github.com/influxdb/telegraf/pull/412): Additional memcached stats. Thanks @mgresser!
- [#410](https://github.com/influxdb/telegraf/pull/410): Additional redis metrics. Thanks @vlaadbrain!
- [#414](https://github.com/influxdb/telegraf/issues/414): Jolokia plugin auth parameters
- [#415](https://github.com/influxdb/telegraf/issues/415): memcached plugin: support unix sockets
- [#418](https://github.com/influxdb/telegraf/pull/418): memcached plugin additional unit tests.
- [#408](https://github.com/influxdb/telegraf/pull/408): MailChimp plugin.
- [#382](https://github.com/influxdb/telegraf/pull/382): Add system wide network protocol stats to `net` plugin.
- [#401](https://github.com/influxdb/telegraf/pull/401): Support pass/drop/tagpass/tagdrop for outputs. Thanks @oldmantaiter!
+- [#412](https://github.com/influxdata/telegraf/pull/412): Additional memcached stats. Thanks @mgresser!
+- [#410](https://github.com/influxdata/telegraf/pull/410): Additional redis metrics. Thanks @vlaadbrain!
+- [#414](https://github.com/influxdata/telegraf/issues/414): Jolokia plugin auth parameters
+- [#415](https://github.com/influxdata/telegraf/issues/415): memcached plugin: support unix sockets
+- [#418](https://github.com/influxdata/telegraf/pull/418): memcached plugin additional unit tests.
+- [#408](https://github.com/influxdata/telegraf/pull/408): MailChimp plugin.
+- [#382](https://github.com/influxdata/telegraf/pull/382): Add system wide network protocol stats to `net` plugin.
+- [#401](https://github.com/influxdata/telegraf/pull/401): Support pass/drop/tagpass/tagdrop for outputs. Thanks @oldmantaiter!

 ### Bugfixes
- [#405](https://github.com/influxdb/telegraf/issues/405): Prometheus output cardinality issue
- [#388](https://github.com/influxdb/telegraf/issues/388): Fix collection hangup when cpu times decrement.
+- [#405](https://github.com/influxdata/telegraf/issues/405): Prometheus output cardinality issue
+- [#388](https://github.com/influxdata/telegraf/issues/388): Fix collection hangup when cpu times decrement.

 ## v0.2.3 [2015-11-30]

@@ -38,11 +299,11 @@ functional.
 same type can be specified, like this:

 ```
-[[plugins.cpu]]
+[[inputs.cpu]]
  percpu = false
  totalcpu = true

-[[plugins.cpu]]
+[[inputs.cpu]]
  percpu = true
  totalcpu = false
  drop = ["cpu_time"]
@@ -52,15 +313,15 @@ same type can be specified, like this:
 - Aerospike plugin: tag changed from `host` -> `aerospike_host`

 ### Features
- [#379](https://github.com/influxdb/telegraf/pull/379): Riemann output, thanks @allenj!
- [#375](https://github.com/influxdb/telegraf/pull/375): kafka_consumer service plugin.
- [#392](https://github.com/influxdb/telegraf/pull/392): Procstat plugin can now accept pgrep -f pattern, thanks @ecarreras!
- [#383](https://github.com/influxdb/telegraf/pull/383): Specify plugins as a list.
- [#354](https://github.com/influxdb/telegraf/pull/354): Add ability to specify multiple metrics in one statsd line. Thanks @MerlinDMC!
+- [#379](https://github.com/influxdata/telegraf/pull/379): Riemann output, thanks @allenj!
+- [#375](https://github.com/influxdata/telegraf/pull/375): kafka_consumer service plugin.
+- [#392](https://github.com/influxdata/telegraf/pull/392): Procstat plugin can now accept pgrep -f pattern, thanks @ecarreras!
+- [#383](https://github.com/influxdata/telegraf/pull/383): Specify plugins as a list.
+- [#354](https://github.com/influxdata/telegraf/pull/354): Add ability to specify multiple metrics in one statsd line. Thanks @MerlinDMC!

 ### Bugfixes
- [#371](https://github.com/influxdb/telegraf/issues/371): Kafka consumer plugin not functioning.
- [#389](https://github.com/influxdb/telegraf/issues/389): NaN value panic
+- [#371](https://github.com/influxdata/telegraf/issues/371): Kafka consumer plugin not functioning.
+- [#389](https://github.com/influxdata/telegraf/issues/389): NaN value panic

 ## v0.2.2 [2015-11-18]

@@ -69,7 +330,7 @@ same type can be specified, like this:
 lists of servers/URLs. 0.2.2 is being released solely to fix that bug

 ### Bugfixes
- [#377](https://github.com/influxdb/telegraf/pull/377): Fix for duplicate slices in plugins.
+- [#377](https://github.com/influxdata/telegraf/pull/377): Fix for duplicate slices in inputs.

 ## v0.2.1 [2015-11-16]

@@ -86,22 +347,22 @@ changed to just run docker commands in the Makefile. See `make docker-run` and
 same type.

 ### Features
- [#325](https://github.com/influxdb/telegraf/pull/325): NSQ output. Thanks @jrxFive!
- [#318](https://github.com/influxdb/telegraf/pull/318): Prometheus output. Thanks @oldmantaiter!
- [#338](https://github.com/influxdb/telegraf/pull/338): Restart Telegraf on package upgrade. Thanks @linsomniac!
- [#337](https://github.com/influxdb/telegraf/pull/337): Jolokia plugin, thanks @saiello!
- [#350](https://github.com/influxdb/telegraf/pull/350): Amon output.
- [#365](https://github.com/influxdb/telegraf/pull/365): Twemproxy plugin by @codeb2cc
- [#317](https://github.com/influxdb/telegraf/issues/317): ZFS plugin, thanks @cornerot!
- [#364](https://github.com/influxdb/telegraf/pull/364): Support InfluxDB UDP output.
- [#370](https://github.com/influxdb/telegraf/pull/370): Support specifying multiple outputs, as lists.
- [#372](https://github.com/influxdb/telegraf/pull/372): Remove gosigar and update go-dockerclient for FreeBSD support. Thanks @MerlinDMC!
+- [#325](https://github.com/influxdata/telegraf/pull/325): NSQ output. Thanks @jrxFive!
+- [#318](https://github.com/influxdata/telegraf/pull/318): Prometheus output. Thanks @oldmantaiter!
+- [#338](https://github.com/influxdata/telegraf/pull/338): Restart Telegraf on package upgrade. Thanks @linsomniac!
+- [#337](https://github.com/influxdata/telegraf/pull/337): Jolokia plugin, thanks @saiello!
+- [#350](https://github.com/influxdata/telegraf/pull/350): Amon output.
+- [#365](https://github.com/influxdata/telegraf/pull/365): Twemproxy plugin by @codeb2cc
+- [#317](https://github.com/influxdata/telegraf/issues/317): ZFS plugin, thanks @cornerot!
+- [#364](https://github.com/influxdata/telegraf/pull/364): Support InfluxDB UDP output.
+- [#370](https://github.com/influxdata/telegraf/pull/370): Support specifying multiple outputs, as lists.
+- [#372](https://github.com/influxdata/telegraf/pull/372): Remove gosigar and update go-dockerclient for FreeBSD support. Thanks @MerlinDMC!

 ### Bugfixes
- [#331](https://github.com/influxdb/telegraf/pull/331): Dont overwrite host tag in redis plugin.
- [#336](https://github.com/influxdb/telegraf/pull/336): Mongodb plugin should take 2 measurements.
- [#351](https://github.com/influxdb/telegraf/issues/317): Fix continual "CREATE DATABASE" in writes
- [#360](https://github.com/influxdb/telegraf/pull/360): Apply prefix before ShouldPass check. Thanks @sotfo!
+- [#331](https://github.com/influxdata/telegraf/pull/331): Dont overwrite host tag in redis plugin.
+- [#336](https://github.com/influxdata/telegraf/pull/336): Mongodb plugin should take 2 measurements.
+- [#351](https://github.com/influxdata/telegraf/issues/317): Fix continual "CREATE DATABASE" in writes
+- [#360](https://github.com/influxdata/telegraf/pull/360): Apply prefix before ShouldPass check. Thanks @sotfo!

 ## v0.2.0 [2015-10-27]

@@ -122,38 +383,38 @@ be controlled via the `round_interval` and `flush_jitter` config options.
 - Telegraf will now retry metric flushes twice

 ### Features
- [#205](https://github.com/influxdb/telegraf/issues/205): Include per-db redis keyspace info
- [#226](https://github.com/influxdb/telegraf/pull/226): Add timestamps to points in Kafka/AMQP outputs. Thanks @ekini
- [#90](https://github.com/influxdb/telegraf/issues/90): Add Docker labels to tags in docker plugin
- [#223](https://github.com/influxdb/telegraf/pull/223): Add port tag to nginx plugin. Thanks @neezgee!
- [#227](https://github.com/influxdb/telegraf/pull/227): Add command intervals to exec plugin. Thanks @jpalay!
- [#241](https://github.com/influxdb/telegraf/pull/241): MQTT Output. Thanks @shirou!
+- [#205](https://github.com/influxdata/telegraf/issues/205): Include per-db redis keyspace info
+- [#226](https://github.com/influxdata/telegraf/pull/226): Add timestamps to points in Kafka/AMQP outputs. Thanks @ekini
+- [#90](https://github.com/influxdata/telegraf/issues/90): Add Docker labels to tags in docker plugin
+- [#223](https://github.com/influxdata/telegraf/pull/223): Add port tag to nginx plugin. Thanks @neezgee!
+- [#227](https://github.com/influxdata/telegraf/pull/227): Add command intervals to exec plugin. Thanks @jpalay!
+- [#241](https://github.com/influxdata/telegraf/pull/241): MQTT Output. Thanks @shirou!
 - Memory plugin: cached and buffered measurements re-added
 - Logging: additional logging for each collection interval, track the number
-of metrics collected and from how many plugins.
- [#240](https://github.com/influxdb/telegraf/pull/240): procstat plugin, thanks @ranjib!
- [#244](https://github.com/influxdb/telegraf/pull/244): netstat plugin, thanks @shirou!
- [#262](https://github.com/influxdb/telegraf/pull/262): zookeeper plugin, thanks @jrxFive!
- [#237](https://github.com/influxdb/telegraf/pull/237): statsd service plugin, thanks @sparrc
- [#273](https://github.com/influxdb/telegraf/pull/273): puppet agent plugin, thats @jrxFive!
- [#280](https://github.com/influxdb/telegraf/issues/280): Use InfluxDB client v2.
- [#281](https://github.com/influxdb/telegraf/issues/281): Eliminate need to deep copy Batch Points.
- [#286](https://github.com/influxdb/telegraf/issues/286): bcache plugin, thanks @cornerot!
- [#287](https://github.com/influxdb/telegraf/issues/287): Batch AMQP output, thanks @ekini!
- [#301](https://github.com/influxdb/telegraf/issues/301): Collect on even intervals
- [#298](https://github.com/influxdb/telegraf/pull/298): Support retrying output writes
- [#300](https://github.com/influxdb/telegraf/issues/300): aerospike plugin. Thanks @oldmantaiter!
- [#322](https://github.com/influxdb/telegraf/issues/322): Librato output. Thanks @jipperinbham!
+of metrics collected and from how many inputs.
+- [#240](https://github.com/influxdata/telegraf/pull/240): procstat plugin, thanks @ranjib!
+- [#244](https://github.com/influxdata/telegraf/pull/244): netstat plugin, thanks @shirou!
+- [#262](https://github.com/influxdata/telegraf/pull/262): zookeeper plugin, thanks @jrxFive!
+- [#237](https://github.com/influxdata/telegraf/pull/237): statsd service plugin, thanks @sparrc
+- [#273](https://github.com/influxdata/telegraf/pull/273): puppet agent plugin, thats @jrxFive!
+- [#280](https://github.com/influxdata/telegraf/issues/280): Use InfluxDB client v2.
+- [#281](https://github.com/influxdata/telegraf/issues/281): Eliminate need to deep copy Batch Points.
+- [#286](https://github.com/influxdata/telegraf/issues/286): bcache plugin, thanks @cornerot!
+- [#287](https://github.com/influxdata/telegraf/issues/287): Batch AMQP output, thanks @ekini!
+- [#301](https://github.com/influxdata/telegraf/issues/301): Collect on even intervals
+- [#298](https://github.com/influxdata/telegraf/pull/298): Support retrying output writes
+- [#300](https://github.com/influxdata/telegraf/issues/300): aerospike plugin. Thanks @oldmantaiter!
+- [#322](https://github.com/influxdata/telegraf/issues/322): Librato output. Thanks @jipperinbham!

 ### Bugfixes
- [#228](https://github.com/influxdb/telegraf/pull/228): New version of package will replace old one. Thanks @ekini!
- [#232](https://github.com/influxdb/telegraf/pull/232): Fix bashism run during deb package installation. Thanks @yankcrime!
- [#261](https://github.com/influxdb/telegraf/issues/260): RabbitMQ panics if wrong credentials given. Thanks @ekini!
- [#245](https://github.com/influxdb/telegraf/issues/245): Document Exec plugin example. Thanks @ekini!
- [#264](https://github.com/influxdb/telegraf/issues/264): logrotate config file fixes. Thanks @linsomniac!
- [#290](https://github.com/influxdb/telegraf/issues/290): Fix some plugins sending their values as strings.
- [#289](https://github.com/influxdb/telegraf/issues/289): Fix accumulator panic on nil tags.
- [#302](https://github.com/influxdb/telegraf/issues/302): Fix `[tags]` getting applied, thanks @gotyaoi!
+- [#228](https://github.com/influxdata/telegraf/pull/228): New version of package will replace old one. Thanks @ekini!
+- [#232](https://github.com/influxdata/telegraf/pull/232): Fix bashism run during deb package installation. Thanks @yankcrime!
+- [#261](https://github.com/influxdata/telegraf/issues/260): RabbitMQ panics if wrong credentials given. Thanks @ekini!
+- [#245](https://github.com/influxdata/telegraf/issues/245): Document Exec plugin example. Thanks @ekini!
+- [#264](https://github.com/influxdata/telegraf/issues/264): logrotate config file fixes. Thanks @linsomniac!
+- [#290](https://github.com/influxdata/telegraf/issues/290): Fix some plugins sending their values as strings.
+- [#289](https://github.com/influxdata/telegraf/issues/289): Fix accumulator panic on nil tags.
+- [#302](https://github.com/influxdata/telegraf/issues/302): Fix `[tags]` getting applied, thanks @gotyaoi!

 ## v0.1.9 [2015-09-22]

@@ -163,7 +424,7 @@ will still be backwards compatible if only `url` is specified.
 - The -test flag will now output two metric collections
 - Support for filtering telegraf outputs on the CLI -- Telegraf will now
 allow filtering of output sinks on the command-line using the `-outputfilter`
-flag, much like how the `-filter` flag works for plugins.
+flag, much like how the `-filter` flag works for inputs.
 - Support for filtering on config-file creation -- Telegraf now supports
 filtering to -sample-config command. You can now run
 `telegraf -sample-config -filter cpu -outputfilter influxdb` to get a config
@@ -179,27 +440,27 @@ have been renamed for consistency. Some measurements have also been removed from
 re-added in a "verbose" mode if there is demand for it.

 ### Features
- [#143](https://github.com/influxdb/telegraf/issues/143): InfluxDB clustering support
- [#181](https://github.com/influxdb/telegraf/issues/181): Makefile GOBIN support. Thanks @Vye!
- [#203](https://github.com/influxdb/telegraf/pull/200): AMQP output. Thanks @ekini!
- [#182](https://github.com/influxdb/telegraf/pull/182): OpenTSDB output. Thanks @rplessl!
- [#187](https://github.com/influxdb/telegraf/pull/187): Retry output sink connections on startup.
- [#220](https://github.com/influxdb/telegraf/pull/220): Add port tag to apache plugin. Thanks @neezgee!
- [#217](https://github.com/influxdb/telegraf/pull/217): Add filtering for output sinks
+- [#143](https://github.com/influxdata/telegraf/issues/143): InfluxDB clustering support
+- [#181](https://github.com/influxdata/telegraf/issues/181): Makefile GOBIN support. Thanks @Vye!
+- [#203](https://github.com/influxdata/telegraf/pull/200): AMQP output. Thanks @ekini!
+- [#182](https://github.com/influxdata/telegraf/pull/182): OpenTSDB output. Thanks @rplessl!
+- [#187](https://github.com/influxdata/telegraf/pull/187): Retry output sink connections on startup.
+- [#220](https://github.com/influxdata/telegraf/pull/220): Add port tag to apache plugin. Thanks @neezgee!
+- [#217](https://github.com/influxdata/telegraf/pull/217): Add filtering for output sinks
 and filtering when specifying a config file.

 ### Bugfixes
- [#170](https://github.com/influxdb/telegraf/issues/170): Systemd support
- [#175](https://github.com/influxdb/telegraf/issues/175): Set write precision before gathering metrics
- [#178](https://github.com/influxdb/telegraf/issues/178): redis plugin, multiple server thread hang bug
+- [#170](https://github.com/influxdata/telegraf/issues/170): Systemd support
+- [#175](https://github.com/influxdata/telegraf/issues/175): Set write precision before gathering metrics
+- [#178](https://github.com/influxdata/telegraf/issues/178): redis plugin, multiple server thread hang bug
 - Fix net plugin on darwin
- [#84](https://github.com/influxdb/telegraf/issues/84): Fix docker plugin on CentOS. Thanks @neezgee!
- [#189](https://github.com/influxdb/telegraf/pull/189): Fix mem_used_perc. Thanks @mced!
- [#192](https://github.com/influxdb/telegraf/issues/192): Increase compatibility of postgresql plugin. Now supports versions 8.1+
- [#203](https://github.com/influxdb/telegraf/issues/203): EL5 rpm support. Thanks @ekini!
- [#206](https://github.com/influxdb/telegraf/issues/206): CPU steal/guest values wrong on linux.
- [#212](https://github.com/influxdb/telegraf/issues/212): Add hashbang to postinstall script. Thanks @ekini!
- [#212](https://github.com/influxdb/telegraf/issues/212): Fix makefile warning. Thanks @ekini!
+- [#84](https://github.com/influxdata/telegraf/issues/84): Fix docker plugin on CentOS. Thanks @neezgee!
+- [#189](https://github.com/influxdata/telegraf/pull/189): Fix mem_used_perc. Thanks @mced!
+- [#192](https://github.com/influxdata/telegraf/issues/192): Increase compatibility of postgresql plugin. Now supports versions 8.1+
+- [#203](https://github.com/influxdata/telegraf/issues/203): EL5 rpm support. Thanks @ekini!
+- [#206](https://github.com/influxdata/telegraf/issues/206): CPU steal/guest values wrong on linux.
+- [#212](https://github.com/influxdata/telegraf/issues/212): Add hashbang to postinstall script. Thanks @ekini!
+- [#212](https://github.com/influxdata/telegraf/issues/212): Fix makefile warning. Thanks @ekini!

 ## v0.1.8 [2015-09-04]

@@ -208,106 +469,106 @@ and filtering when specifying a config file.
 - Now using Go 1.5 to build telegraf

 ### Features
- [#150](https://github.com/influxdb/telegraf/pull/150): Add Host Uptime metric to system plugin
- [#158](https://github.com/influxdb/telegraf/pull/158): Apache Plugin. Thanks @KPACHbIuLLIAnO4
- [#159](https://github.com/influxdb/telegraf/pull/159): Use second precision for InfluxDB writes
- [#165](https://github.com/influxdb/telegraf/pull/165): Add additional metrics to mysql plugin. Thanks @nickscript0
- [#162](https://github.com/influxdb/telegraf/pull/162): Write UTC by default, provide option
- [#166](https://github.com/influxdb/telegraf/pull/166): Upload binaries to S3
- [#169](https://github.com/influxdb/telegraf/pull/169): Ping plugin
+- [#150](https://github.com/influxdata/telegraf/pull/150): Add Host Uptime metric to system plugin
+- [#158](https://github.com/influxdata/telegraf/pull/158): Apache Plugin. Thanks @KPACHbIuLLIAnO4
+- [#159](https://github.com/influxdata/telegraf/pull/159): Use second precision for InfluxDB writes
+- [#165](https://github.com/influxdata/telegraf/pull/165): Add additional metrics to mysql plugin. Thanks @nickscript0
+- [#162](https://github.com/influxdata/telegraf/pull/162): Write UTC by default, provide option
+- [#166](https://github.com/influxdata/telegraf/pull/166): Upload binaries to S3
+- [#169](https://github.com/influxdata/telegraf/pull/169): Ping plugin

 ### Bugfixes

 ## v0.1.7 [2015-08-28]

 ### Features
- [#38](https://github.com/influxdb/telegraf/pull/38): Kafka output producer.
- [#133](https://github.com/influxdb/telegraf/pull/133): Add plugin.Gather error logging. Thanks @nickscript0!
- [#136](https://github.com/influxdb/telegraf/issues/136): Add a -usage flag for printing usage of a single plugin.
- [#137](https://github.com/influxdb/telegraf/issues/137): Memcached: fix when a value contains a space
- [#138](https://github.com/influxdb/telegraf/issues/138): MySQL server address tag.
- [#142](https://github.com/influxdb/telegraf/pull/142): Add Description and SampleConfig funcs to output interface
+- [#38](https://github.com/influxdata/telegraf/pull/38): Kafka output producer.
+- [#133](https://github.com/influxdata/telegraf/pull/133): Add plugin.Gather error logging. Thanks @nickscript0!
+- [#136](https://github.com/influxdata/telegraf/issues/136): Add a -usage flag for printing usage of a single plugin.
+- [#137](https://github.com/influxdata/telegraf/issues/137): Memcached: fix when a value contains a space
+- [#138](https://github.com/influxdata/telegraf/issues/138): MySQL server address tag.
+- [#142](https://github.com/influxdata/telegraf/pull/142): Add Description and SampleConfig funcs to output interface
 - Indent the toml config file for readability

 ### Bugfixes
- [#128](https://github.com/influxdb/telegraf/issues/128): system_load measurement missing.
- [#129](https://github.com/influxdb/telegraf/issues/129): Latest pkg url fix.
- [#131](https://github.com/influxdb/telegraf/issues/131): Fix memory reporting on linux & darwin. Thanks @subhachandrachandra!
- [#140](https://github.com/influxdb/telegraf/issues/140): Memory plugin prec->perc typo fix. Thanks @brunoqc!
+- [#128](https://github.com/influxdata/telegraf/issues/128): system_load measurement missing.
+- [#129](https://github.com/influxdata/telegraf/issues/129): Latest pkg url fix.
+- [#131](https://github.com/influxdata/telegraf/issues/131): Fix memory reporting on linux & darwin. Thanks @subhachandrachandra!
+- [#140](https://github.com/influxdata/telegraf/issues/140): Memory plugin prec->perc typo fix. Thanks @brunoqc!

 ## v0.1.6 [2015-08-20]

 ### Features
- [#112](https://github.com/influxdb/telegraf/pull/112): Datadog output. Thanks @jipperinbham!
- [#116](https://github.com/influxdb/telegraf/pull/116): Use godep to vendor all dependencies
- [#120](https://github.com/influxdb/telegraf/pull/120): Httpjson plugin. Thanks @jpalay & @alvaromorales!
+- [#112](https://github.com/influxdata/telegraf/pull/112): Datadog output. Thanks @jipperinbham!
+- [#116](https://github.com/influxdata/telegraf/pull/116): Use godep to vendor all dependencies
+- [#120](https://github.com/influxdata/telegraf/pull/120): Httpjson plugin. Thanks @jpalay & @alvaromorales!

 ### Bugfixes
- [#113](https://github.com/influxdb/telegraf/issues/113): Update README with Telegraf/InfluxDB compatibility
- [#118](https://github.com/influxdb/telegraf/pull/118): Fix for disk usage stats in Windows. Thanks @srfraser!
- [#122](https://github.com/influxdb/telegraf/issues/122): Fix for DiskUsage segv fault. Thanks @srfraser!
- [#126](https://github.com/influxdb/telegraf/issues/126): Nginx plugin not catching net.SplitHostPort error
+- [#113](https://github.com/influxdata/telegraf/issues/113): Update README with Telegraf/InfluxDB compatibility
+- [#118](https://github.com/influxdata/telegraf/pull/118): Fix for disk usage stats in Windows. Thanks @srfraser!
+- [#122](https://github.com/influxdata/telegraf/issues/122): Fix for DiskUsage segv fault. Thanks @srfraser!
+- [#126](https://github.com/influxdata/telegraf/issues/126): Nginx plugin not catching net.SplitHostPort error

 ## v0.1.5 [2015-08-13]

 ### Features
- [#54](https://github.com/influxdb/telegraf/pull/54): MongoDB plugin. Thanks @jipperinbham!
- [#55](https://github.com/influxdb/telegraf/pull/55): Elasticsearch plugin. Thanks @brocaar!
- [#71](https://github.com/influxdb/telegraf/pull/71): HAProxy plugin. Thanks @kureikain!
- [#72](https://github.com/influxdb/telegraf/pull/72): Adding TokuDB metrics to MySQL. Thanks vadimtk!
- [#73](https://github.com/influxdb/telegraf/pull/73): RabbitMQ plugin. Thanks @ianunruh!
- [#77](https://github.com/influxdb/telegraf/issues/77): Automatically create database.
- [#79](https://github.com/influxdb/telegraf/pull/56): Nginx plugin. Thanks @codeb2cc!
- [#86](https://github.com/influxdb/telegraf/pull/86): Lustre2 plugin. Thanks srfraser!
- [#91](https://github.com/influxdb/telegraf/pull/91): Unit testing
- [#92](https://github.com/influxdb/telegraf/pull/92): Exec plugin. Thanks @alvaromorales!
- [#98](https://github.com/influxdb/telegraf/pull/98): LeoFS plugin. Thanks @mocchira!
- [#103](https://github.com/influxdb/telegraf/pull/103): Filter by metric tags. Thanks @srfraser!
- [#106](https://github.com/influxdb/telegraf/pull/106): Options to filter plugins on startup. Thanks @zepouet!
- [#107](https://github.com/influxdb/telegraf/pull/107): Multiple outputs beyong influxdb. Thanks @jipperinbham!
- [#108](https://github.com/influxdb/telegraf/issues/108): Support setting per-CPU and total-CPU gathering.
- [#111](https://github.com/influxdb/telegraf/pull/111): Report CPU Usage in cpu plugin. Thanks @jpalay!
+- [#54](https://github.com/influxdata/telegraf/pull/54): MongoDB plugin. Thanks @jipperinbham!
+- [#55](https://github.com/influxdata/telegraf/pull/55): Elasticsearch plugin. Thanks @brocaar!
+- [#71](https://github.com/influxdata/telegraf/pull/71): HAProxy plugin. Thanks @kureikain!
+- [#72](https://github.com/influxdata/telegraf/pull/72): Adding TokuDB metrics to MySQL. Thanks vadimtk!
+- [#73](https://github.com/influxdata/telegraf/pull/73): RabbitMQ plugin. Thanks @ianunruh!
+- [#77](https://github.com/influxdata/telegraf/issues/77): Automatically create database.
+- [#79](https://github.com/influxdata/telegraf/pull/56): Nginx plugin. Thanks @codeb2cc!
+- [#86](https://github.com/influxdata/telegraf/pull/86): Lustre2 plugin. Thanks srfraser!
+- [#91](https://github.com/influxdata/telegraf/pull/91): Unit testing
+- [#92](https://github.com/influxdata/telegraf/pull/92): Exec plugin. Thanks @alvaromorales!
+- [#98](https://github.com/influxdata/telegraf/pull/98): LeoFS plugin. Thanks @mocchira!
+- [#103](https://github.com/influxdata/telegraf/pull/103): Filter by metric tags. Thanks @srfraser!
+- [#106](https://github.com/influxdata/telegraf/pull/106): Options to filter plugins on startup. Thanks @zepouet!
+- [#107](https://github.com/influxdata/telegraf/pull/107): Multiple outputs beyong influxdb. Thanks @jipperinbham!
+- [#108](https://github.com/influxdata/telegraf/issues/108): Support setting per-CPU and total-CPU gathering.
+- [#111](https://github.com/influxdata/telegraf/pull/111): Report CPU Usage in cpu plugin. Thanks @jpalay!

 ### Bugfixes
- [#85](https://github.com/influxdb/telegraf/pull/85): Fix GetLocalHost testutil function for mac users
- [#89](https://github.com/influxdb/telegraf/pull/89): go fmt fixes
- [#94](https://github.com/influxdb/telegraf/pull/94): Fix for issue #93, explicitly call sarama.v1 -> sarama
- [#101](https://github.com/influxdb/telegraf/issues/101): switch back from master branch if building locally
- [#99](https://github.com/influxdb/telegraf/issues/99): update integer output to new InfluxDB line protocol format
+- [#85](https://github.com/influxdata/telegraf/pull/85): Fix GetLocalHost testutil function for mac users
+- [#89](https://github.com/influxdata/telegraf/pull/89): go fmt fixes
+- [#94](https://github.com/influxdata/telegraf/pull/94): Fix for issue #93, explicitly call sarama.v1 -> sarama
+- [#101](https://github.com/influxdata/telegraf/issues/101): switch back from master branch if building locally
+- [#99](https://github.com/influxdata/telegraf/issues/99): update integer output to new InfluxDB line protocol format

 ## v0.1.4 [2015-07-09]

 ### Features
- [#56](https://github.com/influxdb/telegraf/pull/56): Update README for Kafka plugin. Thanks @EmilS!
+- [#56](https://github.com/influxdata/telegraf/pull/56): Update README for Kafka plugin. Thanks @EmilS!

 ### Bugfixes
- [#50](https://github.com/influxdb/telegraf/pull/50): Fix init.sh script to use telegraf directory. Thanks @jseriff!
- [#52](https://github.com/influxdb/telegraf/pull/52): Update CHANGELOG to reference updated directory. Thanks @benfb!
+- [#50](https://github.com/influxdata/telegraf/pull/50): Fix init.sh script to use telegraf directory. Thanks @jseriff!
+- [#52](https://github.com/influxdata/telegraf/pull/52): Update CHANGELOG to reference updated directory. Thanks @benfb!

 ## v0.1.3 [2015-07-05]

 ### Features
- [#35](https://github.com/influxdb/telegraf/pull/35): Add Kafka plugin. Thanks @EmilS!
- [#47](https://github.com/influxdb/telegraf/pull/47): Add RethinkDB plugin. Thanks @jipperinbham!
+- [#35](https://github.com/influxdata/telegraf/pull/35): Add Kafka plugin. Thanks @EmilS!
+- [#47](https://github.com/influxdata/telegraf/pull/47): Add RethinkDB plugin. Thanks @jipperinbham!

 ### Bugfixes
- [#45](https://github.com/influxdb/telegraf/pull/45): Skip disk tags that don't have a value. Thanks @jhofeditz!
- [#43](https://github.com/influxdb/telegraf/pull/43): Fix bug in MySQL plugin. Thanks @marcosnils!
+- [#45](https://github.com/influxdata/telegraf/pull/45): Skip disk tags that don't have a value. Thanks @jhofeditz!
+- [#43](https://github.com/influxdata/telegraf/pull/43): Fix bug in MySQL plugin. Thanks @marcosnils!

 ## v0.1.2 [2015-07-01]

 ### Features
- [#12](https://github.com/influxdb/telegraf/pull/12): Add Linux/ARM to the list of built binaries. Thanks @voxxit!
- [#14](https://github.com/influxdb/telegraf/pull/14): Clarify the S3 buckets that Telegraf is pushed to.
- [#16](https://github.com/influxdb/telegraf/pull/16): Convert Redis to use URI, support Redis AUTH. Thanks @jipperinbham!
- [#21](https://github.com/influxdb/telegraf/pull/21): Add memcached plugin. Thanks @Yukki!
+- [#12](https://github.com/influxdata/telegraf/pull/12): Add Linux/ARM to the list of built binaries. Thanks @voxxit!
+- [#14](https://github.com/influxdata/telegraf/pull/14): Clarify the S3 buckets that Telegraf is pushed to.
+- [#16](https://github.com/influxdata/telegraf/pull/16): Convert Redis to use URI, support Redis AUTH. Thanks @jipperinbham!
+- [#21](https://github.com/influxdata/telegraf/pull/21): Add memcached plugin. Thanks @Yukki!

 ### Bugfixes
- [#13](https://github.com/influxdb/telegraf/pull/13): Fix the packaging script.
- [#19](https://github.com/influxdb/telegraf/pull/19): Add host name to metric tags. Thanks @sherifzain!
- [#20](https://github.com/influxdb/telegraf/pull/20): Fix race condition with accumulator mutex. Thanks @nkatsaros!
- [#23](https://github.com/influxdb/telegraf/pull/23): Change name of folder for packages. Thanks @colinrymer!
- [#32](https://github.com/influxdb/telegraf/pull/32): Fix spelling of memoory -> memory. Thanks @tylernisonoff!
+- [#13](https://github.com/influxdata/telegraf/pull/13): Fix the packaging script.
+- [#19](https://github.com/influxdata/telegraf/pull/19): Add host name to metric tags. Thanks @sherifzain!
+- [#20](https://github.com/influxdata/telegraf/pull/20): Fix race condition with accumulator mutex. Thanks @nkatsaros!
+- [#23](https://github.com/influxdata/telegraf/pull/23): Change name of folder for packages. Thanks @colinrymer!
+- [#32](https://github.com/influxdata/telegraf/pull/32): Fix spelling of memoory -> memory. Thanks @tylernisonoff!

 ## v0.1.1 [2015-06-19]

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,103 +1,72 @@
+## Steps for Contributing:
+
+1. [Sign the CLA](http://influxdb.com/community/cla.html)
+1. Make changes or write plugin (see below for details)
+1. Add your plugin to `plugins/inputs/all/all.go` or `plugins/outputs/all/all.go`
+1. If your plugin requires a new Go package,
+[add it](https://github.com/influxdata/telegraf/blob/master/CONTRIBUTING.md#adding-a-dependency)
+1. Write a README for your plugin, if it's an input plugin, it should be structured
+like the [input example here](https://github.com/influxdata/telegraf/blob/master/plugins/inputs/EXAMPLE_README.md).
+Output plugins READMEs are less structured,
+but any information you can provide on how the data will look is appreciated.
+See the [OpenTSDB output](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/opentsdb)
+for a good example.
+
+## GoDoc
+
+Public interfaces for inputs, outputs, metrics, and the accumulator can be found
+on the GoDoc
+
+[![GoDoc](https://godoc.org/github.com/influxdata/telegraf?status.svg)](https://godoc.org/github.com/influxdata/telegraf)
+
 ## Sign the CLA

 Before we can merge a pull request, you will need to sign the CLA,
 which can be found [on our website](http://influxdb.com/community/cla.html)

-## Plugins
+## Adding a dependency

-This section is for developers who want to create new collection plugins.
+Assuming you can already build the project, run these in the telegraf directory:
+
+1. `go get github.com/sparrc/gdm`
+1. `gdm restore`
+1. `gdm save`
+
+## Input Plugins
+
+This section is for developers who want to create new collection inputs.
 Telegraf is entirely plugin driven. This interface allows for operators to
-pick and chose what is gathered as well as makes it easy for developers
+pick and chose what is gathered and makes it easy for developers
 to create new ways of generating metrics.

 Plugin authorship is kept as simple as possible to promote people to develop
-and submit new plugins.
+and submit new inputs.

-### Plugin Guidelines
+### Input Plugin Guidelines

-* A plugin must conform to the `plugins.Plugin` interface.
-* Each generated metric automatically has the name of the plugin that generated
-it prepended. This is to keep plugins honest.
-* Plugins should call `plugins.Add` in their `init` function to register themselves.
+* A plugin must conform to the `telegraf.Input` interface.
+* Input Plugins should call `inputs.Add` in their `init` function to register themselves.
 See below for a quick example.
-* To be available within Telegraf itself, plugins must add themselves to the
-`github.com/influxdb/telegraf/plugins/all/all.go` file.
+* Input Plugins must be added to the
+`github.com/influxdata/telegraf/plugins/inputs/all/all.go` file.
 * The `SampleConfig` function should return valid toml that describes how the
 plugin can be configured. This is include in `telegraf -sample-config`.
 * The `Description` function should say in one line what this plugin does.

-### Plugin interface
+Let's say you've written a plugin that emits metrics about processes on the
+current host.

-```go
-type Plugin interface {
-    SampleConfig() string
-    Description() string
-    Gather(Accumulator) error
-}
-
-type Accumulator interface {
-    Add(measurement string,
-        value interface{},
-        tags map[string]string,
-        timestamp ...time.Time)
-    AddFields(measurement string,
-        fields map[string]interface{},
-        tags map[string]string,
-        timestamp ...time.Time)
-}
-```
-
-### Accumulator
-
-The way that a plugin emits metrics is by interacting with the Accumulator.
-
-The `Add` function takes 3 arguments:
-* **measurement**: A string description of the metric. For instance `bytes_read` or `faults`.
-* **value**: A value for the metric. This accepts 5 different types of value:
-  * **int**: The most common type. All int types are accepted but favor using `int64`
-  Useful for counters, etc.
-  * **float**: Favor `float64`, useful for gauges, percentages, etc.
-  * **bool**: `true` or `false`, useful to indicate the presence of a state. `light_on`, etc.
-  * **string**: Typically used to indicate a message, or some kind of freeform information.
-  * **time.Time**: Useful for indicating when a state last occurred, for instance `light_on_since`.
-* **tags**: This is a map of strings to strings to describe the where or who
-about the metric. For instance, the `net` plugin adds a tag named `"interface"`
-set to the name of the network interface, like `"eth0"`.
-
-The `AddFieldsWithTime` allows multiple values for a point to be passed. The values
-used are the same type profile as **value** above. The **timestamp** argument
-allows a point to be registered as having occurred at an arbitrary time.
-
-Let's say you've written a plugin that emits metrics about processes on the current host.
-
-```go
-
-type Process struct {
-    CPUTime float64
-    MemoryBytes int64
-    PID int
-}
-
-func Gather(acc plugins.Accumulator) error {
-    for _, process := range system.Processes() {
-        tags := map[string]string {
-            "pid": fmt.Sprintf("%d", process.Pid),
-        }
-
-        acc.Add("cpu", process.CPUTime, tags, time.Now())
-        acc.Add("memory", process.MemoryBytes, tags, time.Now())
-    }
-}
-```
-
-### Plugin Example
+### Input Plugin Example

 ```go
 package simple

 // simple.go

-import "github.com/influxdb/telegraf/plugins"
+import (
+    "github.com/influxdata/telegraf"
+    "github.com/influxdata/telegraf/plugins/inputs"
+)

 type Simple struct {
    Ok bool
@@ -111,7 +80,7 @@ func (s *Simple) SampleConfig() string {
    return "ok = true # indicate if everything is fine"
 }

-func (s *Simple) Gather(acc plugins.Accumulator) error {
+func (s *Simple) Gather(acc telegraf.Accumulator) error {
    if s.Ok {
        acc.Add("state", "pretty good", nil)
    } else {
@@ -122,19 +91,65 @@ func (s *Simple) Gather(acc plugins.Accumulator) error {
 }

 func init() {
-    plugins.Add("simple", func() plugins.Plugin { return &Simple{} })
+    inputs.Add("simple", func() telegraf.Input { return &Simple{} })
 }
 ```

-## Service Plugins
+## Input Plugins Accepting Arbitrary Data Formats
+
+Some input plugins (such as
+[exec](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/exec))
+accept arbitrary input data formats. An overview of these data formats can
+be found
+[here](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md).
+
+In order to enable this, you must specify a `SetParser(parser parsers.Parser)`
+function on the plugin object (see the exec plugin for an example), as well as
+defining `parser` as a field of the object.
+
+You can then utilize the parser internally in your plugin, parsing data as you
+see fit. Telegraf's configuration layer will take care of instantiating and
+creating the `Parser` object.
+
+You should also add the following to your SampleConfig() return:
+
+```toml
+  ## Data format to consume. This can be "json", "influx" or "graphite"
+  ## 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"
+```
+
+Below is the `Parser` interface.
+
+```go
+// Parser is an interface defining functions that a parser plugin must satisfy.
+type Parser interface {
+    // Parse takes a byte buffer separated by newlines
+    // ie, `cpu.usage.idle 90\ncpu.usage.busy 10`
+    // and parses it into telegraf metrics
+    Parse(buf []byte) ([]telegraf.Metric, error)
+
+    // ParseLine takes a single string metric
+    // ie, "cpu.usage.idle 90"
+    // and parses it into a telegraf metric.
+    ParseLine(line string) (telegraf.Metric, error)
+}
+```
+
+And you can view the code
+[here.](https://github.com/influxdata/telegraf/blob/henrypfhu-master/plugins/parsers/registry.go)
+
+## Service Input Plugins

 This section is for developers who want to create new "service" collection
-plugins. A service plugin differs from a regular plugin in that it operates
+inputs. A service plugin differs from a regular plugin in that it operates
 a background service while Telegraf is running. One example would be the `statsd`
 plugin, which operates a statsd server.

-Service Plugins are substantially more complicated than a regular plugin, as they
-will require threads and locks to verify data integrity. Service Plugins should
+Service Input Plugins are substantially more complicated than a regular plugin, as they
+will require threads and locks to verify data integrity. Service Input Plugins should
 be avoided unless there is no way to create their behavior with a regular plugin.

 Their interface is quite similar to a regular plugin, with the addition of `Start()`
@@ -143,49 +158,25 @@ and `Stop()` methods.
 ### Service Plugin Guidelines

 * Same as the `Plugin` guidelines, except that they must conform to the
-`plugins.ServicePlugin` interface.
+`inputs.ServiceInput` interface.

-### Service Plugin interface
-
-```go
-type ServicePlugin interface {
-    SampleConfig() string
-    Description() string
-    Gather(Accumulator) error
-    Start() error
-    Stop()
-}
-```
-
-## Outputs
+## Output Plugins

 This section is for developers who want to create a new output sink. Outputs
 are created in a similar manner as collection plugins, and their interface has
 similar constructs.

-### Output Guidelines
+### Output Plugin Guidelines

 * An output must conform to the `outputs.Output` interface.
 * Outputs should call `outputs.Add` in their `init` function to register themselves.
 See below for a quick example.
 * To be available within Telegraf itself, plugins must add themselves to the
-`github.com/influxdb/telegraf/outputs/all/all.go` file.
+`github.com/influxdata/telegraf/plugins/outputs/all/all.go` file.
 * The `SampleConfig` function should return valid toml that describes how the
 output can be configured. This is include in `telegraf -sample-config`.
 * The `Description` function should say in one line what this output does.

-### Output interface
-
-```go
-type Output interface {
-    Connect() error
-    Close() error
-    Description() string
-    SampleConfig() string
-    Write(points []*client.Point) error
-}
-```
-
 ### Output Example

 ```go
@@ -193,7 +184,10 @@ package simpleoutput

 // simpleoutput.go

-import "github.com/influxdb/telegraf/outputs"
+import (
+    "github.com/influxdata/telegraf"
+    "github.com/influxdata/telegraf/plugins/outputs"
+)

 type Simple struct {
    Ok bool
@@ -217,7 +211,7 @@ func (s *Simple) Close() error {
    return nil
 }

-func (s *Simple) Write(points []*client.Point) error {
+func (s *Simple) Write(metrics []telegraf.Metric) error {
    for _, pt := range points {
        // write `pt` to the output sink here
    }
@@ -225,12 +219,39 @@ func (s *Simple) Write(points []*client.Point) error {
 }

 func init() {
-    outputs.Add("simpleoutput", func() outputs.Output { return &Simple{} })
+    outputs.Add("simpleoutput", func() telegraf.Output { return &Simple{} })
 }

 ```

-## Service Outputs
+## Output Plugins Writing Arbitrary Data Formats
+
+Some output plugins (such as
+[file](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/file))
+can write arbitrary output data formats. An overview of these data formats can
+be found
+[here](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md).
+
+In order to enable this, you must specify a
+`SetSerializer(serializer serializers.Serializer)`
+function on the plugin object (see the file plugin for an example), as well as
+defining `serializer` as a field of the object.
+
+You can then utilize the serializer internally in your plugin, serializing data
+before it's written. Telegraf's configuration layer will take care of
+instantiating and creating the `Serializer` object.
+
+You should also add the following to your SampleConfig() return:
+
+```toml
+  ## Data format to output. This can be "influx" or "graphite"
+  ## 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"
+```
+
+## Service Output Plugins

 This section is for developers who want to create new "service" output. A
 service output differs from a regular output in that it operates a background service
@@ -243,21 +264,7 @@ and `Stop()` methods.
 ### Service Output Guidelines

 * Same as the `Output` guidelines, except that they must conform to the
-`plugins.ServiceOutput` interface.
-
-### Service Output interface
-
-```go
-type ServiceOutput interface {
-    Connect() error
-    Close() error
-    Description() string
-    SampleConfig() string
-    Write(points []*client.Point) error
-    Start() error
-    Stop()
-}
-```
+`output.ServiceOutput` interface.

 ## Unit Tests

@@ -274,7 +281,7 @@ which would take some time to replicate.
 To overcome this situation we've decided to use docker containers to provide a
 fast and reproducible environment to test those services which require it.
 For other situations
-(i.e: https://github.com/influxdb/telegraf/blob/master/plugins/redis/redis_test.go )
+(i.e: https://github.com/influxdata/telegraf/blob/master/plugins/inputs/redis/redis_test.go)
 a simple mock will suffice.

 To execute Telegraf tests follow these simple steps:
--- a/79
+++ b/79
@@ -1,52 +1,53 @@
-git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git dbd8d5c40a582eb9adacde36b47932b3a3ad0034
-github.com/Shopify/sarama 159e9990b0796511607dd0d7aaa3eb37d1829d16
-github.com/Sirupsen/logrus 446d1c146faa8ed3f4218f056fcd165f6bcfda81
-github.com/amir/raidman 6a8e089bbe32e6b907feae5ba688841974b3c339
-github.com/armon/go-metrics 06b60999766278efd6d2b5d8418a58c3d5b99e87
-github.com/aws/aws-sdk-go 999b1591218c36d5050d1ba7266eba956e65965f
-github.com/beorn7/perks b965b613227fddccbfffe13eae360ed3fa822f8d
-github.com/boltdb/bolt b34b35ea8d06bb9ae69d9a349119252e4c1d8ee0
+github.com/Shopify/sarama 8aadb476e66ca998f2f6bb3c993e9a2daa3666b9
+github.com/Sirupsen/logrus 219c8cb75c258c552e999735be6df753ffc7afdc
+github.com/amir/raidman 53c1b967405155bfc8758557863bf2e14f814687
+github.com/aws/aws-sdk-go 13a12060f716145019378a10e2806c174356b857
+github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4
 github.com/cenkalti/backoff 4dc77674aceaabba2c7e3da25d4c823edfb73f99
-github.com/dancannon/gorethink a124c9663325ed9f7fb669d17c69961b59151e6e
+github.com/couchbase/go-couchbase cb664315a324d87d19c879d9cc67fda6be8c2ac1
+github.com/couchbase/gomemcached a5ea6356f648fec6ab89add00edd09151455b4b2
+github.com/couchbase/goutils 5823a0cbaaa9008406021dc5daf80125ea30bba6
+github.com/dancannon/gorethink e7cac92ea2bc52638791a021f212145acfedb1fc
 github.com/davecgh/go-spew 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d
-github.com/eapache/go-resiliency f341fb4dca45128e4aa86389fa6a675d55fe25e1
+github.com/eapache/go-resiliency b86b1ec0dd4209a588dc1285cdd471e73525c0b3
 github.com/eapache/queue ded5959c0d4e360646dc9e9908cff48666781367
-github.com/fsouza/go-dockerclient 7177a9e3543b0891a5d91dbf7051e0f71455c8ef
-github.com/go-ini/ini 9314fb0ef64171d6a3d0a4fa570dfa33441cba05
-github.com/go-sql-driver/mysql d512f204a577a4ab037a1816604c48c9c13210be
-github.com/gogo/protobuf e492fd34b12d0230755c45aa5fb1e1eea6a84aa9
-github.com/golang/protobuf 68415e7123da32b07eab49c96d2c4d6158360e9b
-github.com/golang/snappy 723cc1e459b8eea2dea4583200fd60757d40097a
+github.com/eclipse/paho.mqtt.golang 4ab3e867810d1ec5f35157c59e965054dbf43a0d
+github.com/fsouza/go-dockerclient a49c8269a6899cae30da1f8a4b82e0ce945f9967
+github.com/go-sql-driver/mysql 1fca743146605a172a266e1654e01e5cd5669bee
+github.com/golang/protobuf 552c7b9542c194800fd493123b3798ef0a832032
+github.com/golang/snappy 427fb6fc07997f43afa32f35e850833760e489a7
 github.com/gonuts/go-shellquote e842a11b24c6abfb3dd27af69a17f482e4b483c2
-github.com/hailocab/go-hostpool 0637eae892be221164aff5fcbccc57171aea6406
-github.com/hashicorp/go-msgpack fa3f63826f7c23912c15263591e65d54d080b458
-github.com/hashicorp/raft d136cd15dfb7876fd7c89cad1995bc4f19ceb294
-github.com/hashicorp/raft-boltdb d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee
-github.com/influxdb/influxdb 69a7664f2d4b75aec300b7cbfc7e57c971721f04
-github.com/jmespath/go-jmespath c01cf91b011868172fdcd9f41838e80c9d716264
-github.com/klauspost/crc32 0aff1ea9c20474c3901672b5b6ead0ac611156de
-github.com/lib/pq 11fc39a580a008f1f39bb3d11d984fb34ed778d9
+github.com/gorilla/context 1ea25387ff6f684839d82767c1733ff4d4d15d0a
+github.com/gorilla/mux c9e326e2bdec29039a3761c07bece13133863e1e
+github.com/hailocab/go-hostpool e80d13ce29ede4452c43dea11e79b9bc8a15b478
+github.com/influxdata/config b79f6829346b8d6e78ba73544b1e1038f1f1c9da
+github.com/influxdata/influxdb e3fef5593c21644f2b43af55d6e17e70910b0e48
+github.com/influxdata/toml af4df43894b16e3fd2b788d01bd27ad0776ef2d0
+github.com/klauspost/crc32 19b0b332c9e4516a6370a0456e6182c3b5036720
+github.com/lib/pq e182dc4027e2ded4b19396d638610f2653295f36
 github.com/matttproud/golang_protobuf_extensions d0c3fe89de86839aecf2e0579c40ba3bb336a453
+github.com/miekg/dns cce6c130cdb92c752850880fd285bea1d64439dd
 github.com/mreiferson/go-snappystream 028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504
 github.com/naoina/go-stringutil 6b638e95a32d0c1131db0e7fe83775cbea4a0d0b
-github.com/naoina/toml 751171607256bb66e64c9f0220c00662420c38e9
-github.com/nsqio/go-nsq 2118015c120962edc5d03325c680daf3163a8b5f
-github.com/pborman/uuid cccd189d45f7ac3368a0d127efb7f4d08ae0b655
-github.com/pmezard/go-difflib e8554b8641db39598be7f6342874b958f12ae1d4
-github.com/prometheus/client_golang 67994f177195311c3ea3d4407ed0175e34a4256f
+github.com/nats-io/nats b13fc9d12b0b123ebc374e6b808c6228ae4234a3
+github.com/nats-io/nuid 4f84f5f3b2786224e336af2e13dba0a0a80b76fa
+github.com/nsqio/go-nsq 0b80d6f05e15ca1930e0c5e1d540ed627e299980
+github.com/prometheus/client_golang 18acf9993a863f4c4b40612e19cdd243e7c86831
 github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6
-github.com/prometheus/common 56b90312e937d43b930f06a59bf0d6a4ae1944bc
+github.com/prometheus/common e8eabff8812b05acf522b45fdcd725a785188e37
 github.com/prometheus/procfs 406e5b7bfd8201a36e2bb5f7bdae0b03380c2ce8
 github.com/samuel/go-zookeeper 218e9c81c0dd8b3b18172b2bbfad92cc7d6db55f
-github.com/shirou/gopsutil fc932d9090f13a84fb4b3cb8baa124610cab184c
+github.com/shirou/gopsutil 1f32ce1bb380845be7f5d174ac641a2c592c0c42
+github.com/soniah/gosnmp b1b4f885b12c5dcbd021c5cee1c904110de6db7d
 github.com/streadway/amqp b4f3ceab0337f013208d31348b578d83c0064744
-github.com/stretchr/objx 1a9d0bb9f541897e62256577b352fdbc1fb4fd94
-github.com/stretchr/testify e3a8ff8ce36581f87a15341206f205b1da467059
-github.com/wvanbergen/kafka 1a8639a45164fcc245d5c7b4bd3ccfbd1a0ffbf3
+github.com/stretchr/testify 1f4a1643a57e798696635ea4c126e9127adb7d3c
+github.com/wvanbergen/kafka 46f9a1cf3f670edec492029fadded9c2d9e18866
 github.com/wvanbergen/kazoo-go 0f768712ae6f76454f987c3356177e138df258f8
-golang.org/x/crypto 7b85b097bf7527677d54d3220065e966a0e3b613
-golang.org/x/net 1796f9b8b7178e3c7587dff118d3bb9d37f9b0b3
-gopkg.in/dancannon/gorethink.v1 a124c9663325ed9f7fb669d17c69961b59151e6e
+github.com/zensqlmonitor/go-mssqldb ffe5510c6fa5e15e6d983210ab501c815b56b363
+golang.org/x/crypto 5dc8cb4b8a8eb076cbb5a06bc3b8682c15bdbbd3
+golang.org/x/net 6acef71eb69611914f7a30939ea9f6e194c78172
+golang.org/x/text a71fd10341b064c10f4a81ceac72bcf70f26ea34
+gopkg.in/dancannon/gorethink.v1 7d1af5be49cb5ecc7b177bf387d232050299d6ef
 gopkg.in/fatih/pool.v2 cba550ebf9bce999a02e963296d4bc7a486cb715
-gopkg.in/mgo.v2 e30de8ac9ae3b30df7065f766c71f88bba7d4e49
-gopkg.in/yaml.v2 f7716cbe52baa25d2e9b0d0da546fcf909fc16b4
+gopkg.in/mgo.v2 d90005c5262a3463800497ea5a89aed5fe22c886
+gopkg.in/yaml.v2 a83829b6f1293c91addabc89d0571c246397bbf4
--- a/60
+++ b/60
@@ -0,0 +1,60 @@
+github.com/Shopify/sarama 8aadb476e66ca998f2f6bb3c993e9a2daa3666b9
+github.com/Sirupsen/logrus 219c8cb75c258c552e999735be6df753ffc7afdc
+github.com/StackExchange/wmi f3e2bae1e0cb5aef83e319133eabfee30013a4a5
+github.com/amir/raidman 53c1b967405155bfc8758557863bf2e14f814687
+github.com/aws/aws-sdk-go 13a12060f716145019378a10e2806c174356b857
+github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4
+github.com/cenkalti/backoff 4dc77674aceaabba2c7e3da25d4c823edfb73f99
+github.com/couchbase/go-couchbase cb664315a324d87d19c879d9cc67fda6be8c2ac1
+github.com/couchbase/gomemcached a5ea6356f648fec6ab89add00edd09151455b4b2
+github.com/couchbase/goutils 5823a0cbaaa9008406021dc5daf80125ea30bba6
+github.com/dancannon/gorethink e7cac92ea2bc52638791a021f212145acfedb1fc
+github.com/davecgh/go-spew fc32781af5e85e548d3f1abaf0fa3dbe8a72495c
+github.com/eapache/go-resiliency b86b1ec0dd4209a588dc1285cdd471e73525c0b3
+github.com/eapache/queue ded5959c0d4e360646dc9e9908cff48666781367
+github.com/eclipse/paho.mqtt.golang 4ab3e867810d1ec5f35157c59e965054dbf43a0d
+github.com/fsouza/go-dockerclient a49c8269a6899cae30da1f8a4b82e0ce945f9967
+github.com/go-ini/ini 776aa739ce9373377cd16f526cdf06cb4c89b40f
+github.com/go-ole/go-ole 50055884d646dd9434f16bbb5c9801749b9bafe4
+github.com/go-sql-driver/mysql 1fca743146605a172a266e1654e01e5cd5669bee
+github.com/golang/protobuf 552c7b9542c194800fd493123b3798ef0a832032
+github.com/golang/snappy 5979233c5d6225d4a8e438cdd0b411888449ddab
+github.com/gonuts/go-shellquote e842a11b24c6abfb3dd27af69a17f482e4b483c2
+github.com/gorilla/context 1ea25387ff6f684839d82767c1733ff4d4d15d0a
+github.com/gorilla/mux c9e326e2bdec29039a3761c07bece13133863e1e
+github.com/hailocab/go-hostpool e80d13ce29ede4452c43dea11e79b9bc8a15b478
+github.com/influxdata/config b79f6829346b8d6e78ba73544b1e1038f1f1c9da
+github.com/influxdata/influxdb c190778997f4154294e6160c41b90140641ac915
+github.com/influxdata/toml af4df43894b16e3fd2b788d01bd27ad0776ef2d0
+github.com/jmespath/go-jmespath 0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74
+github.com/klauspost/crc32 19b0b332c9e4516a6370a0456e6182c3b5036720
+github.com/lib/pq e182dc4027e2ded4b19396d638610f2653295f36
+github.com/lxn/win 9a7734ea4db26bc593d52f6a8a957afdad39c5c1
+github.com/matttproud/golang_protobuf_extensions d0c3fe89de86839aecf2e0579c40ba3bb336a453
+github.com/miekg/dns cce6c130cdb92c752850880fd285bea1d64439dd
+github.com/mreiferson/go-snappystream 028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504
+github.com/naoina/go-stringutil 6b638e95a32d0c1131db0e7fe83775cbea4a0d0b
+github.com/nats-io/nats b13fc9d12b0b123ebc374e6b808c6228ae4234a3
+github.com/nats-io/nuid 4f84f5f3b2786224e336af2e13dba0a0a80b76fa
+github.com/nsqio/go-nsq 0b80d6f05e15ca1930e0c5e1d540ed627e299980
+github.com/pmezard/go-difflib 792786c7400a136282c1664665ae0a8db921c6c2
+github.com/prometheus/client_golang 18acf9993a863f4c4b40612e19cdd243e7c86831
+github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6
+github.com/prometheus/common e8eabff8812b05acf522b45fdcd725a785188e37
+github.com/prometheus/procfs 406e5b7bfd8201a36e2bb5f7bdae0b03380c2ce8
+github.com/samuel/go-zookeeper 218e9c81c0dd8b3b18172b2bbfad92cc7d6db55f
+github.com/shirou/gopsutil 1f32ce1bb380845be7f5d174ac641a2c592c0c42
+github.com/shirou/w32 ada3ba68f000aa1b58580e45c9d308fe0b7fc5c5
+github.com/soniah/gosnmp b1b4f885b12c5dcbd021c5cee1c904110de6db7d
+github.com/streadway/amqp b4f3ceab0337f013208d31348b578d83c0064744
+github.com/stretchr/objx 1a9d0bb9f541897e62256577b352fdbc1fb4fd94
+github.com/stretchr/testify 1f4a1643a57e798696635ea4c126e9127adb7d3c
+github.com/wvanbergen/kafka 1a8639a45164fcc245d5c7b4bd3ccfbd1a0ffbf3
+github.com/wvanbergen/kazoo-go 0f768712ae6f76454f987c3356177e138df258f8
+github.com/zensqlmonitor/go-mssqldb ffe5510c6fa5e15e6d983210ab501c815b56b363
+golang.org/x/net 6acef71eb69611914f7a30939ea9f6e194c78172
+golang.org/x/text a71fd10341b064c10f4a81ceac72bcf70f26ea34
+gopkg.in/dancannon/gorethink.v1 7d1af5be49cb5ecc7b177bf387d232050299d6ef
+gopkg.in/fatih/pool.v2 cba550ebf9bce999a02e963296d4bc7a486cb715
+gopkg.in/mgo.v2 d90005c5262a3463800497ea5a89aed5fe22c886
+gopkg.in/yaml.v2 a83829b6f1293c91addabc89d0571c246397bbf4
--- a/52
+++ b/52
@@ -9,36 +9,41 @@ endif
 # Standard Telegraf build
 default: prepare build

+# Windows build
+windows: prepare-windows build-windows
+
 # Only run the build (no dependency grabbing)
 build:
-	go build -o telegraf -ldflags \
+	go install -ldflags "-X main.Version=$(VERSION)" ./...
+
+build-windows:
+	go build -o telegraf.exe -ldflags \
 		"-X main.Version=$(VERSION)" \
 		./cmd/telegraf/telegraf.go

+build-for-docker:
+	CGO_ENABLED=0 GOOS=linux go build -installsuffix cgo -o telegraf -ldflags \
+					"-s -X main.Version=$(VERSION)" \
+					./cmd/telegraf/telegraf.go
+
 # Build with race detector
 dev: prepare
-	go build -race -o telegraf -ldflags \
-		"-X main.Version=$(VERSION)" \
-		./cmd/telegraf/telegraf.go
+	go build -race -ldflags "-X main.Version=$(VERSION)" ./...

-# Build linux 64-bit, 32-bit and arm architectures
-build-linux-bins: prepare
-	GOARCH=amd64 GOOS=linux go build -o telegraf_linux_amd64 \
-								-ldflags "-X main.Version=$(VERSION)" \
-								./cmd/telegraf/telegraf.go
-	GOARCH=386 GOOS=linux go build -o telegraf_linux_386 \
-								-ldflags "-X main.Version=$(VERSION)" \
-								./cmd/telegraf/telegraf.go
-	GOARCH=arm GOOS=linux go build -o telegraf_linux_arm \
-								-ldflags "-X main.Version=$(VERSION)" \
-								./cmd/telegraf/telegraf.go
+# run package script
+package:
+	./scripts/build.py --package --version="$(VERSION)" --platform=linux --arch=all --upload

 # Get dependencies and use gdm to checkout changesets
 prepare:
-	go get ./...
 	go get github.com/sparrc/gdm
 	gdm restore

+# Use the windows godeps file to prepare dependencies
+prepare-windows:
+	go get github.com/sparrc/gdm
+	gdm restore -f Godeps_windows
+
 # Run all docker containers necessary for unit tests
 docker-run:
 ifeq ($(UNAME), Darwin)
@@ -65,6 +70,7 @@ endif
 	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 blalor/riemann
+	docker run --name snmp -p "31161:31161/udp" -d titilambert/snmpsim

 # Run docker containers necessary for CircleCI unit tests
 docker-run-circle:
@@ -78,21 +84,25 @@ docker-run-circle:
 	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 blalor/riemann
+	docker run --name snmp -p "31161:31161/udp" -d titilambert/snmpsim

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

 # Run full unit tests using docker containers (includes setup and teardown)
-test: docker-kill docker-run
+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:
+test-short: vet
 	go test -short ./...

-.PHONY: test
+vet:
+	go vet ./...
+
+.PHONY: test test-short vet build default
--- a/README.md
+++ b/README.md
@@ -1,48 +1,81 @@
-# Telegraf - A native agent for InfluxDB [![Circle CI](https://circleci.com/gh/influxdb/telegraf.svg?style=svg)](https://circleci.com/gh/influxdb/telegraf)
+# Telegraf [![Circle CI](https://circleci.com/gh/influxdata/telegraf.svg?style=svg)](https://circleci.com/gh/influxdata/telegraf)

 Telegraf is an agent written in Go for collecting metrics from the system it's
-running on, or from other services, and writing them into InfluxDB.
+running on, or from other services, and writing them into InfluxDB or other
+[outputs](https://github.com/influxdata/telegraf#supported-output-plugins).

 Design goals are to have a minimal memory footprint with a plugin system so
 that developers in the community can easily add support for collecting metrics
 from well known services (like Hadoop, Postgres, or Redis) and third party
 APIs (like Mailchimp, AWS CloudWatch, or Google Analytics).

-We'll eagerly accept pull requests for new plugins and will manage the set of
-plugins that Telegraf supports. See the
-[contributing guide](CONTRIBUTING.md) for instructions on
-writing new plugins.
+New input and output 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
+new plugins.

 ## Installation:

-### Linux deb and rpm packages:
+### Linux deb and rpm Packages:

 Latest:
-* http://get.influxdb.org/telegraf/telegraf_0.2.4_amd64.deb
-* http://get.influxdb.org/telegraf/telegraf-0.2.4-1.x86_64.rpm
+* http://get.influxdb.org/telegraf/telegraf_0.12.0-1_amd64.deb
+* http://get.influxdb.org/telegraf/telegraf-0.12.0-1.x86_64.rpm

-##### Package instructions:
+Latest (arm):
+* http://get.influxdb.org/telegraf/telegraf_0.12.0-1_armhf.deb
+* http://get.influxdb.org/telegraf/telegraf-0.12.0-1.armhf.rpm

-* Telegraf binary is installed in `/opt/telegraf/telegraf`
-* Telegraf daemon configuration file is in `/etc/opt/telegraf/telegraf.conf`
+##### Package Instructions:
+
+* Telegraf binary is installed in `/usr/bin/telegraf`
+* Telegraf daemon configuration file is in `/etc/telegraf/telegraf.conf`
 * On sysv systems, the telegraf daemon can be controlled via
 `service telegraf [action]`
 * On systemd systems (such as Ubuntu 15+), the telegraf daemon can be
 controlled via `systemctl [action] telegraf`

-### Linux binaries:
+### yum/apt Repositories:
+
+There is a yum/apt repo available for the whole InfluxData stack, see
+[here](https://docs.influxdata.com/influxdb/v0.10/introduction/installation/#installation)
+for instructions on setting up the repo. Once it is configured, you will be able
+to use this repo to install & update telegraf.
+
+### Linux tarballs:

 Latest:
-* http://get.influxdb.org/telegraf/telegraf_linux_amd64_0.2.4.tar.gz
-* http://get.influxdb.org/telegraf/telegraf_linux_386_0.2.4.tar.gz
-* http://get.influxdb.org/telegraf/telegraf_linux_arm_0.2.4.tar.gz
+* http://get.influxdb.org/telegraf/telegraf-0.12.0-1_linux_amd64.tar.gz
+* http://get.influxdb.org/telegraf/telegraf-0.12.0-1_linux_i386.tar.gz
+* http://get.influxdb.org/telegraf/telegraf-0.12.0-1_linux_armhf.tar.gz

-##### Binary instructions:
+##### tarball Instructions:

-These are standalone binaries that can be unpacked and executed on any linux
-system. They can be unpacked and renamed in a location such as
-`/usr/local/bin` for convenience. A config file will need to be generated,
-see "How to use it" below.
+To install the full directory structure with config file, run:
+
+```
+sudo tar -C / -zxvf ./telegraf-0.12.0-1_linux_amd64.tar.gz
+```
+
+To extract only the binary, run:
+
+```
+tar -zxvf telegraf-0.12.0-1_linux_amd64.tar.gz --strip-components=3 ./usr/bin/telegraf
+```
+
+### FreeBSD tarball:
+
+Latest:
+* http://get.influxdb.org/telegraf/telegraf-0.12.0-1_freebsd_amd64.tar.gz
+
+##### tarball Instructions:
+
+See linux instructions above.
+
+### Ansible Role:
+
+Ansible role: https://github.com/rossmcdonald/telegraf

 ### OSX via Homebrew:

@@ -51,244 +84,169 @@ brew update
 brew install telegraf
 ```

+### Windows Binaries (EXPERIMENTAL)
+
+Latest:
+* http://get.influxdb.org/telegraf/telegraf-0.12.0-1_windows_amd64.zip
+* http://get.influxdb.org/telegraf/telegraf-0.12.0-1_windows_i386.zip
+
 ### From Source:

 Telegraf manages dependencies via [gdm](https://github.com/sparrc/gdm),
 which gets installed via the Makefile
-if you don't have it already. You also must build with golang version 1.4+.
+if you don't have it already. You also must build with golang version 1.5+.

 1. [Install Go](https://golang.org/doc/install)
 2. [Setup your GOPATH](https://golang.org/doc/code.html#GOPATH)
-3. Run `go get github.com/influxdb/telegraf`
-4. Run `cd $GOPATH/src/github.com/influxdb/telegraf`
+3. Run `go get github.com/influxdata/telegraf`
+4. Run `cd $GOPATH/src/github.com/influxdata/telegraf`
 5. Run `make`

-### How to use it:
+## How to use it:

-* Run `telegraf -sample-config > telegraf.conf` to create an initial configuration.
-* Or run `telegraf -sample-config -filter cpu:mem -outputfilter influxdb > telegraf.conf`.
-to create a config file with only CPU and memory plugins defined, and InfluxDB
-output defined.
-* Edit the configuration to match your needs.
-* Run `telegraf -config telegraf.conf -test` to output one full measurement
-sample to STDOUT. NOTE: you may want to run as the telegraf user if you are using
-the linux packages `sudo -u telegraf telegraf -config telegraf.conf -test`
-* Run `telegraf -config telegraf.conf` to gather and send metrics to configured outputs.
-* Run `telegraf -config telegraf.conf -filter system:swap`.
-to run telegraf with only the system & swap plugins defined in the config.
+```console
+$ telegraf -help
+Telegraf, The plugin-driven server agent for collecting and reporting metrics.

-## Telegraf Options
+Usage:

-Telegraf has a few options you can configure under the `agent` section of the
-config.
+  telegraf <flags>

-* **hostname**: The hostname is passed as a tag. By default this will be
-the value returned by `hostname` on the machine running Telegraf.
-You can override that value here.
-* **interval**: How often to gather metrics. Uses a simple number +
-unit parser, e.g. "10s" for 10 seconds or "5m" for 5 minutes.
-* **debug**: Set to true to gather and send metrics to STDOUT as well as
-InfluxDB.
+The flags are:

-## Plugin Options
+  -config <file>     configuration file to load
+  -test              gather metrics once, print them to stdout, and exit
+  -sample-config     print out full sample configuration to stdout
+  -config-directory  directory containing additional *.conf files
+  -input-filter      filter the input plugins to enable, separator is :
+  -output-filter     filter the output plugins to enable, separator is :
+  -usage             print usage for a plugin, ie, 'telegraf -usage mysql'
+  -debug             print metrics as they're generated to stdout
+  -quiet             run in quiet mode
+  -version           print the version to stdout

-There are 5 configuration options that are configurable per plugin:
+Examples:

-* **pass**: An array of strings that is used to filter metrics generated by the
-current plugin. Each string in the array is tested as a glob match against metric names
-and if it matches, the metric is emitted.
-* **drop**: The inverse of pass, if a metric name matches, it is not emitted.
-* **tagpass**: tag names and arrays of strings that are used to filter metrics by the current plugin. Each string in the array is tested as a glob match against
-the tag name, and if it matches the metric is emitted.
-* **tagdrop**: The inverse of tagpass. If a tag matches, the metric is not emitted.
-This is tested on metrics that have passed the tagpass test.
-* **interval**: How often to gather this metric. Normal plugins use a single
-global interval, but if one particular plugin should be run less or more often,
-you can configure that here.
+  # generate a telegraf config file:
+  telegraf -sample-config > telegraf.conf

-### Plugin Configuration Examples
+  # generate config with only cpu input & influxdb output plugins defined
+  telegraf -sample-config -input-filter cpu -output-filter influxdb

-This is a full working config that will output CPU data to an InfluxDB instance
-at 192.168.59.103:8086, tagging measurements with dc="denver-1". It will output
-measurements at a 10s interval and will collect per-cpu data, dropping any
-measurements which begin with `cpu_time`.
+  # run a single telegraf collection, outputing metrics to stdout
+  telegraf -config telegraf.conf -test

-```toml
-[tags]
-  dc = "denver-1"
+  # run telegraf with all plugins defined in config file
+  telegraf -config telegraf.conf

-[agent]
-  interval = "10s"
-
-# OUTPUTS
-[outputs]
-[[outputs.influxdb]]
-  url = "http://192.168.59.103:8086" # required.
-  database = "telegraf" # required.
-  precision = "s"
-
-# PLUGINS
-[plugins]
-[[plugins.cpu]]
-  percpu = true
-  totalcpu = false
-  drop = ["cpu_time*"]
+  # run telegraf, enabling the cpu & memory input, and influxdb output plugins
+  telegraf -config telegraf.conf -input-filter cpu:mem -output-filter influxdb
 ```

-Below is how to configure `tagpass` and `tagdrop` parameters
+## Configuration

-```toml
-[plugins]
-[[plugins.cpu]]
-  percpu = true
-  totalcpu = false
-  drop = ["cpu_time"]
-  # Don't collect CPU data for cpu6 & cpu7
-  [plugins.cpu.tagdrop]
-    cpu = [ "cpu6", "cpu7" ]
+See the [configuration guide](docs/CONFIGURATION.md) for a rundown of the more advanced
+configuration options.

-[[plugins.disk]]
-  [plugins.disk.tagpass]
-    # tagpass conditions are OR, not AND.
-    # If the (filesystem is ext4 or xfs) OR (the path is /opt or /home)
-    # then the metric passes
-    fstype = [ "ext4", "xfs" ]
-    # Globs can also be used on the tag values
-    path = [ "/opt", "/home*" ]
-```
+## Supported Input Plugins

-Below is how to configure `pass` and `drop` parameters
+Telegraf currently has support for collecting metrics from many sources. For
+more information on each, please look at the directory of the same name in
+`plugins/inputs`.

-```toml
-# Drop all metrics for guest CPU usage
-[[plugins.cpu]]
-  drop = [ "cpu_usage_guest" ]
+Currently implemented sources:

-# Only store inode related metrics for disks
-[[plugins.disk]]
-  pass = [ "disk_inodes*" ]
-```
-
-
-Additional plugins (or outputs) of the same type can be specified,
-just define more instances in the config file:
-
-```toml
-[[plugins.cpu]]
-  percpu = false
-  totalcpu = true
-
-[[plugins.cpu]]
-  percpu = true
-  totalcpu = false
-  drop = ["cpu_time*"]
-```
-
-## Supported Plugins
-
-**You can view usage instructions for each plugin by running**
-`telegraf -usage <pluginname>`.
-
-Telegraf currently has support for collecting metrics from:
-
-* aerospike
-* apache
-* bcache
-* disque
-* elasticsearch
-* exec (generic JSON-emitting executable plugin)
-* haproxy
-* httpjson (generic JSON-emitting http service plugin)
-* influxdb
-* jolokia (remote JMX with JSON over HTTP)
-* leofs
-* lustre2
-* mailchimp
-* memcached
-* mongodb
-* mysql
-* nginx
-* phpfpm
-* ping
-* postgresql
-* procstat
-* prometheus
-* puppetagent
-* rabbitmq
-* redis
-* rethinkdb
-* twemproxy
-* zfs
-* zookeeper
-* system
+* [aerospike](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/aerospike)
+* [apache](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/apache)
+* [bcache](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/bcache)
+* [couchbase](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/couchbase)
+* [couchdb](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/couchdb)
+* [disque](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/disque)
+* [dns query time](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/dns_query)
+* [docker](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/docker)
+* [dovecot](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/dovecot)
+* [elasticsearch](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/elasticsearch)
+* [exec](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/exec ) (generic executable plugin, support JSON, influx, graphite and nagios)
+* [haproxy](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/haproxy)
+* [httpjson ](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/httpjson ) (generic JSON-emitting http service plugin)
+* [influxdb](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/influxdb)
+* [ipmi_sensor](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/ipmi_sensor)
+* [jolokia](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/jolokia)
+* [leofs](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/leofs)
+* [lustre2](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/lustre2)
+* [mailchimp](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/mailchimp)
+* [memcached](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/memcached)
+* [mesos](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/mesos)
+* [mongodb](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/mongodb)
+* [mysql](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/mysql)
+* [net_response](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/net_response)
+* [nginx](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/nginx)
+* [nsq](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/nsq)
+* [ntpq](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/ntpq)
+* [phpfpm](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/phpfpm)
+* [phusion passenger](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/passenger)
+* [ping](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/ping)
+* [postgresql](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/postgresql)
+* [postgresql_extensible](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/postgresql_extensible)
+* [powerdns](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/powerdns)
+* [procstat](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/procstat)
+* [prometheus](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/prometheus)
+* [puppetagent](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/puppetagent)
+* [rabbitmq](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/rabbitmq)
+* [raindrops](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/raindrops)
+* [redis](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/redis)
+* [rethinkdb](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/rethinkdb)
+* [riak](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/riak)
+* [sensors ](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/sensors) (only available if built from source)
+* [snmp](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/snmp)
+* [sql server](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/sqlserver) (microsoft)
+* [twemproxy](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/twemproxy)
+* [zfs](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/zfs)
+* [zookeeper](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/zookeeper)
+* [win_perf_counters ](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/win_perf_counters) (windows performance counters)
+* [system](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/system)
    * cpu
    * mem
-    * io
    * net
    * netstat
    * disk
+    * diskio
    * swap
+    * processes
+    * kernel (/proc/stat)

-## Supported Service Plugins
+Telegraf can also collect metrics via the following service plugins:

-Telegraf can collect metrics via the following services:
-
-* statsd
-* kafka_consumer
+* [statsd](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/statsd)
+* [udp_listener](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/udp_listener)
+* [tcp_listener](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/tcp_listener)
+* [mqtt_consumer](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/mqtt_consumer)
+* [kafka_consumer](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/kafka_consumer)
+* [nats_consumer](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/nats_consumer)
+* [github_webhooks](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/github_webhooks)

 We'll be adding support for many more over the coming months. Read on if you
 want to add support for another service or third-party API.

-## Output options
+## Supported Output Plugins

-Telegraf also supports specifying multiple output sinks to send data to,
-configuring each output sink is different, but examples can be
-found by running `telegraf -sample-config`.
-
-Outputs also support the same configurable options as plugins
-(pass, drop, tagpass, tagdrop), added in 0.2.4
-
-```toml
-[[outputs.influxdb]]
-  urls = [ "http://localhost:8086" ]
-  database = "telegraf"
-  precision = "s"
-  # Drop all measurements that start with "aerospike"
-  drop = ["aerospike*"]
-
-[[outputs.influxdb]]
-  urls = [ "http://localhost:8086" ]
-  database = "telegraf-aerospike-data"
-  precision = "s"
-  # Only accept aerospike data:
-  pass = ["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"]
-```
-
-
-## Supported Outputs
-
-* influxdb
-* nsq
-* kafka
-* datadog
-* opentsdb
-* amqp (rabbitmq)
-* mqtt
-* librato
-* prometheus
-* amon
-* riemann
+* [influxdb](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/influxdb)
+* [amon](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/amon)
+* [amqp](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/amqp)
+* [aws kinesis](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/kinesis)
+* [aws cloudwatch](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/cloudwatch)
+* [datadog](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/datadog)
+* [graphite](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/graphite)
+* [kafka](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/kafka)
+* [librato](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/librato)
+* [mqtt](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/mqtt)
+* [nsq](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/nsq)
+* [opentsdb](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/opentsdb)
+* [prometheus](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/prometheus_client)
+* [riemann](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/riemann)

 ## Contributing

 Please see the
 [contributing guide](CONTRIBUTING.md)
-for details on contributing a plugin or output to Telegraf.
+for details on contributing a plugin to Telegraf.
--- a/accumulator.go
+++ b/accumulator.go
@@ -1,154 +1,21 @@
 package telegraf

-import (
-	"fmt"
-	"log"
-	"math"
-	"sync"
-	"time"
-
-	"github.com/influxdb/telegraf/internal/config"
-
-	"github.com/influxdb/influxdb/client/v2"
-)
+import "time"

 type Accumulator interface {
-	Add(measurement string, value interface{},
-		tags map[string]string, t ...time.Time)
-	AddFields(measurement string, fields map[string]interface{},
-		tags map[string]string, t ...time.Time)
+	// Create a point with a value, decorating it with tags
+	// NOTE: tags is expected to be owned by the caller, don't mutate
+	// it after passing to Add.
+	Add(measurement string,
+		value interface{},
+		tags map[string]string,
+		t ...time.Time)

-	SetDefaultTags(tags map[string]string)
-	AddDefaultTag(key, value string)
-
-	Prefix() string
-	SetPrefix(prefix string)
+	AddFields(measurement string,
+		fields map[string]interface{},
+		tags map[string]string,
+		t ...time.Time)

 	Debug() bool
 	SetDebug(enabled bool)
 }
-
-func NewAccumulator(
-	pluginConfig *config.PluginConfig,
-	points chan *client.Point,
-) Accumulator {
-	acc := accumulator{}
-	acc.points = points
-	acc.pluginConfig = pluginConfig
-	return &acc
-}
-
-type accumulator struct {
-	sync.Mutex
-
-	points chan *client.Point
-
-	defaultTags map[string]string
-
-	debug bool
-
-	pluginConfig *config.PluginConfig
-
-	prefix string
-}
-
-func (ac *accumulator) Add(
-	measurement string,
-	value interface{},
-	tags map[string]string,
-	t ...time.Time,
-) {
-	fields := make(map[string]interface{})
-	fields["value"] = value
-	ac.AddFields(measurement, fields, tags, t...)
-}
-
-func (ac *accumulator) AddFields(
-	measurement string,
-	fields map[string]interface{},
-	tags map[string]string,
-	t ...time.Time,
-) {
-	// Validate uint64 and float64 fields
-	for k, v := range fields {
-		switch val := v.(type) {
-		case uint64:
-			// InfluxDB does not support writing uint64
-			if val < uint64(9223372036854775808) {
-				fields[k] = int64(val)
-			} else {
-				fields[k] = int64(9223372036854775807)
-			}
-		case float64:
-			// NaNs are invalid values in influxdb, skip measurement
-			if math.IsNaN(val) || math.IsInf(val, 0) {
-				if ac.debug {
-					log.Printf("Measurement [%s] has a NaN or Inf field, skipping",
-						measurement)
-				}
-				return
-			}
-		}
-	}
-
-	if tags == nil {
-		tags = make(map[string]string)
-	}
-
-	var timestamp time.Time
-	if len(t) > 0 {
-		timestamp = t[0]
-	} else {
-		timestamp = time.Now()
-	}
-
-	if ac.prefix != "" {
-		measurement = ac.prefix + measurement
-	}
-
-	if ac.pluginConfig != nil {
-		if !ac.pluginConfig.Filter.ShouldPass(measurement) || !ac.pluginConfig.Filter.ShouldTagsPass(tags) {
-			return
-		}
-	}
-
-	for k, v := range ac.defaultTags {
-		if _, ok := tags[k]; !ok {
-			tags[k] = v
-		}
-	}
-
-	pt, err := client.NewPoint(measurement, tags, fields, timestamp)
-	if err != nil {
-		log.Printf("Error adding point [%s]: %s\n", measurement, err.Error())
-		return
-	}
-	if ac.debug {
-		fmt.Println("> " + pt.String())
-	}
-	ac.points <- pt
-}
-
-func (ac *accumulator) SetDefaultTags(tags map[string]string) {
-	ac.defaultTags = tags
-}
-
-func (ac *accumulator) AddDefaultTag(key, value string) {
-	ac.defaultTags[key] = value
-}
-
-func (ac *accumulator) Prefix() string {
-	return ac.prefix
-}
-
-func (ac *accumulator) SetPrefix(prefix string) {
-	ac.prefix = prefix
-}
-
-func (ac *accumulator) Debug() bool {
-	return ac.debug
-}
-
-func (ac *accumulator) SetDebug(debug bool) {
-	ac.debug = debug
-}
--- a/agent.go
+++ b/agent.go
@@ -1,397 +0,0 @@
-package telegraf
-
-import (
-	"crypto/rand"
-	"fmt"
-	"log"
-	"math/big"
-	"os"
-	"sync"
-	"time"
-
-	"github.com/influxdb/telegraf/internal/config"
-	"github.com/influxdb/telegraf/outputs"
-	"github.com/influxdb/telegraf/plugins"
-
-	"github.com/influxdb/influxdb/client/v2"
-)
-
-// Agent runs telegraf and collects data based on the given config
-type Agent struct {
-	Config *config.Config
-}
-
-// NewAgent returns an Agent struct based off the given Config
-func NewAgent(config *config.Config) (*Agent, error) {
-	a := &Agent{
-		Config: config,
-	}
-
-	if a.Config.Agent.Hostname == "" {
-		hostname, err := os.Hostname()
-		if err != nil {
-			return nil, err
-		}
-
-		a.Config.Agent.Hostname = hostname
-	}
-
-	config.Tags["host"] = a.Config.Agent.Hostname
-
-	return a, nil
-}
-
-// Connect connects to all configured outputs
-func (a *Agent) Connect() error {
-	for _, o := range a.Config.Outputs {
-		switch ot := o.Output.(type) {
-		case outputs.ServiceOutput:
-			if err := ot.Start(); err != nil {
-				log.Printf("Service for output %s failed to start, exiting\n%s\n",
-					o.Name, err.Error())
-				return err
-			}
-		}
-
-		if a.Config.Agent.Debug {
-			log.Printf("Attempting connection to output: %s\n", o.Name)
-		}
-		err := o.Output.Connect()
-		if err != nil {
-			log.Printf("Failed to connect to output %s, retrying in 15s\n", o.Name)
-			time.Sleep(15 * time.Second)
-			err = o.Output.Connect()
-			if err != nil {
-				return err
-			}
-		}
-		if a.Config.Agent.Debug {
-			log.Printf("Successfully connected to output: %s\n", o.Name)
-		}
-	}
-	return nil
-}
-
-// Close closes the connection to all configured outputs
-func (a *Agent) Close() error {
-	var err error
-	for _, o := range a.Config.Outputs {
-		err = o.Output.Close()
-		switch ot := o.Output.(type) {
-		case outputs.ServiceOutput:
-			ot.Stop()
-		}
-	}
-	return err
-}
-
-// gatherParallel runs the plugins that are using the same reporting interval
-// as the telegraf agent.
-func (a *Agent) gatherParallel(pointChan chan *client.Point) error {
-	var wg sync.WaitGroup
-
-	start := time.Now()
-	counter := 0
-	for _, plugin := range a.Config.Plugins {
-		if plugin.Config.Interval != 0 {
-			continue
-		}
-
-		wg.Add(1)
-		counter++
-		go func(plugin *config.RunningPlugin) {
-			defer wg.Done()
-
-			acc := NewAccumulator(plugin.Config, pointChan)
-			acc.SetDebug(a.Config.Agent.Debug)
-			acc.SetPrefix(plugin.Name + "_")
-			acc.SetDefaultTags(a.Config.Tags)
-
-			if err := plugin.Plugin.Gather(acc); err != nil {
-				log.Printf("Error in plugin [%s]: %s", plugin.Name, err)
-			}
-
-		}(plugin)
-	}
-
-	if counter == 0 {
-		return nil
-	}
-
-	wg.Wait()
-
-	elapsed := time.Since(start)
-	log.Printf("Gathered metrics, (%s interval), from %d plugins in %s\n",
-		a.Config.Agent.Interval, counter, elapsed)
-	return nil
-}
-
-// gatherSeparate runs the plugins that have been configured with their own
-// reporting interval.
-func (a *Agent) gatherSeparate(
-	shutdown chan struct{},
-	plugin *config.RunningPlugin,
-	pointChan chan *client.Point,
-) error {
-	ticker := time.NewTicker(plugin.Config.Interval)
-
-	for {
-		var outerr error
-		start := time.Now()
-
-		acc := NewAccumulator(plugin.Config, pointChan)
-		acc.SetDebug(a.Config.Agent.Debug)
-		acc.SetPrefix(plugin.Name + "_")
-		acc.SetDefaultTags(a.Config.Tags)
-
-		if err := plugin.Plugin.Gather(acc); err != nil {
-			log.Printf("Error in plugin [%s]: %s", plugin.Name, err)
-		}
-
-		elapsed := time.Since(start)
-		log.Printf("Gathered metrics, (separate %s interval), from %s in %s\n",
-			plugin.Config.Interval, plugin.Name, elapsed)
-
-		if outerr != nil {
-			return outerr
-		}
-
-		select {
-		case <-shutdown:
-			return nil
-		case <-ticker.C:
-			continue
-		}
-	}
-}
-
-// Test verifies that we can 'Gather' from all plugins with their configured
-// Config struct
-func (a *Agent) Test() error {
-	shutdown := make(chan struct{})
-	defer close(shutdown)
-	pointChan := make(chan *client.Point)
-
-	// dummy receiver for the point channel
-	go func() {
-		for {
-			select {
-			case <-pointChan:
-				// do nothing
-			case <-shutdown:
-				return
-			}
-		}
-	}()
-
-	for _, plugin := range a.Config.Plugins {
-		acc := NewAccumulator(plugin.Config, pointChan)
-		acc.SetDebug(true)
-		acc.SetPrefix(plugin.Name + "_")
-
-		fmt.Printf("* Plugin: %s, Collection 1\n", plugin.Name)
-		if plugin.Config.Interval != 0 {
-			fmt.Printf("* Internal: %s\n", plugin.Config.Interval)
-		}
-
-		if err := plugin.Plugin.Gather(acc); err != nil {
-			return err
-		}
-
-		// Special instructions for some plugins. cpu, for example, needs to be
-		// run twice in order to return cpu usage percentages.
-		switch plugin.Name {
-		case "cpu", "mongodb":
-			time.Sleep(500 * time.Millisecond)
-			fmt.Printf("* Plugin: %s, Collection 2\n", plugin.Name)
-			if err := plugin.Plugin.Gather(acc); err != nil {
-				return err
-			}
-		}
-
-	}
-	return nil
-}
-
-// writeOutput writes a list of points to a single output, with retries.
-// Optionally takes a `done` channel to indicate that it is done writing.
-func (a *Agent) writeOutput(
-	points []*client.Point,
-	ro *config.RunningOutput,
-	shutdown chan struct{},
-	wg *sync.WaitGroup,
-) {
-	defer wg.Done()
-	if len(points) == 0 {
-		return
-	}
-	retry := 0
-	retries := a.Config.Agent.FlushRetries
-	start := time.Now()
-
-	for {
-		filtered := ro.FilterPoints(points)
-		err := ro.Output.Write(filtered)
-		if err == nil {
-			// Write successful
-			elapsed := time.Since(start)
-			log.Printf("Flushed %d metrics to output %s in %s\n",
-				len(filtered), ro.Name, elapsed)
-			return
-		}
-
-		select {
-		case <-shutdown:
-			return
-		default:
-			if retry >= retries {
-				// No more retries
-				msg := "FATAL: Write to output [%s] failed %d times, dropping" +
-					" %d metrics\n"
-				log.Printf(msg, ro.Name, retries+1, len(points))
-				return
-			} else if err != nil {
-				// Sleep for a retry
-				log.Printf("Error in output [%s]: %s, retrying in %s",
-					ro.Name, err.Error(), a.Config.Agent.FlushInterval.Duration)
-				time.Sleep(a.Config.Agent.FlushInterval.Duration)
-			}
-		}
-
-		retry++
-	}
-}
-
-// flush writes a list of points to all configured outputs
-func (a *Agent) flush(
-	points []*client.Point,
-	shutdown chan struct{},
-	wait bool,
-) {
-	var wg sync.WaitGroup
-	for _, o := range a.Config.Outputs {
-		wg.Add(1)
-		go a.writeOutput(points, o, shutdown, &wg)
-	}
-	if wait {
-		wg.Wait()
-	}
-}
-
-// flusher monitors the points input channel and flushes on the minimum interval
-func (a *Agent) flusher(shutdown chan struct{}, pointChan chan *client.Point) 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 * 100)
-
-	ticker := time.NewTicker(a.Config.Agent.FlushInterval.Duration)
-	points := make([]*client.Point, 0)
-
-	for {
-		select {
-		case <-shutdown:
-			log.Println("Hang on, flushing any cached points before shutdown")
-			a.flush(points, shutdown, true)
-			return nil
-		case <-ticker.C:
-			a.flush(points, shutdown, false)
-			points = make([]*client.Point, 0)
-		case pt := <-pointChan:
-			points = append(points, pt)
-		}
-	}
-}
-
-// jitterInterval applies the the interval jitter to the flush interval using
-// crypto/rand number generator
-func jitterInterval(ininterval, injitter time.Duration) time.Duration {
-	var jitter int64
-	outinterval := ininterval
-	if injitter.Nanoseconds() != 0 {
-		maxjitter := big.NewInt(injitter.Nanoseconds())
-		if j, err := rand.Int(rand.Reader, maxjitter); err == nil {
-			jitter = j.Int64()
-		}
-		outinterval = time.Duration(jitter + ininterval.Nanoseconds())
-	}
-
-	if outinterval.Nanoseconds() < time.Duration(500*time.Millisecond).Nanoseconds() {
-		log.Printf("Flush interval %s too low, setting to 500ms\n", outinterval)
-		outinterval = time.Duration(500 * time.Millisecond)
-	}
-
-	return outinterval
-}
-
-// Run runs the agent daemon, gathering every Interval
-func (a *Agent) Run(shutdown chan struct{}) error {
-	var wg sync.WaitGroup
-
-	a.Config.Agent.FlushInterval.Duration = jitterInterval(a.Config.Agent.FlushInterval.Duration,
-		a.Config.Agent.FlushJitter.Duration)
-
-	log.Printf("Agent Config: Interval:%s, Debug:%#v, Hostname:%#v, "+
-		"Flush Interval:%s\n",
-		a.Config.Agent.Interval, a.Config.Agent.Debug,
-		a.Config.Agent.Hostname, a.Config.Agent.FlushInterval)
-
-	// channel shared between all plugin threads for accumulating points
-	pointChan := make(chan *client.Point, 1000)
-
-	// Round collection to nearest interval by sleeping
-	if a.Config.Agent.RoundInterval {
-		i := int64(a.Config.Agent.Interval.Duration)
-		time.Sleep(time.Duration(i - (time.Now().UnixNano() % i)))
-	}
-	ticker := time.NewTicker(a.Config.Agent.Interval.Duration)
-
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		if err := a.flusher(shutdown, pointChan); err != nil {
-			log.Printf("Flusher routine failed, exiting: %s\n", err.Error())
-			close(shutdown)
-		}
-	}()
-
-	for _, plugin := range a.Config.Plugins {
-
-		// Start service of any ServicePlugins
-		switch p := plugin.Plugin.(type) {
-		case plugins.ServicePlugin:
-			if err := p.Start(); err != nil {
-				log.Printf("Service for plugin %s failed to start, exiting\n%s\n",
-					plugin.Name, err.Error())
-				return err
-			}
-			defer p.Stop()
-		}
-
-		// Special handling for plugins that have their own collection interval
-		// configured. Default intervals are handled below with gatherParallel
-		if plugin.Config.Interval != 0 {
-			wg.Add(1)
-			go func(plugin *config.RunningPlugin) {
-				defer wg.Done()
-				if err := a.gatherSeparate(shutdown, plugin, pointChan); err != nil {
-					log.Printf(err.Error())
-				}
-			}(plugin)
-		}
-	}
-
-	defer wg.Wait()
-
-	for {
-		if err := a.gatherParallel(pointChan); err != nil {
-			log.Printf(err.Error())
-		}
-
-		select {
-		case <-shutdown:
-			return nil
-		case <-ticker.C:
-			continue
-		}
-	}
-}
--- a/agent/accumulator.go
+++ b/agent/accumulator.go
@@ -0,0 +1,177 @@
+package agent
+
+import (
+	"fmt"
+	"log"
+	"math"
+	"sync"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal/models"
+)
+
+func NewAccumulator(
+	inputConfig *internal_models.InputConfig,
+	metrics chan telegraf.Metric,
+) *accumulator {
+	acc := accumulator{}
+	acc.metrics = metrics
+	acc.inputConfig = inputConfig
+	return &acc
+}
+
+type accumulator struct {
+	sync.Mutex
+
+	metrics chan telegraf.Metric
+
+	defaultTags map[string]string
+
+	debug bool
+
+	inputConfig *internal_models.InputConfig
+
+	prefix string
+}
+
+func (ac *accumulator) Add(
+	measurement string,
+	value interface{},
+	tags map[string]string,
+	t ...time.Time,
+) {
+	fields := make(map[string]interface{})
+	fields["value"] = value
+
+	if !ac.inputConfig.Filter.ShouldNamePass(measurement) {
+		return
+	}
+
+	ac.AddFields(measurement, fields, tags, t...)
+}
+
+func (ac *accumulator) AddFields(
+	measurement string,
+	fields map[string]interface{},
+	tags map[string]string,
+	t ...time.Time,
+) {
+	if len(fields) == 0 || len(measurement) == 0 {
+		return
+	}
+
+	if !ac.inputConfig.Filter.ShouldNamePass(measurement) {
+		return
+	}
+
+	if !ac.inputConfig.Filter.ShouldTagsPass(tags) {
+		return
+	}
+
+	// Override measurement name if set
+	if len(ac.inputConfig.NameOverride) != 0 {
+		measurement = ac.inputConfig.NameOverride
+	}
+	// Apply measurement prefix and suffix if set
+	if len(ac.inputConfig.MeasurementPrefix) != 0 {
+		measurement = ac.inputConfig.MeasurementPrefix + measurement
+	}
+	if len(ac.inputConfig.MeasurementSuffix) != 0 {
+		measurement = measurement + ac.inputConfig.MeasurementSuffix
+	}
+
+	if tags == nil {
+		tags = make(map[string]string)
+	}
+	// Apply plugin-wide tags if set
+	for k, v := range ac.inputConfig.Tags {
+		if _, ok := tags[k]; !ok {
+			tags[k] = v
+		}
+	}
+	// Apply daemon-wide tags if set
+	for k, v := range ac.defaultTags {
+		if _, ok := tags[k]; !ok {
+			tags[k] = v
+		}
+	}
+
+	result := make(map[string]interface{})
+	for k, v := range fields {
+		// Filter out any filtered fields
+		if ac.inputConfig != nil {
+			if !ac.inputConfig.Filter.ShouldFieldsPass(k) {
+				continue
+			}
+		}
+
+		// Validate uint64 and float64 fields
+		switch val := v.(type) {
+		case uint64:
+			// InfluxDB does not support writing uint64
+			if val < uint64(9223372036854775808) {
+				result[k] = int64(val)
+			} else {
+				result[k] = int64(9223372036854775807)
+			}
+			continue
+		case float64:
+			// NaNs are invalid values in influxdb, skip measurement
+			if math.IsNaN(val) || math.IsInf(val, 0) {
+				if ac.debug {
+					log.Printf("Measurement [%s] field [%s] has a NaN or Inf "+
+						"field, skipping",
+						measurement, k)
+				}
+				continue
+			}
+		}
+
+		result[k] = v
+	}
+	fields = nil
+	if len(result) == 0 {
+		return
+	}
+
+	var timestamp time.Time
+	if len(t) > 0 {
+		timestamp = t[0]
+	} else {
+		timestamp = time.Now()
+	}
+
+	if ac.prefix != "" {
+		measurement = ac.prefix + measurement
+	}
+
+	m, err := telegraf.NewMetric(measurement, tags, result, timestamp)
+	if err != nil {
+		log.Printf("Error adding point [%s]: %s\n", measurement, err.Error())
+		return
+	}
+	if ac.debug {
+		fmt.Println("> " + m.String())
+	}
+	ac.metrics <- m
+}
+
+func (ac *accumulator) Debug() bool {
+	return ac.debug
+}
+
+func (ac *accumulator) SetDebug(debug bool) {
+	ac.debug = debug
+}
+
+func (ac *accumulator) setDefaultTags(tags map[string]string) {
+	ac.defaultTags = tags
+}
+
+func (ac *accumulator) addDefaultTag(key, value string) {
+	if ac.defaultTags == nil {
+		ac.defaultTags = make(map[string]string)
+	}
+	ac.defaultTags[key] = value
+}
--- a/agent/accumulator_test.go
+++ b/agent/accumulator_test.go
@@ -0,0 +1,302 @@
+package agent
+
+import (
+	"fmt"
+	"math"
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal/models"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestAdd(t *testing.T) {
+	a := accumulator{}
+	now := time.Now()
+	a.metrics = make(chan telegraf.Metric, 10)
+	defer close(a.metrics)
+	a.inputConfig = &internal_models.InputConfig{}
+
+	a.Add("acctest", float64(101), map[string]string{})
+	a.Add("acctest", float64(101), map[string]string{"acc": "test"})
+	a.Add("acctest", float64(101), map[string]string{"acc": "test"}, now)
+
+	testm := <-a.metrics
+	actual := testm.String()
+	assert.Contains(t, actual, "acctest value=101")
+
+	testm = <-a.metrics
+	actual = testm.String()
+	assert.Contains(t, actual, "acctest,acc=test value=101")
+
+	testm = <-a.metrics
+	actual = testm.String()
+	assert.Equal(t,
+		fmt.Sprintf("acctest,acc=test value=101 %d", now.UnixNano()),
+		actual)
+}
+
+func TestAddDefaultTags(t *testing.T) {
+	a := accumulator{}
+	a.addDefaultTag("default", "tag")
+	now := time.Now()
+	a.metrics = make(chan telegraf.Metric, 10)
+	defer close(a.metrics)
+	a.inputConfig = &internal_models.InputConfig{}
+
+	a.Add("acctest", float64(101), map[string]string{})
+	a.Add("acctest", float64(101), map[string]string{"acc": "test"})
+	a.Add("acctest", float64(101), map[string]string{"acc": "test"}, now)
+
+	testm := <-a.metrics
+	actual := testm.String()
+	assert.Contains(t, actual, "acctest,default=tag value=101")
+
+	testm = <-a.metrics
+	actual = testm.String()
+	assert.Contains(t, actual, "acctest,acc=test,default=tag value=101")
+
+	testm = <-a.metrics
+	actual = testm.String()
+	assert.Equal(t,
+		fmt.Sprintf("acctest,acc=test,default=tag value=101 %d", now.UnixNano()),
+		actual)
+}
+
+func TestAddFields(t *testing.T) {
+	a := accumulator{}
+	now := time.Now()
+	a.metrics = make(chan telegraf.Metric, 10)
+	defer close(a.metrics)
+	a.inputConfig = &internal_models.InputConfig{}
+
+	fields := map[string]interface{}{
+		"usage": float64(99),
+	}
+	a.AddFields("acctest", fields, map[string]string{})
+	a.AddFields("acctest", fields, map[string]string{"acc": "test"})
+	a.AddFields("acctest", fields, map[string]string{"acc": "test"}, now)
+
+	testm := <-a.metrics
+	actual := testm.String()
+	assert.Contains(t, actual, "acctest usage=99")
+
+	testm = <-a.metrics
+	actual = testm.String()
+	assert.Contains(t, actual, "acctest,acc=test usage=99")
+
+	testm = <-a.metrics
+	actual = testm.String()
+	assert.Equal(t,
+		fmt.Sprintf("acctest,acc=test usage=99 %d", now.UnixNano()),
+		actual)
+}
+
+// Test that all Inf fields get dropped, and not added to metrics channel
+func TestAddInfFields(t *testing.T) {
+	inf := math.Inf(1)
+	ninf := math.Inf(-1)
+
+	a := accumulator{}
+	now := time.Now()
+	a.metrics = make(chan telegraf.Metric, 10)
+	defer close(a.metrics)
+	a.inputConfig = &internal_models.InputConfig{}
+
+	fields := map[string]interface{}{
+		"usage":  inf,
+		"nusage": ninf,
+	}
+	a.AddFields("acctest", fields, map[string]string{})
+	a.AddFields("acctest", fields, map[string]string{"acc": "test"})
+	a.AddFields("acctest", fields, map[string]string{"acc": "test"}, now)
+
+	assert.Len(t, a.metrics, 0)
+
+	// test that non-inf fields are kept and not dropped
+	fields["notinf"] = float64(100)
+	a.AddFields("acctest", fields, map[string]string{})
+	testm := <-a.metrics
+	actual := testm.String()
+	assert.Contains(t, actual, "acctest notinf=100")
+}
+
+// Test that nan fields are dropped and not added
+func TestAddNaNFields(t *testing.T) {
+	nan := math.NaN()
+
+	a := accumulator{}
+	now := time.Now()
+	a.metrics = make(chan telegraf.Metric, 10)
+	defer close(a.metrics)
+	a.inputConfig = &internal_models.InputConfig{}
+
+	fields := map[string]interface{}{
+		"usage": nan,
+	}
+	a.AddFields("acctest", fields, map[string]string{})
+	a.AddFields("acctest", fields, map[string]string{"acc": "test"})
+	a.AddFields("acctest", fields, map[string]string{"acc": "test"}, now)
+
+	assert.Len(t, a.metrics, 0)
+
+	// test that non-nan fields are kept and not dropped
+	fields["notnan"] = float64(100)
+	a.AddFields("acctest", fields, map[string]string{})
+	testm := <-a.metrics
+	actual := testm.String()
+	assert.Contains(t, actual, "acctest notnan=100")
+}
+
+func TestAddUint64Fields(t *testing.T) {
+	a := accumulator{}
+	now := time.Now()
+	a.metrics = make(chan telegraf.Metric, 10)
+	defer close(a.metrics)
+	a.inputConfig = &internal_models.InputConfig{}
+
+	fields := map[string]interface{}{
+		"usage": uint64(99),
+	}
+	a.AddFields("acctest", fields, map[string]string{})
+	a.AddFields("acctest", fields, map[string]string{"acc": "test"})
+	a.AddFields("acctest", fields, map[string]string{"acc": "test"}, now)
+
+	testm := <-a.metrics
+	actual := testm.String()
+	assert.Contains(t, actual, "acctest usage=99i")
+
+	testm = <-a.metrics
+	actual = testm.String()
+	assert.Contains(t, actual, "acctest,acc=test usage=99i")
+
+	testm = <-a.metrics
+	actual = testm.String()
+	assert.Equal(t,
+		fmt.Sprintf("acctest,acc=test usage=99i %d", now.UnixNano()),
+		actual)
+}
+
+func TestAddUint64Overflow(t *testing.T) {
+	a := accumulator{}
+	now := time.Now()
+	a.metrics = make(chan telegraf.Metric, 10)
+	defer close(a.metrics)
+	a.inputConfig = &internal_models.InputConfig{}
+
+	fields := map[string]interface{}{
+		"usage": uint64(9223372036854775808),
+	}
+	a.AddFields("acctest", fields, map[string]string{})
+	a.AddFields("acctest", fields, map[string]string{"acc": "test"})
+	a.AddFields("acctest", fields, map[string]string{"acc": "test"}, now)
+
+	testm := <-a.metrics
+	actual := testm.String()
+	assert.Contains(t, actual, "acctest usage=9223372036854775807i")
+
+	testm = <-a.metrics
+	actual = testm.String()
+	assert.Contains(t, actual, "acctest,acc=test usage=9223372036854775807i")
+
+	testm = <-a.metrics
+	actual = testm.String()
+	assert.Equal(t,
+		fmt.Sprintf("acctest,acc=test usage=9223372036854775807i %d", now.UnixNano()),
+		actual)
+}
+
+func TestAddInts(t *testing.T) {
+	a := accumulator{}
+	a.addDefaultTag("default", "tag")
+	now := time.Now()
+	a.metrics = make(chan telegraf.Metric, 10)
+	defer close(a.metrics)
+	a.inputConfig = &internal_models.InputConfig{}
+
+	a.Add("acctest", int(101), map[string]string{})
+	a.Add("acctest", int32(101), map[string]string{"acc": "test"})
+	a.Add("acctest", int64(101), map[string]string{"acc": "test"}, now)
+
+	testm := <-a.metrics
+	actual := testm.String()
+	assert.Contains(t, actual, "acctest,default=tag value=101i")
+
+	testm = <-a.metrics
+	actual = testm.String()
+	assert.Contains(t, actual, "acctest,acc=test,default=tag value=101i")
+
+	testm = <-a.metrics
+	actual = testm.String()
+	assert.Equal(t,
+		fmt.Sprintf("acctest,acc=test,default=tag value=101i %d", now.UnixNano()),
+		actual)
+}
+
+func TestAddFloats(t *testing.T) {
+	a := accumulator{}
+	a.addDefaultTag("default", "tag")
+	now := time.Now()
+	a.metrics = make(chan telegraf.Metric, 10)
+	defer close(a.metrics)
+	a.inputConfig = &internal_models.InputConfig{}
+
+	a.Add("acctest", float32(101), map[string]string{"acc": "test"})
+	a.Add("acctest", float64(101), map[string]string{"acc": "test"}, now)
+
+	testm := <-a.metrics
+	actual := testm.String()
+	assert.Contains(t, actual, "acctest,acc=test,default=tag value=101")
+
+	testm = <-a.metrics
+	actual = testm.String()
+	assert.Equal(t,
+		fmt.Sprintf("acctest,acc=test,default=tag value=101 %d", now.UnixNano()),
+		actual)
+}
+
+func TestAddStrings(t *testing.T) {
+	a := accumulator{}
+	a.addDefaultTag("default", "tag")
+	now := time.Now()
+	a.metrics = make(chan telegraf.Metric, 10)
+	defer close(a.metrics)
+	a.inputConfig = &internal_models.InputConfig{}
+
+	a.Add("acctest", "test", map[string]string{"acc": "test"})
+	a.Add("acctest", "foo", map[string]string{"acc": "test"}, now)
+
+	testm := <-a.metrics
+	actual := testm.String()
+	assert.Contains(t, actual, "acctest,acc=test,default=tag value=\"test\"")
+
+	testm = <-a.metrics
+	actual = testm.String()
+	assert.Equal(t,
+		fmt.Sprintf("acctest,acc=test,default=tag value=\"foo\" %d", now.UnixNano()),
+		actual)
+}
+
+func TestAddBools(t *testing.T) {
+	a := accumulator{}
+	a.addDefaultTag("default", "tag")
+	now := time.Now()
+	a.metrics = make(chan telegraf.Metric, 10)
+	defer close(a.metrics)
+	a.inputConfig = &internal_models.InputConfig{}
+
+	a.Add("acctest", true, map[string]string{"acc": "test"})
+	a.Add("acctest", false, map[string]string{"acc": "test"}, now)
+
+	testm := <-a.metrics
+	actual := testm.String()
+	assert.Contains(t, actual, "acctest,acc=test,default=tag value=true")
+
+	testm = <-a.metrics
+	actual = testm.String()
+	assert.Equal(t,
+		fmt.Sprintf("acctest,acc=test,default=tag value=false %d", now.UnixNano()),
+		actual)
+}
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -0,0 +1,389 @@
+package agent
+
+import (
+	cryptorand "crypto/rand"
+	"fmt"
+	"log"
+	"math/big"
+	"math/rand"
+	"os"
+	"runtime"
+	"sync"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal/config"
+	"github.com/influxdata/telegraf/internal/models"
+)
+
+// Agent runs telegraf and collects data based on the given config
+type Agent struct {
+	Config *config.Config
+}
+
+// NewAgent returns an Agent struct based off the given Config
+func NewAgent(config *config.Config) (*Agent, error) {
+	a := &Agent{
+		Config: config,
+	}
+
+	if !a.Config.Agent.OmitHostname {
+		if a.Config.Agent.Hostname == "" {
+			hostname, err := os.Hostname()
+			if err != nil {
+				return nil, err
+			}
+
+			a.Config.Agent.Hostname = hostname
+		}
+
+		config.Tags["host"] = a.Config.Agent.Hostname
+	}
+
+	return a, nil
+}
+
+// Connect connects to all configured outputs
+func (a *Agent) Connect() error {
+	for _, o := range a.Config.Outputs {
+		o.Quiet = a.Config.Agent.Quiet
+
+		switch ot := o.Output.(type) {
+		case telegraf.ServiceOutput:
+			if err := ot.Start(); err != nil {
+				log.Printf("Service for output %s failed to start, exiting\n%s\n",
+					o.Name, err.Error())
+				return err
+			}
+		}
+
+		if a.Config.Agent.Debug {
+			log.Printf("Attempting connection to output: %s\n", o.Name)
+		}
+		err := o.Output.Connect()
+		if err != nil {
+			log.Printf("Failed to connect to output %s, retrying in 15s, "+
+				"error was '%s' \n", o.Name, err)
+			time.Sleep(15 * time.Second)
+			err = o.Output.Connect()
+			if err != nil {
+				return err
+			}
+		}
+		if a.Config.Agent.Debug {
+			log.Printf("Successfully connected to output: %s\n", o.Name)
+		}
+	}
+	return nil
+}
+
+// Close closes the connection to all configured outputs
+func (a *Agent) Close() error {
+	var err error
+	for _, o := range a.Config.Outputs {
+		err = o.Output.Close()
+		switch ot := o.Output.(type) {
+		case telegraf.ServiceOutput:
+			ot.Stop()
+		}
+	}
+	return err
+}
+
+func panicRecover(input *internal_models.RunningInput) {
+	if err := recover(); err != nil {
+		trace := make([]byte, 2048)
+		runtime.Stack(trace, true)
+		log.Printf("FATAL: Input [%s] panicked: %s, Stack:\n%s\n",
+			input.Name, err, trace)
+		log.Println("PLEASE REPORT THIS PANIC ON GITHUB with " +
+			"stack trace, configuration, and OS information: " +
+			"https://github.com/influxdata/telegraf/issues/new")
+	}
+}
+
+// gatherParallel runs the inputs that are using the same reporting interval
+// as the telegraf agent.
+func (a *Agent) gatherParallel(metricC chan telegraf.Metric) error {
+	var wg sync.WaitGroup
+
+	start := time.Now()
+	counter := 0
+	jitter := a.Config.Agent.CollectionJitter.Duration.Nanoseconds()
+	for _, input := range a.Config.Inputs {
+		if input.Config.Interval != 0 {
+			continue
+		}
+
+		wg.Add(1)
+		counter++
+		go func(input *internal_models.RunningInput) {
+			defer panicRecover(input)
+			defer wg.Done()
+
+			acc := NewAccumulator(input.Config, metricC)
+			acc.SetDebug(a.Config.Agent.Debug)
+			acc.setDefaultTags(a.Config.Tags)
+
+			if jitter != 0 {
+				nanoSleep := rand.Int63n(jitter)
+				d, err := time.ParseDuration(fmt.Sprintf("%dns", nanoSleep))
+				if err != nil {
+					log.Printf("Jittering collection interval failed for plugin %s",
+						input.Name)
+				} else {
+					time.Sleep(d)
+				}
+			}
+
+			if err := input.Input.Gather(acc); err != nil {
+				log.Printf("Error in input [%s]: %s", input.Name, err)
+			}
+
+		}(input)
+	}
+
+	if counter == 0 {
+		return nil
+	}
+
+	wg.Wait()
+
+	elapsed := time.Since(start)
+	if !a.Config.Agent.Quiet {
+		log.Printf("Gathered metrics, (%s interval), from %d inputs in %s\n",
+			a.Config.Agent.Interval.Duration, counter, elapsed)
+	}
+	return nil
+}
+
+// gatherSeparate runs the inputs that have been configured with their own
+// reporting interval.
+func (a *Agent) gatherSeparate(
+	shutdown chan struct{},
+	input *internal_models.RunningInput,
+	metricC chan telegraf.Metric,
+) error {
+	defer panicRecover(input)
+
+	ticker := time.NewTicker(input.Config.Interval)
+
+	for {
+		var outerr error
+		start := time.Now()
+
+		acc := NewAccumulator(input.Config, metricC)
+		acc.SetDebug(a.Config.Agent.Debug)
+		acc.setDefaultTags(a.Config.Tags)
+
+		if err := input.Input.Gather(acc); err != nil {
+			log.Printf("Error in input [%s]: %s", input.Name, err)
+		}
+
+		elapsed := time.Since(start)
+		if !a.Config.Agent.Quiet {
+			log.Printf("Gathered metrics, (separate %s interval), from %s in %s\n",
+				input.Config.Interval, input.Name, elapsed)
+		}
+
+		if outerr != nil {
+			return outerr
+		}
+
+		select {
+		case <-shutdown:
+			return nil
+		case <-ticker.C:
+			continue
+		}
+	}
+}
+
+// Test verifies that we can 'Gather' from all inputs with their configured
+// Config struct
+func (a *Agent) Test() error {
+	shutdown := make(chan struct{})
+	defer close(shutdown)
+	metricC := make(chan telegraf.Metric)
+
+	// dummy receiver for the point channel
+	go func() {
+		for {
+			select {
+			case <-metricC:
+				// do nothing
+			case <-shutdown:
+				return
+			}
+		}
+	}()
+
+	for _, input := range a.Config.Inputs {
+		acc := NewAccumulator(input.Config, metricC)
+		acc.SetDebug(true)
+
+		fmt.Printf("* Plugin: %s, Collection 1\n", input.Name)
+		if input.Config.Interval != 0 {
+			fmt.Printf("* Internal: %s\n", input.Config.Interval)
+		}
+
+		if err := input.Input.Gather(acc); err != nil {
+			return err
+		}
+
+		// Special instructions for some inputs. cpu, for example, needs to be
+		// run twice in order to return cpu usage percentages.
+		switch input.Name {
+		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 {
+				return err
+			}
+		}
+
+	}
+	return nil
+}
+
+// flush writes a list of metrics to all configured outputs
+func (a *Agent) flush() {
+	var wg sync.WaitGroup
+
+	wg.Add(len(a.Config.Outputs))
+	for _, o := range a.Config.Outputs {
+		go func(output *internal_models.RunningOutput) {
+			defer wg.Done()
+			err := output.Write()
+			if err != nil {
+				log.Printf("Error writing to output [%s]: %s\n",
+					output.Name, err.Error())
+			}
+		}(o)
+	}
+
+	wg.Wait()
+}
+
+// flusher monitors the metrics input channel and flushes on the minimum interval
+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 * 200)
+
+	ticker := time.NewTicker(a.Config.Agent.FlushInterval.Duration)
+
+	for {
+		select {
+		case <-shutdown:
+			log.Println("Hang on, flushing any cached metrics before shutdown")
+			a.flush()
+			return nil
+		case <-ticker.C:
+			a.flush()
+		case m := <-metricC:
+			for _, o := range a.Config.Outputs {
+				o.AddMetric(m)
+			}
+		}
+	}
+}
+
+// jitterInterval applies the the interval jitter to the flush interval using
+// crypto/rand number generator
+func jitterInterval(ininterval, injitter time.Duration) time.Duration {
+	var jitter int64
+	outinterval := ininterval
+	if injitter.Nanoseconds() != 0 {
+		maxjitter := big.NewInt(injitter.Nanoseconds())
+		if j, err := cryptorand.Int(cryptorand.Reader, maxjitter); err == nil {
+			jitter = j.Int64()
+		}
+		outinterval = time.Duration(jitter + ininterval.Nanoseconds())
+	}
+
+	if outinterval.Nanoseconds() < time.Duration(500*time.Millisecond).Nanoseconds() {
+		log.Printf("Flush interval %s too low, setting to 500ms\n", outinterval)
+		outinterval = time.Duration(500 * time.Millisecond)
+	}
+
+	return outinterval
+}
+
+// Run runs the agent daemon, gathering every Interval
+func (a *Agent) Run(shutdown chan struct{}) error {
+	var wg sync.WaitGroup
+
+	a.Config.Agent.FlushInterval.Duration = jitterInterval(
+		a.Config.Agent.FlushInterval.Duration,
+		a.Config.Agent.FlushJitter.Duration)
+
+	log.Printf("Agent Config: Interval:%s, Debug:%#v, Quiet:%#v, Hostname:%#v, "+
+		"Flush Interval:%s \n",
+		a.Config.Agent.Interval.Duration, a.Config.Agent.Debug, a.Config.Agent.Quiet,
+		a.Config.Agent.Hostname, a.Config.Agent.FlushInterval.Duration)
+
+	// channel shared between all input threads for accumulating metrics
+	metricC := make(chan telegraf.Metric, 10000)
+
+	for _, input := range a.Config.Inputs {
+		// Start service of any ServicePlugins
+		switch p := input.Input.(type) {
+		case telegraf.ServiceInput:
+			acc := NewAccumulator(input.Config, metricC)
+			acc.SetDebug(a.Config.Agent.Debug)
+			acc.setDefaultTags(a.Config.Tags)
+			if err := p.Start(acc); err != nil {
+				log.Printf("Service for input %s failed to start, exiting\n%s\n",
+					input.Name, err.Error())
+				return err
+			}
+			defer p.Stop()
+		}
+	}
+
+	// Round collection to nearest interval by sleeping
+	if a.Config.Agent.RoundInterval {
+		i := int64(a.Config.Agent.Interval.Duration)
+		time.Sleep(time.Duration(i - (time.Now().UnixNano() % i)))
+	}
+	ticker := time.NewTicker(a.Config.Agent.Interval.Duration)
+
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
+		if err := a.flusher(shutdown, metricC); err != nil {
+			log.Printf("Flusher routine failed, exiting: %s\n", err.Error())
+			close(shutdown)
+		}
+	}()
+
+	for _, input := range a.Config.Inputs {
+		// Special handling for inputs that have their own collection interval
+		// configured. Default intervals are handled below with gatherParallel
+		if input.Config.Interval != 0 {
+			wg.Add(1)
+			go func(input *internal_models.RunningInput) {
+				defer wg.Done()
+				if err := a.gatherSeparate(shutdown, input, metricC); err != nil {
+					log.Printf(err.Error())
+				}
+			}(input)
+		}
+	}
+
+	defer wg.Wait()
+
+	for {
+		if err := a.gatherParallel(metricC); err != nil {
+			log.Printf(err.Error())
+		}
+
+		select {
+		case <-shutdown:
+			return nil
+		case <-ticker.C:
+			continue
+		}
+	}
+}
--- a/agent/agent_test.go
+++ b/agent/agent_test.go
@@ -1,84 +1,112 @@
-package telegraf
+package agent

 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"

-	"github.com/influxdb/telegraf/internal/config"
+	"github.com/influxdata/telegraf/internal/config"

 	// needing to load the plugins
-	_ "github.com/influxdb/telegraf/plugins/all"
+	_ "github.com/influxdata/telegraf/plugins/inputs/all"
 	// needing to load the outputs
-	_ "github.com/influxdb/telegraf/outputs/all"
+	_ "github.com/influxdata/telegraf/plugins/outputs/all"
+
+	"github.com/stretchr/testify/assert"
 )

+func TestAgent_OmitHostname(t *testing.T) {
+	c := config.NewConfig()
+	c.Agent.OmitHostname = true
+	_, err := NewAgent(c)
+	assert.NoError(t, err)
+	assert.NotContains(t, c.Tags, "host")
+}
+
 func TestAgent_LoadPlugin(t *testing.T) {
 	c := config.NewConfig()
-	c.PluginFilters = []string{"mysql"}
-	c.LoadConfig("./internal/config/testdata/telegraf-agent.toml")
+	c.InputFilters = []string{"mysql"}
+	err := c.LoadConfig("../internal/config/testdata/telegraf-agent.toml")
+	assert.NoError(t, err)
 	a, _ := NewAgent(c)
-	assert.Equal(t, 1, len(a.Config.Plugins))
+	assert.Equal(t, 1, len(a.Config.Inputs))

 	c = config.NewConfig()
-	c.PluginFilters = []string{"foo"}
-	c.LoadConfig("./internal/config/testdata/telegraf-agent.toml")
+	c.InputFilters = []string{"foo"}
+	err = c.LoadConfig("../internal/config/testdata/telegraf-agent.toml")
+	assert.NoError(t, err)
 	a, _ = NewAgent(c)
-	assert.Equal(t, 0, len(a.Config.Plugins))
+	assert.Equal(t, 0, len(a.Config.Inputs))

 	c = config.NewConfig()
-	c.PluginFilters = []string{"mysql", "foo"}
-	c.LoadConfig("./internal/config/testdata/telegraf-agent.toml")
+	c.InputFilters = []string{"mysql", "foo"}
+	err = c.LoadConfig("../internal/config/testdata/telegraf-agent.toml")
+	assert.NoError(t, err)
 	a, _ = NewAgent(c)
-	assert.Equal(t, 1, len(a.Config.Plugins))
+	assert.Equal(t, 1, len(a.Config.Inputs))

 	c = config.NewConfig()
-	c.PluginFilters = []string{"mysql", "redis"}
-	c.LoadConfig("./internal/config/testdata/telegraf-agent.toml")
+	c.InputFilters = []string{"mysql", "redis"}
+	err = c.LoadConfig("../internal/config/testdata/telegraf-agent.toml")
+	assert.NoError(t, err)
 	a, _ = NewAgent(c)
-	assert.Equal(t, 2, len(a.Config.Plugins))
+	assert.Equal(t, 2, len(a.Config.Inputs))

 	c = config.NewConfig()
-	c.PluginFilters = []string{"mysql", "foo", "redis", "bar"}
-	c.LoadConfig("./internal/config/testdata/telegraf-agent.toml")
+	c.InputFilters = []string{"mysql", "foo", "redis", "bar"}
+	err = c.LoadConfig("../internal/config/testdata/telegraf-agent.toml")
+	assert.NoError(t, err)
 	a, _ = NewAgent(c)
-	assert.Equal(t, 2, len(a.Config.Plugins))
+	assert.Equal(t, 2, len(a.Config.Inputs))
 }

 func TestAgent_LoadOutput(t *testing.T) {
 	c := config.NewConfig()
 	c.OutputFilters = []string{"influxdb"}
-	c.LoadConfig("./internal/config/testdata/telegraf-agent.toml")
+	err := c.LoadConfig("../internal/config/testdata/telegraf-agent.toml")
+	assert.NoError(t, err)
 	a, _ := NewAgent(c)
 	assert.Equal(t, 2, len(a.Config.Outputs))

+	c = config.NewConfig()
+	c.OutputFilters = []string{"kafka"}
+	err = c.LoadConfig("../internal/config/testdata/telegraf-agent.toml")
+	assert.NoError(t, err)
+	a, _ = NewAgent(c)
+	assert.Equal(t, 1, len(a.Config.Outputs))
+
 	c = config.NewConfig()
 	c.OutputFilters = []string{}
-	c.LoadConfig("./internal/config/testdata/telegraf-agent.toml")
+	err = c.LoadConfig("../internal/config/testdata/telegraf-agent.toml")
+	assert.NoError(t, err)
 	a, _ = NewAgent(c)
 	assert.Equal(t, 3, len(a.Config.Outputs))

 	c = config.NewConfig()
 	c.OutputFilters = []string{"foo"}
-	c.LoadConfig("./internal/config/testdata/telegraf-agent.toml")
+	err = c.LoadConfig("../internal/config/testdata/telegraf-agent.toml")
+	assert.NoError(t, err)
 	a, _ = NewAgent(c)
 	assert.Equal(t, 0, len(a.Config.Outputs))

 	c = config.NewConfig()
 	c.OutputFilters = []string{"influxdb", "foo"}
-	c.LoadConfig("./internal/config/testdata/telegraf-agent.toml")
+	err = c.LoadConfig("../internal/config/testdata/telegraf-agent.toml")
+	assert.NoError(t, err)
 	a, _ = NewAgent(c)
 	assert.Equal(t, 2, len(a.Config.Outputs))

 	c = config.NewConfig()
 	c.OutputFilters = []string{"influxdb", "kafka"}
-	c.LoadConfig("./internal/config/testdata/telegraf-agent.toml")
+	err = c.LoadConfig("../internal/config/testdata/telegraf-agent.toml")
+	assert.NoError(t, err)
+	assert.Equal(t, 3, len(c.Outputs))
 	a, _ = NewAgent(c)
 	assert.Equal(t, 3, len(a.Config.Outputs))

 	c = config.NewConfig()
 	c.OutputFilters = []string{"influxdb", "foo", "kafka", "bar"}
-	c.LoadConfig("./internal/config/testdata/telegraf-agent.toml")
+	err = c.LoadConfig("../internal/config/testdata/telegraf-agent.toml")
+	assert.NoError(t, err)
 	a, _ = NewAgent(c)
 	assert.Equal(t, 3, len(a.Config.Outputs))
 }
--- a/circle.yml
+++ b/circle.yml
@@ -4,16 +4,17 @@ machine:
  post:
    - sudo service zookeeper stop
    - go version
-    - go version | grep 1.5.1 || sudo rm -rf /usr/local/go
-    - wget https://storage.googleapis.com/golang/go1.5.1.linux-amd64.tar.gz
-    - sudo tar -C /usr/local -xzf go1.5.1.linux-amd64.tar.gz
+    - go version | grep 1.6 || sudo rm -rf /usr/local/go
+    - wget https://storage.googleapis.com/golang/go1.6.linux-amd64.tar.gz
+    - sudo tar -C /usr/local -xzf go1.6.linux-amd64.tar.gz
    - go version

 dependencies:
-  cache_directories:
-    - "~/telegraf-build/src"
  override:
    - docker info
+  post:
+    - gem install fpm
+    - sudo apt-get install -y rpm python-boto

 test:
  override:
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -7,146 +7,270 @@ import (
 	"os"
 	"os/signal"
 	"strings"
+	"syscall"

-	"github.com/influxdb/telegraf"
-	"github.com/influxdb/telegraf/internal/config"
-	_ "github.com/influxdb/telegraf/outputs/all"
-	_ "github.com/influxdb/telegraf/plugins/all"
+	"github.com/influxdata/telegraf/agent"
+	"github.com/influxdata/telegraf/internal/config"
+	"github.com/influxdata/telegraf/plugins/inputs"
+	_ "github.com/influxdata/telegraf/plugins/inputs/all"
+	"github.com/influxdata/telegraf/plugins/outputs"
+	_ "github.com/influxdata/telegraf/plugins/outputs/all"
 )

 var fDebug = flag.Bool("debug", false,
 	"show metrics as they're generated to stdout")
+var fQuiet = flag.Bool("quiet", false,
+	"run in quiet mode")
 var fTest = flag.Bool("test", false, "gather metrics, print them out, and exit")
 var fConfig = flag.String("config", "", "configuration file to load")
-var fConfigDirectory = flag.String("configdirectory", "",
+var fConfigDirectory = flag.String("config-directory", "",
 	"directory containing additional *.conf files")
 var fVersion = flag.Bool("version", false, "display the version")
 var fSampleConfig = flag.Bool("sample-config", false,
 	"print out full sample configuration")
 var fPidfile = flag.String("pidfile", "", "file to write our pid to")
-var fPLuginFilters = flag.String("filter", "",
-	"filter the plugins to enable, separator is :")
-var fOutputFilters = flag.String("outputfilter", "",
+var fInputFilters = flag.String("input-filter", "",
+	"filter the inputs to enable, separator is :")
+var fInputList = flag.Bool("input-list", false,
+	"print available input plugins.")
+var fOutputFilters = flag.String("output-filter", "",
 	"filter the outputs to enable, separator is :")
+var fOutputList = flag.Bool("output-list", false,
+	"print available output plugins.")
 var fUsage = flag.String("usage", "",
 	"print usage for a plugin, ie, 'telegraf -usage mysql'")
+var fInputFiltersLegacy = flag.String("filter", "",
+	"filter the inputs to enable, separator is :")
+var fOutputFiltersLegacy = flag.String("outputfilter", "",
+	"filter the outputs to enable, separator is :")
+var fConfigDirectoryLegacy = flag.String("configdirectory", "",
+	"directory containing additional *.conf files")

 // Telegraf version
 //	-ldflags "-X main.Version=`git describe --always --tags`"
 var Version string

+const usage = `Telegraf, The plugin-driven server agent for collecting and reporting metrics.
+
+Usage:
+
+  telegraf <flags>
+
+The flags are:
+
+  -config <file>     configuration file to load
+  -test              gather metrics once, print them to stdout, and exit
+  -sample-config     print out full sample configuration to stdout
+  -config-directory  directory containing additional *.conf files
+  -input-filter      filter the input plugins to enable, separator is :
+  -input-list        print all the plugins inputs
+  -output-filter     filter the output plugins to enable, separator is :
+  -output-list       print all the available outputs
+  -usage             print usage for a plugin, ie, 'telegraf -usage mysql'
+  -debug             print metrics as they're generated to stdout
+  -quiet             run in quiet mode
+  -version           print the version to stdout
+
+Examples:
+
+  # generate a telegraf config file:
+  telegraf -sample-config > telegraf.conf
+
+  # generate config with only cpu input & influxdb output plugins defined
+  telegraf -sample-config -input-filter cpu -output-filter influxdb
+
+  # run a single telegraf collection, outputing metrics to stdout
+  telegraf -config telegraf.conf -test
+
+  # run telegraf with all plugins defined in config file
+  telegraf -config telegraf.conf
+
+  # run telegraf, enabling the cpu & memory input, and influxdb output plugins
+  telegraf -config telegraf.conf -input-filter cpu:mem -output-filter influxdb
+`
+
 func main() {
-	flag.Parse()
+	reload := make(chan bool, 1)
+	reload <- true
+	for <-reload {
+		reload <- false
+		flag.Usage = func() { usageExit(0) }
+		flag.Parse()
+		args := flag.Args()

-	var pluginFilters []string
-	if *fPLuginFilters != "" {
-		pluginsFilter := strings.TrimSpace(*fPLuginFilters)
-		pluginFilters = strings.Split(":"+pluginsFilter+":", ":")
-	}
+		if flag.NFlag() == 0 && len(args) == 0 {
+			usageExit(0)
+		}

-	var outputFilters []string
-	if *fOutputFilters != "" {
-		outputFilter := strings.TrimSpace(*fOutputFilters)
-		outputFilters = strings.Split(":"+outputFilter+":", ":")
-	}
+		var inputFilters []string
+		if *fInputFiltersLegacy != "" {
+			inputFilter := strings.TrimSpace(*fInputFiltersLegacy)
+			inputFilters = strings.Split(":"+inputFilter+":", ":")
+		}
+		if *fInputFilters != "" {
+			inputFilter := strings.TrimSpace(*fInputFilters)
+			inputFilters = strings.Split(":"+inputFilter+":", ":")
+		}

-	if *fVersion {
-		v := fmt.Sprintf("Telegraf - Version %s", Version)
-		fmt.Println(v)
-		return
-	}
+		var outputFilters []string
+		if *fOutputFiltersLegacy != "" {
+			outputFilter := strings.TrimSpace(*fOutputFiltersLegacy)
+			outputFilters = strings.Split(":"+outputFilter+":", ":")
+		}
+		if *fOutputFilters != "" {
+			outputFilter := strings.TrimSpace(*fOutputFilters)
+			outputFilters = strings.Split(":"+outputFilter+":", ":")
+		}

-	if *fSampleConfig {
-		config.PrintSampleConfig(pluginFilters, outputFilters)
-		return
-	}
-
-	if *fUsage != "" {
-		if err := config.PrintPluginConfig(*fUsage); err != nil {
-			if err2 := config.PrintOutputConfig(*fUsage); err2 != nil {
-				log.Fatalf("%s and %s", err, err2)
+		if len(args) > 0 {
+			switch args[0] {
+			case "version":
+				v := fmt.Sprintf("Telegraf - Version %s", Version)
+				fmt.Println(v)
+				return
+			case "config":
+				config.PrintSampleConfig(inputFilters, outputFilters)
+				return
 			}
 		}
-		return
-	}

-	var (
-		c   *config.Config
-		err error
-	)
+		if *fOutputList {
+			fmt.Println("Available Output Plugins:")
+			for k, _ := range outputs.Outputs {
+				fmt.Printf("  %s\n", k)
+			}
+			return
+		}

-	if *fConfig != "" {
-		c = config.NewConfig()
-		c.OutputFilters = outputFilters
-		c.PluginFilters = pluginFilters
-		err = c.LoadConfig(*fConfig)
+		if *fInputList {
+			fmt.Println("Available Input Plugins:")
+			for k, _ := range inputs.Inputs {
+				fmt.Printf("  %s\n", k)
+			}
+			return
+		}
+
+		if *fVersion {
+			v := fmt.Sprintf("Telegraf - Version %s", Version)
+			fmt.Println(v)
+			return
+		}
+
+		if *fSampleConfig {
+			config.PrintSampleConfig(inputFilters, outputFilters)
+			return
+		}
+
+		if *fUsage != "" {
+			if err := config.PrintInputConfig(*fUsage); err != nil {
+				if err2 := config.PrintOutputConfig(*fUsage); err2 != nil {
+					log.Fatalf("%s and %s", err, err2)
+				}
+			}
+			return
+		}
+
+		var (
+			c   *config.Config
+			err error
+		)
+
+		if *fConfig != "" {
+			c = config.NewConfig()
+			c.OutputFilters = outputFilters
+			c.InputFilters = inputFilters
+			err = c.LoadConfig(*fConfig)
+			if err != nil {
+				log.Fatal(err)
+			}
+		} else {
+			fmt.Println("You must specify a config file. See telegraf --help")
+			os.Exit(1)
+		}
+
+		if *fConfigDirectoryLegacy != "" {
+			err = c.LoadDirectory(*fConfigDirectoryLegacy)
+			if err != nil {
+				log.Fatal(err)
+			}
+		}
+
+		if *fConfigDirectory != "" {
+			err = c.LoadDirectory(*fConfigDirectory)
+			if err != nil {
+				log.Fatal(err)
+			}
+		}
+		if len(c.Outputs) == 0 {
+			log.Fatalf("Error: no outputs found, did you provide a valid config file?")
+		}
+		if len(c.Inputs) == 0 {
+			log.Fatalf("Error: no inputs found, did you provide a valid config file?")
+		}
+
+		ag, err := agent.NewAgent(c)
 		if err != nil {
 			log.Fatal(err)
 		}
-	} else {
-		fmt.Println("Usage: Telegraf")
-		flag.PrintDefaults()
-		return
-	}

-	if *fConfigDirectory != "" {
-		err = c.LoadDirectory(*fConfigDirectory)
+		if *fDebug {
+			ag.Config.Agent.Debug = true
+		}
+
+		if *fQuiet {
+			ag.Config.Agent.Quiet = true
+		}
+
+		if *fTest {
+			err = ag.Test()
+			if err != nil {
+				log.Fatal(err)
+			}
+			return
+		}
+
+		err = ag.Connect()
 		if err != nil {
 			log.Fatal(err)
 		}
-	}
-	if len(c.Outputs) == 0 {
-		log.Fatalf("Error: no outputs found, did you provide a valid config file?")
-	}
-	if len(c.Plugins) == 0 {
-		log.Fatalf("Error: no plugins found, did you provide a valid config file?")
-	}

-	ag, err := telegraf.NewAgent(c)
-	if err != nil {
-		log.Fatal(err)
-	}
+		shutdown := make(chan struct{})
+		signals := make(chan os.Signal)
+		signal.Notify(signals, os.Interrupt, syscall.SIGHUP)
+		go func() {
+			sig := <-signals
+			if sig == os.Interrupt {
+				close(shutdown)
+			}
+			if sig == syscall.SIGHUP {
+				log.Printf("Reloading Telegraf config\n")
+				<-reload
+				reload <- true
+				close(shutdown)
+			}
+		}()

-	if *fDebug {
-		ag.Config.Agent.Debug = true
-	}
+		log.Printf("Starting Telegraf (version %s)\n", Version)
+		log.Printf("Loaded outputs: %s", strings.Join(c.OutputNames(), " "))
+		log.Printf("Loaded inputs: %s", strings.Join(c.InputNames(), " "))
+		log.Printf("Tags enabled: %s", c.ListTags())

-	if *fTest {
-		err = ag.Test()
-		if err != nil {
-			log.Fatal(err)
-		}
-		return
-	}
+		if *fPidfile != "" {
+			f, err := os.Create(*fPidfile)
+			if err != nil {
+				log.Fatalf("Unable to create pidfile: %s", err)
+			}

-	err = ag.Connect()
-	if err != nil {
-		log.Fatal(err)
-	}
+			fmt.Fprintf(f, "%d\n", os.Getpid())

-	shutdown := make(chan struct{})
-	signals := make(chan os.Signal)
-	signal.Notify(signals, os.Interrupt)
-	go func() {
-		<-signals
-		close(shutdown)
-	}()
-
-	log.Printf("Starting Telegraf (version %s)\n", Version)
-	log.Printf("Loaded outputs: %s", strings.Join(c.OutputNames(), " "))
-	log.Printf("Loaded plugins: %s", strings.Join(c.PluginNames(), " "))
-	log.Printf("Tags enabled: %s", c.ListTags())
-
-	if *fPidfile != "" {
-		f, err := os.Create(*fPidfile)
-		if err != nil {
-			log.Fatalf("Unable to create pidfile: %s", err)
+			f.Close()
 		}

-		fmt.Fprintf(f, "%d\n", os.Getpid())
-
-		f.Close()
+		ag.Run(shutdown)
 	}
-
-	ag.Run(shutdown)
+}
+
+func usageExit(rc int) {
+	fmt.Println(usage)
+	os.Exit(rc)
 }
--- a/docs/CONFIGURATION.md
+++ b/docs/CONFIGURATION.md
@@ -0,0 +1,242 @@
+# Telegraf Configuration
+
+## Generating a Configuration File
+
+A default Telegraf config file can be generated using the -sample-config flag:
+`telegraf -sample-config > telegraf.conf`
+
+To generate a file with specific inputs and outputs, you can use the
+-input-filter and -output-filter flags:
+`telegraf -sample-config -input-filter cpu:mem:net:swap -output-filter influxdb:kafka`
+
+## Environment Variables
+
+Environment variables can be used anywhere in the config file, simply prepend
+them with $. For strings the variable must be within quotes (ie, "$STR_VAR"),
+for numbers and booleans they should be plain (ie, $INT_VAR, $BOOL_VAR)
+
+## `[global_tags]` Configuration
+
+Global tags can be specific in the `[global_tags]` section of the config file in
+key="value" format. All metrics being gathered on this host will be tagged
+with the tags specified here.
+
+## `[agent]` Configuration
+
+Telegraf has a few options you can configure under the `agent` section of the
+config.
+
+* **interval**: Default data collection interval for all inputs
+* **round_interval**: Rounds collection interval to 'interval'
+ie, if interval="10s" then always collect on :00, :10, :20, etc.
+* **metric_buffer_limit**: Telegraf will cache metric_buffer_limit metrics
+for each output, and will flush this buffer on a successful write.
+* **collection_jitter**: Collection jitter is used to jitter
+the collection by a random amount.
+Each plugin will sleep for a random time within jitter before collecting.
+This can be used to avoid many plugins querying things like sysfs at the
+same time, which can have a measurable effect on the system.
+* **flush_interval**: Default data flushing interval for all outputs.
+You should not set this below
+interval. Maximum flush_interval will be flush_interval + flush_jitter
+* **flush_jitter**: Jitter the flush interval by a random amount.
+This is primarily to avoid
+large write spikes for users running a large number of telegraf instances.
+ie, a jitter of 5s and flush_interval 10s means flushes will happen every 10-15s.
+* **debug**: Run telegraf in debug mode.
+* **quiet**: Run telegraf in quiet mode.
+* **hostname**: Override default hostname, if empty use os.Hostname().
+
+## `[inputs.xxx]` Configuration
+
+There are some configuration options that are configurable per input:
+
+* **name_override**: Override the base name of the measurement.
+(Default is the name of the input).
+* **name_prefix**: Specifies a prefix to attach to the measurement name.
+* **name_suffix**: Specifies a suffix to attach to the measurement name.
+* **tags**: A map of tags to apply to a specific input's measurements.
+* **interval**: How often to gather this metric. Normal plugins use a single
+global interval, but if one particular input should be run less or more often,
+you can configure that here.
+
+#### Input Filters
+
+There are also filters that can be configured per input:
+
+* **namepass**: An array of strings that is used to filter metrics generated by the
+current input. Each string in the array is tested as a glob match against
+measurement names and if it matches, the field is emitted.
+* **namedrop**: The inverse of pass, if a measurement name matches, it is not emitted.
+* **fieldpass**: An array of strings that is used to filter metrics generated by the
+current input. Each string in the array is tested as a glob match against field names
+and if it matches, the field is emitted.
+* **fielddrop**: The inverse of pass, if a field name matches, it is not emitted.
+* **tagpass**: tag names and arrays of strings that are used to filter
+measurements by the current input. Each string in the array is tested as a glob
+match against the tag name, and if it matches the measurement is emitted.
+* **tagdrop**: The inverse of tagpass. If a tag matches, the measurement is not
+emitted. This is tested on measurements that have passed the tagpass test.
+
+#### Input Configuration Examples
+
+This is a full working config that will output CPU data to an InfluxDB instance
+at 192.168.59.103:8086, tagging measurements with dc="denver-1". It will output
+measurements at a 10s interval and will collect per-cpu data, dropping any
+fields which begin with `time_`.
+
+```toml
+[global_tags]
+  dc = "denver-1"
+
+[agent]
+  interval = "10s"
+
+# OUTPUTS
+[[outputs.influxdb]]
+  url = "http://192.168.59.103:8086" # required.
+  database = "telegraf" # required.
+  precision = "s"
+
+# INPUTS
+[[inputs.cpu]]
+  percpu = true
+  totalcpu = false
+  # filter all fields beginning with 'time_'
+  fielddrop = ["time_*"]
+```
+
+#### Input Config: tagpass and tagdrop
+
+```toml
+[[inputs.cpu]]
+  percpu = true
+  totalcpu = false
+  fielddrop = ["cpu_time"]
+  # Don't collect CPU data for cpu6 & cpu7
+  [inputs.cpu.tagdrop]
+    cpu = [ "cpu6", "cpu7" ]
+
+[[inputs.disk]]
+  [inputs.disk.tagpass]
+    # tagpass conditions are OR, not AND.
+    # If the (filesystem is ext4 or xfs) OR (the path is /opt or /home)
+    # then the metric passes
+    fstype = [ "ext4", "xfs" ]
+    # Globs can also be used on the tag values
+    path = [ "/opt", "/home*" ]
+```
+
+#### Input Config: fieldpass and fielddrop
+
+```toml
+# Drop all metrics for guest & steal CPU usage
+[[inputs.cpu]]
+  percpu = false
+  totalcpu = true
+  fielddrop = ["usage_guest", "usage_steal"]
+
+# Only store inode related metrics for disks
+[[inputs.disk]]
+  fieldpass = ["inodes*"]
+```
+
+#### Input Config: namepass and namedrop
+
+```toml
+# Drop all metrics about containers for kubelet
+[[inputs.prometheus]]
+  urls = ["http://kube-node-1:4194/metrics"]
+  namedrop = ["container_*"]
+
+# Only store rest client related metrics for kubelet
+[[inputs.prometheus]]
+  urls = ["http://kube-node-1:4194/metrics"]
+  namepass = ["rest_client_*"]
+```
+
+#### Input config: prefix, suffix, and override
+
+This plugin will emit measurements with the name `cpu_total`
+
+```toml
+[[inputs.cpu]]
+  name_suffix = "_total"
+  percpu = false
+  totalcpu = true
+```
+
+This will emit measurements with the name `foobar`
+
+```toml
+[[inputs.cpu]]
+  name_override = "foobar"
+  percpu = false
+  totalcpu = true
+```
+
+#### Input config: tags
+
+This plugin will emit measurements with two additional tags: `tag1=foo` and
+`tag2=bar`
+
+```toml
+[[inputs.cpu]]
+  percpu = false
+  totalcpu = true
+  [inputs.cpu.tags]
+    tag1 = "foo"
+    tag2 = "bar"
+```
+
+#### Multiple inputs of the same type
+
+Additional inputs (or outputs) of the same type can be specified,
+just define more instances in the config file. It is highly recommended that
+you utilize `name_override`, `name_prefix`, or `name_suffix` config options
+to avoid measurement collisions:
+
+```toml
+[[inputs.cpu]]
+  percpu = false
+  totalcpu = true
+
+[[inputs.cpu]]
+  percpu = true
+  totalcpu = false
+  name_override = "percpu_usage"
+  fielddrop = ["cpu_time*"]
+```
+
+## `[outputs.xxx]` Configuration
+
+Telegraf also supports specifying multiple output sinks to send data to,
+configuring each output sink is different, but examples can be
+found by running `telegraf -sample-config`.
+
+Outputs also support the same configurable options as inputs
+(namepass, namedrop, tagpass, tagdrop)
+
+```toml
+[[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
@@ -0,0 +1,352 @@
+# Telegraf Input Data Formats
+
+Telegraf is able to parse the following input data formats into metrics:
+
+1. InfluxDB Line Protocol
+1. JSON
+1. Graphite
+1. Value, ie 45 or "booyah"
+
+Telegraf metrics, like InfluxDB
+[points](https://docs.influxdata.com/influxdb/v0.10/write_protocols/line/),
+are a combination of four basic parts:
+
+1. Measurement Name
+1. Tags
+1. Fields
+1. Timestamp
+
+These four parts are easily defined when using InfluxDB line-protocol as a
+data format. But there are other data formats that users may want to use which
+require more advanced configuration to create usable Telegraf metrics.
+
+Plugins such as `exec` and `kafka_consumer` parse textual data. Up until now,
+these plugins were statically configured to parse just a single
+data format. `exec` mostly only supported parsing JSON, and `kafka_consumer` only
+supported data in InfluxDB line-protocol.
+
+But now we are normalizing the parsing of various data formats across all
+plugins that can support it. You will be able to identify a plugin that supports
+different data formats by the presence of a `data_format` config option, for
+example, in the exec plugin:
+
+```toml
+[[inputs.exec]]
+  ## Commands array
+  commands = ["/tmp/test.sh", "/usr/bin/mycollector --foo=bar"]
+
+  ## measurement name suffix (for separating different commands)
+  name_suffix = "_mycollector"
+
+  ## Data format to consume. This can be "json", "influx" or "graphite"
+  ## 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"
+
+  ## Additional configuration options go here
+```
+
+Each data_format has an additional set of configuration options available, which
+I'll go over below.
+
+## Influx:
+
+There are no additional configuration options for InfluxDB line-protocol. The
+metrics are parsed directly into Telegraf metrics.
+
+#### Influx Configuration:
+
+```toml
+[[inputs.exec]]
+  ## Commands array
+  commands = ["/tmp/test.sh", "/usr/bin/mycollector --foo=bar"]
+
+  ## measurement name suffix (for separating different commands)
+  name_suffix = "_mycollector"
+
+  ## Data format to consume. This can be "json", "influx" or "graphite"
+  ## 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"
+```
+
+## JSON:
+
+The JSON data format flattens JSON into metric _fields_. For example, this JSON:
+
+```json
+{
+    "a": 5,
+    "b": {
+        "c": 6
+    }
+}
+```
+
+Would get translated into _fields_ of a measurement:
+
+```
+myjsonmetric a=5,b_c=6
+```
+
+The _measurement_ _name_ is usually the name of the plugin,
+but can be overridden using the `name_override` config option.
+
+#### JSON Configuration:
+
+The JSON data format supports specifying "tag keys". If specified, keys
+will be searched for in the root-level of the JSON blob. If the key(s) exist,
+they will be applied as tags to the Telegraf metrics.
+
+For example, if you had this configuration:
+
+```toml
+[[inputs.exec]]
+  ## Commands array
+  commands = ["/tmp/test.sh", "/usr/bin/mycollector --foo=bar"]
+
+  ## measurement name suffix (for separating different commands)
+  name_suffix = "_mycollector"
+
+  ## Data format to consume. This can be "json", "influx" or "graphite"
+  ## 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"
+
+  ## List of tag names to extract from top-level of JSON server response
+  tag_keys = [
+    "my_tag_1",
+    "my_tag_2"
+  ]
+```
+
+with this JSON output from a command:
+
+```json
+{
+    "a": 5,
+    "b": {
+        "c": 6
+    },
+    "my_tag_1": "foo"
+}
+```
+
+Your Telegraf metrics would get tagged with "my_tag_1"
+
+```
+exec_mycollector,my_tag_1=foo a=5,b_c=6
+```
+
+## Value:
+
+The "value" data format translates single values into Telegraf metrics. This
+is done by assigning a measurement name (which can be overridden using the
+`name_override` config option), and setting a single field ("value") as the
+parsed metric.
+
+#### Value Configuration:
+
+You can tell Telegraf what type of metric to collect by using the `data_type`
+configuration option.
+
+It is also recommended that you set `name_override` to a measurement name that
+makes sense for your metric, otherwise it will just be set to the name of the
+plugin.
+
+```toml
+[[inputs.exec]]
+  ## Commands array
+  commands = ["cat /proc/sys/kernel/random/entropy_avail"]
+
+  ## override the default metric name of "exec"
+  name_override = "entropy_available"
+
+  ## Data format to consume. This can be "json", "value", influx" or "graphite"
+  ## 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"
+  data_type = "integer"
+```
+
+## Graphite:
+
+The Graphite data format translates graphite _dot_ buckets directly into
+telegraf measurement names, with a single value field, and without any tags. For
+more advanced options, Telegraf supports specifying "templates" to translate
+graphite buckets into Telegraf metrics.
+
+#### Separator:
+
+You can specify a separator to use for the parsed metrics.
+By default, it will leave the metrics with a "." separator.
+Setting `separator = "_"` will translate:
+
+```
+cpu.usage.idle 99
+=> cpu_usage_idle value=99
+```
+
+#### Measurement/Tag Templates:
+
+The most basic template is to specify a single transformation to apply to all
+incoming metrics. _measurement_ is a special keyword that tells Telegraf which
+parts of the graphite bucket to combine into the measurement name. It can have a
+trailing `*` to indicate that the remainder of the metric should be used.
+Other words are considered tag keys. So the following template:
+
+```toml
+templates = [
+    "region.measurement*"
+]
+```
+
+would result in the following Graphite -> Telegraf transformation.
+
+```
+us-west.cpu.load 100
+=> cpu.load,region=us-west value=100
+```
+
+#### Field Templates:
+
+There is also a _field_ keyword, which can only be specified once.
+The field keyword tells Telegraf to give the metric that field name.
+So the following template:
+
+```toml
+templates = [
+    "measurement.measurement.field.field.region"
+]
+```
+
+would result in the following Graphite -> Telegraf transformation.
+
+```
+cpu.usage.idle.percent.us-west 100
+=> cpu_usage,region=us-west idle_percent=100
+```
+
+The field key can also be derived from the second "half" of the input metric-name by specifying ```field*```:
+```toml
+templates = [
+    "measurement.measurement.region.field*"
+]
+```
+
+would result in the following Graphite -> Telegraf transformation.
+
+```
+cpu.usage.us-west.idle.percentage 100
+=> cpu_usage,region=us-west idle_percentage=100
+```
+(This cannot be used in conjunction with "measurement*"!)
+
+#### Filter Templates:
+
+Users can also filter the template(s) to use based on the name of the bucket,
+using glob matching, like so:
+
+```toml
+templates = [
+    "cpu.* measurement.measurement.region",
+    "mem.* measurement.measurement.host"
+]
+```
+
+which would result in the following transformation:
+
+```
+cpu.load.us-west 100
+=> cpu_load,region=us-west value=100
+
+mem.cached.localhost 256
+=> mem_cached,host=localhost value=256
+```
+
+#### Adding Tags:
+
+Additional tags can be added to a metric that don't exist on the received metric.
+You can add additional tags by specifying them after the pattern.
+Tags have the same format as the line protocol.
+Multiple tags are separated by commas.
+
+```toml
+templates = [
+    "measurement.measurement.field.region datacenter=1a"
+]
+```
+
+would result in the following Graphite -> Telegraf transformation.
+
+```
+cpu.usage.idle.us-west 100
+=> cpu_usage,region=us-west,datacenter=1a idle=100
+```
+
+There are many more options available,
+[More details can be found here](https://github.com/influxdata/influxdb/tree/master/services/graphite#templates)
+
+#### Graphite Configuration:
+
+```toml
+[[inputs.exec]]
+  ## Commands array
+  commands = ["/tmp/test.sh", "/usr/bin/mycollector --foo=bar"]
+
+  ## measurement name suffix (for separating different commands)
+  name_suffix = "_mycollector"
+
+  ## Data format to consume. This can be "json", "influx" or "graphite" (line-protocol)
+  ## 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"
+
+  ## This string will be used to join the matched values.
+  separator = "_"
+
+  ## Each template line requires a template pattern. It can have an optional
+  ## filter before the template and separated by spaces. It can also have optional extra
+  ## tags following the template. Multiple tags should be separated by commas and no spaces
+  ## similar to the line protocol format. There can be only one default template.
+  ## Templates support below format:
+  ## 1. filter + template
+  ## 2. filter + template + extra tag
+  ## 3. filter + template with field key
+  ## 4. default template
+  templates = [
+    "*.app env.service.resource.measurement",
+    "stats.* .host.measurement* region=us-west,agent=sensu",
+    "stats2.* .host.measurement.field",
+    "measurement*"
+  ]
+```
+
+## Nagios:
+
+There are no additional configuration options for Nagios line-protocol. The
+metrics are parsed directly into Telegraf metrics.
+
+Note: Nagios Input Data Formats is only supported in `exec` input plugin.
+
+#### Nagios Configuration:
+
+```toml
+[[inputs.exec]]
+  ## Commands array
+  commands = ["/usr/lib/nagios/plugins/check_load", "-w 5,6,7 -c 7,8,9"]
+
+  ## measurement name suffix (for separating different commands)
+  name_suffix = "_mycollector"
+
+  ## Data format to consume. This can be "json", "influx", "graphite" or "nagios"
+  ## 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"
+```
--- a/docs/DATA_FORMATS_OUTPUT.md
+++ b/docs/DATA_FORMATS_OUTPUT.md
@@ -0,0 +1,131 @@
+# Telegraf Output Data Formats
+
+Telegraf metrics, like InfluxDB
+[points](https://docs.influxdata.com/influxdb/v0.10/write_protocols/line/),
+are a combination of four basic parts:
+
+1. Measurement Name
+1. Tags
+1. Fields
+1. Timestamp
+
+In InfluxDB line protocol, these 4 parts are easily defined in textual form:
+
+```
+measurement_name[,tag1=val1,...]  field1=val1[,field2=val2,...]  [timestamp]
+```
+
+For Telegraf outputs that write textual data (such as `kafka`, `mqtt`, and `file`),
+InfluxDB line protocol was originally the only available output format. But now
+we are normalizing telegraf metric "serializers" into a
+[plugin-like interface](https://github.com/influxdata/telegraf/tree/master/plugins/serializers)
+across all output plugins that can support it.
+You will be able to identify a plugin that supports different data formats
+by the presence of a `data_format`
+config option, for example, in the `file` output plugin:
+
+```toml
+[[outputs.file]]
+  ## Files to write to, "stdout" is a specially handled file.
+  files = ["stdout"]
+
+  ## Data format to output. This can be "influx" or "graphite"
+  ## 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"
+
+  ## Additional configuration options go here
+```
+
+Each data_format has an additional set of configuration options available, which
+I'll go over below.
+
+## Influx:
+
+There are no additional configuration options for InfluxDB line-protocol. The
+metrics are serialized directly into InfluxDB line-protocol.
+
+#### Influx Configuration:
+
+```toml
+[[outputs.file]]
+  ## Files to write to, "stdout" is a specially handled file.
+  files = ["stdout", "/tmp/metrics.out"]
+
+  ## Data format to output. This can be "influx", "json" or "graphite"
+  ## 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"
+```
+
+## Graphite:
+
+The Graphite data format translates Telegraf metrics into _dot_ buckets.
+The format is:
+
+```
+[prefix].[host tag].[all tags (alphabetical)].[measurement name].[field name] value timestamp
+```
+
+Which means the following influx metric -> graphite conversion would happen:
+
+```
+cpu,cpu=cpu-total,dc=us-east-1,host=tars usage_idle=98.09,usage_user=0.89 1455320660004257758
+=>
+tars.cpu-total.us-east-1.cpu.usage_user 0.89 1455320690
+tars.cpu-total.us-east-1.cpu.usage_idle 98.09 1455320690
+```
+
+`prefix` is a configuration option when using the graphite output data format.
+
+#### Graphite Configuration:
+
+```toml
+[[outputs.file]]
+  ## Files to write to, "stdout" is a specially handled file.
+  files = ["stdout", "/tmp/metrics.out"]
+
+  ## Data format to output. This can be "influx", "json" or "graphite"
+  ## 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"
+
+  prefix = "telegraf"
+```
+
+## Json:
+
+The Json data format serialized Telegraf metrics in json format. The format is:
+
+```json
+{
+   "fields":{
+      "field_1":30,
+      "field_2":4,
+      "field_N":59,
+      "n_images":660
+   },
+   "name":"docker",
+   "tags":{
+      "host":"raynor"
+   },
+   "timestamp":1458229140
+}
+```
+
+#### Json Configuration:
+
+```toml
+[[outputs.file]]
+  ## Files to write to, "stdout" is a specially handled file.
+  files = ["stdout", "/tmp/metrics.out"]
+
+  ## Data format to output. This can be "influx", "json" or "graphite"
+  ## 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"
+```
--- a/docs/LICENSE_OF_DEPENDENCIES.md
+++ b/docs/LICENSE_OF_DEPENDENCIES.md
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
--- a/etc/telegraf_windows.conf
+++ b/etc/telegraf_windows.conf
@@ -0,0 +1,164 @@
+# Telegraf configuration
+
+# Telegraf is entirely plugin driven. All metrics are gathered from the
+# declared inputs, and sent to the declared outputs.
+
+# Plugins must be declared in here to be active.
+# To deactivate a plugin, comment out the name and any variables.
+
+# Use 'telegraf -config telegraf.conf -test' to see what metrics a config
+# file would generate.
+
+# Global tags can be specified here in key="value" format.
+[global_tags]
+  # dc = "us-east-1" # will tag all metrics with dc=us-east-1
+  # rack = "1a"
+
+# Configuration for telegraf agent
+[agent]
+  ## Default data collection interval for all inputs
+  interval = "10s"
+  ## Rounds collection interval to 'interval'
+  ## ie, if interval="10s" then always collect on :00, :10, :20, etc.
+  round_interval = true
+
+  ## Telegraf will cache metric_buffer_limit metrics for each output, and will
+  ## flush this buffer on a successful write.
+  metric_buffer_limit = 1000
+  ## Flush the buffer whenever full, regardless of flush_interval.
+  flush_buffer_when_full = true
+
+  ## Collection jitter is used to jitter the collection by a random amount.
+  ## Each plugin will sleep for a random time within jitter before collecting.
+  ## This can be used to avoid many plugins querying things like sysfs at the
+  ## same time, which can have a measurable effect on the system.
+  collection_jitter = "0s"
+
+  ## Default flushing interval for all outputs. You shouldn't set this below
+  ## interval. Maximum flush_interval will be flush_interval + flush_jitter
+  flush_interval = "10s"
+  ## Jitter the flush interval by a random amount. This is primarily to avoid
+  ## large write spikes for users running a large number of telegraf instances.
+  ## ie, a jitter of 5s and interval 10s means flushes will happen every 10-15s
+  flush_jitter = "0s"
+
+  ## Run telegraf in debug mode
+  debug = false
+  ## Run telegraf in quiet mode
+  quiet = false
+  ## Override default hostname, if empty use os.Hostname()
+  hostname = ""
+
+
+###############################################################################
+#                                  OUTPUTS                                    #
+###############################################################################
+
+# Configuration for influxdb server to send metrics to
+[[outputs.influxdb]]
+  # The full HTTP or UDP endpoint URL for your InfluxDB instance.
+  # Multiple urls can be specified but it is assumed that they are part of the same
+  # cluster, this means that only ONE of the urls will be written to each interval.
+  # urls = ["udp://localhost:8089"] # UDP endpoint example
+  urls = ["http://localhost:8086"] # required
+  # The target database for metrics (telegraf will create it if not exists)
+  database = "telegraf" # required
+  # Precision of writes, valid values are "ns", "us" (or "µs"), "ms", "s", "m", "h".
+  # note: using second precision greatly helps InfluxDB compression
+  precision = "s"
+
+  ## Write timeout (for the InfluxDB client), formatted as a string.
+  ## If not provided, will default to 5s. 0s means no timeout (not recommended).
+  timeout = "5s"
+  # username = "telegraf"
+  # password = "metricsmetricsmetricsmetrics"
+  # Set the user agent for HTTP POSTs (can be useful for log differentiation)
+  # user_agent = "telegraf"
+  # Set UDP payload size, defaults to InfluxDB UDP Client default (512 bytes)
+  # udp_payload = 512
+
+
+###############################################################################
+#                                  INPUTS                                     #
+###############################################################################
+
+# Windows Performance Counters plugin.
+# These are the recommended method of monitoring system metrics on windows,
+# as the regular system plugins (inputs.cpu, inputs.mem, etc.) rely on WMI,
+# which utilizes a lot of system resources.
+#
+# See more configuration examples at:
+#   https://github.com/influxdata/telegraf/tree/master/plugins/inputs/win_perf_counters
+
+[[inputs.win_perf_counters]]
+  [[inputs.win_perf_counters.object]]
+    # Processor usage, alternative to native, reports on a per core.
+    ObjectName = "Processor"
+    Instances = ["*"]
+    Counters = ["% Idle Time", "% Interrupt Time", "% Privileged Time", "% User Time", "% Processor Time"]
+    Measurement = "win_cpu"
+    #IncludeTotal=false #Set to true to include _Total instance when querying for all (*).
+
+  [[inputs.win_perf_counters.object]]
+    # Disk times and queues
+    ObjectName = "LogicalDisk"
+    Instances = ["*"]
+    Counters = ["% Idle Time", "% Disk Time","% Disk Read Time", "% Disk Write Time", "% User Time", "Current Disk Queue Length"]
+    Measurement = "win_disk"
+    #IncludeTotal=false #Set to true to include _Total instance when querying for all (*).
+
+  [[inputs.win_perf_counters.object]]
+    ObjectName = "System"
+    Counters = ["Context Switches/sec","System Calls/sec"]
+    Instances = ["------"]
+    Measurement = "win_system"
+    #IncludeTotal=false #Set to true to include _Total instance when querying for all (*).
+
+  [[inputs.win_perf_counters.object]]
+    # Example query where the Instance portion must be removed to get data back, such as from the Memory object.
+    ObjectName = "Memory"
+    Counters = ["Available Bytes","Cache Faults/sec","Demand Zero Faults/sec","Page Faults/sec","Pages/sec","Transition Faults/sec","Pool Nonpaged Bytes","Pool Paged Bytes"]
+    Instances = ["------"] # Use 6 x - to remove the Instance bit from the query.
+    Measurement = "win_mem"
+    #IncludeTotal=false #Set to true to include _Total instance when querying for all (*).
+
+
+# Windows system plugins using WMI (disabled by default, using
+# win_perf_counters over WMI is recommended)
+
+# Read metrics about cpu usage
+#[[inputs.cpu]]
+  ## Whether to report per-cpu stats or not
+  #percpu = true
+  ## Whether to report total system cpu stats or not
+  #totalcpu = true
+  ## Comment this line if you want the raw CPU time metrics
+  #fielddrop = ["time_*"]
+
+# Read metrics about disk usage by mount point
+#[[inputs.disk]]
+  ## By default, telegraf gather stats for all mountpoints.
+  ## Setting mountpoints will restrict the stats to the specified mountpoints.
+  ## mount_points=["/"]
+
+  ## Ignore some mountpoints by filesystem type. For example (dev)tmpfs (usually
+  ## present on /run, /var/run, /dev/shm or /dev).
+  #ignore_fs = ["tmpfs", "devtmpfs"]
+
+# Read metrics about disk IO by device
+#[[inputs.diskio]]
+  ## By default, telegraf will gather stats for all devices including
+  ## disk partitions.
+  ## Setting devices will restrict the stats to the specified devices.
+  ## devices = ["sda", "sdb"]
+  ## Uncomment the following line if you do not need disk serial numbers.
+  ## skip_serial_number = true
+
+# Read metrics about memory usage
+#[[inputs.mem]]
+  # no configuration
+
+# Read metrics about swap memory usage
+#[[inputs.swap]]
+  # no configuration
+
--- a/input.go
+++ b/input.go
@@ -0,0 +1,31 @@
+package telegraf
+
+type Input interface {
+	// SampleConfig returns the default configuration of the Input
+	SampleConfig() string
+
+	// Description returns a one-sentence description on the Input
+	Description() string
+
+	// Gather takes in an accumulator and adds the metrics that the Input
+	// gathers. This is called every "interval"
+	Gather(Accumulator) error
+}
+
+type ServiceInput interface {
+	// SampleConfig returns the default configuration of the Input
+	SampleConfig() string
+
+	// Description returns a one-sentence description on the Input
+	Description() string
+
+	// Gather takes in an accumulator and adds the metrics that the Input
+	// gathers. This is called every "interval"
+	Gather(Accumulator) error
+
+	// Start starts the ServiceInput's service, whatever that may be
+	Start(Accumulator) error
+
+	// Stop stops the services and closes any necessary channels and connections
+	Stop()
+}
--- a/internal/config/config.go
+++ b/internal/config/config.go
--- a/internal/config/config_test.go
+++ b/internal/config/config_test.go
@@ -1,36 +1,84 @@
 package config

 import (
+	"os"
 	"testing"
 	"time"

-	"github.com/influxdb/telegraf/plugins"
-	"github.com/influxdb/telegraf/plugins/exec"
-	"github.com/influxdb/telegraf/plugins/memcached"
-	"github.com/influxdb/telegraf/plugins/procstat"
+	"github.com/influxdata/telegraf/internal/models"
+	"github.com/influxdata/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs/exec"
+	"github.com/influxdata/telegraf/plugins/inputs/memcached"
+	"github.com/influxdata/telegraf/plugins/inputs/procstat"
+	"github.com/influxdata/telegraf/plugins/parsers"
+
 	"github.com/stretchr/testify/assert"
 )

-func TestConfig_LoadSinglePlugin(t *testing.T) {
+func TestConfig_LoadSingleInputWithEnvVars(t *testing.T) {
 	c := NewConfig()
-	c.LoadConfig("./testdata/single_plugin.toml")
+	err := os.Setenv("MY_TEST_SERVER", "192.168.1.1")
+	assert.NoError(t, err)
+	err = os.Setenv("TEST_INTERVAL", "10s")
+	assert.NoError(t, err)
+	c.LoadConfig("./testdata/single_plugin_env_vars.toml")

-	memcached := plugins.Plugins["memcached"]().(*memcached.Memcached)
-	memcached.Servers = []string{"localhost"}
+	memcached := inputs.Inputs["memcached"]().(*memcached.Memcached)
+	memcached.Servers = []string{"192.168.1.1"}

-	mConfig := &PluginConfig{
+	mConfig := &internal_models.InputConfig{
 		Name: "memcached",
-		Filter: Filter{
-			Drop: []string{"other", "stuff"},
-			Pass: []string{"some", "strings"},
-			TagDrop: []TagFilter{
-				TagFilter{
+		Filter: internal_models.Filter{
+			NameDrop:  []string{"metricname2"},
+			NamePass:  []string{"metricname1"},
+			FieldDrop: []string{"other", "stuff"},
+			FieldPass: []string{"some", "strings"},
+			TagDrop: []internal_models.TagFilter{
+				internal_models.TagFilter{
 					Name:   "badtag",
 					Filter: []string{"othertag"},
 				},
 			},
-			TagPass: []TagFilter{
-				TagFilter{
+			TagPass: []internal_models.TagFilter{
+				internal_models.TagFilter{
+					Name:   "goodtag",
+					Filter: []string{"mytag"},
+				},
+			},
+			IsActive: true,
+		},
+		Interval: 10 * time.Second,
+	}
+	mConfig.Tags = make(map[string]string)
+
+	assert.Equal(t, memcached, c.Inputs[0].Input,
+		"Testdata did not produce a correct memcached struct.")
+	assert.Equal(t, mConfig, c.Inputs[0].Config,
+		"Testdata did not produce correct memcached metadata.")
+}
+
+func TestConfig_LoadSingleInput(t *testing.T) {
+	c := NewConfig()
+	c.LoadConfig("./testdata/single_plugin.toml")
+
+	memcached := inputs.Inputs["memcached"]().(*memcached.Memcached)
+	memcached.Servers = []string{"localhost"}
+
+	mConfig := &internal_models.InputConfig{
+		Name: "memcached",
+		Filter: internal_models.Filter{
+			NameDrop:  []string{"metricname2"},
+			NamePass:  []string{"metricname1"},
+			FieldDrop: []string{"other", "stuff"},
+			FieldPass: []string{"some", "strings"},
+			TagDrop: []internal_models.TagFilter{
+				internal_models.TagFilter{
+					Name:   "badtag",
+					Filter: []string{"othertag"},
+				},
+			},
+			TagPass: []internal_models.TagFilter{
+				internal_models.TagFilter{
 					Name:   "goodtag",
 					Filter: []string{"mytag"},
 				},
@@ -39,10 +87,11 @@ func TestConfig_LoadSinglePlugin(t *testing.T) {
 		},
 		Interval: 5 * time.Second,
 	}
+	mConfig.Tags = make(map[string]string)

-	assert.Equal(t, memcached, c.Plugins[0].Plugin,
+	assert.Equal(t, memcached, c.Inputs[0].Input,
 		"Testdata did not produce a correct memcached struct.")
-	assert.Equal(t, mConfig, c.Plugins[0].Config,
+	assert.Equal(t, mConfig, c.Inputs[0].Config,
 		"Testdata did not produce correct memcached metadata.")
 }

@@ -57,22 +106,24 @@ func TestConfig_LoadDirectory(t *testing.T) {
 		t.Error(err)
 	}

-	memcached := plugins.Plugins["memcached"]().(*memcached.Memcached)
+	memcached := inputs.Inputs["memcached"]().(*memcached.Memcached)
 	memcached.Servers = []string{"localhost"}

-	mConfig := &PluginConfig{
+	mConfig := &internal_models.InputConfig{
 		Name: "memcached",
-		Filter: Filter{
-			Drop: []string{"other", "stuff"},
-			Pass: []string{"some", "strings"},
-			TagDrop: []TagFilter{
-				TagFilter{
+		Filter: internal_models.Filter{
+			NameDrop:  []string{"metricname2"},
+			NamePass:  []string{"metricname1"},
+			FieldDrop: []string{"other", "stuff"},
+			FieldPass: []string{"some", "strings"},
+			TagDrop: []internal_models.TagFilter{
+				internal_models.TagFilter{
 					Name:   "badtag",
 					Filter: []string{"othertag"},
 				},
 			},
-			TagPass: []TagFilter{
-				TagFilter{
+			TagPass: []internal_models.TagFilter{
+				internal_models.TagFilter{
 					Name:   "goodtag",
 					Filter: []string{"mytag"},
 				},
@@ -81,216 +132,42 @@ func TestConfig_LoadDirectory(t *testing.T) {
 		},
 		Interval: 5 * time.Second,
 	}
-	assert.Equal(t, memcached, c.Plugins[0].Plugin,
+	mConfig.Tags = make(map[string]string)
+
+	assert.Equal(t, memcached, c.Inputs[0].Input,
 		"Testdata did not produce a correct memcached struct.")
-	assert.Equal(t, mConfig, c.Plugins[0].Config,
+	assert.Equal(t, mConfig, c.Inputs[0].Config,
 		"Testdata did not produce correct memcached metadata.")

-	ex := plugins.Plugins["exec"]().(*exec.Exec)
-	ex.Commands = []*exec.Command{
-		&exec.Command{
-			Command: "/usr/bin/myothercollector --foo=bar",
-			Name:    "myothercollector",
-		},
+	ex := inputs.Inputs["exec"]().(*exec.Exec)
+	p, err := parsers.NewJSONParser("exec", nil, nil)
+	assert.NoError(t, err)
+	ex.SetParser(p)
+	ex.Command = "/usr/bin/myothercollector --foo=bar"
+	eConfig := &internal_models.InputConfig{
+		Name:              "exec",
+		MeasurementSuffix: "_myothercollector",
 	}
-	eConfig := &PluginConfig{Name: "exec"}
-	assert.Equal(t, ex, c.Plugins[1].Plugin,
+	eConfig.Tags = make(map[string]string)
+	assert.Equal(t, ex, c.Inputs[1].Input,
 		"Merged Testdata did not produce a correct exec struct.")
-	assert.Equal(t, eConfig, c.Plugins[1].Config,
+	assert.Equal(t, eConfig, c.Inputs[1].Config,
 		"Merged Testdata did not produce correct exec metadata.")

 	memcached.Servers = []string{"192.168.1.1"}
-	assert.Equal(t, memcached, c.Plugins[2].Plugin,
+	assert.Equal(t, memcached, c.Inputs[2].Input,
 		"Testdata did not produce a correct memcached struct.")
-	assert.Equal(t, mConfig, c.Plugins[2].Config,
+	assert.Equal(t, mConfig, c.Inputs[2].Config,
 		"Testdata did not produce correct memcached metadata.")

-	pstat := plugins.Plugins["procstat"]().(*procstat.Procstat)
-	pstat.Specifications = []*procstat.Specification{
-		&procstat.Specification{
-			PidFile: "/var/run/grafana-server.pid",
-		},
-		&procstat.Specification{
-			PidFile: "/var/run/influxdb/influxd.pid",
-		},
-	}
+	pstat := inputs.Inputs["procstat"]().(*procstat.Procstat)
+	pstat.PidFile = "/var/run/grafana-server.pid"

-	pConfig := &PluginConfig{Name: "procstat"}
+	pConfig := &internal_models.InputConfig{Name: "procstat"}
+	pConfig.Tags = make(map[string]string)

-	assert.Equal(t, pstat, c.Plugins[3].Plugin,
+	assert.Equal(t, pstat, c.Inputs[3].Input,
 		"Merged Testdata did not produce a correct procstat struct.")
-	assert.Equal(t, pConfig, c.Plugins[3].Config,
+	assert.Equal(t, pConfig, c.Inputs[3].Config,
 		"Merged Testdata did not produce correct procstat metadata.")
 }
-
-func TestFilter_Empty(t *testing.T) {
-	f := Filter{}
-
-	measurements := []string{
-		"foo",
-		"bar",
-		"barfoo",
-		"foo_bar",
-		"foo.bar",
-		"foo-bar",
-		"supercalifradjulisticexpialidocious",
-	}
-
-	for _, measurement := range measurements {
-		if !f.ShouldPass(measurement) {
-			t.Errorf("Expected measurement %s to pass", measurement)
-		}
-	}
-}
-
-func TestFilter_Pass(t *testing.T) {
-	f := Filter{
-		Pass: []string{"foo*", "cpu_usage_idle"},
-	}
-
-	passes := []string{
-		"foo",
-		"foo_bar",
-		"foo.bar",
-		"foo-bar",
-		"cpu_usage_idle",
-	}
-
-	drops := []string{
-		"bar",
-		"barfoo",
-		"bar_foo",
-		"cpu_usage_busy",
-	}
-
-	for _, measurement := range passes {
-		if !f.ShouldPass(measurement) {
-			t.Errorf("Expected measurement %s to pass", measurement)
-		}
-	}
-
-	for _, measurement := range drops {
-		if f.ShouldPass(measurement) {
-			t.Errorf("Expected measurement %s to drop", measurement)
-		}
-	}
-}
-
-func TestFilter_Drop(t *testing.T) {
-	f := Filter{
-		Drop: []string{"foo*", "cpu_usage_idle"},
-	}
-
-	drops := []string{
-		"foo",
-		"foo_bar",
-		"foo.bar",
-		"foo-bar",
-		"cpu_usage_idle",
-	}
-
-	passes := []string{
-		"bar",
-		"barfoo",
-		"bar_foo",
-		"cpu_usage_busy",
-	}
-
-	for _, measurement := range passes {
-		if !f.ShouldPass(measurement) {
-			t.Errorf("Expected measurement %s to pass", measurement)
-		}
-	}
-
-	for _, measurement := range drops {
-		if f.ShouldPass(measurement) {
-			t.Errorf("Expected measurement %s to drop", measurement)
-		}
-	}
-}
-
-func TestFilter_TagPass(t *testing.T) {
-	filters := []TagFilter{
-		TagFilter{
-			Name:   "cpu",
-			Filter: []string{"cpu-*"},
-		},
-		TagFilter{
-			Name:   "mem",
-			Filter: []string{"mem_free"},
-		}}
-	f := Filter{
-		TagPass: filters,
-	}
-
-	passes := []map[string]string{
-		{"cpu": "cpu-total"},
-		{"cpu": "cpu-0"},
-		{"cpu": "cpu-1"},
-		{"cpu": "cpu-2"},
-		{"mem": "mem_free"},
-	}
-
-	drops := []map[string]string{
-		{"cpu": "cputotal"},
-		{"cpu": "cpu0"},
-		{"cpu": "cpu1"},
-		{"cpu": "cpu2"},
-		{"mem": "mem_used"},
-	}
-
-	for _, tags := range passes {
-		if !f.ShouldTagsPass(tags) {
-			t.Errorf("Expected tags %v to pass", tags)
-		}
-	}
-
-	for _, tags := range drops {
-		if f.ShouldTagsPass(tags) {
-			t.Errorf("Expected tags %v to drop", tags)
-		}
-	}
-}
-
-func TestFilter_TagDrop(t *testing.T) {
-	filters := []TagFilter{
-		TagFilter{
-			Name:   "cpu",
-			Filter: []string{"cpu-*"},
-		},
-		TagFilter{
-			Name:   "mem",
-			Filter: []string{"mem_free"},
-		}}
-	f := Filter{
-		TagDrop: filters,
-	}
-
-	drops := []map[string]string{
-		{"cpu": "cpu-total"},
-		{"cpu": "cpu-0"},
-		{"cpu": "cpu-1"},
-		{"cpu": "cpu-2"},
-		{"mem": "mem_free"},
-	}
-
-	passes := []map[string]string{
-		{"cpu": "cputotal"},
-		{"cpu": "cpu0"},
-		{"cpu": "cpu1"},
-		{"cpu": "cpu2"},
-		{"mem": "mem_used"},
-	}
-
-	for _, tags := range passes {
-		if !f.ShouldTagsPass(tags) {
-			t.Errorf("Expected tags %v to pass", tags)
-		}
-	}
-
-	for _, tags := range drops {
-		if f.ShouldTagsPass(tags) {
-			t.Errorf("Expected tags %v to drop", tags)
-		}
-	}
-}
--- a/internal/config/testdata/single_plugin.toml
+++ b/internal/config/testdata/single_plugin.toml
@@ -1,9 +1,11 @@
-[[plugins.memcached]]
+[[inputs.memcached]]
  servers = ["localhost"]
-  pass = ["some", "strings"]
-  drop = ["other", "stuff"]
+  namepass = ["metricname1"]
+  namedrop = ["metricname2"]
+  fieldpass = ["some", "strings"]
+  fielddrop = ["other", "stuff"]
  interval = "5s"
-  [plugins.memcached.tagpass]
+  [inputs.memcached.tagpass]
    goodtag = ["mytag"]
-  [plugins.memcached.tagdrop]
+  [inputs.memcached.tagdrop]
    badtag = ["othertag"]
--- a/internal/config/testdata/single_plugin_env_vars.toml
+++ b/internal/config/testdata/single_plugin_env_vars.toml
@@ -0,0 +1,11 @@
+[[inputs.memcached]]
+  servers = ["$MY_TEST_SERVER"]
+  namepass = ["metricname1"]
+  namedrop = ["metricname2"]
+  fieldpass = ["some", "strings"]
+  fielddrop = ["other", "stuff"]
+  interval = "$TEST_INTERVAL"
+  [inputs.memcached.tagpass]
+    goodtag = ["mytag"]
+  [inputs.memcached.tagdrop]
+    badtag = ["othertag"]
--- a/internal/config/testdata/subconfig/exec.conf
+++ b/internal/config/testdata/subconfig/exec.conf
@@ -1,8 +1,4 @@
-[[plugins.exec]]
-  # specify commands via an array of tables
-  [[plugins.exec.commands]]
+[[inputs.exec]]
  # the command to run
  command = "/usr/bin/myothercollector --foo=bar"
-
-  # name of the command (used as a prefix for measurements)
-  name = "myothercollector"
+  name_suffix = "_myothercollector"
--- a/internal/config/testdata/subconfig/memcached.conf
+++ b/internal/config/testdata/subconfig/memcached.conf
@@ -1,9 +1,11 @@
-[[plugins.memcached]]
+[[inputs.memcached]]
  servers = ["192.168.1.1"]
+  namepass = ["metricname1"]
+  namedrop = ["metricname2"]
  pass = ["some", "strings"]
  drop = ["other", "stuff"]
  interval = "5s"
-  [plugins.memcached.tagpass]
+  [inputs.memcached.tagpass]
    goodtag = ["mytag"]
-  [plugins.memcached.tagdrop]
+  [inputs.memcached.tagdrop]
    badtag = ["othertag"]
--- a/internal/config/testdata/subconfig/procstat.conf
+++ b/internal/config/testdata/subconfig/procstat.conf
@@ -1,5 +1,2 @@
-[[plugins.procstat]]
-  [[plugins.procstat.specifications]]
+[[inputs.procstat]]
  pid_file = "/var/run/grafana-server.pid"
-  [[plugins.procstat.specifications]]
-  pid_file = "/var/run/influxdb/influxd.pid"
--- a/internal/config/testdata/telegraf-agent.toml
+++ b/internal/config/testdata/telegraf-agent.toml
@@ -1,7 +1,7 @@
 # Telegraf configuration

 # Telegraf is entirely plugin driven. All metrics are gathered from the
-# declared plugins.
+# declared inputs.

 # Even if a plugin has no configuration, it must be declared in here
 # to be active. Declaring a plugin means just specifying the name
@@ -20,21 +20,14 @@
 # with 'required'. Be sure to edit those to make this configuration work.

 # Tags can also be specified via a normal map, but only one form at a time:
-[tags]
-  # dc = "us-east-1"
+[global_tags]
+  dc = "us-east-1"

 # Configuration for telegraf agent
 [agent]
  # Default data collection interval for all plugins
  interval = "10s"

-  # If utc = false, uses local time (utc is highly recommended)
-  utc = true
-
-  # Precision of writes, valid values are n, u, ms, s, m, and h
-  # note: using second precision greatly helps InfluxDB compression
-  precision = "s"
-
  # run telegraf in debug mode
  debug = false

@@ -46,8 +39,6 @@
 #                                  OUTPUTS                                    #
 ###############################################################################

-[outputs]
-
 # Configuration for influxdb server to send metrics to
 [[outputs.influxdb]]
  # The full HTTP endpoint URL for your InfluxDB instance
@@ -58,17 +49,6 @@
  # The target database for metrics. This database must already exist
  database = "telegraf" # required.

-  # Connection timeout (for the connection with InfluxDB), formatted as a string.
-  # Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
-  # If not provided, will default to 0 (no timeout)
-  # timeout = "5s"
-
-  # username = "telegraf"
-  # password = "metricsmetricsmetricsmetrics"
-
-  # Set the user agent for the POSTs (can be useful for log differentiation)
-  # user_agent = "telegraf"
-
 [[outputs.influxdb]]
  urls = ["udp://localhost:8089"]
  database = "udp-telegraf"
@@ -88,15 +68,13 @@
 #                                  PLUGINS                                    #
 ###############################################################################

-[plugins]
-
 # Read Apache status information (mod_status)
-[[plugins.apache]]
-# An array of Apache status URI to gather stats.
-urls = ["http://localhost/server-status?auto"]
+[[inputs.apache]]
+  # An array of Apache status URI to gather stats.
+  urls = ["http://localhost/server-status?auto"]

 # Read metrics about cpu usage
-[[plugins.cpu]]
+[[inputs.cpu]]
  # Whether to report per-cpu stats or not
  percpu = true
  # Whether to report total system cpu stats or not
@@ -105,11 +83,11 @@ urls = ["http://localhost/server-status?auto"]
  drop = ["cpu_time"]

 # Read metrics about disk usage by mount point
-[[plugins.disk]]
+[[inputs.diskio]]
  # no configuration

 # Read metrics from one or many disque servers
-[[plugins.disque]]
+[[inputs.disque]]
  # An array of URI to gather stats about. Specify an ip or hostname
  # with optional port and password. ie disque://localhost, disque://10.10.3.33:18832,
  # 10.0.0.1:10000, etc.
@@ -118,7 +96,7 @@ urls = ["http://localhost/server-status?auto"]
  servers = ["localhost"]

 # Read stats from one or more Elasticsearch servers or clusters
-[[plugins.elasticsearch]]
+[[inputs.elasticsearch]]
  # specify a list of one or more Elasticsearch servers
  servers = ["http://localhost:9200"]

@@ -127,17 +105,13 @@ urls = ["http://localhost/server-status?auto"]
  local = true

 # Read flattened metrics from one or more commands that output JSON to stdout
-[[plugins.exec]]
-  # specify commands via an array of tables
-  [[exec.commands]]
+[[inputs.exec]]
  # the command to run
  command = "/usr/bin/mycollector --foo=bar"
-
-  # name of the command (used as a prefix for measurements)
-  name = "mycollector"
+  name_suffix = "_mycollector"

 # Read metrics of haproxy, via socket or csv stats page
-[[plugins.haproxy]]
+[[inputs.haproxy]]
  # An array of address to gather stats about. Specify an ip on hostname
  # with optional port. ie localhost, 10.10.3.33:1936, etc.
  #
@@ -147,33 +121,30 @@ urls = ["http://localhost/server-status?auto"]
  # servers = ["socket:/run/haproxy/admin.sock"]

 # Read flattened metrics from one or more JSON HTTP endpoints
-[[plugins.httpjson]]
-  # Specify services via an array of tables
-  [[httpjson.services]]
+[[inputs.httpjson]]
+  # a name for the service being polled
+  name = "webserver_stats"

-    # a name for the service being polled
-    name = "webserver_stats"
+  # URL of each server in the service's cluster
+  servers = [
+    "http://localhost:9999/stats/",
+    "http://localhost:9998/stats/",
+  ]

-    # URL of each server in the service's cluster
-    servers = [
-      "http://localhost:9999/stats/",
-      "http://localhost:9998/stats/",
-    ]
+  # HTTP method to use (case-sensitive)
+  method = "GET"

-    # HTTP method to use (case-sensitive)
-    method = "GET"
-
-    # HTTP parameters (all values must be strings)
-    [httpjson.services.parameters]
-      event_type = "cpu_spike"
-      threshold = "0.75"
+  # HTTP parameters (all values must be strings)
+  [httpjson.parameters]
+    event_type = "cpu_spike"
+    threshold = "0.75"

 # Read metrics about disk IO by device
-[[plugins.io]]
+[[inputs.diskio]]
  # no configuration

 # read metrics from a Kafka topic
-[[plugins.kafka_consumer]]
+[[inputs.kafka_consumer]]
  # topic(s) to consume
  topics = ["telegraf"]
  # an array of Zookeeper connection strings
@@ -186,7 +157,7 @@ urls = ["http://localhost/server-status?auto"]
  offset = "oldest"

 # Read metrics from a LeoFS Server via SNMP
-[[plugins.leofs]]
+[[inputs.leofs]]
  # An array of URI to gather stats about LeoFS.
  # Specify an ip or hostname with port. ie 127.0.0.1:4020
  #
@@ -194,7 +165,7 @@ urls = ["http://localhost/server-status?auto"]
  servers = ["127.0.0.1:4021"]

 # Read metrics from local Lustre service on OST, MDS
-[[plugins.lustre2]]
+[[inputs.lustre2]]
  # An array of /proc globs to search for Lustre stats
  # If not specified, the default will work on Lustre 2.5.x
  #
@@ -202,19 +173,28 @@ urls = ["http://localhost/server-status?auto"]
  # mds_procfiles = ["/proc/fs/lustre/mdt/*/md_stats"]

 # Read metrics about memory usage
-[[plugins.mem]]
+[[inputs.mem]]
  # no configuration

 # Read metrics from one or many memcached servers
-[[plugins.memcached]]
+[[inputs.memcached]]
  # An array of address to gather stats about. Specify an ip on hostname
  # with optional port. ie localhost, 10.0.0.1:11211, etc.
  #
  # If no servers are specified, then localhost is used as the host.
  servers = ["localhost"]

+# Telegraf plugin for gathering metrics from N Mesos masters
+[[inputs.mesos]]
+  # Timeout, in ms.
+  timeout = 100
+  # A list of Mesos masters, default value is localhost:5050.
+  masters = ["localhost:5050"]
+  # Metrics groups to be collected, by default, all enabled.
+  master_collections = ["resources","master","system","slaves","frameworks","messages","evqueue","registrar"]
+
 # Read metrics from one or many MongoDB servers
-[[plugins.mongodb]]
+[[inputs.mongodb]]
  # An array of URI to gather stats about. Specify an ip or hostname
  # with optional port add password. ie mongodb://user:auth_key@10.10.3.30:27017,
  # mongodb://10.10.3.33:18832, 10.0.0.1:10000, etc.
@@ -223,7 +203,7 @@ urls = ["http://localhost/server-status?auto"]
  servers = ["127.0.0.1:27017"]

 # Read metrics from one or many mysql servers
-[[plugins.mysql]]
+[[inputs.mysql]]
  # specify servers via a url matching:
  #  [username[:password]@][protocol[(address)]]/[?tls=[true|false|skip-verify]]
  #  e.g.
@@ -234,7 +214,7 @@ urls = ["http://localhost/server-status?auto"]
  servers = ["localhost"]

 # Read metrics about network interface usage
-[[plugins.net]]
+[[inputs.net]]
  # By default, telegraf gathers stats from any up interface (excluding loopback)
  # Setting interfaces will tell it to gather these explicit interfaces,
  # regardless of status.
@@ -242,12 +222,12 @@ urls = ["http://localhost/server-status?auto"]
  # interfaces = ["eth0", ... ]

 # Read Nginx's basic status information (ngx_http_stub_status_module)
-[[plugins.nginx]]
+[[inputs.nginx]]
  # An array of Nginx stub_status URI to gather stats.
  urls = ["http://localhost/status"]

 # Ping given url(s) and return statistics
-[[plugins.ping]]
+[[inputs.ping]]
  # urls to ping
  urls = ["www.google.com"] # required
  # number of pings to send (ping -c <COUNT>)
@@ -260,10 +240,7 @@ urls = ["http://localhost/server-status?auto"]
  interface = ""

 # Read metrics from one or many postgresql servers
-[[plugins.postgresql]]
-  # specify servers via an array of tables
-  [[postgresql.servers]]
-
+[[inputs.postgresql]]
  # specify address via a url matching:
  #   postgres://[pqgotest[:password]]@localhost[/dbname]?sslmode=[disable|verify-ca|verify-full]
  # or a simple string:
@@ -290,14 +267,13 @@ urls = ["http://localhost/server-status?auto"]
  # address = "influx@remoteserver"

 # Read metrics from one or many prometheus clients
-[[plugins.prometheus]]
+[[inputs.prometheus]]
  # An array of urls to scrape metrics from.
  urls = ["http://localhost:9100/metrics"]

 # Read metrics from one or many RabbitMQ servers via the management API
-[[plugins.rabbitmq]]
+[[inputs.rabbitmq]]
  # Specify servers via an array of tables
-  [[rabbitmq.servers]]
  # name = "rmq-server-1" # optional tag
  # url = "http://localhost:15672"
  # username = "guest"
@@ -308,7 +284,7 @@ urls = ["http://localhost/server-status?auto"]
  # nodes = ["rabbit@node1", "rabbit@node2"]

 # Read metrics from one or many redis servers
-[[plugins.redis]]
+[[inputs.redis]]
  # An array of URI to gather stats about. Specify an ip or hostname
  # with optional port add password. ie redis://localhost, redis://10.10.3.33:18832,
  # 10.0.0.1:10000, etc.
@@ -317,7 +293,7 @@ urls = ["http://localhost/server-status?auto"]
  servers = ["localhost"]

 # Read metrics from one or many RethinkDB servers
-[[plugins.rethinkdb]]
+[[inputs.rethinkdb]]
  # An array of URI to gather stats about. Specify an ip or hostname
  # with optional port add password. ie rethinkdb://user:auth_key@10.10.3.30:28105,
  # rethinkdb://10.10.3.33:18832, 10.0.0.1:10000, etc.
@@ -326,9 +302,9 @@ urls = ["http://localhost/server-status?auto"]
  servers = ["127.0.0.1:28015"]

 # Read metrics about swap memory usage
-[[plugins.swap]]
+[[inputs.swap]]
  # no configuration

 # Read metrics about system load & uptime
-[[plugins.system]]
+[[inputs.system]]
  # no configuration
--- a/internal/internal.go
+++ b/internal/internal.go
@@ -2,12 +2,20 @@ package internal

 import (
 	"bufio"
+	"crypto/rand"
+	"crypto/tls"
+	"crypto/x509"
 	"errors"
+	"fmt"
+	"io/ioutil"
 	"os"
 	"strings"
 	"time"
+	"unicode"
 )

+const alphanum string = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
+
 // Duration just wraps time.Duration
 type Duration struct {
 	Duration time.Duration
@@ -62,6 +70,76 @@ func ReadLinesOffsetN(filename string, offset uint, n int) ([]string, error) {
 	return ret, nil
 }

+// RandomString returns a random string of alpha-numeric characters
+func RandomString(n int) string {
+	var bytes = make([]byte, n)
+	rand.Read(bytes)
+	for i, b := range bytes {
+		bytes[i] = alphanum[b%byte(len(alphanum))]
+	}
+	return string(bytes)
+}
+
+// GetTLSConfig gets a tls.Config object from the given certs, key, and CA files.
+// you must give the full path to the files.
+// If all files are blank and InsecureSkipVerify=false, returns a nil pointer.
+func GetTLSConfig(
+	SSLCert, SSLKey, SSLCA string,
+	InsecureSkipVerify bool,
+) (*tls.Config, error) {
+	if SSLCert == "" && SSLKey == "" && SSLCA == "" && !InsecureSkipVerify {
+		return nil, nil
+	}
+
+	t := &tls.Config{
+		InsecureSkipVerify: InsecureSkipVerify,
+	}
+
+	if SSLCA != "" {
+		caCert, err := ioutil.ReadFile(SSLCA)
+		if err != nil {
+			return nil, errors.New(fmt.Sprintf("Could not load TLS CA: %s",
+				err))
+		}
+
+		caCertPool := x509.NewCertPool()
+		caCertPool.AppendCertsFromPEM(caCert)
+		t.RootCAs = caCertPool
+	}
+
+	if SSLCert != "" && SSLKey != "" {
+		cert, err := tls.LoadX509KeyPair(SSLCert, SSLKey)
+		if err != nil {
+			return nil, errors.New(fmt.Sprintf(
+				"Could not load TLS client key/certificate: %s",
+				err))
+		}
+
+		t.Certificates = []tls.Certificate{cert}
+		t.BuildNameToCertificate()
+	}
+
+	// will be nil by default if nothing is provided
+	return t, nil
+}
+
+// SnakeCase converts the given string to snake case following the Golang format:
+// acronyms are converted to lower-case and preceded by an underscore.
+func SnakeCase(in string) string {
+	runes := []rune(in)
+	length := len(runes)
+
+	var out []rune
+	for i := 0; i < length; i++ {
+		if i > 0 && unicode.IsUpper(runes[i]) && ((i+1 < length && unicode.IsLower(runes[i+1])) || unicode.IsLower(runes[i-1])) {
+			out = append(out, '_')
+		}
+		out = append(out, unicode.ToLower(runes[i]))
+	}
+
+	return string(out)
+}
+
 // Glob will test a string pattern, potentially containing globs, against a
 // subject string. The result is a simple true/false, determining whether or
 // not the glob pattern matched the subject text.
--- a/internal/internal_test.go
+++ b/internal/internal_test.go
@@ -42,3 +42,32 @@ func TestGlob(t *testing.T) {
 		testGlobNoMatch(t, pattern, "this_is_a_test")
 	}
 }
+
+type SnakeTest struct {
+	input  string
+	output string
+}
+
+var tests = []SnakeTest{
+	{"a", "a"},
+	{"snake", "snake"},
+	{"A", "a"},
+	{"ID", "id"},
+	{"MOTD", "motd"},
+	{"Snake", "snake"},
+	{"SnakeTest", "snake_test"},
+	{"APIResponse", "api_response"},
+	{"SnakeID", "snake_id"},
+	{"SnakeIDGoogle", "snake_id_google"},
+	{"LinuxMOTD", "linux_motd"},
+	{"OMGWTFBBQ", "omgwtfbbq"},
+	{"omg_wtf_bbq", "omg_wtf_bbq"},
+}
+
+func TestSnakeCase(t *testing.T) {
+	for _, test := range tests {
+		if SnakeCase(test.input) != test.output {
+			t.Errorf(`SnakeCase("%s"), wanted "%s", got \%s"`, test.input, test.output, SnakeCase(test.input))
+		}
+	}
+}
--- a/internal/models/filter.go
+++ b/internal/models/filter.go
@@ -0,0 +1,123 @@
+package internal_models
+
+import (
+	"strings"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+)
+
+// TagFilter is the name of a tag, and the values on which to filter
+type TagFilter struct {
+	Name   string
+	Filter []string
+}
+
+// Filter containing drop/pass and tagdrop/tagpass rules
+type Filter struct {
+	NameDrop []string
+	NamePass []string
+
+	FieldDrop []string
+	FieldPass []string
+
+	TagDrop []TagFilter
+	TagPass []TagFilter
+
+	IsActive bool
+}
+
+func (f Filter) ShouldMetricPass(metric telegraf.Metric) bool {
+	if f.ShouldNamePass(metric.Name()) && f.ShouldTagsPass(metric.Tags()) {
+		return true
+	}
+	return false
+}
+
+// ShouldFieldsPass 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 {
+		for _, pat := range f.NamePass {
+			// TODO remove HasPrefix check, leaving it for now for legacy support.
+			// Cam, 2015-12-07
+			if strings.HasPrefix(key, pat) || internal.Glob(pat, key) {
+				return true
+			}
+		}
+		return false
+	}
+
+	if f.NameDrop != nil {
+		for _, pat := range f.NameDrop {
+			// TODO remove HasPrefix check, leaving it for now for legacy support.
+			// Cam, 2015-12-07
+			if strings.HasPrefix(key, pat) || internal.Glob(pat, key) {
+				return false
+			}
+		}
+
+		return true
+	}
+	return true
+}
+
+// ShouldFieldsPass returns true if the metric should pass, false if should drop
+// based on the drop/pass filter parameters
+func (f Filter) ShouldFieldsPass(key string) bool {
+	if f.FieldPass != nil {
+		for _, pat := range f.FieldPass {
+			// TODO remove HasPrefix check, leaving it for now for legacy support.
+			// Cam, 2015-12-07
+			if strings.HasPrefix(key, pat) || internal.Glob(pat, key) {
+				return true
+			}
+		}
+		return false
+	}
+
+	if f.FieldDrop != nil {
+		for _, pat := range f.FieldDrop {
+			// TODO remove HasPrefix check, leaving it for now for legacy support.
+			// Cam, 2015-12-07
+			if strings.HasPrefix(key, pat) || internal.Glob(pat, key) {
+				return false
+			}
+		}
+
+		return true
+	}
+	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 {
+		for _, pat := range f.TagPass {
+			if tagval, ok := tags[pat.Name]; ok {
+				for _, filter := range pat.Filter {
+					if internal.Glob(filter, tagval) {
+						return true
+					}
+				}
+			}
+		}
+		return false
+	}
+
+	if f.TagDrop != nil {
+		for _, pat := range f.TagDrop {
+			if tagval, ok := tags[pat.Name]; ok {
+				for _, filter := range pat.Filter {
+					if internal.Glob(filter, tagval) {
+						return false
+					}
+				}
+			}
+		}
+		return true
+	}
+
+	return true
+}
--- a/internal/models/filter_test.go
+++ b/internal/models/filter_test.go
@@ -0,0 +1,243 @@
+package internal_models
+
+import (
+	"testing"
+)
+
+func TestFilter_Empty(t *testing.T) {
+	f := Filter{}
+
+	measurements := []string{
+		"foo",
+		"bar",
+		"barfoo",
+		"foo_bar",
+		"foo.bar",
+		"foo-bar",
+		"supercalifradjulisticexpialidocious",
+	}
+
+	for _, measurement := range measurements {
+		if !f.ShouldFieldsPass(measurement) {
+			t.Errorf("Expected measurement %s to pass", measurement)
+		}
+	}
+}
+
+func TestFilter_NamePass(t *testing.T) {
+	f := Filter{
+		NamePass: []string{"foo*", "cpu_usage_idle"},
+	}
+
+	passes := []string{
+		"foo",
+		"foo_bar",
+		"foo.bar",
+		"foo-bar",
+		"cpu_usage_idle",
+	}
+
+	drops := []string{
+		"bar",
+		"barfoo",
+		"bar_foo",
+		"cpu_usage_busy",
+	}
+
+	for _, measurement := range passes {
+		if !f.ShouldNamePass(measurement) {
+			t.Errorf("Expected measurement %s to pass", measurement)
+		}
+	}
+
+	for _, measurement := range drops {
+		if f.ShouldNamePass(measurement) {
+			t.Errorf("Expected measurement %s to drop", measurement)
+		}
+	}
+}
+
+func TestFilter_NameDrop(t *testing.T) {
+	f := Filter{
+		NameDrop: []string{"foo*", "cpu_usage_idle"},
+	}
+
+	drops := []string{
+		"foo",
+		"foo_bar",
+		"foo.bar",
+		"foo-bar",
+		"cpu_usage_idle",
+	}
+
+	passes := []string{
+		"bar",
+		"barfoo",
+		"bar_foo",
+		"cpu_usage_busy",
+	}
+
+	for _, measurement := range passes {
+		if !f.ShouldNamePass(measurement) {
+			t.Errorf("Expected measurement %s to pass", measurement)
+		}
+	}
+
+	for _, measurement := range drops {
+		if f.ShouldNamePass(measurement) {
+			t.Errorf("Expected measurement %s to drop", measurement)
+		}
+	}
+}
+
+func TestFilter_FieldPass(t *testing.T) {
+	f := Filter{
+		FieldPass: []string{"foo*", "cpu_usage_idle"},
+	}
+
+	passes := []string{
+		"foo",
+		"foo_bar",
+		"foo.bar",
+		"foo-bar",
+		"cpu_usage_idle",
+	}
+
+	drops := []string{
+		"bar",
+		"barfoo",
+		"bar_foo",
+		"cpu_usage_busy",
+	}
+
+	for _, measurement := range passes {
+		if !f.ShouldFieldsPass(measurement) {
+			t.Errorf("Expected measurement %s to pass", measurement)
+		}
+	}
+
+	for _, measurement := range drops {
+		if f.ShouldFieldsPass(measurement) {
+			t.Errorf("Expected measurement %s to drop", measurement)
+		}
+	}
+}
+
+func TestFilter_FieldDrop(t *testing.T) {
+	f := Filter{
+		FieldDrop: []string{"foo*", "cpu_usage_idle"},
+	}
+
+	drops := []string{
+		"foo",
+		"foo_bar",
+		"foo.bar",
+		"foo-bar",
+		"cpu_usage_idle",
+	}
+
+	passes := []string{
+		"bar",
+		"barfoo",
+		"bar_foo",
+		"cpu_usage_busy",
+	}
+
+	for _, measurement := range passes {
+		if !f.ShouldFieldsPass(measurement) {
+			t.Errorf("Expected measurement %s to pass", measurement)
+		}
+	}
+
+	for _, measurement := range drops {
+		if f.ShouldFieldsPass(measurement) {
+			t.Errorf("Expected measurement %s to drop", measurement)
+		}
+	}
+}
+
+func TestFilter_TagPass(t *testing.T) {
+	filters := []TagFilter{
+		TagFilter{
+			Name:   "cpu",
+			Filter: []string{"cpu-*"},
+		},
+		TagFilter{
+			Name:   "mem",
+			Filter: []string{"mem_free"},
+		}}
+	f := Filter{
+		TagPass: filters,
+	}
+
+	passes := []map[string]string{
+		{"cpu": "cpu-total"},
+		{"cpu": "cpu-0"},
+		{"cpu": "cpu-1"},
+		{"cpu": "cpu-2"},
+		{"mem": "mem_free"},
+	}
+
+	drops := []map[string]string{
+		{"cpu": "cputotal"},
+		{"cpu": "cpu0"},
+		{"cpu": "cpu1"},
+		{"cpu": "cpu2"},
+		{"mem": "mem_used"},
+	}
+
+	for _, tags := range passes {
+		if !f.ShouldTagsPass(tags) {
+			t.Errorf("Expected tags %v to pass", tags)
+		}
+	}
+
+	for _, tags := range drops {
+		if f.ShouldTagsPass(tags) {
+			t.Errorf("Expected tags %v to drop", tags)
+		}
+	}
+}
+
+func TestFilter_TagDrop(t *testing.T) {
+	filters := []TagFilter{
+		TagFilter{
+			Name:   "cpu",
+			Filter: []string{"cpu-*"},
+		},
+		TagFilter{
+			Name:   "mem",
+			Filter: []string{"mem_free"},
+		}}
+	f := Filter{
+		TagDrop: filters,
+	}
+
+	drops := []map[string]string{
+		{"cpu": "cpu-total"},
+		{"cpu": "cpu-0"},
+		{"cpu": "cpu-1"},
+		{"cpu": "cpu-2"},
+		{"mem": "mem_free"},
+	}
+
+	passes := []map[string]string{
+		{"cpu": "cputotal"},
+		{"cpu": "cpu0"},
+		{"cpu": "cpu1"},
+		{"cpu": "cpu2"},
+		{"mem": "mem_used"},
+	}
+
+	for _, tags := range passes {
+		if !f.ShouldTagsPass(tags) {
+			t.Errorf("Expected tags %v to pass", tags)
+		}
+	}
+
+	for _, tags := range drops {
+		if f.ShouldTagsPass(tags) {
+			t.Errorf("Expected tags %v to drop", tags)
+		}
+	}
+}
--- a/internal/models/running_input.go
+++ b/internal/models/running_input.go
@@ -0,0 +1,24 @@
+package internal_models
+
+import (
+	"time"
+
+	"github.com/influxdata/telegraf"
+)
+
+type RunningInput struct {
+	Name   string
+	Input  telegraf.Input
+	Config *InputConfig
+}
+
+// InputConfig containing a name, interval, and filter
+type InputConfig struct {
+	Name              string
+	NameOverride      string
+	MeasurementPrefix string
+	MeasurementSuffix string
+	Tags              map[string]string
+	Filter            Filter
+	Interval          time.Duration
+}
--- a/internal/models/running_output.go
+++ b/internal/models/running_output.go
@@ -0,0 +1,143 @@
+package internal_models
+
+import (
+	"log"
+	"sync"
+	"time"
+
+	"github.com/influxdata/telegraf"
+)
+
+const (
+	// Default number of metrics kept between flushes.
+	DEFAULT_METRIC_BUFFER_LIMIT = 1000
+
+	// Limit how many full metric buffers are kept due to failed writes.
+	FULL_METRIC_BUFFERS_LIMIT = 100
+)
+
+type RunningOutput struct {
+	Name                string
+	Output              telegraf.Output
+	Config              *OutputConfig
+	Quiet               bool
+	MetricBufferLimit   int
+	FlushBufferWhenFull bool
+
+	metrics    []telegraf.Metric
+	tmpmetrics map[int][]telegraf.Metric
+	overwriteI int
+	mapI       int
+
+	sync.Mutex
+}
+
+func NewRunningOutput(
+	name string,
+	output telegraf.Output,
+	conf *OutputConfig,
+) *RunningOutput {
+	ro := &RunningOutput{
+		Name:              name,
+		metrics:           make([]telegraf.Metric, 0),
+		tmpmetrics:        make(map[int][]telegraf.Metric),
+		Output:            output,
+		Config:            conf,
+		MetricBufferLimit: DEFAULT_METRIC_BUFFER_LIMIT,
+	}
+	return ro
+}
+
+// AddMetric adds a metric to the output. This function can also write cached
+// points if FlushBufferWhenFull is true.
+func (ro *RunningOutput) AddMetric(metric telegraf.Metric) {
+	if ro.Config.Filter.IsActive {
+		if !ro.Config.Filter.ShouldMetricPass(metric) {
+			return
+		}
+	}
+	ro.Lock()
+	defer ro.Unlock()
+
+	if len(ro.metrics) < ro.MetricBufferLimit {
+		ro.metrics = append(ro.metrics, metric)
+	} else {
+		if ro.FlushBufferWhenFull {
+			ro.metrics = append(ro.metrics, metric)
+			tmpmetrics := make([]telegraf.Metric, len(ro.metrics))
+			copy(tmpmetrics, ro.metrics)
+			ro.metrics = make([]telegraf.Metric, 0)
+			err := ro.write(tmpmetrics)
+			if err != nil {
+				log.Printf("ERROR writing full metric buffer to output %s, %s",
+					ro.Name, err)
+				if len(ro.tmpmetrics) == FULL_METRIC_BUFFERS_LIMIT {
+					ro.mapI = 0
+					// overwrite one
+					ro.tmpmetrics[ro.mapI] = tmpmetrics
+					ro.mapI++
+				} else {
+					ro.tmpmetrics[ro.mapI] = tmpmetrics
+					ro.mapI++
+				}
+			}
+		} else {
+			if ro.overwriteI == 0 {
+				log.Printf("WARNING: overwriting cached metrics, you may want to " +
+					"increase the metric_buffer_limit setting in your [agent] " +
+					"config if you do not wish to overwrite metrics.\n")
+			}
+			if ro.overwriteI == len(ro.metrics) {
+				ro.overwriteI = 0
+			}
+			ro.metrics[ro.overwriteI] = metric
+			ro.overwriteI++
+		}
+	}
+}
+
+// Write writes all cached points to this output.
+func (ro *RunningOutput) Write() error {
+	ro.Lock()
+	defer ro.Unlock()
+	err := ro.write(ro.metrics)
+	if err != nil {
+		return err
+	} else {
+		ro.metrics = make([]telegraf.Metric, 0)
+		ro.overwriteI = 0
+	}
+
+	// Write any cached metric buffers that failed previously
+	for i, tmpmetrics := range ro.tmpmetrics {
+		if err := ro.write(tmpmetrics); err != nil {
+			return err
+		} else {
+			delete(ro.tmpmetrics, i)
+		}
+	}
+
+	return nil
+}
+
+func (ro *RunningOutput) write(metrics []telegraf.Metric) error {
+	if len(metrics) == 0 {
+		return nil
+	}
+	start := time.Now()
+	err := ro.Output.Write(metrics)
+	elapsed := time.Since(start)
+	if err == nil {
+		if !ro.Quiet {
+			log.Printf("Wrote %d metrics to output %s in %s\n",
+				len(metrics), ro.Name, elapsed)
+		}
+	}
+	return err
+}
+
+// OutputConfig containing name and filter
+type OutputConfig struct {
+	Name   string
+	Filter Filter
+}
--- a/internal/models/running_output_test.go
+++ b/internal/models/running_output_test.go
@@ -0,0 +1,265 @@
+package internal_models
+
+import (
+	"fmt"
+	"sort"
+	"sync"
+	"testing"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/testutil"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+var first5 = []telegraf.Metric{
+	testutil.TestMetric(101, "metric1"),
+	testutil.TestMetric(101, "metric2"),
+	testutil.TestMetric(101, "metric3"),
+	testutil.TestMetric(101, "metric4"),
+	testutil.TestMetric(101, "metric5"),
+}
+
+var next5 = []telegraf.Metric{
+	testutil.TestMetric(101, "metric6"),
+	testutil.TestMetric(101, "metric7"),
+	testutil.TestMetric(101, "metric8"),
+	testutil.TestMetric(101, "metric9"),
+	testutil.TestMetric(101, "metric10"),
+}
+
+// Test that we can write metrics with simple default setup.
+func TestRunningOutputDefault(t *testing.T) {
+	conf := &OutputConfig{
+		Filter: Filter{
+			IsActive: false,
+		},
+	}
+
+	m := &mockOutput{}
+	ro := NewRunningOutput("test", m, conf)
+
+	for _, metric := range first5 {
+		ro.AddMetric(metric)
+	}
+	for _, metric := range next5 {
+		ro.AddMetric(metric)
+	}
+	assert.Len(t, m.Metrics(), 0)
+
+	err := ro.Write()
+	assert.NoError(t, err)
+	assert.Len(t, m.Metrics(), 10)
+}
+
+// Test that the first metric gets overwritten if there is a buffer overflow.
+func TestRunningOutputOverwrite(t *testing.T) {
+	conf := &OutputConfig{
+		Filter: Filter{
+			IsActive: false,
+		},
+	}
+
+	m := &mockOutput{}
+	ro := NewRunningOutput("test", m, conf)
+	ro.MetricBufferLimit = 4
+
+	for _, metric := range first5 {
+		ro.AddMetric(metric)
+	}
+	require.Len(t, m.Metrics(), 0)
+
+	err := ro.Write()
+	require.NoError(t, err)
+	require.Len(t, m.Metrics(), 4)
+
+	var expected, actual []string
+	for i, exp := range first5[1:] {
+		expected = append(expected, exp.String())
+		actual = append(actual, m.Metrics()[i].String())
+	}
+
+	sort.Strings(expected)
+	sort.Strings(actual)
+
+	assert.Equal(t, expected, actual)
+}
+
+// Test that multiple buffer overflows are handled properly.
+func TestRunningOutputMultiOverwrite(t *testing.T) {
+	conf := &OutputConfig{
+		Filter: Filter{
+			IsActive: false,
+		},
+	}
+
+	m := &mockOutput{}
+	ro := NewRunningOutput("test", m, conf)
+	ro.MetricBufferLimit = 3
+
+	for _, metric := range first5 {
+		ro.AddMetric(metric)
+	}
+	for _, metric := range next5 {
+		ro.AddMetric(metric)
+	}
+	require.Len(t, m.Metrics(), 0)
+
+	err := ro.Write()
+	require.NoError(t, err)
+	require.Len(t, m.Metrics(), 3)
+
+	var expected, actual []string
+	for i, exp := range next5[2:] {
+		expected = append(expected, exp.String())
+		actual = append(actual, m.Metrics()[i].String())
+	}
+
+	sort.Strings(expected)
+	sort.Strings(actual)
+
+	assert.Equal(t, expected, actual)
+}
+
+// Test that running output doesn't flush until it's full when
+// FlushBufferWhenFull is set.
+func TestRunningOutputFlushWhenFull(t *testing.T) {
+	conf := &OutputConfig{
+		Filter: Filter{
+			IsActive: false,
+		},
+	}
+
+	m := &mockOutput{}
+	ro := NewRunningOutput("test", m, conf)
+	ro.FlushBufferWhenFull = true
+	ro.MetricBufferLimit = 5
+
+	// Fill buffer to limit
+	for _, metric := range first5 {
+		ro.AddMetric(metric)
+	}
+	// no flush yet
+	assert.Len(t, m.Metrics(), 0)
+
+	// add one more metric
+	ro.AddMetric(next5[0])
+	// now it flushed
+	assert.Len(t, m.Metrics(), 6)
+
+	// add one more metric and write it manually
+	ro.AddMetric(next5[1])
+	err := ro.Write()
+	assert.NoError(t, err)
+	assert.Len(t, m.Metrics(), 7)
+}
+
+// Test that running output doesn't flush until it's full when
+// FlushBufferWhenFull is set, twice.
+func TestRunningOutputMultiFlushWhenFull(t *testing.T) {
+	conf := &OutputConfig{
+		Filter: Filter{
+			IsActive: false,
+		},
+	}
+
+	m := &mockOutput{}
+	ro := NewRunningOutput("test", m, conf)
+	ro.FlushBufferWhenFull = true
+	ro.MetricBufferLimit = 4
+
+	// Fill buffer past limit twive
+	for _, metric := range first5 {
+		ro.AddMetric(metric)
+	}
+	for _, metric := range next5 {
+		ro.AddMetric(metric)
+	}
+	// flushed twice
+	assert.Len(t, m.Metrics(), 10)
+}
+
+func TestRunningOutputWriteFail(t *testing.T) {
+	conf := &OutputConfig{
+		Filter: Filter{
+			IsActive: false,
+		},
+	}
+
+	m := &mockOutput{}
+	m.failWrite = true
+	ro := NewRunningOutput("test", m, conf)
+	ro.FlushBufferWhenFull = true
+	ro.MetricBufferLimit = 4
+
+	// Fill buffer past limit twice
+	for _, metric := range first5 {
+		ro.AddMetric(metric)
+	}
+	for _, metric := range next5 {
+		ro.AddMetric(metric)
+	}
+	// no successful flush yet
+	assert.Len(t, m.Metrics(), 0)
+
+	// manual write fails
+	err := ro.Write()
+	require.Error(t, err)
+	// no successful flush yet
+	assert.Len(t, m.Metrics(), 0)
+
+	m.failWrite = false
+	err = ro.Write()
+	require.NoError(t, err)
+
+	assert.Len(t, m.Metrics(), 10)
+}
+
+type mockOutput struct {
+	sync.Mutex
+
+	metrics []telegraf.Metric
+
+	// if true, mock a write failure
+	failWrite bool
+}
+
+func (m *mockOutput) Connect() error {
+	return nil
+}
+
+func (m *mockOutput) Close() error {
+	return nil
+}
+
+func (m *mockOutput) Description() string {
+	return ""
+}
+
+func (m *mockOutput) SampleConfig() string {
+	return ""
+}
+
+func (m *mockOutput) Write(metrics []telegraf.Metric) error {
+	m.Lock()
+	defer m.Unlock()
+	if m.failWrite {
+		return fmt.Errorf("Failed Write!")
+	}
+
+	if m.metrics == nil {
+		m.metrics = []telegraf.Metric{}
+	}
+
+	for _, metric := range metrics {
+		m.metrics = append(m.metrics, metric)
+	}
+	return nil
+}
+
+func (m *mockOutput) Metrics() []telegraf.Metric {
+	m.Lock()
+	defer m.Unlock()
+	return m.metrics
+}
--- a/metric.go
+++ b/metric.go
@@ -0,0 +1,94 @@
+package telegraf
+
+import (
+	"time"
+
+	"github.com/influxdata/influxdb/client/v2"
+)
+
+type Metric interface {
+	// Name returns the measurement name of the metric
+	Name() string
+
+	// Name returns the tags associated with the metric
+	Tags() map[string]string
+
+	// Time return the timestamp for the metric
+	Time() time.Time
+
+	// UnixNano returns the unix nano time of the metric
+	UnixNano() int64
+
+	// Fields returns the fields for the metric
+	Fields() map[string]interface{}
+
+	// String returns a line-protocol string of the metric
+	String() string
+
+	// PrecisionString returns a line-protocol string of the metric, at precision
+	PrecisionString(precison string) string
+
+	// Point returns a influxdb client.Point object
+	Point() *client.Point
+}
+
+// metric is a wrapper of the influxdb client.Point struct
+type metric struct {
+	pt *client.Point
+}
+
+// NewMetric returns a metric with the given timestamp. If a timestamp is not
+// given, then data is sent to the database without a timestamp, in which case
+// the server will assign local time upon reception. NOTE: it is recommended to
+// send data with a timestamp.
+func NewMetric(
+	name string,
+	tags map[string]string,
+	fields map[string]interface{},
+	t ...time.Time,
+) (Metric, error) {
+	var T time.Time
+	if len(t) > 0 {
+		T = t[0]
+	}
+
+	pt, err := client.NewPoint(name, tags, fields, T)
+	if err != nil {
+		return nil, err
+	}
+	return &metric{
+		pt: pt,
+	}, nil
+}
+
+func (m *metric) Name() string {
+	return m.pt.Name()
+}
+
+func (m *metric) Tags() map[string]string {
+	return m.pt.Tags()
+}
+
+func (m *metric) Time() time.Time {
+	return m.pt.Time()
+}
+
+func (m *metric) UnixNano() int64 {
+	return m.pt.UnixNano()
+}
+
+func (m *metric) Fields() map[string]interface{} {
+	return m.pt.Fields()
+}
+
+func (m *metric) String() string {
+	return m.pt.String()
+}
+
+func (m *metric) PrecisionString(precison string) string {
+	return m.pt.PrecisionString(precison)
+}
+
+func (m *metric) Point() *client.Point {
+	return m.pt
+}
--- a/metric_test.go
+++ b/metric_test.go
@@ -0,0 +1,83 @@
+package telegraf
+
+import (
+	"fmt"
+	"math"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestNewMetric(t *testing.T) {
+	now := time.Now()
+
+	tags := map[string]string{
+		"host":       "localhost",
+		"datacenter": "us-east-1",
+	}
+	fields := map[string]interface{}{
+		"usage_idle": float64(99),
+		"usage_busy": float64(1),
+	}
+	m, err := NewMetric("cpu", tags, fields, now)
+	assert.NoError(t, err)
+
+	assert.Equal(t, tags, m.Tags())
+	assert.Equal(t, fields, m.Fields())
+	assert.Equal(t, "cpu", m.Name())
+	assert.Equal(t, now, m.Time())
+	assert.Equal(t, now.UnixNano(), m.UnixNano())
+}
+
+func TestNewMetricString(t *testing.T) {
+	now := time.Now()
+
+	tags := map[string]string{
+		"host": "localhost",
+	}
+	fields := map[string]interface{}{
+		"usage_idle": float64(99),
+	}
+	m, err := NewMetric("cpu", tags, fields, now)
+	assert.NoError(t, err)
+
+	lineProto := fmt.Sprintf("cpu,host=localhost usage_idle=99 %d",
+		now.UnixNano())
+	assert.Equal(t, lineProto, m.String())
+
+	lineProtoPrecision := fmt.Sprintf("cpu,host=localhost usage_idle=99 %d",
+		now.Unix())
+	assert.Equal(t, lineProtoPrecision, m.PrecisionString("s"))
+}
+
+func TestNewMetricStringNoTime(t *testing.T) {
+	tags := map[string]string{
+		"host": "localhost",
+	}
+	fields := map[string]interface{}{
+		"usage_idle": float64(99),
+	}
+	m, err := NewMetric("cpu", tags, fields)
+	assert.NoError(t, err)
+
+	lineProto := fmt.Sprintf("cpu,host=localhost usage_idle=99")
+	assert.Equal(t, lineProto, m.String())
+
+	lineProtoPrecision := fmt.Sprintf("cpu,host=localhost usage_idle=99")
+	assert.Equal(t, lineProtoPrecision, m.PrecisionString("s"))
+}
+
+func TestNewMetricFailNaN(t *testing.T) {
+	now := time.Now()
+
+	tags := map[string]string{
+		"host": "localhost",
+	}
+	fields := map[string]interface{}{
+		"usage_idle": math.NaN(),
+	}
+
+	_, err := NewMetric("cpu", tags, fields, now)
+	assert.Error(t, err)
+}
--- a/outputs/registry.go
+++ b/outputs/registry.go
@@ -1,8 +1,4 @@
-package outputs
-
-import (
-	"github.com/influxdb/influxdb/client/v2"
-)
+package telegraf

 type Output interface {
 	// Connect to the Output
@@ -14,7 +10,7 @@ type Output interface {
 	// SampleConfig returns the default configuration of the Output
 	SampleConfig() string
 	// Write takes in group of points to be written to the Output
-	Write(points []*client.Point) error
+	Write(metrics []Metric) error
 }

 type ServiceOutput interface {
@@ -27,17 +23,9 @@ type ServiceOutput interface {
 	// SampleConfig returns the default configuration of the Output
 	SampleConfig() string
 	// Write takes in group of points to be written to the Output
-	Write(points []*client.Point) error
+	Write(metrics []Metric) error
 	// Start the "service" that will provide an Output
 	Start() error
 	// Stop the "service" that will provide an Output
 	Stop()
 }
-
-type Creator func() Output
-
-var Outputs = map[string]Creator{}
-
-func Add(name string, creator Creator) {
-	Outputs[name] = creator
-}
--- a/outputs/all/all.go
+++ b/outputs/all/all.go
@@ -1,16 +0,0 @@
-package all
-
-import (
-	_ "github.com/influxdb/telegraf/outputs/amon"
-	_ "github.com/influxdb/telegraf/outputs/amqp"
-	_ "github.com/influxdb/telegraf/outputs/datadog"
-	_ "github.com/influxdb/telegraf/outputs/influxdb"
-	_ "github.com/influxdb/telegraf/outputs/kafka"
-	_ "github.com/influxdb/telegraf/outputs/kinesis"
-	_ "github.com/influxdb/telegraf/outputs/librato"
-	_ "github.com/influxdb/telegraf/outputs/mqtt"
-	_ "github.com/influxdb/telegraf/outputs/nsq"
-	_ "github.com/influxdb/telegraf/outputs/opentsdb"
-	_ "github.com/influxdb/telegraf/outputs/prometheus_client"
-	_ "github.com/influxdb/telegraf/outputs/riemann"
-)
--- a/outputs/amqp/amqp.go
+++ b/outputs/amqp/amqp.go
@@ -1,161 +0,0 @@
-package amqp
-
-import (
-	"bytes"
-	"fmt"
-	"log"
-	"sync"
-	"time"
-
-	"github.com/influxdb/influxdb/client/v2"
-	"github.com/influxdb/telegraf/outputs"
-	"github.com/streadway/amqp"
-)
-
-type AMQP struct {
-	// AMQP brokers to send metrics to
-	URL string
-	// AMQP exchange
-	Exchange string
-	// Routing Key Tag
-	RoutingTag string `toml:"routing_tag"`
-	// InfluxDB database
-	Database string
-	// InfluxDB retention policy
-	RetentionPolicy string
-	// InfluxDB precision
-	Precision string
-
-	channel *amqp.Channel
-	sync.Mutex
-	headers amqp.Table
-}
-
-const (
-	DefaultRetentionPolicy = "default"
-	DefaultDatabase        = "telegraf"
-	DefaultPrecision       = "s"
-)
-
-var sampleConfig = `
-  # AMQP url
-  url = "amqp://localhost:5672/influxdb"
-  # AMQP exchange
-  exchange = "telegraf"
-  # Telegraf tag to use as a routing key
-  #  ie, if this tag exists, it's value will be used as the routing key
-  routing_tag = "host"
-
-  # InfluxDB retention policy
-  #retention_policy = "default"
-  # InfluxDB database
-  #database = "telegraf"
-  # InfluxDB precision
-  #precision = "s"
-`
-
-func (q *AMQP) Connect() error {
-	q.Lock()
-	defer q.Unlock()
-
-	q.headers = amqp.Table{
-		"precision":        q.Precision,
-		"database":         q.Database,
-		"retention_policy": q.RetentionPolicy,
-	}
-
-	connection, err := amqp.Dial(q.URL)
-	if err != nil {
-		return err
-	}
-	channel, err := connection.Channel()
-	if err != nil {
-		return fmt.Errorf("Failed to open a channel: %s", err)
-	}
-
-	err = channel.ExchangeDeclare(
-		q.Exchange, // name
-		"topic",    // type
-		true,       // durable
-		false,      // delete when unused
-		false,      // internal
-		false,      // no-wait
-		nil,        // arguments
-	)
-	if err != nil {
-		return fmt.Errorf("Failed to declare an exchange: %s", err)
-	}
-	q.channel = channel
-	go func() {
-		log.Printf("Closing: %s", <-connection.NotifyClose(make(chan *amqp.Error)))
-		log.Printf("Trying to reconnect")
-		for err := q.Connect(); err != nil; err = q.Connect() {
-			log.Println(err)
-			time.Sleep(10 * time.Second)
-		}
-
-	}()
-	return nil
-}
-
-func (q *AMQP) Close() error {
-	return q.channel.Close()
-}
-
-func (q *AMQP) SampleConfig() string {
-	return sampleConfig
-}
-
-func (q *AMQP) Description() string {
-	return "Configuration for the AMQP server to send metrics to"
-}
-
-func (q *AMQP) Write(points []*client.Point) error {
-	q.Lock()
-	defer q.Unlock()
-	if len(points) == 0 {
-		return nil
-	}
-	var outbuf = make(map[string][][]byte)
-
-	for _, p := range points {
-		// Combine tags from Point and BatchPoints and grab the resulting
-		// line-protocol output string to write to AMQP
-		var value, key string
-		value = p.String()
-
-		if q.RoutingTag != "" {
-			if h, ok := p.Tags()[q.RoutingTag]; ok {
-				key = h
-			}
-		}
-		outbuf[key] = append(outbuf[key], []byte(value))
-
-	}
-	for key, buf := range outbuf {
-		err := q.channel.Publish(
-			q.Exchange, // exchange
-			key,        // routing key
-			false,      // mandatory
-			false,      // immediate
-			amqp.Publishing{
-				Headers:     q.headers,
-				ContentType: "text/plain",
-				Body:        bytes.Join(buf, []byte("\n")),
-			})
-		if err != nil {
-			return fmt.Errorf("FAILED to send amqp message: %s", err)
-		}
-	}
-	return nil
-}
-
-func init() {
-	outputs.Add("amqp", func() outputs.Output {
-		return &AMQP{
-			Database:        DefaultDatabase,
-			Precision:       DefaultPrecision,
-			RetentionPolicy: DefaultRetentionPolicy,
-		}
-	})
-}
--- a/outputs/influxdb/README.md
+++ b/outputs/influxdb/README.md
@@ -1,12 +0,0 @@
-# InfluxDB Output Plugin
-
-This plugin writes to [InfluxDB](https://www.influxdb.com) via HTTP or UDP.
-
-Required parameters:
-
-* `urls`: List of strings, this is for InfluxDB clustering
-support. On each flush interval, Telegraf will randomly choose one of the urls
-to write to. Each URL should start with either `http://` or `udp://`
-* `database`: The name of the database to write to.
-
-
--- a/outputs/influxdb/influxdb.go
+++ b/outputs/influxdb/influxdb.go
@@ -1,160 +0,0 @@
-package influxdb
-
-import (
-	"errors"
-	"fmt"
-	"log"
-	"math/rand"
-	"net/url"
-	"strings"
-
-	"github.com/influxdb/influxdb/client/v2"
-	"github.com/influxdb/telegraf/internal"
-	"github.com/influxdb/telegraf/outputs"
-)
-
-type InfluxDB struct {
-	// URL is only for backwards compatability
-	URL        string
-	URLs       []string `toml:"urls"`
-	Username   string
-	Password   string
-	Database   string
-	UserAgent  string
-	Precision  string
-	Timeout    internal.Duration
-	UDPPayload int `toml:"udp_payload"`
-
-	conns []client.Client
-}
-
-var sampleConfig = `
-  # The full HTTP or UDP endpoint URL for your InfluxDB instance.
-  # Multiple urls can be specified but it is assumed that they are part of the same
-  # cluster, this means that only ONE of the urls will be written to each interval.
-  # urls = ["udp://localhost:8089"] # UDP endpoint example
-  urls = ["http://localhost:8086"] # required
-  # The target database for metrics (telegraf will create it if not exists)
-  database = "telegraf" # required
-  # Precision of writes, valid values are n, u, ms, s, m, and h
-  # note: using second precision greatly helps InfluxDB compression
-  precision = "s"
-
-  # Connection timeout (for the connection with InfluxDB), formatted as a string.
-  # If not provided, will default to 0 (no timeout)
-  # timeout = "5s"
-  # username = "telegraf"
-  # password = "metricsmetricsmetricsmetrics"
-  # Set the user agent for HTTP POSTs (can be useful for log differentiation)
-  # user_agent = "telegraf"
-  # Set UDP payload size, defaults to InfluxDB UDP Client default (512 bytes)
-  # udp_payload = 512
-`
-
-func (i *InfluxDB) Connect() error {
-	var urls []string
-	for _, u := range i.URLs {
-		urls = append(urls, u)
-	}
-
-	// Backward-compatability with single Influx URL config files
-	// This could eventually be removed in favor of specifying the urls as a list
-	if i.URL != "" {
-		urls = append(urls, i.URL)
-	}
-
-	var conns []client.Client
-	for _, u := range urls {
-		switch {
-		case strings.HasPrefix(u, "udp"):
-			parsed_url, err := url.Parse(u)
-			if err != nil {
-				return err
-			}
-
-			if i.UDPPayload == 0 {
-				i.UDPPayload = client.UDPPayloadSize
-			}
-			c, err := client.NewUDPClient(client.UDPConfig{
-				Addr:        parsed_url.Host,
-				PayloadSize: i.UDPPayload,
-			})
-			if err != nil {
-				return err
-			}
-			conns = append(conns, c)
-		default:
-			// If URL doesn't start with "udp", assume HTTP client
-			c, err := client.NewHTTPClient(client.HTTPConfig{
-				Addr:      u,
-				Username:  i.Username,
-				Password:  i.Password,
-				UserAgent: i.UserAgent,
-				Timeout:   i.Timeout.Duration,
-			})
-			if err != nil {
-				return err
-			}
-
-			// Create Database if it doesn't exist
-			_, e := c.Query(client.Query{
-				Command: fmt.Sprintf("CREATE DATABASE IF NOT EXISTS %s", i.Database),
-			})
-
-			if e != nil {
-				log.Println("Database creation failed: " + e.Error())
-			}
-
-			conns = append(conns, c)
-		}
-	}
-
-	i.conns = conns
-	return nil
-}
-
-func (i *InfluxDB) Close() error {
-	// InfluxDB client does not provide a Close() function
-	return nil
-}
-
-func (i *InfluxDB) SampleConfig() string {
-	return sampleConfig
-}
-
-func (i *InfluxDB) Description() string {
-	return "Configuration for influxdb server to send metrics to"
-}
-
-// Choose a random server in the cluster to write to until a successful write
-// occurs, logging each unsuccessful. If all servers fail, return error.
-func (i *InfluxDB) Write(points []*client.Point) error {
-	bp, _ := client.NewBatchPoints(client.BatchPointsConfig{
-		Database:  i.Database,
-		Precision: i.Precision,
-	})
-
-	for _, point := range points {
-		bp.AddPoint(point)
-	}
-
-	// This will get set to nil if a successful write occurs
-	err := errors.New("Could not write to any InfluxDB server in cluster")
-
-	p := rand.Perm(len(i.conns))
-	for _, n := range p {
-		if e := i.conns[n].Write(bp); e != nil {
-			log.Println("ERROR: " + e.Error())
-		} else {
-			err = nil
-			break
-		}
-	}
-	return err
-}
-
-func init() {
-	outputs.Add("influxdb", func() outputs.Output {
-		return &InfluxDB{}
-	})
-}
--- a/outputs/kafka/kafka.go
+++ b/outputs/kafka/kafka.go
@@ -1,85 +0,0 @@
-package kafka
-
-import (
-	"errors"
-	"fmt"
-
-	"github.com/Shopify/sarama"
-	"github.com/influxdb/influxdb/client/v2"
-	"github.com/influxdb/telegraf/outputs"
-)
-
-type Kafka struct {
-	// Kafka brokers to send metrics to
-	Brokers []string
-	// Kafka topic
-	Topic string
-	// Routing Key Tag
-	RoutingTag string `toml:"routing_tag"`
-
-	producer sarama.SyncProducer
-}
-
-var sampleConfig = `
-  # URLs of kafka brokers
-  brokers = ["localhost:9092"]
-  # Kafka topic for producer messages
-  topic = "telegraf"
-  # Telegraf tag to use as a routing key
-  #  ie, if this tag exists, it's value will be used as the routing key
-  routing_tag = "host"
-`
-
-func (k *Kafka) Connect() error {
-	producer, err := sarama.NewSyncProducer(k.Brokers, nil)
-	if err != nil {
-		return err
-	}
-	k.producer = producer
-	return nil
-}
-
-func (k *Kafka) Close() error {
-	return k.producer.Close()
-}
-
-func (k *Kafka) SampleConfig() string {
-	return sampleConfig
-}
-
-func (k *Kafka) Description() string {
-	return "Configuration for the Kafka server to send metrics to"
-}
-
-func (k *Kafka) Write(points []*client.Point) error {
-	if len(points) == 0 {
-		return nil
-	}
-
-	for _, p := range points {
-		// Combine tags from Point and BatchPoints and grab the resulting
-		// line-protocol output string to write to Kafka
-		value := p.String()
-
-		m := &sarama.ProducerMessage{
-			Topic: k.Topic,
-			Value: sarama.StringEncoder(value),
-		}
-		if h, ok := p.Tags()[k.RoutingTag]; ok {
-			m.Key = sarama.StringEncoder(h)
-		}
-
-		_, _, err := k.producer.SendMessage(m)
-		if err != nil {
-			return errors.New(fmt.Sprintf("FAILED to send kafka message: %s\n",
-				err))
-		}
-	}
-	return nil
-}
-
-func init() {
-	outputs.Add("kafka", func() outputs.Output {
-		return &Kafka{}
-	})
-}
--- a/outputs/librato/librato.go
+++ b/outputs/librato/librato.go
@@ -1,165 +0,0 @@
-package librato
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"log"
-	"net/http"
-
-	"github.com/influxdb/influxdb/client/v2"
-	"github.com/influxdb/telegraf/internal"
-	"github.com/influxdb/telegraf/outputs"
-)
-
-type Librato struct {
-	ApiUser   string
-	ApiToken  string
-	SourceTag string
-	Timeout   internal.Duration
-
-	apiUrl string
-	client *http.Client
-}
-
-var sampleConfig = `
-  # Librator API Docs
-  # http://dev.librato.com/v1/metrics-authentication
-
-  # Librato API user
-  api_user = "telegraf@influxdb.com" # required.
-
-  # Librato API token
-  api_token = "my-secret-token" # required.
-
-  # Tag Field to populate source attribute (optional)
-  # This is typically the _hostname_ from which the metric was obtained.
-  source_tag = "hostname"
-
-  # Connection timeout.
-  # timeout = "5s"
-`
-
-type Metrics struct {
-	Gauges []*Gauge `json:"gauges"`
-}
-
-type Gauge struct {
-	Name        string  `json:"name"`
-	Value       float64 `json:"value"`
-	Source      string  `json:"source"`
-	MeasureTime int64   `json:"measure_time"`
-}
-
-const librato_api = "https://metrics-api.librato.com/v1/metrics"
-
-func NewLibrato(apiUrl string) *Librato {
-	return &Librato{
-		apiUrl: apiUrl,
-	}
-}
-
-func (l *Librato) Connect() error {
-	if l.ApiUser == "" || l.ApiToken == "" {
-		return fmt.Errorf("api_user and api_token are required fields for librato output")
-	}
-	l.client = &http.Client{
-		Timeout: l.Timeout.Duration,
-	}
-	return nil
-}
-
-func (l *Librato) Write(points []*client.Point) error {
-	if len(points) == 0 {
-		return nil
-	}
-	metrics := Metrics{}
-	var tempGauges = make([]*Gauge, len(points))
-	var acceptablePoints = 0
-	for _, pt := range points {
-		if gauge, err := l.buildGauge(pt); err == nil {
-			tempGauges[acceptablePoints] = gauge
-			acceptablePoints += 1
-		} else {
-			log.Printf("unable to build Gauge for %s, skipping\n", pt.Name())
-		}
-	}
-	metrics.Gauges = make([]*Gauge, acceptablePoints)
-	copy(metrics.Gauges, tempGauges[0:])
-	metricsBytes, err := json.Marshal(metrics)
-	if err != nil {
-		return fmt.Errorf("unable to marshal Metrics, %s\n", err.Error())
-	}
-	req, err := http.NewRequest("POST", l.apiUrl, bytes.NewBuffer(metricsBytes))
-	if err != nil {
-		return fmt.Errorf("unable to create http.Request, %s\n", err.Error())
-	}
-	req.Header.Add("Content-Type", "application/json")
-	req.SetBasicAuth(l.ApiUser, l.ApiToken)
-
-	resp, err := l.client.Do(req)
-	if err != nil {
-		return fmt.Errorf("error POSTing metrics, %s\n", err.Error())
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != 200 {
-		return fmt.Errorf("received bad status code, %d\n", resp.StatusCode)
-	}
-
-	return nil
-}
-
-func (l *Librato) SampleConfig() string {
-	return sampleConfig
-}
-
-func (l *Librato) Description() string {
-	return "Configuration for Librato API to send metrics to."
-}
-
-func (l *Librato) buildGauge(pt *client.Point) (*Gauge, error) {
-	gauge := &Gauge{
-		Name:        pt.Name(),
-		MeasureTime: pt.Time().Unix(),
-	}
-	if err := gauge.setValue(pt.Fields()["value"]); err != nil {
-		return gauge, fmt.Errorf("unable to extract value from Fields, %s\n", err.Error())
-	}
-	if l.SourceTag != "" {
-		if source, ok := pt.Tags()[l.SourceTag]; ok {
-			gauge.Source = source
-		} else {
-			return gauge, fmt.Errorf("undeterminable Source type from Field, %s\n", l.SourceTag)
-		}
-	}
-	return gauge, nil
-}
-
-func (g *Gauge) setValue(v interface{}) error {
-	switch d := v.(type) {
-	case int:
-		g.Value = float64(int(d))
-	case int32:
-		g.Value = float64(int32(d))
-	case int64:
-		g.Value = float64(int64(d))
-	case float32:
-		g.Value = float64(d)
-	case float64:
-		g.Value = float64(d)
-	default:
-		return fmt.Errorf("undeterminable type %+v", d)
-	}
-	return nil
-}
-
-func (l *Librato) Close() error {
-	return nil
-}
-
-func init() {
-	outputs.Add("librato", func() outputs.Output {
-		return NewLibrato(librato_api)
-	})
-}
--- a/outputs/mqtt/mqtt.go
+++ b/outputs/mqtt/mqtt.go
@@ -1,190 +0,0 @@
-package mqtt
-
-import (
-	"crypto/rand"
-	"crypto/tls"
-	"crypto/x509"
-	"fmt"
-	"io/ioutil"
-	"strings"
-	"sync"
-
-	paho "git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git"
-	"github.com/influxdb/influxdb/client/v2"
-	"github.com/influxdb/telegraf/internal"
-	"github.com/influxdb/telegraf/outputs"
-)
-
-const MaxClientIdLen = 8
-const MaxRetryCount = 3
-const ClientIdPrefix = "telegraf"
-
-type MQTT struct {
-	Servers     []string `toml:"servers"`
-	Username    string
-	Password    string
-	Database    string
-	Timeout     internal.Duration
-	TopicPrefix string
-
-	Client *paho.Client
-	Opts   *paho.ClientOptions
-	sync.Mutex
-}
-
-var sampleConfig = `
-  servers = ["localhost:1883"] # required.
-
-  # MQTT outputs send metrics to this topic format
-  #    "<topic_prefix>/host/<hostname>/<pluginname>/"
-  #   ex: prefix/host/web01.example.com/mem/available
-  # topic_prefix = "prefix"
-
-  # username and password to connect MQTT server.
-  # username = "telegraf"
-  # password = "metricsmetricsmetricsmetrics"
-`
-
-func (m *MQTT) Connect() error {
-	var err error
-	m.Lock()
-	defer m.Unlock()
-
-	m.Opts, err = m.CreateOpts()
-	if err != nil {
-		return err
-	}
-
-	m.Client = paho.NewClient(m.Opts)
-	if token := m.Client.Connect(); token.Wait() && token.Error() != nil {
-		return token.Error()
-	}
-
-	return nil
-}
-
-func (m *MQTT) Close() error {
-	if m.Client.IsConnected() {
-		m.Client.Disconnect(20)
-	}
-	return nil
-}
-
-func (m *MQTT) SampleConfig() string {
-	return sampleConfig
-}
-
-func (m *MQTT) Description() string {
-	return "Configuration for MQTT server to send metrics to"
-}
-
-func (m *MQTT) Write(points []*client.Point) error {
-	m.Lock()
-	defer m.Unlock()
-	if len(points) == 0 {
-		return nil
-	}
-	hostname, ok := points[0].Tags()["host"]
-	if !ok {
-		hostname = ""
-	}
-
-	for _, p := range points {
-		var t []string
-		if m.TopicPrefix != "" {
-			t = append(t, m.TopicPrefix)
-		}
-		tm := strings.Split(p.Name(), "_")
-		if len(tm) < 2 {
-			tm = []string{p.Name(), "stat"}
-		}
-
-		t = append(t, "host", hostname, tm[0], tm[1])
-		topic := strings.Join(t, "/")
-
-		value := p.String()
-		err := m.publish(topic, value)
-		if err != nil {
-			return fmt.Errorf("Could not write to MQTT server, %s", err)
-		}
-	}
-
-	return nil
-}
-
-func (m *MQTT) publish(topic, body string) error {
-	token := m.Client.Publish(topic, 0, false, body)
-	token.Wait()
-	if token.Error() != nil {
-		return token.Error()
-	}
-	return nil
-}
-
-func (m *MQTT) CreateOpts() (*paho.ClientOptions, error) {
-	opts := paho.NewClientOptions()
-
-	clientId := getRandomClientId()
-	opts.SetClientID(clientId)
-
-	TLSConfig := &tls.Config{InsecureSkipVerify: false}
-	ca := "" // TODO
-	scheme := "tcp"
-	if ca != "" {
-		scheme = "ssl"
-		certPool, err := getCertPool(ca)
-		if err != nil {
-			return nil, err
-		}
-		TLSConfig.RootCAs = certPool
-	}
-	TLSConfig.InsecureSkipVerify = true // TODO
-	opts.SetTLSConfig(TLSConfig)
-
-	user := m.Username
-	if user == "" {
-		opts.SetUsername(user)
-	}
-	password := m.Password
-	if password != "" {
-		opts.SetPassword(password)
-	}
-
-	if len(m.Servers) == 0 {
-		return opts, fmt.Errorf("could not get host infomations")
-	}
-	for _, host := range m.Servers {
-		server := fmt.Sprintf("%s://%s", scheme, host)
-
-		opts.AddBroker(server)
-	}
-	opts.SetAutoReconnect(true)
-	return opts, nil
-}
-
-func getRandomClientId() string {
-	const alphanum = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
-	var bytes = make([]byte, MaxClientIdLen)
-	rand.Read(bytes)
-	for i, b := range bytes {
-		bytes[i] = alphanum[b%byte(len(alphanum))]
-	}
-	return ClientIdPrefix + "-" + string(bytes)
-}
-
-func getCertPool(pemPath string) (*x509.CertPool, error) {
-	certs := x509.NewCertPool()
-
-	pemData, err := ioutil.ReadFile(pemPath)
-	if err != nil {
-		return nil, err
-	}
-	certs.AppendCertsFromPEM(pemData)
-	return certs, nil
-}
-
-func init() {
-	outputs.Add("mqtt", func() outputs.Output {
-		return &MQTT{}
-	})
-}
--- a/outputs/nsq/nsq.go
+++ b/outputs/nsq/nsq.go
@@ -1,71 +0,0 @@
-package nsq
-
-import (
-	"fmt"
-	"github.com/influxdb/influxdb/client/v2"
-	"github.com/influxdb/telegraf/outputs"
-	"github.com/nsqio/go-nsq"
-)
-
-type NSQ struct {
-	Server   string
-	Topic    string
-	producer *nsq.Producer
-}
-
-var sampleConfig = `
-  # Location of nsqd instance listening on TCP
-  server = "localhost:4150"
-  # NSQ topic for producer messages
-  topic = "telegraf"
-`
-
-func (n *NSQ) Connect() error {
-	config := nsq.NewConfig()
-	producer, err := nsq.NewProducer(n.Server, config)
-
-	if err != nil {
-		return err
-	}
-
-	n.producer = producer
-	return nil
-}
-
-func (n *NSQ) Close() error {
-	n.producer.Stop()
-	return nil
-}
-
-func (n *NSQ) SampleConfig() string {
-	return sampleConfig
-}
-
-func (n *NSQ) Description() string {
-	return "Send telegraf measurements to NSQD"
-}
-
-func (n *NSQ) Write(points []*client.Point) error {
-	if len(points) == 0 {
-		return nil
-	}
-
-	for _, p := range points {
-		// Combine tags from Point and BatchPoints and grab the resulting
-		// line-protocol output string to write to NSQ
-		value := p.String()
-
-		err := n.producer.Publish(n.Topic, []byte(value))
-
-		if err != nil {
-			return fmt.Errorf("FAILED to send NSQD message: %s", err)
-		}
-	}
-	return nil
-}
-
-func init() {
-	outputs.Add("nsq", func() outputs.Output {
-		return &NSQ{}
-	})
-}
--- a/outputs/prometheus_client/prometheus_client.go
+++ b/outputs/prometheus_client/prometheus_client.go
@@ -1,125 +0,0 @@
-package prometheus_client
-
-import (
-	"fmt"
-	"log"
-	"net/http"
-
-	"github.com/influxdb/influxdb/client/v2"
-	"github.com/influxdb/telegraf/outputs"
-	"github.com/prometheus/client_golang/prometheus"
-)
-
-type PrometheusClient struct {
-	Listen  string
-	metrics map[string]*prometheus.UntypedVec
-}
-
-var sampleConfig = `
-  # Address to listen on
-  # listen = ":9126"
-`
-
-func (p *PrometheusClient) Start() error {
-	if p.Listen == "" {
-		p.Listen = "localhost:9126"
-	}
-
-	http.Handle("/metrics", prometheus.Handler())
-	server := &http.Server{
-		Addr: p.Listen,
-	}
-
-	p.metrics = make(map[string]*prometheus.UntypedVec)
-	go server.ListenAndServe()
-	return nil
-}
-
-func (p *PrometheusClient) Stop() {
-	// TODO: Use a listener for http.Server that counts active connections
-	//       that can be stopped and closed gracefully
-}
-
-func (p *PrometheusClient) Connect() error {
-	// This service output does not need to make any further connections
-	return nil
-}
-
-func (p *PrometheusClient) Close() error {
-	// This service output does not need to close any of its connections
-	return nil
-}
-
-func (p *PrometheusClient) SampleConfig() string {
-	return sampleConfig
-}
-
-func (p *PrometheusClient) Description() string {
-	return "Configuration for the Prometheus client to spawn"
-}
-
-func (p *PrometheusClient) Write(points []*client.Point) error {
-	if len(points) == 0 {
-		return nil
-	}
-
-	for _, point := range points {
-		var labels []string
-		key := point.Name()
-
-		for k, _ := range point.Tags() {
-			if len(k) > 0 {
-				labels = append(labels, k)
-			}
-		}
-
-		if _, ok := p.metrics[key]; !ok {
-			p.metrics[key] = prometheus.NewUntypedVec(
-				prometheus.UntypedOpts{
-					Name: key,
-					Help: fmt.Sprintf("Telegraf collected point '%s'", key),
-				},
-				labels,
-			)
-			prometheus.MustRegister(p.metrics[key])
-		}
-
-		l := prometheus.Labels{}
-		for tk, tv := range point.Tags() {
-			l[tk] = tv
-		}
-
-		for _, val := range point.Fields() {
-			switch val := val.(type) {
-			default:
-				log.Printf("Prometheus output, unsupported type. key: %s, type: %T\n",
-					key, val)
-			case int64:
-				m, err := p.metrics[key].GetMetricWith(l)
-				if err != nil {
-					log.Printf("ERROR Getting metric in Prometheus output, "+
-						"key: %s, labels: %v,\nerr: %s\n",
-						key, l, err.Error())
-					continue
-				}
-				m.Set(float64(val))
-			case float64:
-				m, err := p.metrics[key].GetMetricWith(l)
-				if err != nil {
-					log.Printf("ERROR Getting metric in Prometheus output, "+
-						"key: %s, labels: %v,\nerr: %s\n",
-						key, l, err.Error())
-					continue
-				}
-				m.Set(val)
-			}
-		}
-	}
-	return nil
-}
-
-func init() {
-	outputs.Add("prometheus_client", func() outputs.Output {
-		return &PrometheusClient{}
-	})
-}
--- a/outputs/prometheus_client/prometheus_client_test.go
+++ b/outputs/prometheus_client/prometheus_client_test.go
@@ -1,98 +0,0 @@
-package prometheus_client
-
-import (
-	"testing"
-
-	"github.com/influxdb/influxdb/client/v2"
-	"github.com/influxdb/telegraf/plugins/prometheus"
-	"github.com/influxdb/telegraf/testutil"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-var pTesting *PrometheusClient
-
-func TestPrometheusWritePointEmptyTag(t *testing.T) {
-	if testing.Short() {
-		t.Skip("Skipping integration test in short mode")
-	}
-
-	p := &prometheus.Prometheus{
-		Urls: []string{"http://localhost:9126/metrics"},
-	}
-	tags := make(map[string]string)
-	pt1, _ := client.NewPoint(
-		"test_point_1",
-		tags,
-		map[string]interface{}{"value": 0.0})
-	pt2, _ := client.NewPoint(
-		"test_point_2",
-		tags,
-		map[string]interface{}{"value": 1.0})
-	var points = []*client.Point{
-		pt1,
-		pt2,
-	}
-	require.NoError(t, pTesting.Write(points))
-
-	expected := []struct {
-		name  string
-		value float64
-		tags  map[string]string
-	}{
-		{"test_point_1", 0.0, tags},
-		{"test_point_2", 1.0, tags},
-	}
-
-	var acc testutil.Accumulator
-
-	require.NoError(t, p.Gather(&acc))
-	for _, e := range expected {
-		assert.NoError(t, acc.ValidateValue(e.name, e.value))
-	}
-}
-
-func TestPrometheusWritePointTag(t *testing.T) {
-	if testing.Short() {
-		t.Skip("Skipping integration test in short mode")
-	}
-
-	p := &prometheus.Prometheus{
-		Urls: []string{"http://localhost:9126/metrics"},
-	}
-	tags := make(map[string]string)
-	tags["testtag"] = "testvalue"
-	pt1, _ := client.NewPoint(
-		"test_point_3",
-		tags,
-		map[string]interface{}{"value": 0.0})
-	pt2, _ := client.NewPoint(
-		"test_point_4",
-		tags,
-		map[string]interface{}{"value": 1.0})
-	var points = []*client.Point{
-		pt1,
-		pt2,
-	}
-	require.NoError(t, pTesting.Write(points))
-
-	expected := []struct {
-		name  string
-		value float64
-	}{
-		{"test_point_3", 0.0},
-		{"test_point_4", 1.0},
-	}
-
-	var acc testutil.Accumulator
-
-	require.NoError(t, p.Gather(&acc))
-	for _, e := range expected {
-		assert.True(t, acc.CheckTaggedValue(e.name, e.value, tags))
-	}
-}
-
-func init() {
-	pTesting = &PrometheusClient{Listen: "localhost:9126"}
-	pTesting.Start()
-}
--- a/outputs/riemann/riemann.go
+++ b/outputs/riemann/riemann.go
@@ -1,95 +0,0 @@
-package riemann
-
-import (
-	"errors"
-	"fmt"
-	"os"
-
-	"github.com/amir/raidman"
-	"github.com/influxdb/influxdb/client/v2"
-	"github.com/influxdb/telegraf/outputs"
-)
-
-type Riemann struct {
-	URL       string
-	Transport string
-
-	client *raidman.Client
-}
-
-var sampleConfig = `
-  # URL of server
-  url = "localhost:5555"
-  # transport protocol to use either tcp or udp
-  transport = "tcp"
-`
-
-func (r *Riemann) Connect() error {
-	c, err := raidman.Dial(r.Transport, r.URL)
-
-	if err != nil {
-		return err
-	}
-
-	r.client = c
-	return nil
-}
-
-func (r *Riemann) Close() error {
-	r.client.Close()
-	return nil
-}
-
-func (r *Riemann) SampleConfig() string {
-	return sampleConfig
-}
-
-func (r *Riemann) Description() string {
-	return "Configuration for the Riemann server to send metrics to"
-}
-
-func (r *Riemann) Write(points []*client.Point) error {
-	if len(points) == 0 {
-		return nil
-	}
-
-	var events []*raidman.Event
-	for _, p := range points {
-		ev := buildEvent(p)
-		events = append(events, ev)
-	}
-
-	var senderr = r.client.SendMulti(events)
-	if senderr != nil {
-		return errors.New(fmt.Sprintf("FAILED to send riemann message: %s\n",
-			senderr))
-	}
-
-	return nil
-}
-
-func buildEvent(p *client.Point) *raidman.Event {
-	host, ok := p.Tags()["host"]
-	if !ok {
-		hostname, err := os.Hostname()
-		if err != nil {
-			host = "unknown"
-		} else {
-			host = hostname
-		}
-	}
-
-	var event = &raidman.Event{
-		Host:    host,
-		Service: p.Name(),
-		Metric:  p.Fields()["value"],
-	}
-
-	return event
-}
-
-func init() {
-	outputs.Add("riemann", func() outputs.Output {
-		return &Riemann{}
-	})
-}
--- a/plugins/all/all.go
+++ b/plugins/all/all.go
@@ -1,37 +0,0 @@
-package all
-
-import (
-	_ "github.com/influxdb/telegraf/plugins/aerospike"
-	_ "github.com/influxdb/telegraf/plugins/apache"
-	_ "github.com/influxdb/telegraf/plugins/bcache"
-	_ "github.com/influxdb/telegraf/plugins/disque"
-	_ "github.com/influxdb/telegraf/plugins/elasticsearch"
-	_ "github.com/influxdb/telegraf/plugins/exec"
-	_ "github.com/influxdb/telegraf/plugins/haproxy"
-	_ "github.com/influxdb/telegraf/plugins/httpjson"
-	_ "github.com/influxdb/telegraf/plugins/influxdb"
-	_ "github.com/influxdb/telegraf/plugins/jolokia"
-	_ "github.com/influxdb/telegraf/plugins/kafka_consumer"
-	_ "github.com/influxdb/telegraf/plugins/leofs"
-	_ "github.com/influxdb/telegraf/plugins/lustre2"
-	_ "github.com/influxdb/telegraf/plugins/mailchimp"
-	_ "github.com/influxdb/telegraf/plugins/memcached"
-	_ "github.com/influxdb/telegraf/plugins/mongodb"
-	_ "github.com/influxdb/telegraf/plugins/mysql"
-	_ "github.com/influxdb/telegraf/plugins/nginx"
-	_ "github.com/influxdb/telegraf/plugins/phpfpm"
-	_ "github.com/influxdb/telegraf/plugins/ping"
-	_ "github.com/influxdb/telegraf/plugins/postgresql"
-	_ "github.com/influxdb/telegraf/plugins/procstat"
-	_ "github.com/influxdb/telegraf/plugins/prometheus"
-	_ "github.com/influxdb/telegraf/plugins/puppetagent"
-	_ "github.com/influxdb/telegraf/plugins/rabbitmq"
-	_ "github.com/influxdb/telegraf/plugins/redis"
-	_ "github.com/influxdb/telegraf/plugins/rethinkdb"
-	_ "github.com/influxdb/telegraf/plugins/statsd"
-	_ "github.com/influxdb/telegraf/plugins/system"
-	_ "github.com/influxdb/telegraf/plugins/trig"
-	_ "github.com/influxdb/telegraf/plugins/twemproxy"
-	_ "github.com/influxdb/telegraf/plugins/zfs"
-	_ "github.com/influxdb/telegraf/plugins/zookeeper"
-)
--- a/plugins/elasticsearch/testdata_test.go
+++ b/plugins/elasticsearch/testdata_test.go
@@ -1,759 +0,0 @@
-package elasticsearch
-
-const clusterResponse = `
-{
-   "cluster_name": "elasticsearch_telegraf",
-   "status": "green",
-   "timed_out": false,
-   "number_of_nodes": 3,
-   "number_of_data_nodes": 3,
-   "active_primary_shards": 5,
-   "active_shards": 15,
-   "relocating_shards": 0,
-   "initializing_shards": 0,
-   "unassigned_shards": 0,
-   "indices": {
-      "v1": {
-         "status": "green",
-         "number_of_shards": 10,
-         "number_of_replicas": 1,
-         "active_primary_shards": 10,
-         "active_shards": 20,
-         "relocating_shards": 0,
-         "initializing_shards": 0,
-         "unassigned_shards": 0
-      },
-      "v2": {
-         "status": "red",
-         "number_of_shards": 10,
-         "number_of_replicas": 1,
-         "active_primary_shards": 0,
-         "active_shards": 0,
-         "relocating_shards": 0,
-         "initializing_shards": 0,
-         "unassigned_shards": 20
-      }
-   }
-}
-`
-
-var clusterHealthExpected = map[string]interface{}{
-	"status":                "green",
-	"timed_out":             false,
-	"number_of_nodes":       3,
-	"number_of_data_nodes":  3,
-	"active_primary_shards": 5,
-	"active_shards":         15,
-	"relocating_shards":     0,
-	"initializing_shards":   0,
-	"unassigned_shards":     0,
-}
-
-var v1IndexExpected = map[string]interface{}{
-	"status":                "green",
-	"number_of_shards":      10,
-	"number_of_replicas":    1,
-	"active_primary_shards": 10,
-	"active_shards":         20,
-	"relocating_shards":     0,
-	"initializing_shards":   0,
-	"unassigned_shards":     0,
-}
-
-var v2IndexExpected = map[string]interface{}{
-	"status":                "red",
-	"number_of_shards":      10,
-	"number_of_replicas":    1,
-	"active_primary_shards": 0,
-	"active_shards":         0,
-	"relocating_shards":     0,
-	"initializing_shards":   0,
-	"unassigned_shards":     20,
-}
-
-const statsResponse = `
-{
-  "cluster_name": "es-testcluster",
-  "nodes": {
-    "SDFsfSDFsdfFSDSDfSFDSDF": {
-      "timestamp": 1436365550135,
-      "name": "test.host.com",
-      "transport_address": "inet[/127.0.0.1:9300]",
-      "host": "test",
-      "ip": [
-        "inet[/127.0.0.1:9300]",
-        "NONE"
-      ],
-      "attributes": {
-        "master": "true"
-      },
-      "indices": {
-        "docs": {
-          "count": 29652,
-          "deleted": 5229
-        },
-        "store": {
-          "size_in_bytes": 37715234,
-          "throttle_time_in_millis": 215
-        },
-        "indexing": {
-          "index_total": 84790,
-          "index_time_in_millis": 29680,
-          "index_current": 0,
-          "delete_total": 13879,
-          "delete_time_in_millis": 1139,
-          "delete_current": 0,
-          "noop_update_total": 0,
-          "is_throttled": false,
-          "throttle_time_in_millis": 0
-        },
-        "get": {
-          "total": 1,
-          "time_in_millis": 2,
-          "exists_total": 0,
-          "exists_time_in_millis": 0,
-          "missing_total": 1,
-          "missing_time_in_millis": 2,
-          "current": 0
-        },
-        "search": {
-          "open_contexts": 0,
-          "query_total": 1452,
-          "query_time_in_millis": 5695,
-          "query_current": 0,
-          "fetch_total": 414,
-          "fetch_time_in_millis": 146,
-          "fetch_current": 0
-        },
-        "merges": {
-          "current": 0,
-          "current_docs": 0,
-          "current_size_in_bytes": 0,
-          "total": 133,
-          "total_time_in_millis": 21060,
-          "total_docs": 203672,
-          "total_size_in_bytes": 142900226
-        },
-        "refresh": {
-          "total": 1076,
-          "total_time_in_millis": 20078
-        },
-        "flush": {
-          "total": 115,
-          "total_time_in_millis": 2401
-        },
-        "warmer": {
-          "current": 0,
-          "total": 2319,
-          "total_time_in_millis": 448
-        },
-        "filter_cache": {
-          "memory_size_in_bytes": 7384,
-          "evictions": 0
-        },
-        "id_cache": {
-          "memory_size_in_bytes": 0
-        },
-        "fielddata": {
-          "memory_size_in_bytes": 12996,
-          "evictions": 0
-        },
-        "percolate": {
-          "total": 0,
-          "time_in_millis": 0,
-          "current": 0,
-          "memory_size_in_bytes": -1,
-          "memory_size": "-1b",
-          "queries": 0
-        },
-        "completion": {
-          "size_in_bytes": 0
-        },
-        "segments": {
-          "count": 134,
-          "memory_in_bytes": 1285212,
-          "index_writer_memory_in_bytes": 0,
-          "index_writer_max_memory_in_bytes": 172368955,
-          "version_map_memory_in_bytes": 611844,
-          "fixed_bit_set_memory_in_bytes": 0
-        },
-        "translog": {
-          "operations": 17702,
-          "size_in_bytes": 17
-        },
-        "suggest": {
-          "total": 0,
-          "time_in_millis": 0,
-          "current": 0
-        },
-        "query_cache": {
-          "memory_size_in_bytes": 0,
-          "evictions": 0,
-          "hit_count": 0,
-          "miss_count": 0
-        },
-        "recovery": {
-          "current_as_source": 0,
-          "current_as_target": 0,
-          "throttle_time_in_millis": 0
-        }
-      },
-      "os": {
-        "timestamp": 1436460392944,
-        "load_average": [
-          0.01,
-          0.04,
-          0.05
-        ],
-        "mem": {
-          "free_in_bytes": 477761536,
-          "used_in_bytes": 1621868544,
-          "free_percent": 74,
-          "used_percent": 25,
-          "actual_free_in_bytes": 1565470720,
-          "actual_used_in_bytes": 534159360
-        },
-        "swap": {
-          "used_in_bytes": 0,
-          "free_in_bytes": 487997440
-        }
-      },
-      "process": {
-        "timestamp": 1436460392945,
-        "open_file_descriptors": 160,
-        "cpu": {
-          "percent": 2,
-          "sys_in_millis": 1870,
-          "user_in_millis": 13610,
-          "total_in_millis": 15480
-        },
-        "mem": {
-          "total_virtual_in_bytes": 4747890688
-        }
-      },
-      "jvm": {
-        "timestamp": 1436460392945,
-        "uptime_in_millis": 202245,
-        "mem": {
-          "heap_used_in_bytes": 52709568,
-          "heap_used_percent": 5,
-          "heap_committed_in_bytes": 259522560,
-          "heap_max_in_bytes": 1038876672,
-          "non_heap_used_in_bytes": 39634576,
-          "non_heap_committed_in_bytes": 40841216,
-          "pools": {
-            "young": {
-              "used_in_bytes": 32685760,
-              "max_in_bytes": 279183360,
-              "peak_used_in_bytes": 71630848,
-              "peak_max_in_bytes": 279183360
-            },
-            "survivor": {
-              "used_in_bytes": 8912880,
-              "max_in_bytes": 34865152,
-              "peak_used_in_bytes": 8912888,
-              "peak_max_in_bytes": 34865152
-            },
-            "old": {
-              "used_in_bytes": 11110928,
-              "max_in_bytes": 724828160,
-              "peak_used_in_bytes": 14354608,
-              "peak_max_in_bytes": 724828160
-            }
-          }
-        },
-        "threads": {
-          "count": 44,
-          "peak_count": 45
-        },
-        "gc": {
-          "collectors": {
-            "young": {
-              "collection_count": 2,
-              "collection_time_in_millis": 98
-            },
-            "old": {
-              "collection_count": 1,
-              "collection_time_in_millis": 24
-            }
-          }
-        },
-        "buffer_pools": {
-          "direct": {
-            "count": 40,
-            "used_in_bytes": 6304239,
-            "total_capacity_in_bytes": 6304239
-          },
-          "mapped": {
-            "count": 0,
-            "used_in_bytes": 0,
-            "total_capacity_in_bytes": 0
-          }
-        }
-      },
-      "thread_pool": {
-        "percolate": {
-          "threads": 123,
-          "queue": 23,
-          "active": 13,
-          "rejected": 235,
-          "largest": 23,
-          "completed": 33
-        },
-        "fetch_shard_started": {
-          "threads": 3,
-          "queue": 1,
-          "active": 5,
-          "rejected": 6,
-          "largest": 4,
-          "completed": 54
-        },
-        "listener": {
-          "threads": 1,
-          "queue": 2,
-          "active": 4,
-          "rejected": 8,
-          "largest": 1,
-          "completed": 1
-        },
-        "index": {
-          "threads": 6,
-          "queue": 8,
-          "active": 4,
-          "rejected": 2,
-          "largest": 3,
-          "completed": 6
-        },
-        "refresh": {
-          "threads": 23,
-          "queue": 7,
-          "active": 3,
-          "rejected": 4,
-          "largest": 8,
-          "completed": 3
-        },
-        "suggest": {
-          "threads": 2,
-          "queue": 7,
-          "active": 2,
-          "rejected": 1,
-          "largest": 8,
-          "completed": 3
-        },
-        "generic": {
-          "threads": 1,
-          "queue": 4,
-          "active": 6,
-          "rejected": 3,
-          "largest": 2,
-          "completed": 27
-        },
-        "warmer": {
-          "threads": 2,
-          "queue": 7,
-          "active": 3,
-          "rejected": 2,
-          "largest": 3,
-          "completed": 1
-        },
-        "search": {
-          "threads": 5,
-          "queue": 7,
-          "active": 2,
-          "rejected": 7,
-          "largest": 2,
-          "completed": 4
-        },
-        "flush": {
-          "threads": 3,
-          "queue": 8,
-          "active": 0,
-          "rejected": 1,
-          "largest": 5,
-          "completed": 3
-        },
-        "optimize": {
-          "threads": 3,
-          "queue": 4,
-          "active": 1,
-          "rejected": 2,
-          "largest": 7,
-          "completed": 3
-        },
-        "fetch_shard_store": {
-          "threads": 1,
-          "queue": 7,
-          "active": 4,
-          "rejected": 2,
-          "largest": 4,
-          "completed": 1
-        },
-        "management": {
-          "threads": 2,
-          "queue": 3,
-          "active": 1,
-          "rejected": 6,
-          "largest": 2,
-          "completed": 22
-        },
-        "get": {
-          "threads": 1,
-          "queue": 8,
-          "active": 4,
-          "rejected": 3,
-          "largest": 2,
-          "completed": 1
-        },
-        "merge": {
-          "threads": 6,
-          "queue": 4,
-          "active": 5,
-          "rejected": 2,
-          "largest": 5,
-          "completed": 1
-        },
-        "bulk": {
-          "threads": 4,
-          "queue": 5,
-          "active": 7,
-          "rejected": 3,
-          "largest": 1,
-          "completed": 4
-        },
-        "snapshot": {
-          "threads": 8,
-          "queue": 5,
-          "active": 6,
-          "rejected": 2,
-          "largest": 1,
-          "completed": 0
-        }
-      },
-      "fs": {
-        "timestamp": 1436460392946,
-        "total": {
-          "total_in_bytes": 19507089408,
-          "free_in_bytes": 16909316096,
-          "available_in_bytes": 15894814720
-        },
-        "data": [
-          {
-            "path": "/usr/share/elasticsearch/data/elasticsearch/nodes/0",
-            "mount": "/usr/share/elasticsearch/data",
-            "type": "ext4",
-            "total_in_bytes": 19507089408,
-            "free_in_bytes": 16909316096,
-            "available_in_bytes": 15894814720
-          }
-        ]
-      },
-      "transport": {
-        "server_open": 13,
-        "rx_count": 6,
-        "rx_size_in_bytes": 1380,
-        "tx_count": 6,
-        "tx_size_in_bytes": 1380
-      },
-      "http": {
-        "current_open": 3,
-        "total_opened": 3
-      },
-      "breakers": {
-        "fielddata": {
-          "limit_size_in_bytes": 623326003,
-          "limit_size": "594.4mb",
-          "estimated_size_in_bytes": 0,
-          "estimated_size": "0b",
-          "overhead": 1.03,
-          "tripped": 0
-        },
-        "request": {
-          "limit_size_in_bytes": 415550668,
-          "limit_size": "396.2mb",
-          "estimated_size_in_bytes": 0,
-          "estimated_size": "0b",
-          "overhead": 1.0,
-          "tripped": 0
-        },
-        "parent": {
-          "limit_size_in_bytes": 727213670,
-          "limit_size": "693.5mb",
-          "estimated_size_in_bytes": 0,
-          "estimated_size": "0b",
-          "overhead": 1.0,
-          "tripped": 0
-        }
-      }
-    }
-  }
-}
-`
-
-var indicesExpected = map[string]float64{
-	"indices_id_cache_memory_size_in_bytes":             0,
-	"indices_completion_size_in_bytes":                  0,
-	"indices_suggest_total":                             0,
-	"indices_suggest_time_in_millis":                    0,
-	"indices_suggest_current":                           0,
-	"indices_query_cache_memory_size_in_bytes":          0,
-	"indices_query_cache_evictions":                     0,
-	"indices_query_cache_hit_count":                     0,
-	"indices_query_cache_miss_count":                    0,
-	"indices_store_size_in_bytes":                       37715234,
-	"indices_store_throttle_time_in_millis":             215,
-	"indices_merges_current_docs":                       0,
-	"indices_merges_current_size_in_bytes":              0,
-	"indices_merges_total":                              133,
-	"indices_merges_total_time_in_millis":               21060,
-	"indices_merges_total_docs":                         203672,
-	"indices_merges_total_size_in_bytes":                142900226,
-	"indices_merges_current":                            0,
-	"indices_filter_cache_memory_size_in_bytes":         7384,
-	"indices_filter_cache_evictions":                    0,
-	"indices_indexing_index_total":                      84790,
-	"indices_indexing_index_time_in_millis":             29680,
-	"indices_indexing_index_current":                    0,
-	"indices_indexing_noop_update_total":                0,
-	"indices_indexing_throttle_time_in_millis":          0,
-	"indices_indexing_delete_total":                     13879,
-	"indices_indexing_delete_time_in_millis":            1139,
-	"indices_indexing_delete_current":                   0,
-	"indices_get_exists_time_in_millis":                 0,
-	"indices_get_missing_total":                         1,
-	"indices_get_missing_time_in_millis":                2,
-	"indices_get_current":                               0,
-	"indices_get_total":                                 1,
-	"indices_get_time_in_millis":                        2,
-	"indices_get_exists_total":                          0,
-	"indices_refresh_total":                             1076,
-	"indices_refresh_total_time_in_millis":              20078,
-	"indices_percolate_current":                         0,
-	"indices_percolate_memory_size_in_bytes":            -1,
-	"indices_percolate_queries":                         0,
-	"indices_percolate_total":                           0,
-	"indices_percolate_time_in_millis":                  0,
-	"indices_translog_operations":                       17702,
-	"indices_translog_size_in_bytes":                    17,
-	"indices_recovery_current_as_source":                0,
-	"indices_recovery_current_as_target":                0,
-	"indices_recovery_throttle_time_in_millis":          0,
-	"indices_docs_count":                                29652,
-	"indices_docs_deleted":                              5229,
-	"indices_flush_total_time_in_millis":                2401,
-	"indices_flush_total":                               115,
-	"indices_fielddata_memory_size_in_bytes":            12996,
-	"indices_fielddata_evictions":                       0,
-	"indices_search_fetch_current":                      0,
-	"indices_search_open_contexts":                      0,
-	"indices_search_query_total":                        1452,
-	"indices_search_query_time_in_millis":               5695,
-	"indices_search_query_current":                      0,
-	"indices_search_fetch_total":                        414,
-	"indices_search_fetch_time_in_millis":               146,
-	"indices_warmer_current":                            0,
-	"indices_warmer_total":                              2319,
-	"indices_warmer_total_time_in_millis":               448,
-	"indices_segments_count":                            134,
-	"indices_segments_memory_in_bytes":                  1285212,
-	"indices_segments_index_writer_memory_in_bytes":     0,
-	"indices_segments_index_writer_max_memory_in_bytes": 172368955,
-	"indices_segments_version_map_memory_in_bytes":      611844,
-	"indices_segments_fixed_bit_set_memory_in_bytes":    0,
-}
-
-var osExpected = map[string]float64{
-	"os_swap_used_in_bytes":       0,
-	"os_swap_free_in_bytes":       487997440,
-	"os_timestamp":                1436460392944,
-	"os_mem_free_percent":         74,
-	"os_mem_used_percent":         25,
-	"os_mem_actual_free_in_bytes": 1565470720,
-	"os_mem_actual_used_in_bytes": 534159360,
-	"os_mem_free_in_bytes":        477761536,
-	"os_mem_used_in_bytes":        1621868544,
-}
-
-var processExpected = map[string]float64{
-	"process_mem_total_virtual_in_bytes": 4747890688,
-	"process_timestamp":                  1436460392945,
-	"process_open_file_descriptors":      160,
-	"process_cpu_total_in_millis":        15480,
-	"process_cpu_percent":                2,
-	"process_cpu_sys_in_millis":          1870,
-	"process_cpu_user_in_millis":         13610,
-}
-
-var jvmExpected = map[string]float64{
-	"jvm_timestamp":                                     1436460392945,
-	"jvm_uptime_in_millis":                              202245,
-	"jvm_mem_non_heap_used_in_bytes":                    39634576,
-	"jvm_mem_non_heap_committed_in_bytes":               40841216,
-	"jvm_mem_pools_young_max_in_bytes":                  279183360,
-	"jvm_mem_pools_young_peak_used_in_bytes":            71630848,
-	"jvm_mem_pools_young_peak_max_in_bytes":             279183360,
-	"jvm_mem_pools_young_used_in_bytes":                 32685760,
-	"jvm_mem_pools_survivor_peak_used_in_bytes":         8912888,
-	"jvm_mem_pools_survivor_peak_max_in_bytes":          34865152,
-	"jvm_mem_pools_survivor_used_in_bytes":              8912880,
-	"jvm_mem_pools_survivor_max_in_bytes":               34865152,
-	"jvm_mem_pools_old_peak_max_in_bytes":               724828160,
-	"jvm_mem_pools_old_used_in_bytes":                   11110928,
-	"jvm_mem_pools_old_max_in_bytes":                    724828160,
-	"jvm_mem_pools_old_peak_used_in_bytes":              14354608,
-	"jvm_mem_heap_used_in_bytes":                        52709568,
-	"jvm_mem_heap_used_percent":                         5,
-	"jvm_mem_heap_committed_in_bytes":                   259522560,
-	"jvm_mem_heap_max_in_bytes":                         1038876672,
-	"jvm_threads_peak_count":                            45,
-	"jvm_threads_count":                                 44,
-	"jvm_gc_collectors_young_collection_count":          2,
-	"jvm_gc_collectors_young_collection_time_in_millis": 98,
-	"jvm_gc_collectors_old_collection_count":            1,
-	"jvm_gc_collectors_old_collection_time_in_millis":   24,
-	"jvm_buffer_pools_direct_count":                     40,
-	"jvm_buffer_pools_direct_used_in_bytes":             6304239,
-	"jvm_buffer_pools_direct_total_capacity_in_bytes":   6304239,
-	"jvm_buffer_pools_mapped_count":                     0,
-	"jvm_buffer_pools_mapped_used_in_bytes":             0,
-	"jvm_buffer_pools_mapped_total_capacity_in_bytes":   0,
-}
-
-var threadPoolExpected = map[string]float64{
-	"thread_pool_merge_threads":                 6,
-	"thread_pool_merge_queue":                   4,
-	"thread_pool_merge_active":                  5,
-	"thread_pool_merge_rejected":                2,
-	"thread_pool_merge_largest":                 5,
-	"thread_pool_merge_completed":               1,
-	"thread_pool_bulk_threads":                  4,
-	"thread_pool_bulk_queue":                    5,
-	"thread_pool_bulk_active":                   7,
-	"thread_pool_bulk_rejected":                 3,
-	"thread_pool_bulk_largest":                  1,
-	"thread_pool_bulk_completed":                4,
-	"thread_pool_warmer_threads":                2,
-	"thread_pool_warmer_queue":                  7,
-	"thread_pool_warmer_active":                 3,
-	"thread_pool_warmer_rejected":               2,
-	"thread_pool_warmer_largest":                3,
-	"thread_pool_warmer_completed":              1,
-	"thread_pool_get_largest":                   2,
-	"thread_pool_get_completed":                 1,
-	"thread_pool_get_threads":                   1,
-	"thread_pool_get_queue":                     8,
-	"thread_pool_get_active":                    4,
-	"thread_pool_get_rejected":                  3,
-	"thread_pool_index_threads":                 6,
-	"thread_pool_index_queue":                   8,
-	"thread_pool_index_active":                  4,
-	"thread_pool_index_rejected":                2,
-	"thread_pool_index_largest":                 3,
-	"thread_pool_index_completed":               6,
-	"thread_pool_suggest_threads":               2,
-	"thread_pool_suggest_queue":                 7,
-	"thread_pool_suggest_active":                2,
-	"thread_pool_suggest_rejected":              1,
-	"thread_pool_suggest_largest":               8,
-	"thread_pool_suggest_completed":             3,
-	"thread_pool_fetch_shard_store_queue":       7,
-	"thread_pool_fetch_shard_store_active":      4,
-	"thread_pool_fetch_shard_store_rejected":    2,
-	"thread_pool_fetch_shard_store_largest":     4,
-	"thread_pool_fetch_shard_store_completed":   1,
-	"thread_pool_fetch_shard_store_threads":     1,
-	"thread_pool_management_threads":            2,
-	"thread_pool_management_queue":              3,
-	"thread_pool_management_active":             1,
-	"thread_pool_management_rejected":           6,
-	"thread_pool_management_largest":            2,
-	"thread_pool_management_completed":          22,
-	"thread_pool_percolate_queue":               23,
-	"thread_pool_percolate_active":              13,
-	"thread_pool_percolate_rejected":            235,
-	"thread_pool_percolate_largest":             23,
-	"thread_pool_percolate_completed":           33,
-	"thread_pool_percolate_threads":             123,
-	"thread_pool_listener_active":               4,
-	"thread_pool_listener_rejected":             8,
-	"thread_pool_listener_largest":              1,
-	"thread_pool_listener_completed":            1,
-	"thread_pool_listener_threads":              1,
-	"thread_pool_listener_queue":                2,
-	"thread_pool_search_rejected":               7,
-	"thread_pool_search_largest":                2,
-	"thread_pool_search_completed":              4,
-	"thread_pool_search_threads":                5,
-	"thread_pool_search_queue":                  7,
-	"thread_pool_search_active":                 2,
-	"thread_pool_fetch_shard_started_threads":   3,
-	"thread_pool_fetch_shard_started_queue":     1,
-	"thread_pool_fetch_shard_started_active":    5,
-	"thread_pool_fetch_shard_started_rejected":  6,
-	"thread_pool_fetch_shard_started_largest":   4,
-	"thread_pool_fetch_shard_started_completed": 54,
-	"thread_pool_refresh_rejected":              4,
-	"thread_pool_refresh_largest":               8,
-	"thread_pool_refresh_completed":             3,
-	"thread_pool_refresh_threads":               23,
-	"thread_pool_refresh_queue":                 7,
-	"thread_pool_refresh_active":                3,
-	"thread_pool_optimize_threads":              3,
-	"thread_pool_optimize_queue":                4,
-	"thread_pool_optimize_active":               1,
-	"thread_pool_optimize_rejected":             2,
-	"thread_pool_optimize_largest":              7,
-	"thread_pool_optimize_completed":            3,
-	"thread_pool_snapshot_largest":              1,
-	"thread_pool_snapshot_completed":            0,
-	"thread_pool_snapshot_threads":              8,
-	"thread_pool_snapshot_queue":                5,
-	"thread_pool_snapshot_active":               6,
-	"thread_pool_snapshot_rejected":             2,
-	"thread_pool_generic_threads":               1,
-	"thread_pool_generic_queue":                 4,
-	"thread_pool_generic_active":                6,
-	"thread_pool_generic_rejected":              3,
-	"thread_pool_generic_largest":               2,
-	"thread_pool_generic_completed":             27,
-	"thread_pool_flush_threads":                 3,
-	"thread_pool_flush_queue":                   8,
-	"thread_pool_flush_active":                  0,
-	"thread_pool_flush_rejected":                1,
-	"thread_pool_flush_largest":                 5,
-	"thread_pool_flush_completed":               3,
-}
-
-var fsExpected = map[string]float64{
-	"fs_timestamp":                1436460392946,
-	"fs_total_free_in_bytes":      16909316096,
-	"fs_total_available_in_bytes": 15894814720,
-	"fs_total_total_in_bytes":     19507089408,
-}
-
-var transportExpected = map[string]float64{
-	"transport_server_open":      13,
-	"transport_rx_count":         6,
-	"transport_rx_size_in_bytes": 1380,
-	"transport_tx_count":         6,
-	"transport_tx_size_in_bytes": 1380,
-}
-
-var httpExpected = map[string]float64{
-	"http_current_open": 3,
-	"http_total_opened": 3,
-}
-
-var breakersExpected = map[string]float64{
-	"breakers_fielddata_estimated_size_in_bytes": 0,
-	"breakers_fielddata_overhead":                1.03,
-	"breakers_fielddata_tripped":                 0,
-	"breakers_fielddata_limit_size_in_bytes":     623326003,
-	"breakers_request_estimated_size_in_bytes":   0,
-	"breakers_request_overhead":                  1.0,
-	"breakers_request_tripped":                   0,
-	"breakers_request_limit_size_in_bytes":       415550668,
-	"breakers_parent_overhead":                   1.0,
-	"breakers_parent_tripped":                    0,
-	"breakers_parent_limit_size_in_bytes":        727213670,
-	"breakers_parent_estimated_size_in_bytes":    0,
-}
--- a/plugins/exec/README.md
+++ b/plugins/exec/README.md
@@ -1,42 +0,0 @@
-# Exec Plugin
-
-The exec plugin can execute arbitrary commands which output JSON. Then it flattens JSON and finds
-all numeric values, treating them as floats.
-
-For example, if you have a json-returning command called mycollector, you could
-setup the exec plugin with:
-
-```
-[[exec.commands]]
-command = "/usr/bin/mycollector --output=json"
-name = "mycollector"
-interval = 10
-```
-
-The name is used as a prefix for the measurements.
-
-The interval is used to determine how often a particular command should be run. Each
-time the exec plugin runs, it will only run a particular command if it has been at least
-`interval` seconds since the exec plugin last ran the command.
-
-
-# Sample
-
-Let's say that we have a command named "mycollector", which gives the following output:
-```json
-{
-    "a": 0.5,
-    "b": {
-        "c": "some text",
-        "d": 0.1,
-        "e": 5
-    }
-}
-```
-
-The collected metrics will be:
-```
-exec_mycollector_a value=0.5
-exec_mycollector_b_d value=0.1
-exec_mycollector_b_e value=5
-```
--- a/plugins/exec/exec.go
+++ b/plugins/exec/exec.go
@@ -1,162 +0,0 @@
-package exec
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"github.com/gonuts/go-shellquote"
-	"github.com/influxdb/telegraf/plugins"
-	"math"
-	"os/exec"
-	"strings"
-	"sync"
-	"time"
-)
-
-const sampleConfig = `
-  # specify commands via an array of tables
-  [[plugins.exec.commands]]
-  # the command to run
-  command = "/usr/bin/mycollector --foo=bar"
-
-  # name of the command (used as a prefix for measurements)
-  name = "mycollector"
-
-  # Only run this command if it has been at least this many
-  # seconds since it last ran
-  interval = 10
-`
-
-type Exec struct {
-	Commands []*Command
-	runner   Runner
-	clock    Clock
-}
-
-type Command struct {
-	Command   string
-	Name      string
-	Interval  int
-	lastRunAt time.Time
-}
-
-type Runner interface {
-	Run(*Command) ([]byte, error)
-}
-
-type Clock interface {
-	Now() time.Time
-}
-
-type CommandRunner struct{}
-
-type RealClock struct{}
-
-func (c CommandRunner) Run(command *Command) ([]byte, error) {
-	command.lastRunAt = time.Now()
-	split_cmd, err := shellquote.Split(command.Command)
-	if err != nil || len(split_cmd) == 0 {
-		return nil, fmt.Errorf("exec: unable to parse command, %s", err)
-	}
-
-	cmd := exec.Command(split_cmd[0], split_cmd[1:]...)
-	var out bytes.Buffer
-	cmd.Stdout = &out
-
-	if err := cmd.Run(); err != nil {
-		return nil, fmt.Errorf("exec: %s for command '%s'", err, command.Command)
-	}
-
-	return out.Bytes(), nil
-}
-
-func (c RealClock) Now() time.Time {
-	return time.Now()
-}
-
-func NewExec() *Exec {
-	return &Exec{runner: CommandRunner{}, clock: RealClock{}}
-}
-
-func (e *Exec) SampleConfig() string {
-	return sampleConfig
-}
-
-func (e *Exec) Description() string {
-	return "Read flattened metrics from one or more commands that output JSON to stdout"
-}
-
-func (e *Exec) Gather(acc plugins.Accumulator) error {
-	var wg sync.WaitGroup
-
-	errorChannel := make(chan error, len(e.Commands))
-
-	for _, c := range e.Commands {
-		wg.Add(1)
-		go func(c *Command, acc plugins.Accumulator) {
-			defer wg.Done()
-			err := e.gatherCommand(c, acc)
-			if err != nil {
-				errorChannel <- err
-			}
-		}(c, acc)
-	}
-
-	wg.Wait()
-	close(errorChannel)
-
-	// Get all errors and return them as one giant error
-	errorStrings := []string{}
-	for err := range errorChannel {
-		errorStrings = append(errorStrings, err.Error())
-	}
-
-	if len(errorStrings) == 0 {
-		return nil
-	}
-	return errors.New(strings.Join(errorStrings, "\n"))
-}
-
-func (e *Exec) gatherCommand(c *Command, acc plugins.Accumulator) error {
-	secondsSinceLastRun := 0.0
-
-	if c.lastRunAt.Unix() == 0 { // means time is uninitialized
-		secondsSinceLastRun = math.Inf(1)
-	} else {
-		secondsSinceLastRun = (e.clock.Now().Sub(c.lastRunAt)).Seconds()
-	}
-
-	if secondsSinceLastRun >= float64(c.Interval) {
-		out, err := e.runner.Run(c)
-		if err != nil {
-			return err
-		}
-
-		var jsonOut interface{}
-		err = json.Unmarshal(out, &jsonOut)
-		if err != nil {
-			return fmt.Errorf("exec: unable to parse output of '%s' as JSON, %s", c.Command, err)
-		}
-
-		processResponse(acc, c.Name, map[string]string{}, jsonOut)
-	}
-	return nil
-}
-
-func processResponse(acc plugins.Accumulator, prefix string, tags map[string]string, v interface{}) {
-	switch t := v.(type) {
-	case map[string]interface{}:
-		for k, v := range t {
-			processResponse(acc, prefix+"_"+k, tags, v)
-		}
-	case float64:
-		acc.Add(prefix, v, tags)
-	}
-}
-
-func init() {
-	plugins.Add("exec", func() plugins.Plugin {
-		return NewExec()
-	})
-}
--- a/plugins/exec/exec_test.go
+++ b/plugins/exec/exec_test.go
@@ -1,262 +0,0 @@
-package exec
-
-import (
-	"fmt"
-	"github.com/influxdb/telegraf/testutil"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"math"
-	"testing"
-	"time"
-)
-
-// Midnight 9/22/2015
-const baseTimeSeconds = 1442905200
-
-const validJson = `
-{
-    "status": "green",
-    "num_processes": 82,
-    "cpu": {
-        "status": "red",
-        "nil_status": null,
-        "used": 8234,
-        "free": 32
-    },
-    "percent": 0.81,
-    "users": [0, 1, 2, 3]
-}`
-
-const malformedJson = `
-{
-    "status": "green",
-`
-
-type runnerMock struct {
-	out []byte
-	err error
-}
-
-type clockMock struct {
-	now time.Time
-}
-
-func newRunnerMock(out []byte, err error) Runner {
-	return &runnerMock{
-		out: out,
-		err: err,
-	}
-}
-
-func (r runnerMock) Run(command *Command) ([]byte, error) {
-	if r.err != nil {
-		return nil, r.err
-	}
-	return r.out, nil
-}
-
-func newClockMock(now time.Time) Clock {
-	return &clockMock{now: now}
-}
-
-func (c clockMock) Now() time.Time {
-	return c.now
-}
-
-func TestExec(t *testing.T) {
-	runner := newRunnerMock([]byte(validJson), nil)
-	clock := newClockMock(time.Unix(baseTimeSeconds+20, 0))
-	command := Command{
-		Command:   "testcommand arg1",
-		Name:      "mycollector",
-		Interval:  10,
-		lastRunAt: time.Unix(baseTimeSeconds, 0),
-	}
-
-	e := &Exec{
-		runner:   runner,
-		clock:    clock,
-		Commands: []*Command{&command},
-	}
-
-	var acc testutil.Accumulator
-	initialPoints := len(acc.Points)
-	err := e.Gather(&acc)
-	deltaPoints := len(acc.Points) - initialPoints
-	require.NoError(t, err)
-
-	checkFloat := []struct {
-		name  string
-		value float64
-	}{
-		{"mycollector_num_processes", 82},
-		{"mycollector_cpu_used", 8234},
-		{"mycollector_cpu_free", 32},
-		{"mycollector_percent", 0.81},
-	}
-
-	for _, c := range checkFloat {
-		assert.True(t, acc.CheckValue(c.name, c.value))
-	}
-
-	assert.Equal(t, deltaPoints, 4, "non-numeric measurements should be ignored")
-}
-
-func TestExecMalformed(t *testing.T) {
-	runner := newRunnerMock([]byte(malformedJson), nil)
-	clock := newClockMock(time.Unix(baseTimeSeconds+20, 0))
-	command := Command{
-		Command:   "badcommand arg1",
-		Name:      "mycollector",
-		Interval:  10,
-		lastRunAt: time.Unix(baseTimeSeconds, 0),
-	}
-
-	e := &Exec{
-		runner:   runner,
-		clock:    clock,
-		Commands: []*Command{&command},
-	}
-
-	var acc testutil.Accumulator
-	initialPoints := len(acc.Points)
-	err := e.Gather(&acc)
-	deltaPoints := len(acc.Points) - initialPoints
-	require.Error(t, err)
-
-	assert.Equal(t, deltaPoints, 0, "No new points should have been added")
-}
-
-func TestCommandError(t *testing.T) {
-	runner := newRunnerMock(nil, fmt.Errorf("exit status code 1"))
-	clock := newClockMock(time.Unix(baseTimeSeconds+20, 0))
-	command := Command{
-		Command:   "badcommand",
-		Name:      "mycollector",
-		Interval:  10,
-		lastRunAt: time.Unix(baseTimeSeconds, 0),
-	}
-
-	e := &Exec{
-		runner:   runner,
-		clock:    clock,
-		Commands: []*Command{&command},
-	}
-
-	var acc testutil.Accumulator
-	initialPoints := len(acc.Points)
-	err := e.Gather(&acc)
-	deltaPoints := len(acc.Points) - initialPoints
-	require.Error(t, err)
-
-	assert.Equal(t, deltaPoints, 0, "No new points should have been added")
-}
-
-func TestExecNotEnoughTime(t *testing.T) {
-	runner := newRunnerMock([]byte(validJson), nil)
-	clock := newClockMock(time.Unix(baseTimeSeconds+5, 0))
-	command := Command{
-		Command:   "testcommand arg1",
-		Name:      "mycollector",
-		Interval:  10,
-		lastRunAt: time.Unix(baseTimeSeconds, 0),
-	}
-
-	e := &Exec{
-		runner:   runner,
-		clock:    clock,
-		Commands: []*Command{&command},
-	}
-
-	var acc testutil.Accumulator
-	initialPoints := len(acc.Points)
-	err := e.Gather(&acc)
-	deltaPoints := len(acc.Points) - initialPoints
-	require.NoError(t, err)
-
-	assert.Equal(t, deltaPoints, 0, "No new points should have been added")
-}
-
-func TestExecUninitializedLastRunAt(t *testing.T) {
-	runner := newRunnerMock([]byte(validJson), nil)
-	clock := newClockMock(time.Unix(baseTimeSeconds, 0))
-	command := Command{
-		Command:  "testcommand arg1",
-		Name:     "mycollector",
-		Interval: math.MaxInt32,
-		// Uninitialized lastRunAt should default to time.Unix(0, 0), so this should
-		// run no matter what the interval is
-	}
-
-	e := &Exec{
-		runner:   runner,
-		clock:    clock,
-		Commands: []*Command{&command},
-	}
-
-	var acc testutil.Accumulator
-	initialPoints := len(acc.Points)
-	err := e.Gather(&acc)
-	deltaPoints := len(acc.Points) - initialPoints
-	require.NoError(t, err)
-
-	checkFloat := []struct {
-		name  string
-		value float64
-	}{
-		{"mycollector_num_processes", 82},
-		{"mycollector_cpu_used", 8234},
-		{"mycollector_cpu_free", 32},
-		{"mycollector_percent", 0.81},
-	}
-
-	for _, c := range checkFloat {
-		assert.True(t, acc.CheckValue(c.name, c.value))
-	}
-
-	assert.Equal(t, deltaPoints, 4, "non-numeric measurements should be ignored")
-}
-func TestExecOneNotEnoughTimeAndOneEnoughTime(t *testing.T) {
-	runner := newRunnerMock([]byte(validJson), nil)
-	clock := newClockMock(time.Unix(baseTimeSeconds+5, 0))
-	notEnoughTimeCommand := Command{
-		Command:   "testcommand arg1",
-		Name:      "mycollector",
-		Interval:  10,
-		lastRunAt: time.Unix(baseTimeSeconds, 0),
-	}
-	enoughTimeCommand := Command{
-		Command:   "testcommand arg1",
-		Name:      "mycollector",
-		Interval:  3,
-		lastRunAt: time.Unix(baseTimeSeconds, 0),
-	}
-
-	e := &Exec{
-		runner:   runner,
-		clock:    clock,
-		Commands: []*Command{&notEnoughTimeCommand, &enoughTimeCommand},
-	}
-
-	var acc testutil.Accumulator
-	initialPoints := len(acc.Points)
-	err := e.Gather(&acc)
-	deltaPoints := len(acc.Points) - initialPoints
-	require.NoError(t, err)
-
-	checkFloat := []struct {
-		name  string
-		value float64
-	}{
-		{"mycollector_num_processes", 82},
-		{"mycollector_cpu_used", 8234},
-		{"mycollector_cpu_free", 32},
-		{"mycollector_percent", 0.81},
-	}
-
-	for _, c := range checkFloat {
-		assert.True(t, acc.CheckValue(c.name, c.value))
-	}
-
-	assert.Equal(t, deltaPoints, 4, "Only one command should have been run")
-}
--- a/plugins/httpjson/httpjson.go
+++ b/plugins/httpjson/httpjson.go
@@ -1,233 +0,0 @@
-package httpjson
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-	"strings"
-	"sync"
-
-	"github.com/influxdb/telegraf/plugins"
-)
-
-type HttpJson struct {
-	Services []Service
-	client   HTTPClient
-}
-
-type Service struct {
-	Name       string
-	Servers    []string
-	Method     string
-	TagKeys    []string
-	Parameters map[string]string
-}
-
-type HTTPClient interface {
-	// Returns the result of an http request
-	//
-	// Parameters:
-	// req: HTTP request object
-	//
-	// Returns:
-	// http.Response:  HTTP respons object
-	// error        :  Any error that may have occurred
-	MakeRequest(req *http.Request) (*http.Response, error)
-}
-
-type RealHTTPClient struct {
-	client *http.Client
-}
-
-func (c RealHTTPClient) MakeRequest(req *http.Request) (*http.Response, error) {
-	return c.client.Do(req)
-}
-
-var sampleConfig = `
-  # Specify services via an array of tables
-  [[plugins.httpjson.services]]
-
-    # a name for the service being polled
-    name = "webserver_stats"
-
-    # URL of each server in the service's cluster
-    servers = [
-      "http://localhost:9999/stats/",
-      "http://localhost:9998/stats/",
-    ]
-
-    # HTTP method to use (case-sensitive)
-    method = "GET"
-
-    # List of tag names to extract from top-level of JSON server response
-    # tag_keys = [
-    #   "my_tag_1",
-    #   "my_tag_2"
-    # ]
-
-    # HTTP parameters (all values must be strings)
-    [plugins.httpjson.services.parameters]
-      event_type = "cpu_spike"
-      threshold = "0.75"
-`
-
-func (h *HttpJson) SampleConfig() string {
-	return sampleConfig
-}
-
-func (h *HttpJson) Description() string {
-	return "Read flattened metrics from one or more JSON HTTP endpoints"
-}
-
-// Gathers data for all servers.
-func (h *HttpJson) Gather(acc plugins.Accumulator) error {
-	var wg sync.WaitGroup
-
-	totalServers := 0
-	for _, service := range h.Services {
-		totalServers += len(service.Servers)
-	}
-	errorChannel := make(chan error, totalServers)
-
-	for _, service := range h.Services {
-		for _, server := range service.Servers {
-			wg.Add(1)
-			go func(service Service, server string) {
-				defer wg.Done()
-				if err := h.gatherServer(acc, service, server); err != nil {
-					errorChannel <- err
-				}
-			}(service, server)
-		}
-	}
-
-	wg.Wait()
-	close(errorChannel)
-
-	// Get all errors and return them as one giant error
-	errorStrings := []string{}
-	for err := range errorChannel {
-		errorStrings = append(errorStrings, err.Error())
-	}
-
-	if len(errorStrings) == 0 {
-		return nil
-	}
-	return errors.New(strings.Join(errorStrings, "\n"))
-}
-
-// Gathers data from a particular server
-// Parameters:
-//     acc      : The telegraf Accumulator to use
-//     serverURL: endpoint to send request to
-//     service  : the service being queried
-//
-// Returns:
-//     error: Any error that may have occurred
-func (h *HttpJson) gatherServer(
-	acc plugins.Accumulator,
-	service Service,
-	serverURL string,
-) error {
-	resp, err := h.sendRequest(service, serverURL)
-	if err != nil {
-		return err
-	}
-
-	var jsonOut map[string]interface{}
-	if err = json.Unmarshal([]byte(resp), &jsonOut); err != nil {
-		return errors.New("Error decoding JSON response")
-	}
-
-	tags := map[string]string{
-		"server": serverURL,
-	}
-
-	for _, tag := range service.TagKeys {
-		switch v := jsonOut[tag].(type) {
-		case string:
-			tags[tag] = v
-		}
-		delete(jsonOut, tag)
-	}
-
-	processResponse(acc, service.Name, tags, jsonOut)
-	return nil
-}
-
-// Sends an HTTP request to the server using the HttpJson object's HTTPClient
-// Parameters:
-//     serverURL: endpoint to send request to
-//
-// Returns:
-//     string: body of the response
-//     error : Any error that may have occurred
-func (h *HttpJson) sendRequest(service Service, serverURL string) (string, error) {
-	// Prepare URL
-	requestURL, err := url.Parse(serverURL)
-	if err != nil {
-		return "", fmt.Errorf("Invalid server URL \"%s\"", serverURL)
-	}
-
-	params := url.Values{}
-	for k, v := range service.Parameters {
-		params.Add(k, v)
-	}
-	requestURL.RawQuery = params.Encode()
-
-	// Create + send request
-	req, err := http.NewRequest(service.Method, requestURL.String(), nil)
-	if err != nil {
-		return "", err
-	}
-
-	resp, err := h.client.MakeRequest(req)
-	if err != nil {
-		return "", err
-	}
-
-	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return string(body), err
-	}
-
-	// Process response
-	if resp.StatusCode != http.StatusOK {
-		err = fmt.Errorf("Response from url \"%s\" has status code %d (%s), expected %d (%s)",
-			requestURL.String(),
-			resp.StatusCode,
-			http.StatusText(resp.StatusCode),
-			http.StatusOK,
-			http.StatusText(http.StatusOK))
-		return string(body), err
-	}
-
-	return string(body), err
-}
-
-// Flattens the map generated from the JSON object and stores its float values using a
-// plugins.Accumulator. It ignores any non-float values.
-// Parameters:
-//     acc: the Accumulator to use
-//     prefix: What the name of the measurement name should be prefixed by.
-//     tags: telegraf tags to
-func processResponse(acc plugins.Accumulator, prefix string, tags map[string]string, v interface{}) {
-	switch t := v.(type) {
-	case map[string]interface{}:
-		for k, v := range t {
-			processResponse(acc, prefix+"_"+k, tags, v)
-		}
-	case float64:
-		acc.Add(prefix, v, tags)
-	}
-}
-
-func init() {
-	plugins.Add("httpjson", func() plugins.Plugin {
-		return &HttpJson{client: RealHTTPClient{client: &http.Client{}}}
-	})
-}
--- a/plugins/httpjson/httpjson_test.go
+++ b/plugins/httpjson/httpjson_test.go
@@ -1,223 +0,0 @@
-package httpjson
-
-import (
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/influxdb/telegraf/testutil"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-const validJSON = `
-	{
-		"parent": {
-			"child": 3,
-			"ignored_child": "hi"
-		},
-		"ignored_null": null,
-		"integer": 4,
-		"ignored_list": [3, 4],
-		"ignored_parent": {
-			"another_ignored_list": [4],
-			"another_ignored_null": null,
-			"ignored_string": "hello, world!"
-		}
-	}`
-
-const validJSONTags = `
-	{
-		"value": 15,
-		"role": "master",
-		"build": "123"
-	}`
-
-const invalidJSON = "I don't think this is JSON"
-
-const empty = ""
-
-type mockHTTPClient struct {
-	responseBody string
-	statusCode   int
-}
-
-// Mock implementation of MakeRequest. Usually returns an http.Response with
-// hard-coded responseBody and statusCode. However, if the request uses a
-// nonstandard method, it uses status code 405 (method not allowed)
-func (c mockHTTPClient) MakeRequest(req *http.Request) (*http.Response, error) {
-	resp := http.Response{}
-	resp.StatusCode = c.statusCode
-
-	// basic error checking on request method
-	allowedMethods := []string{"GET", "HEAD", "POST", "PUT", "DELETE", "TRACE", "CONNECT"}
-	methodValid := false
-	for _, method := range allowedMethods {
-		if req.Method == method {
-			methodValid = true
-			break
-		}
-	}
-
-	if !methodValid {
-		resp.StatusCode = 405 // Method not allowed
-	}
-
-	resp.Body = ioutil.NopCloser(strings.NewReader(c.responseBody))
-	return &resp, nil
-}
-
-// Generates a pointer to an HttpJson object that uses a mock HTTP client.
-// Parameters:
-//     response  : Body of the response that the mock HTTP client should return
-//     statusCode: HTTP status code the mock HTTP client should return
-//
-// Returns:
-//     *HttpJson: Pointer to an HttpJson object that uses the generated mock HTTP client
-func genMockHttpJson(response string, statusCode int) *HttpJson {
-	return &HttpJson{
-		client: mockHTTPClient{responseBody: response, statusCode: statusCode},
-		Services: []Service{
-			Service{
-				Servers: []string{
-					"http://server1.example.com/metrics/",
-					"http://server2.example.com/metrics/",
-				},
-				Name:   "my_webapp",
-				Method: "GET",
-				Parameters: map[string]string{
-					"httpParam1": "12",
-					"httpParam2": "the second parameter",
-				},
-			},
-			Service{
-				Servers: []string{
-					"http://server3.example.com/metrics/",
-					"http://server4.example.com/metrics/",
-				},
-				Name:   "other_webapp",
-				Method: "POST",
-				Parameters: map[string]string{
-					"httpParam1": "12",
-					"httpParam2": "the second parameter",
-				},
-				TagKeys: []string{
-					"role",
-					"build",
-				},
-			},
-		},
-	}
-}
-
-// Test that the proper values are ignored or collected
-func TestHttpJson200(t *testing.T) {
-	httpjson := genMockHttpJson(validJSON, 200)
-
-	var acc testutil.Accumulator
-	err := httpjson.Gather(&acc)
-	require.NoError(t, err)
-
-	assert.Equal(t, 8, len(acc.Points))
-
-	for _, service := range httpjson.Services {
-		for _, srv := range service.Servers {
-			require.NoError(t,
-				acc.ValidateTaggedValue(
-					fmt.Sprintf("%s_parent_child", service.Name),
-					3.0,
-					map[string]string{"server": srv},
-				),
-			)
-			require.NoError(t,
-				acc.ValidateTaggedValue(
-					fmt.Sprintf("%s_integer", service.Name),
-					4.0,
-					map[string]string{"server": srv},
-				),
-			)
-		}
-	}
-}
-
-// Test response to HTTP 500
-func TestHttpJson500(t *testing.T) {
-	httpjson := genMockHttpJson(validJSON, 500)
-
-	var acc testutil.Accumulator
-	err := httpjson.Gather(&acc)
-
-	assert.NotNil(t, err)
-	// 4 error lines for (2 urls) * (2 services)
-	assert.Equal(t, len(strings.Split(err.Error(), "\n")), 4)
-	assert.Equal(t, 0, len(acc.Points))
-}
-
-// Test response to HTTP 405
-func TestHttpJsonBadMethod(t *testing.T) {
-	httpjson := genMockHttpJson(validJSON, 200)
-	httpjson.Services[0].Method = "NOT_A_REAL_METHOD"
-
-	var acc testutil.Accumulator
-	err := httpjson.Gather(&acc)
-
-	assert.NotNil(t, err)
-	// 2 error lines for (2 urls) * (1 falied service)
-	assert.Equal(t, len(strings.Split(err.Error(), "\n")), 2)
-
-	// (2 measurements) * (2 servers) * (1 successful service)
-	assert.Equal(t, 4, len(acc.Points))
-}
-
-// Test response to malformed JSON
-func TestHttpJsonBadJson(t *testing.T) {
-	httpjson := genMockHttpJson(invalidJSON, 200)
-
-	var acc testutil.Accumulator
-	err := httpjson.Gather(&acc)
-
-	assert.NotNil(t, err)
-	// 4 error lines for (2 urls) * (2 services)
-	assert.Equal(t, len(strings.Split(err.Error(), "\n")), 4)
-	assert.Equal(t, 0, len(acc.Points))
-}
-
-// Test response to empty string as response objectgT
-func TestHttpJsonEmptyResponse(t *testing.T) {
-	httpjson := genMockHttpJson(empty, 200)
-
-	var acc testutil.Accumulator
-	err := httpjson.Gather(&acc)
-
-	assert.NotNil(t, err)
-	// 4 error lines for (2 urls) * (2 services)
-	assert.Equal(t, len(strings.Split(err.Error(), "\n")), 4)
-	assert.Equal(t, 0, len(acc.Points))
-}
-
-// Test that the proper values are ignored or collected
-func TestHttpJson200Tags(t *testing.T) {
-	httpjson := genMockHttpJson(validJSONTags, 200)
-
-	var acc testutil.Accumulator
-	err := httpjson.Gather(&acc)
-	require.NoError(t, err)
-
-	assert.Equal(t, 4, len(acc.Points))
-
-	for _, service := range httpjson.Services {
-		if service.Name == "other_webapp" {
-			for _, srv := range service.Servers {
-				require.NoError(t,
-					acc.ValidateTaggedValue(
-						fmt.Sprintf("%s_value", service.Name),
-						15.0,
-						map[string]string{"server": srv, "role": "master", "build": "123"},
-					),
-				)
-			}
-		}
-	}
-}
--- a/plugins/inputs/EXAMPLE_README.md
+++ b/plugins/inputs/EXAMPLE_README.md
@@ -0,0 +1,37 @@
+# Example Input Plugin
+
+The example plugin gathers metrics about example things
+
+### Configuration:
+
+```toml
+# Description
+[[inputs.example]]
+  # SampleConfig
+```
+
+### Measurements & Fields:
+
+<optional description>
+
+- measurement1
+    - field1 (type, unit)
+    - field2 (float, percent)
+- measurement2
+    - field3 (integer, bytes)
+
+### Tags:
+
+- All measurements have the following tags:
+    - tag1 (optional description)
+    - tag2
+- measurement2 has the following tags:
+    - tag3
+
+### 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
@@ -4,7 +4,8 @@ import (
 	"bytes"
 	"encoding/binary"
 	"fmt"
-	"github.com/influxdb/telegraf/plugins"
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
 	"net"
 	"strconv"
 	"strings"
@@ -103,11 +104,9 @@ type Aerospike struct {
 }

 var sampleConfig = `
-  # Aerospike servers to connect to (with port)
-  # Default: servers = ["localhost:3000"]
-  #
-  # This plugin will query all namespaces the aerospike
-  # server has configured and get stats for them.
+  ## Aerospike servers to connect to (with port)
+  ## This plugin will query all namespaces the aerospike
+  ## server has configured and get stats for them.
  servers = ["localhost:3000"]
 `

@@ -119,7 +118,7 @@ func (a *Aerospike) Description() string {
 	return "Read stats from an aerospike server"
 }

-func (a *Aerospike) Gather(acc plugins.Accumulator) error {
+func (a *Aerospike) Gather(acc telegraf.Accumulator) error {
 	if len(a.Servers) == 0 {
 		return a.gatherServer("127.0.0.1:3000", acc)
 	}
@@ -140,7 +139,7 @@ func (a *Aerospike) Gather(acc plugins.Accumulator) error {
 	return outerr
 }

-func (a *Aerospike) gatherServer(host string, acc plugins.Accumulator) error {
+func (a *Aerospike) gatherServer(host string, acc telegraf.Accumulator) error {
 	aerospikeInfo, err := getMap(STATISTICS_COMMAND, host)
 	if err != nil {
 		return fmt.Errorf("Aerospike info failed: %s", err)
@@ -247,26 +246,32 @@ func get(key []byte, host string) (map[string]string, error) {
 	return data, err
 }

-func readAerospikeStats(stats map[string]string, acc plugins.Accumulator, host, namespace string) {
+func readAerospikeStats(
+	stats map[string]string,
+	acc telegraf.Accumulator,
+	host string,
+	namespace string,
+) {
+	fields := make(map[string]interface{})
+	tags := map[string]string{
+		"aerospike_host": host,
+		"namespace":      "_service",
+	}
+
+	if namespace != "" {
+		tags["namespace"] = namespace
+	}
 	for key, value := range stats {
-		tags := map[string]string{
-			"aerospike_host": host,
-			"namespace":      "_service",
-		}
-
-		if namespace != "" {
-			tags["namespace"] = namespace
-		}
-
 		// We are going to ignore all string based keys
 		val, err := strconv.ParseInt(value, 10, 64)
 		if err == nil {
 			if strings.Contains(key, "-") {
 				key = strings.Replace(key, "-", "_", -1)
 			}
-			acc.Add(key, val, tags)
+			fields[key] = val
 		}
 	}
+	acc.AddFields("aerospike", fields, tags)
 }

 func unmarshalMapInfo(infoMap map[string]string, key string) (map[string]string, error) {
@@ -330,7 +335,7 @@ func msgLenFromBytes(buf [6]byte) int64 {
 }

 func init() {
-	plugins.Add("aerospike", func() plugins.Plugin {
+	inputs.Add("aerospike", func() telegraf.Input {
 		return &Aerospike{}
 	})
 }
--- a/plugins/inputs/aerospike/aerospike_test.go
+++ b/plugins/inputs/aerospike/aerospike_test.go
@@ -1,11 +1,12 @@
 package aerospike

 import (
-	"github.com/influxdb/telegraf/testutil"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 	"reflect"
 	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )

 func TestAerospikeStatistics(t *testing.T) {
@@ -31,7 +32,7 @@ func TestAerospikeStatistics(t *testing.T) {
 	}

 	for _, metric := range asMetrics {
-		assert.True(t, acc.HasIntValue(metric), metric)
+		assert.True(t, acc.HasIntField("aerospike", metric), metric)
 	}

 }
@@ -49,13 +50,16 @@ func TestReadAerospikeStatsNoNamespace(t *testing.T) {
 		"stat_read_reqs":  "12345",
 	}
 	readAerospikeStats(stats, &acc, "host1", "")
-	for k := range stats {
-		if k == "stat-write-errs" {
-			k = "stat_write_errs"
-		}
-		assert.True(t, acc.HasMeasurement(k))
-		assert.True(t, acc.CheckValue(k, int64(12345)))
+
+	fields := map[string]interface{}{
+		"stat_write_errs": int64(12345),
+		"stat_read_reqs":  int64(12345),
 	}
+	tags := map[string]string{
+		"aerospike_host": "host1",
+		"namespace":      "_service",
+	}
+	acc.AssertContainsTaggedFields(t, "aerospike", fields, tags)
 }

 func TestReadAerospikeStatsNamespace(t *testing.T) {
@@ -66,13 +70,15 @@ func TestReadAerospikeStatsNamespace(t *testing.T) {
 	}
 	readAerospikeStats(stats, &acc, "host1", "test")

+	fields := map[string]interface{}{
+		"stat_write_errs": int64(12345),
+		"stat_read_reqs":  int64(12345),
+	}
 	tags := map[string]string{
 		"aerospike_host": "host1",
 		"namespace":      "test",
 	}
-	for k := range stats {
-		assert.True(t, acc.ValidateTaggedValue(k, int64(12345), tags) == nil)
-	}
+	acc.AssertContainsTaggedFields(t, "aerospike", fields, tags)
 }

 func TestAerospikeUnmarshalList(t *testing.T) {
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -0,0 +1,61 @@
+package all
+
+import (
+	_ "github.com/influxdata/telegraf/plugins/inputs/aerospike"
+	_ "github.com/influxdata/telegraf/plugins/inputs/apache"
+	_ "github.com/influxdata/telegraf/plugins/inputs/bcache"
+	_ "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/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/github_webhooks"
+	_ "github.com/influxdata/telegraf/plugins/inputs/haproxy"
+	_ "github.com/influxdata/telegraf/plugins/inputs/httpjson"
+	_ "github.com/influxdata/telegraf/plugins/inputs/influxdb"
+	_ "github.com/influxdata/telegraf/plugins/inputs/ipmi_sensor"
+	_ "github.com/influxdata/telegraf/plugins/inputs/jolokia"
+	_ "github.com/influxdata/telegraf/plugins/inputs/kafka_consumer"
+	_ "github.com/influxdata/telegraf/plugins/inputs/leofs"
+	_ "github.com/influxdata/telegraf/plugins/inputs/lustre2"
+	_ "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/mongodb"
+	_ "github.com/influxdata/telegraf/plugins/inputs/mqtt_consumer"
+	_ "github.com/influxdata/telegraf/plugins/inputs/mysql"
+	_ "github.com/influxdata/telegraf/plugins/inputs/nats_consumer"
+	_ "github.com/influxdata/telegraf/plugins/inputs/net_response"
+	_ "github.com/influxdata/telegraf/plugins/inputs/nginx"
+	_ "github.com/influxdata/telegraf/plugins/inputs/nsq"
+	_ "github.com/influxdata/telegraf/plugins/inputs/ntpq"
+	_ "github.com/influxdata/telegraf/plugins/inputs/passenger"
+	_ "github.com/influxdata/telegraf/plugins/inputs/phpfpm"
+	_ "github.com/influxdata/telegraf/plugins/inputs/ping"
+	_ "github.com/influxdata/telegraf/plugins/inputs/postgresql"
+	_ "github.com/influxdata/telegraf/plugins/inputs/postgresql_extensible"
+	_ "github.com/influxdata/telegraf/plugins/inputs/powerdns"
+	_ "github.com/influxdata/telegraf/plugins/inputs/procstat"
+	_ "github.com/influxdata/telegraf/plugins/inputs/prometheus"
+	_ "github.com/influxdata/telegraf/plugins/inputs/puppetagent"
+	_ "github.com/influxdata/telegraf/plugins/inputs/rabbitmq"
+	_ "github.com/influxdata/telegraf/plugins/inputs/raindrops"
+	_ "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/sensors"
+	_ "github.com/influxdata/telegraf/plugins/inputs/snmp"
+	_ "github.com/influxdata/telegraf/plugins/inputs/sqlserver"
+	_ "github.com/influxdata/telegraf/plugins/inputs/statsd"
+	_ "github.com/influxdata/telegraf/plugins/inputs/system"
+	_ "github.com/influxdata/telegraf/plugins/inputs/tcp_listener"
+	_ "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/win_perf_counters"
+	_ "github.com/influxdata/telegraf/plugins/inputs/zfs"
+	_ "github.com/influxdata/telegraf/plugins/inputs/zookeeper"
+)
--- a/plugins/inputs/apache/README.md
+++ b/plugins/inputs/apache/README.md
--- a/plugins/inputs/apache/apache.go
+++ b/plugins/inputs/apache/apache.go
@@ -11,7 +11,8 @@ import (
 	"sync"
 	"time"

-	"github.com/influxdb/telegraf/plugins"
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )

 type Apache struct {
@@ -19,7 +20,7 @@ type Apache struct {
 }

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

@@ -31,7 +32,7 @@ func (n *Apache) Description() string {
 	return "Read Apache status information (mod_status)"
 }

-func (n *Apache) Gather(acc plugins.Accumulator) error {
+func (n *Apache) Gather(acc telegraf.Accumulator) error {
 	var wg sync.WaitGroup
 	var outerr error

@@ -57,9 +58,12 @@ var tr = &http.Transport{
 	ResponseHeaderTimeout: time.Duration(3 * time.Second),
 }

-var client = &http.Client{Transport: tr}
+var client = &http.Client{
+	Transport: tr,
+	Timeout:   time.Duration(4 * time.Second),
+}

-func (n *Apache) gatherUrl(addr *url.URL, acc plugins.Accumulator) error {
+func (n *Apache) gatherUrl(addr *url.URL, acc telegraf.Accumulator) error {
 	resp, err := client.Get(addr.String())
 	if err != nil {
 		return fmt.Errorf("error making HTTP request to %s: %s", addr.String(), err)
@@ -72,32 +76,33 @@ func (n *Apache) gatherUrl(addr *url.URL, acc plugins.Accumulator) error {
 	tags := getTags(addr)

 	sc := bufio.NewScanner(resp.Body)
+	fields := make(map[string]interface{})
 	for sc.Scan() {
 		line := sc.Text()
 		if strings.Contains(line, ":") {
-
 			parts := strings.SplitN(line, ":", 2)
 			key, part := strings.Replace(parts[0], " ", "", -1), strings.TrimSpace(parts[1])

 			switch key {
-
 			case "Scoreboard":
-				n.gatherScores(part, acc, tags)
+				for field, value := range n.gatherScores(part) {
+					fields[field] = value
+				}
 			default:
 				value, err := strconv.ParseFloat(part, 64)
 				if err != nil {
 					continue
 				}
-				acc.Add(key, value, tags)
+				fields[key] = value
 			}
 		}
 	}
+	acc.AddFields("apache", fields, tags)

 	return nil
 }

-func (n *Apache) gatherScores(data string, acc plugins.Accumulator, tags map[string]string) {
-
+func (n *Apache) gatherScores(data string) map[string]interface{} {
 	var waiting, open int = 0, 0
 	var S, R, W, K, D, C, L, G, I int = 0, 0, 0, 0, 0, 0, 0, 0, 0

@@ -129,17 +134,20 @@ func (n *Apache) gatherScores(data string, acc plugins.Accumulator, tags map[str
 		}
 	}

-	acc.Add("scboard_waiting", float64(waiting), tags)
-	acc.Add("scboard_starting", float64(S), tags)
-	acc.Add("scboard_reading", float64(R), tags)
-	acc.Add("scboard_sending", float64(W), tags)
-	acc.Add("scboard_keepalive", float64(K), tags)
-	acc.Add("scboard_dnslookup", float64(D), tags)
-	acc.Add("scboard_closing", float64(C), tags)
-	acc.Add("scboard_logging", float64(L), tags)
-	acc.Add("scboard_finishing", float64(G), tags)
-	acc.Add("scboard_idle_cleanup", float64(I), tags)
-	acc.Add("scboard_open", float64(open), tags)
+	fields := map[string]interface{}{
+		"scboard_waiting":      float64(waiting),
+		"scboard_starting":     float64(S),
+		"scboard_reading":      float64(R),
+		"scboard_sending":      float64(W),
+		"scboard_keepalive":    float64(K),
+		"scboard_dnslookup":    float64(D),
+		"scboard_closing":      float64(C),
+		"scboard_logging":      float64(L),
+		"scboard_finishing":    float64(G),
+		"scboard_idle_cleanup": float64(I),
+		"scboard_open":         float64(open),
+	}
+	return fields
 }

 // Get tag(s) for the apache plugin
@@ -160,7 +168,7 @@ func getTags(addr *url.URL) map[string]string {
 }

 func init() {
-	plugins.Add("apache", func() plugins.Plugin {
+	inputs.Add("apache", func() telegraf.Input {
 		return &Apache{}
 	})
 }
--- a/plugins/inputs/apache/apache_test.go
+++ b/plugins/inputs/apache/apache_test.go
@@ -6,9 +6,8 @@ import (
 	"net/http/httptest"
 	"testing"

-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"

-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

@@ -44,37 +43,31 @@ func TestHTTPApache(t *testing.T) {
 	err := a.Gather(&acc)
 	require.NoError(t, err)

-	testInt := []struct {
-		measurement string
-		value       float64
-	}{
-		{"TotalAccesses", 1.29811861e+08},
-		{"TotalkBytes", 5.213701865e+09},
-		{"CPULoad", 6.51929},
-		{"Uptime", 941553},
-		{"ReqPerSec", 137.87},
-		{"BytesPerSec", 5.67024e+06},
-		{"BytesPerReq", 41127.4},
-		{"BusyWorkers", 270},
-		{"IdleWorkers", 630},
-		{"ConnsTotal", 1451},
-		{"ConnsAsyncWriting", 32},
-		{"ConnsAsyncKeepAlive", 945},
-		{"ConnsAsyncClosing", 205},
-		{"scboard_waiting", 630},
-		{"scboard_starting", 0},
-		{"scboard_reading", 157},
-		{"scboard_sending", 113},
-		{"scboard_keepalive", 0},
-		{"scboard_dnslookup", 0},
-		{"scboard_closing", 0},
-		{"scboard_logging", 0},
-		{"scboard_finishing", 0},
-		{"scboard_idle_cleanup", 0},
-		{"scboard_open", 2850},
-	}
-
-	for _, test := range testInt {
-		assert.True(t, acc.CheckValue(test.measurement, test.value))
+	fields := map[string]interface{}{
+		"TotalAccesses":        float64(1.29811861e+08),
+		"TotalkBytes":          float64(5.213701865e+09),
+		"CPULoad":              float64(6.51929),
+		"Uptime":               float64(941553),
+		"ReqPerSec":            float64(137.87),
+		"BytesPerSec":          float64(5.67024e+06),
+		"BytesPerReq":          float64(41127.4),
+		"BusyWorkers":          float64(270),
+		"IdleWorkers":          float64(630),
+		"ConnsTotal":           float64(1451),
+		"ConnsAsyncWriting":    float64(32),
+		"ConnsAsyncKeepAlive":  float64(945),
+		"ConnsAsyncClosing":    float64(205),
+		"scboard_waiting":      float64(630),
+		"scboard_starting":     float64(0),
+		"scboard_reading":      float64(157),
+		"scboard_sending":      float64(113),
+		"scboard_keepalive":    float64(0),
+		"scboard_dnslookup":    float64(0),
+		"scboard_closing":      float64(0),
+		"scboard_logging":      float64(0),
+		"scboard_finishing":    float64(0),
+		"scboard_idle_cleanup": float64(0),
+		"scboard_open":         float64(2850),
 	}
+	acc.AssertContainsFields(t, "apache", fields)
 }
--- a/plugins/inputs/bcache/README.md
+++ b/plugins/inputs/bcache/README.md
@@ -26,27 +26,27 @@ Measurement names:
 dirty_data
  Amount of dirty data for this backing device in the cache. Continuously
  updated unlike the cache set's version, but may be slightly off.
-  
+
 bypassed
  Amount of IO (both reads and writes) that has bypassed the cache
-  
+

 cache_bypass_hits
 cache_bypass_misses
  Hits and misses for IO that is intended to skip the cache are still counted,
  but broken out here.
-  
+
 cache_hits
 cache_misses
 cache_hit_ratio
  Hits and misses are counted per individual IO as bcache sees them; a
  partial hit is counted as a miss.
-  
+
 cache_miss_collisions
  Counts instances where data was going to be inserted into the cache from a
  cache miss, but raced with a write and data was already present (usually 0
  since the synchronization for cache misses was rewritten)
-  
+
 cache_readaheads
  Count of times readahead occurred.
 ```
@@ -70,7 +70,7 @@ Using this configuration:
 When run with:

 ```
-./telegraf -config telegraf.conf -filter bcache -test
+./telegraf -config telegraf.conf -input-filter bcache -test
 ```

 It produces:
--- a/plugins/inputs/bcache/bcache.go
+++ b/plugins/inputs/bcache/bcache.go
@@ -8,7 +8,8 @@ import (
 	"strconv"
 	"strings"

-	"github.com/influxdb/telegraf/plugins"
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )

 type Bcache struct {
@@ -17,14 +18,14 @@ type Bcache struct {
 }

 var sampleConfig = `
-  # Bcache sets path
-  # If not specified, then default is:
-  # bcachePath = "/sys/fs/bcache"
-  #
-  # By default, telegraf gather stats for all bcache devices
-  # Setting devices will restrict the stats to the specified
-  # bcache devices.
-  # bcacheDevs = ["bcache0", ...]
+  ## Bcache sets path
+  ## If not specified, then default is:
+  bcachePath = "/sys/fs/bcache"
+
+  ## By default, telegraf gather stats for all bcache devices
+  ## Setting devices will restrict the stats to the specified
+  ## bcache devices.
+  bcacheDevs = ["bcache0"]
 `

 func (b *Bcache) SampleConfig() string {
@@ -69,7 +70,7 @@ func prettyToBytes(v string) uint64 {
 	return uint64(result)
 }

-func (b *Bcache) gatherBcache(bdev string, acc plugins.Accumulator) error {
+func (b *Bcache) gatherBcache(bdev string, acc telegraf.Accumulator) error {
 	tags := getTags(bdev)
 	metrics, err := filepath.Glob(bdev + "/stats_total/*")
 	if len(metrics) < 0 {
@@ -81,7 +82,9 @@ func (b *Bcache) gatherBcache(bdev string, acc plugins.Accumulator) error {
 	}
 	rawValue := strings.TrimSpace(string(file))
 	value := prettyToBytes(rawValue)
-	acc.Add("dirty_data", value, tags)
+
+	fields := make(map[string]interface{})
+	fields["dirty_data"] = value

 	for _, path := range metrics {
 		key := filepath.Base(path)
@@ -92,16 +95,17 @@ func (b *Bcache) gatherBcache(bdev string, acc plugins.Accumulator) error {
 		}
 		if key == "bypassed" {
 			value := prettyToBytes(rawValue)
-			acc.Add(key, value, tags)
+			fields[key] = value
 		} else {
 			value, _ := strconv.ParseUint(rawValue, 10, 64)
-			acc.Add(key, value, tags)
+			fields[key] = value
 		}
 	}
+	acc.AddFields("bcache", fields, tags)
 	return nil
 }

-func (b *Bcache) Gather(acc plugins.Accumulator) error {
+func (b *Bcache) Gather(acc telegraf.Accumulator) error {
 	bcacheDevsChecked := make(map[string]bool)
 	var restrictDevs bool
 	if len(b.BcacheDevs) != 0 {
@@ -117,7 +121,7 @@ func (b *Bcache) Gather(acc plugins.Accumulator) error {
 	}
 	bdevs, _ := filepath.Glob(bcachePath + "/*/bdev*")
 	if len(bdevs) < 1 {
-		return errors.New("Can't found any bcache device")
+		return errors.New("Can't find any bcache device")
 	}
 	for _, bdev := range bdevs {
 		if restrictDevs {
@@ -132,7 +136,7 @@ func (b *Bcache) Gather(acc plugins.Accumulator) error {
 }

 func init() {
-	plugins.Add("bcache", func() plugins.Plugin {
+	inputs.Add("bcache", func() telegraf.Input {
 		return &Bcache{}
 	})
 }
--- a/plugins/inputs/bcache/bcache_test.go
+++ b/plugins/inputs/bcache/bcache_test.go
@@ -5,8 +5,7 @@ import (
 	"os"
 	"testing"

-	"github.com/influxdb/telegraf/testutil"
-	"github.com/stretchr/testify/assert"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/require"
 )

@@ -29,11 +28,6 @@ var (
 	testBcacheBackingDevPath = os.TempDir() + "/telegraf/sys/devices/virtual/block/md10"
 )

-type metrics struct {
-	name  string
-	value uint64
-}
-
 func TestBcacheGeneratesMetrics(t *testing.T) {
 	err := os.MkdirAll(testBcacheUuidPath, 0755)
 	require.NoError(t, err)
@@ -53,70 +47,52 @@ func TestBcacheGeneratesMetrics(t *testing.T) {
 	err = os.MkdirAll(testBcacheUuidPath+"/bdev0/stats_total", 0755)
 	require.NoError(t, err)

-	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/dirty_data", []byte(dirty_data), 0644)
+	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/dirty_data",
+		[]byte(dirty_data), 0644)
 	require.NoError(t, err)

-	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/stats_total/bypassed", []byte(bypassed), 0644)
+	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/stats_total/bypassed",
+		[]byte(bypassed), 0644)
 	require.NoError(t, err)

-	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/stats_total/cache_bypass_hits", []byte(cache_bypass_hits), 0644)
+	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/stats_total/cache_bypass_hits",
+		[]byte(cache_bypass_hits), 0644)
 	require.NoError(t, err)

-	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/stats_total/cache_bypass_misses", []byte(cache_bypass_misses), 0644)
+	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/stats_total/cache_bypass_misses",
+		[]byte(cache_bypass_misses), 0644)
 	require.NoError(t, err)

-	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/stats_total/cache_hit_ratio", []byte(cache_hit_ratio), 0644)
+	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/stats_total/cache_hit_ratio",
+		[]byte(cache_hit_ratio), 0644)
 	require.NoError(t, err)

-	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/stats_total/cache_hits", []byte(cache_hits), 0644)
+	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/stats_total/cache_hits",
+		[]byte(cache_hits), 0644)
 	require.NoError(t, err)

-	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/stats_total/cache_miss_collisions", []byte(cache_miss_collisions), 0644)
+	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/stats_total/cache_miss_collisions",
+		[]byte(cache_miss_collisions), 0644)
 	require.NoError(t, err)

-	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/stats_total/cache_misses", []byte(cache_misses), 0644)
+	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/stats_total/cache_misses",
+		[]byte(cache_misses), 0644)
 	require.NoError(t, err)

-	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/stats_total/cache_readaheads", []byte(cache_readaheads), 0644)
+	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/stats_total/cache_readaheads",
+		[]byte(cache_readaheads), 0644)
 	require.NoError(t, err)

-	intMetrics := []*metrics{
-		{
-			name:  "dirty_data",
-			value: 1610612736,
-		},
-		{
-			name:  "bypassed",
-			value: 5167704440832,
-		},
-		{
-			name:  "cache_bypass_hits",
-			value: 146155333,
-		},
-		{
-			name:  "cache_bypass_misses",
-			value: 0,
-		},
-		{
-			name:  "cache_hit_ratio",
-			value: 90,
-		},
-		{
-			name:  "cache_hits",
-			value: 511469583,
-		},
-		{
-			name:  "cache_miss_collisions",
-			value: 157567,
-		},
-		{
-			name:  "cache_misses",
-			value: 50616331,
-		},
-		{
-			name:  "cache_readaheads",
-			value: 2,
-		},
+	fields := map[string]interface{}{
+		"dirty_data":            uint64(1610612736),
+		"bypassed":              uint64(5167704440832),
+		"cache_bypass_hits":     uint64(146155333),
+		"cache_bypass_misses":   uint64(0),
+		"cache_hit_ratio":       uint64(90),
+		"cache_hits":            uint64(511469583),
+		"cache_miss_collisions": uint64(157567),
+		"cache_misses":          uint64(50616331),
+		"cache_readaheads":      uint64(2),
 	}

 	tags := map[string]string{
@@ -126,27 +102,19 @@ func TestBcacheGeneratesMetrics(t *testing.T) {

 	var acc testutil.Accumulator

-	//all devs
+	// all devs
 	b := &Bcache{BcachePath: testBcachePath}

 	err = b.Gather(&acc)
 	require.NoError(t, err)
+	acc.AssertContainsTaggedFields(t, "bcache", fields, tags)

-	for _, metric := range intMetrics {
-		assert.True(t, acc.HasUIntValue(metric.name), metric.name)
-		assert.True(t, acc.CheckTaggedValue(metric.name, metric.value, tags))
-	}
-
-	//one exist dev
+	// one exist dev
 	b = &Bcache{BcachePath: testBcachePath, BcacheDevs: []string{"bcache0"}}

 	err = b.Gather(&acc)
 	require.NoError(t, err)
-
-	for _, metric := range intMetrics {
-		assert.True(t, acc.HasUIntValue(metric.name), metric.name)
-		assert.True(t, acc.CheckTaggedValue(metric.name, metric.value, tags))
-	}
+	acc.AssertContainsTaggedFields(t, "bcache", fields, tags)

 	err = os.RemoveAll(os.TempDir() + "/telegraf")
 	require.NoError(t, err)
--- a/plugins/inputs/couchbase/README.md
+++ b/plugins/inputs/couchbase/README.md
@@ -0,0 +1,63 @@
+# Telegraf Plugin: Couchbase
+
+## Configuration:
+
+```
+# Read per-node and per-bucket metrics from Couchbase
+[[inputs.couchbase]]
+  ## specify servers via a url matching:
+  ##  [protocol://][:password]@address[:port]
+  ##  e.g.
+  ##    http://couchbase-0.example.com/
+  ##    http://admin:secret@couchbase-0.example.com:8091/
+  ##
+  ## If no servers are specified, then localhost is used as the host.
+  ## If no protocol is specifed, HTTP is used.
+  ## If no port is specified, 8091 is used.
+  servers = ["http://localhost:8091"]
+```
+
+## Measurements:
+
+### couchbase_node
+
+Tags:
+- 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:
+- memory_free (unit: bytes, example: 23181365248.0)
+- memory_total (unit: bytes, example: 64424656896.0)
+
+### couchbase_bucket
+
+Tags:
+- cluster: whatever you called it in `servers` in the configuration, e.g.: `http://couchbase-0.example.com/`)
+- bucket: the name of the couchbase bucket, e.g., `blastro-df`
+
+Fields:
+- quota_percent_used (unit: percent, example: 68.85424936294555)
+- ops_per_sec (unit: count, example: 5686.789686789687)
+- disk_fetches (unit: count, example: 0.0)
+- item_count (unit: count, example: 943239752.0)
+- disk_used (unit: bytes, example: 409178772321.0)
+- data_used (unit: bytes, example: 212179309111.0)
+- mem_used (unit: bytes, example: 202156957464.0)
+
+
+## Example output
+
+```
+$ 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
+> couchbase_node,cluster=https://couchbase-0.example.com/,hostname=172.16.13.105:8091 memory_free=23531704320,memory_total=64424656896 1458381183695995259
+> couchbase_node,cluster=https://couchbase-0.example.com/,hostname=172.16.13.173:8091 memory_free=23628767232,memory_total=64424656896 1458381183696010870
+> couchbase_node,cluster=https://couchbase-0.example.com/,hostname=172.16.15.120:8091 memory_free=23616692224,memory_total=64424656896 1458381183696027406
+> couchbase_node,cluster=https://couchbase-0.example.com/,hostname=172.16.8.127:8091 memory_free=23431770112,memory_total=64424656896 1458381183696041040
+> couchbase_node,cluster=https://couchbase-0.example.com/,hostname=172.16.8.148:8091 memory_free=23811371008,memory_total=64424656896 1458381183696059060
+> couchbase_bucket,bucket=default,cluster=https://couchbase-0.example.com/ data_used=25743360,disk_fetches=0,disk_used=31744886,item_count=0,mem_used=77729224,ops_per_sec=0,quota_percent_used=10.58976636614118 1458381183696210074
+> couchbase_bucket,bucket=demoncat,cluster=https://couchbase-0.example.com/ data_used=38157584951,disk_fetches=0,disk_used=62730302441,item_count=14662532,mem_used=24015304256,ops_per_sec=1207.753207753208,quota_percent_used=79.87855353525707 1458381183696242695
+> couchbase_bucket,bucket=blastro-df,cluster=https://couchbase-0.example.com/ data_used=212552491622,disk_fetches=0,disk_used=413323157621,item_count=944655680,mem_used=202421103760,ops_per_sec=1692.176692176692,quota_percent_used=68.9442170551845 1458381183696272206
+```
--- a/plugins/inputs/couchbase/couchbase.go
+++ b/plugins/inputs/couchbase/couchbase.go
@@ -0,0 +1,104 @@
+package couchbase
+
+import (
+	couchbase "github.com/couchbase/go-couchbase"
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
+	"sync"
+)
+
+type Couchbase struct {
+	Servers []string
+}
+
+var sampleConfig = `
+  ## specify servers via a url matching:
+  ##  [protocol://][:password]@address[:port]
+  ##  e.g.
+  ##    http://couchbase-0.example.com/
+  ##    http://admin:secret@couchbase-0.example.com:8091/
+  ##
+  ## If no servers are specified, then localhost is used as the host.
+  ## If no protocol is specifed, HTTP is used.
+  ## If no port is specified, 8091 is used.
+  servers = ["http://localhost:8091"]
+`
+
+func (r *Couchbase) SampleConfig() string {
+	return sampleConfig
+}
+
+func (r *Couchbase) Description() string {
+	return "Read metrics from one or many couchbase clusters"
+}
+
+// Reads stats from all configured clusters. Accumulates stats.
+// Returns one of the errors encountered while gathering stats (if any).
+func (r *Couchbase) Gather(acc telegraf.Accumulator) error {
+	if len(r.Servers) == 0 {
+		r.gatherServer("http://localhost:8091/", acc, nil)
+		return nil
+	}
+
+	var wg sync.WaitGroup
+
+	var outerr error
+
+	for _, serv := range r.Servers {
+		wg.Add(1)
+		go func(serv string) {
+			defer wg.Done()
+			outerr = r.gatherServer(serv, acc, nil)
+		}(serv)
+	}
+
+	wg.Wait()
+
+	return outerr
+}
+
+func (r *Couchbase) gatherServer(addr string, acc telegraf.Accumulator, pool *couchbase.Pool) error {
+	if pool == nil {
+		client, err := couchbase.Connect(addr)
+		if err != nil {
+			return err
+		}
+
+		// `default` is the only possible pool name. It's a
+		// placeholder for a possible future Couchbase feature. See
+		// http://stackoverflow.com/a/16990911/17498.
+		p, err := client.GetPool("default")
+		if err != nil {
+			return err
+		}
+		pool = &p
+	}
+	for i := 0; i < len(pool.Nodes); i++ {
+		node := pool.Nodes[i]
+		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 {
+		tags := map[string]string{"cluster": addr, "bucket": bucketName}
+		bs := pool.BucketMap[bucketName].BasicStats
+		fields := make(map[string]interface{})
+		fields["quota_percent_used"] = bs["quotaPercentUsed"]
+		fields["ops_per_sec"] = bs["opsPerSec"]
+		fields["disk_fetches"] = bs["diskFetches"]
+		fields["item_count"] = bs["itemCount"]
+		fields["disk_used"] = bs["diskUsed"]
+		fields["data_used"] = bs["dataUsed"]
+		fields["mem_used"] = bs["memUsed"]
+		acc.AddFields("couchbase_bucket", fields, tags)
+	}
+	return nil
+}
+
+func init() {
+	inputs.Add("couchbase", func() telegraf.Input {
+		return &Couchbase{}
+	})
+}
--- 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
@@ -0,0 +1,255 @@
+# CouchDB Input Plugin
+---
+
+The CouchDB plugin gathers metrics of CouchDB using [_stats](http://docs.couchdb.org/en/1.6.1/api/server/common.html?highlight=stats#get--_stats) endpoint.
+
+### Configuration:
+
+```
+# Sample Config:
+[[inputs.couchdb]]
+  hosts = ["http://localhost:5984/_stats"]
+```
+
+### Measurements & Fields:
+
+Statistics specific to the internals of CouchDB:
+
+- couchdb_auth_cache_misses
+- couchdb_database_writes
+- couchdb_open_databases
+- couchdb_auth_cache_hits
+- couchdb_request_time
+- couchdb_database_reads
+- couchdb_open_os_files
+
+Statistics of HTTP requests by method:
+
+- httpd_request_methods_put
+- httpd_request_methods_get
+- httpd_request_methods_copy
+- httpd_request_methods_delete
+- httpd_request_methods_post
+- httpd_request_methods_head
+
+Statistics of HTTP requests by response code:
+
+- httpd_status_codes_200
+- httpd_status_codes_201
+- httpd_status_codes_202
+- httpd_status_codes_301
+- httpd_status_codes_304
+- httpd_status_codes_400
+- httpd_status_codes_401
+- httpd_status_codes_403
+- httpd_status_codes_404
+- httpd_status_codes_405
+- httpd_status_codes_409
+- httpd_status_codes_412
+- httpd_status_codes_500
+
+httpd statistics:
+
+- httpd_clients_requesting_changes
+- httpd_temporary_view_reads
+- httpd_requests
+- httpd_bulk_requests
+- httpd_view_reads
+
+### Tags:
+
+- server (url of the couchdb _stats endpoint)
+
+### Example output:
+
+```
+➜  telegraf git:(master) ✗ ./telegraf -config ./config.conf  -input-filter couchdb -test
+* Plugin: couchdb,
+ Collection 1
+> couchdb,server=http://localhost:5984/_stats couchdb_auth_cache_hits_current=0,
+couchdb_auth_cache_hits_max=0,
+couchdb_auth_cache_hits_mean=0,
+couchdb_auth_cache_hits_min=0,
+couchdb_auth_cache_hits_stddev=0,
+couchdb_auth_cache_hits_sum=0,
+couchdb_auth_cache_misses_current=0,
+couchdb_auth_cache_misses_max=0,
+couchdb_auth_cache_misses_mean=0,
+couchdb_auth_cache_misses_min=0,
+couchdb_auth_cache_misses_stddev=0,
+couchdb_auth_cache_misses_sum=0,
+couchdb_database_reads_current=0,
+couchdb_database_reads_max=0,
+couchdb_database_reads_mean=0,
+couchdb_database_reads_min=0,
+couchdb_database_reads_stddev=0,
+couchdb_database_reads_sum=0,
+couchdb_database_writes_current=1102,
+couchdb_database_writes_max=131,
+couchdb_database_writes_mean=0.116,
+couchdb_database_writes_min=0,
+couchdb_database_writes_stddev=3.536,
+couchdb_database_writes_sum=1102,
+couchdb_open_databases_current=1,
+couchdb_open_databases_max=1,
+couchdb_open_databases_mean=0,
+couchdb_open_databases_min=0,
+couchdb_open_databases_stddev=0.01,
+couchdb_open_databases_sum=1,
+couchdb_open_os_files_current=2,
+couchdb_open_os_files_max=2,
+couchdb_open_os_files_mean=0,
+couchdb_open_os_files_min=0,
+couchdb_open_os_files_stddev=0.02,
+couchdb_open_os_files_sum=2,
+couchdb_request_time_current=242.21,
+couchdb_request_time_max=102,
+couchdb_request_time_mean=5.767,
+couchdb_request_time_min=1,
+couchdb_request_time_stddev=17.369,
+couchdb_request_time_sum=242.21,
+httpd_bulk_requests_current=0,
+httpd_bulk_requests_max=0,
+httpd_bulk_requests_mean=0,
+httpd_bulk_requests_min=0,
+httpd_bulk_requests_stddev=0,
+httpd_bulk_requests_sum=0,
+httpd_clients_requesting_changes_current=0,
+httpd_clients_requesting_changes_max=0,
+httpd_clients_requesting_changes_mean=0,
+httpd_clients_requesting_changes_min=0,
+httpd_clients_requesting_changes_stddev=0,
+httpd_clients_requesting_changes_sum=0,
+httpd_request_methods_copy_current=0,
+httpd_request_methods_copy_max=0,
+httpd_request_methods_copy_mean=0,
+httpd_request_methods_copy_min=0,
+httpd_request_methods_copy_stddev=0,
+httpd_request_methods_copy_sum=0,
+httpd_request_methods_delete_current=0,
+httpd_request_methods_delete_max=0,
+httpd_request_methods_delete_mean=0,
+httpd_request_methods_delete_min=0,
+httpd_request_methods_delete_stddev=0,
+httpd_request_methods_delete_sum=0,
+httpd_request_methods_get_current=31,
+httpd_request_methods_get_max=1,
+httpd_request_methods_get_mean=0.003,
+httpd_request_methods_get_min=0,
+httpd_request_methods_get_stddev=0.057,
+httpd_request_methods_get_sum=31,
+httpd_request_methods_head_current=0,
+httpd_request_methods_head_max=0,
+httpd_request_methods_head_mean=0,
+httpd_request_methods_head_min=0,
+httpd_request_methods_head_stddev=0,
+httpd_request_methods_head_sum=0,
+httpd_request_methods_post_current=1102,
+httpd_request_methods_post_max=131,
+httpd_request_methods_post_mean=0.116,
+httpd_request_methods_post_min=0,
+httpd_request_methods_post_stddev=3.536,
+httpd_request_methods_post_sum=1102,
+httpd_request_methods_put_current=1,
+httpd_request_methods_put_max=1,
+httpd_request_methods_put_mean=0,
+httpd_request_methods_put_min=0,
+httpd_request_methods_put_stddev=0.01,
+httpd_request_methods_put_sum=1,
+httpd_requests_current=1133,
+httpd_requests_max=130,
+httpd_requests_mean=0.118,
+httpd_requests_min=0,
+httpd_requests_stddev=3.512,
+httpd_requests_sum=1133,
+httpd_status_codes_200_current=31,
+httpd_status_codes_200_max=1,
+httpd_status_codes_200_mean=0.003,
+httpd_status_codes_200_min=0,
+httpd_status_codes_200_stddev=0.057,
+httpd_status_codes_200_sum=31,
+httpd_status_codes_201_current=1103,
+httpd_status_codes_201_max=130,
+httpd_status_codes_201_mean=0.116,
+httpd_status_codes_201_min=0,
+httpd_status_codes_201_stddev=3.532,
+httpd_status_codes_201_sum=1103,
+httpd_status_codes_202_current=0,
+httpd_status_codes_202_max=0,
+httpd_status_codes_202_mean=0,
+httpd_status_codes_202_min=0,
+httpd_status_codes_202_stddev=0,
+httpd_status_codes_202_sum=0,
+httpd_status_codes_301_current=0,
+httpd_status_codes_301_max=0,
+httpd_status_codes_301_mean=0,
+httpd_status_codes_301_min=0,
+httpd_status_codes_301_stddev=0,
+httpd_status_codes_301_sum=0,
+httpd_status_codes_304_current=0,
+httpd_status_codes_304_max=0,
+httpd_status_codes_304_mean=0,
+httpd_status_codes_304_min=0,
+httpd_status_codes_304_stddev=0,
+httpd_status_codes_304_sum=0,
+httpd_status_codes_400_current=0,
+httpd_status_codes_400_max=0,
+httpd_status_codes_400_mean=0,
+httpd_status_codes_400_min=0,
+httpd_status_codes_400_stddev=0,
+httpd_status_codes_400_sum=0,
+httpd_status_codes_401_current=0,
+httpd_status_codes_401_max=0,
+httpd_status_codes_401_mean=0,
+httpd_status_codes_401_min=0,
+httpd_status_codes_401_stddev=0,
+httpd_status_codes_401_sum=0,
+httpd_status_codes_403_current=0,
+httpd_status_codes_403_max=0,
+httpd_status_codes_403_mean=0,
+httpd_status_codes_403_min=0,
+httpd_status_codes_403_stddev=0,
+httpd_status_codes_403_sum=0,
+httpd_status_codes_404_current=0,
+httpd_status_codes_404_max=0,
+httpd_status_codes_404_mean=0,
+httpd_status_codes_404_min=0,
+httpd_status_codes_404_stddev=0,
+httpd_status_codes_404_sum=0,
+httpd_status_codes_405_current=0,
+httpd_status_codes_405_max=0,
+httpd_status_codes_405_mean=0,
+httpd_status_codes_405_min=0,
+httpd_status_codes_405_stddev=0,
+httpd_status_codes_405_sum=0,
+httpd_status_codes_409_current=0,
+httpd_status_codes_409_max=0,
+httpd_status_codes_409_mean=0,
+httpd_status_codes_409_min=0,
+httpd_status_codes_409_stddev=0,
+httpd_status_codes_409_sum=0,
+httpd_status_codes_412_current=0,
+httpd_status_codes_412_max=0,
+httpd_status_codes_412_mean=0,
+httpd_status_codes_412_min=0,
+httpd_status_codes_412_stddev=0,
+httpd_status_codes_412_sum=0,
+httpd_status_codes_500_current=0,
+httpd_status_codes_500_max=0,
+httpd_status_codes_500_mean=0,
+httpd_status_codes_500_min=0,
+httpd_status_codes_500_stddev=0,
+httpd_status_codes_500_sum=0,
+httpd_temporary_view_reads_current=0,
+httpd_temporary_view_reads_max=0,
+httpd_temporary_view_reads_mean=0,
+httpd_temporary_view_reads_min=0,
+httpd_temporary_view_reads_stddev=0,
+httpd_temporary_view_reads_sum=0,
+httpd_view_reads_current=0,
+httpd_view_reads_max=0,
+httpd_view_reads_mean=0,
+httpd_view_reads_min=0,
+httpd_view_reads_stddev=0,
+httpd_view_reads_sum=0 1454692257621938169
+```
--- a/plugins/inputs/couchdb/couchdb.go
+++ b/plugins/inputs/couchdb/couchdb.go
@@ -0,0 +1,215 @@
+package couchdb
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
+	"net/http"
+	"reflect"
+	"strings"
+	"sync"
+	"time"
+)
+
+// Schema:
+type metaData struct {
+	Description string  `json:"description"`
+	Current     float64 `json:"current"`
+	Sum         float64 `json:"sum"`
+	Mean        float64 `json:"mean"`
+	Stddev      float64 `json:"stddev"`
+	Min         float64 `json:"min"`
+	Max         float64 `json:"max"`
+}
+
+type Stats struct {
+	Couchdb struct {
+		AuthCacheMisses metaData `json:"auth_cache_misses"`
+		DatabaseWrites  metaData `json:"database_writes"`
+		OpenDatabases   metaData `json:"open_databases"`
+		AuthCacheHits   metaData `json:"auth_cache_hits"`
+		RequestTime     metaData `json:"request_time"`
+		DatabaseReads   metaData `json:"database_reads"`
+		OpenOsFiles     metaData `json:"open_os_files"`
+	} `json:"couchdb"`
+	HttpdRequestMethods struct {
+		Put    metaData `json:"PUT"`
+		Get    metaData `json:"GET"`
+		Copy   metaData `json:"COPY"`
+		Delete metaData `json:"DELETE"`
+		Post   metaData `json:"POST"`
+		Head   metaData `json:"HEAD"`
+	} `json:"httpd_request_methods"`
+	HttpdStatusCodes struct {
+		Status200 metaData `json:"200"`
+		Status201 metaData `json:"201"`
+		Status202 metaData `json:"202"`
+		Status301 metaData `json:"301"`
+		Status304 metaData `json:"304"`
+		Status400 metaData `json:"400"`
+		Status401 metaData `json:"401"`
+		Status403 metaData `json:"403"`
+		Status404 metaData `json:"404"`
+		Status405 metaData `json:"405"`
+		Status409 metaData `json:"409"`
+		Status412 metaData `json:"412"`
+		Status500 metaData `json:"500"`
+	} `json:"httpd_status_codes"`
+	Httpd struct {
+		ClientsRequestingChanges metaData `json:"clients_requesting_changes"`
+		TemporaryViewReads       metaData `json:"temporary_view_reads"`
+		Requests                 metaData `json:"requests"`
+		BulkRequests             metaData `json:"bulk_requests"`
+		ViewReads                metaData `json:"view_reads"`
+	} `json:"httpd"`
+}
+
+type CouchDB struct {
+	HOSTs []string `toml:"hosts"`
+}
+
+func (*CouchDB) Description() string {
+	return "Read CouchDB Stats from one or more servers"
+}
+
+func (*CouchDB) SampleConfig() string {
+	return `
+  ## Works with CouchDB stats endpoints out of the box
+  ## Multiple HOSTs from which to read CouchDB stats:
+  hosts = ["http://localhost:8086/_stats"]
+`
+}
+
+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 {
+				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{
+	ResponseHeaderTimeout: time.Duration(3 * time.Second),
+}
+
+var client = &http.Client{
+	Transport: tr,
+	Timeout:   time.Duration(4 * time.Second),
+}
+
+func (c *CouchDB) fetchAndInsertData(accumulator telegraf.Accumulator, host string) error {
+
+	response, error := client.Get(host)
+	if error != nil {
+		return error
+	}
+	defer response.Body.Close()
+
+	var stats Stats
+	decoder := json.NewDecoder(response.Body)
+	decoder.Decode(&stats)
+
+	fields := map[string]interface{}{}
+
+	// CouchDB meta stats:
+	c.MapCopy(fields, c.generateFields("couchdb_auth_cache_misses", stats.Couchdb.AuthCacheMisses))
+	c.MapCopy(fields, c.generateFields("couchdb_database_writes", stats.Couchdb.DatabaseWrites))
+	c.MapCopy(fields, c.generateFields("couchdb_open_databases", stats.Couchdb.OpenDatabases))
+	c.MapCopy(fields, c.generateFields("couchdb_auth_cache_hits", stats.Couchdb.AuthCacheHits))
+	c.MapCopy(fields, c.generateFields("couchdb_request_time", stats.Couchdb.RequestTime))
+	c.MapCopy(fields, c.generateFields("couchdb_database_reads", stats.Couchdb.DatabaseReads))
+	c.MapCopy(fields, c.generateFields("couchdb_open_os_files", stats.Couchdb.OpenOsFiles))
+
+	// http request methods stats:
+	c.MapCopy(fields, c.generateFields("httpd_request_methods_put", stats.HttpdRequestMethods.Put))
+	c.MapCopy(fields, c.generateFields("httpd_request_methods_get", stats.HttpdRequestMethods.Get))
+	c.MapCopy(fields, c.generateFields("httpd_request_methods_copy", stats.HttpdRequestMethods.Copy))
+	c.MapCopy(fields, c.generateFields("httpd_request_methods_delete", stats.HttpdRequestMethods.Delete))
+	c.MapCopy(fields, c.generateFields("httpd_request_methods_post", stats.HttpdRequestMethods.Post))
+	c.MapCopy(fields, c.generateFields("httpd_request_methods_head", stats.HttpdRequestMethods.Head))
+
+	// status code stats:
+	c.MapCopy(fields, c.generateFields("httpd_status_codes_200", stats.HttpdStatusCodes.Status200))
+	c.MapCopy(fields, c.generateFields("httpd_status_codes_201", stats.HttpdStatusCodes.Status201))
+	c.MapCopy(fields, c.generateFields("httpd_status_codes_202", stats.HttpdStatusCodes.Status202))
+	c.MapCopy(fields, c.generateFields("httpd_status_codes_301", stats.HttpdStatusCodes.Status301))
+	c.MapCopy(fields, c.generateFields("httpd_status_codes_304", stats.HttpdStatusCodes.Status304))
+	c.MapCopy(fields, c.generateFields("httpd_status_codes_400", stats.HttpdStatusCodes.Status400))
+	c.MapCopy(fields, c.generateFields("httpd_status_codes_401", stats.HttpdStatusCodes.Status401))
+	c.MapCopy(fields, c.generateFields("httpd_status_codes_403", stats.HttpdStatusCodes.Status403))
+	c.MapCopy(fields, c.generateFields("httpd_status_codes_404", stats.HttpdStatusCodes.Status404))
+	c.MapCopy(fields, c.generateFields("httpd_status_codes_405", stats.HttpdStatusCodes.Status405))
+	c.MapCopy(fields, c.generateFields("httpd_status_codes_409", stats.HttpdStatusCodes.Status409))
+	c.MapCopy(fields, c.generateFields("httpd_status_codes_412", stats.HttpdStatusCodes.Status412))
+	c.MapCopy(fields, c.generateFields("httpd_status_codes_500", stats.HttpdStatusCodes.Status500))
+
+	// httpd stats:
+	c.MapCopy(fields, c.generateFields("httpd_clients_requesting_changes", stats.Httpd.ClientsRequestingChanges))
+	c.MapCopy(fields, c.generateFields("httpd_temporary_view_reads", stats.Httpd.TemporaryViewReads))
+	c.MapCopy(fields, c.generateFields("httpd_requests", stats.Httpd.Requests))
+	c.MapCopy(fields, c.generateFields("httpd_bulk_requests", stats.Httpd.BulkRequests))
+	c.MapCopy(fields, c.generateFields("httpd_view_reads", stats.Httpd.ViewReads))
+
+	tags := map[string]string{
+		"server": host,
+	}
+	accumulator.AddFields("couchdb", fields, tags)
+	return nil
+}
+
+func (*CouchDB) MapCopy(dst, src interface{}) {
+	dv, sv := reflect.ValueOf(dst), reflect.ValueOf(src)
+	for _, k := range sv.MapKeys() {
+		dv.SetMapIndex(k, sv.MapIndex(k))
+	}
+}
+
+func (*CouchDB) safeCheck(value interface{}) interface{} {
+	if value == nil {
+		return 0.0
+	}
+	return value
+}
+
+func (c *CouchDB) generateFields(prefix string, obj metaData) map[string]interface{} {
+	fields := map[string]interface{}{
+		prefix + "_current": c.safeCheck(obj.Current),
+		prefix + "_sum":     c.safeCheck(obj.Sum),
+		prefix + "_mean":    c.safeCheck(obj.Mean),
+		prefix + "_stddev":  c.safeCheck(obj.Stddev),
+		prefix + "_min":     c.safeCheck(obj.Min),
+		prefix + "_max":     c.safeCheck(obj.Max),
+	}
+	return fields
+}
+
+func init() {
+	inputs.Add("couchdb", func() telegraf.Input {
+		return &CouchDB{}
+	})
+}
--- a/plugins/inputs/couchdb/couchdb_test.go
+++ b/plugins/inputs/couchdb/couchdb_test.go
@@ -0,0 +1,320 @@
+package couchdb_test
+
+import (
+	"github.com/influxdata/telegraf/plugins/inputs/couchdb"
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/require"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+)
+
+func TestBasic(t *testing.T) {
+	js := `
+{
+    "couchdb": {
+        "auth_cache_misses": {
+            "description": "number of authentication cache misses",
+            "current": null,
+            "sum": null,
+            "mean": null,
+            "stddev": null,
+            "min": null,
+            "max": null
+        },
+        "database_writes": {
+            "description": "number of times a database was changed",
+            "current": null,
+            "sum": null,
+            "mean": null,
+            "stddev": null,
+            "min": null,
+            "max": null
+        },
+        "open_databases": {
+            "description": "number of open databases",
+            "current": null,
+            "sum": null,
+            "mean": null,
+            "stddev": null,
+            "min": null,
+            "max": null
+        },
+        "auth_cache_hits": {
+            "description": "number of authentication cache hits",
+            "current": null,
+            "sum": null,
+            "mean": null,
+            "stddev": null,
+            "min": null,
+            "max": null
+        },
+        "request_time": {
+            "description": "length of a request inside CouchDB without MochiWeb",
+            "current": 18.0,
+            "sum": 18.0,
+            "mean": 18.0,
+            "stddev": null,
+            "min": 18.0,
+            "max": 18.0
+        },
+        "database_reads": {
+            "description": "number of times a document was read from a database",
+            "current": null,
+            "sum": null,
+            "mean": null,
+            "stddev": null,
+            "min": null,
+            "max": null
+        },
+        "open_os_files": {
+            "description": "number of file descriptors CouchDB has open",
+            "current": null,
+            "sum": null,
+            "mean": null,
+            "stddev": null,
+            "min": null,
+            "max": null
+        }
+    },
+    "httpd_request_methods": {
+        "PUT": {
+            "description": "number of HTTP PUT requests",
+            "current": null,
+            "sum": null,
+            "mean": null,
+            "stddev": null,
+            "min": null,
+            "max": null
+        },
+        "GET": {
+            "description": "number of HTTP GET requests",
+            "current": 2.0,
+            "sum": 2.0,
+            "mean": 0.25,
+            "stddev": 0.70699999999999996181,
+            "min": 0,
+            "max": 2
+        },
+        "COPY": {
+            "description": "number of HTTP COPY requests",
+            "current": null,
+            "sum": null,
+            "mean": null,
+            "stddev": null,
+            "min": null,
+            "max": null
+        },
+        "DELETE": {
+            "description": "number of HTTP DELETE requests",
+            "current": null,
+            "sum": null,
+            "mean": null,
+            "stddev": null,
+            "min": null,
+            "max": null
+        },
+        "POST": {
+            "description": "number of HTTP POST requests",
+            "current": null,
+            "sum": null,
+            "mean": null,
+            "stddev": null,
+            "min": null,
+            "max": null
+        },
+        "HEAD": {
+            "description": "number of HTTP HEAD requests",
+            "current": null,
+            "sum": null,
+            "mean": null,
+            "stddev": null,
+            "min": null,
+            "max": null
+        }
+    },
+    "httpd_status_codes": {
+        "403": {
+            "description": "number of HTTP 403 Forbidden responses",
+            "current": null,
+            "sum": null,
+            "mean": null,
+            "stddev": null,
+            "min": null,
+            "max": null
+        },
+        "202": {
+            "description": "number of HTTP 202 Accepted responses",
+            "current": null,
+            "sum": null,
+            "mean": null,
+            "stddev": null,
+            "min": null,
+            "max": null
+        },
+        "401": {
+            "description": "number of HTTP 401 Unauthorized responses",
+            "current": null,
+            "sum": null,
+            "mean": null,
+            "stddev": null,
+            "min": null,
+            "max": null
+        },
+        "409": {
+            "description": "number of HTTP 409 Conflict responses",
+            "current": null,
+            "sum": null,
+            "mean": null,
+            "stddev": null,
+            "min": null,
+            "max": null
+        },
+        "200": {
+            "description": "number of HTTP 200 OK responses",
+            "current": 1.0,
+            "sum": 1.0,
+            "mean": 0.125,
+            "stddev": 0.35399999999999998135,
+            "min": 0,
+            "max": 1
+        },
+        "405": {
+            "description": "number of HTTP 405 Method Not Allowed responses",
+            "current": null,
+            "sum": null,
+            "mean": null,
+            "stddev": null,
+            "min": null,
+            "max": null
+        },
+        "400": {
+            "description": "number of HTTP 400 Bad Request responses",
+            "current": null,
+            "sum": null,
+            "mean": null,
+            "stddev": null,
+            "min": null,
+            "max": null
+        },
+        "201": {
+            "description": "number of HTTP 201 Created responses",
+            "current": null,
+            "sum": null,
+            "mean": null,
+            "stddev": null,
+            "min": null,
+            "max": null
+        },
+        "404": {
+            "description": "number of HTTP 404 Not Found responses",
+            "current": null,
+            "sum": null,
+            "mean": null,
+            "stddev": null,
+            "min": null,
+            "max": null
+        },
+        "500": {
+            "description": "number of HTTP 500 Internal Server Error responses",
+            "current": null,
+            "sum": null,
+            "mean": null,
+            "stddev": null,
+            "min": null,
+            "max": null
+        },
+        "412": {
+            "description": "number of HTTP 412 Precondition Failed responses",
+            "current": null,
+            "sum": null,
+            "mean": null,
+            "stddev": null,
+            "min": null,
+            "max": null
+        },
+        "301": {
+            "description": "number of HTTP 301 Moved Permanently responses",
+            "current": null,
+            "sum": null,
+            "mean": null,
+            "stddev": null,
+            "min": null,
+            "max": null
+        },
+        "304": {
+            "description": "number of HTTP 304 Not Modified responses",
+            "current": null,
+            "sum": null,
+            "mean": null,
+            "stddev": null,
+            "min": null,
+            "max": null
+        }
+    },
+    "httpd": {
+        "clients_requesting_changes": {
+            "description": "number of clients for continuous _changes",
+            "current": null,
+            "sum": null,
+            "mean": null,
+            "stddev": null,
+            "min": null,
+            "max": null
+        },
+        "temporary_view_reads": {
+            "description": "number of temporary view reads",
+            "current": null,
+            "sum": null,
+            "mean": null,
+            "stddev": null,
+            "min": null,
+            "max": null
+        },
+        "requests": {
+            "description": "number of HTTP requests",
+            "current": 2.0,
+            "sum": 2.0,
+            "mean": 0.25,
+            "stddev": 0.70699999999999996181,
+            "min": 0,
+            "max": 2
+        },
+        "bulk_requests": {
+            "description": "number of bulk requests",
+            "current": null,
+            "sum": null,
+            "mean": null,
+            "stddev": null,
+            "min": null,
+            "max": null
+        },
+        "view_reads": {
+            "description": "number of view reads",
+            "current": null,
+            "sum": null,
+            "mean": null,
+            "stddev": null,
+            "min": null,
+            "max": null
+        }
+    }
+}
+
+`
+	fakeServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path == "/_stats" {
+			_, _ = w.Write([]byte(js))
+		} else {
+			w.WriteHeader(http.StatusNotFound)
+		}
+	}))
+	defer fakeServer.Close()
+
+	plugin := &couchdb.CouchDB{
+		HOSTs: []string{fakeServer.URL + "/_stats"},
+	}
+
+	var acc testutil.Accumulator
+	require.NoError(t, plugin.Gather(&acc))
+}
--- a/plugins/inputs/disque/disque.go
+++ b/plugins/inputs/disque/disque.go
@@ -9,8 +9,10 @@ import (
 	"strconv"
 	"strings"
 	"sync"
+	"time"

-	"github.com/influxdb/telegraf/plugins"
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )

 type Disque struct {
@@ -21,14 +23,15 @@ type Disque struct {
 }

 var sampleConfig = `
-  # An array of URI to gather stats about. Specify an ip or hostname
-  # with optional port and password. ie disque://localhost, disque://10.10.3.33:18832,
-  # 10.0.0.1:10000, etc.
-  #
-  # If no servers are specified, then localhost is used as the host.
+  ## An array of URI to gather stats about. Specify an ip or hostname
+  ## with optional port and password.
+  ## ie disque://localhost, disque://10.10.3.33:18832, 10.0.0.1:10000, etc.
+  ## If no servers are specified, then localhost is used as the host.
  servers = ["localhost"]
 `

+var defaultTimeout = 5 * time.Second
+
 func (r *Disque) SampleConfig() string {
 	return sampleConfig
 }
@@ -61,7 +64,7 @@ var ErrProtocolError = errors.New("disque protocol error")

 // Reads stats from all configured servers accumulates stats.
 // Returns one of the errors encountered while gather stats (if any).
-func (g *Disque) Gather(acc plugins.Accumulator) error {
+func (g *Disque) Gather(acc telegraf.Accumulator) error {
 	if len(g.Servers) == 0 {
 		url := &url.URL{
 			Host: ":7711",
@@ -98,7 +101,7 @@ func (g *Disque) Gather(acc plugins.Accumulator) error {

 const defaultPort = "7711"

-func (g *Disque) gatherServer(addr *url.URL, acc plugins.Accumulator) error {
+func (g *Disque) gatherServer(addr *url.URL, acc telegraf.Accumulator) error {
 	if g.c == nil {

 		_, _, err := net.SplitHostPort(addr.Host)
@@ -106,7 +109,7 @@ func (g *Disque) gatherServer(addr *url.URL, acc plugins.Accumulator) error {
 			addr.Host = addr.Host + ":" + defaultPort
 		}

-		c, err := net.Dial("tcp", addr.Host)
+		c, err := net.DialTimeout("tcp", addr.Host, defaultTimeout)
 		if err != nil {
 			return fmt.Errorf("Unable to connect to disque server '%s': %s", addr.Host, err)
 		}
@@ -131,6 +134,9 @@ func (g *Disque) gatherServer(addr *url.URL, acc plugins.Accumulator) error {
 		g.c = c
 	}

+	// Extend connection
+	g.c.SetDeadline(time.Now().Add(defaultTimeout))
+
 	g.c.Write([]byte("info\r\n"))

 	r := bufio.NewReader(g.c)
@@ -155,6 +161,8 @@ func (g *Disque) gatherServer(addr *url.URL, acc plugins.Accumulator) error {

 	var read int

+	fields := make(map[string]interface{})
+	tags := map[string]string{"host": addr.String()}
 	for read < sz {
 		line, err := r.ReadString('\n')
 		if err != nil {
@@ -176,12 +184,11 @@ func (g *Disque) gatherServer(addr *url.URL, acc plugins.Accumulator) error {
 			continue
 		}

-		tags := map[string]string{"host": addr.String()}
 		val := strings.TrimSpace(parts[1])

 		ival, err := strconv.ParseUint(val, 10, 64)
 		if err == nil {
-			acc.Add(metric, ival, tags)
+			fields[metric] = ival
 			continue
 		}

@@ -190,14 +197,14 @@ func (g *Disque) gatherServer(addr *url.URL, acc plugins.Accumulator) error {
 			return err
 		}

-		acc.Add(metric, fval, tags)
+		fields[metric] = fval
 	}
-
+	acc.AddFields("disque", fields, tags)
 	return nil
 }

 func init() {
-	plugins.Add("disque", func() plugins.Plugin {
+	inputs.Add("disque", func() telegraf.Input {
 		return &Disque{}
 	})
 }
--- a/plugins/inputs/disque/disque_test.go
+++ b/plugins/inputs/disque/disque_test.go
@@ -6,8 +6,7 @@ import (
 	"net"
 	"testing"

-	"github.com/influxdb/telegraf/testutil"
-	"github.com/stretchr/testify/assert"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/require"
 )

@@ -55,42 +54,26 @@ func TestDisqueGeneratesMetrics(t *testing.T) {
 	err = r.Gather(&acc)
 	require.NoError(t, err)

-	checkInt := []struct {
-		name  string
-		value uint64
-	}{
-		{"uptime", 1452705},
-		{"clients", 31},
-		{"blocked_clients", 13},
-		{"used_memory", 1840104},
-		{"used_memory_rss", 3227648},
-		{"used_memory_peak", 89603656},
-		{"total_connections_received", 5062777},
-		{"total_commands_processed", 12308396},
-		{"instantaneous_ops_per_sec", 18},
-		{"latest_fork_usec", 1644},
-		{"registered_jobs", 360},
-		{"registered_queues", 12},
-	}
-
-	for _, c := range checkInt {
-		assert.True(t, acc.CheckValue(c.name, c.value))
-	}
-
-	checkFloat := []struct {
-		name  string
-		value float64
-	}{
-		{"mem_fragmentation_ratio", 1.75},
-		{"used_cpu_sys", 19585.73},
-		{"used_cpu_user", 11255.96},
-		{"used_cpu_sys_children", 1.75},
-		{"used_cpu_user_children", 1.91},
-	}
-
-	for _, c := range checkFloat {
-		assert.True(t, acc.CheckValue(c.name, c.value))
+	fields := map[string]interface{}{
+		"uptime":                     uint64(1452705),
+		"clients":                    uint64(31),
+		"blocked_clients":            uint64(13),
+		"used_memory":                uint64(1840104),
+		"used_memory_rss":            uint64(3227648),
+		"used_memory_peak":           uint64(89603656),
+		"total_connections_received": uint64(5062777),
+		"total_commands_processed":   uint64(12308396),
+		"instantaneous_ops_per_sec":  uint64(18),
+		"latest_fork_usec":           uint64(1644),
+		"registered_jobs":            uint64(360),
+		"registered_queues":          uint64(12),
+		"mem_fragmentation_ratio":    float64(1.75),
+		"used_cpu_sys":               float64(19585.73),
+		"used_cpu_user":              float64(11255.96),
+		"used_cpu_sys_children":      float64(1.75),
+		"used_cpu_user_children":     float64(1.91),
 	}
+	acc.AssertContainsFields(t, "disque", fields)
 }

 func TestDisqueCanPullStatsFromMultipleServers(t *testing.T) {
@@ -137,42 +120,26 @@ func TestDisqueCanPullStatsFromMultipleServers(t *testing.T) {
 	err = r.Gather(&acc)
 	require.NoError(t, err)

-	checkInt := []struct {
-		name  string
-		value uint64
-	}{
-		{"uptime", 1452705},
-		{"clients", 31},
-		{"blocked_clients", 13},
-		{"used_memory", 1840104},
-		{"used_memory_rss", 3227648},
-		{"used_memory_peak", 89603656},
-		{"total_connections_received", 5062777},
-		{"total_commands_processed", 12308396},
-		{"instantaneous_ops_per_sec", 18},
-		{"latest_fork_usec", 1644},
-		{"registered_jobs", 360},
-		{"registered_queues", 12},
-	}
-
-	for _, c := range checkInt {
-		assert.True(t, acc.CheckValue(c.name, c.value))
-	}
-
-	checkFloat := []struct {
-		name  string
-		value float64
-	}{
-		{"mem_fragmentation_ratio", 1.75},
-		{"used_cpu_sys", 19585.73},
-		{"used_cpu_user", 11255.96},
-		{"used_cpu_sys_children", 1.75},
-		{"used_cpu_user_children", 1.91},
-	}
-
-	for _, c := range checkFloat {
-		assert.True(t, acc.CheckValue(c.name, c.value))
+	fields := map[string]interface{}{
+		"uptime":                     uint64(1452705),
+		"clients":                    uint64(31),
+		"blocked_clients":            uint64(13),
+		"used_memory":                uint64(1840104),
+		"used_memory_rss":            uint64(3227648),
+		"used_memory_peak":           uint64(89603656),
+		"total_connections_received": uint64(5062777),
+		"total_commands_processed":   uint64(12308396),
+		"instantaneous_ops_per_sec":  uint64(18),
+		"latest_fork_usec":           uint64(1644),
+		"registered_jobs":            uint64(360),
+		"registered_queues":          uint64(12),
+		"mem_fragmentation_ratio":    float64(1.75),
+		"used_cpu_sys":               float64(19585.73),
+		"used_cpu_user":              float64(11255.96),
+		"used_cpu_sys_children":      float64(1.75),
+		"used_cpu_user_children":     float64(1.91),
 	}
+	acc.AssertContainsFields(t, "disque", fields)
 }

 const testOutput = `# Server
--- a/plugins/inputs/dns_query/README.md
+++ b/plugins/inputs/dns_query/README.md
@@ -0,0 +1,51 @@
+# DNS Query Input Plugin
+
+The DNS plugin gathers dns query times in miliseconds - like [Dig](https://en.wikipedia.org/wiki/Dig_\(command\))
+
+### Configuration:
+
+```
+# Sample Config:
+[[inputs.dns_query]]
+  ## servers to query
+  servers = ["8.8.8.8"] # required
+
+  ## Domains or subdomains to query. "." (root) is default
+  domains = ["."] # optional
+
+  ## Query record type. Posible values: A, AAAA, ANY, CNAME, MX,  NS, PTR, SOA, SPF, SRV, TXT. Default is "NS"
+  record_type = "A" # optional
+
+  ## Dns server port. 53 is default
+  port = 53 # optional
+
+  ## Query timeout in seconds. Default is 2 seconds
+  timeout = 2 # optional
+```
+
+For querying more than one record type make:
+
+```
+[[inputs.dns_query]]
+  domains = ["mjasion.pl"]
+  servers = ["8.8.8.8", "8.8.4.4"]
+  record_type = "A"
+
+[[inputs.dns_query]]
+  domains = ["mjasion.pl"]
+  servers = ["8.8.8.8", "8.8.4.4"]
+  record_type = "MX"
+```
+
+### Tags:
+
+- server
+- domain
+- record_type
+
+### Example output:
+
+```
+./telegraf -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
@@ -0,0 +1,160 @@
+package dns_query
+
+import (
+	"errors"
+	"fmt"
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
+	"github.com/miekg/dns"
+	"net"
+	"strconv"
+	"time"
+)
+
+type DnsQuery struct {
+	// Domains or subdomains to query
+	Domains []string
+
+	// Server to query
+	Servers []string
+
+	// Record type
+	RecordType string `toml:"record_type"`
+
+	// DNS server port number
+	Port int
+
+	// Dns query timeout in seconds. 0 means no timeout
+	Timeout int
+}
+
+var sampleConfig = `
+  ## servers to query
+  servers = ["8.8.8.8"] # required
+
+  ## Domains or subdomains to query. "."(root) is default
+  domains = ["."] # optional
+
+  ## Query record type. Default is "A"
+  ## Posible values: A, AAAA, CNAME, MX, NS, PTR, TXT, SOA, SPF, SRV.
+  record_type = "A" # optional
+
+  ## Dns server port. 53 is default
+  port = 53 # optional
+
+  ## Query timeout in seconds. Default is 2 seconds
+  timeout = 2 # optional
+`
+
+func (d *DnsQuery) SampleConfig() string {
+	return sampleConfig
+}
+
+func (d *DnsQuery) Description() string {
+	return "Query given DNS server and gives statistics"
+}
+func (d *DnsQuery) Gather(acc telegraf.Accumulator) error {
+	d.setDefaultValues()
+	for _, domain := range d.Domains {
+		for _, server := range d.Servers {
+			dnsQueryTime, err := d.getDnsQueryTime(domain, server)
+			if err != nil {
+				return err
+			}
+			tags := map[string]string{
+				"server":      server,
+				"domain":      domain,
+				"record_type": d.RecordType,
+			}
+
+			fields := map[string]interface{}{"query_time_ms": dnsQueryTime}
+			acc.AddFields("dns_query", fields, tags)
+		}
+	}
+
+	return nil
+}
+
+func (d *DnsQuery) setDefaultValues() {
+	if len(d.RecordType) == 0 {
+		d.RecordType = "NS"
+	}
+
+	if len(d.Domains) == 0 {
+		d.Domains = []string{"."}
+		d.RecordType = "NS"
+	}
+
+	if d.Port == 0 {
+		d.Port = 53
+	}
+
+	if d.Timeout == 0 {
+		d.Timeout = 2
+	}
+}
+
+func (d *DnsQuery) getDnsQueryTime(domain string, server string) (float64, error) {
+	dnsQueryTime := float64(0)
+
+	c := new(dns.Client)
+	c.ReadTimeout = time.Duration(d.Timeout) * time.Second
+
+	m := new(dns.Msg)
+	recordType, err := d.parseRecordType()
+	if err != nil {
+		return dnsQueryTime, err
+	}
+	m.SetQuestion(dns.Fqdn(domain), recordType)
+	m.RecursionDesired = true
+
+	r, rtt, err := c.Exchange(m, net.JoinHostPort(server, strconv.Itoa(d.Port)))
+	if err != nil {
+		return dnsQueryTime, err
+	}
+	if r.Rcode != dns.RcodeSuccess {
+		return dnsQueryTime, errors.New(fmt.Sprintf("Invalid answer name %s after %s query for %s\n", domain, d.RecordType, domain))
+	}
+	dnsQueryTime = float64(rtt.Nanoseconds()) / 1e6
+	return dnsQueryTime, nil
+}
+
+func (d *DnsQuery) parseRecordType() (uint16, error) {
+	var recordType uint16
+	var error error
+
+	switch d.RecordType {
+	case "A":
+		recordType = dns.TypeA
+	case "AAAA":
+		recordType = dns.TypeAAAA
+	case "ANY":
+		recordType = dns.TypeANY
+	case "CNAME":
+		recordType = dns.TypeCNAME
+	case "MX":
+		recordType = dns.TypeMX
+	case "NS":
+		recordType = dns.TypeNS
+	case "PTR":
+		recordType = dns.TypePTR
+	case "SOA":
+		recordType = dns.TypeSOA
+	case "SPF":
+		recordType = dns.TypeSPF
+	case "SRV":
+		recordType = dns.TypeSRV
+	case "TXT":
+		recordType = dns.TypeTXT
+	default:
+		error = errors.New(fmt.Sprintf("Record type %s not recognized", d.RecordType))
+	}
+
+	return recordType, error
+}
+
+func init() {
+	inputs.Add("dns_query", func() telegraf.Input {
+		return &DnsQuery{}
+	})
+}
--- a/plugins/inputs/dns_query/dns_query_test.go
+++ b/plugins/inputs/dns_query/dns_query_test.go
@@ -0,0 +1,195 @@
+package dns_query
+
+import (
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf/testutil"
+
+	"github.com/miekg/dns"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+var servers = []string{"8.8.8.8"}
+var domains = []string{"google.com"}
+
+func TestGathering(t *testing.T) {
+	var dnsConfig = DnsQuery{
+		Servers: servers,
+		Domains: domains,
+	}
+	var acc testutil.Accumulator
+
+	err := dnsConfig.Gather(&acc)
+	assert.NoError(t, err)
+	metric, ok := acc.Get("dns_query")
+	require.True(t, ok)
+	queryTime, _ := metric.Fields["query_time_ms"].(float64)
+
+	assert.NotEqual(t, 0, queryTime)
+}
+
+func TestGatheringMxRecord(t *testing.T) {
+	var dnsConfig = DnsQuery{
+		Servers: servers,
+		Domains: domains,
+	}
+	var acc testutil.Accumulator
+	dnsConfig.RecordType = "MX"
+
+	err := dnsConfig.Gather(&acc)
+	assert.NoError(t, err)
+	metric, ok := acc.Get("dns_query")
+	require.True(t, ok)
+	queryTime, _ := metric.Fields["query_time_ms"].(float64)
+
+	assert.NotEqual(t, 0, queryTime)
+}
+
+func TestGatheringRootDomain(t *testing.T) {
+	var dnsConfig = DnsQuery{
+		Servers:    servers,
+		Domains:    []string{"."},
+		RecordType: "MX",
+	}
+	var acc testutil.Accumulator
+	tags := map[string]string{
+		"server":      "8.8.8.8",
+		"domain":      ".",
+		"record_type": "MX",
+	}
+	fields := map[string]interface{}{}
+
+	err := dnsConfig.Gather(&acc)
+	assert.NoError(t, err)
+	metric, ok := acc.Get("dns_query")
+	require.True(t, ok)
+	queryTime, _ := metric.Fields["query_time_ms"].(float64)
+
+	fields["query_time_ms"] = queryTime
+	acc.AssertContainsTaggedFields(t, "dns_query", fields, tags)
+}
+
+func TestMetricContainsServerAndDomainAndRecordTypeTags(t *testing.T) {
+	var dnsConfig = DnsQuery{
+		Servers: servers,
+		Domains: domains,
+	}
+	var acc testutil.Accumulator
+	tags := map[string]string{
+		"server":      "8.8.8.8",
+		"domain":      "google.com",
+		"record_type": "NS",
+	}
+	fields := map[string]interface{}{}
+
+	err := dnsConfig.Gather(&acc)
+	assert.NoError(t, err)
+	metric, ok := acc.Get("dns_query")
+	require.True(t, ok)
+	queryTime, _ := metric.Fields["query_time_ms"].(float64)
+
+	fields["query_time_ms"] = queryTime
+	acc.AssertContainsTaggedFields(t, "dns_query", fields, tags)
+}
+
+func TestGatheringTimeout(t *testing.T) {
+	var dnsConfig = DnsQuery{
+		Servers: servers,
+		Domains: domains,
+	}
+	var acc testutil.Accumulator
+	dnsConfig.Port = 60054
+	dnsConfig.Timeout = 1
+	var err error
+
+	channel := make(chan error, 1)
+	go func() {
+		channel <- dnsConfig.Gather(&acc)
+	}()
+	select {
+	case res := <-channel:
+		err = res
+	case <-time.After(time.Second * 2):
+		err = nil
+	}
+
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "i/o timeout")
+}
+
+func TestSettingDefaultValues(t *testing.T) {
+	dnsConfig := DnsQuery{}
+
+	dnsConfig.setDefaultValues()
+
+	assert.Equal(t, []string{"."}, dnsConfig.Domains, "Default domain not equal \".\"")
+	assert.Equal(t, "NS", dnsConfig.RecordType, "Default record type not equal 'NS'")
+	assert.Equal(t, 53, dnsConfig.Port, "Default port number not equal 53")
+	assert.Equal(t, 2, dnsConfig.Timeout, "Default timeout not equal 2")
+
+	dnsConfig = DnsQuery{Domains: []string{"."}}
+
+	dnsConfig.setDefaultValues()
+
+	assert.Equal(t, "NS", dnsConfig.RecordType, "Default record type not equal 'NS'")
+}
+
+func TestRecordTypeParser(t *testing.T) {
+	var dnsConfig = DnsQuery{}
+	var recordType uint16
+
+	dnsConfig.RecordType = "A"
+	recordType, _ = dnsConfig.parseRecordType()
+	assert.Equal(t, dns.TypeA, recordType)
+
+	dnsConfig.RecordType = "AAAA"
+	recordType, _ = dnsConfig.parseRecordType()
+	assert.Equal(t, dns.TypeAAAA, recordType)
+
+	dnsConfig.RecordType = "ANY"
+	recordType, _ = dnsConfig.parseRecordType()
+	assert.Equal(t, dns.TypeANY, recordType)
+
+	dnsConfig.RecordType = "CNAME"
+	recordType, _ = dnsConfig.parseRecordType()
+	assert.Equal(t, dns.TypeCNAME, recordType)
+
+	dnsConfig.RecordType = "MX"
+	recordType, _ = dnsConfig.parseRecordType()
+	assert.Equal(t, dns.TypeMX, recordType)
+
+	dnsConfig.RecordType = "NS"
+	recordType, _ = dnsConfig.parseRecordType()
+	assert.Equal(t, dns.TypeNS, recordType)
+
+	dnsConfig.RecordType = "PTR"
+	recordType, _ = dnsConfig.parseRecordType()
+	assert.Equal(t, dns.TypePTR, recordType)
+
+	dnsConfig.RecordType = "SOA"
+	recordType, _ = dnsConfig.parseRecordType()
+	assert.Equal(t, dns.TypeSOA, recordType)
+
+	dnsConfig.RecordType = "SPF"
+	recordType, _ = dnsConfig.parseRecordType()
+	assert.Equal(t, dns.TypeSPF, recordType)
+
+	dnsConfig.RecordType = "SRV"
+	recordType, _ = dnsConfig.parseRecordType()
+	assert.Equal(t, dns.TypeSRV, recordType)
+
+	dnsConfig.RecordType = "TXT"
+	recordType, _ = dnsConfig.parseRecordType()
+	assert.Equal(t, dns.TypeTXT, recordType)
+}
+
+func TestRecordTypeParserError(t *testing.T) {
+	var dnsConfig = DnsQuery{}
+	var err error
+
+	dnsConfig.RecordType = "nil"
+	_, err = dnsConfig.parseRecordType()
+	assert.Error(t, err)
+}
--- a/plugins/inputs/docker/README.md
+++ b/plugins/inputs/docker/README.md
@@ -0,0 +1,191 @@
+# Docker Input Plugin
+
+The docker plugin uses the docker remote API to gather metrics on running
+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 excellent
+[fsouza go-dockerclient](https://github.com/fsouza/go-dockerclient) library to
+gather stats. Documentation for the library can be found
+[here](https://godoc.org/github.com/fsouza/go-dockerclient) and documentation
+for the stat structure can be found
+[here](https://godoc.org/github.com/fsouza/go-dockerclient#Stats)
+
+### Configuration:
+
+```
+# Read metrics about docker containers
+[[inputs.docker]]
+  # Docker Endpoint
+  #   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 = []
+```
+
+### Measurements & Fields:
+
+Every effort was made to preserve the names based on the JSON response from the
+docker API.
+
+Note that the docker_cpu metric may appear multiple times per collection, based
+on the availability of per-cpu stats on your system.
+
+- docker_mem
+    - total_pgmafault
+    - cache
+    - mapped_file
+    - total_inactive_file
+    - pgpgout
+    - rss
+    - total_mapped_file
+    - writeback
+    - unevictable
+    - pgpgin
+    - total_unevictable
+    - pgmajfault
+    - total_rss
+    - total_rss_huge
+    - total_writeback
+    - total_inactive_anon
+    - rss_huge
+    - hierarchical_memory_limit
+    - total_pgfault
+    - total_active_file
+    - active_anon
+    - total_active_anon
+    - total_pgpgout
+    - total_cache
+    - inactive_anon
+    - active_file
+    - pgfault
+    - inactive_file
+    - total_pgpgin
+    - max_usage
+    - usage
+    - failcnt
+    - limit
+- docker_cpu
+    - throttling_periods
+    - throttling_throttled_periods
+    - throttling_throttled_time
+    - usage_in_kernelmode
+    - usage_in_usermode
+    - usage_system
+    - usage_total
+    - usage_percent
+- docker_net
+    - rx_dropped
+    - rx_bytes
+    - rx_errors
+    - tx_packets
+    - tx_dropped
+    - rx_packets
+    - tx_errors
+    - tx_bytes
+- docker_blkio
+    - io_service_bytes_recursive_async
+    - io_service_bytes_recursive_read
+    - io_service_bytes_recursive_sync
+    - io_service_bytes_recursive_total
+    - io_service_bytes_recursive_write
+    - io_serviced_recursive_async
+    - io_serviced_recursive_read
+    - io_serviced_recursive_sync
+    - io_serviced_recursive_total
+    - io_serviced_recursive_write
+- docker_
+    - n_used_file_descriptors
+    - n_cpus
+    - n_containers
+    - n_images
+    - n_goroutines
+    - n_listener_events
+    - memory_total
+    - pool_blocksize
+- docker_data
+    - available
+    - total
+    - used
+- docker_metadata
+    - available
+    - total
+    - used
+
+
+### Tags:
+
+- docker (memory_total)
+    - unit=bytes
+- docker (pool_blocksize)
+    - unit=bytes
+- docker_data
+    - unit=bytes
+- docker_metadata
+    - unit=bytes
+
+- docker_cpu specific:
+    - cont_id (container ID)
+    - cont_image (container image)
+    - cont_name (container name)
+    - cpu
+- docker_net specific:
+    - cont_id (container ID)
+    - cont_image (container image)
+    - cont_name (container name)
+    - network
+- docker_blkio specific:
+    - cont_id (container ID)
+    - cont_image (container image)
+    - cont_name (container name)
+    - device
+
+### Example Output:
+
+```
+% ./telegraf -config ~/ws/telegraf.conf -input-filter docker -test
+* Plugin: docker, Collection 1
+> docker n_cpus=8i 1456926671065383978
+> docker n_used_file_descriptors=15i 1456926671065383978
+> docker n_containers=7i 1456926671065383978
+> docker n_images=152i 1456926671065383978
+> docker n_goroutines=36i 1456926671065383978
+> docker n_listener_events=0i 1456926671065383978
+> docker,unit=bytes memory_total=18935443456i 1456926671065383978
+> docker,unit=bytes pool_blocksize=65540i 1456926671065383978
+> docker_data,unit=bytes available=24340000000i,total=107400000000i,used=14820000000i 1456926671065383978
+> docker_metadata,unit=bytes available=2126999999i,total=2146999999i,used=20420000i 145692667106538
+> docker_mem,cont_id=5705ba8ed8fb47527410653d60a8bb2f3af5e62372297c419022a3cc6d45d848,\
+cont_image=spotify/kafka,cont_name=kafka \
+active_anon=52568064i,active_file=6926336i,cache=12038144i,fail_count=0i,\
+hierarchical_memory_limit=9223372036854771712i,inactive_anon=52707328i,\
+inactive_file=5111808i,limit=1044578304i,mapped_file=10301440i,\
+max_usage=140656640i,pgfault=63762i,pgmajfault=2837i,pgpgin=73355i,\
+pgpgout=45736i,rss=105275392i,rss_huge=4194304i,total_active_anon=52568064i,\
+total_active_file=6926336i,total_cache=12038144i,total_inactive_anon=52707328i,\
+total_inactive_file=5111808i,total_mapped_file=10301440i,total_pgfault=63762i,\
+total_pgmafault=0i,total_pgpgin=73355i,total_pgpgout=45736i,\
+total_rss=105275392i,total_rss_huge=4194304i,total_unevictable=0i,\
+total_writeback=0i,unevictable=0i,usage=117440512i,writeback=0i 1453409536840126713
+> docker_cpu,cont_id=5705ba8ed8fb47527410653d60a8bb2f3af5e62372297c419022a3cc6d45d848,\
+cont_image=spotify/kafka,cont_name=kafka,cpu=cpu-total \
+throttling_periods=0i,throttling_throttled_periods=0i,\
+throttling_throttled_time=0i,usage_in_kernelmode=440000000i,\
+usage_in_usermode=2290000000i,usage_system=84795360000000i,\
+usage_total=6628208865i 1453409536840126713
+> docker_cpu,cont_id=5705ba8ed8fb47527410653d60a8bb2f3af5e62372297c419022a3cc6d45d848,\
+cont_image=spotify/kafka,cont_name=kafka,cpu=cpu0 \
+usage_total=6628208865i 1453409536840126713
+> docker_net,cont_id=5705ba8ed8fb47527410653d60a8bb2f3af5e62372297c419022a3cc6d45d848,\
+cont_image=spotify/kafka,cont_name=kafka,network=eth0 \
+rx_bytes=7468i,rx_dropped=0i,rx_errors=0i,rx_packets=94i,tx_bytes=946i,\
+tx_dropped=0i,tx_errors=0i,tx_packets=13i 1453409536840126713
+> docker_blkio,cont_id=5705ba8ed8fb47527410653d60a8bb2f3af5e62372297c419022a3cc6d45d848,\
+cont_image=spotify/kafka,cont_name=kafka,device=8:0 \
+io_service_bytes_recursive_async=80216064i,io_service_bytes_recursive_read=79925248i,\
+io_service_bytes_recursive_sync=77824i,io_service_bytes_recursive_total=80293888i,\
+io_service_bytes_recursive_write=368640i,io_serviced_recursive_async=6562i,\
+io_serviced_recursive_read=6492i,io_serviced_recursive_sync=37i,\
+io_serviced_recursive_total=6599i,io_serviced_recursive_write=107i 1453409536840126713
+```
--- a/plugins/inputs/docker/docker.go
+++ b/plugins/inputs/docker/docker.go
@@ -0,0 +1,463 @@
+package system
+
+import (
+	"encoding/json"
+	"fmt"
+	"log"
+	"regexp"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
+
+	"github.com/fsouza/go-dockerclient"
+)
+
+type Docker struct {
+	Endpoint       string
+	ContainerNames []string
+
+	client DockerClient
+}
+
+type DockerClient interface {
+	// Docker Client wrapper
+	// Useful for test
+	Info() (*docker.Env, error)
+	ListContainers(opts docker.ListContainersOptions) ([]docker.APIContainers, error)
+	Stats(opts docker.StatsOptions) error
+}
+
+const (
+	KB = 1000
+	MB = 1000 * KB
+	GB = 1000 * MB
+	TB = 1000 * GB
+	PB = 1000 * TB
+)
+
+var (
+	sizeRegex = regexp.MustCompile(`^(\d+(\.\d+)*) ?([kKmMgGtTpP])?[bB]?$`)
+)
+
+var sampleConfig = `
+  ## Docker Endpoint
+  ##   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 = []
+`
+
+func (d *Docker) Description() string {
+	return "Read metrics about docker containers"
+}
+
+func (d *Docker) SampleConfig() string { return sampleConfig }
+
+func (d *Docker) Gather(acc telegraf.Accumulator) error {
+	if d.client == nil {
+		var c *docker.Client
+		var err error
+		if d.Endpoint == "ENV" {
+			c, err = docker.NewClientFromEnv()
+			if err != nil {
+				return err
+			}
+		} else if d.Endpoint == "" {
+			c, err = docker.NewClient("unix:///var/run/docker.sock")
+			if err != nil {
+				return err
+			}
+		} else {
+			c, err = docker.NewClient(d.Endpoint)
+			if err != nil {
+				return err
+			}
+		}
+		d.client = c
+	}
+
+	// Get daemon info
+	err := d.gatherInfo(acc)
+	if err != nil {
+		fmt.Println(err.Error())
+	}
+
+	// List containers
+	opts := docker.ListContainersOptions{}
+	containers, err := d.client.ListContainers(opts)
+	if err != nil {
+		return err
+	}
+
+	// Get container data
+	var wg sync.WaitGroup
+	wg.Add(len(containers))
+	for _, container := range containers {
+
+		go func(c docker.APIContainers) {
+			defer wg.Done()
+			err := d.gatherContainer(c, acc)
+			if err != nil {
+				fmt.Println(err.Error())
+			}
+		}(container)
+	}
+	wg.Wait()
+
+	return nil
+}
+
+func (d *Docker) gatherInfo(acc telegraf.Accumulator) error {
+	// Init vars
+	var driverStatus [][]string
+	dataFields := make(map[string]interface{})
+	metadataFields := make(map[string]interface{})
+	now := time.Now()
+	// Get info from docker daemon
+	info, err := d.client.Info()
+	if err != nil {
+		return err
+	}
+
+	fields := map[string]interface{}{
+		"n_cpus":                  info.GetInt64("NCPU"),
+		"n_used_file_descriptors": info.GetInt64("NFd"),
+		"n_containers":            info.GetInt64("Containers"),
+		"n_images":                info.GetInt64("Images"),
+		"n_goroutines":            info.GetInt64("NGoroutines"),
+		"n_listener_events":       info.GetInt64("NEventsListener"),
+	}
+	// Add metrics
+	acc.AddFields("docker",
+		fields,
+		nil,
+		now)
+	acc.AddFields("docker",
+		map[string]interface{}{"memory_total": info.GetInt64("MemTotal")},
+		map[string]string{"unit": "bytes"},
+		now)
+	// Get storage metrics
+	driverStatusRaw := []byte(info.Get("DriverStatus"))
+	json.Unmarshal(driverStatusRaw, &driverStatus)
+	for _, rawData := range driverStatus {
+		// Try to convert string to int (bytes)
+		value, err := parseSize(rawData[1])
+		if err != nil {
+			continue
+		}
+		name := strings.ToLower(strings.Replace(rawData[0], " ", "_", -1))
+		if name == "pool_blocksize" {
+			// pool blocksize
+			acc.AddFields("docker",
+				map[string]interface{}{"pool_blocksize": value},
+				map[string]string{"unit": "bytes"},
+				now)
+		} else if strings.HasPrefix(name, "data_space_") {
+			// data space
+			field_name := strings.TrimPrefix(name, "data_space_")
+			dataFields[field_name] = value
+		} else if strings.HasPrefix(name, "metadata_space_") {
+			// metadata space
+			field_name := strings.TrimPrefix(name, "metadata_space_")
+			metadataFields[field_name] = value
+		}
+	}
+	if len(dataFields) > 0 {
+		acc.AddFields("docker_data",
+			dataFields,
+			map[string]string{"unit": "bytes"},
+			now)
+	}
+	if len(metadataFields) > 0 {
+		acc.AddFields("docker_metadata",
+			metadataFields,
+			map[string]string{"unit": "bytes"},
+			now)
+	}
+	return nil
+}
+
+func (d *Docker) gatherContainer(
+	container docker.APIContainers,
+	acc telegraf.Accumulator,
+) error {
+	// Parse container name
+	cname := "unknown"
+	if len(container.Names) > 0 {
+		// Not sure what to do with other names, just take the first.
+		cname = strings.TrimPrefix(container.Names[0], "/")
+	}
+
+	tags := map[string]string{
+		"cont_id":    container.ID,
+		"cont_name":  cname,
+		"cont_image": container.Image,
+	}
+	if len(d.ContainerNames) > 0 {
+		if !sliceContains(cname, d.ContainerNames) {
+			return nil
+		}
+	}
+
+	statChan := make(chan *docker.Stats)
+	done := make(chan bool)
+	statOpts := docker.StatsOptions{
+		Stream:  false,
+		ID:      container.ID,
+		Stats:   statChan,
+		Done:    done,
+		Timeout: time.Duration(time.Second * 5),
+	}
+
+	go func() {
+		err := d.client.Stats(statOpts)
+		if err != nil {
+			log.Printf("Error getting docker stats: %s\n", err.Error())
+		}
+	}()
+
+	stat := <-statChan
+	close(done)
+
+	if stat == nil {
+		return nil
+	}
+
+	// Add labels to tags
+	for k, v := range container.Labels {
+		tags[k] = v
+	}
+
+	gatherContainerStats(stat, acc, tags)
+
+	return nil
+}
+
+func gatherContainerStats(
+	stat *docker.Stats,
+	acc telegraf.Accumulator,
+	tags map[string]string,
+) {
+	now := stat.Read
+
+	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.TotalPgmafault,
+		"cache":                     stat.MemoryStats.Stats.Cache,
+		"mapped_file":               stat.MemoryStats.Stats.MappedFile,
+		"total_inactive_file":       stat.MemoryStats.Stats.TotalInactiveFile,
+		"pgpgout":                   stat.MemoryStats.Stats.Pgpgout,
+		"rss":                       stat.MemoryStats.Stats.Rss,
+		"total_mapped_file":         stat.MemoryStats.Stats.TotalMappedFile,
+		"writeback":                 stat.MemoryStats.Stats.Writeback,
+		"unevictable":               stat.MemoryStats.Stats.Unevictable,
+		"pgpgin":                    stat.MemoryStats.Stats.Pgpgin,
+		"total_unevictable":         stat.MemoryStats.Stats.TotalUnevictable,
+		"pgmajfault":                stat.MemoryStats.Stats.Pgmajfault,
+		"total_rss":                 stat.MemoryStats.Stats.TotalRss,
+		"total_rss_huge":            stat.MemoryStats.Stats.TotalRssHuge,
+		"total_writeback":           stat.MemoryStats.Stats.TotalWriteback,
+		"total_inactive_anon":       stat.MemoryStats.Stats.TotalInactiveAnon,
+		"rss_huge":                  stat.MemoryStats.Stats.RssHuge,
+		"hierarchical_memory_limit": stat.MemoryStats.Stats.HierarchicalMemoryLimit,
+		"total_pgfault":             stat.MemoryStats.Stats.TotalPgfault,
+		"total_active_file":         stat.MemoryStats.Stats.TotalActiveFile,
+		"active_anon":               stat.MemoryStats.Stats.ActiveAnon,
+		"total_active_anon":         stat.MemoryStats.Stats.TotalActiveAnon,
+		"total_pgpgout":             stat.MemoryStats.Stats.TotalPgpgout,
+		"total_cache":               stat.MemoryStats.Stats.TotalCache,
+		"inactive_anon":             stat.MemoryStats.Stats.InactiveAnon,
+		"active_file":               stat.MemoryStats.Stats.ActiveFile,
+		"pgfault":                   stat.MemoryStats.Stats.Pgfault,
+		"inactive_file":             stat.MemoryStats.Stats.InactiveFile,
+		"total_pgpgin":              stat.MemoryStats.Stats.TotalPgpgin,
+		"usage_percent":             calculateMemPercent(stat),
+	}
+	acc.AddFields("docker_mem", memfields, tags, now)
+
+	cpufields := map[string]interface{}{
+		"usage_total":                  stat.CPUStats.CPUUsage.TotalUsage,
+		"usage_in_usermode":            stat.CPUStats.CPUUsage.UsageInUsermode,
+		"usage_in_kernelmode":          stat.CPUStats.CPUUsage.UsageInKernelmode,
+		"usage_system":                 stat.CPUStats.SystemCPUUsage,
+		"throttling_periods":           stat.CPUStats.ThrottlingData.Periods,
+		"throttling_throttled_periods": stat.CPUStats.ThrottlingData.ThrottledPeriods,
+		"throttling_throttled_time":    stat.CPUStats.ThrottlingData.ThrottledTime,
+		"usage_percent":                calculateCPUPercent(stat),
+	}
+	cputags := copyTags(tags)
+	cputags["cpu"] = "cpu-total"
+	acc.AddFields("docker_cpu", cpufields, cputags, now)
+
+	for i, percpu := range stat.CPUStats.CPUUsage.PercpuUsage {
+		percputags := copyTags(tags)
+		percputags["cpu"] = fmt.Sprintf("cpu%d", i)
+		acc.AddFields("docker_cpu", map[string]interface{}{"usage_total": percpu}, percputags, now)
+	}
+
+	for network, netstats := range stat.Networks {
+		netfields := map[string]interface{}{
+			"rx_dropped": netstats.RxDropped,
+			"rx_bytes":   netstats.RxBytes,
+			"rx_errors":  netstats.RxErrors,
+			"tx_packets": netstats.TxPackets,
+			"tx_dropped": netstats.TxDropped,
+			"rx_packets": netstats.RxPackets,
+			"tx_errors":  netstats.TxErrors,
+			"tx_bytes":   netstats.TxBytes,
+		}
+		// Create a new network tag dictionary for the "network" tag
+		nettags := copyTags(tags)
+		nettags["network"] = network
+		acc.AddFields("docker_net", netfields, nettags, now)
+	}
+
+	gatherBlockIOMetrics(stat, acc, tags, now)
+}
+
+func calculateMemPercent(stat *docker.Stats) 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 *docker.Stats) 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.SystemCPUUsage) - float64(stat.PreCPUStats.SystemCPUUsage)
+
+	if systemDelta > 0.0 && cpuDelta > 0.0 {
+		cpuPercent = (cpuDelta / systemDelta) * float64(len(stat.CPUStats.CPUUsage.PercpuUsage)) * 100.0
+	}
+	return cpuPercent
+}
+
+func gatherBlockIOMetrics(
+	stat *docker.Stats,
+	acc telegraf.Accumulator,
+	tags map[string]string,
+	now time.Time,
+) {
+	blkioStats := stat.BlkioStats
+	// Make a map of devices to their block io stats
+	deviceStatMap := make(map[string]map[string]interface{})
+
+	for _, metric := range blkioStats.IOServiceBytesRecursive {
+		device := fmt.Sprintf("%d:%d", metric.Major, metric.Minor)
+		_, ok := deviceStatMap[device]
+		if !ok {
+			deviceStatMap[device] = make(map[string]interface{})
+		}
+
+		field := fmt.Sprintf("io_service_bytes_recursive_%s", strings.ToLower(metric.Op))
+		deviceStatMap[device][field] = metric.Value
+	}
+
+	for _, metric := range blkioStats.IOServicedRecursive {
+		device := fmt.Sprintf("%d:%d", metric.Major, metric.Minor)
+		_, ok := deviceStatMap[device]
+		if !ok {
+			deviceStatMap[device] = make(map[string]interface{})
+		}
+
+		field := fmt.Sprintf("io_serviced_recursive_%s", strings.ToLower(metric.Op))
+		deviceStatMap[device][field] = metric.Value
+	}
+
+	for _, metric := range blkioStats.IOQueueRecursive {
+		device := fmt.Sprintf("%d:%d", metric.Major, metric.Minor)
+		field := fmt.Sprintf("io_queue_recursive_%s", strings.ToLower(metric.Op))
+		deviceStatMap[device][field] = metric.Value
+	}
+
+	for _, metric := range blkioStats.IOServiceTimeRecursive {
+		device := fmt.Sprintf("%d:%d", metric.Major, metric.Minor)
+		field := fmt.Sprintf("io_service_time_recursive_%s", strings.ToLower(metric.Op))
+		deviceStatMap[device][field] = metric.Value
+	}
+
+	for _, metric := range blkioStats.IOWaitTimeRecursive {
+		device := fmt.Sprintf("%d:%d", metric.Major, metric.Minor)
+		field := fmt.Sprintf("io_wait_time_%s", strings.ToLower(metric.Op))
+		deviceStatMap[device][field] = metric.Value
+	}
+
+	for _, metric := range blkioStats.IOMergedRecursive {
+		device := fmt.Sprintf("%d:%d", metric.Major, metric.Minor)
+		field := fmt.Sprintf("io_merged_recursive_%s", strings.ToLower(metric.Op))
+		deviceStatMap[device][field] = metric.Value
+	}
+
+	for _, metric := range blkioStats.IOTimeRecursive {
+		device := fmt.Sprintf("%d:%d", metric.Major, metric.Minor)
+		field := fmt.Sprintf("io_time_recursive_%s", strings.ToLower(metric.Op))
+		deviceStatMap[device][field] = metric.Value
+	}
+
+	for _, metric := range blkioStats.SectorsRecursive {
+		device := fmt.Sprintf("%d:%d", metric.Major, metric.Minor)
+		field := fmt.Sprintf("sectors_recursive_%s", strings.ToLower(metric.Op))
+		deviceStatMap[device][field] = metric.Value
+	}
+
+	for device, fields := range deviceStatMap {
+		iotags := copyTags(tags)
+		iotags["device"] = device
+		acc.AddFields("docker_blkio", fields, iotags, now)
+	}
+}
+
+func copyTags(in map[string]string) map[string]string {
+	out := make(map[string]string)
+	for k, v := range in {
+		out[k] = v
+	}
+	return out
+}
+
+func sliceContains(in string, sl []string) bool {
+	for _, str := range sl {
+		if str == in {
+			return true
+		}
+	}
+	return false
+}
+
+// Parses the human-readable size string into the amount it represents.
+func parseSize(sizeStr string) (int64, error) {
+	matches := sizeRegex.FindStringSubmatch(sizeStr)
+	if len(matches) != 4 {
+		return -1, fmt.Errorf("invalid size: '%s'", sizeStr)
+	}
+
+	size, err := strconv.ParseFloat(matches[1], 64)
+	if err != nil {
+		return -1, err
+	}
+
+	uMap := map[string]int64{"k": KB, "m": MB, "g": GB, "t": TB, "p": PB}
+	unitPrefix := strings.ToLower(matches[3])
+	if mul, ok := uMap[unitPrefix]; ok {
+		size *= float64(mul)
+	}
+
+	return int64(size), nil
+}
+
+func init() {
+	inputs.Add("docker", func() telegraf.Input {
+		return &Docker{}
+	})
+}
--- a/plugins/inputs/docker/docker_test.go
+++ b/plugins/inputs/docker/docker_test.go
@@ -0,0 +1,381 @@
+package system
+
+import (
+	"encoding/json"
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf/testutil"
+
+	"github.com/fsouza/go-dockerclient"
+	"github.com/stretchr/testify/require"
+)
+
+func TestDockerGatherContainerStats(t *testing.T) {
+	var acc testutil.Accumulator
+	stats := testStats()
+
+	tags := map[string]string{
+		"cont_id":    "foobarbaz",
+		"cont_name":  "redis",
+		"cont_image": "redis/image",
+	}
+	gatherContainerStats(stats, &acc, tags)
+
+	// test docker_net measurement
+	netfields := map[string]interface{}{
+		"rx_dropped": uint64(1),
+		"rx_bytes":   uint64(2),
+		"rx_errors":  uint64(3),
+		"tx_packets": uint64(4),
+		"tx_dropped": uint64(1),
+		"rx_packets": uint64(2),
+		"tx_errors":  uint64(3),
+		"tx_bytes":   uint64(4),
+	}
+	nettags := copyTags(tags)
+	nettags["network"] = "eth0"
+	acc.AssertContainsTaggedFields(t, "docker_net", netfields, nettags)
+
+	// test docker_blkio measurement
+	blkiotags := copyTags(tags)
+	blkiotags["device"] = "6:0"
+	blkiofields := map[string]interface{}{
+		"io_service_bytes_recursive_read": uint64(100),
+		"io_serviced_recursive_write":     uint64(101),
+	}
+	acc.AssertContainsTaggedFields(t, "docker_blkio", blkiofields, blkiotags)
+
+	// test docker_mem measurement
+	memfields := map[string]interface{}{
+		"max_usage":                 uint64(1001),
+		"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),
+	}
+
+	acc.AssertContainsTaggedFields(t, "docker_mem", memfields, tags)
+
+	// test docker_cpu measurement
+	cputags := copyTags(tags)
+	cputags["cpu"] = "cpu-total"
+	cpufields := map[string]interface{}{
+		"usage_total":                  uint64(500),
+		"usage_in_usermode":            uint64(100),
+		"usage_in_kernelmode":          uint64(200),
+		"usage_system":                 uint64(100),
+		"throttling_periods":           uint64(1),
+		"throttling_throttled_periods": uint64(0),
+		"throttling_throttled_time":    uint64(0),
+		"usage_percent":                float64(400.0),
+	}
+	acc.AssertContainsTaggedFields(t, "docker_cpu", cpufields, cputags)
+
+	cputags["cpu"] = "cpu0"
+	cpu0fields := map[string]interface{}{
+		"usage_total": uint64(1),
+	}
+	acc.AssertContainsTaggedFields(t, "docker_cpu", cpu0fields, cputags)
+
+	cputags["cpu"] = "cpu1"
+	cpu1fields := map[string]interface{}{
+		"usage_total": uint64(1002),
+	}
+	acc.AssertContainsTaggedFields(t, "docker_cpu", cpu1fields, cputags)
+}
+
+func testStats() *docker.Stats {
+	stats := &docker.Stats{
+		Read:     time.Now(),
+		Networks: make(map[string]docker.NetworkStats),
+	}
+
+	stats.CPUStats.CPUUsage.PercpuUsage = []uint64{1, 1002}
+	stats.CPUStats.CPUUsage.UsageInUsermode = 100
+	stats.CPUStats.CPUUsage.TotalUsage = 500
+	stats.CPUStats.CPUUsage.UsageInKernelmode = 200
+	stats.CPUStats.SystemCPUUsage = 100
+	stats.CPUStats.ThrottlingData.Periods = 1
+
+	stats.PreCPUStats.CPUUsage.TotalUsage = 400
+	stats.PreCPUStats.SystemCPUUsage = 50
+
+	stats.MemoryStats.Stats.TotalPgmafault = 0
+	stats.MemoryStats.Stats.Cache = 0
+	stats.MemoryStats.Stats.MappedFile = 0
+	stats.MemoryStats.Stats.TotalInactiveFile = 0
+	stats.MemoryStats.Stats.Pgpgout = 0
+	stats.MemoryStats.Stats.Rss = 0
+	stats.MemoryStats.Stats.TotalMappedFile = 0
+	stats.MemoryStats.Stats.Writeback = 0
+	stats.MemoryStats.Stats.Unevictable = 0
+	stats.MemoryStats.Stats.Pgpgin = 0
+	stats.MemoryStats.Stats.TotalUnevictable = 0
+	stats.MemoryStats.Stats.Pgmajfault = 0
+	stats.MemoryStats.Stats.TotalRss = 44
+	stats.MemoryStats.Stats.TotalRssHuge = 444
+	stats.MemoryStats.Stats.TotalWriteback = 55
+	stats.MemoryStats.Stats.TotalInactiveAnon = 0
+	stats.MemoryStats.Stats.RssHuge = 0
+	stats.MemoryStats.Stats.HierarchicalMemoryLimit = 0
+	stats.MemoryStats.Stats.TotalPgfault = 0
+	stats.MemoryStats.Stats.TotalActiveFile = 0
+	stats.MemoryStats.Stats.ActiveAnon = 0
+	stats.MemoryStats.Stats.TotalActiveAnon = 0
+	stats.MemoryStats.Stats.TotalPgpgout = 0
+	stats.MemoryStats.Stats.TotalCache = 0
+	stats.MemoryStats.Stats.InactiveAnon = 0
+	stats.MemoryStats.Stats.ActiveFile = 1
+	stats.MemoryStats.Stats.Pgfault = 2
+	stats.MemoryStats.Stats.InactiveFile = 3
+	stats.MemoryStats.Stats.TotalPgpgin = 4
+
+	stats.MemoryStats.MaxUsage = 1001
+	stats.MemoryStats.Usage = 1111
+	stats.MemoryStats.Failcnt = 1
+	stats.MemoryStats.Limit = 2000
+
+	stats.Networks["eth0"] = docker.NetworkStats{
+		RxDropped: 1,
+		RxBytes:   2,
+		RxErrors:  3,
+		TxPackets: 4,
+		TxDropped: 1,
+		RxPackets: 2,
+		TxErrors:  3,
+		TxBytes:   4,
+	}
+
+	sbr := docker.BlkioStatsEntry{
+		Major: 6,
+		Minor: 0,
+		Op:    "read",
+		Value: 100,
+	}
+	sr := docker.BlkioStatsEntry{
+		Major: 6,
+		Minor: 0,
+		Op:    "write",
+		Value: 101,
+	}
+
+	stats.BlkioStats.IOServiceBytesRecursive = append(
+		stats.BlkioStats.IOServiceBytesRecursive, sbr)
+	stats.BlkioStats.IOServicedRecursive = append(
+		stats.BlkioStats.IOServicedRecursive, sr)
+
+	return stats
+}
+
+type FakeDockerClient struct {
+}
+
+func (d FakeDockerClient) Info() (*docker.Env, error) {
+	env := docker.Env{"Containers=108", "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", "ExecutionDriver=native-0.2", "InitSha1=23a51f3c916d2b5a3bbb31caf301fd2d14edd518", "ExperimentalBuild=false", "CpuCfsPeriod=true", "RegistryConfig={\"IndexConfigs\":{\"docker.io\":{\"Mirrors\":null,\"Name\":\"docker.io\",\"Official\":true,\"Secure\":true}},\"InsecureRegistryCIDRs\":[\"127.0.0.0/8\"],\"Mirrors\":null}", "OperatingSystem=Linux Mint LMDE (containerized)", "BridgeNfIptables=true", "HttpsProxy=", "Labels=null", "MemoryLimit=false", "DriverStatus=[[\"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", "InitPath=/usr/lib/docker.io/dockerinit", "NCPU=4", "DockerRootDir=/var/lib/docker", "NoProxy=", "BridgeNfIp6tables=true"}
+	return &env, nil
+}
+
+func (d FakeDockerClient) ListContainers(opts docker.ListContainersOptions) ([]docker.APIContainers, error) {
+	container1 := docker.APIContainers{
+		ID:      "e2173b9478a6ae55e237d4d74f8bbb753f0817192b5081334dc78476296b7dfb",
+		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: []docker.APIPort{
+			docker.APIPort{
+				PrivatePort: 7001,
+				PublicPort:  0,
+				Type:        "tcp",
+			},
+			docker.APIPort{
+				PrivatePort: 4001,
+				PublicPort:  0,
+				Type:        "tcp",
+			},
+			docker.APIPort{
+				PrivatePort: 2380,
+				PublicPort:  0,
+				Type:        "tcp",
+			},
+			docker.APIPort{
+				PrivatePort: 2379,
+				PublicPort:  2379,
+				Type:        "tcp",
+				IP:          "0.0.0.0",
+			},
+		},
+		SizeRw:     0,
+		SizeRootFs: 0,
+		Names:      []string{"/etcd"},
+	}
+	container2 := docker.APIContainers{
+		ID:      "b7dfbb9478a6ae55e237d4d74f8bbb753f0817192b5081334dc78476296e2173",
+		Image:   "quay.io/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: []docker.APIPort{
+			docker.APIPort{
+				PrivatePort: 7002,
+				PublicPort:  0,
+				Type:        "tcp",
+			},
+			docker.APIPort{
+				PrivatePort: 4002,
+				PublicPort:  0,
+				Type:        "tcp",
+			},
+			docker.APIPort{
+				PrivatePort: 2381,
+				PublicPort:  0,
+				Type:        "tcp",
+			},
+			docker.APIPort{
+				PrivatePort: 2382,
+				PublicPort:  2382,
+				Type:        "tcp",
+				IP:          "0.0.0.0",
+			},
+		},
+		SizeRw:     0,
+		SizeRootFs: 0,
+		Names:      []string{"/etcd2"},
+	}
+
+	containers := []docker.APIContainers{container1, container2}
+	return containers, nil
+
+	//#{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
+}
+
+func (d FakeDockerClient) Stats(opts docker.StatsOptions) error {
+	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":{}}}`
+	var stat docker.Stats
+	json.Unmarshal([]byte(jsonStat), &stat)
+	opts.Stats <- &stat
+	return nil
+}
+
+func TestDockerGatherInfo(t *testing.T) {
+	var acc testutil.Accumulator
+	client := FakeDockerClient{}
+	d := Docker{client: client}
+
+	err := d.Gather(&acc)
+
+	require.NoError(t, err)
+
+	acc.AssertContainsTaggedFields(t,
+		"docker",
+		map[string]interface{}{
+			"n_listener_events":       int64(0),
+			"n_cpus":                  int64(4),
+			"n_used_file_descriptors": int64(19),
+			"n_containers":            int64(108),
+			"n_images":                int64(199),
+			"n_goroutines":            int64(39),
+		},
+		map[string]string{},
+	)
+
+	acc.AssertContainsTaggedFields(t,
+		"docker_data",
+		map[string]interface{}{
+			"used":      int64(17300000000),
+			"total":     int64(107400000000),
+			"available": int64(36530000000),
+		},
+		map[string]string{
+			"unit": "bytes",
+		},
+	)
+	acc.AssertContainsTaggedFields(t,
+		"docker_cpu",
+		map[string]interface{}{
+			"usage_total": uint64(1231652),
+		},
+		map[string]string{
+			"cont_id":    "b7dfbb9478a6ae55e237d4d74f8bbb753f0817192b5081334dc78476296e2173",
+			"cont_name":  "etcd2",
+			"cont_image": "quay.io/coreos/etcd:v2.2.2",
+			"cpu":        "cpu3",
+		},
+	)
+	acc.AssertContainsTaggedFields(t,
+		"docker_mem",
+		map[string]interface{}{
+			"total_pgpgout":             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),
+		},
+		map[string]string{
+			"cont_id":    "b7dfbb9478a6ae55e237d4d74f8bbb753f0817192b5081334dc78476296e2173",
+			"cont_name":  "etcd2",
+			"cont_image": "quay.io/coreos/etcd:v2.2.2",
+		},
+	)
+
+	//fmt.Print(info)
+}
--- a/plugins/inputs/dovecot/README.md
+++ b/plugins/inputs/dovecot/README.md
@@ -0,0 +1,67 @@
+# Dovecot Input Plugin
+
+The dovecot plugin uses the dovecot Stats protocol to gather metrics on configured
+domains. You can read Dovecot's documentation
+[here](http://wiki2.dovecot.org/Statistics)
+
+
+### Configuration:
+
+```
+# Read metrics about dovecot servers
+[[inputs.dovecot]]
+  # Dovecot servers
+  #  specify dovecot servers via an address:port list
+  #  e.g.
+  #    localhost:24242
+  #
+  # If no servers are specified, then localhost is used as the host.
+  servers = ["localhost:24242"]
+  # Only collect metrics for these domains, collect all if empty
+  domains = []
+```
+
+
+### Tags:
+	server: hostname
+	domain: domain name
+
+
+### Fields:
+
+	reset_timestamp        time.Time
+	last_update            time.Time
+	num_logins             int64
+	num_cmds               int64
+	num_connected_sessions int64
+	user_cpu               float32
+	sys_cpu                float32
+	clock_time             float64
+	min_faults             int64
+	maj_faults             int64
+	vol_cs                 int64
+	invol_cs               int64
+	disk_input             int64
+	disk_output            int64
+	read_count             int64
+	read_bytes             int64
+	write_count            int64
+	write_bytes            int64
+	mail_lookup_path       int64
+	mail_lookup_attr       int64
+	mail_read_count        int64
+	mail_read_bytes        int64
+	mail_cache_hits        int64
+
+
+### Example Output:
+
+```
+telegraf -config telegraf.cfg -input-filter dovecot -test
+* Plugin: dovecot, Collection 1
+> dovecot,domain=xxxxx.it,server=dovecot--1.mail.sys clock_time=12105746411632.5,disk_input=115285225472i,disk_output=4885067755520i,invol_cs=169701886i,last_update="2016-02-09 08:49:47.000014113 +0100 CET",mail_cache_hits=441828i,mail_lookup_attr=0i,mail_lookup_path=25323i,mail_read_bytes=241188145i,mail_read_count=11719i,maj_faults=3168i,min_faults=321438988i,num_cmds=51635i,num_connected_sessions=2i,num_logins=17149i,read_bytes=7939026951110i,read_count=3716991752i,reset_timestamp="2016-01-28 09:34:36 +0100 CET",sys_cpu=222595.288,user_cpu=267468.08,vol_cs=3288715920i,write_bytes=4483648967059i,write_count=1640646952i 1455004219924838345
+> dovecot,domain=yyyyy.com,server=dovecot-1.mail.sys clock_time=6650794455331782,disk_input=61957695569920i,disk_output=2638244004487168i,invol_cs=2004805041i,last_update="2016-02-09 08:49:49.000251296 +0100 CET",mail_cache_hits=2499112513i,mail_lookup_attr=506730i,mail_lookup_path=39128227i,mail_read_bytes=1076496874501i,mail_read_count=32615262i,maj_faults=1643304i,min_faults=4216116325i,num_cmds=85785559i,num_connected_sessions=1177i,num_logins=11658255i,read_bytes=4289150974554145i,read_count=1112000703i,reset_timestamp="2016-01-28 09:31:26 +0100 CET",sys_cpu=121125923.032,user_cpu=145561336.428,vol_cs=205451885i,write_bytes=2420130526835796i,write_count=2991367252i 1455004219925152529
+> dovecot,domain=xxxxx.it,server=dovecot-2.mail.sys clock_time=10710826586999.143,disk_input=79792410624i,disk_output=4496066158592i,invol_cs=150426876i,last_update="2016-02-09 08:48:19.000209134 +0100 CET",mail_cache_hits=5480869i,mail_lookup_attr=0i,mail_lookup_path=122563i,mail_read_bytes=340746273i,mail_read_count=44275i,maj_faults=1722i,min_faults=288071875i,num_cmds=50098i,num_connected_sessions=0i,num_logins=16389i,read_bytes=7259551999517i,read_count=3396625369i,reset_timestamp="2016-01-28 09:31:29 +0100 CET",sys_cpu=200762.792,user_cpu=242477.664,vol_cs=2996657358i,write_bytes=4133381575263i,write_count=1497242759i 1455004219924888283
+> dovecot,domain=yyyyy.com,server=dovecot-2.mail.sys clock_time=6522131245483702,disk_input=48259150004224i,disk_output=2754333359087616i,invol_cs=2294595260i,last_update="2016-02-09 08:49:49.000251919 +0100 CET",mail_cache_hits=2139113611i,mail_lookup_attr=520276i,mail_lookup_path=37940318i,mail_read_bytes=1088002215022i,mail_read_count=31350271i,maj_faults=994420i,min_faults=1486260543i,num_cmds=40414997i,num_connected_sessions=978i,num_logins=11259672i,read_bytes=4445546612487315i,read_count=1763534543i,reset_timestamp="2016-01-28 09:31:24 +0100 CET",sys_cpu=123655962.668,user_cpu=149259327.032,vol_cs=4215130546i,write_bytes=2531186030222761i,write_count=2186579650i 1455004219925398372
+```
+
--- a/plugins/inputs/dovecot/dovecot.go
+++ b/plugins/inputs/dovecot/dovecot.go
@@ -0,0 +1,171 @@
+package dovecot
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"net"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+type Dovecot struct {
+	Servers []string
+	Domains []string
+}
+
+func (d *Dovecot) Description() string {
+	return "Read statistics from one or many dovecot servers"
+}
+
+var sampleConfig = `
+  ## specify dovecot servers via an address:port list
+  ##  e.g.
+  ##    localhost:24242
+  ##
+  ## If no servers are specified, then localhost is used as the host.
+  servers = ["localhost:24242"]
+  ## Only collect metrics for these domains, collect all if empty
+  domains = []
+`
+
+var defaultTimeout = time.Second * time.Duration(5)
+
+func (d *Dovecot) SampleConfig() string { return sampleConfig }
+
+const defaultPort = "24242"
+
+// Reads stats from all configured servers.
+func (d *Dovecot) Gather(acc telegraf.Accumulator) error {
+
+	if len(d.Servers) == 0 {
+		d.Servers = append(d.Servers, "127.0.0.1:24242")
+	}
+
+	var wg sync.WaitGroup
+
+	var outerr error
+
+	var domains = make(map[string]bool)
+
+	for _, dom := range d.Domains {
+		domains[dom] = true
+	}
+
+	for _, serv := range d.Servers {
+		wg.Add(1)
+		go func(serv string) {
+			defer wg.Done()
+			outerr = d.gatherServer(serv, acc, domains)
+		}(serv)
+	}
+
+	wg.Wait()
+
+	return outerr
+}
+
+func (d *Dovecot) gatherServer(addr string, acc telegraf.Accumulator, doms map[string]bool) error {
+	_, _, err := net.SplitHostPort(addr)
+	if err != nil {
+		return fmt.Errorf("Error: %s on url %s\n", err, addr)
+	}
+
+	c, err := net.DialTimeout("tcp", addr, defaultTimeout)
+	if err != nil {
+		return fmt.Errorf("Unable to connect to dovecot server '%s': %s", addr, err)
+	}
+	defer c.Close()
+
+	// Extend connection
+	c.SetDeadline(time.Now().Add(defaultTimeout))
+
+	c.Write([]byte("EXPORT\tdomain\n\n"))
+	var buf bytes.Buffer
+	io.Copy(&buf, c)
+	//	buf := bufio.NewReader(c)
+
+	host, _, _ := net.SplitHostPort(addr)
+
+	return gatherStats(&buf, acc, doms, host)
+}
+
+func gatherStats(buf *bytes.Buffer, acc telegraf.Accumulator, doms map[string]bool, host string) error {
+
+	lines := strings.Split(buf.String(), "\n")
+	head := strings.Split(lines[0], "\t")
+	vals := lines[1:]
+
+	for i := range vals {
+		if vals[i] == "" {
+			continue
+		}
+		val := strings.Split(vals[i], "\t")
+		fields := make(map[string]interface{})
+		if len(doms) > 0 && !doms[val[0]] {
+			continue
+		}
+		tags := map[string]string{"server": host, "domain": val[0]}
+		for n := range val {
+			switch head[n] {
+			case "domain":
+				continue
+				//				fields[head[n]] = val[n]
+			case "user_cpu", "sys_cpu", "clock_time":
+				fields[head[n]] = secParser(val[n])
+			case "reset_timestamp", "last_update":
+				fields[head[n]] = timeParser(val[n])
+			default:
+				ival, _ := splitSec(val[n])
+				fields[head[n]] = ival
+			}
+		}
+
+		acc.AddFields("dovecot", fields, tags)
+	}
+
+	return nil
+}
+
+func splitSec(tm string) (sec int64, msec int64) {
+	var err error
+	ss := strings.Split(tm, ".")
+
+	sec, err = strconv.ParseInt(ss[0], 10, 64)
+	if err != nil {
+		sec = 0
+	}
+	if len(ss) > 1 {
+		msec, err = strconv.ParseInt(ss[1], 10, 64)
+		if err != nil {
+			msec = 0
+		}
+	} else {
+		msec = 0
+	}
+
+	return sec, msec
+}
+
+func timeParser(tm string) time.Time {
+
+	sec, msec := splitSec(tm)
+	return time.Unix(sec, msec)
+}
+
+func secParser(tm string) float64 {
+
+	sec, msec := splitSec(tm)
+	return float64(sec) + (float64(msec) / 1000000.0)
+}
+
+func init() {
+	inputs.Add("dovecot", func() telegraf.Input {
+		return &Dovecot{}
+	})
+}
--- a/plugins/inputs/dovecot/dovecot_test.go
+++ b/plugins/inputs/dovecot/dovecot_test.go
@@ -0,0 +1,61 @@
+package dovecot
+
+import (
+	"bytes"
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/require"
+)
+
+func TestDovecot(t *testing.T) {
+
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	var acc testutil.Accumulator
+	tags := map[string]string{"server": "dovecot.test", "domain": "domain.test"}
+	buf := bytes.NewBufferString(sampleStats)
+
+	var doms = map[string]bool{
+		"domain.test": true,
+	}
+
+	err := gatherStats(buf, &acc, doms, "dovecot.test")
+	require.NoError(t, err)
+
+	fields := map[string]interface{}{
+		"reset_timestamp":        time.Unix(1453969886, 0),
+		"last_update":            time.Unix(1454603963, 39864),
+		"num_logins":             int64(7503897),
+		"num_cmds":               int64(52595715),
+		"num_connected_sessions": int64(1204),
+		"user_cpu":               1.00831175372e+08,
+		"sys_cpu":                8.3849071112e+07,
+		"clock_time":             4.3260019315281835e+15,
+		"min_faults":             int64(763950011),
+		"maj_faults":             int64(1112443),
+		"vol_cs":                 int64(4120386897),
+		"invol_cs":               int64(3685239306),
+		"disk_input":             int64(41679480946688),
+		"disk_output":            int64(1819070669176832),
+		"read_count":             int64(2368906465),
+		"read_bytes":             int64(2957928122981169),
+		"write_count":            int64(3545389615),
+		"write_bytes":            int64(1666822498251286),
+		"mail_lookup_path":       int64(24396105),
+		"mail_lookup_attr":       int64(302845),
+		"mail_read_count":        int64(20155768),
+		"mail_read_bytes":        int64(669946617705),
+		"mail_cache_hits":        int64(1557255080),
+	}
+
+	acc.AssertContainsTaggedFields(t, "dovecot", fields, tags)
+
+}
+
+const sampleStats = `domain	reset_timestamp	last_update	num_logins	num_cmds	num_connected_sessions	user_cpu	sys_cpu	clock_time	min_faults	maj_faults	vol_cs	invol_cs	disk_input	disk_output	read_count	read_bytes	write_count	write_bytes	mail_lookup_path	mail_lookup_attr	mail_read_count	mail_read_bytes	mail_cache_hits
+domain.bad	1453970076	1454603947.383029	10749	33828	0	177988.524000	148071.772000	7531838964717.193706	212491179	2125	2190386067	112779200	74487934976	3221808119808	2469948401	5237602841760	1091171292	2951966459802	15363	0	2922	136403379	334372
+domain.test	1453969886	1454603963.039864	7503897	52595715	1204	100831175.372000	83849071.112000	4326001931528183.495762	763950011	1112443	4120386897	3685239306	41679480946688	1819070669176832	2368906465	2957928122981169	3545389615	1666822498251286	24396105	302845	20155768	669946617705	1557255080`
--- a/plugins/inputs/elasticsearch/README.md
+++ b/plugins/inputs/elasticsearch/README.md
@@ -31,8 +31,9 @@ contains `status`, `timed_out`, `number_of_nodes`, `number_of_data_nodes`,
 `initializing_shards`, `unassigned_shards` fields
 - elasticsearch_cluster_health

-contains `status`, `number_of_shards`, `number_of_replicas`, `active_primary_shards`,
-`active_shards`, `relocating_shards`, `initializing_shards`, `unassigned_shards` fields
+contains `status`, `number_of_shards`, `number_of_replicas`,
+`active_primary_shards`, `active_shards`, `relocating_shards`,
+`initializing_shards`, `unassigned_shards` fields
 - elasticsearch_indices

 #### node measurements:
@@ -316,4 +317,4 @@ Transport statistics about sent and received bytes in cluster communication meas
 - elasticsearch_transport_rx_count value=6
 - elasticsearch_transport_rx_size_in_bytes value=1380
 - elasticsearch_transport_tx_count value=6
- elasticsearch_transport_tx_size_in_bytes value=1380
+- elasticsearch_transport_tx_size_in_bytes value=1380
--- a/plugins/inputs/elasticsearch/elasticsearch.go
+++ b/plugins/inputs/elasticsearch/elasticsearch.go
@@ -2,11 +2,16 @@ package elasticsearch

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

-	"github.com/influxdb/telegraf/plugins"
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
+	jsonparser "github.com/influxdata/telegraf/plugins/parsers/json"
 )

 const statsPath = "/_nodes/stats"
@@ -54,14 +59,14 @@ type indexHealth struct {
 }

 const sampleConfig = `
-  # specify a list of one or more Elasticsearch servers
+  ## specify a list of one or more Elasticsearch servers
  servers = ["http://localhost:9200"]

-  # set local to false when you want to read the indices stats from all nodes
-  # within the cluster
+  ## set local to false when you want to read the indices stats from all nodes
+  ## within the cluster
  local = true

-  # set cluster_health to true when you want to also obtain cluster level stats
+  ## set cluster_health to true when you want to also obtain cluster level stats
  cluster_health = false
 `

@@ -76,7 +81,12 @@ type Elasticsearch struct {

 // NewElasticsearch return a new instance of Elasticsearch
 func NewElasticsearch() *Elasticsearch {
-	return &Elasticsearch{client: http.DefaultClient}
+	tr := &http.Transport{ResponseHeaderTimeout: time.Duration(3 * time.Second)}
+	client := &http.Client{
+		Transport: tr,
+		Timeout:   time.Duration(4 * time.Second),
+	}
+	return &Elasticsearch{client: client}
 }

 // SampleConfig returns sample configuration for this plugin.
@@ -91,25 +101,45 @@ func (e *Elasticsearch) Description() string {

 // Gather reads the stats from Elasticsearch and writes it to the
 // Accumulator.
-func (e *Elasticsearch) Gather(acc plugins.Accumulator) error {
+func (e *Elasticsearch) Gather(acc telegraf.Accumulator) error {
+	errChan := make(chan error, len(e.Servers))
+	var wg sync.WaitGroup
+	wg.Add(len(e.Servers))
+
 	for _, serv := range e.Servers {
-		var url string
-		if e.Local {
-			url = serv + statsPathLocal
-		} else {
-			url = serv + statsPath
-		}
-		if err := e.gatherNodeStats(url, acc); err != nil {
-			return err
-		}
-		if e.ClusterHealth {
-			e.gatherClusterStats(fmt.Sprintf("%s/_cluster/health?level=indices", serv), acc)
-		}
+		go func(s string, acc telegraf.Accumulator) {
+			defer wg.Done()
+			var url string
+			if e.Local {
+				url = s + statsPathLocal
+			} else {
+				url = s + statsPath
+			}
+			if err := e.gatherNodeStats(url, acc); err != nil {
+				errChan <- err
+				return
+			}
+			if e.ClusterHealth {
+				e.gatherClusterStats(fmt.Sprintf("%s/_cluster/health?level=indices", s), acc)
+			}
+		}(serv, acc)
 	}
-	return nil
+
+	wg.Wait()
+	close(errChan)
+	// Get all errors and return them as one giant error
+	errStrings := []string{}
+	for err := range errChan {
+		errStrings = append(errStrings, err.Error())
+	}
+
+	if len(errStrings) == 0 {
+		return nil
+	}
+	return errors.New(strings.Join(errStrings, "\n"))
 }

-func (e *Elasticsearch) gatherNodeStats(url string, acc plugins.Accumulator) error {
+func (e *Elasticsearch) gatherNodeStats(url string, acc telegraf.Accumulator) error {
 	nodeStats := &struct {
 		ClusterName string           `json:"cluster_name"`
 		Nodes       map[string]*node `json:"nodes"`
@@ -141,16 +171,20 @@ func (e *Elasticsearch) gatherNodeStats(url string, acc plugins.Accumulator) err
 			"breakers":    n.Breakers,
 		}

+		now := time.Now()
 		for p, s := range stats {
-			if err := e.parseInterface(acc, p, tags, s); err != nil {
+			f := jsonparser.JSONFlattener{}
+			err := f.FlattenJSON("", s)
+			if err != nil {
 				return err
 			}
+			acc.AddFields("elasticsearch_"+p, f.Fields, tags, now)
 		}
 	}
 	return nil
 }

-func (e *Elasticsearch) gatherClusterStats(url string, acc plugins.Accumulator) error {
+func (e *Elasticsearch) gatherClusterStats(url string, acc telegraf.Accumulator) error {
 	clusterStats := &clusterHealth{}
 	if err := e.gatherData(url, clusterStats); err != nil {
 		return err
@@ -168,7 +202,7 @@ func (e *Elasticsearch) gatherClusterStats(url string, acc plugins.Accumulator)
 		"unassigned_shards":     clusterStats.UnassignedShards,
 	}
 	acc.AddFields(
-		"cluster_health",
+		"elasticsearch_cluster_health",
 		clusterFields,
 		map[string]string{"name": clusterStats.ClusterName},
 		measurementTime,
@@ -186,7 +220,7 @@ func (e *Elasticsearch) gatherClusterStats(url string, acc plugins.Accumulator)
 			"unassigned_shards":     health.UnassignedShards,
 		}
 		acc.AddFields(
-			"indices",
+			"elasticsearch_indices",
 			indexFields,
 			map[string]string{"index": name},
 			measurementTime,
@@ -205,7 +239,8 @@ func (e *Elasticsearch) gatherData(url string, v interface{}) error {
 		// NOTE: we are not going to read/discard r.Body under the assumption we'd prefer
 		// to let the underlying transport close the connection and re-establish a new one for
 		// future calls.
-		return fmt.Errorf("elasticsearch: API responded with status-code %d, expected %d", r.StatusCode, http.StatusOK)
+		return fmt.Errorf("elasticsearch: API responded with status-code %d, expected %d",
+			r.StatusCode, http.StatusOK)
 	}
 	if err = json.NewDecoder(r.Body).Decode(v); err != nil {
 		return err
@@ -213,27 +248,8 @@ func (e *Elasticsearch) gatherData(url string, v interface{}) error {
 	return nil
 }

-func (e *Elasticsearch) parseInterface(acc plugins.Accumulator, prefix string, tags map[string]string, v interface{}) error {
-	switch t := v.(type) {
-	case map[string]interface{}:
-		for k, v := range t {
-			if err := e.parseInterface(acc, prefix+"_"+k, tags, v); err != nil {
-				return err
-			}
-		}
-	case float64:
-		acc.Add(prefix, t, tags)
-	case bool, string, []interface{}:
-		// ignored types
-		return nil
-	default:
-		return fmt.Errorf("elasticsearch: got unexpected type %T with value %v (%s)", t, t, prefix)
-	}
-	return nil
-}
-
 func init() {
-	plugins.Add("elasticsearch", func() plugins.Plugin {
+	inputs.Add("elasticsearch", func() telegraf.Input {
 		return NewElasticsearch()
 	})
 }
--- a/plugins/inputs/elasticsearch/elasticsearch_test.go
+++ b/plugins/inputs/elasticsearch/elasticsearch_test.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"testing"

-	"github.com/influxdb/telegraf/testutil"
-	"github.com/stretchr/testify/assert"
+	"github.com/influxdata/telegraf/testutil"
+
 	"github.com/stretchr/testify/require"
 )

@@ -34,6 +34,9 @@ func (t *transportMock) RoundTrip(r *http.Request) (*http.Response, error) {
 	return res, nil
 }

+func (t *transportMock) CancelRequest(_ *http.Request) {
+}
+
 func TestElasticsearch(t *testing.T) {
 	es := NewElasticsearch()
 	es.Servers = []string{"http://example.com:9200"}
@@ -52,23 +55,15 @@ func TestElasticsearch(t *testing.T) {
 		"node_host":             "test",
 	}

-	testTables := []map[string]float64{
-		indicesExpected,
-		osExpected,
-		processExpected,
-		jvmExpected,
-		threadPoolExpected,
-		fsExpected,
-		transportExpected,
-		httpExpected,
-		breakersExpected,
-	}
-
-	for _, testTable := range testTables {
-		for k, v := range testTable {
-			assert.NoError(t, acc.ValidateTaggedValue(k, v, tags))
-		}
-	}
+	acc.AssertContainsTaggedFields(t, "elasticsearch_indices", indicesExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_os", osExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_process", processExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_jvm", jvmExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_thread_pool", threadPoolExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_fs", fsExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_transport", transportExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_http", httpExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_breakers", breakersExpected, tags)
 }

 func TestGatherClusterStats(t *testing.T) {
@@ -80,29 +75,15 @@ func TestGatherClusterStats(t *testing.T) {
 	var acc testutil.Accumulator
 	require.NoError(t, es.Gather(&acc))

-	var clusterHealthTests = []struct {
-		measurement string
-		fields      map[string]interface{}
-		tags        map[string]string
-	}{
-		{
-			"cluster_health",
-			clusterHealthExpected,
-			map[string]string{"name": "elasticsearch_telegraf"},
-		},
-		{
-			"indices",
-			v1IndexExpected,
-			map[string]string{"index": "v1"},
-		},
-		{
-			"indices",
-			v2IndexExpected,
-			map[string]string{"index": "v2"},
-		},
-	}
+	acc.AssertContainsTaggedFields(t, "elasticsearch_cluster_health",
+		clusterHealthExpected,
+		map[string]string{"name": "elasticsearch_telegraf"})

-	for _, exp := range clusterHealthTests {
-		assert.NoError(t, acc.ValidateTaggedFields(exp.measurement, exp.fields, exp.tags))
-	}
+	acc.AssertContainsTaggedFields(t, "elasticsearch_indices",
+		v1IndexExpected,
+		map[string]string{"index": "v1"})
+
+	acc.AssertContainsTaggedFields(t, "elasticsearch_indices",
+		v2IndexExpected,
+		map[string]string{"index": "v2"})
 }
--- a/plugins/inputs/elasticsearch/testdata_test.go
+++ b/plugins/inputs/elasticsearch/testdata_test.go
@@ -0,0 +1,765 @@
+package elasticsearch
+
+const clusterResponse = `
+{
+   "cluster_name": "elasticsearch_telegraf",
+   "status": "green",
+   "timed_out": false,
+   "number_of_nodes": 3,
+   "number_of_data_nodes": 3,
+   "active_primary_shards": 5,
+   "active_shards": 15,
+   "relocating_shards": 0,
+   "initializing_shards": 0,
+   "unassigned_shards": 0,
+   "indices": {
+      "v1": {
+         "status": "green",
+         "number_of_shards": 10,
+         "number_of_replicas": 1,
+         "active_primary_shards": 10,
+         "active_shards": 20,
+         "relocating_shards": 0,
+         "initializing_shards": 0,
+         "unassigned_shards": 0
+      },
+      "v2": {
+         "status": "red",
+         "number_of_shards": 10,
+         "number_of_replicas": 1,
+         "active_primary_shards": 0,
+         "active_shards": 0,
+         "relocating_shards": 0,
+         "initializing_shards": 0,
+         "unassigned_shards": 20
+      }
+   }
+}
+`
+
+var clusterHealthExpected = map[string]interface{}{
+	"status":                "green",
+	"timed_out":             false,
+	"number_of_nodes":       3,
+	"number_of_data_nodes":  3,
+	"active_primary_shards": 5,
+	"active_shards":         15,
+	"relocating_shards":     0,
+	"initializing_shards":   0,
+	"unassigned_shards":     0,
+}
+
+var v1IndexExpected = map[string]interface{}{
+	"status":                "green",
+	"number_of_shards":      10,
+	"number_of_replicas":    1,
+	"active_primary_shards": 10,
+	"active_shards":         20,
+	"relocating_shards":     0,
+	"initializing_shards":   0,
+	"unassigned_shards":     0,
+}
+
+var v2IndexExpected = map[string]interface{}{
+	"status":                "red",
+	"number_of_shards":      10,
+	"number_of_replicas":    1,
+	"active_primary_shards": 0,
+	"active_shards":         0,
+	"relocating_shards":     0,
+	"initializing_shards":   0,
+	"unassigned_shards":     20,
+}
+
+const statsResponse = `
+{
+  "cluster_name": "es-testcluster",
+  "nodes": {
+    "SDFsfSDFsdfFSDSDfSFDSDF": {
+      "timestamp": 1436365550135,
+      "name": "test.host.com",
+      "transport_address": "inet[/127.0.0.1:9300]",
+      "host": "test",
+      "ip": [
+        "inet[/127.0.0.1:9300]",
+        "NONE"
+      ],
+      "attributes": {
+        "master": "true"
+      },
+      "indices": {
+        "docs": {
+          "count": 29652,
+          "deleted": 5229
+        },
+        "store": {
+          "size_in_bytes": 37715234,
+          "throttle_time_in_millis": 215
+        },
+        "indexing": {
+          "index_total": 84790,
+          "index_time_in_millis": 29680,
+          "index_current": 0,
+          "delete_total": 13879,
+          "delete_time_in_millis": 1139,
+          "delete_current": 0,
+          "noop_update_total": 0,
+          "is_throttled": false,
+          "throttle_time_in_millis": 0
+        },
+        "get": {
+          "total": 1,
+          "time_in_millis": 2,
+          "exists_total": 0,
+          "exists_time_in_millis": 0,
+          "missing_total": 1,
+          "missing_time_in_millis": 2,
+          "current": 0
+        },
+        "search": {
+          "open_contexts": 0,
+          "query_total": 1452,
+          "query_time_in_millis": 5695,
+          "query_current": 0,
+          "fetch_total": 414,
+          "fetch_time_in_millis": 146,
+          "fetch_current": 0
+        },
+        "merges": {
+          "current": 0,
+          "current_docs": 0,
+          "current_size_in_bytes": 0,
+          "total": 133,
+          "total_time_in_millis": 21060,
+          "total_docs": 203672,
+          "total_size_in_bytes": 142900226
+        },
+        "refresh": {
+          "total": 1076,
+          "total_time_in_millis": 20078
+        },
+        "flush": {
+          "total": 115,
+          "total_time_in_millis": 2401
+        },
+        "warmer": {
+          "current": 0,
+          "total": 2319,
+          "total_time_in_millis": 448
+        },
+        "filter_cache": {
+          "memory_size_in_bytes": 7384,
+          "evictions": 0
+        },
+        "id_cache": {
+          "memory_size_in_bytes": 0
+        },
+        "fielddata": {
+          "memory_size_in_bytes": 12996,
+          "evictions": 0
+        },
+        "percolate": {
+          "total": 0,
+          "time_in_millis": 0,
+          "current": 0,
+          "memory_size_in_bytes": -1,
+          "memory_size": "-1b",
+          "queries": 0
+        },
+        "completion": {
+          "size_in_bytes": 0
+        },
+        "segments": {
+          "count": 134,
+          "memory_in_bytes": 1285212,
+          "index_writer_memory_in_bytes": 0,
+          "index_writer_max_memory_in_bytes": 172368955,
+          "version_map_memory_in_bytes": 611844,
+          "fixed_bit_set_memory_in_bytes": 0
+        },
+        "translog": {
+          "operations": 17702,
+          "size_in_bytes": 17
+        },
+        "suggest": {
+          "total": 0,
+          "time_in_millis": 0,
+          "current": 0
+        },
+        "query_cache": {
+          "memory_size_in_bytes": 0,
+          "evictions": 0,
+          "hit_count": 0,
+          "miss_count": 0
+        },
+        "recovery": {
+          "current_as_source": 0,
+          "current_as_target": 0,
+          "throttle_time_in_millis": 0
+        }
+      },
+      "os": {
+        "timestamp": 1436460392944,
+        "load_average": [
+          0.01,
+          0.04,
+          0.05
+        ],
+        "mem": {
+          "free_in_bytes": 477761536,
+          "used_in_bytes": 1621868544,
+          "free_percent": 74,
+          "used_percent": 25,
+          "actual_free_in_bytes": 1565470720,
+          "actual_used_in_bytes": 534159360
+        },
+        "swap": {
+          "used_in_bytes": 0,
+          "free_in_bytes": 487997440
+        }
+      },
+      "process": {
+        "timestamp": 1436460392945,
+        "open_file_descriptors": 160,
+        "cpu": {
+          "percent": 2,
+          "sys_in_millis": 1870,
+          "user_in_millis": 13610,
+          "total_in_millis": 15480
+        },
+        "mem": {
+          "total_virtual_in_bytes": 4747890688
+        }
+      },
+      "jvm": {
+        "timestamp": 1436460392945,
+        "uptime_in_millis": 202245,
+        "mem": {
+          "heap_used_in_bytes": 52709568,
+          "heap_used_percent": 5,
+          "heap_committed_in_bytes": 259522560,
+          "heap_max_in_bytes": 1038876672,
+          "non_heap_used_in_bytes": 39634576,
+          "non_heap_committed_in_bytes": 40841216,
+          "pools": {
+            "young": {
+              "used_in_bytes": 32685760,
+              "max_in_bytes": 279183360,
+              "peak_used_in_bytes": 71630848,
+              "peak_max_in_bytes": 279183360
+            },
+            "survivor": {
+              "used_in_bytes": 8912880,
+              "max_in_bytes": 34865152,
+              "peak_used_in_bytes": 8912888,
+              "peak_max_in_bytes": 34865152
+            },
+            "old": {
+              "used_in_bytes": 11110928,
+              "max_in_bytes": 724828160,
+              "peak_used_in_bytes": 14354608,
+              "peak_max_in_bytes": 724828160
+            }
+          }
+        },
+        "threads": {
+          "count": 44,
+          "peak_count": 45
+        },
+        "gc": {
+          "collectors": {
+            "young": {
+              "collection_count": 2,
+              "collection_time_in_millis": 98
+            },
+            "old": {
+              "collection_count": 1,
+              "collection_time_in_millis": 24
+            }
+          }
+        },
+        "buffer_pools": {
+          "direct": {
+            "count": 40,
+            "used_in_bytes": 6304239,
+            "total_capacity_in_bytes": 6304239
+          },
+          "mapped": {
+            "count": 0,
+            "used_in_bytes": 0,
+            "total_capacity_in_bytes": 0
+          }
+        }
+      },
+      "thread_pool": {
+        "percolate": {
+          "threads": 123,
+          "queue": 23,
+          "active": 13,
+          "rejected": 235,
+          "largest": 23,
+          "completed": 33
+        },
+        "fetch_shard_started": {
+          "threads": 3,
+          "queue": 1,
+          "active": 5,
+          "rejected": 6,
+          "largest": 4,
+          "completed": 54
+        },
+        "listener": {
+          "threads": 1,
+          "queue": 2,
+          "active": 4,
+          "rejected": 8,
+          "largest": 1,
+          "completed": 1
+        },
+        "index": {
+          "threads": 6,
+          "queue": 8,
+          "active": 4,
+          "rejected": 2,
+          "largest": 3,
+          "completed": 6
+        },
+        "refresh": {
+          "threads": 23,
+          "queue": 7,
+          "active": 3,
+          "rejected": 4,
+          "largest": 8,
+          "completed": 3
+        },
+        "suggest": {
+          "threads": 2,
+          "queue": 7,
+          "active": 2,
+          "rejected": 1,
+          "largest": 8,
+          "completed": 3
+        },
+        "generic": {
+          "threads": 1,
+          "queue": 4,
+          "active": 6,
+          "rejected": 3,
+          "largest": 2,
+          "completed": 27
+        },
+        "warmer": {
+          "threads": 2,
+          "queue": 7,
+          "active": 3,
+          "rejected": 2,
+          "largest": 3,
+          "completed": 1
+        },
+        "search": {
+          "threads": 5,
+          "queue": 7,
+          "active": 2,
+          "rejected": 7,
+          "largest": 2,
+          "completed": 4
+        },
+        "flush": {
+          "threads": 3,
+          "queue": 8,
+          "active": 0,
+          "rejected": 1,
+          "largest": 5,
+          "completed": 3
+        },
+        "optimize": {
+          "threads": 3,
+          "queue": 4,
+          "active": 1,
+          "rejected": 2,
+          "largest": 7,
+          "completed": 3
+        },
+        "fetch_shard_store": {
+          "threads": 1,
+          "queue": 7,
+          "active": 4,
+          "rejected": 2,
+          "largest": 4,
+          "completed": 1
+        },
+        "management": {
+          "threads": 2,
+          "queue": 3,
+          "active": 1,
+          "rejected": 6,
+          "largest": 2,
+          "completed": 22
+        },
+        "get": {
+          "threads": 1,
+          "queue": 8,
+          "active": 4,
+          "rejected": 3,
+          "largest": 2,
+          "completed": 1
+        },
+        "merge": {
+          "threads": 6,
+          "queue": 4,
+          "active": 5,
+          "rejected": 2,
+          "largest": 5,
+          "completed": 1
+        },
+        "bulk": {
+          "threads": 4,
+          "queue": 5,
+          "active": 7,
+          "rejected": 3,
+          "largest": 1,
+          "completed": 4
+        },
+        "snapshot": {
+          "threads": 8,
+          "queue": 5,
+          "active": 6,
+          "rejected": 2,
+          "largest": 1,
+          "completed": 0
+        }
+      },
+      "fs": {
+        "timestamp": 1436460392946,
+        "total": {
+          "total_in_bytes": 19507089408,
+          "free_in_bytes": 16909316096,
+          "available_in_bytes": 15894814720
+        },
+        "data": [
+          {
+            "path": "/usr/share/elasticsearch/data/elasticsearch/nodes/0",
+            "mount": "/usr/share/elasticsearch/data",
+            "type": "ext4",
+            "total_in_bytes": 19507089408,
+            "free_in_bytes": 16909316096,
+            "available_in_bytes": 15894814720
+          }
+        ]
+      },
+      "transport": {
+        "server_open": 13,
+        "rx_count": 6,
+        "rx_size_in_bytes": 1380,
+        "tx_count": 6,
+        "tx_size_in_bytes": 1380
+      },
+      "http": {
+        "current_open": 3,
+        "total_opened": 3
+      },
+      "breakers": {
+        "fielddata": {
+          "limit_size_in_bytes": 623326003,
+          "limit_size": "594.4mb",
+          "estimated_size_in_bytes": 0,
+          "estimated_size": "0b",
+          "overhead": 1.03,
+          "tripped": 0
+        },
+        "request": {
+          "limit_size_in_bytes": 415550668,
+          "limit_size": "396.2mb",
+          "estimated_size_in_bytes": 0,
+          "estimated_size": "0b",
+          "overhead": 1.0,
+          "tripped": 0
+        },
+        "parent": {
+          "limit_size_in_bytes": 727213670,
+          "limit_size": "693.5mb",
+          "estimated_size_in_bytes": 0,
+          "estimated_size": "0b",
+          "overhead": 1.0,
+          "tripped": 0
+        }
+      }
+    }
+  }
+}
+`
+
+var indicesExpected = map[string]interface{}{
+	"id_cache_memory_size_in_bytes":             float64(0),
+	"completion_size_in_bytes":                  float64(0),
+	"suggest_total":                             float64(0),
+	"suggest_time_in_millis":                    float64(0),
+	"suggest_current":                           float64(0),
+	"query_cache_memory_size_in_bytes":          float64(0),
+	"query_cache_evictions":                     float64(0),
+	"query_cache_hit_count":                     float64(0),
+	"query_cache_miss_count":                    float64(0),
+	"store_size_in_bytes":                       float64(37715234),
+	"store_throttle_time_in_millis":             float64(215),
+	"merges_current_docs":                       float64(0),
+	"merges_current_size_in_bytes":              float64(0),
+	"merges_total":                              float64(133),
+	"merges_total_time_in_millis":               float64(21060),
+	"merges_total_docs":                         float64(203672),
+	"merges_total_size_in_bytes":                float64(142900226),
+	"merges_current":                            float64(0),
+	"filter_cache_memory_size_in_bytes":         float64(7384),
+	"filter_cache_evictions":                    float64(0),
+	"indexing_index_total":                      float64(84790),
+	"indexing_index_time_in_millis":             float64(29680),
+	"indexing_index_current":                    float64(0),
+	"indexing_noop_update_total":                float64(0),
+	"indexing_throttle_time_in_millis":          float64(0),
+	"indexing_delete_total":                     float64(13879),
+	"indexing_delete_time_in_millis":            float64(1139),
+	"indexing_delete_current":                   float64(0),
+	"get_exists_time_in_millis":                 float64(0),
+	"get_missing_total":                         float64(1),
+	"get_missing_time_in_millis":                float64(2),
+	"get_current":                               float64(0),
+	"get_total":                                 float64(1),
+	"get_time_in_millis":                        float64(2),
+	"get_exists_total":                          float64(0),
+	"refresh_total":                             float64(1076),
+	"refresh_total_time_in_millis":              float64(20078),
+	"percolate_current":                         float64(0),
+	"percolate_memory_size_in_bytes":            float64(-1),
+	"percolate_queries":                         float64(0),
+	"percolate_total":                           float64(0),
+	"percolate_time_in_millis":                  float64(0),
+	"translog_operations":                       float64(17702),
+	"translog_size_in_bytes":                    float64(17),
+	"recovery_current_as_source":                float64(0),
+	"recovery_current_as_target":                float64(0),
+	"recovery_throttle_time_in_millis":          float64(0),
+	"docs_count":                                float64(29652),
+	"docs_deleted":                              float64(5229),
+	"flush_total_time_in_millis":                float64(2401),
+	"flush_total":                               float64(115),
+	"fielddata_memory_size_in_bytes":            float64(12996),
+	"fielddata_evictions":                       float64(0),
+	"search_fetch_current":                      float64(0),
+	"search_open_contexts":                      float64(0),
+	"search_query_total":                        float64(1452),
+	"search_query_time_in_millis":               float64(5695),
+	"search_query_current":                      float64(0),
+	"search_fetch_total":                        float64(414),
+	"search_fetch_time_in_millis":               float64(146),
+	"warmer_current":                            float64(0),
+	"warmer_total":                              float64(2319),
+	"warmer_total_time_in_millis":               float64(448),
+	"segments_count":                            float64(134),
+	"segments_memory_in_bytes":                  float64(1285212),
+	"segments_index_writer_memory_in_bytes":     float64(0),
+	"segments_index_writer_max_memory_in_bytes": float64(172368955),
+	"segments_version_map_memory_in_bytes":      float64(611844),
+	"segments_fixed_bit_set_memory_in_bytes":    float64(0),
+}
+
+var osExpected = map[string]interface{}{
+	"load_average_0":           float64(0.01),
+	"load_average_1":           float64(0.04),
+	"load_average_2":           float64(0.05),
+	"swap_used_in_bytes":       float64(0),
+	"swap_free_in_bytes":       float64(487997440),
+	"timestamp":                float64(1436460392944),
+	"mem_free_percent":         float64(74),
+	"mem_used_percent":         float64(25),
+	"mem_actual_free_in_bytes": float64(1565470720),
+	"mem_actual_used_in_bytes": float64(534159360),
+	"mem_free_in_bytes":        float64(477761536),
+	"mem_used_in_bytes":        float64(1621868544),
+}
+
+var processExpected = map[string]interface{}{
+	"mem_total_virtual_in_bytes": float64(4747890688),
+	"timestamp":                  float64(1436460392945),
+	"open_file_descriptors":      float64(160),
+	"cpu_total_in_millis":        float64(15480),
+	"cpu_percent":                float64(2),
+	"cpu_sys_in_millis":          float64(1870),
+	"cpu_user_in_millis":         float64(13610),
+}
+
+var jvmExpected = map[string]interface{}{
+	"timestamp":                                     float64(1436460392945),
+	"uptime_in_millis":                              float64(202245),
+	"mem_non_heap_used_in_bytes":                    float64(39634576),
+	"mem_non_heap_committed_in_bytes":               float64(40841216),
+	"mem_pools_young_max_in_bytes":                  float64(279183360),
+	"mem_pools_young_peak_used_in_bytes":            float64(71630848),
+	"mem_pools_young_peak_max_in_bytes":             float64(279183360),
+	"mem_pools_young_used_in_bytes":                 float64(32685760),
+	"mem_pools_survivor_peak_used_in_bytes":         float64(8912888),
+	"mem_pools_survivor_peak_max_in_bytes":          float64(34865152),
+	"mem_pools_survivor_used_in_bytes":              float64(8912880),
+	"mem_pools_survivor_max_in_bytes":               float64(34865152),
+	"mem_pools_old_peak_max_in_bytes":               float64(724828160),
+	"mem_pools_old_used_in_bytes":                   float64(11110928),
+	"mem_pools_old_max_in_bytes":                    float64(724828160),
+	"mem_pools_old_peak_used_in_bytes":              float64(14354608),
+	"mem_heap_used_in_bytes":                        float64(52709568),
+	"mem_heap_used_percent":                         float64(5),
+	"mem_heap_committed_in_bytes":                   float64(259522560),
+	"mem_heap_max_in_bytes":                         float64(1038876672),
+	"threads_peak_count":                            float64(45),
+	"threads_count":                                 float64(44),
+	"gc_collectors_young_collection_count":          float64(2),
+	"gc_collectors_young_collection_time_in_millis": float64(98),
+	"gc_collectors_old_collection_count":            float64(1),
+	"gc_collectors_old_collection_time_in_millis":   float64(24),
+	"buffer_pools_direct_count":                     float64(40),
+	"buffer_pools_direct_used_in_bytes":             float64(6304239),
+	"buffer_pools_direct_total_capacity_in_bytes":   float64(6304239),
+	"buffer_pools_mapped_count":                     float64(0),
+	"buffer_pools_mapped_used_in_bytes":             float64(0),
+	"buffer_pools_mapped_total_capacity_in_bytes":   float64(0),
+}
+
+var threadPoolExpected = map[string]interface{}{
+	"merge_threads":                 float64(6),
+	"merge_queue":                   float64(4),
+	"merge_active":                  float64(5),
+	"merge_rejected":                float64(2),
+	"merge_largest":                 float64(5),
+	"merge_completed":               float64(1),
+	"bulk_threads":                  float64(4),
+	"bulk_queue":                    float64(5),
+	"bulk_active":                   float64(7),
+	"bulk_rejected":                 float64(3),
+	"bulk_largest":                  float64(1),
+	"bulk_completed":                float64(4),
+	"warmer_threads":                float64(2),
+	"warmer_queue":                  float64(7),
+	"warmer_active":                 float64(3),
+	"warmer_rejected":               float64(2),
+	"warmer_largest":                float64(3),
+	"warmer_completed":              float64(1),
+	"get_largest":                   float64(2),
+	"get_completed":                 float64(1),
+	"get_threads":                   float64(1),
+	"get_queue":                     float64(8),
+	"get_active":                    float64(4),
+	"get_rejected":                  float64(3),
+	"index_threads":                 float64(6),
+	"index_queue":                   float64(8),
+	"index_active":                  float64(4),
+	"index_rejected":                float64(2),
+	"index_largest":                 float64(3),
+	"index_completed":               float64(6),
+	"suggest_threads":               float64(2),
+	"suggest_queue":                 float64(7),
+	"suggest_active":                float64(2),
+	"suggest_rejected":              float64(1),
+	"suggest_largest":               float64(8),
+	"suggest_completed":             float64(3),
+	"fetch_shard_store_queue":       float64(7),
+	"fetch_shard_store_active":      float64(4),
+	"fetch_shard_store_rejected":    float64(2),
+	"fetch_shard_store_largest":     float64(4),
+	"fetch_shard_store_completed":   float64(1),
+	"fetch_shard_store_threads":     float64(1),
+	"management_threads":            float64(2),
+	"management_queue":              float64(3),
+	"management_active":             float64(1),
+	"management_rejected":           float64(6),
+	"management_largest":            float64(2),
+	"management_completed":          float64(22),
+	"percolate_queue":               float64(23),
+	"percolate_active":              float64(13),
+	"percolate_rejected":            float64(235),
+	"percolate_largest":             float64(23),
+	"percolate_completed":           float64(33),
+	"percolate_threads":             float64(123),
+	"listener_active":               float64(4),
+	"listener_rejected":             float64(8),
+	"listener_largest":              float64(1),
+	"listener_completed":            float64(1),
+	"listener_threads":              float64(1),
+	"listener_queue":                float64(2),
+	"search_rejected":               float64(7),
+	"search_largest":                float64(2),
+	"search_completed":              float64(4),
+	"search_threads":                float64(5),
+	"search_queue":                  float64(7),
+	"search_active":                 float64(2),
+	"fetch_shard_started_threads":   float64(3),
+	"fetch_shard_started_queue":     float64(1),
+	"fetch_shard_started_active":    float64(5),
+	"fetch_shard_started_rejected":  float64(6),
+	"fetch_shard_started_largest":   float64(4),
+	"fetch_shard_started_completed": float64(54),
+	"refresh_rejected":              float64(4),
+	"refresh_largest":               float64(8),
+	"refresh_completed":             float64(3),
+	"refresh_threads":               float64(23),
+	"refresh_queue":                 float64(7),
+	"refresh_active":                float64(3),
+	"optimize_threads":              float64(3),
+	"optimize_queue":                float64(4),
+	"optimize_active":               float64(1),
+	"optimize_rejected":             float64(2),
+	"optimize_largest":              float64(7),
+	"optimize_completed":            float64(3),
+	"snapshot_largest":              float64(1),
+	"snapshot_completed":            float64(0),
+	"snapshot_threads":              float64(8),
+	"snapshot_queue":                float64(5),
+	"snapshot_active":               float64(6),
+	"snapshot_rejected":             float64(2),
+	"generic_threads":               float64(1),
+	"generic_queue":                 float64(4),
+	"generic_active":                float64(6),
+	"generic_rejected":              float64(3),
+	"generic_largest":               float64(2),
+	"generic_completed":             float64(27),
+	"flush_threads":                 float64(3),
+	"flush_queue":                   float64(8),
+	"flush_active":                  float64(0),
+	"flush_rejected":                float64(1),
+	"flush_largest":                 float64(5),
+	"flush_completed":               float64(3),
+}
+
+var fsExpected = map[string]interface{}{
+	"data_0_total_in_bytes":     float64(19507089408),
+	"data_0_free_in_bytes":      float64(16909316096),
+	"data_0_available_in_bytes": float64(15894814720),
+	"timestamp":                 float64(1436460392946),
+	"total_free_in_bytes":       float64(16909316096),
+	"total_available_in_bytes":  float64(15894814720),
+	"total_total_in_bytes":      float64(19507089408),
+}
+
+var transportExpected = map[string]interface{}{
+	"server_open":      float64(13),
+	"rx_count":         float64(6),
+	"rx_size_in_bytes": float64(1380),
+	"tx_count":         float64(6),
+	"tx_size_in_bytes": float64(1380),
+}
+
+var httpExpected = map[string]interface{}{
+	"current_open": float64(3),
+	"total_opened": float64(3),
+}
+
+var breakersExpected = map[string]interface{}{
+	"fielddata_estimated_size_in_bytes": float64(0),
+	"fielddata_overhead":                float64(1.03),
+	"fielddata_tripped":                 float64(0),
+	"fielddata_limit_size_in_bytes":     float64(623326003),
+	"request_estimated_size_in_bytes":   float64(0),
+	"request_overhead":                  float64(1.0),
+	"request_tripped":                   float64(0),
+	"request_limit_size_in_bytes":       float64(415550668),
+	"parent_overhead":                   float64(1.0),
+	"parent_tripped":                    float64(0),
+	"parent_limit_size_in_bytes":        float64(727213670),
+	"parent_estimated_size_in_bytes":    float64(0),
+}
--- a/plugins/inputs/exec/README.md
+++ b/plugins/inputs/exec/README.md
@@ -0,0 +1,190 @@
+# Exec Input Plugin
+
+Please also see: [Telegraf Input Data Formats](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md)
+
+The exec input plugin can execute arbitrary commands which output:
+
+* JSON [javascript object notation](http://www.json.org/)
+* InfluxDB [line-protocol](https://docs.influxdata.com/influxdb/v0.10/write_protocols/line/) 
+* Graphite [graphite-protocol](http://graphite.readthedocs.org/en/latest/feeding-carbon.html)
+
+
+### Example 1 - JSON
+
+#### Configuration
+
+In this example a script called ```/tmp/test.sh``` and a script called ```/tmp/test2.sh``` 
+are configured for ```[[inputs.exec]]``` in JSON format.
+
+```
+# Read flattened metrics from one or more commands that output JSON to stdout
+[[inputs.exec]]
+  # Shell/commands array
+  commands = ["/tmp/test.sh", "/tmp/test2.sh"]
+
+  # Data format to consume. This can be "json", "influx" or "graphite" (line-protocol)
+  # NOTE json only reads numerical measurements, strings and booleans are ignored.
+  data_format = "json"
+
+  # measurement name suffix (for separating different commands)
+  name_suffix = "_mycollector"
+
+  ## Below configuration will be used for data_format = "graphite", can be ignored for other data_format
+  ## If matching multiple measurement files, this string will be used to join the matched values.
+  #separator = "."
+
+  ## Each template line requires a template pattern.  It can have an optional
+  ## filter before the template and separated by spaces.  It can also have optional extra
+  ## tags following the template.  Multiple tags should be separated by commas and no spaces
+  ## similar to the line protocol format.  The can be only one default template.
+  ## Templates support below format:
+  ## 1. filter + template
+  ## 2. filter + template + extra tag
+  ## 3. filter + template with field key
+  ## 4. default template
+  #templates = [
+  #  "*.app env.service.resource.measurement",
+  #  "stats.* .host.measurement* region=us-west,agent=sensu",
+  #  "stats2.* .host.measurement.field",
+  #  "measurement*"
+  #]
+```
+
+Other options for modifying the measurement names are:
+
+```
+name_prefix = "prefix_"
+```
+
+Let's say that we have the above configuration, and mycollector outputs the
+following JSON:
+
+```json
+{
+    "a": 0.5,
+    "b": {
+        "c": 0.1,
+        "d": 5
+    }
+}
+```
+
+The collected metrics will be stored as fields under the measurement
+"exec_mycollector":
+
+```
+exec_mycollector a=0.5,b_c=0.1,b_d=5 1452815002357578567
+```
+If using JSON, only numeric values are parsed and turned into floats. Booleans
+and strings will be ignored.
+
+### Example 2 - Influx Line-Protocol
+
+In this example an application called ```/usr/bin/line_protocol_collector```
+and a script called ```/tmp/test2.sh``` are configured for ```[[inputs.exec]]``` 
+in influx line-protocol format.
+
+#### Configuration
+
+```
+[[inputs.exec]]
+  # Shell/commands array
+  # compatible with old version
+  # we can still use the old command configuration
+  # command = "/usr/bin/line_protocol_collector"
+  commands = ["/usr/bin/line_protocol_collector","/tmp/test2.sh"]
+
+  # Data format to consume. This can be "json" or "influx" (line-protocol)
+  # NOTE json only reads numerical measurements, strings and booleans are ignored.
+  data_format = "influx"
+```
+
+The line_protocol_collector application outputs the following line protocol:
+
+```
+cpu,cpu=cpu0,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
+cpu,cpu=cpu1,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
+cpu,cpu=cpu2,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
+cpu,cpu=cpu3,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
+cpu,cpu=cpu4,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
+cpu,cpu=cpu5,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
+cpu,cpu=cpu6,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
+```
+
+You will get data in InfluxDB exactly as it is defined above,
+tags are cpu=cpuN, host=foo, and datacenter=us-east with fields usage_idle
+and usage_busy. They will receive a timestamp at collection time. 
+Each line must end in \n, just as the Influx line protocol does.
+
+
+### Example 3 - Graphite
+
+We can also change the data_format to "graphite" to use the metrics collecting scripts such as (compatible with graphite):
+
+* Nagios [Mertics Plugins] (https://exchange.nagios.org/directory/Plugins)
+* Sensu [Mertics Plugins] (https://github.com/sensu-plugins)
+
+In this example a script called /tmp/test.sh and a script called /tmp/test2.sh are configured for [[inputs.exec]] in graphite format.
+
+#### Configuration
+```
+# Read flattened metrics from one or more commands that output JSON to stdout
+[[inputs.exec]]
+  # Shell/commands array
+  commands = ["/tmp/test.sh","/tmp/test2.sh"]
+
+  # Data format to consume. This can be "json", "influx" or "graphite" (line-protocol)
+  # NOTE json only reads numerical measurements, strings and booleans are ignored.
+  data_format = "graphite"
+
+  # measurement name suffix (for separating different commands)
+  name_suffix = "_mycollector"
+
+  ## Below configuration will be used for data_format = "graphite", can be ignored for other data_format
+  ## If matching multiple measurement files, this string will be used to join the matched values.
+  separator = "."
+
+  ## Each template line requires a template pattern.  It can have an optional
+  ## filter before the template and separated by spaces.  It can also have optional extra
+  ## tags following the template.  Multiple tags should be separated by commas and no spaces
+  ## similar to the line protocol format.  The can be only one default template.
+  ## Templates support below format:
+  ## 1. filter + template
+  ## 2. filter + template + extra tag
+  ## 3. filter + template with field key
+  ## 4. default template
+  templates = [
+    "*.app env.service.resource.measurement",
+    "stats.* .host.measurement* region=us-west,agent=sensu",
+    "stats2.* .host.measurement.field",
+    "measurement*"
+  ]
+```
+Graphite messages are in this format:
+
+```
+metric_path value timestamp\n
+```
+
+__metric_path__ is the metric namespace that you want to populate.
+
+__value__ is the value that you want to assign to the metric at this time.
+
+__timestamp__ is the unix epoch time.
+
+And test.sh/test2.sh will output:
+
+```
+sensu.metric.net.server0.eth0.rx_packets 461295119435 1444234982
+sensu.metric.net.server0.eth0.tx_bytes 1093086493388480 1444234982
+sensu.metric.net.server0.eth0.rx_bytes 1015633926034834 1444234982
+sensu.metric.net.server0.eth0.tx_errors 0 1444234982
+sensu.metric.net.server0.eth0.rx_errors 0 1444234982
+sensu.metric.net.server0.eth0.tx_dropped 0 1444234982
+sensu.metric.net.server0.eth0.rx_dropped 0 1444234982
+```
+
+The templates configuration will be used to parse the graphite metrics to support influxdb/opentsdb tagging store engines.
+
+More detail information about templates, please refer to [The graphite Input] (https://github.com/influxdata/influxdb/blob/master/services/graphite/README.md)
+ 
--- a/plugins/inputs/exec/exec.go
+++ b/plugins/inputs/exec/exec.go
@@ -0,0 +1,165 @@
+package exec
+
+import (
+	"bytes"
+	"fmt"
+	"os/exec"
+	"sync"
+	"syscall"
+
+	"github.com/gonuts/go-shellquote"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/parsers"
+	"github.com/influxdata/telegraf/plugins/parsers/nagios"
+)
+
+const sampleConfig = `
+  ## Commands array
+  commands = ["/tmp/test.sh", "/usr/bin/mycollector --foo=bar"]
+
+  ## measurement name suffix (for separating different commands)
+  name_suffix = "_mycollector"
+
+  ## Data format to consume.
+  ## Each data format has 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"
+`
+
+type Exec struct {
+	Commands []string
+	Command  string
+
+	parser parsers.Parser
+
+	wg sync.WaitGroup
+
+	runner  Runner
+	errChan chan error
+}
+
+func NewExec() *Exec {
+	return &Exec{
+		runner: CommandRunner{},
+	}
+}
+
+type Runner interface {
+	Run(*Exec, string, telegraf.Accumulator) ([]byte, error)
+}
+
+type CommandRunner struct{}
+
+func AddNagiosState(exitCode error, acc telegraf.Accumulator) error {
+	nagiosState := 0
+	if exitCode != nil {
+		exiterr, ok := exitCode.(*exec.ExitError)
+		if ok {
+			status, ok := exiterr.Sys().(syscall.WaitStatus)
+			if ok {
+				nagiosState = status.ExitStatus()
+			} else {
+				return fmt.Errorf("exec: unable to get nagios plugin exit code")
+			}
+		} else {
+			return fmt.Errorf("exec: unable to get nagios plugin exit code")
+		}
+	}
+	fields := map[string]interface{}{"state": nagiosState}
+	acc.AddFields("nagios_state", fields, nil)
+	return nil
+}
+
+func (c CommandRunner) Run(e *Exec, command string, acc telegraf.Accumulator) ([]byte, error) {
+	split_cmd, err := shellquote.Split(command)
+	if err != nil || len(split_cmd) == 0 {
+		return nil, fmt.Errorf("exec: unable to parse command, %s", err)
+	}
+
+	cmd := exec.Command(split_cmd[0], split_cmd[1:]...)
+
+	var out bytes.Buffer
+	cmd.Stdout = &out
+
+	if err := cmd.Run(); err != nil {
+		switch e.parser.(type) {
+		case *nagios.NagiosParser:
+			AddNagiosState(err, acc)
+		default:
+			return nil, fmt.Errorf("exec: %s for command '%s'", err, command)
+		}
+	} else {
+		switch e.parser.(type) {
+		case *nagios.NagiosParser:
+			AddNagiosState(nil, acc)
+		}
+	}
+
+	return out.Bytes(), nil
+}
+
+func (e *Exec) ProcessCommand(command string, acc telegraf.Accumulator) {
+	defer e.wg.Done()
+
+	out, err := e.runner.Run(e, command, acc)
+	if err != nil {
+		e.errChan <- err
+		return
+	}
+
+	metrics, err := e.parser.Parse(out)
+	if err != nil {
+		e.errChan <- err
+	} else {
+		for _, metric := range metrics {
+			acc.AddFields(metric.Name(), metric.Fields(), metric.Tags(), metric.Time())
+		}
+	}
+}
+
+func (e *Exec) SampleConfig() string {
+	return sampleConfig
+}
+
+func (e *Exec) Description() string {
+	return "Read metrics from one or more commands that can output to stdout"
+}
+
+func (e *Exec) SetParser(parser parsers.Parser) {
+	e.parser = parser
+}
+
+func (e *Exec) Gather(acc telegraf.Accumulator) error {
+	// Legacy single command support
+	if e.Command != "" {
+		e.Commands = append(e.Commands, e.Command)
+		e.Command = ""
+	}
+
+	e.errChan = make(chan error, len(e.Commands))
+
+	e.wg.Add(len(e.Commands))
+	for _, command := range e.Commands {
+		go e.ProcessCommand(command, acc)
+	}
+	e.wg.Wait()
+
+	select {
+	default:
+		close(e.errChan)
+		return nil
+	case err := <-e.errChan:
+		close(e.errChan)
+		return err
+	}
+
+}
+
+func init() {
+	inputs.Add("exec", func() telegraf.Input {
+		return NewExec()
+	})
+}
--- a/plugins/inputs/exec/exec_test.go
+++ b/plugins/inputs/exec/exec_test.go
@@ -0,0 +1,171 @@
+package exec
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/parsers"
+
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+// Midnight 9/22/2015
+const baseTimeSeconds = 1442905200
+
+const validJson = `
+{
+    "status": "green",
+    "num_processes": 82,
+    "cpu": {
+        "status": "red",
+        "nil_status": null,
+        "used": 8234,
+        "free": 32
+    },
+    "percent": 0.81,
+    "users": [0, 1, 2, 3]
+}`
+
+const malformedJson = `
+{
+    "status": "green",
+`
+
+const lineProtocol = "cpu,host=foo,datacenter=us-east usage_idle=99,usage_busy=1"
+
+const lineProtocolMulti = `
+cpu,cpu=cpu0,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
+cpu,cpu=cpu1,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
+cpu,cpu=cpu2,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
+cpu,cpu=cpu3,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
+cpu,cpu=cpu4,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
+cpu,cpu=cpu5,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
+cpu,cpu=cpu6,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
+`
+
+type runnerMock struct {
+	out []byte
+	err error
+}
+
+func newRunnerMock(out []byte, err error) Runner {
+	return &runnerMock{
+		out: out,
+		err: err,
+	}
+}
+
+func (r runnerMock) Run(e *Exec, command string, acc telegraf.Accumulator) ([]byte, error) {
+	if r.err != nil {
+		return nil, r.err
+	}
+	return r.out, nil
+}
+
+func TestExec(t *testing.T) {
+	parser, _ := parsers.NewJSONParser("exec", []string{}, nil)
+	e := &Exec{
+		runner:   newRunnerMock([]byte(validJson), nil),
+		Commands: []string{"testcommand arg1"},
+		parser:   parser,
+	}
+
+	var acc testutil.Accumulator
+	err := e.Gather(&acc)
+	require.NoError(t, err)
+	assert.Equal(t, acc.NFields(), 8, "non-numeric measurements should be ignored")
+
+	fields := map[string]interface{}{
+		"num_processes": float64(82),
+		"cpu_used":      float64(8234),
+		"cpu_free":      float64(32),
+		"percent":       float64(0.81),
+		"users_0":       float64(0),
+		"users_1":       float64(1),
+		"users_2":       float64(2),
+		"users_3":       float64(3),
+	}
+	acc.AssertContainsFields(t, "exec", fields)
+}
+
+func TestExecMalformed(t *testing.T) {
+	parser, _ := parsers.NewJSONParser("exec", []string{}, nil)
+	e := &Exec{
+		runner:   newRunnerMock([]byte(malformedJson), nil),
+		Commands: []string{"badcommand arg1"},
+		parser:   parser,
+	}
+
+	var acc testutil.Accumulator
+	err := e.Gather(&acc)
+	require.Error(t, err)
+	assert.Equal(t, acc.NFields(), 0, "No new points should have been added")
+}
+
+func TestCommandError(t *testing.T) {
+	parser, _ := parsers.NewJSONParser("exec", []string{}, nil)
+	e := &Exec{
+		runner:   newRunnerMock(nil, fmt.Errorf("exit status code 1")),
+		Commands: []string{"badcommand"},
+		parser:   parser,
+	}
+
+	var acc testutil.Accumulator
+	err := e.Gather(&acc)
+	require.Error(t, err)
+	assert.Equal(t, acc.NFields(), 0, "No new points should have been added")
+}
+
+func TestLineProtocolParse(t *testing.T) {
+	parser, _ := parsers.NewInfluxParser()
+	e := &Exec{
+		runner:   newRunnerMock([]byte(lineProtocol), nil),
+		Commands: []string{"line-protocol"},
+		parser:   parser,
+	}
+
+	var acc testutil.Accumulator
+	err := e.Gather(&acc)
+	require.NoError(t, err)
+
+	fields := map[string]interface{}{
+		"usage_idle": float64(99),
+		"usage_busy": float64(1),
+	}
+	tags := map[string]string{
+		"host":       "foo",
+		"datacenter": "us-east",
+	}
+	acc.AssertContainsTaggedFields(t, "cpu", fields, tags)
+}
+
+func TestLineProtocolParseMultiple(t *testing.T) {
+	parser, _ := parsers.NewInfluxParser()
+	e := &Exec{
+		runner:   newRunnerMock([]byte(lineProtocolMulti), nil),
+		Commands: []string{"line-protocol"},
+		parser:   parser,
+	}
+
+	var acc testutil.Accumulator
+	err := e.Gather(&acc)
+	require.NoError(t, err)
+
+	fields := map[string]interface{}{
+		"usage_idle": float64(99),
+		"usage_busy": float64(1),
+	}
+	tags := map[string]string{
+		"host":       "foo",
+		"datacenter": "us-east",
+	}
+	cpuTags := []string{"cpu0", "cpu1", "cpu2", "cpu3", "cpu4", "cpu5", "cpu6"}
+
+	for _, cpu := range cpuTags {
+		tags["cpu"] = cpu
+		acc.AssertContainsTaggedFields(t, "cpu", fields, tags)
+	}
+}
--- a/plugins/inputs/github_webhooks/README.md
+++ b/plugins/inputs/github_webhooks/README.md
@@ -0,0 +1,369 @@
+# github_webhooks
+
+This is a Telegraf service plugin that listens for events kicked off by Github's Webhooks service and persists data from them into configured outputs. To set up the listener first generate the proper configuration:
+```sh
+$ telegraf -sample-config -input-filter github_webhooks -output-filter influxdb > config.conf.new
+```
+Change the config file to point to the InfluxDB server you are using and adjust the settings to match your environment. Once that is complete:
+```sh
+$ cp config.conf.new /etc/telegraf/telegraf.conf
+$ sudo service telegraf start
+```
+Once the server is running you should configure your Organization's Webhooks to point at the `github_webhooks` service. To do this go to `github.com/{my_organization}` and click `Settings > Webhooks > Add webhook`. In the resulting menu set `Payload URL` to `http://<my_ip>:1618`, `Content type` to `application/json` and under the section `Which events would you like to trigger this webhook?` select 'Send me <b>everything</b>'. By default all of the events will write to the `github_webhooks` measurement, this is configurable by setting the `measurement_name` in the config file.
+
+## Events
+
+The titles of the following sections are links to the full payloads and details for each event. The body contains what information from the event is persisted. The format is as follows:
+```
+# TAGS
+* 'tagKey' = `tagValue` type
+# FIELDS 
+* 'fieldKey' = `fieldValue` type
+```
+The tag values and field values show the place on the incoming JSON object where the data is sourced from. 
+
+#### [`commit_comment` event](https://developer.github.com/v3/activity/events/types/#commitcommentevent)
+
+**Tags:**
+* 'event' = `headers[X-Github-Event]` string
+* 'repository' = `event.repository.full_name` string
+* 'private' = `event.repository.private` bool
+* 'user' = `event.sender.login` string
+* 'admin' = `event.sender.site_admin` bool
+
+**Fields:**
+* 'stars' = `event.repository.stargazers_count` int
+* 'forks' = `event.repository.forks_count` int
+* 'issues' = `event.repository.open_issues_count` int
+* 'commit' = `event.comment.commit_id` string
+* 'comment' = `event.comment.body` string
+
+#### [`create` event](https://developer.github.com/v3/activity/events/types/#createevent)
+
+**Tags:**
+* 'event' = `headers[X-Github-Event]` string
+* 'repository' = `event.repository.full_name` string
+* 'private' = `event.repository.private` bool
+* 'user' = `event.sender.login` string
+* 'admin' = `event.sender.site_admin` bool
+
+**Fields:**
+* 'stars' = `event.repository.stargazers_count` int
+* 'forks' = `event.repository.forks_count` int
+* 'issues' = `event.repository.open_issues_count` int
+* 'ref' = `event.ref` string
+* 'issues' = `event.ref_type` string
+
+#### [`delete` event](https://developer.github.com/v3/activity/events/types/#deleteevent)
+
+**Tags:**
+* 'event' = `headers[X-Github-Event]` string
+* 'repository' = `event.repository.full_name` string
+* 'private' = `event.repository.private` bool
+* 'user' = `event.sender.login` string
+* 'admin' = `event.sender.site_admin` bool
+
+**Fields:**
+* 'stars' = `event.repository.stargazers_count` int
+* 'forks' = `event.repository.forks_count` int
+* 'issues' = `event.repository.open_issues_count` int
+* 'ref' = `event.ref` string
+* 'issues' = `event.ref_type` string
+
+#### [`deployment` event](https://developer.github.com/v3/activity/events/types/#deploymentevent)
+
+**Tags:**
+* 'event' = `headers[X-Github-Event]` string
+* 'repository' = `event.repository.full_name` string
+* 'private' = `event.repository.private` bool
+* 'user' = `event.sender.login` string
+* 'admin' = `event.sender.site_admin` bool
+
+**Fields:**
+* 'stars' = `event.repository.stargazers_count` int
+* 'forks' = `event.repository.forks_count` int
+* 'issues' = `event.repository.open_issues_count` int
+* 'commit' = `event.deployment.sha` string
+* 'task' = `event.deployment.task` string
+* 'environment' = `event.deployment.evnironment` string
+* 'description' = `event.deployment.description` string
+
+#### [`deployment_status` event](https://developer.github.com/v3/activity/events/types/#deploymentstatusevent)
+
+**Tags:**
+* 'event' = `headers[X-Github-Event]` string
+* 'repository' = `event.repository.full_name` string
+* 'private' = `event.repository.private` bool
+* 'user' = `event.sender.login` string
+* 'admin' = `event.sender.site_admin` bool
+
+**Fields:**
+* 'stars' = `event.repository.stargazers_count` int
+* 'forks' = `event.repository.forks_count` int
+* 'issues' = `event.repository.open_issues_count` int
+* 'commit' = `event.deployment.sha` string
+* 'task' = `event.deployment.task` string
+* 'environment' = `event.deployment.evnironment` string
+* 'description' = `event.deployment.description` string
+* 'depState' = `event.deployment_status.state` string
+* 'depDescription' = `event.deployment_status.description` string
+
+#### [`fork` event](https://developer.github.com/v3/activity/events/types/#forkevent)
+
+**Tags:**
+* 'event' = `headers[X-Github-Event]` string
+* 'repository' = `event.repository.full_name` string
+* 'private' = `event.repository.private` bool
+* 'user' = `event.sender.login` string
+* 'admin' = `event.sender.site_admin` bool
+
+**Fields:**
+* 'stars' = `event.repository.stargazers_count` int
+* 'forks' = `event.repository.forks_count` int
+* 'issues' = `event.repository.open_issues_count` int
+* 'forkee' = `event.forkee.repository` string
+
+#### [`gollum` event](https://developer.github.com/v3/activity/events/types/#gollumevent)
+
+**Tags:**
+* 'event' = `headers[X-Github-Event]` string
+* 'repository' = `event.repository.full_name` string
+* 'private' = `event.repository.private` bool
+* 'user' = `event.sender.login` string
+* 'admin' = `event.sender.site_admin` bool
+
+**Fields:**
+* 'stars' = `event.repository.stargazers_count` int
+* 'forks' = `event.repository.forks_count` int
+* 'issues' = `event.repository.open_issues_count` int
+
+#### [`issue_comment` event](https://developer.github.com/v3/activity/events/types/#issuecommentevent)
+
+**Tags:**
+* 'event' = `headers[X-Github-Event]` string
+* 'repository' = `event.repository.full_name` string
+* 'private' = `event.repository.private` bool
+* 'user' = `event.sender.login` string
+* 'admin' = `event.sender.site_admin` bool
+* 'issue' = `event.issue.number` int
+
+**Fields:**
+* 'stars' = `event.repository.stargazers_count` int
+* 'forks' = `event.repository.forks_count` int
+* 'issues' = `event.repository.open_issues_count` int
+* 'title' = `event.issue.title` string
+* 'comments' = `event.issue.comments` int
+* 'body' = `event.comment.body` string
+
+#### [`issues` event](https://developer.github.com/v3/activity/events/types/#issuesevent)
+
+**Tags:**
+* 'event' = `headers[X-Github-Event]` string
+* 'repository' = `event.repository.full_name` string
+* 'private' = `event.repository.private` bool
+* 'user' = `event.sender.login` string
+* 'admin' = `event.sender.site_admin` bool
+* 'issue' = `event.issue.number` int
+* 'action' = `event.action` string
+
+**Fields:**
+* 'stars' = `event.repository.stargazers_count` int
+* 'forks' = `event.repository.forks_count` int
+* 'issues' = `event.repository.open_issues_count` int
+* 'title' = `event.issue.title` string
+* 'comments' = `event.issue.comments` int
+
+#### [`member` event](https://developer.github.com/v3/activity/events/types/#memberevent)
+
+**Tags:**
+* 'event' = `headers[X-Github-Event]` string
+* 'repository' = `event.repository.full_name` string
+* 'private' = `event.repository.private` bool
+* 'user' = `event.sender.login` string
+* 'admin' = `event.sender.site_admin` bool
+
+**Fields:**
+* 'stars' = `event.repository.stargazers_count` int
+* 'forks' = `event.repository.forks_count` int
+* 'issues' = `event.repository.open_issues_count` int
+* 'newMember' = `event.sender.login` string
+* 'newMemberStatus' = `event.sender.site_admin` bool
+
+#### [`membership` event](https://developer.github.com/v3/activity/events/types/#membershipevent)
+
+**Tags:**
+* 'event' = `headers[X-Github-Event]` string
+* 'user' = `event.sender.login` string
+* 'admin' = `event.sender.site_admin` bool
+* 'action' = `event.action` string
+
+**Fields:**
+* 'newMember' = `event.sender.login` string
+* 'newMemberStatus' = `event.sender.site_admin` bool
+
+#### [`page_build` event](https://developer.github.com/v3/activity/events/types/#pagebuildevent)
+
+**Tags:**
+* 'event' = `headers[X-Github-Event]` string
+* 'repository' = `event.repository.full_name` string
+* 'private' = `event.repository.private` bool
+* 'user' = `event.sender.login` string
+* 'admin' = `event.sender.site_admin` bool
+
+**Fields:**
+* 'stars' = `event.repository.stargazers_count` int
+* 'forks' = `event.repository.forks_count` int
+* 'issues' = `event.repository.open_issues_count` int
+
+#### [`public` event](https://developer.github.com/v3/activity/events/types/#publicevent)
+
+**Tags:**
+* 'event' = `headers[X-Github-Event]` string
+* 'repository' = `event.repository.full_name` string
+* 'private' = `event.repository.private` bool
+* 'user' = `event.sender.login` string
+* 'admin' = `event.sender.site_admin` bool
+
+**Fields:**
+* 'stars' = `event.repository.stargazers_count` int
+* 'forks' = `event.repository.forks_count` int
+* 'issues' = `event.repository.open_issues_count` int
+
+#### [`pull_request_review_comment` event](https://developer.github.com/v3/activity/events/types/#pullrequestreviewcommentevent)
+
+**Tags:**
+* 'event' = `headers[X-Github-Event]` string
+* 'action' = `event.action` string
+* 'repository' = `event.repository.full_name` string
+* 'private' = `event.repository.private` bool
+* 'user' = `event.sender.login` string
+* 'admin' = `event.sender.site_admin` bool
+* 'prNumber' = `event.pull_request.number` int
+
+**Fields:**
+* 'stars' = `event.repository.stargazers_count` int
+* 'forks' = `event.repository.forks_count` int
+* 'issues' = `event.repository.open_issues_count` int
+* 'state' = `event.pull_request.state` string
+* 'title' = `event.pull_request.title` string
+* 'comments' = `event.pull_request.comments` int
+* 'commits' = `event.pull_request.commits` int
+* 'additions' = `event.pull_request.additions` int
+* 'deletions' = `event.pull_request.deletions` int
+* 'changedFiles' = `event.pull_request.changed_files` int
+* 'commentFile' = `event.comment.file` string
+* 'comment' = `event.comment.body` string
+
+#### [`pull_request` event](https://developer.github.com/v3/activity/events/types/#pullrequestevent)
+
+**Tags:**
+* 'event' = `headers[X-Github-Event]` string
+* 'action' = `event.action` string
+* 'repository' = `event.repository.full_name` string
+* 'private' = `event.repository.private` bool
+* 'user' = `event.sender.login` string
+* 'admin' = `event.sender.site_admin` bool
+* 'prNumber' = `event.pull_request.number` int
+
+**Fields:**
+* 'stars' = `event.repository.stargazers_count` int
+* 'forks' = `event.repository.forks_count` int
+* 'issues' = `event.repository.open_issues_count` int
+* 'state' = `event.pull_request.state` string
+* 'title' = `event.pull_request.title` string
+* 'comments' = `event.pull_request.comments` int
+* 'commits' = `event.pull_request.commits` int
+* 'additions' = `event.pull_request.additions` int
+* 'deletions' = `event.pull_request.deletions` int
+* 'changedFiles' = `event.pull_request.changed_files` int
+
+#### [`push` event](https://developer.github.com/v3/activity/events/types/#pushevent)
+
+**Tags:**
+* 'event' = `headers[X-Github-Event]` string
+* 'repository' = `event.repository.full_name` string
+* 'private' = `event.repository.private` bool
+* 'user' = `event.sender.login` string
+* 'admin' = `event.sender.site_admin` bool
+
+**Fields:**
+* 'stars' = `event.repository.stargazers_count` int
+* 'forks' = `event.repository.forks_count` int
+* 'issues' = `event.repository.open_issues_count` int
+* 'ref' = `event.ref` string
+* 'before' = `event.before` string
+* 'after' = `event.after` string
+
+#### [`repository` event](https://developer.github.com/v3/activity/events/types/#repositoryevent)
+
+**Tags:**
+* 'event' = `headers[X-Github-Event]` string
+* 'repository' = `event.repository.full_name` string
+* 'private' = `event.repository.private` bool
+* 'user' = `event.sender.login` string
+* 'admin' = `event.sender.site_admin` bool
+
+**Fields:**
+* 'stars' = `event.repository.stargazers_count` int
+* 'forks' = `event.repository.forks_count` int
+* 'issues' = `event.repository.open_issues_count` int
+
+#### [`release` event](https://developer.github.com/v3/activity/events/types/#releaseevent)
+
+**Tags:**
+* 'event' = `headers[X-Github-Event]` string
+* 'repository' = `event.repository.full_name` string
+* 'private' = `event.repository.private` bool
+* 'user' = `event.sender.login` string
+* 'admin' = `event.sender.site_admin` bool
+
+**Fields:**
+* 'stars' = `event.repository.stargazers_count` int
+* 'forks' = `event.repository.forks_count` int
+* 'issues' = `event.repository.open_issues_count` int
+* 'tagName' = `event.release.tag_name` string
+
+#### [`status` event](https://developer.github.com/v3/activity/events/types/#statusevent)
+
+**Tags:**
+* 'event' = `headers[X-Github-Event]` string
+* 'repository' = `event.repository.full_name` string
+* 'private' = `event.repository.private` bool
+* 'user' = `event.sender.login` string
+* 'admin' = `event.sender.site_admin` bool
+
+**Fields:**
+* 'stars' = `event.repository.stargazers_count` int
+* 'forks' = `event.repository.forks_count` int
+* 'issues' = `event.repository.open_issues_count` int
+* 'commit' = `event.sha` string
+* 'state' = `event.state` string
+
+#### [`team_add` event](https://developer.github.com/v3/activity/events/types/#teamaddevent)
+
+**Tags:**
+* 'event' = `headers[X-Github-Event]` string
+* 'repository' = `event.repository.full_name` string
+* 'private' = `event.repository.private` bool
+* 'user' = `event.sender.login` string
+* 'admin' = `event.sender.site_admin` bool
+
+**Fields:**
+* 'stars' = `event.repository.stargazers_count` int
+* 'forks' = `event.repository.forks_count` int
+* 'issues' = `event.repository.open_issues_count` int
+* 'teamName' = `event.team.name` string
+
+#### [`watch` event](https://developer.github.com/v3/activity/events/types/#watchevent)
+
+**Tags:**
+* 'event' = `headers[X-Github-Event]` string
+* 'repository' = `event.repository.full_name` string
+* 'private' = `event.repository.private` bool
+* 'user' = `event.sender.login` string
+* 'admin' = `event.sender.site_admin` bool
+
+**Fields:**
+* 'stars' = `event.repository.stargazers_count` int
+* 'forks' = `event.repository.forks_count` int
+* 'issues' = `event.repository.open_issues_count` int
--- a/plugins/inputs/github_webhooks/github_webhooks.go
+++ b/plugins/inputs/github_webhooks/github_webhooks.go
@@ -0,0 +1,338 @@
+package github_webhooks
+
+import (
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"log"
+	"net/http"
+	"sync"
+
+	"github.com/gorilla/mux"
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+func init() {
+	inputs.Add("github_webhooks", func() telegraf.Input { return &GithubWebhooks{} })
+}
+
+type GithubWebhooks struct {
+	ServiceAddress string
+	// Lock for the struct
+	sync.Mutex
+	// Events buffer to store events between Gather calls
+	events []Event
+}
+
+func NewGithubWebhooks() *GithubWebhooks {
+	return &GithubWebhooks{}
+}
+
+func (gh *GithubWebhooks) SampleConfig() string {
+	return `
+  ## Address and port to host Webhook listener on
+  service_address = ":1618"
+`
+}
+
+func (gh *GithubWebhooks) Description() string {
+	return "A Github Webhook Event collector"
+}
+
+// Writes the points from <-gh.in to the Accumulator
+func (gh *GithubWebhooks) Gather(acc telegraf.Accumulator) error {
+	gh.Lock()
+	defer gh.Unlock()
+	for _, event := range gh.events {
+		p := event.NewMetric()
+		acc.AddFields("github_webhooks", p.Fields(), p.Tags(), p.Time())
+	}
+	gh.events = make([]Event, 0)
+	return nil
+}
+
+func (gh *GithubWebhooks) Listen() {
+	r := mux.NewRouter()
+	r.HandleFunc("/", gh.eventHandler).Methods("POST")
+	err := http.ListenAndServe(fmt.Sprintf("%s", gh.ServiceAddress), r)
+	if err != nil {
+		log.Printf("Error starting server: %v", err)
+	}
+}
+
+func (gh *GithubWebhooks) Start(_ telegraf.Accumulator) error {
+	go gh.Listen()
+	log.Printf("Started the github_webhooks service on %s\n", gh.ServiceAddress)
+	return nil
+}
+
+func (gh *GithubWebhooks) Stop() {
+	log.Println("Stopping the ghWebhooks service")
+}
+
+// Handles the / route
+func (gh *GithubWebhooks) eventHandler(w http.ResponseWriter, r *http.Request) {
+	defer r.Body.Close()
+	eventType := r.Header["X-Github-Event"][0]
+	data, err := ioutil.ReadAll(r.Body)
+	if err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+	e, err := NewEvent(data, eventType)
+	if err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+	gh.Lock()
+	gh.events = append(gh.events, e)
+	gh.Unlock()
+	w.WriteHeader(http.StatusOK)
+}
+
+func newCommitComment(data []byte) (Event, error) {
+	commitCommentStruct := CommitCommentEvent{}
+	err := json.Unmarshal(data, &commitCommentStruct)
+	if err != nil {
+		return nil, err
+	}
+	return commitCommentStruct, nil
+}
+
+func newCreate(data []byte) (Event, error) {
+	createStruct := CreateEvent{}
+	err := json.Unmarshal(data, &createStruct)
+	if err != nil {
+		return nil, err
+	}
+	return createStruct, nil
+}
+
+func newDelete(data []byte) (Event, error) {
+	deleteStruct := DeleteEvent{}
+	err := json.Unmarshal(data, &deleteStruct)
+	if err != nil {
+		return nil, err
+	}
+	return deleteStruct, nil
+}
+
+func newDeployment(data []byte) (Event, error) {
+	deploymentStruct := DeploymentEvent{}
+	err := json.Unmarshal(data, &deploymentStruct)
+	if err != nil {
+		return nil, err
+	}
+	return deploymentStruct, nil
+}
+
+func newDeploymentStatus(data []byte) (Event, error) {
+	deploymentStatusStruct := DeploymentStatusEvent{}
+	err := json.Unmarshal(data, &deploymentStatusStruct)
+	if err != nil {
+		return nil, err
+	}
+	return deploymentStatusStruct, nil
+}
+
+func newFork(data []byte) (Event, error) {
+	forkStruct := ForkEvent{}
+	err := json.Unmarshal(data, &forkStruct)
+	if err != nil {
+		return nil, err
+	}
+	return forkStruct, nil
+}
+
+func newGollum(data []byte) (Event, error) {
+	gollumStruct := GollumEvent{}
+	err := json.Unmarshal(data, &gollumStruct)
+	if err != nil {
+		return nil, err
+	}
+	return gollumStruct, nil
+}
+
+func newIssueComment(data []byte) (Event, error) {
+	issueCommentStruct := IssueCommentEvent{}
+	err := json.Unmarshal(data, &issueCommentStruct)
+	if err != nil {
+		return nil, err
+	}
+	return issueCommentStruct, nil
+}
+
+func newIssues(data []byte) (Event, error) {
+	issuesStruct := IssuesEvent{}
+	err := json.Unmarshal(data, &issuesStruct)
+	if err != nil {
+		return nil, err
+	}
+	return issuesStruct, nil
+}
+
+func newMember(data []byte) (Event, error) {
+	memberStruct := MemberEvent{}
+	err := json.Unmarshal(data, &memberStruct)
+	if err != nil {
+		return nil, err
+	}
+	return memberStruct, nil
+}
+
+func newMembership(data []byte) (Event, error) {
+	membershipStruct := MembershipEvent{}
+	err := json.Unmarshal(data, &membershipStruct)
+	if err != nil {
+		return nil, err
+	}
+	return membershipStruct, nil
+}
+
+func newPageBuild(data []byte) (Event, error) {
+	pageBuildEvent := PageBuildEvent{}
+	err := json.Unmarshal(data, &pageBuildEvent)
+	if err != nil {
+		return nil, err
+	}
+	return pageBuildEvent, nil
+}
+
+func newPublic(data []byte) (Event, error) {
+	publicEvent := PublicEvent{}
+	err := json.Unmarshal(data, &publicEvent)
+	if err != nil {
+		return nil, err
+	}
+	return publicEvent, nil
+}
+
+func newPullRequest(data []byte) (Event, error) {
+	pullRequestStruct := PullRequestEvent{}
+	err := json.Unmarshal(data, &pullRequestStruct)
+	if err != nil {
+		return nil, err
+	}
+	return pullRequestStruct, nil
+}
+
+func newPullRequestReviewComment(data []byte) (Event, error) {
+	pullRequestReviewCommentStruct := PullRequestReviewCommentEvent{}
+	err := json.Unmarshal(data, &pullRequestReviewCommentStruct)
+	if err != nil {
+		return nil, err
+	}
+	return pullRequestReviewCommentStruct, nil
+}
+
+func newPush(data []byte) (Event, error) {
+	pushStruct := PushEvent{}
+	err := json.Unmarshal(data, &pushStruct)
+	if err != nil {
+		return nil, err
+	}
+	return pushStruct, nil
+}
+
+func newRelease(data []byte) (Event, error) {
+	releaseStruct := ReleaseEvent{}
+	err := json.Unmarshal(data, &releaseStruct)
+	if err != nil {
+		return nil, err
+	}
+	return releaseStruct, nil
+}
+
+func newRepository(data []byte) (Event, error) {
+	repositoryStruct := RepositoryEvent{}
+	err := json.Unmarshal(data, &repositoryStruct)
+	if err != nil {
+		return nil, err
+	}
+	return repositoryStruct, nil
+}
+
+func newStatus(data []byte) (Event, error) {
+	statusStruct := StatusEvent{}
+	err := json.Unmarshal(data, &statusStruct)
+	if err != nil {
+		return nil, err
+	}
+	return statusStruct, nil
+}
+
+func newTeamAdd(data []byte) (Event, error) {
+	teamAddStruct := TeamAddEvent{}
+	err := json.Unmarshal(data, &teamAddStruct)
+	if err != nil {
+		return nil, err
+	}
+	return teamAddStruct, nil
+}
+
+func newWatch(data []byte) (Event, error) {
+	watchStruct := WatchEvent{}
+	err := json.Unmarshal(data, &watchStruct)
+	if err != nil {
+		return nil, err
+	}
+	return watchStruct, nil
+}
+
+type newEventError struct {
+	s string
+}
+
+func (e *newEventError) Error() string {
+	return e.s
+}
+
+func NewEvent(r []byte, t string) (Event, error) {
+	log.Printf("New %v event recieved", t)
+	switch t {
+	case "commit_comment":
+		return newCommitComment(r)
+	case "create":
+		return newCreate(r)
+	case "delete":
+		return newDelete(r)
+	case "deployment":
+		return newDeployment(r)
+	case "deployment_status":
+		return newDeploymentStatus(r)
+	case "fork":
+		return newFork(r)
+	case "gollum":
+		return newGollum(r)
+	case "issue_comment":
+		return newIssueComment(r)
+	case "issues":
+		return newIssues(r)
+	case "member":
+		return newMember(r)
+	case "membership":
+		return newMembership(r)
+	case "page_build":
+		return newPageBuild(r)
+	case "public":
+		return newPublic(r)
+	case "pull_request":
+		return newPullRequest(r)
+	case "pull_request_review_comment":
+		return newPullRequestReviewComment(r)
+	case "push":
+		return newPush(r)
+	case "release":
+		return newRelease(r)
+	case "repository":
+		return newRepository(r)
+	case "status":
+		return newStatus(r)
+	case "team_add":
+		return newTeamAdd(r)
+	case "watch":
+		return newWatch(r)
+	}
+	return nil, &newEventError{"Not a recgonized event type"}
+}
--- a/plugins/inputs/github_webhooks/github_webhooks_mock_json.go
+++ b/plugins/inputs/github_webhooks/github_webhooks_mock_json.go
--- a/plugins/inputs/github_webhooks/github_webhooks_models.go
+++ b/plugins/inputs/github_webhooks/github_webhooks_models.go
@@ -0,0 +1,711 @@
+package github_webhooks
+
+import (
+	"fmt"
+	"log"
+	"time"
+
+	"github.com/influxdata/telegraf"
+)
+
+const meas = "github_webhooks"
+
+type Event interface {
+	NewMetric() telegraf.Metric
+}
+
+type Repository struct {
+	Repository string `json:"full_name"`
+	Private    bool   `json:"private"`
+	Stars      int    `json:"stargazers_count"`
+	Forks      int    `json:"forks_count"`
+	Issues     int    `json:"open_issues_count"`
+}
+
+type Sender struct {
+	User  string `json:"login"`
+	Admin bool   `json:"site_admin"`
+}
+
+type CommitComment struct {
+	Commit string `json:"commit_id"`
+	Body   string `json:"body"`
+}
+
+type Deployment struct {
+	Commit      string `json:"sha"`
+	Task        string `json:"task"`
+	Environment string `json:"environment"`
+	Description string `json:"description"`
+}
+
+type Page struct {
+	Name   string `json:"page_name"`
+	Title  string `json:"title"`
+	Action string `json:"action"`
+}
+
+type Issue struct {
+	Number   int    `json:"number"`
+	Title    string `json:"title"`
+	Comments int    `json:"comments"`
+}
+
+type IssueComment struct {
+	Body string `json:"body"`
+}
+
+type Team struct {
+	Name string `json:"name"`
+}
+
+type PullRequest struct {
+	Number       int    `json:"number"`
+	State        string `json:"state"`
+	Title        string `json:"title"`
+	Comments     int    `json:"comments"`
+	Commits      int    `json:"commits"`
+	Additions    int    `json:"additions"`
+	Deletions    int    `json:"deletions"`
+	ChangedFiles int    `json:"changed_files"`
+}
+
+type PullRequestReviewComment struct {
+	File    string `json:"path"`
+	Comment string `json:"body"`
+}
+
+type Release struct {
+	TagName string `json:"tag_name"`
+}
+
+type DeploymentStatus struct {
+	State       string `json:"state"`
+	Description string `json:"description"`
+}
+
+type CommitCommentEvent struct {
+	Comment    CommitComment `json:"comment"`
+	Repository Repository    `json:"repository"`
+	Sender     Sender        `json:"sender"`
+}
+
+func (s CommitCommentEvent) NewMetric() telegraf.Metric {
+	event := "commit_comment"
+	t := map[string]string{
+		"event":      event,
+		"repository": s.Repository.Repository,
+		"private":    fmt.Sprintf("%v", s.Repository.Private),
+		"user":       s.Sender.User,
+		"admin":      fmt.Sprintf("%v", s.Sender.Admin),
+	}
+	f := map[string]interface{}{
+		"stars":   s.Repository.Stars,
+		"forks":   s.Repository.Forks,
+		"issues":  s.Repository.Issues,
+		"commit":  s.Comment.Commit,
+		"comment": s.Comment.Body,
+	}
+	m, err := telegraf.NewMetric(meas, t, f, time.Now())
+	if err != nil {
+		log.Fatalf("Failed to create %v event", event)
+	}
+	return m
+}
+
+type CreateEvent struct {
+	Ref        string     `json:"ref"`
+	RefType    string     `json:"ref_type"`
+	Repository Repository `json:"repository"`
+	Sender     Sender     `json:"sender"`
+}
+
+func (s CreateEvent) NewMetric() telegraf.Metric {
+	event := "create"
+	t := map[string]string{
+		"event":      event,
+		"repository": s.Repository.Repository,
+		"private":    fmt.Sprintf("%v", s.Repository.Private),
+		"user":       s.Sender.User,
+		"admin":      fmt.Sprintf("%v", s.Sender.Admin),
+	}
+	f := map[string]interface{}{
+		"stars":   s.Repository.Stars,
+		"forks":   s.Repository.Forks,
+		"issues":  s.Repository.Issues,
+		"ref":     s.Ref,
+		"refType": s.RefType,
+	}
+	m, err := telegraf.NewMetric(meas, t, f, time.Now())
+	if err != nil {
+		log.Fatalf("Failed to create %v event", event)
+	}
+	return m
+}
+
+type DeleteEvent struct {
+	Ref        string     `json:"ref"`
+	RefType    string     `json:"ref_type"`
+	Repository Repository `json:"repository"`
+	Sender     Sender     `json:"sender"`
+}
+
+func (s DeleteEvent) NewMetric() telegraf.Metric {
+	event := "delete"
+	t := map[string]string{
+		"event":      event,
+		"repository": s.Repository.Repository,
+		"private":    fmt.Sprintf("%v", s.Repository.Private),
+		"user":       s.Sender.User,
+		"admin":      fmt.Sprintf("%v", s.Sender.Admin),
+	}
+	f := map[string]interface{}{
+		"stars":   s.Repository.Stars,
+		"forks":   s.Repository.Forks,
+		"issues":  s.Repository.Issues,
+		"ref":     s.Ref,
+		"refType": s.RefType,
+	}
+	m, err := telegraf.NewMetric(meas, t, f, time.Now())
+	if err != nil {
+		log.Fatalf("Failed to create %v event", event)
+	}
+	return m
+}
+
+type DeploymentEvent struct {
+	Deployment Deployment `json:"deployment"`
+	Repository Repository `json:"repository"`
+	Sender     Sender     `json:"sender"`
+}
+
+func (s DeploymentEvent) NewMetric() telegraf.Metric {
+	event := "deployment"
+	t := map[string]string{
+		"event":      event,
+		"repository": s.Repository.Repository,
+		"private":    fmt.Sprintf("%v", s.Repository.Private),
+		"user":       s.Sender.User,
+		"admin":      fmt.Sprintf("%v", s.Sender.Admin),
+	}
+	f := map[string]interface{}{
+		"stars":       s.Repository.Stars,
+		"forks":       s.Repository.Forks,
+		"issues":      s.Repository.Issues,
+		"commit":      s.Deployment.Commit,
+		"task":        s.Deployment.Task,
+		"environment": s.Deployment.Environment,
+		"description": s.Deployment.Description,
+	}
+	m, err := telegraf.NewMetric(meas, t, f, time.Now())
+	if err != nil {
+		log.Fatalf("Failed to create %v event", event)
+	}
+	return m
+}
+
+type DeploymentStatusEvent struct {
+	Deployment       Deployment       `json:"deployment"`
+	DeploymentStatus DeploymentStatus `json:"deployment_status"`
+	Repository       Repository       `json:"repository"`
+	Sender           Sender           `json:"sender"`
+}
+
+func (s DeploymentStatusEvent) NewMetric() telegraf.Metric {
+	event := "delete"
+	t := map[string]string{
+		"event":      event,
+		"repository": s.Repository.Repository,
+		"private":    fmt.Sprintf("%v", s.Repository.Private),
+		"user":       s.Sender.User,
+		"admin":      fmt.Sprintf("%v", s.Sender.Admin),
+	}
+	f := map[string]interface{}{
+		"stars":          s.Repository.Stars,
+		"forks":          s.Repository.Forks,
+		"issues":         s.Repository.Issues,
+		"commit":         s.Deployment.Commit,
+		"task":           s.Deployment.Task,
+		"environment":    s.Deployment.Environment,
+		"description":    s.Deployment.Description,
+		"depState":       s.DeploymentStatus.State,
+		"depDescription": s.DeploymentStatus.Description,
+	}
+	m, err := telegraf.NewMetric(meas, t, f, time.Now())
+	if err != nil {
+		log.Fatalf("Failed to create %v event", event)
+	}
+	return m
+}
+
+type ForkEvent struct {
+	Forkee     Repository `json:"forkee"`
+	Repository Repository `json:"repository"`
+	Sender     Sender     `json:"sender"`
+}
+
+func (s ForkEvent) NewMetric() telegraf.Metric {
+	event := "fork"
+	t := map[string]string{
+		"event":      event,
+		"repository": s.Repository.Repository,
+		"private":    fmt.Sprintf("%v", s.Repository.Private),
+		"user":       s.Sender.User,
+		"admin":      fmt.Sprintf("%v", s.Sender.Admin),
+	}
+	f := map[string]interface{}{
+		"stars":  s.Repository.Stars,
+		"forks":  s.Repository.Forks,
+		"issues": s.Repository.Issues,
+		"fork":   s.Forkee.Repository,
+	}
+	m, err := telegraf.NewMetric(meas, t, f, time.Now())
+	if err != nil {
+		log.Fatalf("Failed to create %v event", event)
+	}
+	return m
+}
+
+type GollumEvent struct {
+	Pages      []Page     `json:"pages"`
+	Repository Repository `json:"repository"`
+	Sender     Sender     `json:"sender"`
+}
+
+// REVIEW: Going to be lazy and not deal with the pages.
+func (s GollumEvent) NewMetric() telegraf.Metric {
+	event := "gollum"
+	t := map[string]string{
+		"event":      event,
+		"repository": s.Repository.Repository,
+		"private":    fmt.Sprintf("%v", s.Repository.Private),
+		"user":       s.Sender.User,
+		"admin":      fmt.Sprintf("%v", s.Sender.Admin),
+	}
+	f := map[string]interface{}{
+		"stars":  s.Repository.Stars,
+		"forks":  s.Repository.Forks,
+		"issues": s.Repository.Issues,
+	}
+	m, err := telegraf.NewMetric(meas, t, f, time.Now())
+	if err != nil {
+		log.Fatalf("Failed to create %v event", event)
+	}
+	return m
+}
+
+type IssueCommentEvent struct {
+	Issue      Issue        `json:"issue"`
+	Comment    IssueComment `json:"comment"`
+	Repository Repository   `json:"repository"`
+	Sender     Sender       `json:"sender"`
+}
+
+func (s IssueCommentEvent) NewMetric() telegraf.Metric {
+	event := "issue_comment"
+	t := map[string]string{
+		"event":      event,
+		"repository": s.Repository.Repository,
+		"private":    fmt.Sprintf("%v", s.Repository.Private),
+		"user":       s.Sender.User,
+		"admin":      fmt.Sprintf("%v", s.Sender.Admin),
+		"issue":      fmt.Sprintf("%v", s.Issue.Number),
+	}
+	f := map[string]interface{}{
+		"stars":    s.Repository.Stars,
+		"forks":    s.Repository.Forks,
+		"issues":   s.Repository.Issues,
+		"title":    s.Issue.Title,
+		"comments": s.Issue.Comments,
+		"body":     s.Comment.Body,
+	}
+	m, err := telegraf.NewMetric(meas, t, f, time.Now())
+	if err != nil {
+		log.Fatalf("Failed to create %v event", event)
+	}
+	return m
+}
+
+type IssuesEvent struct {
+	Action     string     `json:"action"`
+	Issue      Issue      `json:"issue"`
+	Repository Repository `json:"repository"`
+	Sender     Sender     `json:"sender"`
+}
+
+func (s IssuesEvent) NewMetric() telegraf.Metric {
+	event := "issue"
+	t := map[string]string{
+		"event":      event,
+		"repository": s.Repository.Repository,
+		"private":    fmt.Sprintf("%v", s.Repository.Private),
+		"user":       s.Sender.User,
+		"admin":      fmt.Sprintf("%v", s.Sender.Admin),
+		"issue":      fmt.Sprintf("%v", s.Issue.Number),
+		"action":     s.Action,
+	}
+	f := map[string]interface{}{
+		"stars":    s.Repository.Stars,
+		"forks":    s.Repository.Forks,
+		"issues":   s.Repository.Issues,
+		"title":    s.Issue.Title,
+		"comments": s.Issue.Comments,
+	}
+	m, err := telegraf.NewMetric(meas, t, f, time.Now())
+	if err != nil {
+		log.Fatalf("Failed to create %v event", event)
+	}
+	return m
+}
+
+type MemberEvent struct {
+	Member     Sender     `json:"member"`
+	Repository Repository `json:"repository"`
+	Sender     Sender     `json:"sender"`
+}
+
+func (s MemberEvent) NewMetric() telegraf.Metric {
+	event := "member"
+	t := map[string]string{
+		"event":      event,
+		"repository": s.Repository.Repository,
+		"private":    fmt.Sprintf("%v", s.Repository.Private),
+		"user":       s.Sender.User,
+		"admin":      fmt.Sprintf("%v", s.Sender.Admin),
+	}
+	f := map[string]interface{}{
+		"stars":           s.Repository.Stars,
+		"forks":           s.Repository.Forks,
+		"issues":          s.Repository.Issues,
+		"newMember":       s.Member.User,
+		"newMemberStatus": s.Member.Admin,
+	}
+	m, err := telegraf.NewMetric(meas, t, f, time.Now())
+	if err != nil {
+		log.Fatalf("Failed to create %v event", event)
+	}
+	return m
+}
+
+type MembershipEvent struct {
+	Action string `json:"action"`
+	Member Sender `json:"member"`
+	Sender Sender `json:"sender"`
+	Team   Team   `json:"team"`
+}
+
+func (s MembershipEvent) NewMetric() telegraf.Metric {
+	event := "membership"
+	t := map[string]string{
+		"event":  event,
+		"user":   s.Sender.User,
+		"admin":  fmt.Sprintf("%v", s.Sender.Admin),
+		"action": s.Action,
+	}
+	f := map[string]interface{}{
+		"newMember":       s.Member.User,
+		"newMemberStatus": s.Member.Admin,
+	}
+	m, err := telegraf.NewMetric(meas, t, f, time.Now())
+	if err != nil {
+		log.Fatalf("Failed to create %v event", event)
+	}
+	return m
+}
+
+type PageBuildEvent struct {
+	Repository Repository `json:"repository"`
+	Sender     Sender     `json:"sender"`
+}
+
+func (s PageBuildEvent) NewMetric() telegraf.Metric {
+	event := "page_build"
+	t := map[string]string{
+		"event":      event,
+		"repository": s.Repository.Repository,
+		"private":    fmt.Sprintf("%v", s.Repository.Private),
+		"user":       s.Sender.User,
+		"admin":      fmt.Sprintf("%v", s.Sender.Admin),
+	}
+	f := map[string]interface{}{
+		"stars":  s.Repository.Stars,
+		"forks":  s.Repository.Forks,
+		"issues": s.Repository.Issues,
+	}
+	m, err := telegraf.NewMetric(meas, t, f, time.Now())
+	if err != nil {
+		log.Fatalf("Failed to create %v event", event)
+	}
+	return m
+}
+
+type PublicEvent struct {
+	Repository Repository `json:"repository"`
+	Sender     Sender     `json:"sender"`
+}
+
+func (s PublicEvent) NewMetric() telegraf.Metric {
+	event := "public"
+	t := map[string]string{
+		"event":      event,
+		"repository": s.Repository.Repository,
+		"private":    fmt.Sprintf("%v", s.Repository.Private),
+		"user":       s.Sender.User,
+		"admin":      fmt.Sprintf("%v", s.Sender.Admin),
+	}
+	f := map[string]interface{}{
+		"stars":  s.Repository.Stars,
+		"forks":  s.Repository.Forks,
+		"issues": s.Repository.Issues,
+	}
+	m, err := telegraf.NewMetric(meas, t, f, time.Now())
+	if err != nil {
+		log.Fatalf("Failed to create %v event", event)
+	}
+	return m
+}
+
+type PullRequestEvent struct {
+	Action      string      `json:"action"`
+	PullRequest PullRequest `json:"pull_request"`
+	Repository  Repository  `json:"repository"`
+	Sender      Sender      `json:"sender"`
+}
+
+func (s PullRequestEvent) NewMetric() telegraf.Metric {
+	event := "pull_request"
+	t := map[string]string{
+		"event":      event,
+		"action":     s.Action,
+		"repository": s.Repository.Repository,
+		"private":    fmt.Sprintf("%v", s.Repository.Private),
+		"user":       s.Sender.User,
+		"admin":      fmt.Sprintf("%v", s.Sender.Admin),
+		"prNumber":   fmt.Sprintf("%v", s.PullRequest.Number),
+	}
+	f := map[string]interface{}{
+		"stars":        s.Repository.Stars,
+		"forks":        s.Repository.Forks,
+		"issues":       s.Repository.Issues,
+		"state":        s.PullRequest.State,
+		"title":        s.PullRequest.Title,
+		"comments":     s.PullRequest.Comments,
+		"commits":      s.PullRequest.Commits,
+		"additions":    s.PullRequest.Additions,
+		"deletions":    s.PullRequest.Deletions,
+		"changedFiles": s.PullRequest.ChangedFiles,
+	}
+	m, err := telegraf.NewMetric(meas, t, f, time.Now())
+	if err != nil {
+		log.Fatalf("Failed to create %v event", event)
+	}
+	return m
+}
+
+type PullRequestReviewCommentEvent struct {
+	Comment     PullRequestReviewComment `json:"comment"`
+	PullRequest PullRequest              `json:"pull_request"`
+	Repository  Repository               `json:"repository"`
+	Sender      Sender                   `json:"sender"`
+}
+
+func (s PullRequestReviewCommentEvent) NewMetric() telegraf.Metric {
+	event := "pull_request_review_comment"
+	t := map[string]string{
+		"event":      event,
+		"repository": s.Repository.Repository,
+		"private":    fmt.Sprintf("%v", s.Repository.Private),
+		"user":       s.Sender.User,
+		"admin":      fmt.Sprintf("%v", s.Sender.Admin),
+		"prNumber":   fmt.Sprintf("%v", s.PullRequest.Number),
+	}
+	f := map[string]interface{}{
+		"stars":        s.Repository.Stars,
+		"forks":        s.Repository.Forks,
+		"issues":       s.Repository.Issues,
+		"state":        s.PullRequest.State,
+		"title":        s.PullRequest.Title,
+		"comments":     s.PullRequest.Comments,
+		"commits":      s.PullRequest.Commits,
+		"additions":    s.PullRequest.Additions,
+		"deletions":    s.PullRequest.Deletions,
+		"changedFiles": s.PullRequest.ChangedFiles,
+		"commentFile":  s.Comment.File,
+		"comment":      s.Comment.Comment,
+	}
+	m, err := telegraf.NewMetric(meas, t, f, time.Now())
+	if err != nil {
+		log.Fatalf("Failed to create %v event", event)
+	}
+	return m
+}
+
+type PushEvent struct {
+	Ref        string     `json:"ref"`
+	Before     string     `json:"before"`
+	After      string     `json:"after"`
+	Repository Repository `json:"repository"`
+	Sender     Sender     `json:"sender"`
+}
+
+func (s PushEvent) NewMetric() telegraf.Metric {
+	event := "push"
+	t := map[string]string{
+		"event":      event,
+		"repository": s.Repository.Repository,
+		"private":    fmt.Sprintf("%v", s.Repository.Private),
+		"user":       s.Sender.User,
+		"admin":      fmt.Sprintf("%v", s.Sender.Admin),
+	}
+	f := map[string]interface{}{
+		"stars":  s.Repository.Stars,
+		"forks":  s.Repository.Forks,
+		"issues": s.Repository.Issues,
+		"ref":    s.Ref,
+		"before": s.Before,
+		"after":  s.After,
+	}
+	m, err := telegraf.NewMetric(meas, t, f, time.Now())
+	if err != nil {
+		log.Fatalf("Failed to create %v event", event)
+	}
+	return m
+}
+
+type ReleaseEvent struct {
+	Release    Release    `json:"release"`
+	Repository Repository `json:"repository"`
+	Sender     Sender     `json:"sender"`
+}
+
+func (s ReleaseEvent) NewMetric() telegraf.Metric {
+	event := "release"
+	t := map[string]string{
+		"event":      event,
+		"repository": s.Repository.Repository,
+		"private":    fmt.Sprintf("%v", s.Repository.Private),
+		"user":       s.Sender.User,
+		"admin":      fmt.Sprintf("%v", s.Sender.Admin),
+	}
+	f := map[string]interface{}{
+		"stars":   s.Repository.Stars,
+		"forks":   s.Repository.Forks,
+		"issues":  s.Repository.Issues,
+		"tagName": s.Release.TagName,
+	}
+	m, err := telegraf.NewMetric(meas, t, f, time.Now())
+	if err != nil {
+		log.Fatalf("Failed to create %v event", event)
+	}
+	return m
+}
+
+type RepositoryEvent struct {
+	Repository Repository `json:"repository"`
+	Sender     Sender     `json:"sender"`
+}
+
+func (s RepositoryEvent) NewMetric() telegraf.Metric {
+	event := "repository"
+	t := map[string]string{
+		"event":      event,
+		"repository": s.Repository.Repository,
+		"private":    fmt.Sprintf("%v", s.Repository.Private),
+		"user":       s.Sender.User,
+		"admin":      fmt.Sprintf("%v", s.Sender.Admin),
+	}
+	f := map[string]interface{}{
+		"stars":  s.Repository.Stars,
+		"forks":  s.Repository.Forks,
+		"issues": s.Repository.Issues,
+	}
+	m, err := telegraf.NewMetric(meas, t, f, time.Now())
+	if err != nil {
+		log.Fatalf("Failed to create %v event", event)
+	}
+	return m
+}
+
+type StatusEvent struct {
+	Commit     string     `json:"sha"`
+	State      string     `json:"state"`
+	Repository Repository `json:"repository"`
+	Sender     Sender     `json:"sender"`
+}
+
+func (s StatusEvent) NewMetric() telegraf.Metric {
+	event := "status"
+	t := map[string]string{
+		"event":      event,
+		"repository": s.Repository.Repository,
+		"private":    fmt.Sprintf("%v", s.Repository.Private),
+		"user":       s.Sender.User,
+		"admin":      fmt.Sprintf("%v", s.Sender.Admin),
+	}
+	f := map[string]interface{}{
+		"stars":  s.Repository.Stars,
+		"forks":  s.Repository.Forks,
+		"issues": s.Repository.Issues,
+		"commit": s.Commit,
+		"state":  s.State,
+	}
+	m, err := telegraf.NewMetric(meas, t, f, time.Now())
+	if err != nil {
+		log.Fatalf("Failed to create %v event", event)
+	}
+	return m
+}
+
+type TeamAddEvent struct {
+	Team       Team       `json:"team"`
+	Repository Repository `json:"repository"`
+	Sender     Sender     `json:"sender"`
+}
+
+func (s TeamAddEvent) NewMetric() telegraf.Metric {
+	event := "team_add"
+	t := map[string]string{
+		"event":      event,
+		"repository": s.Repository.Repository,
+		"private":    fmt.Sprintf("%v", s.Repository.Private),
+		"user":       s.Sender.User,
+		"admin":      fmt.Sprintf("%v", s.Sender.Admin),
+	}
+	f := map[string]interface{}{
+		"stars":    s.Repository.Stars,
+		"forks":    s.Repository.Forks,
+		"issues":   s.Repository.Issues,
+		"teamName": s.Team.Name,
+	}
+	m, err := telegraf.NewMetric(meas, t, f, time.Now())
+	if err != nil {
+		log.Fatalf("Failed to create %v event", event)
+	}
+	return m
+}
+
+type WatchEvent struct {
+	Repository Repository `json:"repository"`
+	Sender     Sender     `json:"sender"`
+}
+
+func (s WatchEvent) NewMetric() telegraf.Metric {
+	event := "delete"
+	t := map[string]string{
+		"event":      event,
+		"repository": s.Repository.Repository,
+		"private":    fmt.Sprintf("%v", s.Repository.Private),
+		"user":       s.Sender.User,
+		"admin":      fmt.Sprintf("%v", s.Sender.Admin),
+	}
+	f := map[string]interface{}{
+		"stars":  s.Repository.Stars,
+		"forks":  s.Repository.Forks,
+		"issues": s.Repository.Issues,
+	}
+	m, err := telegraf.NewMetric(meas, t, f, time.Now())
+	if err != nil {
+		log.Fatalf("Failed to create %v event", event)
+	}
+	return m
+}
--- a/plugins/inputs/github_webhooks/github_webhooks_test.go
+++ b/plugins/inputs/github_webhooks/github_webhooks_test.go
@@ -0,0 +1,237 @@
+package github_webhooks
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+)
+
+func TestCommitCommentEvent(t *testing.T) {
+	gh := NewGithubWebhooks()
+	jsonString := CommitCommentEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "commit_comment")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
+}
+
+func TestDeleteEvent(t *testing.T) {
+	gh := NewGithubWebhooks()
+	jsonString := DeleteEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "delete")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
+}
+
+func TestDeploymentEvent(t *testing.T) {
+	gh := NewGithubWebhooks()
+	jsonString := DeploymentEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "deployment")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
+}
+
+func TestDeploymentStatusEvent(t *testing.T) {
+	gh := NewGithubWebhooks()
+	jsonString := DeploymentStatusEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "deployment_status")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
+}
+
+func TestForkEvent(t *testing.T) {
+	gh := NewGithubWebhooks()
+	jsonString := ForkEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "fork")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
+}
+
+func TestGollumEvent(t *testing.T) {
+	gh := NewGithubWebhooks()
+	jsonString := GollumEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "gollum")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
+}
+
+func TestIssueCommentEvent(t *testing.T) {
+	gh := NewGithubWebhooks()
+	jsonString := IssueCommentEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "issue_comment")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
+}
+
+func TestIssuesEvent(t *testing.T) {
+	gh := NewGithubWebhooks()
+	jsonString := IssuesEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "issues")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
+}
+
+func TestMemberEvent(t *testing.T) {
+	gh := NewGithubWebhooks()
+	jsonString := MemberEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "member")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
+}
+
+func TestMembershipEvent(t *testing.T) {
+	gh := NewGithubWebhooks()
+	jsonString := MembershipEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "membership")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
+}
+
+func TestPageBuildEvent(t *testing.T) {
+	gh := NewGithubWebhooks()
+	jsonString := PageBuildEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "page_build")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
+}
+
+func TestPublicEvent(t *testing.T) {
+	gh := NewGithubWebhooks()
+	jsonString := PublicEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "public")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
+}
+
+func TestPullRequestReviewCommentEvent(t *testing.T) {
+	gh := NewGithubWebhooks()
+	jsonString := PullRequestReviewCommentEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "pull_request_review_comment")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
+}
+
+func TestPushEvent(t *testing.T) {
+	gh := NewGithubWebhooks()
+	jsonString := PushEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "push")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
+}
+
+func TestReleaseEvent(t *testing.T) {
+	gh := NewGithubWebhooks()
+	jsonString := ReleaseEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "release")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
+}
+
+func TestRepositoryEvent(t *testing.T) {
+	gh := NewGithubWebhooks()
+	jsonString := RepositoryEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "repository")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
+}
+
+func TestStatusEvent(t *testing.T) {
+	gh := NewGithubWebhooks()
+
+	jsonString := StatusEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "status")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
+}
+
+func TestTeamAddEvent(t *testing.T) {
+	gh := NewGithubWebhooks()
+	jsonString := TeamAddEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "team_add")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
+}
+
+func TestWatchEvent(t *testing.T) {
+	gh := NewGithubWebhooks()
+	jsonString := WatchEventJSON()
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", "watch")
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("POST commit_comment returned HTTP status code %v.\nExpected %v", w.Code, http.StatusOK)
+	}
+}
--- a/plugins/inputs/haproxy/haproxy.go
+++ b/plugins/inputs/haproxy/haproxy.go
@@ -3,12 +3,14 @@ package haproxy
 import (
 	"encoding/csv"
 	"fmt"
-	"github.com/influxdb/telegraf/plugins"
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
 	"io"
 	"net/http"
 	"net/url"
 	"strconv"
 	"sync"
+	"time"
 )

 //CSV format: https://cbonte.github.io/haproxy-dconv/configuration-1.5.html#9.1
@@ -84,13 +86,13 @@ type haproxy struct {
 }

 var sampleConfig = `
-  # An array of address to gather stats about. Specify an ip on hostname
-  # with optional port. ie localhost, 10.10.3.33:1936, etc.
-  #
-  # If no servers are specified, then default to 127.0.0.1:1936
+  ## An array of address to gather stats about. Specify an ip on hostname
+  ## with optional port. ie localhost, 10.10.3.33:1936, etc.
+
+  ## If no servers are specified, then default to 127.0.0.1:1936
  servers = ["http://myhaproxy.com:1936", "http://anotherhaproxy.com:1936"]
-  # Or you can also use local socket(not work yet)
-  # servers = ["socket:/run/haproxy/admin.sock"]
+  ## Or you can also use local socket(not work yet)
+  ## servers = ["socket://run/haproxy/admin.sock"]
 `

 func (r *haproxy) SampleConfig() string {
@@ -103,7 +105,7 @@ func (r *haproxy) Description() string {

 // Reads stats from all configured servers accumulates stats.
 // Returns one of the errors encountered while gather stats (if any).
-func (g *haproxy) Gather(acc plugins.Accumulator) error {
+func (g *haproxy) Gather(acc telegraf.Accumulator) error {
 	if len(g.Servers) == 0 {
 		return g.gatherServer("http://127.0.0.1:1936", acc)
 	}
@@ -125,10 +127,13 @@ func (g *haproxy) Gather(acc plugins.Accumulator) error {
 	return outerr
 }

-func (g *haproxy) gatherServer(addr string, acc plugins.Accumulator) error {
+func (g *haproxy) gatherServer(addr string, acc telegraf.Accumulator) error {
 	if g.client == nil {
-
-		client := &http.Client{}
+		tr := &http.Transport{ResponseHeaderTimeout: time.Duration(3 * time.Second)}
+		client := &http.Client{
+			Transport: tr,
+			Timeout:   time.Duration(4 * time.Second),
+		}
 		g.client = client
 	}

@@ -152,214 +157,212 @@ func (g *haproxy) gatherServer(addr string, acc plugins.Accumulator) error {
 		return fmt.Errorf("Unable to get valid stat result from '%s': %s", addr, err)
 	}

-	importCsvResult(res.Body, acc, u.Host)
-
-	return nil
+	return importCsvResult(res.Body, acc, u.Host)
 }

-func importCsvResult(r io.Reader, acc plugins.Accumulator, host string) ([][]string, error) {
+func importCsvResult(r io.Reader, acc telegraf.Accumulator, host string) error {
 	csv := csv.NewReader(r)
 	result, err := csv.ReadAll()
+	now := time.Now()

 	for _, row := range result {
-
+		fields := make(map[string]interface{})
+		tags := map[string]string{
+			"server": host,
+			"proxy":  row[HF_PXNAME],
+			"sv":     row[HF_SVNAME],
+		}
 		for field, v := range row {
-			tags := map[string]string{
-				"server": host,
-				"proxy":  row[HF_PXNAME],
-				"sv":     row[HF_SVNAME],
-			}
 			switch field {
 			case HF_QCUR:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("qcur", ival, tags)
+					fields["qcur"] = ival
 				}
 			case HF_QMAX:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("qmax", ival, tags)
+					fields["qmax"] = ival
 				}
 			case HF_SCUR:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("scur", ival, tags)
+					fields["scur"] = ival
 				}
 			case HF_SMAX:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("smax", ival, tags)
+					fields["smax"] = ival
 				}
 			case HF_STOT:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("stot", ival, tags)
+					fields["stot"] = ival
 				}
 			case HF_BIN:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("bin", ival, tags)
+					fields["bin"] = ival
 				}
 			case HF_BOUT:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("bout", ival, tags)
+					fields["bout"] = ival
 				}
 			case HF_DREQ:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("dreq", ival, tags)
+					fields["dreq"] = ival
 				}
 			case HF_DRESP:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("dresp", ival, tags)
+					fields["dresp"] = ival
 				}
 			case HF_EREQ:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("ereq", ival, tags)
+					fields["ereq"] = ival
 				}
 			case HF_ECON:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("econ", ival, tags)
+					fields["econ"] = ival
 				}
 			case HF_ERESP:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("eresp", ival, tags)
+					fields["eresp"] = ival
 				}
 			case HF_WRETR:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("wretr", ival, tags)
+					fields["wretr"] = ival
 				}
 			case HF_WREDIS:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("wredis", ival, tags)
+					fields["wredis"] = ival
 				}
 			case HF_ACT:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("active_servers", ival, tags)
+					fields["active_servers"] = ival
 				}
 			case HF_BCK:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("backup_servers", ival, tags)
+					fields["backup_servers"] = ival
 				}
 			case HF_DOWNTIME:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("downtime", ival, tags)
+					fields["downtime"] = ival
 				}
 			case HF_THROTTLE:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("throttle", ival, tags)
+					fields["throttle"] = ival
 				}
 			case HF_LBTOT:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("lbtot", ival, tags)
+					fields["lbtot"] = ival
 				}
 			case HF_RATE:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("rate", ival, tags)
+					fields["rate"] = ival
 				}
 			case HF_RATE_MAX:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("rate_max", ival, tags)
+					fields["rate_max"] = ival
 				}
 			case HF_CHECK_DURATION:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("check_duration", ival, tags)
+					fields["check_duration"] = ival
 				}
 			case HF_HRSP_1xx:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("http_response.1xx", ival, tags)
+					fields["http_response.1xx"] = ival
 				}
 			case HF_HRSP_2xx:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("http_response.2xx", ival, tags)
+					fields["http_response.2xx"] = ival
 				}
 			case HF_HRSP_3xx:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("http_response.3xx", ival, tags)
+					fields["http_response.3xx"] = ival
 				}
 			case HF_HRSP_4xx:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("http_response.4xx", ival, tags)
+					fields["http_response.4xx"] = ival
 				}
 			case HF_HRSP_5xx:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("http_response.5xx", ival, tags)
+					fields["http_response.5xx"] = ival
 				}
 			case HF_REQ_RATE:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("req_rate", ival, tags)
+					fields["req_rate"] = ival
 				}
 			case HF_REQ_RATE_MAX:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("req_rate_max", ival, tags)
+					fields["req_rate_max"] = ival
 				}
 			case HF_REQ_TOT:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("req_tot", ival, tags)
+					fields["req_tot"] = ival
 				}
 			case HF_CLI_ABRT:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("cli_abort", ival, tags)
+					fields["cli_abort"] = ival
 				}
 			case HF_SRV_ABRT:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("srv_abort", ival, tags)
+					fields["srv_abort"] = ival
 				}
 			case HF_QTIME:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("qtime", ival, tags)
+					fields["qtime"] = ival
 				}
 			case HF_CTIME:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("ctime", ival, tags)
+					fields["ctime"] = ival
 				}
 			case HF_RTIME:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("rtime", ival, tags)
+					fields["rtime"] = ival
 				}
 			case HF_TTIME:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
-					acc.Add("ttime", ival, tags)
+					fields["ttime"] = ival
 				}
-
 			}
-
 		}
+		acc.AddFields("haproxy", fields, tags, now)
 	}
-	return result, err
+	return err
 }

 func init() {
-	plugins.Add("haproxy", func() plugins.Plugin {
+	inputs.Add("haproxy", func() telegraf.Input {
 		return &haproxy{}
 	})
 }
--- a/plugins/inputs/haproxy/haproxy_test.go
+++ b/plugins/inputs/haproxy/haproxy_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"

-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"net/http"
@@ -47,52 +47,39 @@ func TestHaproxyGeneratesMetricsWithAuthentication(t *testing.T) {
 		"sv":     "host0",
 	}

-	assert.NoError(t, acc.ValidateTaggedValue("stot", uint64(171014), tags))
-
-	checkInt := []struct {
-		name  string
-		value uint64
-	}{
-
-		{"qmax", 81},
-		{"scur", 288},
-		{"smax", 713},
-		{"bin", 5557055817},
-		{"bout", 24096715169},
-		{"dreq", 1102},
-		{"dresp", 80},
-		{"ereq", 95740},
-		{"econ", 0},
-		{"eresp", 0},
-		{"wretr", 17},
-		{"wredis", 19},
-		{"active_servers", 1},
-		{"backup_servers", 0},
-		{"downtime", 0},
-		{"throttle", 13},
-		{"lbtot", 114},
-		{"rate", 18},
-		{"rate_max", 102},
-		{"check_duration", 1},
-		{"http_response.1xx", 0},
-		{"http_response.2xx", 1314093},
-		{"http_response.3xx", 537036},
-		{"http_response.4xx", 123452},
-		{"http_response.5xx", 11966},
-		{"req_rate", 35},
-		{"req_rate_max", 140},
-		{"req_tot", 1987928},
-		{"cli_abort", 0},
-		{"srv_abort", 0},
-		{"qtime", 0},
-		{"ctime", 2},
-		{"rtime", 23},
-		{"ttime", 545},
-	}
-
-	for _, c := range checkInt {
-		assert.Equal(t, true, acc.CheckValue(c.name, c.value))
+	fields := map[string]interface{}{
+		"active_servers":    uint64(1),
+		"backup_servers":    uint64(0),
+		"bin":               uint64(510913516),
+		"bout":              uint64(2193856571),
+		"check_duration":    uint64(10),
+		"cli_abort":         uint64(73),
+		"ctime":             uint64(2),
+		"downtime":          uint64(0),
+		"dresp":             uint64(0),
+		"econ":              uint64(0),
+		"eresp":             uint64(1),
+		"http_response.1xx": uint64(0),
+		"http_response.2xx": uint64(119534),
+		"http_response.3xx": uint64(48051),
+		"http_response.4xx": uint64(2345),
+		"http_response.5xx": uint64(1056),
+		"lbtot":             uint64(171013),
+		"qcur":              uint64(0),
+		"qmax":              uint64(0),
+		"qtime":             uint64(0),
+		"rate":              uint64(3),
+		"rate_max":          uint64(12),
+		"rtime":             uint64(312),
+		"scur":              uint64(1),
+		"smax":              uint64(32),
+		"srv_abort":         uint64(1),
+		"stot":              uint64(171014),
+		"ttime":             uint64(2341),
+		"wredis":            uint64(0),
+		"wretr":             uint64(1),
 	}
+	acc.AssertContainsTaggedFields(t, "haproxy", fields, tags)

 	//Here, we should get error because we don't pass authentication data
 	r = &haproxy{
@@ -124,10 +111,39 @@ func TestHaproxyGeneratesMetricsWithoutAuthentication(t *testing.T) {
 		"sv":     "host0",
 	}

-	assert.NoError(t, acc.ValidateTaggedValue("stot", uint64(171014), tags))
-	assert.NoError(t, acc.ValidateTaggedValue("scur", uint64(1), tags))
-	assert.NoError(t, acc.ValidateTaggedValue("rate", uint64(3), tags))
-	assert.Equal(t, true, acc.CheckValue("bin", uint64(5557055817)))
+	fields := map[string]interface{}{
+		"active_servers":    uint64(1),
+		"backup_servers":    uint64(0),
+		"bin":               uint64(510913516),
+		"bout":              uint64(2193856571),
+		"check_duration":    uint64(10),
+		"cli_abort":         uint64(73),
+		"ctime":             uint64(2),
+		"downtime":          uint64(0),
+		"dresp":             uint64(0),
+		"econ":              uint64(0),
+		"eresp":             uint64(1),
+		"http_response.1xx": uint64(0),
+		"http_response.2xx": uint64(119534),
+		"http_response.3xx": uint64(48051),
+		"http_response.4xx": uint64(2345),
+		"http_response.5xx": uint64(1056),
+		"lbtot":             uint64(171013),
+		"qcur":              uint64(0),
+		"qmax":              uint64(0),
+		"qtime":             uint64(0),
+		"rate":              uint64(3),
+		"rate_max":          uint64(12),
+		"rtime":             uint64(312),
+		"scur":              uint64(1),
+		"smax":              uint64(32),
+		"srv_abort":         uint64(1),
+		"stot":              uint64(171014),
+		"ttime":             uint64(2341),
+		"wredis":            uint64(0),
+		"wretr":             uint64(1),
+	}
+	acc.AssertContainsTaggedFields(t, "haproxy", fields, tags)
 }

 //When not passing server config, we default to localhost
--- a/Show More
+++ b/Show More