Experimental windows build process changes

2016-02-22 18:20:37 -07:00
692 changed files with 10144 additions and 97250 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +0,0 @@
-CHANGELOG.md merge=union
-README.md merge=union
-plugins/inputs/all/all.go merge=union
-plugins/outputs/all/all.go merge=union
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,44 +0,0 @@
-## Directions
-
-GitHub Issues are reserved for actionable bug reports and feature requests.
-General questions should be asked at the [InfluxData Community](https://community.influxdata.com) site.
-
-Before opening an issue, search for similar bug reports or feature requests on GitHub Issues.
-If no similar issue can be found, fill out either the "Bug Report" or the "Feature Request" section below.
-Erase the other section and everything on and above this line.
-
-*Please note, the quickest way to fix a bug is to open a Pull Request.*
-
-## Bug report
-
-### Relevant telegraf.conf:
-
-### System info:
-
-[Include Telegraf version, operating system name, and other relevant details]
-
-### Steps to reproduce:
-
-1. ...
-2. ...
-
-### Expected behavior:
-
-### Actual behavior:
-
-### Additional info:
-
-[Include gist of relevant config, logs, etc.]
-
-
-## Feature Request
-
-Opening a feature request kicks off a discussion.
-
-### Proposal:
-
-### Current behavior:
-
-### Desired behavior:
-
-### Use case: [Why is this important (helps with prioritizing requests)]
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,5 +0,0 @@
-### Required for all PRs:
-
- [ ] Signed [CLA](https://influxdata.com/community/cla/).
- [ ] Associated README.md updated.
- [ ] Has appropriate unit tests.
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-build
 tivan
 .vagrant
 /telegraf
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,7 +2,7 @@

 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 one of: `plugins/{inputs,outputs,aggregators,processors}/all/all.go`
+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
@@ -11,13 +11,11 @@ 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.
-1. **Optional:** Help users of your plugin by including example queries for populating dashboards. Include these sample queries in the `README.md` for the plugin.
-1. **Optional:** Write a [tickscript](https://docs.influxdata.com/kapacitor/v1.0/tick/syntax/) for your plugin and add it to [Kapacitor](https://github.com/influxdata/kapacitor/tree/master/examples/telegraf).

 ## GoDoc

-Public interfaces for inputs, outputs, processors, aggregators, metrics,
-and the accumulator can be found on the 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)

@@ -32,7 +30,7 @@ Assuming you can already build the project, run these in the telegraf directory:

 1. `go get github.com/sparrc/gdm`
 1. `gdm restore`
-1. `GOOS=linux gdm save`
+1. `gdm save`

 ## Input Plugins

@@ -46,13 +44,13 @@ and submit new inputs.

 ### Input Plugin Guidelines

-* A plugin must conform to the [`telegraf.Input`](https://godoc.org/github.com/influxdata/telegraf#Input) interface.
+* 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.
 * 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 config`.
+plugin can be configured. This is include in `telegraf -sample-config`.
 * The `Description` function should say in one line what this plugin does.

 Let's say you've written a plugin that emits metrics about processes on the
@@ -82,11 +80,11 @@ func (s *Simple) SampleConfig() string {
    return "ok = true # indicate if everything is fine"
 }

-func (s *Simple) Gather(acc telegraf.Accumulator) error {
+func (s *Simple) Gather(acc inputs.Accumulator) error {
    if s.Ok {
-        acc.AddFields("state", map[string]interface{}{"value": "pretty good"}, nil)
+        acc.Add("state", "pretty good", nil)
    } else {
-        acc.AddFields("state", map[string]interface{}{"value": "not great"}, nil)
+        acc.Add("state", "not great", nil)
    }

    return nil
@@ -97,13 +95,6 @@ func init() {
 }
 ```

-## Adding Typed Metrics
-
-In addition the the `AddFields` function, the accumulator also supports an
-`AddGauge` and `AddCounter` function. These functions are for adding _typed_
-metrics. Metric types are ignored for the InfluxDB output, but can be used
-for other outputs, such as [prometheus](https://prometheus.io/docs/concepts/metric_types/).
-
 ## Input Plugins Accepting Arbitrary Data Formats

 Some input plugins (such as
@@ -123,8 +114,8 @@ creating the `Parser` object.
 You should also add the following to your SampleConfig() return:

 ```toml
-  ## Data format to consume.
-  ## Each data format has its own unique set of configuration options, read
+  ## 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"
@@ -177,13 +168,13 @@ similar constructs.

 ### Output Plugin Guidelines

-* An output must conform to the [`telegraf.Output`](https://godoc.org/github.com/influxdata/telegraf#Output) interface.
+* 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/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 config`.
+output can be configured. This is include in `telegraf -sample-config`.
 * The `Description` function should say in one line what this output does.

 ### Output Example
@@ -221,8 +212,8 @@ func (s *Simple) Close() error {
 }

 func (s *Simple) Write(metrics []telegraf.Metric) error {
-    for _, metric := range metrics {
-        // write `metric` to the output sink here
+    for _, pt := range points {
+        // write `pt` to the output sink here
    }
    return nil
 }
@@ -253,8 +244,8 @@ instantiating and creating the `Serializer` object.
 You should also add the following to your SampleConfig() return:

 ```toml
-  ## Data format to output.
-  ## Each data format has its own unique set of configuration options, read
+  ## 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"
@@ -275,210 +266,35 @@ and `Stop()` methods.
 * Same as the `Output` guidelines, except that they must conform to the
 `output.ServiceOutput` interface.

-## Processor Plugins
-
-This section is for developers who want to create a new processor plugin.
-
-### Processor Plugin Guidelines
-
-* A processor must conform to the [`telegraf.Processor`](https://godoc.org/github.com/influxdata/telegraf#Processor) interface.
-* Processors should call `processors.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/influxdata/telegraf/plugins/processors/all/all.go` file.
-* The `SampleConfig` function should return valid toml that describes how the
-processor can be configured. This is include in the output of `telegraf config`.
-* The `Description` function should say in one line what this processor does.
-
-### Processor Example
-
-```go
-package printer
-
-// printer.go
-
-import (
-	"fmt"
-
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/plugins/processors"
-)
-
-type Printer struct {
-}
-
-var sampleConfig = `
-`
-
-func (p *Printer) SampleConfig() string {
-	return sampleConfig
-}
-
-func (p *Printer) Description() string {
-	return "Print all metrics that pass through this filter."
-}
-
-func (p *Printer) Apply(in ...telegraf.Metric) []telegraf.Metric {
-	for _, metric := range in {
-		fmt.Println(metric.String())
-	}
-	return in
-}
-
-func init() {
-	processors.Add("printer", func() telegraf.Processor {
-		return &Printer{}
-	})
-}
-```
-
-## Aggregator Plugins
-
-This section is for developers who want to create a new aggregator plugin.
-
-### Aggregator Plugin Guidelines
-
-* A aggregator must conform to the [`telegraf.Aggregator`](https://godoc.org/github.com/influxdata/telegraf#Aggregator) interface.
-* Aggregators should call `aggregators.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/influxdata/telegraf/plugins/aggregators/all/all.go` file.
-* The `SampleConfig` function should return valid toml that describes how the
-aggregator can be configured. This is include in `telegraf config`.
-* The `Description` function should say in one line what this aggregator does.
-* The Aggregator plugin will need to keep caches of metrics that have passed
-through it. This should be done using the builtin `HashID()` function of each
-metric.
-* When the `Reset()` function is called, all caches should be cleared.
-
-### Aggregator Example
-
-```go
-package min
-
-// min.go
-
-import (
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/plugins/aggregators"
-)
-
-type Min struct {
-	// caches for metric fields, names, and tags
-	fieldCache map[uint64]map[string]float64
-	nameCache  map[uint64]string
-	tagCache   map[uint64]map[string]string
-}
-
-func NewMin() telegraf.Aggregator {
-	m := &Min{}
-	m.Reset()
-	return m
-}
-
-var sampleConfig = `
-  ## period is the flush & clear interval of the aggregator.
-  period = "30s"
-  ## If true drop_original will drop the original metrics and
-  ## only send aggregates.
-  drop_original = false
-`
-
-func (m *Min) SampleConfig() string {
-	return sampleConfig
-}
-
-func (m *Min) Description() string {
-	return "Keep the aggregate min of each metric passing through."
-}
-
-func (m *Min) Add(in telegraf.Metric) {
-	id := in.HashID()
-	if _, ok := m.nameCache[id]; !ok {
-		// hit an uncached metric, create caches for first time:
-		m.nameCache[id] = in.Name()
-		m.tagCache[id] = in.Tags()
-		m.fieldCache[id] = make(map[string]float64)
-		for k, v := range in.Fields() {
-			if fv, ok := convert(v); ok {
-				m.fieldCache[id][k] = fv
-			}
-		}
-	} else {
-		for k, v := range in.Fields() {
-			if fv, ok := convert(v); ok {
-				if _, ok := m.fieldCache[id][k]; !ok {
-					// hit an uncached field of a cached metric
-					m.fieldCache[id][k] = fv
-					continue
-				}
-				if fv < m.fieldCache[id][k] {
-                    // set new minimum
-					m.fieldCache[id][k] = fv
-				}
-			}
-		}
-	}
-}
-
-func (m *Min) Push(acc telegraf.Accumulator) {
-	for id, _ := range m.nameCache {
-		fields := map[string]interface{}{}
-		for k, v := range m.fieldCache[id] {
-			fields[k+"_min"] = v
-		}
-		acc.AddFields(m.nameCache[id], fields, m.tagCache[id])
-	}
-}
-
-func (m *Min) Reset() {
-	m.fieldCache = make(map[uint64]map[string]float64)
-	m.nameCache = make(map[uint64]string)
-	m.tagCache = make(map[uint64]map[string]string)
-}
-
-func convert(in interface{}) (float64, bool) {
-	switch v := in.(type) {
-	case float64:
-		return v, true
-	case int64:
-		return float64(v), true
-	default:
-		return 0, false
-	}
-}
-
-func init() {
-	aggregators.Add("min", func() telegraf.Aggregator {
-		return NewMin()
-	})
-}
-```
-
 ## Unit Tests

-Before opening a pull request you should run the linter checks and
-the short tests.
-
-### Execute linter
-
-execute `make lint`
-
 ### Execute short tests

-execute `make test`
+execute `make test-short`

-### Execute integration tests
+### Execute long tests

-Running the integration tests requires several docker containers to be
-running.  You can start the containers with:
-```
-make docker-run
-```
+As Telegraf collects metrics from several third-party services it becomes a
+difficult task to mock each service as some of them have complicated protocols
+which would take some time to replicate.

-And run the full test suite with:
-```
-make test-all
-```
+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/influxdata/telegraf/blob/master/plugins/inputs/redis/redis_test.go)
+a simple mock will suffice.

-Use `make docker-kill` to stop the containers.
+To execute Telegraf tests follow these simple steps:
+
+- Install docker following [these](https://docs.docker.com/installation/)
+instructions
+- execute `make test`
+
+**OSX users**: you will need to install `boot2docker` or `docker-machine`.
+The Makefile will assume that you have a `docker-machine` box called `default` to
+get the IP address.
+
+### Unit test troubleshooting
+
+Try cleaning up your test environment by executing `make docker-kill` and
+re-running
--- a/133
+++ b/133
@@ -1,92 +1,53 @@
-collectd.org 2ce144541b8903101fb8f1483cc0497a68798122
-github.com/aerospike/aerospike-client-go 95e1ad7791bdbca44707fedbb29be42024900d9c
-github.com/amir/raidman c74861fe6a7bb8ede0a010ce4485bdbb4fc4c985
-github.com/apache/thrift 4aaa92ece8503a6da9bc6701604f69acf2b99d07
-github.com/aws/aws-sdk-go c861d27d0304a79f727e9a8a4e2ac1e74602fdc0
-github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
-github.com/bsm/sarama-cluster abf039439f66c1ce78017f560b490612552f6472
-github.com/cenkalti/backoff b02f2bbce11d7ea6b97f282ef1771b0fe2f65ef3
-github.com/couchbase/go-couchbase bfe555a140d53dc1adf390f1a1d4b0fd4ceadb28
-github.com/couchbase/gomemcached 4a25d2f4e1dea9ea7dd76dfd943407abf9b07d29
-github.com/couchbase/goutils 5823a0cbaaa9008406021dc5daf80125ea30bba6
-github.com/davecgh/go-spew 346938d642f2ec3594ed81d874461961cd0faa76
-github.com/dgrijalva/jwt-go dbeaa9332f19a944acb5736b4456cfcc02140e29
-github.com/docker/docker f5ec1e2936dcbe7b5001c2b817188b095c700c27
-github.com/docker/go-connections 990a1a1a70b0da4c4cb70e117971a4f0babfbf1a
+git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git 617c801af238c3af2d9e72c5d4a0f02edad03ce5
+github.com/Shopify/sarama d37c73f2b2bce85f7fa16b6a550d26c5372892ef
+github.com/Sirupsen/logrus f7f79f729e0fbe2fcc061db48a9ba0263f588252
+github.com/amir/raidman 6a8e089bbe32e6b907feae5ba688841974b3c339
+github.com/aws/aws-sdk-go 87b1e60a50b09e4812dee560b33a238f67305804
+github.com/beorn7/perks b965b613227fddccbfffe13eae360ed3fa822f8d
+github.com/cenkalti/backoff 4dc77674aceaabba2c7e3da25d4c823edfb73f99
+github.com/dancannon/gorethink 6f088135ff288deb9d5546f4c71919207f891a70
+github.com/davecgh/go-spew 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d
 github.com/eapache/go-resiliency b86b1ec0dd4209a588dc1285cdd471e73525c0b3
-github.com/eapache/go-xerial-snappy bb955e01b9346ac19dc29eb16586c90ded99a98c
-github.com/eapache/queue 44cc805cf13205b55f69e14bcb69867d1ae92f98
-github.com/eclipse/paho.mqtt.golang d4f545eb108a2d19f9b1a735689dbfb719bc21fb
-github.com/go-logfmt/logfmt 390ab7935ee28ec6b286364bba9b4dd6410cb3d5
-github.com/go-sql-driver/mysql 2e00b5cd70399450106cec6431c2e2ce3cae5034
-github.com/gobwas/glob bea32b9cd2d6f55753d94a28e959b13f0244797a
-github.com/go-ini/ini 9144852efba7c4daf409943ee90767da62d55438
-github.com/gogo/protobuf 7b6c6391c4ff245962047fc1e2c6e08b1cdfa0e8
-github.com/golang/protobuf 8ee79997227bf9b34611aee7946ae64735e6fd93
-github.com/golang/snappy 7db9049039a047d955fe8c19b83c8ff5abd765c7
-github.com/go-ole/go-ole be49f7c07711fcb603cff39e1de7c67926dc0ba7
-github.com/google/go-cmp f94e52cad91c65a63acc1e75d4be223ea22e99bc
-github.com/gorilla/mux 392c28fe23e1c45ddba891b0320b3b5df220beea
-github.com/go-sql-driver/mysql 2e00b5cd70399450106cec6431c2e2ce3cae5034
+github.com/eapache/queue ded5959c0d4e360646dc9e9908cff48666781367
+github.com/fsouza/go-dockerclient 7b651349f9479f5114913eefbfd3c4eeddd79ab4
+github.com/go-ini/ini afbd495e5aaea13597b5e14fe514ddeaa4d76fc3
+github.com/go-sql-driver/mysql 7c7f556282622f94213bc028b4d0a7b6151ba239
+github.com/golang/protobuf 6aaa8d47701fa6cf07e914ec01fde3d4a1fe79c3
+github.com/golang/snappy 723cc1e459b8eea2dea4583200fd60757d40097a
+github.com/gonuts/go-shellquote e842a11b24c6abfb3dd27af69a17f482e4b483c2
+github.com/gorilla/context 1c83b3eabd45b6d76072b66b746c20815fb2872d
+github.com/gorilla/mux 26a6070f849969ba72b72256e9f14cf519751690
 github.com/hailocab/go-hostpool e80d13ce29ede4452c43dea11e79b9bc8a15b478
-github.com/hashicorp/consul 63d2fc68239b996096a1c55a0d4b400ea4c2583f
-github.com/influxdata/tail a395bf99fe07c233f41fba0735fa2b13b58588ea
-github.com/influxdata/toml 5d1d907f22ead1cd47adde17ceec5bda9cacaf8f
-github.com/influxdata/wlog 7c63b0a71ef8300adc255344d275e10e5c3a71ec
-github.com/jackc/pgx 63f58fd32edb5684b9e9f4cfaac847c6b42b3917
-github.com/jmespath/go-jmespath bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d
-github.com/kardianos/osext c2c54e542fb797ad986b31721e1baedf214ca413
-github.com/kardianos/service 6d3a0ee7d3425d9d835debc51a0ca1ffa28f4893
-github.com/kballard/go-shellquote d8ec1a69a250a17bb0e419c386eac1f3711dc142
-github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c
-github.com/Microsoft/go-winio ce2922f643c8fd76b46cadc7f404a06282678b34
-github.com/miekg/dns 99f84ae56e75126dd77e5de4fae2ea034a468ca1
-github.com/mitchellh/mapstructure d0303fe809921458f417bcf828397a65db30a7e4
-github.com/multiplay/go-ts3 07477f49b8dfa3ada231afc7b7b17617d42afe8e
+github.com/influxdata/config bae7cb98197d842374d3b8403905924094930f24
+github.com/influxdata/influxdb ef571fc104dc24b77cd3710c156cd95e5cfd7aa5
+github.com/jmespath/go-jmespath c01cf91b011868172fdcd9f41838e80c9d716264
+github.com/klauspost/crc32 999f3125931f6557b991b2f8472172bdfa578d38
+github.com/lib/pq 8ad2b298cadd691a77015666a5372eae5dbfac8f
+github.com/matttproud/golang_protobuf_extensions d0c3fe89de86839aecf2e0579c40ba3bb336a453
+github.com/mreiferson/go-snappystream 028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504
 github.com/naoina/go-stringutil 6b638e95a32d0c1131db0e7fe83775cbea4a0d0b
-github.com/nats-io/go-nats ea9585611a4ab58a205b9b125ebd74c389a6b898
-github.com/nats-io/nats ea9585611a4ab58a205b9b125ebd74c389a6b898
-github.com/nats-io/nuid 289cccf02c178dc782430d534e3c1f5b72af807f
-github.com/nsqio/go-nsq eee57a3ac4174c55924125bb15eeeda8cffb6e6f
-github.com/opencontainers/runc 89ab7f2ccc1e45ddf6485eaa802c35dcf321dfc8
-github.com/opentracing-contrib/go-observer a52f2342449246d5bcc273e65cbdcfa5f7d6c63c
-github.com/opentracing/opentracing-go 06f47b42c792fef2796e9681353e1d908c417827
-github.com/openzipkin/zipkin-go-opentracing 1cafbdfde94fbf2b373534764e0863aa3bd0bf7b
-github.com/pierrec/lz4 5c9560bfa9ace2bf86080bf40d46b34ae44604df
-github.com/pierrec/xxHash 5a004441f897722c627870a981d02b29924215fa
-github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d
-github.com/pmezard/go-difflib/difflib 792786c7400a136282c1664665ae0a8db921c6c2
-github.com/prometheus/client_golang c317fb74746eac4fc65fe3909195f4cf67c5562a
+github.com/naoina/toml 751171607256bb66e64c9f0220c00662420c38e9
+github.com/nats-io/nats 6a83f1a633cfbfd90aa648ac99fb38c06a8b40df
+github.com/nsqio/go-nsq 2118015c120962edc5d03325c680daf3163a8b5f
+github.com/pmezard/go-difflib 792786c7400a136282c1664665ae0a8db921c6c2
+github.com/prometheus/client_golang 67994f177195311c3ea3d4407ed0175e34a4256f
 github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6
-github.com/prometheus/common dd2f054febf4a6c00f2343686efb775948a8bff4
-github.com/prometheus/procfs 1878d9fbb537119d24b21ca07effd591627cd160
-github.com/rcrowley/go-metrics 1f30fe9094a513ce4c700b9a54458bbb0c96996c
-github.com/samuel/go-zookeeper 1d7be4effb13d2d908342d349d71a284a7542693
-github.com/satori/go.uuid 5bf94b69c6b68ee1b541973bb8e1144db23a194b
-github.com/shirou/gopsutil 384a55110aa5ae052eb93ea94940548c1e305a99
-github.com/shirou/w32 3c9377fc6748f222729a8270fe2775d149a249ad
-github.com/Shopify/sarama 3b1b38866a79f06deddf0487d5c27ba0697ccd65
-github.com/Sirupsen/logrus 61e43dc76f7ee59a82bdf3d71033dc12bea4c77d
-github.com/soniah/gosnmp 5ad50dc75ab389f8a1c9f8a67d3a1cd85f67ed15
-github.com/StackExchange/wmi f3e2bae1e0cb5aef83e319133eabfee30013a4a5
-github.com/streadway/amqp 63795daa9a446c920826655f26ba31c81c860fd6
+github.com/prometheus/common 14ca1097bbe21584194c15e391a9dab95ad42a59
+github.com/prometheus/procfs 406e5b7bfd8201a36e2bb5f7bdae0b03380c2ce8
+github.com/samuel/go-zookeeper 218e9c81c0dd8b3b18172b2bbfad92cc7d6db55f
+github.com/shirou/gopsutil e77438504d45b9985c99a75730fe65220ceea00e
+github.com/soniah/gosnmp b1b4f885b12c5dcbd021c5cee1c904110de6db7d
+github.com/streadway/amqp b4f3ceab0337f013208d31348b578d83c0064744
 github.com/stretchr/objx 1a9d0bb9f541897e62256577b352fdbc1fb4fd94
-github.com/stretchr/testify 4d4bfba8f1d1027c4fdbe371823030df51419987
-github.com/vjeantet/grok d73e972b60935c7fec0b4ffbc904ed39ecaf7efe
-github.com/wvanbergen/kafka bc265fedb9ff5b5c5d3c0fdcef4a819b3523d3ee
-github.com/wvanbergen/kazoo-go 968957352185472eacb69215fa3dbfcfdbac1096
-github.com/yuin/gopher-lua 66c871e454fcf10251c61bf8eff02d0978cae75a
+github.com/stretchr/testify f390dcf405f7b83c997eac1b06768bb9f44dec18
+github.com/wvanbergen/kafka 1a8639a45164fcc245d5c7b4bd3ccfbd1a0ffbf3
+github.com/wvanbergen/kazoo-go 0f768712ae6f76454f987c3356177e138df258f8
 github.com/zensqlmonitor/go-mssqldb ffe5510c6fa5e15e6d983210ab501c815b56b363
-golang.org/x/crypto dc137beb6cce2043eb6b5f223ab8bf51c32459f4
-golang.org/x/net f2499483f923065a842d38eb4c7f1927e6fc6e6d
-golang.org/x/sys 739734461d1c916b6c72a63d7efda2b27edb369f
-golang.org/x/text 506f9d5c962f284575e88337e7d9296d27e729d3
-gopkg.in/asn1-ber.v1 4e86f4367175e39f69d9358a5f17b4dda270378d
-gopkg.in/fatih/pool.v2 6e328e67893eb46323ad06f0e92cb9536babbabc
-gopkg.in/fsnotify.v1 a8a77c9133d2d6fd8334f3260d06f60e8d80a5fb
-gopkg.in/gorethink/gorethink.v3 7ab832f7b65573104a555d84a27992ae9ea1f659
-gopkg.in/ldap.v2 8168ee085ee43257585e50c6441aadf54ecb2c9f
-gopkg.in/mgo.v2 3f83fa5005286a7fe593b055f0d7771a7dce4655
-gopkg.in/olivere/elastic.v5 3113f9b9ad37509fe5f8a0e5e91c96fdc4435e26
-gopkg.in/tomb.v1 dd632973f1e7218eb1089048e0798ec9ae7dceb8
-gopkg.in/yaml.v2 4c78c975fe7c825c6d1466c42be594d1d6f3aba6
+golang.org/x/crypto 1f22c0103821b9390939b6776727195525381532
+golang.org/x/net 04b9de9b512f58addf28c9853d50ebef61c3953e
+golang.org/x/text 6d3c22c4525a4da167968fa2479be5524d2e8bd0
+gopkg.in/dancannon/gorethink.v1 6f088135ff288deb9d5546f4c71919207f891a70
+gopkg.in/fatih/pool.v2 cba550ebf9bce999a02e963296d4bc7a486cb715
+gopkg.in/mgo.v2 03c9f3ee4c14c8e51ee521a6a7d0425658dd6f64
+gopkg.in/yaml.v2 f7716cbe52baa25d2e9b0d0da546fcf909fc16b4
+github.com/miekg/dns e0d84d97e59bcb6561eae269c4e94d25b66822cb
--- a/56
+++ b/56
@@ -0,0 +1,56 @@
+git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git 617c801af238c3af2d9e72c5d4a0f02edad03ce5
+github.com/Shopify/sarama d37c73f2b2bce85f7fa16b6a550d26c5372892ef
+github.com/Sirupsen/logrus f7f79f729e0fbe2fcc061db48a9ba0263f588252
+github.com/StackExchange/wmi f3e2bae1e0cb5aef83e319133eabfee30013a4a5
+github.com/amir/raidman 6a8e089bbe32e6b907feae5ba688841974b3c339
+github.com/aws/aws-sdk-go 87b1e60a50b09e4812dee560b33a238f67305804
+github.com/beorn7/perks b965b613227fddccbfffe13eae360ed3fa822f8d
+github.com/cenkalti/backoff 4dc77674aceaabba2c7e3da25d4c823edfb73f99
+github.com/dancannon/gorethink 6f088135ff288deb9d5546f4c71919207f891a70
+github.com/davecgh/go-spew 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d
+github.com/eapache/go-resiliency b86b1ec0dd4209a588dc1285cdd471e73525c0b3
+github.com/eapache/queue ded5959c0d4e360646dc9e9908cff48666781367
+github.com/fsouza/go-dockerclient 7b651349f9479f5114913eefbfd3c4eeddd79ab4
+github.com/go-ini/ini afbd495e5aaea13597b5e14fe514ddeaa4d76fc3
+github.com/go-ole/go-ole 50055884d646dd9434f16bbb5c9801749b9bafe4
+github.com/go-sql-driver/mysql 7c7f556282622f94213bc028b4d0a7b6151ba239
+github.com/golang/protobuf 6aaa8d47701fa6cf07e914ec01fde3d4a1fe79c3
+github.com/golang/snappy 723cc1e459b8eea2dea4583200fd60757d40097a
+github.com/gonuts/go-shellquote e842a11b24c6abfb3dd27af69a17f482e4b483c2
+github.com/gorilla/context 1c83b3eabd45b6d76072b66b746c20815fb2872d
+github.com/gorilla/mux 26a6070f849969ba72b72256e9f14cf519751690
+github.com/hailocab/go-hostpool e80d13ce29ede4452c43dea11e79b9bc8a15b478
+github.com/influxdata/config bae7cb98197d842374d3b8403905924094930f24
+github.com/influxdata/influxdb ef571fc104dc24b77cd3710c156cd95e5cfd7aa5
+github.com/jmespath/go-jmespath c01cf91b011868172fdcd9f41838e80c9d716264
+github.com/klauspost/crc32 999f3125931f6557b991b2f8472172bdfa578d38
+github.com/lib/pq 8ad2b298cadd691a77015666a5372eae5dbfac8f
+github.com/lxn/win 9a7734ea4db26bc593d52f6a8a957afdad39c5c1
+github.com/matttproud/golang_protobuf_extensions d0c3fe89de86839aecf2e0579c40ba3bb336a453
+github.com/miekg/dns e0d84d97e59bcb6561eae269c4e94d25b66822cb
+github.com/mreiferson/go-snappystream 028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504
+github.com/naoina/go-stringutil 6b638e95a32d0c1131db0e7fe83775cbea4a0d0b
+github.com/naoina/toml 751171607256bb66e64c9f0220c00662420c38e9
+github.com/nats-io/nats 6a83f1a633cfbfd90aa648ac99fb38c06a8b40df
+github.com/nsqio/go-nsq 2118015c120962edc5d03325c680daf3163a8b5f
+github.com/pmezard/go-difflib 792786c7400a136282c1664665ae0a8db921c6c2
+github.com/prometheus/client_golang 67994f177195311c3ea3d4407ed0175e34a4256f
+github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6
+github.com/prometheus/common 14ca1097bbe21584194c15e391a9dab95ad42a59
+github.com/prometheus/procfs 406e5b7bfd8201a36e2bb5f7bdae0b03380c2ce8
+github.com/samuel/go-zookeeper 218e9c81c0dd8b3b18172b2bbfad92cc7d6db55f
+github.com/shirou/gopsutil e77438504d45b9985c99a75730fe65220ceea00e
+github.com/shirou/w32 ada3ba68f000aa1b58580e45c9d308fe0b7fc5c5
+github.com/soniah/gosnmp b1b4f885b12c5dcbd021c5cee1c904110de6db7d
+github.com/streadway/amqp b4f3ceab0337f013208d31348b578d83c0064744
+github.com/stretchr/objx 1a9d0bb9f541897e62256577b352fdbc1fb4fd94
+github.com/stretchr/testify f390dcf405f7b83c997eac1b06768bb9f44dec18
+github.com/wvanbergen/kafka 1a8639a45164fcc245d5c7b4bd3ccfbd1a0ffbf3
+github.com/wvanbergen/kazoo-go 0f768712ae6f76454f987c3356177e138df258f8
+github.com/zensqlmonitor/go-mssqldb ffe5510c6fa5e15e6d983210ab501c815b56b363
+golang.org/x/net 04b9de9b512f58addf28c9853d50ebef61c3953e
+golang.org/x/text 6d3c22c4525a4da167968fa2479be5524d2e8bd0
+gopkg.in/dancannon/gorethink.v1 6f088135ff288deb9d5546f4c71919207f891a70
+gopkg.in/fatih/pool.v2 cba550ebf9bce999a02e963296d4bc7a486cb715
+gopkg.in/mgo.v2 03c9f3ee4c14c8e51ee521a6a7d0425658dd6f64
+gopkg.in/yaml.v2 f7716cbe52baa25d2e9b0d0da546fcf909fc16b4
--- a/175
+++ b/175
@@ -1,127 +1,108 @@
-PREFIX := /usr/local
-VERSION := $(shell git describe --exact-match --tags 2>/dev/null)
-BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
-COMMIT := $(shell git rev-parse --short HEAD)
+UNAME := $(shell sh -c 'uname')
+VERSION := $(shell sh -c 'git describe --always --tags')
 ifdef GOBIN
 PATH := $(GOBIN):$(PATH)
 else
 PATH := $(subst :,/bin:,$(GOPATH))/bin:$(PATH)
 endif

-TELEGRAF := telegraf$(shell go tool dist env | grep -q 'GOOS=.windows.' && echo .exe)
+# Standard Telegraf build
+default: prepare build

-LDFLAGS := $(LDFLAGS) -X main.commit=$(COMMIT) -X main.branch=$(BRANCH)
-ifdef VERSION
-	LDFLAGS += -X main.version=$(VERSION)
-endif
+# Windows build
+windows: prepare-windows build-windows

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

-deps:
+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 -o telegraf -ldflags \
+					"-X main.Version=$(VERSION)" \
+					./cmd/telegraf/telegraf.go
+
+# Build with race detector
+dev: prepare
+	go build -race -ldflags "-X main.Version=$(VERSION)" ./...
+
+# 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 github.com/sparrc/gdm
 	gdm restore

-telegraf:
-	go build -i -o $(TELEGRAF) -ldflags "$(LDFLAGS)" ./cmd/telegraf/telegraf.go
+# Use the windows godeps file to prepare dependencies
+prepare-windows:
+	go get github.com/sparrc/gdm
+	gdm restore -f Godeps_windows

-go-install:
-	go install -ldflags "-w -s $(LDFLAGS)" ./cmd/telegraf
-
-install: telegraf
-	mkdir -p $(DESTDIR)$(PREFIX)/bin/
-	cp $(TELEGRAF) $(DESTDIR)$(PREFIX)/bin/
-
-test:
-	go test -short ./...
-
-test-windows:
-	go test ./plugins/inputs/ping/...
-	go test ./plugins/inputs/win_perf_counters/...
-	go test ./plugins/inputs/win_services/...
-
-lint:
-	go vet ./...
-
-test-all: lint
-	go test ./...
-
-package:
-	./scripts/build.py --package --platform=all --arch=all
-
-clean:
-	-rm -f telegraf
-	-rm -f telegraf.exe
-
-docker-image:
-	./scripts/build.py --package --platform=linux --arch=amd64
-	cp build/telegraf*$(COMMIT)*.deb .
-	docker build -f scripts/dev.docker --build-arg "package=telegraf*$(COMMIT)*.deb" -t "telegraf-dev:$(COMMIT)" .
-
-# Run all docker containers necessary for integration tests
+# Run all docker containers necessary for unit tests
 docker-run:
-	docker run --name aerospike -p "3000:3000" -d aerospike/aerospike-server:3.9.0
-	docker run --name zookeeper -p "2181:2181" -d wurstmeister/zookeeper
+ifeq ($(UNAME), Darwin)
 	docker run --name kafka \
-		--link zookeeper:zookeeper \
-		-e KAFKA_ADVERTISED_HOST_NAME=localhost \
-		-e KAFKA_ADVERTISED_PORT=9092 \
-		-e KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181 \
-		-e KAFKA_CREATE_TOPICS="test:1:1" \
-		-p "9092:9092" \
-		-d wurstmeister/kafka
-	docker run --name elasticsearch -p "9200:9200" -p "9300:9300" -d elasticsearch:5
+		-e ADVERTISED_HOST=$(shell sh -c 'boot2docker ip || docker-machine ip default') \
+		-e ADVERTISED_PORT=9092 \
+		-p "2181:2181" -p "9092:9092" \
+		-d spotify/kafka
+endif
+ifeq ($(UNAME), Linux)
+	docker run --name kafka \
+		-e ADVERTISED_HOST=localhost \
+		-e ADVERTISED_PORT=9092 \
+		-p "2181:2181" -p "9092:9092" \
+		-d spotify/kafka
+endif
 	docker run --name mysql -p "3306:3306" -e MYSQL_ALLOW_EMPTY_PASSWORD=yes -d mysql
 	docker run --name memcached -p "11211:11211" -d memcached
 	docker run --name postgres -p "5432:5432" -d postgres
 	docker run --name rabbitmq -p "15672:15672" -p "5672:5672" -d rabbitmq:3-management
+	docker run --name opentsdb -p "4242:4242" -d petergrace/opentsdb-docker
 	docker run --name redis -p "6379:6379" -d redis
+	docker run --name aerospike -p "3000:3000" -d aerospike
 	docker run --name nsq -p "4150:4150" -d nsqio/nsq /nsqd
 	docker run --name mqtt -p "1883:1883" -d ncarlier/mqtt
-	docker run --name riemann -p "5555:5555" -d stealthly/docker-riemann
-	docker run --name nats -p "4222:4222" -d nats
-	docker run --name openldap \
-		-e SLAPD_CONFIG_ROOTDN="cn=manager,cn=config" \
-		-e SLAPD_CONFIG_ROOTPW="secret" \
-		-p "389:389" -p "636:636" \
-		-d cobaugh/openldap-alpine
-	docker run --name cratedb \
-		-p "6543:5432" \
-		-d crate:2.2 \
-		-Cnetwork.host=0.0.0.0 \
-		-Ctransport.host=localhost \
-		-Clicense.enterprise=false
+	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 integration tests; skipping services provided
-# by CircleCI
+# Run docker containers necessary for CircleCI unit tests
 docker-run-circle:
-	docker run --name aerospike -p "3000:3000" -d aerospike/aerospike-server:3.9.0
-	docker run --name zookeeper -p "2181:2181" -d wurstmeister/zookeeper
 	docker run --name kafka \
-		--link zookeeper:zookeeper \
-		-e KAFKA_ADVERTISED_HOST_NAME=localhost \
-		-e KAFKA_ADVERTISED_PORT=9092 \
-		-e KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181 \
-		-e KAFKA_CREATE_TOPICS="test:1:1" \
-		-p "9092:9092" \
-		-d wurstmeister/kafka
-	docker run --name elasticsearch -p "9200:9200" -p "9300:9300" -d elasticsearch:5
+		-e ADVERTISED_HOST=localhost \
+		-e ADVERTISED_PORT=9092 \
+		-p "2181:2181" -p "9092:9092" \
+		-d spotify/kafka
+	docker run --name opentsdb -p "4242:4242" -d petergrace/opentsdb-docker
+	docker run --name aerospike -p "3000:3000" -d aerospike
 	docker run --name nsq -p "4150:4150" -d nsqio/nsq /nsqd
 	docker run --name mqtt -p "1883:1883" -d ncarlier/mqtt
-	docker run --name riemann -p "5555:5555" -d stealthly/docker-riemann
-	docker run --name nats -p "4222:4222" -d nats
-	docker run --name openldap \
-		-e SLAPD_CONFIG_ROOTDN="cn=manager,cn=config" \
-		-e SLAPD_CONFIG_ROOTPW="secret" \
-		-p "389:389" -p "636:636" \
-		-d cobaugh/openldap-alpine
+	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 aerospike elasticsearch kafka memcached mqtt mysql nats nsq \
-		openldap postgres rabbitmq redis riemann zookeeper cratedb
-	-docker rm aerospike elasticsearch kafka memcached mqtt mysql nats nsq \
-		openldap postgres rabbitmq redis riemann zookeeper cratedb
+	-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

-.PHONY: deps telegraf telegraf.exe install test test-windows lint test-all \
-	package clean docker-run docker-run-circle docker-kill docker-image
+# Run full unit tests using docker containers (includes setup and teardown)
+test: vet docker-kill docker-run
+	# Sleeping for kafka leadership election, TSDB setup, etc.
+	sleep 60
+	# SUCCESS, running tests
+	go test -race ./...
+
+# Run "short" unit tests
+test-short: vet
+	go test -short ./...
+
+vet:
+	go vet ./...
+
+.PHONY: test test-short vet build default
--- a/README.md
+++ b/README.md
@@ -1,218 +1,206 @@
-# Telegraf [![Circle CI](https://circleci.com/gh/influxdata/telegraf.svg?style=svg)](https://circleci.com/gh/influxdata/telegraf) [![Docker pulls](https://img.shields.io/docker/pulls/library/telegraf.svg)](https://hub.docker.com/_/telegraf/)
+# Telegraf [![Circle CI](https://circleci.com/gh/influxdata/telegraf.svg?style=svg)](https://circleci.com/gh/influxdata/telegraf)

-Telegraf is an agent written in Go for collecting, processing, aggregating,
-and writing metrics.
+Telegraf is an agent written in Go for collecting metrics from the system it's
+running on, or from other services, and writing them into InfluxDB or other
+[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 local or remote services.
+from well known services (like Hadoop, Postgres, or Redis) and third party
+APIs (like Mailchimp, AWS CloudWatch, or Google Analytics).

-Telegraf is plugin-driven and has the concept of 4 distinct plugins:
-
-1. [Input Plugins](#input-plugins) collect metrics from the system, services, or 3rd party APIs
-2. [Processor Plugins](#processor-plugins) transform, decorate, and/or filter metrics
-3. [Aggregator Plugins](#aggregator-plugins) create aggregate metrics (e.g. mean, min, max, quantiles, etc.)
-4. [Output Plugins](#output-plugins) write metrics to various destinations
-
-For more information on Processor and Aggregator plugins please [read this](./docs/AGGREGATORS_AND_PROCESSORS.md).
-
-New plugins are designed to be easy to contribute,
+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.
-
-## Contributing
-
-There are many ways to contribute:
- Fix and [report bugs](https://github.com/influxdata/telegraf/issues/new)
- [Improve documentation](https://github.com/influxdata/telegraf/issues?q=is%3Aopen+label%3Adocumentation)
- [Review code and feature proposals](https://github.com/influxdata/telegraf/pulls)
- Answer questions on github and on the [Community Site](https://community.influxdata.com/)
- [Contribute plugins](CONTRIBUTING.md)
+See the [contributing guide](CONTRIBUTING.md) for instructions on writing
+new plugins.

 ## Installation:

-You can download the binaries directly from the [downloads](https://www.influxdata.com/downloads) page
-or from the [releases](https://github.com/influxdata/telegraf/releases) section.
+NOTE: Telegraf 0.10.x is **not** backwards-compatible with previous versions
+of telegraf, both in the database layout and the configuration file. 0.2.x
+will continue to be supported, see below for download links.
+
+For more details on the differences between Telegraf 0.2.x and 0.10.x, see
+the [release blog post](https://influxdata.com/blog/announcing-telegraf-0-10-0/).
+
+### Linux deb and rpm Packages:
+
+Latest:
+* http://get.influxdb.org/telegraf/telegraf_0.10.3-1_amd64.deb
+* http://get.influxdb.org/telegraf/telegraf-0.10.3-1.x86_64.rpm
+
+Latest (arm):
+* http://get.influxdb.org/telegraf/telegraf_0.10.3-1_arm.deb
+* http://get.influxdb.org/telegraf/telegraf-0.10.3-1.arm.rpm
+
+0.2.x:
+* http://get.influxdb.org/telegraf/telegraf_0.2.4_amd64.deb
+* http://get.influxdb.org/telegraf/telegraf-0.2.4-1.x86_64.rpm
+
+##### 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`
+
+### yum/apt Repositories:
+
+There is a yum/apt repo available for the whole InfluxData stack, see
+[here](https://docs.influxdata.com/influxdb/v0.9/introduction/installation/#installation)
+for instructions, replacing the `influxdb` package name with `telegraf`.
+
+### Linux tarballs:
+
+Latest:
+* http://get.influxdb.org/telegraf/telegraf-0.10.3-1_linux_amd64.tar.gz
+* http://get.influxdb.org/telegraf/telegraf-0.10.3-1_linux_i386.tar.gz
+* http://get.influxdb.org/telegraf/telegraf-0.10.3-1_linux_arm.tar.gz
+
+0.2.x:
+* 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
+
+##### tarball Instructions:
+
+To install the full directory structure with config file, run:
+
+```
+sudo tar -C / -zxvf ./telegraf-0.10.3-1_linux_amd64.tar.gz
+```
+
+To extract only the binary, run:
+
+```
+tar -zxvf telegraf-0.10.3-1_linux_amd64.tar.gz --strip-components=3 ./usr/bin/telegraf
+```

 ### Ansible Role:

 Ansible role: https://github.com/rossmcdonald/telegraf

+### OSX via Homebrew:
+
+```
+brew update
+brew install telegraf
+```
+
 ### From Source:

-Telegraf requires golang version 1.8+, the Makefile requires GNU make.
-
-Dependencies are managed with [gdm](https://github.com/sparrc/gdm),
-which is installed by the Makefile if you don't have it already.
+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.5+.

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

-### Nightly Builds
-
-These builds are generated from the master branch:
- [telegraf_nightly_amd64.deb](https://dl.influxdata.com/telegraf/nightlies/telegraf_nightly_amd64.deb)
- [telegraf_nightly_arm64.deb](https://dl.influxdata.com/telegraf/nightlies/telegraf_nightly_arm64.deb)
- [telegraf-nightly.arm64.rpm](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly.arm64.rpm)
- [telegraf_nightly_armel.deb](https://dl.influxdata.com/telegraf/nightlies/telegraf_nightly_armel.deb)
- [telegraf-nightly.armel.rpm](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly.armel.rpm)
- [telegraf_nightly_armhf.deb](https://dl.influxdata.com/telegraf/nightlies/telegraf_nightly_armhf.deb)
- [telegraf-nightly.armv6hl.rpm](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly.armv6hl.rpm)
- [telegraf-nightly_freebsd_amd64.tar.gz](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly_freebsd_amd64.tar.gz)
- [telegraf-nightly_freebsd_i386.tar.gz](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly_freebsd_i386.tar.gz)
- [telegraf_nightly_i386.deb](https://dl.influxdata.com/telegraf/nightlies/telegraf_nightly_i386.deb)
- [telegraf-nightly.i386.rpm](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly.i386.rpm)
- [telegraf-nightly_linux_amd64.tar.gz](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly_linux_amd64.tar.gz)
- [telegraf-nightly_linux_arm64.tar.gz](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly_linux_arm64.tar.gz)
- [telegraf-nightly_linux_armel.tar.gz](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly_linux_armel.tar.gz)
- [telegraf-nightly_linux_armhf.tar.gz](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly_linux_armhf.tar.gz)
- [telegraf-nightly_linux_i386.tar.gz](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly_linux_i386.tar.gz)
- [telegraf-nightly_linux_s390x.tar.gz](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly_linux_s390x.tar.gz)
- [telegraf_nightly_s390x.deb](https://dl.influxdata.com/telegraf/nightlies/telegraf_nightly_s390x.deb)
- [telegraf-nightly.s390x.rpm](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly.s390x.rpm)
- [telegraf-nightly_windows_amd64.zip](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly_windows_amd64.zip)
- [telegraf-nightly_windows_i386.zip](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly_windows_i386.zip)
- [telegraf-nightly.x86_64.rpm](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly.x86_64.rpm)
- [telegraf-static-nightly_linux_amd64.tar.gz](https://dl.influxdata.com/telegraf/nightlies/telegraf-static-nightly_linux_amd64.tar.gz)
-
 ## How to use it:

-See usage with:
+```console
+$ telegraf -help
+Telegraf, The plugin-driven server agent for collecting and reporting metrics.

-```
-./telegraf --help
-```
+Usage:

-#### Generate a telegraf config file:
+  telegraf <flags>

-```
-./telegraf config > telegraf.conf
-```
+The flags are:

-#### Generate config with only cpu input & influxdb output plugins defined:
+  -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

-```
-./telegraf --input-filter cpu --output-filter influxdb config
-```
+Examples:

-#### Run a single telegraf collection, outputing metrics to stdout:
+  # generate a telegraf config file:
+  telegraf -sample-config > telegraf.conf

-```
-./telegraf --config telegraf.conf --test
-```
+  # generate config with only cpu input & influxdb output plugins defined
+  telegraf -sample-config -input-filter cpu -output-filter influxdb

-#### Run telegraf with all plugins defined in config file:
+  # run a single telegraf collection, outputing metrics to stdout
+  telegraf -config telegraf.conf -test

-```
-./telegraf --config telegraf.conf
-```
-
-#### Run telegraf, enabling the cpu & memory input, and influxdb output plugins:
+  # 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
 ```
-./telegraf --config telegraf.conf --input-filter cpu:mem --output-filter influxdb
-```
-

 ## Configuration

 See the [configuration guide](docs/CONFIGURATION.md) for a rundown of the more advanced
 configuration options.

-## Input Plugins
+## Supported Input Plugins

-* [aerospike](./plugins/inputs/aerospike)
-* [amqp_consumer](./plugins/inputs/amqp_consumer) (rabbitmq)
-* [apache](./plugins/inputs/apache)
-* [aws cloudwatch](./plugins/inputs/cloudwatch)
-* [bcache](./plugins/inputs/bcache)
-* [bond](./plugins/inputs/bond)
-* [cassandra](./plugins/inputs/cassandra)
-* [ceph](./plugins/inputs/ceph)
-* [cgroup](./plugins/inputs/cgroup)
-* [chrony](./plugins/inputs/chrony)
-* [consul](./plugins/inputs/consul)
-* [conntrack](./plugins/inputs/conntrack)
-* [couchbase](./plugins/inputs/couchbase)
-* [couchdb](./plugins/inputs/couchdb)
-* [DC/OS](./plugins/inputs/dcos)
-* [disque](./plugins/inputs/disque)
-* [dmcache](./plugins/inputs/dmcache)
-* [dns query time](./plugins/inputs/dns_query)
-* [docker](./plugins/inputs/docker)
-* [dovecot](./plugins/inputs/dovecot)
-* [elasticsearch](./plugins/inputs/elasticsearch)
-* [exec](./plugins/inputs/exec) (generic executable plugin, support JSON, influx, graphite and nagios)
-* [fail2ban](./plugins/inputs/fail2ban)
-* [filestat](./plugins/inputs/filestat)
-* [fluentd](./plugins/inputs/fluentd)
-* [graylog](./plugins/inputs/graylog)
-* [haproxy](./plugins/inputs/haproxy)
-* [hddtemp](./plugins/inputs/hddtemp)
-* [http_response](./plugins/inputs/http_response)
-* [httpjson](./plugins/inputs/httpjson) (generic JSON-emitting http service plugin)
-* [internal](./plugins/inputs/internal)
-* [influxdb](./plugins/inputs/influxdb)
-* [interrupts](./plugins/inputs/interrupts)
-* [ipmi_sensor](./plugins/inputs/ipmi_sensor)
-* [iptables](./plugins/inputs/iptables)
-* [jolokia](./plugins/inputs/jolokia) (deprecated, use [jolokia2](./plugins/inputs/jolokia2))
-* [jolokia2](./plugins/inputs/jolokia2)
-* [kapacitor](./plugins/inputs/kapacitor)
-* [kubernetes](./plugins/inputs/kubernetes)
-* [leofs](./plugins/inputs/leofs)
-* [lustre2](./plugins/inputs/lustre2)
-* [mailchimp](./plugins/inputs/mailchimp)
-* [memcached](./plugins/inputs/memcached)
-* [mesos](./plugins/inputs/mesos)
-* [minecraft](./plugins/inputs/minecraft)
-* [mongodb](./plugins/inputs/mongodb)
-* [mysql](./plugins/inputs/mysql)
-* [net_response](./plugins/inputs/net_response)
-* [nginx](./plugins/inputs/nginx)
-* [nginx_plus](./plugins/inputs/nginx_plus)
-* [nsq](./plugins/inputs/nsq)
-* [nstat](./plugins/inputs/nstat)
-* [ntpq](./plugins/inputs/ntpq)
-* [openldap](./plugins/inputs/openldap)
-* [opensmtpd](./plugins/inputs/opensmtpd)
-* [pf](./plugins/inputs/pf)
-* [phpfpm](./plugins/inputs/phpfpm)
-* [phusion passenger](./plugins/inputs/passenger)
-* [ping](./plugins/inputs/ping)
-* [postfix](./plugins/inputs/postfix)
-* [postgresql_extensible](./plugins/inputs/postgresql_extensible)
-* [postgresql](./plugins/inputs/postgresql)
-* [powerdns](./plugins/inputs/powerdns)
-* [procstat](./plugins/inputs/procstat)
-* [prometheus](./plugins/inputs/prometheus) (can be used for [Caddy server](./plugins/inputs/prometheus/README.md#usage-for-caddy-http-server))
-* [puppetagent](./plugins/inputs/puppetagent)
-* [rabbitmq](./plugins/inputs/rabbitmq)
-* [raindrops](./plugins/inputs/raindrops)
-* [redis](./plugins/inputs/redis)
-* [rethinkdb](./plugins/inputs/rethinkdb)
-* [riak](./plugins/inputs/riak)
-* [salesforce](./plugins/inputs/salesforce)
-* [sensors](./plugins/inputs/sensors)
-* [smart](./plugins/inputs/smart)
-* [snmp](./plugins/inputs/snmp)
-* [snmp_legacy](./plugins/inputs/snmp_legacy)
-* [solr](./plugins/inputs/solr)
-* [sql server](./plugins/inputs/sqlserver) (microsoft)
-* [teamspeak](./plugins/inputs/teamspeak)
-* [tomcat](./plugins/inputs/tomcat)
-* [twemproxy](./plugins/inputs/twemproxy)
-* [unbound](./plugins/input/unbound)
-* [varnish](./plugins/inputs/varnish)
-* [zfs](./plugins/inputs/zfs)
-* [zookeeper](./plugins/inputs/zookeeper)
-* [win_perf_counters](./plugins/inputs/win_perf_counters) (windows performance counters)
-* [win_services](./plugins/inputs/win_services)
-* [sysstat](./plugins/inputs/sysstat)
-* [system](./plugins/inputs/system)
+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`.
+
+Currently implemented sources:
+
+* aerospike
+* apache
+* bcache
+* couchdb
+* disque
+* dns query time
+* docker
+* dovecot
+* elasticsearch
+* exec (generic executable plugin, support JSON, influx and graphite)
+* haproxy
+* httpjson (generic JSON-emitting http service plugin)
+* influxdb
+* jolokia
+* leofs
+* lustre2
+* mailchimp
+* memcached
+* mesos
+* mongodb
+* mysql
+* net_response
+* nginx
+* nsq
+* phpfpm
+* phusion passenger
+* ping
+* postgresql
+* powerdns
+* procstat
+* prometheus
+* puppetagent
+* rabbitmq
+* raindrops
+* redis
+* rethinkdb
+* riak
+* sensors (only available if built from source)
+* snmp
+* sql server (microsoft)
+* twemproxy
+* zfs
+* zookeeper
+* win_perf_counters (windows performance counters)
+* system
    * cpu
    * mem
    * net
@@ -220,78 +208,37 @@ configuration options.
    * disk
    * diskio
    * swap
-    * processes
-    * kernel (/proc/stat)
-    * kernel (/proc/vmstat)
-    * linux_sysctl_fs (/proc/sys/fs)

 Telegraf can also collect metrics via the following service plugins:

-* [http_listener](./plugins/inputs/http_listener)
-* [kafka_consumer](./plugins/inputs/kafka_consumer)
-* [mqtt_consumer](./plugins/inputs/mqtt_consumer)
-* [nats_consumer](./plugins/inputs/nats_consumer)
-* [nsq_consumer](./plugins/inputs/nsq_consumer)
-* [logparser](./plugins/inputs/logparser)
-* [statsd](./plugins/inputs/statsd)
-* [socket_listener](./plugins/inputs/socket_listener)
-* [tail](./plugins/inputs/tail)
-* [tcp_listener](./plugins/inputs/socket_listener)
-* [udp_listener](./plugins/inputs/socket_listener)
-* [webhooks](./plugins/inputs/webhooks)
-  * [filestack](./plugins/inputs/webhooks/filestack)
-  * [github](./plugins/inputs/webhooks/github)
-  * [mandrill](./plugins/inputs/webhooks/mandrill)
-  * [papertrail](./plugins/inputs/webhooks/papertrail)
-  * [particle](./plugins/inputs/webhooks/particle)
-  * [rollbar](./plugins/inputs/webhooks/rollbar)
-* [zipkin](./plugins/inputs/zipkin)
+* statsd
+* mqtt_consumer
+* kafka_consumer
+* nats_consumer
+* github_webhooks

-Telegraf is able to parse the following input data formats into metrics, these
-formats may be used with input plugins supporting the `data_format` option:
+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.

-* [InfluxDB Line Protocol](./docs/DATA_FORMATS_INPUT.md#influx)
-* [JSON](./docs/DATA_FORMATS_INPUT.md#json)
-* [Graphite](./docs/DATA_FORMATS_INPUT.md#graphite)
-* [Value](./docs/DATA_FORMATS_INPUT.md#value)
-* [Nagios](./docs/DATA_FORMATS_INPUT.md#nagios)
-* [Collectd](./docs/DATA_FORMATS_INPUT.md#collectd)
+## Supported Output Plugins

-## Processor Plugins
+* influxdb
+* amon
+* amqp
+* aws kinesis
+* aws cloudwatch
+* datadog
+* graphite
+* kafka
+* librato
+* mqtt
+* nsq
+* opentsdb
+* prometheus
+* riemann

-* [printer](./plugins/processors/printer)
+## Contributing

-## Aggregator Plugins
-
-* [basicstats](./plugins/aggregators/basicstats)
-* [minmax](./plugins/aggregators/minmax)
-* [histogram](./plugins/aggregators/histogram)
-
-## Output Plugins
-
-* [influxdb](./plugins/outputs/influxdb)
-* [amon](./plugins/outputs/amon)
-* [amqp](./plugins/outputs/amqp) (rabbitmq)
-* [aws kinesis](./plugins/outputs/kinesis)
-* [aws cloudwatch](./plugins/outputs/cloudwatch)
-* [cratedb](./plugins/outputs/cratedb)
-* [datadog](./plugins/outputs/datadog)
-* [discard](./plugins/outputs/discard)
-* [elasticsearch](./plugins/outputs/elasticsearch)
-* [file](./plugins/outputs/file)
-* [graphite](./plugins/outputs/graphite)
-* [graylog](./plugins/outputs/graylog)
-* [instrumental](./plugins/outputs/instrumental)
-* [kafka](./plugins/outputs/kafka)
-* [librato](./plugins/outputs/librato)
-* [mqtt](./plugins/outputs/mqtt)
-* [nats](./plugins/outputs/nats)
-* [nsq](./plugins/outputs/nsq)
-* [opentsdb](./plugins/outputs/opentsdb)
-* [prometheus](./plugins/outputs/prometheus_client)
-* [riemann](./plugins/outputs/riemann)
-* [riemann_legacy](./plugins/outputs/riemann_legacy)
-* [socket_writer](./plugins/outputs/socket_writer)
-* [tcp](./plugins/outputs/socket_writer)
-* [udp](./plugins/outputs/socket_writer)
-* [wavefront](./plugins/outputs/wavefront)
+Please see the
+[contributing guide](CONTRIBUTING.md)
+for details on contributing a plugin to Telegraf.
--- a/accumulator.go
+++ b/accumulator.go
@@ -2,45 +2,20 @@ package telegraf

 import "time"

-// Accumulator is an interface for "accumulating" metrics from plugin(s).
-// The metrics are sent down a channel shared between all plugins.
 type Accumulator interface {
-	// AddFields adds a metric to the accumulator with the given measurement
-	// name, fields, and tags (and timestamp). If a timestamp is not provided,
-	// then the accumulator sets it to "now".
 	// 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)
+
 	AddFields(measurement string,
 		fields map[string]interface{},
 		tags map[string]string,
 		t ...time.Time)

-	// AddGauge is the same as AddFields, but will add the metric as a "Gauge" type
-	AddGauge(measurement string,
-		fields map[string]interface{},
-		tags map[string]string,
-		t ...time.Time)
-
-	// AddCounter is the same as AddFields, but will add the metric as a "Counter" type
-	AddCounter(measurement string,
-		fields map[string]interface{},
-		tags map[string]string,
-		t ...time.Time)
-
-	// AddSummary is the same as AddFields, but will add the metric as a "Summary" type
-	AddSummary(measurement string,
-		fields map[string]interface{},
-		tags map[string]string,
-		t ...time.Time)
-
-	// AddHistogram is the same as AddFields, but will add the metric as a "Histogram" type
-	AddHistogram(measurement string,
-		fields map[string]interface{},
-		tags map[string]string,
-		t ...time.Time)
-
-	SetPrecision(precision, interval time.Duration)
-
-	AddError(err error)
+	Debug() bool
+	SetDebug(enabled bool)
 }
--- a/agent/accumulator.go
+++ b/agent/accumulator.go
@@ -1,46 +1,54 @@
 package agent

 import (
+	"fmt"
 	"log"
+	"math"
+	"sync"
 	"time"

 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/selfstat"
+	"github.com/influxdata/telegraf/internal/models"
 )

-var (
-	NErrors = selfstat.Register("agent", "gather_errors", map[string]string{})
-)
-
-type MetricMaker interface {
-	Name() string
-	MakeMetric(
-		measurement string,
-		fields map[string]interface{},
-		tags map[string]string,
-		mType telegraf.ValueType,
-		t time.Time,
-	) telegraf.Metric
-}
-
 func NewAccumulator(
-	maker MetricMaker,
+	inputConfig *internal_models.InputConfig,
 	metrics chan telegraf.Metric,
 ) *accumulator {
-	acc := accumulator{
-		maker:     maker,
-		metrics:   metrics,
-		precision: time.Nanosecond,
-	}
+	acc := accumulator{}
+	acc.metrics = metrics
+	acc.inputConfig = inputConfig
 	return &acc
 }

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

-	maker MetricMaker
+	defaultTags map[string]string

-	precision time.Duration
+	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(
@@ -49,93 +57,116 @@ func (ac *accumulator) AddFields(
 	tags map[string]string,
 	t ...time.Time,
 ) {
-	if m := ac.maker.MakeMetric(measurement, fields, tags, telegraf.Untyped, ac.getTime(t)); m != nil {
-		ac.metrics <- m
-	}
-}
-
-func (ac *accumulator) AddGauge(
-	measurement string,
-	fields map[string]interface{},
-	tags map[string]string,
-	t ...time.Time,
-) {
-	if m := ac.maker.MakeMetric(measurement, fields, tags, telegraf.Gauge, ac.getTime(t)); m != nil {
-		ac.metrics <- m
-	}
-}
-
-func (ac *accumulator) AddCounter(
-	measurement string,
-	fields map[string]interface{},
-	tags map[string]string,
-	t ...time.Time,
-) {
-	if m := ac.maker.MakeMetric(measurement, fields, tags, telegraf.Counter, ac.getTime(t)); m != nil {
-		ac.metrics <- m
-	}
-}
-
-func (ac *accumulator) AddSummary(
-	measurement string,
-	fields map[string]interface{},
-	tags map[string]string,
-	t ...time.Time,
-) {
-	if m := ac.maker.MakeMetric(measurement, fields, tags, telegraf.Summary, ac.getTime(t)); m != nil {
-		ac.metrics <- m
-	}
-}
-
-func (ac *accumulator) AddHistogram(
-	measurement string,
-	fields map[string]interface{},
-	tags map[string]string,
-	t ...time.Time,
-) {
-	if m := ac.maker.MakeMetric(measurement, fields, tags, telegraf.Histogram, ac.getTime(t)); m != nil {
-		ac.metrics <- m
-	}
-}
-
-// AddError passes a runtime error to the accumulator.
-// The error will be tagged with the plugin name and written to the log.
-func (ac *accumulator) AddError(err error) {
-	if err == nil {
+	if len(fields) == 0 || len(measurement) == 0 {
 		return
 	}
-	NErrors.Incr(1)
-	//TODO suppress/throttle consecutive duplicate errors?
-	log.Printf("E! Error in plugin [%s]: %s", ac.maker.Name(), err)
-}

-// SetPrecision takes two time.Duration objects. If the first is non-zero,
-// it sets that as the precision. Otherwise, it takes the second argument
-// as the order of time that the metrics should be rounded to, with the
-// maximum being 1s.
-func (ac *accumulator) SetPrecision(precision, interval time.Duration) {
-	if precision > 0 {
-		ac.precision = precision
+	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
+			}
+		}
+		result[k] = v
+
+		// 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)
+			}
+		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
+			}
+		}
+	}
+	fields = nil
+	if len(result) == 0 {
 		return
 	}
-	switch {
-	case interval >= time.Second:
-		ac.precision = time.Second
-	case interval >= time.Millisecond:
-		ac.precision = time.Millisecond
-	case interval >= time.Microsecond:
-		ac.precision = time.Microsecond
-	default:
-		ac.precision = time.Nanosecond
-	}
-}

-func (ac accumulator) getTime(t []time.Time) time.Time {
 	var timestamp time.Time
 	if len(t) > 0 {
 		timestamp = t[0]
 	} else {
 		timestamp = time.Now()
 	}
-	return timestamp.Round(ac.precision)
+
+	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) {
+	ac.defaultTags[key] = value
 }
--- a/agent/accumulator_test.go
+++ b/agent/accumulator_test.go
@@ -1,340 +0,0 @@
-package agent
-
-import (
-	"bytes"
-	"fmt"
-	"log"
-	"os"
-	"testing"
-	"time"
-
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/metric"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestAdd(t *testing.T) {
-	now := time.Now()
-	metrics := make(chan telegraf.Metric, 10)
-	defer close(metrics)
-	a := NewAccumulator(&TestMetricMaker{}, metrics)
-
-	a.AddFields("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{})
-	a.AddFields("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{"acc": "test"})
-	a.AddFields("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{"acc": "test"}, now)
-
-	testm := <-metrics
-	actual := testm.String()
-	assert.Contains(t, actual, "acctest value=101")
-
-	testm = <-metrics
-	actual = testm.String()
-	assert.Contains(t, actual, "acctest,acc=test value=101")
-
-	testm = <-metrics
-	actual = testm.String()
-	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test value=101 %d\n", now.UnixNano()),
-		actual)
-}
-
-func TestAddFields(t *testing.T) {
-	now := time.Now()
-	metrics := make(chan telegraf.Metric, 10)
-	defer close(metrics)
-	a := NewAccumulator(&TestMetricMaker{}, metrics)
-
-	fields := map[string]interface{}{
-		"usage": float64(99),
-	}
-	a.AddFields("acctest", fields, map[string]string{})
-	a.AddGauge("acctest", fields, map[string]string{"acc": "test"})
-	a.AddCounter("acctest", fields, map[string]string{"acc": "test"}, now)
-
-	testm := <-metrics
-	actual := testm.String()
-	assert.Contains(t, actual, "acctest usage=99")
-
-	testm = <-metrics
-	actual = testm.String()
-	assert.Contains(t, actual, "acctest,acc=test usage=99")
-
-	testm = <-metrics
-	actual = testm.String()
-	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test usage=99 %d\n", now.UnixNano()),
-		actual)
-}
-
-func TestAccAddError(t *testing.T) {
-	errBuf := bytes.NewBuffer(nil)
-	log.SetOutput(errBuf)
-	defer log.SetOutput(os.Stderr)
-
-	metrics := make(chan telegraf.Metric, 10)
-	defer close(metrics)
-	a := NewAccumulator(&TestMetricMaker{}, metrics)
-
-	a.AddError(fmt.Errorf("foo"))
-	a.AddError(fmt.Errorf("bar"))
-	a.AddError(fmt.Errorf("baz"))
-
-	errs := bytes.Split(errBuf.Bytes(), []byte{'\n'})
-	assert.EqualValues(t, int64(3), NErrors.Get())
-	require.Len(t, errs, 4) // 4 because of trailing newline
-	assert.Contains(t, string(errs[0]), "TestPlugin")
-	assert.Contains(t, string(errs[0]), "foo")
-	assert.Contains(t, string(errs[1]), "TestPlugin")
-	assert.Contains(t, string(errs[1]), "bar")
-	assert.Contains(t, string(errs[2]), "TestPlugin")
-	assert.Contains(t, string(errs[2]), "baz")
-}
-
-func TestAddNoIntervalWithPrecision(t *testing.T) {
-	now := time.Date(2006, time.February, 10, 12, 0, 0, 82912748, time.UTC)
-	metrics := make(chan telegraf.Metric, 10)
-	defer close(metrics)
-	a := NewAccumulator(&TestMetricMaker{}, metrics)
-	a.SetPrecision(0, time.Second)
-
-	a.AddFields("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{})
-	a.AddFields("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{"acc": "test"})
-	a.AddFields("acctest",
-		map[string]interface{}{"value": 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\n", int64(1139572800000000000)),
-		actual)
-}
-
-func TestAddDisablePrecision(t *testing.T) {
-	now := time.Date(2006, time.February, 10, 12, 0, 0, 82912748, time.UTC)
-	metrics := make(chan telegraf.Metric, 10)
-	defer close(metrics)
-	a := NewAccumulator(&TestMetricMaker{}, metrics)
-
-	a.SetPrecision(time.Nanosecond, 0)
-	a.AddFields("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{})
-	a.AddFields("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{"acc": "test"})
-	a.AddFields("acctest",
-		map[string]interface{}{"value": 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\n", int64(1139572800082912748)),
-		actual)
-}
-
-func TestAddNoPrecisionWithInterval(t *testing.T) {
-	now := time.Date(2006, time.February, 10, 12, 0, 0, 82912748, time.UTC)
-	metrics := make(chan telegraf.Metric, 10)
-	defer close(metrics)
-	a := NewAccumulator(&TestMetricMaker{}, metrics)
-
-	a.SetPrecision(0, time.Second)
-	a.AddFields("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{})
-	a.AddFields("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{"acc": "test"})
-	a.AddFields("acctest",
-		map[string]interface{}{"value": 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\n", int64(1139572800000000000)),
-		actual)
-}
-
-func TestDifferentPrecisions(t *testing.T) {
-	now := time.Date(2006, time.February, 10, 12, 0, 0, 82912748, time.UTC)
-	metrics := make(chan telegraf.Metric, 10)
-	defer close(metrics)
-	a := NewAccumulator(&TestMetricMaker{}, metrics)
-
-	a.SetPrecision(0, time.Second)
-	a.AddFields("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{"acc": "test"}, now)
-	testm := <-a.metrics
-	actual := testm.String()
-	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800000000000)),
-		actual)
-
-	a.SetPrecision(0, time.Millisecond)
-	a.AddFields("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{"acc": "test"}, now)
-	testm = <-a.metrics
-	actual = testm.String()
-	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800083000000)),
-		actual)
-
-	a.SetPrecision(0, time.Microsecond)
-	a.AddFields("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{"acc": "test"}, now)
-	testm = <-a.metrics
-	actual = testm.String()
-	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800082913000)),
-		actual)
-
-	a.SetPrecision(0, time.Nanosecond)
-	a.AddFields("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{"acc": "test"}, now)
-	testm = <-a.metrics
-	actual = testm.String()
-	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800082912748)),
-		actual)
-}
-
-func TestAddGauge(t *testing.T) {
-	now := time.Now()
-	metrics := make(chan telegraf.Metric, 10)
-	defer close(metrics)
-	a := NewAccumulator(&TestMetricMaker{}, metrics)
-
-	a.AddGauge("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{})
-	a.AddGauge("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{"acc": "test"})
-	a.AddGauge("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{"acc": "test"}, now)
-
-	testm := <-metrics
-	actual := testm.String()
-	assert.Contains(t, actual, "acctest value=101")
-	assert.Equal(t, testm.Type(), telegraf.Gauge)
-
-	testm = <-metrics
-	actual = testm.String()
-	assert.Contains(t, actual, "acctest,acc=test value=101")
-	assert.Equal(t, testm.Type(), telegraf.Gauge)
-
-	testm = <-metrics
-	actual = testm.String()
-	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test value=101 %d\n", now.UnixNano()),
-		actual)
-	assert.Equal(t, testm.Type(), telegraf.Gauge)
-}
-
-func TestAddCounter(t *testing.T) {
-	now := time.Now()
-	metrics := make(chan telegraf.Metric, 10)
-	defer close(metrics)
-	a := NewAccumulator(&TestMetricMaker{}, metrics)
-
-	a.AddCounter("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{})
-	a.AddCounter("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{"acc": "test"})
-	a.AddCounter("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{"acc": "test"}, now)
-
-	testm := <-metrics
-	actual := testm.String()
-	assert.Contains(t, actual, "acctest value=101")
-	assert.Equal(t, testm.Type(), telegraf.Counter)
-
-	testm = <-metrics
-	actual = testm.String()
-	assert.Contains(t, actual, "acctest,acc=test value=101")
-	assert.Equal(t, testm.Type(), telegraf.Counter)
-
-	testm = <-metrics
-	actual = testm.String()
-	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test value=101 %d\n", now.UnixNano()),
-		actual)
-	assert.Equal(t, testm.Type(), telegraf.Counter)
-}
-
-type TestMetricMaker struct {
-}
-
-func (tm *TestMetricMaker) Name() string {
-	return "TestPlugin"
-}
-func (tm *TestMetricMaker) MakeMetric(
-	measurement string,
-	fields map[string]interface{},
-	tags map[string]string,
-	mType telegraf.ValueType,
-	t time.Time,
-) telegraf.Metric {
-	switch mType {
-	case telegraf.Untyped:
-		if m, err := metric.New(measurement, tags, fields, t); err == nil {
-			return m
-		}
-	case telegraf.Counter:
-		if m, err := metric.New(measurement, tags, fields, t, telegraf.Counter); err == nil {
-			return m
-		}
-	case telegraf.Gauge:
-		if m, err := metric.New(measurement, tags, fields, t, telegraf.Gauge); err == nil {
-			return m
-		}
-	}
-	return nil
-}
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -1,18 +1,19 @@
 package agent

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

 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/internal/config"
 	"github.com/influxdata/telegraf/internal/models"
-	"github.com/influxdata/telegraf/selfstat"
 )

 // Agent runs telegraf and collects data based on the given config
@@ -26,38 +27,40 @@ func NewAgent(config *config.Config) (*Agent, error) {
 		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
+	if a.Config.Agent.Hostname == "" {
+		hostname, err := os.Hostname()
+		if err != nil {
+			return nil, err
 		}

-		config.Tags["host"] = a.Config.Agent.Hostname
+		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("E! Service for output %s failed to start, exiting\n%s\n",
+				log.Printf("Service for output %s failed to start, exiting\n%s\n",
 					o.Name, err.Error())
 				return err
 			}
 		}

-		log.Printf("D! Attempting connection to output: %s\n", o.Name)
+		if a.Config.Agent.Debug {
+			log.Printf("Attempting connection to output: %s\n", o.Name)
+		}
 		err := o.Output.Connect()
 		if err != nil {
-			log.Printf("E! Failed to connect to output %s, retrying in 15s, "+
+			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()
@@ -65,7 +68,9 @@ func (a *Agent) Connect() error {
 				return err
 			}
 		}
-		log.Printf("D! Successfully connected to output: %s\n", o.Name)
+		if a.Config.Agent.Debug {
+			log.Printf("Successfully connected to output: %s\n", o.Name)
+		}
 	}
 	return nil
 }
@@ -83,90 +88,111 @@ func (a *Agent) Close() error {
 	return err
 }

-func panicRecover(input *models.RunningInput) {
+func panicRecover(input *internal_models.RunningInput) {
 	if err := recover(); err != nil {
 		trace := make([]byte, 2048)
 		runtime.Stack(trace, true)
-		log.Printf("E! FATAL: Input [%s] panicked: %s, Stack:\n%s\n",
-			input.Name(), err, trace)
-		log.Println("E! PLEASE REPORT THIS PANIC ON GITHUB with " +
+		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")
 	}
 }

-// gatherer runs the inputs that have been configured with their own
-// reporting interval.
-func (a *Agent) gatherer(
-	shutdown chan struct{},
-	input *models.RunningInput,
-	interval time.Duration,
-	metricC chan telegraf.Metric,
-) {
-	defer panicRecover(input)
+// 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

-	GatherTime := selfstat.RegisterTiming("gather",
-		"gather_time_ns",
-		map[string]string{"input": input.Config.Name},
-	)
-
-	acc := NewAccumulator(input, metricC)
-	acc.SetPrecision(a.Config.Agent.Precision.Duration,
-		a.Config.Agent.Interval.Duration)
-
-	ticker := time.NewTicker(interval)
-	defer ticker.Stop()
-
-	for {
-		internal.RandomSleep(a.Config.Agent.CollectionJitter.Duration, shutdown)
-
-		start := time.Now()
-		gatherWithTimeout(shutdown, input, acc, interval)
-		elapsed := time.Since(start)
-
-		GatherTime.Incr(elapsed.Nanoseconds())
-
-		select {
-		case <-shutdown:
-			return
-		case <-ticker.C:
+	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
 }

-// gatherWithTimeout gathers from the given input, with the given timeout.
-//   when the given timeout is reached, gatherWithTimeout logs an error message
-//   but continues waiting for it to return. This is to avoid leaving behind
-//   hung processes, and to prevent re-calling the same hung process over and
-//   over.
-func gatherWithTimeout(
+// gatherSeparate runs the inputs that have been configured with their own
+// reporting interval.
+func (a *Agent) gatherSeparate(
 	shutdown chan struct{},
-	input *models.RunningInput,
-	acc *accumulator,
-	timeout time.Duration,
-) {
-	ticker := time.NewTicker(timeout)
-	defer ticker.Stop()
-	done := make(chan error)
-	go func() {
-		done <- input.Input.Gather(acc)
-	}()
+	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 err := <-done:
-			if err != nil {
-				acc.AddError(err)
-			}
-			return
-		case <-ticker.C:
-			err := fmt.Errorf("took longer to collect than collection interval (%s)",
-				timeout)
-			acc.AddError(err)
-			continue
 		case <-shutdown:
-			return
+			return nil
+		case <-ticker.C:
+			continue
 		}
 	}
 }
@@ -191,19 +217,10 @@ func (a *Agent) Test() error {
 	}()

 	for _, input := range a.Config.Inputs {
-		if _, ok := input.Input.(telegraf.ServiceInput); ok {
-			fmt.Printf("\nWARNING: skipping plugin [[%s]]: service inputs not supported in --test mode\n",
-				input.Name())
-			continue
-		}
+		acc := NewAccumulator(input.Config, metricC)
+		acc.SetDebug(true)

-		acc := NewAccumulator(input, metricC)
-		acc.SetPrecision(a.Config.Agent.Precision.Duration,
-			a.Config.Agent.Interval.Duration)
-		input.SetTrace(true)
-		input.SetDefaultTags(a.Config.Tags)
-
-		fmt.Printf("* Plugin: %s, Collection 1\n", input.Name())
+		fmt.Printf("* Plugin: %s, Collection 1\n", input.Name)
 		if input.Config.Interval != 0 {
 			fmt.Printf("* Internal: %s\n", input.Config.Interval)
 		}
@@ -214,10 +231,10 @@ func (a *Agent) Test() error {

 		// Special instructions for some inputs. cpu, for example, needs to be
 		// run twice in order to return cpu usage percentages.
-		switch input.Name() {
-		case "inputs.cpu", "inputs.mongodb", "inputs.procstat":
+		switch input.Name {
+		case "cpu", "mongodb", "procstat":
 			time.Sleep(500 * time.Millisecond)
-			fmt.Printf("* Plugin: %s, Collection 2\n", input.Name())
+			fmt.Printf("* Plugin: %s, Collection 2\n", input.Name)
 			if err := input.Input.Gather(acc); err != nil {
 				return err
 			}
@@ -233,11 +250,11 @@ func (a *Agent) flush() {

 	wg.Add(len(a.Config.Outputs))
 	for _, o := range a.Config.Outputs {
-		go func(output *models.RunningOutput) {
+		go func(output *internal_models.RunningOutput) {
 			defer wg.Done()
 			err := output.Write()
 			if err != nil {
-				log.Printf("E! Error writing to output [%s]: %s\n",
+				log.Printf("Error writing to output [%s]: %s\n",
 					output.Name, err.Error())
 			}
 		}(o)
@@ -247,141 +264,76 @@ func (a *Agent) flush() {
 }

 // flusher monitors the metrics input channel and flushes on the minimum interval
-func (a *Agent) flusher(shutdown chan struct{}, metricC chan telegraf.Metric, aggC chan telegraf.Metric) error {
+func (a *Agent) flusher(shutdown chan struct{}, metricC chan telegraf.Metric) error {
 	// Inelegant, but this sleep is to allow the Gather threads to run, so that
 	// the flusher will flush after metrics are collected.
-	time.Sleep(time.Millisecond * 300)
-
-	// create an output metric channel and a gorouting that continuously passes
-	// each metric onto the output plugins & aggregators.
-	outMetricC := make(chan telegraf.Metric, 100)
-	var wg sync.WaitGroup
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		for {
-			select {
-			case <-shutdown:
-				if len(outMetricC) > 0 {
-					// keep going until outMetricC is flushed
-					continue
-				}
-				return
-			case m := <-outMetricC:
-				// if dropOriginal is set to true, then we will only send this
-				// metric to the aggregators, not the outputs.
-				var dropOriginal bool
-				if !m.IsAggregate() {
-					for _, agg := range a.Config.Aggregators {
-						if ok := agg.Add(m.Copy()); ok {
-							dropOriginal = true
-						}
-					}
-				}
-				if !dropOriginal {
-					for i, o := range a.Config.Outputs {
-						if i == len(a.Config.Outputs)-1 {
-							o.AddMetric(m)
-						} else {
-							o.AddMetric(m.Copy())
-						}
-					}
-				}
-			}
-		}
-	}()
-
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		for {
-			select {
-			case <-shutdown:
-				if len(aggC) > 0 {
-					// keep going until aggC is flushed
-					continue
-				}
-				return
-			case metric := <-aggC:
-				metrics := []telegraf.Metric{metric}
-				for _, processor := range a.Config.Processors {
-					metrics = processor.Apply(metrics...)
-				}
-				for _, m := range metrics {
-					for i, o := range a.Config.Outputs {
-						if i == len(a.Config.Outputs)-1 {
-							o.AddMetric(m)
-						} else {
-							o.AddMetric(m.Copy())
-						}
-					}
-				}
-			}
-		}
-	}()
+	time.Sleep(time.Millisecond * 200)

 	ticker := time.NewTicker(a.Config.Agent.FlushInterval.Duration)
-	semaphore := make(chan struct{}, 1)
+
 	for {
 		select {
 		case <-shutdown:
-			log.Println("I! Hang on, flushing any cached metrics before shutdown")
-			// wait for outMetricC to get flushed before flushing outputs
-			wg.Wait()
+			log.Println("Hang on, flushing any cached metrics before shutdown")
 			a.flush()
 			return nil
 		case <-ticker.C:
-			go func() {
-				select {
-				case semaphore <- struct{}{}:
-					internal.RandomSleep(a.Config.Agent.FlushJitter.Duration, shutdown)
-					a.flush()
-					<-semaphore
-				default:
-					// skipping this flush because one is already happening
-					log.Println("W! Skipping a scheduled flush because there is" +
-						" already a flush ongoing.")
-				}
-			}()
-		case metric := <-metricC:
-			// NOTE potential bottleneck here as we put each metric through the
-			// processors serially.
-			mS := []telegraf.Metric{metric}
-			for _, processor := range a.Config.Processors {
-				mS = processor.Apply(mS...)
-			}
-			for _, m := range mS {
-				outMetricC <- m
+			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

-	log.Printf("I! Agent Config: Interval:%s, Quiet:%#v, Hostname:%#v, "+
+	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.Quiet,
+		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, 100)
-	aggC := make(chan telegraf.Metric, 100)
+	metricC := make(chan telegraf.Metric, 10000)

-	// Start all ServicePlugins
 	for _, input := range a.Config.Inputs {
-		input.SetDefaultTags(a.Config.Tags)
+		// Start service of any ServicePlugins
 		switch p := input.Input.(type) {
 		case telegraf.ServiceInput:
-			acc := NewAccumulator(input, metricC)
-			// Service input plugins should set their own precision of their
-			// metrics.
-			acc.SetPrecision(time.Nanosecond, 0)
+			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("E! Service for input %s failed to start, exiting\n%s\n",
-					input.Name(), err.Error())
+				log.Printf("Service for input %s failed to start, exiting\n%s\n",
+					input.Name, err.Error())
 				return err
 			}
 			defer p.Stop()
@@ -393,41 +345,43 @@ func (a *Agent) Run(shutdown chan struct{}) error {
 		i := int64(a.Config.Agent.Interval.Duration)
 		time.Sleep(time.Duration(i - (time.Now().UnixNano() % i)))
 	}
+	ticker := time.NewTicker(a.Config.Agent.Interval.Duration)

 	wg.Add(1)
 	go func() {
 		defer wg.Done()
-		if err := a.flusher(shutdown, metricC, aggC); err != nil {
-			log.Printf("E! Flusher routine failed, exiting: %s\n", err.Error())
+		if err := a.flusher(shutdown, metricC); err != nil {
+			log.Printf("Flusher routine failed, exiting: %s\n", err.Error())
 			close(shutdown)
 		}
 	}()

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

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

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

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

@@ -9,18 +11,8 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/all"
 	// needing to load the outputs
 	_ "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.InputFilters = []string{"mysql"}
@@ -109,3 +101,75 @@ func TestAgent_LoadOutput(t *testing.T) {
 	a, _ = NewAgent(c)
 	assert.Equal(t, 3, len(a.Config.Outputs))
 }
+
+func TestAgent_ZeroJitter(t *testing.T) {
+	flushinterval := jitterInterval(time.Duration(10*time.Second),
+		time.Duration(0*time.Second))
+
+	actual := flushinterval.Nanoseconds()
+	exp := time.Duration(10 * time.Second).Nanoseconds()
+
+	if actual != exp {
+		t.Errorf("Actual %v, expected %v", actual, exp)
+	}
+}
+
+func TestAgent_ZeroInterval(t *testing.T) {
+	min := time.Duration(500 * time.Millisecond).Nanoseconds()
+	max := time.Duration(5 * time.Second).Nanoseconds()
+
+	for i := 0; i < 1000; i++ {
+		flushinterval := jitterInterval(time.Duration(0*time.Second),
+			time.Duration(5*time.Second))
+		actual := flushinterval.Nanoseconds()
+
+		if actual > max {
+			t.Errorf("Didn't expect interval %d to be > %d", actual, max)
+			break
+		}
+		if actual < min {
+			t.Errorf("Didn't expect interval %d to be < %d", actual, min)
+			break
+		}
+	}
+}
+
+func TestAgent_ZeroBoth(t *testing.T) {
+	flushinterval := jitterInterval(time.Duration(0*time.Second),
+		time.Duration(0*time.Second))
+
+	actual := flushinterval
+	exp := time.Duration(500 * time.Millisecond)
+
+	if actual != exp {
+		t.Errorf("Actual %v, expected %v", actual, exp)
+	}
+}
+
+func TestAgent_JitterMax(t *testing.T) {
+	max := time.Duration(32 * time.Second).Nanoseconds()
+
+	for i := 0; i < 1000; i++ {
+		flushinterval := jitterInterval(time.Duration(30*time.Second),
+			time.Duration(2*time.Second))
+		actual := flushinterval.Nanoseconds()
+		if actual > max {
+			t.Errorf("Didn't expect interval %d to be > %d", actual, max)
+			break
+		}
+	}
+}
+
+func TestAgent_JitterMin(t *testing.T) {
+	min := time.Duration(30 * time.Second).Nanoseconds()
+
+	for i := 0; i < 1000; i++ {
+		flushinterval := jitterInterval(time.Duration(30*time.Second),
+			time.Duration(2*time.Second))
+		actual := flushinterval.Nanoseconds()
+		if actual < min {
+			t.Errorf("Didn't expect interval %d to be < %d", actual, min)
+			break
+		}
+	}
+}
--- a/aggregator.go
+++ b/aggregator.go
@@ -1,22 +0,0 @@
-package telegraf
-
-// Aggregator is an interface for implementing an Aggregator plugin.
-// the RunningAggregator wraps this interface and guarantees that
-// Add, Push, and Reset can not be called concurrently, so locking is not
-// required when implementing an Aggregator plugin.
-type Aggregator interface {
-	// SampleConfig returns the default configuration of the Input.
-	SampleConfig() string
-
-	// Description returns a one-sentence description on the Input.
-	Description() string
-
-	// Add the metric to the aggregator.
-	Add(in Metric)
-
-	// Push pushes the current aggregates to the accumulator.
-	Push(acc Accumulator)
-
-	// Reset resets the aggregators caches and aggregates.
-	Reset()
-}
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,32 +0,0 @@
-version: "{build}"
-
-cache:
- - C:\Cache
-
-clone_folder: C:\gopath\src\github.com\influxdata\telegraf
-
-environment:
-  GOPATH: C:\gopath
-
-platform: x64
-
-install:
-  - IF NOT EXIST "C:\Cache" mkdir C:\Cache
-  - IF NOT EXIST "C:\Cache\go1.9.2.msi" curl -o "C:\Cache\go1.9.2.msi" https://storage.googleapis.com/golang/go1.9.2.windows-amd64.msi
-  - IF NOT EXIST "C:\Cache\gnuwin32-bin.zip" curl -o "C:\Cache\gnuwin32-bin.zip" https://dl.influxdata.com/telegraf/ci/make-3.81-bin.zip
-  - IF NOT EXIST "C:\Cache\gnuwin32-dep.zip" curl -o "C:\Cache\gnuwin32-dep.zip" https://dl.influxdata.com/telegraf/ci/make-3.81-dep.zip
-  - IF EXIST "C:\Go" rmdir /S /Q C:\Go
-  - msiexec.exe /i "C:\Cache\go1.9.2.msi" /quiet
-  - 7z x "C:\Cache\gnuwin32-bin.zip" -oC:\GnuWin32 -y
-  - 7z x "C:\Cache\gnuwin32-dep.zip" -oC:\GnuWin32 -y
-  - go version
-  - go env
-
-build_script:
-  - cmd: C:\GnuWin32\bin\make
-
-test_script:
-  - cmd: C:\GnuWin32\bin\make test-windows
-
-artifacts:
-  - path: telegraf.exe
--- a/circle.yml
+++ b/circle.yml
@@ -1,18 +1,20 @@
 machine:
  services:
    - docker
-    - memcached
-    - redis
-    - rabbitmq-server
  post:
-    - sudo rm -rf /usr/local/go
-    - wget https://storage.googleapis.com/golang/go1.9.2.linux-amd64.tar.gz
-    - sudo tar -C /usr/local -xzf go1.9.2.linux-amd64.tar.gz
+    - sudo service zookeeper stop
+    - go version
+    - go version | grep 1.5.3 || sudo rm -rf /usr/local/go
+    - wget https://storage.googleapis.com/golang/go1.5.3.linux-amd64.tar.gz
+    - sudo tar -C /usr/local -xzf go1.5.3.linux-amd64.tar.gz
    - go version

 dependencies:
  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
@@ -4,30 +4,20 @@ import (
 	"flag"
 	"fmt"
 	"log"
-	"net/http"
-	_ "net/http/pprof" // Comment this line to disable pprof endpoint.
 	"os"
 	"os/signal"
-	"runtime"
 	"strings"
 	"syscall"

 	"github.com/influxdata/telegraf/agent"
 	"github.com/influxdata/telegraf/internal/config"
-	"github.com/influxdata/telegraf/logger"
-	_ "github.com/influxdata/telegraf/plugins/aggregators/all"
-	"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"
-	_ "github.com/influxdata/telegraf/plugins/processors/all"
-	"github.com/kardianos/service"
 )

 var fDebug = flag.Bool("debug", false,
-	"turn on debug logging")
-var pprofAddr = flag.String("pprof-addr", "",
-	"pprof address to listen on, not activate pprof if empty")
+	"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")
@@ -40,192 +30,205 @@ var fSampleConfig = flag.Bool("sample-config", false,
 var fPidfile = flag.String("pidfile", "", "file to write our pid to")
 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 fAggregatorFilters = flag.String("aggregator-filter", "",
-	"filter the aggregators to enable, separator is :")
-var fProcessorFilters = flag.String("processor-filter", "",
-	"filter the processors to enable, separator is :")
 var fUsage = flag.String("usage", "",
-	"print usage for a plugin, ie, 'telegraf --usage mysql'")
-var fService = flag.String("service", "",
-	"operate on the service")
+	"print usage for a plugin, ie, 'telegraf -usage mysql'")

-var (
-	nextVersion = "1.5.0"
-	version     string
-	commit      string
-	branch      string
-)
+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")

-func init() {
-	// If commit or branch are not set, make that clear.
-	if commit == "" {
-		commit = "unknown"
-	}
-	if branch == "" {
-		branch = "unknown"
-	}
-}
+// 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 [commands|flags]
+  telegraf <flags>

-The commands & flags are:
+The flags are:

-  config              print out full sample configuration to stdout
-  version             print the version to stdout
-
-  --config <file>     configuration file to load
-  --test              gather metrics once, print them to stdout, and exit
-  --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
-  --pprof-addr        pprof address to listen on, format: localhost:6060 or :6060
-  --quiet             run in quiet mode
+  -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

 Examples:

  # generate a telegraf config file:
-  telegraf config > telegraf.conf
+  telegraf -sample-config > telegraf.conf

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

  # run a single telegraf collection, outputing metrics to stdout
-  telegraf --config telegraf.conf --test
+  telegraf -config telegraf.conf -test

  # run telegraf with all plugins defined in config file
-  telegraf --config telegraf.conf
+  telegraf -config telegraf.conf

  # run telegraf, enabling the cpu & memory input, and influxdb output plugins
-  telegraf --config telegraf.conf --input-filter cpu:mem --output-filter influxdb
-
-  # run telegraf with pprof
-  telegraf --config telegraf.conf --pprof-addr localhost:6060
+  telegraf -config telegraf.conf -input-filter cpu:mem -output-filter influxdb
 `

-var stop chan struct{}
-
-func reloadLoop(
-	stop chan struct{},
-	inputFilters []string,
-	outputFilters []string,
-	aggregatorFilters []string,
-	processorFilters []string,
-) {
+func main() {
 	reload := make(chan bool, 1)
 	reload <- true
 	for <-reload {
 		reload <- false
+		flag.Usage = func() { usageExit(0) }
+		flag.Parse()

-		// If no other options are specified, load the config file and run.
-		c := config.NewConfig()
-		c.OutputFilters = outputFilters
-		c.InputFilters = inputFilters
-		err := c.LoadConfig(*fConfig)
-		if err != nil {
-			log.Fatal("E! " + err.Error())
+		if flag.NFlag() == 0 {
+			usageExit(0)
+		}
+
+		var inputFilters []string
+		if *fInputFiltersLegacy != "" {
+			inputFilter := strings.TrimSpace(*fInputFiltersLegacy)
+			inputFilters = strings.Split(":"+inputFilter+":", ":")
+		}
+		if *fInputFilters != "" {
+			inputFilter := strings.TrimSpace(*fInputFilters)
+			inputFilters = strings.Split(":"+inputFilter+":", ":")
+		}
+
+		var outputFilters []string
+		if *fOutputFiltersLegacy != "" {
+			outputFilter := strings.TrimSpace(*fOutputFiltersLegacy)
+			outputFilters = strings.Split(":"+outputFilter+":", ":")
+		}
+		if *fOutputFilters != "" {
+			outputFilter := strings.TrimSpace(*fOutputFilters)
+			outputFilters = strings.Split(":"+outputFilter+":", ":")
+		}
+
+		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("E! " + err.Error())
+				log.Fatal(err)
 			}
 		}
-		if !*fTest && len(c.Outputs) == 0 {
-			log.Fatalf("E! Error: no outputs found, did you provide a valid config file?")
+		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("E! Error: no inputs found, did you provide a valid config file?")
-		}
-
-		if int64(c.Agent.Interval.Duration) <= 0 {
-			log.Fatalf("E! Agent interval must be positive, found %s",
-				c.Agent.Interval.Duration)
-		}
-
-		if int64(c.Agent.FlushInterval.Duration) <= 0 {
-			log.Fatalf("E! Agent flush_interval must be positive; found %s",
-				c.Agent.Interval.Duration)
+			log.Fatalf("Error: no inputs found, did you provide a valid config file?")
 		}

 		ag, err := agent.NewAgent(c)
 		if err != nil {
-			log.Fatal("E! " + err.Error())
+			log.Fatal(err)
 		}

-		// Setup logging
-		logger.SetupLogging(
-			ag.Config.Agent.Debug || *fDebug,
-			ag.Config.Agent.Quiet || *fQuiet,
-			ag.Config.Agent.Logfile,
-		)
+		if *fDebug {
+			ag.Config.Agent.Debug = true
+		}
+
+		if *fQuiet {
+			ag.Config.Agent.Quiet = true
+		}

 		if *fTest {
 			err = ag.Test()
 			if err != nil {
-				log.Fatal("E! " + err.Error())
+				log.Fatal(err)
 			}
-			os.Exit(0)
+			return
 		}

 		err = ag.Connect()
 		if err != nil {
-			log.Fatal("E! " + err.Error())
+			log.Fatal(err)
 		}

 		shutdown := make(chan struct{})
 		signals := make(chan os.Signal)
 		signal.Notify(signals, os.Interrupt, syscall.SIGHUP)
 		go func() {
-			select {
-			case sig := <-signals:
-				if sig == os.Interrupt {
-					close(shutdown)
-				}
-				if sig == syscall.SIGHUP {
-					log.Printf("I! Reloading Telegraf config\n")
-					<-reload
-					reload <- true
-					close(shutdown)
-				}
-			case <-stop:
+			sig := <-signals
+			if sig == os.Interrupt {
+				close(shutdown)
+			}
+			if sig == syscall.SIGHUP {
+				log.Printf("Reloading Telegraf config\n")
+				<-reload
+				reload <- true
 				close(shutdown)
 			}
 		}()

-		log.Printf("I! Starting Telegraf %s\n", displayVersion())
-		log.Printf("I! Loaded outputs: %s", strings.Join(c.OutputNames(), " "))
-		log.Printf("I! Loaded inputs: %s", strings.Join(c.InputNames(), " "))
-		log.Printf("I! Tags enabled: %s", c.ListTags())
+		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 *fPidfile != "" {
-			f, err := os.OpenFile(*fPidfile, os.O_CREATE|os.O_WRONLY, 0644)
+			f, err := os.Create(*fPidfile)
 			if err != nil {
-				log.Printf("E! Unable to create pidfile: %s", err)
-			} else {
-				fmt.Fprintf(f, "%d\n", os.Getpid())
-
-				f.Close()
-
-				defer func() {
-					err := os.Remove(*fPidfile)
-					if err != nil {
-						log.Printf("E! Unable to remove pidfile: %s", err)
-					}
-				}()
+				log.Fatalf("Unable to create pidfile: %s", err)
 			}
+
+			fmt.Fprintf(f, "%d\n", os.Getpid())
+
+			f.Close()
 		}

 		ag.Run(shutdown)
@@ -236,175 +239,3 @@ func usageExit(rc int) {
 	fmt.Println(usage)
 	os.Exit(rc)
 }
-
-type program struct {
-	inputFilters      []string
-	outputFilters     []string
-	aggregatorFilters []string
-	processorFilters  []string
-}
-
-func (p *program) Start(s service.Service) error {
-	go p.run()
-	return nil
-}
-func (p *program) run() {
-	stop = make(chan struct{})
-	reloadLoop(
-		stop,
-		p.inputFilters,
-		p.outputFilters,
-		p.aggregatorFilters,
-		p.processorFilters,
-	)
-}
-func (p *program) Stop(s service.Service) error {
-	close(stop)
-	return nil
-}
-
-func displayVersion() string {
-	if version == "" {
-		return fmt.Sprintf("v%s~%s", nextVersion, commit)
-	}
-	return "v" + version
-}
-
-func main() {
-	flag.Usage = func() { usageExit(0) }
-	flag.Parse()
-	args := flag.Args()
-
-	inputFilters, outputFilters := []string{}, []string{}
-	if *fInputFilters != "" {
-		inputFilters = strings.Split(":"+strings.TrimSpace(*fInputFilters)+":", ":")
-	}
-	if *fOutputFilters != "" {
-		outputFilters = strings.Split(":"+strings.TrimSpace(*fOutputFilters)+":", ":")
-	}
-
-	aggregatorFilters, processorFilters := []string{}, []string{}
-	if *fAggregatorFilters != "" {
-		aggregatorFilters = strings.Split(":"+strings.TrimSpace(*fAggregatorFilters)+":", ":")
-	}
-	if *fProcessorFilters != "" {
-		processorFilters = strings.Split(":"+strings.TrimSpace(*fProcessorFilters)+":", ":")
-	}
-
-	if *pprofAddr != "" {
-		go func() {
-			pprofHostPort := *pprofAddr
-			parts := strings.Split(pprofHostPort, ":")
-			if len(parts) == 2 && parts[0] == "" {
-				pprofHostPort = fmt.Sprintf("localhost:%s", parts[1])
-			}
-			pprofHostPort = "http://" + pprofHostPort + "/debug/pprof"
-
-			log.Printf("I! Starting pprof HTTP server at: %s", pprofHostPort)
-
-			if err := http.ListenAndServe(*pprofAddr, nil); err != nil {
-				log.Fatal("E! " + err.Error())
-			}
-		}()
-	}
-
-	if len(args) > 0 {
-		switch args[0] {
-		case "version":
-			fmt.Printf("Telegraf %s (git: %s %s)\n", displayVersion(), branch, commit)
-			return
-		case "config":
-			config.PrintSampleConfig(
-				inputFilters,
-				outputFilters,
-				aggregatorFilters,
-				processorFilters,
-			)
-			return
-		}
-	}
-
-	// switch for flags which just do something and exit immediately
-	switch {
-	case *fOutputList:
-		fmt.Println("Available Output Plugins:")
-		for k, _ := range outputs.Outputs {
-			fmt.Printf("  %s\n", k)
-		}
-		return
-	case *fInputList:
-		fmt.Println("Available Input Plugins:")
-		for k, _ := range inputs.Inputs {
-			fmt.Printf("  %s\n", k)
-		}
-		return
-	case *fVersion:
-		fmt.Printf("Telegraf %s (git: %s %s)\n", displayVersion(), branch, commit)
-		return
-	case *fSampleConfig:
-		config.PrintSampleConfig(
-			inputFilters,
-			outputFilters,
-			aggregatorFilters,
-			processorFilters,
-		)
-		return
-	case *fUsage != "":
-		err := config.PrintInputConfig(*fUsage)
-		err2 := config.PrintOutputConfig(*fUsage)
-		if err != nil && err2 != nil {
-			log.Fatalf("E! %s and %s", err, err2)
-		}
-		return
-	}
-
-	if runtime.GOOS == "windows" {
-		svcConfig := &service.Config{
-			Name:        "telegraf",
-			DisplayName: "Telegraf Data Collector Service",
-			Description: "Collects data using a series of plugins and publishes it to" +
-				"another series of plugins.",
-			Arguments: []string{"-config", "C:\\Program Files\\Telegraf\\telegraf.conf"},
-		}
-
-		prg := &program{
-			inputFilters:      inputFilters,
-			outputFilters:     outputFilters,
-			aggregatorFilters: aggregatorFilters,
-			processorFilters:  processorFilters,
-		}
-		s, err := service.New(prg, svcConfig)
-		if err != nil {
-			log.Fatal("E! " + err.Error())
-		}
-		// Handle the -service flag here to prevent any issues with tooling that
-		// may not have an interactive session, e.g. installing from Ansible.
-		if *fService != "" {
-			if *fConfig != "" {
-				(*svcConfig).Arguments = []string{"-config", *fConfig}
-			}
-			if *fConfigDirectory != "" {
-				(*svcConfig).Arguments = append((*svcConfig).Arguments, "-config-directory", *fConfigDirectory)
-			}
-			err := service.Control(s, *fService)
-			if err != nil {
-				log.Fatal("E! " + err.Error())
-			}
-			os.Exit(0)
-		} else {
-			err = s.Run()
-			if err != nil {
-				log.Println("E! " + err.Error())
-			}
-		}
-	} else {
-		stop = make(chan struct{})
-		reloadLoop(
-			stop,
-			inputFilters,
-			outputFilters,
-			aggregatorFilters,
-			processorFilters,
-		)
-	}
-}
--- a/docs/AGGREGATORS_AND_PROCESSORS.md
+++ b/docs/AGGREGATORS_AND_PROCESSORS.md
@@ -1,64 +0,0 @@
-# Telegraf Aggregator & Processor Plugins
-
-As of release 1.1.0, Telegraf has the concept of Aggregator and Processor Plugins.
-
-These plugins sit in-between Input & Output plugins, aggregating and processing
-metrics as they pass through Telegraf:
-
-```
-┌───────────┐
-│           │
-│    CPU    │───┐
-│           │   │
-└───────────┘   │
-                │
-┌───────────┐   │                                              ┌───────────┐
-│           │   │                                              │           │
-│  Memory   │───┤                                          ┌──▶│ InfluxDB  │
-│           │   │                                          │   │           │
-└───────────┘   │    ┌─────────────┐     ┌─────────────┐   │   └───────────┘
-                │    │             │     │Aggregate    │   │
-┌───────────┐   │    │Process      │     │ - mean      │   │   ┌───────────┐
-│           │   │    │ - transform │     │ - quantiles │   │   │           │
-│   MySQL   │───┼───▶│ - decorate  │────▶│ - min/max   │───┼──▶│   File    │
-│           │   │    │ - filter    │     │ - count     │   │   │           │
-└───────────┘   │    │             │     │             │   │   └───────────┘
-                │    └─────────────┘     └─────────────┘   │
-┌───────────┐   │                                          │   ┌───────────┐
-│           │   │                                          │   │           │
-│   SNMP    │───┤                                          └──▶│   Kafka   │
-│           │   │                                              │           │
-└───────────┘   │                                              └───────────┘
-                │
-┌───────────┐   │
-│           │   │
-│  Docker   │───┘
-│           │
-└───────────┘
-```
-
-Both Aggregators and Processors analyze metrics as they pass through Telegraf.
-
-Use [measurement filtering](CONFIGURATION.md#measurement-filtering)
-to control which metrics are passed through a processor or aggregator.  If a
-metric is filtered out the metric bypasses the plugin and is passed downstream
-to the next plugin.
-
-**Processor** plugins process metrics as they pass through and immediately emit
-results based on the values they process. For example, this could be printing
-all metrics or adding a tag to all metrics that pass through.
-
-**Aggregator** plugins, on the other hand, are a bit more complicated. Aggregators
-are typically for emitting new _aggregate_ metrics, such as a running mean,
-minimum, maximum, quantiles, or standard deviation. For this reason, all _aggregator_
-plugins are configured with a `period`. The `period` is the size of the window
-of metrics that each _aggregate_ represents. In other words, the emitted
-_aggregate_ metric will be the aggregated value of the past `period` seconds.
-Since many users will only care about their aggregates and not every single metric
-gathered, there is also a `drop_original` argument, which tells Telegraf to only
-emit the aggregates and not the original metrics.
-
-**NOTE** That since aggregators only aggregate metrics within their period, that
-historical data is not supported. In other words, if your metric timestamp is more
-than `now() - period` in the past, it will not be aggregated. If this is a feature
-that you need, please comment on this [github issue](https://github.com/influxdata/telegraf/issues/1992)
--- a/docs/CONFIGURATION.md
+++ b/docs/CONFIGURATION.md
@@ -1,65 +1,30 @@
 # Telegraf Configuration

-You can see the latest config file with all available plugins here:
-[telegraf.conf](https://github.com/influxdata/telegraf/blob/master/etc/telegraf.conf)
-
 ## Generating a Configuration File

-A default Telegraf config file can be auto-generated by telegraf:
-
-```
-telegraf config > telegraf.conf
-```
+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:
+-input-filter and -output-filter flags:
+`telegraf -sample-config -input-filter cpu:mem:net:swap -output-filter influxdb:kafka`

-```
-telegraf --input-filter cpu:mem:net:swap --output-filter influxdb:kafka config
-```
+## `[global_tags]` Configuration

-## 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)
-
-When using the `.deb` or `.rpm` packages, you can define environment variables
-in the `/etc/default/telegraf` file.
-
-## Configuration file locations
-
-The location of the configuration file can be set via the `--config` command
-line flag.
-
-When the `--config-directory` command line flag is used files ending with
-`.conf` in the specified directory will also be included in the Telegraf
-configuration.
-
-On most systems, the default locations are `/etc/telegraf/telegraf.conf` for
-the main configuration file and `/etc/telegraf/telegraf.d` for the directory of
-configuration files.
-
-# Global Tags
-
-Global tags can be specified in the `[global_tags]` section of the config file
-in key="value" format. All metrics being gathered on this host will be tagged
+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
+## `[agent]` Configuration

-Telegraf has a few options you can configure under the `[agent]` section of the
+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_batch_size**: Telegraf will send metrics to output in batch of at
-most metric_batch_size metrics.
 * **metric_buffer_limit**: Telegraf will cache metric_buffer_limit metrics
 for each output, and will flush this buffer on a successful write.
-This should be a multiple of metric_batch_size and could not be less
-than 2 times metric_batch_size.
 * **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.
@@ -72,114 +37,40 @@ interval. Maximum flush_interval will be flush_interval + flush_jitter
 This is primarily to avoid
 large write spikes for users running a large number of telegraf instances.
 ie, a jitter of 5s and flush_interval 10s means flushes will happen every 10-15s.
-* **precision**:
-   By default or when set to "0s", precision will be set to the same
-   timestamp order as the collection interval, with the maximum being 1s.
-   Precision will NOT be used for service inputs. It is up to each individual
-   service input to set the timestamp at the appropriate precision.
-   Valid time units are "ns", "us" (or "µs"), "ms", "s".
-
-* **logfile**: Specify the log file name. The empty string means to log to stderr.
 * **debug**: Run telegraf in debug mode.
-* **quiet**: Run telegraf in quiet mode (error messages only).
+* **quiet**: Run telegraf in quiet mode.
 * **hostname**: Override default hostname, if empty use os.Hostname().
-* **omit_hostname**: If true, do no set the "host" tag in the telegraf agent.

-## Input Configuration
+## `[inputs.xxx]` Configuration

-The following config parameters are available for all inputs:
+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.
-* **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.

-The [measurement filtering](#measurement-filtering) parameters can be used to
-limit what metrics are emitted from the input plugin.
+#### Input Filters

-## Output Configuration
+There are also filters that can be configured per input:

-The [measurement filtering](#measurement-filtering) parameters can be used to
-limit what metrics are emitted from the output plugin.
-
-## Aggregator Configuration
-
-The following config parameters are available for all aggregators:
-
-* **period**: The period on which to flush & clear each aggregator. All metrics
-that are sent with timestamps outside of this period will be ignored by the
-aggregator.
-* **delay**: The delay before each aggregator is flushed. This is to control
-how long for aggregators to wait before receiving metrics from input plugins,
-in the case that aggregators are flushing and inputs are gathering on the
-same interval.
-* **drop_original**: If true, the original metric will be dropped by the
-aggregator and will not get sent to the output plugins.
-* **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.
-
-The [measurement filtering](#measurement-filtering) parameters be used to
-limit what metrics are handled by the aggregator.  Excluded metrics are passed
-downstream to the next aggregator.
-
-## Processor Configuration
-
-The following config parameters are available for all processors:
-
-* **order**: This is the order in which the processor(s) get executed. If this
-is not specified then processor execution order will be random.
-
-The [measurement filtering](#measurement-filtering) can parameters may be used
-to limit what metrics are handled by the processor.  Excluded metrics are
-passed downstream to the next processor.
-
-#### Measurement Filtering
-
-Filters can be configured per input, output, processor, or aggregator,
-see below for examples.
-
-* **namepass**:
-An array of glob pattern strings.  Only points whose measurement name matches
-a pattern in this list are emitted.
-* **namedrop**:
-The inverse of `namepass`.  If a match is found the point is discarded. This
-is tested on points after they have passed the `namepass` test.
-* **fieldpass**:
-An array of glob pattern strings.  Only fields whose field key matches a
-pattern in this list are emitted.  Not available for outputs.
-* **fielddrop**:
-The inverse of `fieldpass`.  Fields with a field key matching one of the
-patterns will be discarded from the point.  This is tested on points after
-they have passed the `fieldpass` test.  Not available for outputs.
-* **tagpass**:
-A table mapping tag keys to arrays of glob pattern strings.  Only points
-that contain a tag key in the table and a tag value matching one of its
-patterns is emitted.
-* **tagdrop**:
-The inverse of `tagpass`.  If a match is found the point is discarded. This
-is tested on points after they have passed the `tagpass` test.
-* **taginclude**:
-An array of glob pattern strings.  Only tags with a tag key matching one of
-the patterns are emitted.  In contrast to `tagpass`, which will pass an entire
-point based on its tag, `taginclude` removes all non matching tags from the
-point.  This filter can be used on both inputs & outputs, but it is
-_recommended_ to be used on inputs, as it is more efficient to filter out tags
-at the ingestion point.
-* **tagexclude**:
-The inverse of `taginclude`. Tags with a tag key matching one of the patterns
-will be discarded from the point.
-
-**NOTE** Due to the way TOML is parsed, `tagpass` and `tagdrop` parameters
-must be defined at the _end_ of the plugin definition, otherwise subsequent
-plugin config options will be interpreted as part of the tagpass/tagdrop
-tables.
+* **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

@@ -199,26 +90,23 @@ fields which begin with `time_`.
 [[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_*"]
+  drop = ["time_*"]
 ```

 #### Input Config: tagpass and tagdrop

-**NOTE** `tagpass` and `tagdrop` parameters must be defined at the _end_ of
-the plugin definition, otherwise subsequent plugin config options will be
-interpreted as part of the tagpass/tagdrop map.
-
 ```toml
 [[inputs.cpu]]
  percpu = true
  totalcpu = false
-  fielddrop = ["cpu_time"]
+  drop = ["cpu_time"]
  # Don't collect CPU data for cpu6 & cpu7
  [inputs.cpu.tagdrop]
    cpu = [ "cpu6", "cpu7" ]
@@ -253,26 +141,12 @@ interpreted as part of the tagpass/tagdrop map.
 # Drop all metrics about containers for kubelet
 [[inputs.prometheus]]
  urls = ["http://kube-node-1:4194/metrics"]
-  namedrop = ["container_*"]
+  namedrop = ["container_"]

 # Only store rest client related metrics for kubelet
 [[inputs.prometheus]]
  urls = ["http://kube-node-1:4194/metrics"]
-  namepass = ["rest_client_*"]
-```
-
-#### Input Config: taginclude and tagexclude
-
-```toml
-# Only include the "cpu" tag in the measurements for the cpu plugin.
-[[inputs.cpu]]
-  percpu = true
-  totalcpu = true
-  taginclude = ["cpu"]
-
-# Exclude the "fstype" tag from the measurements for the disk plugin.
-[[inputs.disk]]
-  tagexclude = ["fstype"]
+  namepass = ["rest_client_"]
 ```

 #### Input config: prefix, suffix, and override
@@ -300,9 +174,6 @@ This will emit measurements with the name `foobar`
 This plugin will emit measurements with two additional tags: `tag1=foo` and
 `tag2=bar`

-NOTE: Order matters, the `[inputs.cpu.tags]` table must be at the _end_ of the
-plugin definition.
-
 ```toml
 [[inputs.cpu]]
  percpu = false
@@ -328,76 +199,38 @@ to avoid measurement collisions:
  percpu = true
  totalcpu = false
  name_override = "percpu_usage"
-  fielddrop = ["cpu_time*"]
+  drop = ["cpu_time*"]
 ```

-#### Output Configuration Examples:
+## `[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"]
 ```
-
-#### Aggregator Configuration Examples:
-
-This will collect and emit the min/max of the system load1 metric every
-30s, dropping the originals.
-
-```toml
-[[inputs.system]]
-  fieldpass = ["load1"] # collects system load1 metric.
-
-[[aggregators.minmax]]
-  period = "30s"        # send & clear the aggregate every 30s.
-  drop_original = true  # drop the original metrics.
-
-[[outputs.file]]
-  files = ["stdout"]
-```
-
-This will collect and emit the min/max of the swap metrics every
-30s, dropping the originals. The aggregator will not be applied
-to the system load metrics due to the `namepass` parameter.
-
-```toml
-[[inputs.swap]]
-
-[[inputs.system]]
-  fieldpass = ["load1"] # collects system load1 metric.
-
-[[aggregators.minmax]]
-  period = "30s"        # send & clear the aggregate every 30s.
-  drop_original = true  # drop the original metrics.
-  namepass = ["swap"]   # only "pass" swap metrics through the aggregator.
-
-[[outputs.file]]
-  files = ["stdout"]
-```
-
-#### Processor Configuration Examples:
-
-Print only the metrics with `cpu` as the measurement name, all metrics are
-passed to the output:
-```toml
-[[processors.printer]]
-  namepass = "cpu"
-
-[[outputs.file]]
-  files = ["/tmp/metrics.out"]
-```
--- a/docs/DATA_FORMATS_INPUT.md
+++ b/docs/DATA_FORMATS_INPUT.md
@@ -1,14 +1,5 @@
 # Telegraf Input Data Formats

-Telegraf is able to parse the following input data formats into metrics:
-
-1. [InfluxDB Line Protocol](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#influx)
-1. [JSON](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#json)
-1. [Graphite](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#graphite)
-1. [Value](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#value), ie: 45 or "booyah"
-1. [Nagios](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#nagios) (exec input only)
-1. [Collectd](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#collectd)
-
 Telegraf metrics, like InfluxDB
 [points](https://docs.influxdata.com/influxdb/v0.10/write_protocols/line/),
 are a combination of four basic parts:
@@ -40,8 +31,8 @@ example, in the exec plugin:
  ## measurement name suffix (for separating different commands)
  name_suffix = "_mycollector"

-  ## Data format to consume.
-  ## Each data format has its own unique set of configuration options, read
+  ## 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"
@@ -52,7 +43,7 @@ example, in the exec plugin:
 Each data_format has an additional set of configuration options available, which
 I'll go over below.

-# Influx:
+## Influx:

 There are no additional configuration options for InfluxDB line-protocol. The
 metrics are parsed directly into Telegraf metrics.
@@ -67,28 +58,23 @@ metrics are parsed directly into Telegraf metrics.
  ## measurement name suffix (for separating different commands)
  name_suffix = "_mycollector"

-  ## Data format to consume.
-  ## Each data format has its own unique set of configuration options, read
+  ## 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:
+## JSON:

-The JSON data format flattens JSON into metric _fields_.
-NOTE: Only numerical values are converted to fields, and they are converted
-into a float. strings are ignored unless specified as a tag_key (see below).
-
-So for example, this JSON:
+The JSON data format flattens JSON into metric _fields_. For example, this JSON:

 ```json
 {
    "a": 5,
    "b": {
        "c": 6
-    },
-    "ignored": "I'm a string"
+    }
 }
 ```

@@ -117,8 +103,8 @@ For example, if you had this configuration:
  ## measurement name suffix (for separating different commands)
  name_suffix = "_mycollector"

-  ## Data format to consume.
-  ## Each data format has its own unique set of configuration options, read
+  ## 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"
@@ -148,191 +134,62 @@ Your Telegraf metrics would get tagged with "my_tag_1"
 exec_mycollector,my_tag_1=foo a=5,b_c=6
 ```

-If the JSON data is an array, then each element of the array is parsed with the configured settings.
-Each resulting metric will be output with the same timestamp.
-
-For example, if the following configuration:
-
-```toml
-[[inputs.exec]]
-  ## Commands array
-  commands = ["/usr/bin/mycollector --foo=bar"]
-
-  ## measurement name suffix (for separating different commands)
-  name_suffix = "_mycollector"
-
-  ## Data format to consume.
-  ## Each data format has its own unique set of configuration options, read
-  ## 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",
-        "my_tag_2": "baz"
-    },
-    {
-        "a": 7,
-        "b": {
-            "c": 8
-        },
-        "my_tag_1": "bar",
-        "my_tag_2": "baz"
-    }
-]
-```
-
-Your Telegraf metrics would get tagged with "my_tag_1" and "my_tag_2"
-
-```
-exec_mycollector,my_tag_1=foo,my_tag_2=baz a=5,b_c=6
-exec_mycollector,my_tag_1=bar,my_tag_2=baz a=7,b_c=8
-```
-
-# Value:
-
-The "value" data format translates single values into Telegraf metrics. This
-is done by assigning a measurement name and setting a single field ("value")
-as the parsed metric.
-
-#### Value Configuration:
-
-You **must** tell Telegraf what type of metric to collect by using the
-`data_type` configuration option. Available options are:
-
-1. integer
-2. float or long
-3. string
-4. boolean
-
-**Note:** 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.
-  ## Each data format has its own unique set of configuration options, read
-  ## more about them here:
-  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
-  data_format = "value"
-  data_type = "integer" # required
-```
-
-# Graphite:
+## Graphite:

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

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

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

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

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

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

 would result in the following Graphite -> Telegraf transformation.

 ```
-us.west.cpu.load 100
-=> cpu.load,region=us.west value=100
-```
-
-Multiple templates can also be specified, but these should be differentiated
-using _filters_ (see below for more details)
-
-```toml
-templates = [
-    "*.*.* region.region.measurement", # <- all 3-part measurements will match this one.
-    "*.*.*.* region.region.host.measurement", # <- all 4-part measurements will match this one.
-]
+us-west.cpu.load 100
+=> cpu.load,region=us-west value=100
 ```

 #### Field Templates:

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

 ```toml
-separator = "_"
 templates = [
-    "measurement.measurement.field.field.region"
+    "measurement.measurement.field.region"
 ]
 ```

 would result in the following Graphite -> Telegraf transformation.

 ```
-cpu.usage.idle.percent.eu-east 100
-=> cpu_usage,region=eu-east idle_percent=100
-```
-
-The field key can also be derived from all remaining elements of the graphite
-bucket by specifying `field*`:
-
-```toml
-separator = "_"
-templates = [
-    "measurement.measurement.region.field*"
-]
-```
-
-which would result in the following Graphite -> Telegraf transformation.
-
-```
-cpu.usage.eu-east.idle.percentage 100
-=> cpu_usage,region=eu-east idle_percentage=100
+cpu.usage.idle.us-west 100
+=> cpu_usage,region=us-west idle=100
 ```

 #### Filter Templates:
@@ -350,8 +207,8 @@ templates = [
 which would result in the following transformation:

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

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

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

 There are many more options available,
@@ -390,8 +247,8 @@ There are many more options available,
  ## measurement name suffix (for separating different commands)
  name_suffix = "_mycollector"

-  ## Data format to consume.
-  ## Each data format has its own unique set of configuration options, read
+  ## 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"
@@ -405,77 +262,13 @@ There are many more options available,
  ## similar to the line protocol format. There can be only one default template.
  ## Templates support below format:
  ## 1. filter + template
-  ## 2. filter + template + extra tag(s)
+  ## 2. filter + template + extra tag
  ## 3. filter + template with field key
  ## 4. default template
  templates = [
    "*.app env.service.resource.measurement",
-    "stats.* .host.measurement* region=eu-east,agent=sensu",
+    "stats.* .host.measurement* region=us-west,agent=sensu",
    "stats2.* .host.measurement.field",
    "measurement*"
  ]
 ```
-
-# 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.
-  ## Each data format has its own unique set of configuration options, read
-  ## more about them here:
-  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
-  data_format = "nagios"
-```
-
-# Collectd:
-
-The collectd format parses the collectd binary network protocol.  Tags are
-created for host, instance, type, and type instance.  All collectd values are
-added as float64 fields.
-
-For more information about the binary network protocol see
-[here](https://collectd.org/wiki/index.php/Binary_protocol).
-
-You can control the cryptographic settings with parser options.  Create an
-authentication file and set `collectd_auth_file` to the path of the file, then
-set the desired security level in `collectd_security_level`.
-
-Additional information including client setup can be found
-[here](https://collectd.org/wiki/index.php/Networking_introduction#Cryptographic_setup).
-
-You can also change the path to the typesdb or add additional typesdb using
-`collectd_typesdb`.
-
-#### Collectd Configuration:
-
-```toml
-[[inputs.socket_listener]]
-  service_address = "udp://127.0.0.1:25826"
-  name_prefix = "collectd_"
-
-  ## Data format to consume.
-  ## Each data format has its own unique set of configuration options, read
-  ## more about them here:
-  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
-  data_format = "collectd"
-
-  ## Authentication file for cryptographic security levels
-  collectd_auth_file = "/etc/collectd/auth_file"
-  ## One of none (default), sign, or encrypt
-  collectd_security_level = "encrypt"
-  ## Path of to TypesDB specifications
-  collectd_typesdb = ["/usr/share/collectd/types.db"]
-```
--- a/docs/DATA_FORMATS_OUTPUT.md
+++ b/docs/DATA_FORMATS_OUTPUT.md
@@ -1,11 +1,5 @@
 # Telegraf Output Data Formats

-Telegraf is able to serialize metrics into the following output data formats:
-
-1. [InfluxDB Line Protocol](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md#influx)
-1. [JSON](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md#json)
-1. [Graphite](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md#graphite)
-
 Telegraf metrics, like InfluxDB
 [points](https://docs.influxdata.com/influxdb/v0.10/write_protocols/line/),
 are a combination of four basic parts:
@@ -35,8 +29,8 @@ config option, for example, in the `file` output plugin:
  ## Files to write to, "stdout" is a specially handled file.
  files = ["stdout"]

-  ## Data format to output.
-  ## Each data format has its own unique set of configuration options, read
+  ## 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"
@@ -47,46 +41,34 @@ config option, for example, in the `file` output plugin:
 Each data_format has an additional set of configuration options available, which
 I'll go over below.

-# Influx:
+## Influx:

 There are no additional configuration options for InfluxDB line-protocol. The
 metrics are serialized directly into InfluxDB line-protocol.

-### Influx Configuration:
+#### Influx Configuration:

 ```toml
 [[outputs.file]]
  ## Files to write to, "stdout" is a specially handled file.
  files = ["stdout", "/tmp/metrics.out"]

-  ## Data format to output.
-  ## Each data format has its own unique set of configuration options, read
+  ## 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"
 ```

-# Graphite:
+## Graphite:

-The Graphite data format translates Telegraf metrics into _dot_ buckets. A
-template can be specified for the output of Telegraf metrics into Graphite
-buckets. The default template is:
+The Graphite data format translates Telegraf metrics into _dot_ buckets.
+The format is:

 ```
-template = "host.tags.measurement.field"
+[prefix].[host tag].[all tags (alphabetical)].[measurement name].[field name] value timestamp
 ```

-In the above template, we have four parts:
-
-1. _host_ is a tag key. This can be any tag key that is in the Telegraf
-metric(s). If the key doesn't exist, it will be ignored. If it does exist, the
-tag value will be filled in.
-1. _tags_ is a special keyword that outputs all remaining tag values, separated
-by dots and in alphabetical order (by tag key). These will be filled after all
-tag keys are filled.
-1. _measurement_ is a special keyword that outputs the measurement name.
-1. _field_ is a special keyword that outputs the field name.
-
 Which means the following influx metric -> graphite conversion would happen:

 ```
@@ -96,68 +78,20 @@ tars.cpu-total.us-east-1.cpu.usage_user 0.89 1455320690
 tars.cpu-total.us-east-1.cpu.usage_idle 98.09 1455320690
 ```

-Fields with string values will be skipped.  Boolean fields will be converted
-to 1 (true) or 0 (false).
+`prefix` is a configuration option when using the graphite output data format.

-### Graphite Configuration:
+#### Graphite Configuration:

 ```toml
 [[outputs.file]]
  ## Files to write to, "stdout" is a specially handled file.
  files = ["stdout", "/tmp/metrics.out"]

-  ## Data format to output.
-  ## Each data format has its own unique set of configuration options, read
+  ## 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 = "graphite"
+  data_format = "influx"

-  # prefix each graphite bucket
  prefix = "telegraf"
-  # graphite template
-  template = "host.tags.measurement.field"
 ```
-
-# 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.
-  ## Each data format has its own unique set of configuration options, read
-  ## more about them here:
-  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
-  data_format = "json"
-  json_timestamp_units = "1ns"
-```
-
-By default, the timestamp that is output in JSON data format serialized Telegraf
-metrics is in seconds. The precision of this timestamp can be adjusted for any output
-by adding the optional `json_timestamp_units` parameter to the configuration for
-that output. This parameter can be used to set the timestamp units to  nanoseconds (`ns`),
-microseconds (`us` or `µs`), milliseconds (`ms`), or seconds (`s`). Note that this
-parameter will be truncated to the nearest power of 10 that, so if the `json_timestamp_units`
-are set to `15ms` the timestamps for the JSON format serialized Telegraf metrics will be
-output in hundredths of a second (`10ms`).
--- a/docs/FAQ.md
+++ b/docs/FAQ.md
@@ -1,46 +0,0 @@
-# Frequently Asked Questions
-
-### Q: How can I monitor the Docker Engine Host from within a container?
-
-You will need to setup several volume mounts as well as some environment
-variables:
-```
-docker run --name telegraf
-	-v /:/hostfs:ro
-	-v /etc:/hostfs/etc:ro
-	-v /proc:/hostfs/proc:ro
-	-v /sys:/hostfs/sys:ro
-	-v /var/run/utmp:/var/run/utmp:ro
-	-e HOST_ETC=/hostfs/etc
-	-e HOST_PROC=/hostfs/proc
-	-e HOST_SYS=/hostfs/sys
-	-e HOST_MOUNT_PREFIX=/hostfs
-	telegraf
-```
-
-
-### Q: Why do I get a "no such host" error resolving hostnames that other
-programs can resolve?
-
-Go uses a pure Go resolver by default for [name resolution](https://golang.org/pkg/net/#hdr-Name_Resolution).
-This resolver behaves differently than the C library functions but is more
-efficient when used with the Go runtime.
-
-If you encounter problems or want to use more advanced name resolution methods
-that are unsupported by the pure Go resolver, you can switch to the cgo
-resolver.
-
-If running manually set:
-```
-export GODEBUG=netdns=cgo
-```
-
-If running as a service add the environment variable to `/etc/default/telegraf`:
-```
-GODEBUG=netdns=cgo
-```
-
-### Q: When will the next version be released?
-
-The latest release date estimate can be viewed on the
-[milestones](https://github.com/influxdata/telegraf/milestones) page.
--- a/docs/LICENSE_OF_DEPENDENCIES.md
+++ b/docs/LICENSE_OF_DEPENDENCIES.md
@@ -1,104 +1,33 @@
-# Licenses of dependencies
+# List
+- github.com/Shopify/sarama [MIT LICENSE](https://github.com/Shopify/sarama/blob/master/MIT-LICENSE)
+- github.com/Sirupsen/logrus [MIT LICENSE](https://github.com/Sirupsen/logrus/blob/master/LICENSE)
+- github.com/armon/go-metrics [MIT LICENSE](https://github.com/armon/go-metrics/blob/master/LICENSE)
+- github.com/boltdb/bolt [MIT LICENSE](https://github.com/boltdb/bolt/blob/master/LICENSE)
+- github.com/cenkalti/backoff [MIT LICENSE](https://github.com/cenkalti/backoff/blob/master/LICENSE)
+- github.com/dancannon/gorethink [APACHE LICENSE](https://github.com/dancannon/gorethink/blob/master/LICENSE)
+- github.com/eapache/go-resiliency [MIT LICENSE](https://github.com/eapache/go-resiliency/blob/master/LICENSE)
+- github.com/eapache/queue [MIT LICENSE](https://github.com/eapache/queue/blob/master/LICENSE)
+- github.com/fsouza/go-dockerclient [BSD LICENSE](https://github.com/fsouza/go-dockerclient/blob/master/LICENSE)
+- github.com/go-sql-driver/mysql [MPL LICENSE](https://github.com/go-sql-driver/mysql/blob/master/LICENSE)
+- github.com/gogo/protobuf [BSD LICENSE](https://github.com/gogo/protobuf/blob/master/LICENSE)
+- github.com/golang/protobuf [BSD LICENSE](https://github.com/golang/protobuf/blob/master/LICENSE)
+- github.com/golang/snappy [BSD LICENSE](https://github.com/golang/snappy/blob/master/LICENSE)
+- github.com/gonuts/go-shellquote (No License, but the project it was forked from https://github.com/kballard/go-shellquote is [MIT](https://github.com/kballard/go-shellquote/blob/master/LICENSE)).
+- github.com/hashicorp/go-msgpack [BSD LICENSE](https://github.com/hashicorp/go-msgpack/blob/master/LICENSE)
+- github.com/hashicorp/raft [MPL LICENSE](https://github.com/hashicorp/raft/blob/master/LICENSE)
+- github.com/hashicorp/raft-boltdb [MPL LICENSE](https://github.com/hashicorp/raft-boltdb/blob/master/LICENSE)
+- github.com/lib/pq [MIT LICENSE](https://github.com/lib/pq/blob/master/LICENSE.md)
+- github.com/matttproud/golang_protobuf_extensions [APACHE LICENSE](https://github.com/matttproud/golang_protobuf_extensions/blob/master/LICENSE)
+- github.com/naoina/go-stringutil [MIT LICENSE](https://github.com/naoina/go-stringutil/blob/master/LICENSE)
+- github.com/naoina/toml [MIT LICENSE](https://github.com/naoina/toml/blob/master/LICENSE)
+- github.com/prometheus/client_golang [APACHE LICENSE](https://github.com/prometheus/client_golang/blob/master/LICENSE)
+- github.com/samuel/go-zookeeper [BSD LICENSE](https://github.com/samuel/go-zookeeper/blob/master/LICENSE)
+- github.com/stretchr/objx [MIT LICENSE](github.com/stretchr/objx)
+- github.com/stretchr/testify [MIT LICENSE](https://github.com/stretchr/testify/blob/master/LICENCE.txt)
+- github.com/wvanbergen/kafka [MIT LICENSE](https://github.com/wvanbergen/kafka/blob/master/LICENSE)
+- github.com/wvanbergen/kazoo-go [MIT LICENSE](https://github.com/wvanbergen/kazoo-go/blob/master/MIT-LICENSE)
+- gopkg.in/dancannon/gorethink.v1 [APACHE LICENSE](https://github.com/dancannon/gorethink/blob/v1.1.2/LICENSE)
+- gopkg.in/mgo.v2 [BSD LICENSE](https://github.com/go-mgo/mgo/blob/v2/LICENSE)
+- golang.org/x/crypto/* [BSD LICENSE](https://github.com/golang/crypto/blob/master/LICENSE)
+- internal Glob function [MIT LICENSE](https://github.com/ryanuber/go-glob/blob/master/LICENSE)

-When distributed in a binary form, Telegraf may contain portions of the
-following works:
-
- collectd.org [MIT](https://github.com/collectd/go-collectd/blob/master/LICENSE)
- github.com/aerospike/aerospike-client-go [APACHE](https://github.com/aerospike/aerospike-client-go/blob/master/LICENSE)
- github.com/amir/raidman [PUBLIC DOMAIN](https://github.com/amir/raidman/blob/master/UNLICENSE)
- github.com/armon/go-metrics [MIT](https://github.com/armon/go-metrics/blob/master/LICENSE)
- github.com/aws/aws-sdk-go [APACHE](https://github.com/aws/aws-sdk-go/blob/master/LICENSE.txt)
- github.com/beorn7/perks [MIT](https://github.com/beorn7/perks/blob/master/LICENSE)
- github.com/boltdb/bolt [MIT](https://github.com/boltdb/bolt/blob/master/LICENSE)
- github.com/bsm/sarama-cluster [MIT](https://github.com/bsm/sarama-cluster/blob/master/LICENSE)
- github.com/cenkalti/backoff [MIT](https://github.com/cenkalti/backoff/blob/master/LICENSE)
- github.com/chuckpreslar/rcon [MIT](https://github.com/chuckpreslar/rcon#license)
- github.com/couchbase/go-couchbase [MIT](https://github.com/couchbase/go-couchbase/blob/master/LICENSE)
- github.com/couchbase/gomemcached [MIT](https://github.com/couchbase/gomemcached/blob/master/LICENSE)
- github.com/couchbase/goutils [MIT](https://github.com/couchbase/go-couchbase/blob/master/LICENSE)
- github.com/dancannon/gorethink [APACHE](https://github.com/dancannon/gorethink/blob/master/LICENSE)
- github.com/davecgh/go-spew [ISC](https://github.com/davecgh/go-spew/blob/master/LICENSE)
- github.com/docker/docker [APACHE](https://github.com/docker/docker/blob/master/LICENSE)
- github.com/docker/cli [APACHE](https://github.com/docker/cli/blob/master/LICENSE)
- github.com/eapache/go-resiliency [MIT](https://github.com/eapache/go-resiliency/blob/master/LICENSE)
- github.com/eapache/go-xerial-snappy [MIT](https://github.com/eapache/go-xerial-snappy/blob/master/LICENSE)
- github.com/eapache/queue [MIT](https://github.com/eapache/queue/blob/master/LICENSE)
- github.com/eclipse/paho.mqtt.golang [ECLIPSE](https://github.com/eclipse/paho.mqtt.golang/blob/master/LICENSE)
- github.com/fsouza/go-dockerclient [BSD](https://github.com/fsouza/go-dockerclient/blob/master/LICENSE)
- github.com/gobwas/glob [MIT](https://github.com/gobwas/glob/blob/master/LICENSE)
- github.com/google/go-cmp [BSD](https://github.com/google/go-cmp/blob/master/LICENSE)
- github.com/gogo/protobuf [BSD](https://github.com/gogo/protobuf/blob/master/LICENSE)
- github.com/golang/protobuf [BSD](https://github.com/golang/protobuf/blob/master/LICENSE)
- github.com/golang/snappy [BSD](https://github.com/golang/snappy/blob/master/LICENSE)
- github.com/go-logfmt/logfmt [MIT](https://github.com/go-logfmt/logfmt/blob/master/LICENSE)
- github.com/gorilla/mux [BSD](https://github.com/gorilla/mux/blob/master/LICENSE)
- github.com/go-ini/ini [APACHE](https://github.com/go-ini/ini/blob/master/LICENSE)
- github.com/go-ole/go-ole [MPL](http://mattn.mit-license.org/2013)
- github.com/go-sql-driver/mysql [MPL](https://github.com/go-sql-driver/mysql/blob/master/LICENSE)
- github.com/hailocab/go-hostpool [MIT](https://github.com/hailocab/go-hostpool/blob/master/LICENSE)
- github.com/hashicorp/consul [MPL](https://github.com/hashicorp/consul/blob/master/LICENSE)
- github.com/hashicorp/go-msgpack [BSD](https://github.com/hashicorp/go-msgpack/blob/master/LICENSE)
- github.com/hashicorp/raft-boltdb [MPL](https://github.com/hashicorp/raft-boltdb/blob/master/LICENSE)
- github.com/hashicorp/raft [MPL](https://github.com/hashicorp/raft/blob/master/LICENSE)
- github.com/influxdata/tail [MIT](https://github.com/influxdata/tail/blob/master/LICENSE.txt)
- github.com/influxdata/toml [MIT](https://github.com/influxdata/toml/blob/master/LICENSE)
- github.com/influxdata/wlog [MIT](https://github.com/influxdata/wlog/blob/master/LICENSE)
- github.com/jackc/pgx [MIT](https://github.com/jackc/pgx/blob/master/LICENSE)
- github.com/jmespath/go-jmespath [APACHE](https://github.com/jmespath/go-jmespath/blob/master/LICENSE)
- github.com/kardianos/osext [BSD](https://github.com/kardianos/osext/blob/master/LICENSE)
- github.com/kardianos/service [ZLIB](https://github.com/kardianos/service/blob/master/LICENSE) (License not named but matches word for word with ZLib)
- github.com/kballard/go-shellquote [MIT](https://github.com/kballard/go-shellquote/blob/master/LICENSE)
- github.com/lib/pq [MIT](https://github.com/lib/pq/blob/master/LICENSE.md)
- github.com/matttproud/golang_protobuf_extensions [APACHE](https://github.com/matttproud/golang_protobuf_extensions/blob/master/LICENSE)
- github.com/Microsoft/go-winio [MIT](https://github.com/Microsoft/go-winio/blob/master/LICENSE)
- github.com/miekg/dns [BSD](https://github.com/miekg/dns/blob/master/LICENSE)
- github.com/naoina/go-stringutil [MIT](https://github.com/naoina/go-stringutil/blob/master/LICENSE)
- github.com/naoina/toml [MIT](https://github.com/naoina/toml/blob/master/LICENSE)
- github.com/nats-io/go-nats [MIT](https://github.com/nats-io/go-nats/blob/master/LICENSE)
- github.com/nats-io/nats [MIT](https://github.com/nats-io/nats/blob/master/LICENSE)
- github.com/nats-io/nuid [MIT](https://github.com/nats-io/nuid/blob/master/LICENSE)
- github.com/nsqio/go-nsq [MIT](https://github.com/nsqio/go-nsq/blob/master/LICENSE)
- github.com/opentracing-contrib/go-observer [APACHE](https://github.com/opentracing-contrib/go-observer/blob/master/LICENSE)
- github.com/opentracing/opentracing-go [MIT](https://github.com/opentracing/opentracing-go/blob/master/LICENSE)
- github.com/openzipkin/zipkin-go-opentracing [MIT](https://github.com/openzipkin/zipkin-go-opentracing/blob/master/LICENSE)
- github.com/pierrec/lz4 [BSD](https://github.com/pierrec/lz4/blob/master/LICENSE)
- github.com/pierrec/xxHash [BSD](https://github.com/pierrec/xxHash/blob/master/LICENSE)
- github.com/pkg/errors [BSD](https://github.com/pkg/errors/blob/master/LICENSE)
- github.com/pmezard/go-difflib [BSD](https://github.com/pmezard/go-difflib/blob/master/LICENSE)
- github.com/prometheus/client_golang [APACHE](https://github.com/prometheus/client_golang/blob/master/LICENSE)
- github.com/prometheus/client_model [APACHE](https://github.com/prometheus/client_model/blob/master/LICENSE)
- github.com/prometheus/common [APACHE](https://github.com/prometheus/common/blob/master/LICENSE)
- github.com/prometheus/procfs [APACHE](https://github.com/prometheus/procfs/blob/master/LICENSE)
- github.com/rcrowley/go-metrics [BSD](https://github.com/rcrowley/go-metrics/blob/master/LICENSE)
- github.com/samuel/go-zookeeper [BSD](https://github.com/samuel/go-zookeeper/blob/master/LICENSE)
- github.com/satori/go.uuid [MIT](https://github.com/satori/go.uuid/blob/master/LICENSE)
- github.com/shirou/gopsutil [BSD](https://github.com/shirou/gopsutil/blob/master/LICENSE)
- github.com/shirou/w32 [BSD](https://github.com/shirou/w32/blob/master/LICENSE)
- github.com/Shopify/sarama [MIT](https://github.com/Shopify/sarama/blob/master/MIT-LICENSE)
- github.com/Sirupsen/logrus [MIT](https://github.com/Sirupsen/logrus/blob/master/LICENSE)
- github.com/StackExchange/wmi [MIT](https://github.com/StackExchange/wmi/blob/master/LICENSE)
- github.com/stretchr/objx [MIT](https://github.com/stretchr/objx/blob/master/LICENSE.md)
- github.com/soniah/gosnmp [BSD](https://github.com/soniah/gosnmp/blob/master/LICENSE)
- github.com/streadway/amqp [BSD](https://github.com/streadway/amqp/blob/master/LICENSE)
- github.com/stretchr/objx [MIT](https://github.com/stretchr/objx/blob/master/LICENSE.md)
- github.com/stretchr/testify [MIT](https://github.com/stretchr/testify/blob/master/LICENCE.txt)
- github.com/mitchellh/mapstructure [MIT](https://github.com/mitchellh/mapstructure/blob/master/LICENSE)
- github.com/multiplay/go-ts3 [BSD](https://github.com/multiplay/go-ts3/blob/master/LICENSE)
- github.com/vjeantet/grok [APACHE](https://github.com/vjeantet/grok/blob/master/LICENSE)
- github.com/wvanbergen/kafka [MIT](https://github.com/wvanbergen/kafka/blob/master/LICENSE)
- github.com/wvanbergen/kazoo-go [MIT](https://github.com/wvanbergen/kazoo-go/blob/master/MIT-LICENSE)
- github.com/yuin/gopher-lua [MIT](https://github.com/yuin/gopher-lua/blob/master/LICENSE)
- github.com/zensqlmonitor/go-mssqldb [BSD](https://github.com/zensqlmonitor/go-mssqldb/blob/master/LICENSE.txt)
- golang.org/x/crypto [BSD](https://github.com/golang/crypto/blob/master/LICENSE)
- golang.org/x/net [BSD](https://go.googlesource.com/net/+/master/LICENSE)
- golang.org/x/text [BSD](https://go.googlesource.com/text/+/master/LICENSE)
- golang.org/x/sys [BSD](https://go.googlesource.com/sys/+/master/LICENSE)
- gopkg.in/asn1-ber.v1 [MIT](https://github.com/go-asn1-ber/asn1-ber/blob/v1.2/LICENSE)
- gopkg.in/dancannon/gorethink.v1 [APACHE](https://github.com/dancannon/gorethink/blob/v1.1.2/LICENSE)
- gopkg.in/fatih/pool.v2 [MIT](https://github.com/fatih/pool/blob/v2.0.0/LICENSE)
- gopkg.in/fsnotify.v1 [BSD](https://github.com/fsnotify/fsnotify/blob/v1.4.2/LICENSE)
- gopkg.in/ldap.v2 [MIT](https://github.com/go-ldap/ldap/blob/v2.5.0/LICENSE)
- gopkg.in/mgo.v2 [BSD](https://github.com/go-mgo/mgo/blob/v2/LICENSE)
- gopkg.in/olivere/elastic.v5 [MIT](https://github.com/olivere/elastic/blob/v5.0.38/LICENSE)
- gopkg.in/tomb.v1 [BSD](https://github.com/go-tomb/tomb/blob/v1/LICENSE)
- gopkg.in/yaml.v2 [APACHE](https://github.com/go-yaml/yaml/blob/v2/LICENSE)
--- a/docs/PROFILING.md
+++ b/docs/PROFILING.md
@@ -1,24 +0,0 @@
-# Telegraf profiling
-
-Telegraf uses the standard package `net/http/pprof`. This package serves via its HTTP server runtime profiling data in the format expected by the pprof visualization tool.
-
-By default, the profiling is turned off.
-
-To enable profiling you need to specify address to config parameter `pprof-addr`, for example:
-
-```
-telegraf --config telegraf.conf --pprof-addr localhost:6060
-```
-
-There are several paths to get different profiling information:
-
-To look at the heap profile:
-
-`go tool pprof http://localhost:6060/debug/pprof/heap`
-
-or to look at a 30-second CPU profile:
-
-`go tool pprof http://localhost:6060/debug/pprof/profile?seconds=30`
-
-To view all available profiles, open `http://localhost:6060/debug/pprof/` in your browser.
-
--- a/docs/WINDOWS_SERVICE.md
+++ b/docs/WINDOWS_SERVICE.md
@@ -1,45 +0,0 @@
-# Running Telegraf as a Windows Service
-
-Telegraf natively supports running as a Windows Service. Outlined below is are
-the general steps to set it up.
-
-1. Obtain the telegraf windows distribution
-2. Create the directory `C:\Program Files\Telegraf` (if you install in a different
-   location simply specify the `-config` parameter with the desired location)
-3. Place the telegraf.exe and the telegraf.conf config file into `C:\Program Files\Telegraf`
-4. To install the service into the Windows Service Manager, run the following in PowerShell as an administrator (If necessary, you can wrap any spaces in the file paths in double quotes ""):
-
-   ```
-   > C:\"Program Files"\Telegraf\telegraf.exe --service install
-   ```
-
-5. Edit the configuration file to meet your needs
-6. To check that it works, run:
-
-   ```
-   > C:\"Program Files"\Telegraf\telegraf.exe --config C:\"Program Files"\Telegraf\telegraf.conf --test
-   ```
-
-7. To start collecting data, run:
-
-   ```
-   > net start telegraf
-   ```
-
-## Other supported operations
-
-Telegraf can manage its own service through the --service flag:
-
-| Command                            | Effect                        |
-|------------------------------------|-------------------------------|
-| `telegraf.exe --service install`   | Install telegraf as a service |
-| `telegraf.exe --service uninstall` | Remove the telegraf service   |
-| `telegraf.exe --service start`     | Start the telegraf service    |
-| `telegraf.exe --service stop`      | Stop the telegraf service     |
-
-
-Troubleshooting  common error #1067
-
-When installing as service in Windows, always double check to specify full path of the config file, otherwise windows service will fail to start
-
- --config C:\"Program Files"\Telegraf\telegraf.conf
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
--- a/etc/telegraf_windows.conf
+++ b/etc/telegraf_windows.conf
@@ -1,266 +0,0 @@
-# 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"
-
-  ## Logging configuration:
-  ## Run telegraf in debug mode
-  debug = false
-  ## Run telegraf in quiet mode
-  quiet = false
-  ## Specify the log file name. The empty string means to log to stdout.
-  logfile = "/Program Files/Telegraf/telegraf.log"
-
-  ## 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://127.0.0.1:8089"] # UDP endpoint example
-  urls = ["http://127.0.0.1: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 utilize more 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",
-      "% DPC Time",
-    ]
-    Measurement = "win_cpu"
-    # Set to true to include _Total instance when querying for all (*).
-    IncludeTotal=true
-
-  [[inputs.win_perf_counters.object]]
-    # Disk times and queues
-    ObjectName = "LogicalDisk"
-    Instances = ["*"]
-    Counters = [
-      "% Idle Time",
-      "% Disk Time",
-      "% Disk Read Time",
-      "% Disk Write Time",
-      "Current Disk Queue Length",
-      "% Free Space",
-      "Free Megabytes",
-    ]
-    Measurement = "win_disk"
-    # Set to true to include _Total instance when querying for all (*).
-    #IncludeTotal=false
-
-  [[inputs.win_perf_counters.object]]
-    ObjectName = "PhysicalDisk"
-    Instances = ["*"]
-    Counters = [
-      "Disk Read Bytes/sec",
-      "Disk Write Bytes/sec",
-      "Current Disk Queue Length",
-      "Disk Reads/sec",
-      "Disk Writes/sec",
-      "% Disk Time",
-      "% Disk Read Time",
-      "% Disk Write Time",
-    ]
-    Measurement = "win_diskio"
-
-  [[inputs.win_perf_counters.object]]
-    ObjectName = "Network Interface"
-    Instances = ["*"]
-    Counters = [
-      "Bytes Received/sec",
-      "Bytes Sent/sec",
-      "Packets Received/sec",
-      "Packets Sent/sec",
-      "Packets Received Discarded",
-      "Packets Outbound Discarded",
-      "Packets Received Errors",
-      "Packets Outbound Errors",
-    ]
-    Measurement = "win_net"
-
-  [[inputs.win_perf_counters.object]]
-    ObjectName = "System"
-    Counters = [
-      "Context Switches/sec",
-      "System Calls/sec",
-      "Processor Queue Length",
-      "System Up Time",
-    ]
-    Instances = ["------"]
-    Measurement = "win_system"
-    # Set to true to include _Total instance when querying for all (*).
-    #IncludeTotal=false
-
-  [[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",
-      "Standby Cache Reserve Bytes",
-      "Standby Cache Normal Priority Bytes",
-      "Standby Cache Core Bytes",
-
-    ]
-    # Use 6 x - to remove the Instance bit from the query.
-    Instances = ["------"]
-    Measurement = "win_mem"
-    # Set to true to include _Total instance when querying for all (*).
-    #IncludeTotal=false
-
-  [[inputs.win_perf_counters.object]]
-    # Example query where the Instance portion must be removed to get data back,
-    # such as from the Paging File object.
-    ObjectName = "Paging File"
-    Counters = [
-      "% Usage",
-    ]
-    Instances = ["_Total"]
-    Measurement = "win_swap"
-
-  [[inputs.win_perf_counters.object]]
-    ObjectName = "Network Interface"
-    Instances = ["*"]
-    Counters = [
-      "Bytes Sent/sec",
-      "Bytes Received/sec",
-      "Packets Sent/sec",
-      "Packets Received/sec",
-      "Packets Received Discarded",
-      "Packets Received Errors",
-      "Packets Outbound Discarded",
-      "Packets Outbound Errors",
-    ]
-
-
-
-# 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/filter/filter.go
+++ b/filter/filter.go
@@ -1,116 +0,0 @@
-package filter
-
-import (
-	"strings"
-
-	"github.com/gobwas/glob"
-)
-
-type Filter interface {
-	Match(string) bool
-}
-
-// Compile takes a list of string filters and returns a Filter interface
-// for matching a given string against the filter list. The filter list
-// supports glob matching too, ie:
-//
-//   f, _ := Compile([]string{"cpu", "mem", "net*"})
-//   f.Match("cpu")     // true
-//   f.Match("network") // true
-//   f.Match("memory")  // false
-//
-func Compile(filters []string) (Filter, error) {
-	// return if there is nothing to compile
-	if len(filters) == 0 {
-		return nil, nil
-	}
-
-	// check if we can compile a non-glob filter
-	noGlob := true
-	for _, filter := range filters {
-		if hasMeta(filter) {
-			noGlob = false
-			break
-		}
-	}
-
-	switch {
-	case noGlob:
-		// return non-globbing filter if not needed.
-		return compileFilterNoGlob(filters), nil
-	case len(filters) == 1:
-		return glob.Compile(filters[0])
-	default:
-		return glob.Compile("{" + strings.Join(filters, ",") + "}")
-	}
-}
-
-// hasMeta reports whether path contains any magic glob characters.
-func hasMeta(s string) bool {
-	return strings.IndexAny(s, "*?[") >= 0
-}
-
-type filter struct {
-	m map[string]struct{}
-}
-
-func (f *filter) Match(s string) bool {
-	_, ok := f.m[s]
-	return ok
-}
-
-type filtersingle struct {
-	s string
-}
-
-func (f *filtersingle) Match(s string) bool {
-	return f.s == s
-}
-
-func compileFilterNoGlob(filters []string) Filter {
-	if len(filters) == 1 {
-		return &filtersingle{s: filters[0]}
-	}
-	out := filter{m: make(map[string]struct{})}
-	for _, filter := range filters {
-		out.m[filter] = struct{}{}
-	}
-	return &out
-}
-
-type IncludeExcludeFilter struct {
-	include Filter
-	exclude Filter
-}
-
-func NewIncludeExcludeFilter(
-	include []string,
-	exclude []string,
-) (Filter, error) {
-	in, err := Compile(include)
-	if err != nil {
-		return nil, err
-	}
-
-	ex, err := Compile(exclude)
-	if err != nil {
-		return nil, err
-	}
-
-	return &IncludeExcludeFilter{in, ex}, nil
-}
-
-func (f *IncludeExcludeFilter) Match(s string) bool {
-	if f.include != nil {
-		if !f.include.Match(s) {
-			return false
-		}
-	}
-
-	if f.exclude != nil {
-		if f.exclude.Match(s) {
-			return false
-		}
-	}
-	return true
-}
--- a/filter/filter_test.go
+++ b/filter/filter_test.go
@@ -1,96 +0,0 @@
-package filter
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestCompile(t *testing.T) {
-	f, err := Compile([]string{})
-	assert.NoError(t, err)
-	assert.Nil(t, f)
-
-	f, err = Compile([]string{"cpu"})
-	assert.NoError(t, err)
-	assert.True(t, f.Match("cpu"))
-	assert.False(t, f.Match("cpu0"))
-	assert.False(t, f.Match("mem"))
-
-	f, err = Compile([]string{"cpu*"})
-	assert.NoError(t, err)
-	assert.True(t, f.Match("cpu"))
-	assert.True(t, f.Match("cpu0"))
-	assert.False(t, f.Match("mem"))
-
-	f, err = Compile([]string{"cpu", "mem"})
-	assert.NoError(t, err)
-	assert.True(t, f.Match("cpu"))
-	assert.False(t, f.Match("cpu0"))
-	assert.True(t, f.Match("mem"))
-
-	f, err = Compile([]string{"cpu", "mem", "net*"})
-	assert.NoError(t, err)
-	assert.True(t, f.Match("cpu"))
-	assert.False(t, f.Match("cpu0"))
-	assert.True(t, f.Match("mem"))
-	assert.True(t, f.Match("network"))
-}
-
-var benchbool bool
-
-func BenchmarkFilterSingleNoGlobFalse(b *testing.B) {
-	f, _ := Compile([]string{"cpu"})
-	var tmp bool
-	for n := 0; n < b.N; n++ {
-		tmp = f.Match("network")
-	}
-	benchbool = tmp
-}
-
-func BenchmarkFilterSingleNoGlobTrue(b *testing.B) {
-	f, _ := Compile([]string{"cpu"})
-	var tmp bool
-	for n := 0; n < b.N; n++ {
-		tmp = f.Match("cpu")
-	}
-	benchbool = tmp
-}
-
-func BenchmarkFilter(b *testing.B) {
-	f, _ := Compile([]string{"cpu", "mem", "net*"})
-	var tmp bool
-	for n := 0; n < b.N; n++ {
-		tmp = f.Match("network")
-	}
-	benchbool = tmp
-}
-
-func BenchmarkFilterNoGlob(b *testing.B) {
-	f, _ := Compile([]string{"cpu", "mem", "net"})
-	var tmp bool
-	for n := 0; n < b.N; n++ {
-		tmp = f.Match("net")
-	}
-	benchbool = tmp
-}
-
-func BenchmarkFilter2(b *testing.B) {
-	f, _ := Compile([]string{"aa", "bb", "c", "ad", "ar", "at", "aq",
-		"aw", "az", "axxx", "ab", "cpu", "mem", "net*"})
-	var tmp bool
-	for n := 0; n < b.N; n++ {
-		tmp = f.Match("network")
-	}
-	benchbool = tmp
-}
-
-func BenchmarkFilter2NoGlob(b *testing.B) {
-	f, _ := Compile([]string{"aa", "bb", "c", "ad", "ar", "at", "aq",
-		"aw", "az", "axxx", "ab", "cpu", "mem", "net"})
-	var tmp bool
-	for n := 0; n < b.N; n++ {
-		tmp = f.Match("net")
-	}
-	benchbool = tmp
-}
--- a/internal/buffer/buffer.go
+++ b/internal/buffer/buffer.go
@@ -1,76 +0,0 @@
-package buffer
-
-import (
-	"sync"
-
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/selfstat"
-)
-
-var (
-	MetricsWritten = selfstat.Register("agent", "metrics_written", map[string]string{})
-	MetricsDropped = selfstat.Register("agent", "metrics_dropped", map[string]string{})
-)
-
-// Buffer is an object for storing metrics in a circular buffer.
-type Buffer struct {
-	buf chan telegraf.Metric
-
-	mu sync.Mutex
-}
-
-// NewBuffer returns a Buffer
-//   size is the maximum number of metrics that Buffer will cache. If Add is
-//   called when the buffer is full, then the oldest metric(s) will be dropped.
-func NewBuffer(size int) *Buffer {
-	return &Buffer{
-		buf: make(chan telegraf.Metric, size),
-	}
-}
-
-// IsEmpty returns true if Buffer is empty.
-func (b *Buffer) IsEmpty() bool {
-	return len(b.buf) == 0
-}
-
-// Len returns the current length of the buffer.
-func (b *Buffer) Len() int {
-	return len(b.buf)
-}
-
-// Add adds metrics to the buffer.
-func (b *Buffer) Add(metrics ...telegraf.Metric) {
-	for i, _ := range metrics {
-		MetricsWritten.Incr(1)
-		select {
-		case b.buf <- metrics[i]:
-		default:
-			b.mu.Lock()
-			MetricsDropped.Incr(1)
-			<-b.buf
-			b.buf <- metrics[i]
-			b.mu.Unlock()
-		}
-	}
-}
-
-// Batch returns a batch of metrics of size batchSize.
-// the batch will be of maximum length batchSize. It can be less than batchSize,
-// if the length of Buffer is less than batchSize.
-func (b *Buffer) Batch(batchSize int) []telegraf.Metric {
-	b.mu.Lock()
-	n := min(len(b.buf), batchSize)
-	out := make([]telegraf.Metric, n)
-	for i := 0; i < n; i++ {
-		out[i] = <-b.buf
-	}
-	b.mu.Unlock()
-	return out
-}
-
-func min(a, b int) int {
-	if b < a {
-		return b
-	}
-	return a
-}
--- a/internal/buffer/buffer_test.go
+++ b/internal/buffer/buffer_test.go
@@ -1,100 +0,0 @@
-package buffer
-
-import (
-	"testing"
-
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/testutil"
-
-	"github.com/stretchr/testify/assert"
-)
-
-var metricList = []telegraf.Metric{
-	testutil.TestMetric(2, "mymetric1"),
-	testutil.TestMetric(1, "mymetric2"),
-	testutil.TestMetric(11, "mymetric3"),
-	testutil.TestMetric(15, "mymetric4"),
-	testutil.TestMetric(8, "mymetric5"),
-}
-
-func BenchmarkAddMetrics(b *testing.B) {
-	buf := NewBuffer(10000)
-	m := testutil.TestMetric(1, "mymetric")
-	for n := 0; n < b.N; n++ {
-		buf.Add(m)
-	}
-}
-
-func TestNewBufferBasicFuncs(t *testing.T) {
-	b := NewBuffer(10)
-	MetricsDropped.Set(0)
-	MetricsWritten.Set(0)
-
-	assert.True(t, b.IsEmpty())
-	assert.Zero(t, b.Len())
-	assert.Zero(t, MetricsDropped.Get())
-	assert.Zero(t, MetricsWritten.Get())
-
-	m := testutil.TestMetric(1, "mymetric")
-	b.Add(m)
-	assert.False(t, b.IsEmpty())
-	assert.Equal(t, b.Len(), 1)
-	assert.Equal(t, int64(0), MetricsDropped.Get())
-	assert.Equal(t, int64(1), MetricsWritten.Get())
-
-	b.Add(metricList...)
-	assert.False(t, b.IsEmpty())
-	assert.Equal(t, b.Len(), 6)
-	assert.Equal(t, int64(0), MetricsDropped.Get())
-	assert.Equal(t, int64(6), MetricsWritten.Get())
-}
-
-func TestDroppingMetrics(t *testing.T) {
-	b := NewBuffer(10)
-	MetricsDropped.Set(0)
-	MetricsWritten.Set(0)
-
-	// Add up to the size of the buffer
-	b.Add(metricList...)
-	b.Add(metricList...)
-	assert.False(t, b.IsEmpty())
-	assert.Equal(t, b.Len(), 10)
-	assert.Equal(t, int64(0), MetricsDropped.Get())
-	assert.Equal(t, int64(10), MetricsWritten.Get())
-
-	// Add 5 more and verify they were dropped
-	b.Add(metricList...)
-	assert.False(t, b.IsEmpty())
-	assert.Equal(t, b.Len(), 10)
-	assert.Equal(t, int64(5), MetricsDropped.Get())
-	assert.Equal(t, int64(15), MetricsWritten.Get())
-}
-
-func TestGettingBatches(t *testing.T) {
-	b := NewBuffer(20)
-	MetricsDropped.Set(0)
-	MetricsWritten.Set(0)
-
-	// Verify that the buffer returned is smaller than requested when there are
-	// not as many items as requested.
-	b.Add(metricList...)
-	batch := b.Batch(10)
-	assert.Len(t, batch, 5)
-
-	// Verify that the buffer is now empty
-	assert.True(t, b.IsEmpty())
-	assert.Zero(t, b.Len())
-	assert.Zero(t, MetricsDropped.Get())
-	assert.Equal(t, int64(5), MetricsWritten.Get())
-
-	// Verify that the buffer returned is not more than the size requested
-	b.Add(metricList...)
-	batch = b.Batch(3)
-	assert.Len(t, batch, 3)
-
-	// Verify that buffer is not empty
-	assert.False(t, b.IsEmpty())
-	assert.Equal(t, b.Len(), 2)
-	assert.Equal(t, int64(0), MetricsDropped.Get())
-	assert.Equal(t, int64(10), MetricsWritten.Get())
-}
--- a/internal/config/aws/credentials.go
+++ b/internal/config/aws/credentials.go
@@ -1,49 +0,0 @@
-package aws
-
-import (
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/client"
-	"github.com/aws/aws-sdk-go/aws/credentials"
-	"github.com/aws/aws-sdk-go/aws/credentials/stscreds"
-	"github.com/aws/aws-sdk-go/aws/session"
-)
-
-type CredentialConfig struct {
-	Region    string
-	AccessKey string
-	SecretKey string
-	RoleARN   string
-	Profile   string
-	Filename  string
-	Token     string
-}
-
-func (c *CredentialConfig) Credentials() client.ConfigProvider {
-	if c.RoleARN != "" {
-		return c.assumeCredentials()
-	} else {
-		return c.rootCredentials()
-	}
-}
-
-func (c *CredentialConfig) rootCredentials() client.ConfigProvider {
-	config := &aws.Config{
-		Region: aws.String(c.Region),
-	}
-	if c.AccessKey != "" || c.SecretKey != "" {
-		config.Credentials = credentials.NewStaticCredentials(c.AccessKey, c.SecretKey, c.Token)
-	} else if c.Profile != "" || c.Filename != "" {
-		config.Credentials = credentials.NewSharedCredentials(c.Filename, c.Profile)
-	}
-
-	return session.New(config)
-}
-
-func (c *CredentialConfig) assumeCredentials() client.ConfigProvider {
-	rootCredentials := c.rootCredentials()
-	config := &aws.Config{
-		Region: aws.String(c.Region),
-	}
-	config.Credentials = stscreds.NewCredentials(rootCredentials, c.RoleARN)
-	return session.New(config)
-}
--- a/internal/config/config.go
+++ b/internal/config/config.go
--- a/internal/config/config_test.go
+++ b/internal/config/config_test.go
@@ -1,7 +1,6 @@
 package config

 import (
-	"os"
 	"testing"
 	"time"

@@ -11,53 +10,9 @@ import (
 	"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_LoadSingleInputWithEnvVars(t *testing.T) {
-	c := NewConfig()
-	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 := inputs.Inputs["memcached"]().(*memcached.Memcached)
-	memcached.Servers = []string{"192.168.1.1"}
-
-	filter := models.Filter{
-		NameDrop:  []string{"metricname2"},
-		NamePass:  []string{"metricname1"},
-		FieldDrop: []string{"other", "stuff"},
-		FieldPass: []string{"some", "strings"},
-		TagDrop: []models.TagFilter{
-			models.TagFilter{
-				Name:   "badtag",
-				Filter: []string{"othertag"},
-			},
-		},
-		TagPass: []models.TagFilter{
-			models.TagFilter{
-				Name:   "goodtag",
-				Filter: []string{"mytag"},
-			},
-		},
-	}
-	assert.NoError(t, filter.Compile())
-	mConfig := &models.InputConfig{
-		Name:     "memcached",
-		Filter:   filter,
-		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")
@@ -65,28 +20,27 @@ func TestConfig_LoadSingleInput(t *testing.T) {
 	memcached := inputs.Inputs["memcached"]().(*memcached.Memcached)
 	memcached.Servers = []string{"localhost"}

-	filter := models.Filter{
-		NameDrop:  []string{"metricname2"},
-		NamePass:  []string{"metricname1"},
-		FieldDrop: []string{"other", "stuff"},
-		FieldPass: []string{"some", "strings"},
-		TagDrop: []models.TagFilter{
-			models.TagFilter{
-				Name:   "badtag",
-				Filter: []string{"othertag"},
+	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: []models.TagFilter{
-			models.TagFilter{
-				Name:   "goodtag",
-				Filter: []string{"mytag"},
+			TagPass: []internal_models.TagFilter{
+				internal_models.TagFilter{
+					Name:   "goodtag",
+					Filter: []string{"mytag"},
+				},
 			},
+			IsActive: true,
 		},
-	}
-	assert.NoError(t, filter.Compile())
-	mConfig := &models.InputConfig{
-		Name:     "memcached",
-		Filter:   filter,
 		Interval: 5 * time.Second,
 	}
 	mConfig.Tags = make(map[string]string)
@@ -111,28 +65,27 @@ func TestConfig_LoadDirectory(t *testing.T) {
 	memcached := inputs.Inputs["memcached"]().(*memcached.Memcached)
 	memcached.Servers = []string{"localhost"}

-	filter := models.Filter{
-		NameDrop:  []string{"metricname2"},
-		NamePass:  []string{"metricname1"},
-		FieldDrop: []string{"other", "stuff"},
-		FieldPass: []string{"some", "strings"},
-		TagDrop: []models.TagFilter{
-			models.TagFilter{
-				Name:   "badtag",
-				Filter: []string{"othertag"},
+	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: []models.TagFilter{
-			models.TagFilter{
-				Name:   "goodtag",
-				Filter: []string{"mytag"},
+			TagPass: []internal_models.TagFilter{
+				internal_models.TagFilter{
+					Name:   "goodtag",
+					Filter: []string{"mytag"},
+				},
 			},
+			IsActive: true,
 		},
-	}
-	assert.NoError(t, filter.Compile())
-	mConfig := &models.InputConfig{
-		Name:     "memcached",
-		Filter:   filter,
 		Interval: 5 * time.Second,
 	}
 	mConfig.Tags = make(map[string]string)
@@ -147,7 +100,7 @@ func TestConfig_LoadDirectory(t *testing.T) {
 	assert.NoError(t, err)
 	ex.SetParser(p)
 	ex.Command = "/usr/bin/myothercollector --foo=bar"
-	eConfig := &models.InputConfig{
+	eConfig := &internal_models.InputConfig{
 		Name:              "exec",
 		MeasurementSuffix: "_myothercollector",
 	}
@@ -166,7 +119,7 @@ func TestConfig_LoadDirectory(t *testing.T) {
 	pstat := inputs.Inputs["procstat"]().(*procstat.Procstat)
 	pstat.PidFile = "/var/run/grafana-server.pid"

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

 	assert.Equal(t, pstat, c.Inputs[3].Input,
--- a/internal/config/testdata/single_plugin_env_vars.toml
+++ b/internal/config/testdata/single_plugin_env_vars.toml
@@ -1,11 +0,0 @@
-[[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/telegraf-agent.toml
+++ b/internal/config/testdata/telegraf-agent.toml
@@ -60,7 +60,7 @@
  # Kafka topic for producer messages
  topic = "telegraf"
  # Telegraf tag to use as a routing key
-  #  ie, if this tag exists, its value will be used as the routing key
+  #  ie, if this tag exists, it's value will be used as the routing key
  routing_tag = "host"


@@ -143,31 +143,19 @@
 [[inputs.diskio]]
  # no configuration

-# read metrics from a Kafka 0.9+ topic
+# read metrics from a Kafka topic
 [[inputs.kafka_consumer]]
-  ## kafka brokers
-  brokers = ["localhost:9092"]
-  ## topic(s) to consume
-  topics = ["telegraf"]
-  ## the name of the consumer group
-  consumer_group = "telegraf_metrics_consumers"
-  ## Offset (must be either "oldest" or "newest")
-  offset = "oldest"
-
-# read metrics from a Kafka legacy topic
-[[inputs.kafka_consumer_legacy]]
-  ## topic(s) to consume
+  # topic(s) to consume
  topics = ["telegraf"]
  # an array of Zookeeper connection strings
  zookeeper_peers = ["localhost:2181"]
-  ## the name of the consumer group
+  # the name of the consumer group
  consumer_group = "telegraf_metrics_consumers"
  # Maximum number of points to buffer between collection intervals
  point_buffer = 100000
-  ## Offset (must be either "oldest" or "newest")
+  # Offset (must be either "oldest" or "newest")
  offset = "oldest"

-
 # Read metrics from a LeoFS Server via SNMP
 [[inputs.leofs]]
  # An array of URI to gather stats about LeoFS.
--- a/internal/globpath/globpath.go
+++ b/internal/globpath/globpath.go
@@ -1,116 +0,0 @@
-package globpath
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/gobwas/glob"
-)
-
-var sepStr = fmt.Sprintf("%v", string(os.PathSeparator))
-
-type GlobPath struct {
-	path         string
-	hasMeta      bool
-	hasSuperMeta bool
-	g            glob.Glob
-	root         string
-}
-
-func Compile(path string) (*GlobPath, error) {
-	out := GlobPath{
-		hasMeta:      hasMeta(path),
-		hasSuperMeta: hasSuperMeta(path),
-		path:         path,
-	}
-
-	// if there are no glob meta characters in the path, don't bother compiling
-	// a glob object or finding the root directory. (see short-circuit in Match)
-	if !out.hasMeta || !out.hasSuperMeta {
-		return &out, nil
-	}
-
-	var err error
-	if out.g, err = glob.Compile(path, os.PathSeparator); err != nil {
-		return nil, err
-	}
-	// Get the root directory for this filepath
-	out.root = findRootDir(path)
-	return &out, nil
-}
-
-func (g *GlobPath) Match() map[string]os.FileInfo {
-	if !g.hasMeta {
-		out := make(map[string]os.FileInfo)
-		info, err := os.Stat(g.path)
-		if err == nil {
-			out[g.path] = info
-		}
-		return out
-	}
-	if !g.hasSuperMeta {
-		out := make(map[string]os.FileInfo)
-		files, _ := filepath.Glob(g.path)
-		for _, file := range files {
-			info, err := os.Stat(file)
-			if err == nil {
-				out[file] = info
-			}
-		}
-		return out
-	}
-	return walkFilePath(g.root, g.g)
-}
-
-// walk the filepath from the given root and return a list of files that match
-// the given glob.
-func walkFilePath(root string, g glob.Glob) map[string]os.FileInfo {
-	matchedFiles := make(map[string]os.FileInfo)
-	walkfn := func(path string, info os.FileInfo, _ error) error {
-		if g.Match(path) {
-			matchedFiles[path] = info
-		}
-		return nil
-	}
-	filepath.Walk(root, walkfn)
-	return matchedFiles
-}
-
-// find the root dir of the given path (could include globs).
-// ie:
-//   /var/log/telegraf.conf -> /var/log
-//   /home/** ->               /home
-//   /home/*/** ->             /home
-//   /lib/share/*/*/**.txt ->  /lib/share
-func findRootDir(path string) string {
-	pathItems := strings.Split(path, sepStr)
-	out := sepStr
-	for i, item := range pathItems {
-		if i == len(pathItems)-1 {
-			break
-		}
-		if item == "" {
-			continue
-		}
-		if hasMeta(item) {
-			break
-		}
-		out += item + sepStr
-	}
-	if out != "/" {
-		out = strings.TrimSuffix(out, "/")
-	}
-	return out
-}
-
-// hasMeta reports whether path contains any magic glob characters.
-func hasMeta(path string) bool {
-	return strings.IndexAny(path, "*?[") >= 0
-}
-
-// hasSuperMeta reports whether path contains any super magic glob characters (**).
-func hasSuperMeta(path string) bool {
-	return strings.Index(path, "**") >= 0
-}
--- a/internal/globpath/globpath_test.go
+++ b/internal/globpath/globpath_test.go
@@ -1,90 +0,0 @@
-package globpath
-
-import (
-	"os"
-	"runtime"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestCompileAndMatch(t *testing.T) {
-	dir := getTestdataDir()
-	// test super asterisk
-	g1, err := Compile(dir + "/**")
-	require.NoError(t, err)
-	// test single asterisk
-	g2, err := Compile(dir + "/*.log")
-	require.NoError(t, err)
-	// test no meta characters (file exists)
-	g3, err := Compile(dir + "/log1.log")
-	require.NoError(t, err)
-	// test file that doesn't exist
-	g4, err := Compile(dir + "/i_dont_exist.log")
-	require.NoError(t, err)
-	// test super asterisk that doesn't exist
-	g5, err := Compile(dir + "/dir_doesnt_exist/**")
-	require.NoError(t, err)
-
-	matches := g1.Match()
-	assert.Len(t, matches, 6)
-	matches = g2.Match()
-	assert.Len(t, matches, 2)
-	matches = g3.Match()
-	assert.Len(t, matches, 1)
-	matches = g4.Match()
-	assert.Len(t, matches, 0)
-	matches = g5.Match()
-	assert.Len(t, matches, 0)
-}
-
-func TestFindRootDir(t *testing.T) {
-	tests := []struct {
-		input  string
-		output string
-	}{
-		{"/var/log/telegraf.conf", "/var/log"},
-		{"/home/**", "/home"},
-		{"/home/*/**", "/home"},
-		{"/lib/share/*/*/**.txt", "/lib/share"},
-	}
-
-	for _, test := range tests {
-		actual := findRootDir(test.input)
-		assert.Equal(t, test.output, actual)
-	}
-}
-
-func TestFindNestedTextFile(t *testing.T) {
-	dir := getTestdataDir()
-	// test super asterisk
-	g1, err := Compile(dir + "/**.txt")
-	require.NoError(t, err)
-
-	matches := g1.Match()
-	assert.Len(t, matches, 1)
-}
-
-func getTestdataDir() string {
-	_, filename, _, _ := runtime.Caller(1)
-	return strings.Replace(filename, "globpath_test.go", "testdata", 1)
-}
-
-func TestMatch_ErrPermission(t *testing.T) {
-	tests := []struct {
-		input    string
-		expected map[string]os.FileInfo
-	}{
-		{"/root/foo", map[string]os.FileInfo{}},
-		{"/root/f*", map[string]os.FileInfo{}},
-	}
-
-	for _, test := range tests {
-		glob, err := Compile(test.input)
-		require.NoError(t, err)
-		actual := glob.Match()
-		require.Equal(t, test.expected, actual)
-	}
-}
--- a/internal/globpath/testdata/log1.log
+++ b/internal/globpath/testdata/log1.log
--- a/internal/globpath/testdata/log2.log
+++ b/internal/globpath/testdata/log2.log
--- a/internal/globpath/testdata/nested1/nested2/nested.txt
+++ b/internal/globpath/testdata/nested1/nested2/nested.txt
--- a/internal/globpath/testdata/test.conf
+++ b/internal/globpath/testdata/test.conf
@@ -1,5 +0,0 @@
-# this is a fake testing config file
-# for testing the filestat plugin
-
-option1 = "foo"
-option2 = "bar"
--- a/internal/internal.go
+++ b/internal/internal.go
@@ -2,31 +2,19 @@ package internal

 import (
 	"bufio"
-	"bytes"
 	"crypto/rand"
 	"crypto/tls"
 	"crypto/x509"
 	"errors"
 	"fmt"
 	"io/ioutil"
-	"log"
-	"math/big"
 	"os"
-	"os/exec"
-	"strconv"
 	"strings"
 	"time"
-	"unicode"
 )

 const alphanum string = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"

-var (
-	TimeoutErr = errors.New("Command timed out.")
-
-	NotImplementedError = errors.New("not implemented yet")
-)
-
 // Duration just wraps time.Duration
 type Duration struct {
 	Duration time.Duration
@@ -34,39 +22,18 @@ type Duration struct {

 // UnmarshalTOML parses the duration from the TOML config file
 func (d *Duration) UnmarshalTOML(b []byte) error {
-	var err error
-	b = bytes.Trim(b, `'`)
-
-	// see if we can directly convert it
-	d.Duration, err = time.ParseDuration(string(b))
-	if err == nil {
-		return nil
+	dur, err := time.ParseDuration(string(b[1 : len(b)-1]))
+	if err != nil {
+		return err
 	}

-	// Parse string duration, ie, "1s"
-	if uq, err := strconv.Unquote(string(b)); err == nil && len(uq) > 0 {
-		d.Duration, err = time.ParseDuration(uq)
-		if err == nil {
-			return nil
-		}
-	}
-
-	// First try parsing as integer seconds
-	sI, err := strconv.ParseInt(string(b), 10, 64)
-	if err == nil {
-		d.Duration = time.Second * time.Duration(sI)
-		return nil
-	}
-	// Second try parsing as float seconds
-	sF, err := strconv.ParseFloat(string(b), 64)
-	if err == nil {
-		d.Duration = time.Second * time.Duration(sF)
-		return nil
-	}
+	d.Duration = dur

 	return nil
 }

+var NotImplementedError = errors.New("not implemented yet")
+
 // ReadLines reads contents from a file and splits them by new lines.
 // A convenience wrapper to ReadLinesOffsetN(filename, 0, -1).
 func ReadLines(filename string) ([]string, error) {
@@ -119,15 +86,15 @@ func GetTLSConfig(
 	SSLCert, SSLKey, SSLCA string,
 	InsecureSkipVerify bool,
 ) (*tls.Config, error) {
-	if SSLCert == "" && SSLKey == "" && SSLCA == "" && !InsecureSkipVerify {
-		return nil, nil
-	}
+	t := &tls.Config{}
+	if SSLCert != "" && SSLKey != "" && SSLCA != "" {
+		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 := &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",
@@ -136,107 +103,75 @@ func GetTLSConfig(

 		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 from %s:%s: %s",
-				SSLKey, SSLCert, err))
+		t = &tls.Config{
+			Certificates:       []tls.Certificate{cert},
+			RootCAs:            caCertPool,
+			InsecureSkipVerify: InsecureSkipVerify,
+		}
+	} else {
+		if InsecureSkipVerify {
+			t.InsecureSkipVerify = true
+		} else {
+			return nil, nil
 		}
-
-		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)
+// 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.
+//
+// Adapted from https://github.com/ryanuber/go-glob/blob/master/glob.go
+// thanks Ryan Uber!
+func Glob(pattern, measurement string) bool {
+	// Empty pattern can only match empty subject
+	if pattern == "" {
+		return measurement == pattern
+	}

-	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, '_')
+	// If the pattern _is_ a glob, it matches everything
+	if pattern == "*" {
+		return true
+	}
+
+	parts := strings.Split(pattern, "*")
+
+	if len(parts) == 1 {
+		// No globs in pattern, so test for match
+		return pattern == measurement
+	}
+
+	leadingGlob := strings.HasPrefix(pattern, "*")
+	trailingGlob := strings.HasSuffix(pattern, "*")
+	end := len(parts) - 1
+
+	for i, part := range parts {
+		switch i {
+		case 0:
+			if leadingGlob {
+				continue
+			}
+			if !strings.HasPrefix(measurement, part) {
+				return false
+			}
+		case end:
+			if len(measurement) > 0 {
+				return trailingGlob || strings.HasSuffix(measurement, part)
+			}
+		default:
+			if !strings.Contains(measurement, part) {
+				return false
+			}
 		}
-		out = append(out, unicode.ToLower(runes[i]))
+
+		// Trim evaluated text from measurement as we loop over the pattern.
+		idx := strings.Index(measurement, part) + len(part)
+		measurement = measurement[idx:]
 	}

-	return string(out)
-}
-
-// CombinedOutputTimeout runs the given command with the given timeout and
-// returns the combined output of stdout and stderr.
-// If the command times out, it attempts to kill the process.
-func CombinedOutputTimeout(c *exec.Cmd, timeout time.Duration) ([]byte, error) {
-	var b bytes.Buffer
-	c.Stdout = &b
-	c.Stderr = &b
-	if err := c.Start(); err != nil {
-		return nil, err
-	}
-	err := WaitTimeout(c, timeout)
-	return b.Bytes(), err
-}
-
-// RunTimeout runs the given command with the given timeout.
-// If the command times out, it attempts to kill the process.
-func RunTimeout(c *exec.Cmd, timeout time.Duration) error {
-	if err := c.Start(); err != nil {
-		return err
-	}
-	return WaitTimeout(c, timeout)
-}
-
-// WaitTimeout waits for the given command to finish with a timeout.
-// It assumes the command has already been started.
-// If the command times out, it attempts to kill the process.
-func WaitTimeout(c *exec.Cmd, timeout time.Duration) error {
-	timer := time.NewTimer(timeout)
-	done := make(chan error)
-	go func() { done <- c.Wait() }()
-	select {
-	case err := <-done:
-		timer.Stop()
-		return err
-	case <-timer.C:
-		if err := c.Process.Kill(); err != nil {
-			log.Printf("E! FATAL error killing process: %s", err)
-			return err
-		}
-		// wait for the command to return after killing it
-		<-done
-		return TimeoutErr
-	}
-}
-
-// RandomSleep will sleep for a random amount of time up to max.
-// If the shutdown channel is closed, it will return before it has finished
-// sleeping.
-func RandomSleep(max time.Duration, shutdown chan struct{}) {
-	if max == 0 {
-		return
-	}
-	maxSleep := big.NewInt(max.Nanoseconds())
-
-	var sleepns int64
-	if j, err := rand.Int(rand.Reader, maxSleep); err == nil {
-		sleepns = j.Int64()
-	}
-
-	t := time.NewTimer(time.Nanosecond * time.Duration(sleepns))
-	select {
-	case <-t.C:
-		return
-	case <-shutdown:
-		t.Stop()
-		return
-	}
+	// All parts of the pattern matched
+	return true
 }
--- a/internal/internal_test.go
+++ b/internal/internal_test.go
@@ -1,157 +1,44 @@
 package internal

-import (
-	"os/exec"
-	"testing"
-	"time"
+import "testing"

-	"github.com/stretchr/testify/assert"
-)
-
-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))
-		}
+func testGlobMatch(t *testing.T, pattern, subj string) {
+	if !Glob(pattern, subj) {
+		t.Errorf("%s should match %s", pattern, subj)
 	}
 }

-var (
-	sleepbin, _ = exec.LookPath("sleep")
-	echobin, _  = exec.LookPath("echo")
-	shell, _    = exec.LookPath("sh")
-)
-
-func TestRunTimeout(t *testing.T) {
-	if sleepbin == "" {
-		t.Skip("'sleep' binary not available on OS, skipping.")
+func testGlobNoMatch(t *testing.T, pattern, subj string) {
+	if Glob(pattern, subj) {
+		t.Errorf("%s should not match %s", pattern, subj)
 	}
-	cmd := exec.Command(sleepbin, "10")
-	start := time.Now()
-	err := RunTimeout(cmd, time.Millisecond*20)
-	elapsed := time.Since(start)
-
-	assert.Equal(t, TimeoutErr, err)
-	// Verify that command gets killed in 20ms, with some breathing room
-	assert.True(t, elapsed < time.Millisecond*75)
 }

-func TestCombinedOutputTimeout(t *testing.T) {
-	if sleepbin == "" {
-		t.Skip("'sleep' binary not available on OS, skipping.")
+func TestEmptyPattern(t *testing.T) {
+	testGlobMatch(t, "", "")
+	testGlobNoMatch(t, "", "test")
+}
+
+func TestPatternWithoutGlobs(t *testing.T) {
+	testGlobMatch(t, "test", "test")
+}
+
+func TestGlob(t *testing.T) {
+	for _, pattern := range []string{
+		"*test",           // Leading glob
+		"this*",           // Trailing glob
+		"*is*a*",          // Lots of globs
+		"**test**",        // Double glob characters
+		"**is**a***test*", // Varying number of globs
+	} {
+		testGlobMatch(t, pattern, "this_is_a_test")
 	}
-	cmd := exec.Command(sleepbin, "10")
-	start := time.Now()
-	_, err := CombinedOutputTimeout(cmd, time.Millisecond*20)
-	elapsed := time.Since(start)

-	assert.Equal(t, TimeoutErr, err)
-	// Verify that command gets killed in 20ms, with some breathing room
-	assert.True(t, elapsed < time.Millisecond*75)
-}
-
-func TestCombinedOutput(t *testing.T) {
-	if echobin == "" {
-		t.Skip("'echo' binary not available on OS, skipping.")
+	for _, pattern := range []string{
+		"test*", // Implicit substring match should fail
+		"*is",   // Partial match should fail
+		"*no*",  // Globs without a match between them should fail
+	} {
+		testGlobNoMatch(t, pattern, "this_is_a_test")
 	}
-	cmd := exec.Command(echobin, "foo")
-	out, err := CombinedOutputTimeout(cmd, time.Second)
-
-	assert.NoError(t, err)
-	assert.Equal(t, "foo\n", string(out))
-}
-
-// test that CombinedOutputTimeout and exec.Cmd.CombinedOutput return
-// the same output from a failed command.
-func TestCombinedOutputError(t *testing.T) {
-	if shell == "" {
-		t.Skip("'sh' binary not available on OS, skipping.")
-	}
-	cmd := exec.Command(shell, "-c", "false")
-	expected, err := cmd.CombinedOutput()
-
-	cmd2 := exec.Command(shell, "-c", "false")
-	actual, err := CombinedOutputTimeout(cmd2, time.Second)
-
-	assert.Error(t, err)
-	assert.Equal(t, expected, actual)
-}
-
-func TestRunError(t *testing.T) {
-	if shell == "" {
-		t.Skip("'sh' binary not available on OS, skipping.")
-	}
-	cmd := exec.Command(shell, "-c", "false")
-	err := RunTimeout(cmd, time.Second)
-
-	assert.Error(t, err)
-}
-
-func TestRandomSleep(t *testing.T) {
-	// test that zero max returns immediately
-	s := time.Now()
-	RandomSleep(time.Duration(0), make(chan struct{}))
-	elapsed := time.Since(s)
-	assert.True(t, elapsed < time.Millisecond)
-
-	// test that max sleep is respected
-	s = time.Now()
-	RandomSleep(time.Millisecond*50, make(chan struct{}))
-	elapsed = time.Since(s)
-	assert.True(t, elapsed < time.Millisecond*100)
-
-	// test that shutdown is respected
-	s = time.Now()
-	shutdown := make(chan struct{})
-	go func() {
-		time.Sleep(time.Millisecond * 100)
-		close(shutdown)
-	}()
-	RandomSleep(time.Second, shutdown)
-	elapsed = time.Since(s)
-	assert.True(t, elapsed < time.Millisecond*150)
-}
-
-func TestDuration(t *testing.T) {
-	var d Duration
-
-	d.UnmarshalTOML([]byte(`"1s"`))
-	assert.Equal(t, time.Second, d.Duration)
-
-	d = Duration{}
-	d.UnmarshalTOML([]byte(`1s`))
-	assert.Equal(t, time.Second, d.Duration)
-
-	d = Duration{}
-	d.UnmarshalTOML([]byte(`'1s'`))
-	assert.Equal(t, time.Second, d.Duration)
-
-	d = Duration{}
-	d.UnmarshalTOML([]byte(`10`))
-	assert.Equal(t, 10*time.Second, d.Duration)
-
-	d = Duration{}
-	d.UnmarshalTOML([]byte(`1.5`))
-	assert.Equal(t, time.Second, d.Duration)
 }
--- a/internal/limiter/limiter.go
+++ b/internal/limiter/limiter.go
@@ -1,59 +0,0 @@
-package limiter
-
-import (
-	"sync"
-	"time"
-)
-
-// NewRateLimiter returns a rate limiter that will will emit from the C
-// channel only 'n' times every 'rate' seconds.
-func NewRateLimiter(n int, rate time.Duration) *rateLimiter {
-	r := &rateLimiter{
-		C:        make(chan bool),
-		rate:     rate,
-		n:        n,
-		shutdown: make(chan bool),
-	}
-	r.wg.Add(1)
-	go r.limiter()
-	return r
-}
-
-type rateLimiter struct {
-	C    chan bool
-	rate time.Duration
-	n    int
-
-	shutdown chan bool
-	wg       sync.WaitGroup
-}
-
-func (r *rateLimiter) Stop() {
-	close(r.shutdown)
-	r.wg.Wait()
-	close(r.C)
-}
-
-func (r *rateLimiter) limiter() {
-	defer r.wg.Done()
-	ticker := time.NewTicker(r.rate)
-	defer ticker.Stop()
-	counter := 0
-	for {
-		select {
-		case <-r.shutdown:
-			return
-		case <-ticker.C:
-			counter = 0
-		default:
-			if counter < r.n {
-				select {
-				case r.C <- true:
-					counter++
-				case <-r.shutdown:
-					return
-				}
-			}
-		}
-	}
-}
--- a/internal/limiter/limiter_test.go
+++ b/internal/limiter/limiter_test.go
@@ -1,54 +0,0 @@
-package limiter
-
-import (
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestRateLimiter(t *testing.T) {
-	r := NewRateLimiter(5, time.Second)
-	ticker := time.NewTicker(time.Millisecond * 75)
-
-	// test that we can only get 5 receives from the rate limiter
-	counter := 0
-outer:
-	for {
-		select {
-		case <-r.C:
-			counter++
-		case <-ticker.C:
-			break outer
-		}
-	}
-
-	assert.Equal(t, 5, counter)
-	r.Stop()
-	// verify that the Stop function closes the channel.
-	_, ok := <-r.C
-	assert.False(t, ok)
-}
-
-func TestRateLimiterMultipleIterations(t *testing.T) {
-	r := NewRateLimiter(5, time.Millisecond*50)
-	ticker := time.NewTicker(time.Millisecond * 250)
-
-	// test that we can get 15 receives from the rate limiter
-	counter := 0
-outer:
-	for {
-		select {
-		case <-ticker.C:
-			break outer
-		case <-r.C:
-			counter++
-		}
-	}
-
-	assert.True(t, counter > 10)
-	r.Stop()
-	// verify that the Stop function closes the channel.
-	_, ok := <-r.C
-	assert.False(t, ok)
-}
--- a/internal/models/filter.go
+++ b/internal/models/filter.go
@@ -1,263 +1,123 @@
-package models
+package internal_models

 import (
-	"fmt"
+	"strings"

-	"github.com/influxdata/telegraf/filter"
+	"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 filter.Filter
 }

 // Filter containing drop/pass and tagdrop/tagpass rules
 type Filter struct {
 	NameDrop []string
-	nameDrop filter.Filter
 	NamePass []string
-	namePass filter.Filter

 	FieldDrop []string
-	fieldDrop filter.Filter
 	FieldPass []string
-	fieldPass filter.Filter

 	TagDrop []TagFilter
 	TagPass []TagFilter

-	TagExclude []string
-	tagExclude filter.Filter
-	TagInclude []string
-	tagInclude filter.Filter
-
-	isActive bool
+	IsActive bool
 }

-// Compile all Filter lists into filter.Filter objects.
-func (f *Filter) Compile() error {
-	if len(f.NameDrop) == 0 &&
-		len(f.NamePass) == 0 &&
-		len(f.FieldDrop) == 0 &&
-		len(f.FieldPass) == 0 &&
-		len(f.TagInclude) == 0 &&
-		len(f.TagExclude) == 0 &&
-		len(f.TagPass) == 0 &&
-		len(f.TagDrop) == 0 {
-		return nil
-	}
-
-	f.isActive = true
-	var err error
-	f.nameDrop, err = filter.Compile(f.NameDrop)
-	if err != nil {
-		return fmt.Errorf("Error compiling 'namedrop', %s", err)
-	}
-	f.namePass, err = filter.Compile(f.NamePass)
-	if err != nil {
-		return fmt.Errorf("Error compiling 'namepass', %s", err)
-	}
-
-	f.fieldDrop, err = filter.Compile(f.FieldDrop)
-	if err != nil {
-		return fmt.Errorf("Error compiling 'fielddrop', %s", err)
-	}
-	f.fieldPass, err = filter.Compile(f.FieldPass)
-	if err != nil {
-		return fmt.Errorf("Error compiling 'fieldpass', %s", err)
-	}
-
-	f.tagExclude, err = filter.Compile(f.TagExclude)
-	if err != nil {
-		return fmt.Errorf("Error compiling 'tagexclude', %s", err)
-	}
-	f.tagInclude, err = filter.Compile(f.TagInclude)
-	if err != nil {
-		return fmt.Errorf("Error compiling 'taginclude', %s", err)
-	}
-
-	for i, _ := range f.TagDrop {
-		f.TagDrop[i].filter, err = filter.Compile(f.TagDrop[i].Filter)
-		if err != nil {
-			return fmt.Errorf("Error compiling 'tagdrop', %s", err)
-		}
-	}
-	for i, _ := range f.TagPass {
-		f.TagPass[i].filter, err = filter.Compile(f.TagPass[i].Filter)
-		if err != nil {
-			return fmt.Errorf("Error compiling 'tagpass', %s", err)
-		}
-	}
-	return nil
-}
-
-// Apply applies the filter to the given measurement name, fields map, and
-// tags map. It will return false if the metric should be "filtered out", and
-// true if the metric should "pass".
-// It will modify tags & fields in-place if they need to be deleted.
-func (f *Filter) Apply(
-	measurement string,
-	fields map[string]interface{},
-	tags map[string]string,
-) bool {
-	if !f.isActive {
+func (f Filter) ShouldMetricPass(metric telegraf.Metric) bool {
+	if f.ShouldNamePass(metric.Name()) && f.ShouldTagsPass(metric.Tags()) {
 		return true
 	}
-
-	// check if the measurement name should pass
-	if !f.shouldNamePass(measurement) {
-		return false
-	}
-
-	// check if the tags should pass
-	if !f.shouldTagsPass(tags) {
-		return false
-	}
-
-	// filter fields
-	for fieldkey, _ := range fields {
-		if !f.shouldFieldPass(fieldkey) {
-			delete(fields, fieldkey)
-		}
-	}
-	if len(fields) == 0 {
-		return false
-	}
-
-	// filter tags
-	f.filterTags(tags)
-
-	return true
+	return false
 }

-// IsActive checking if filter is active
-func (f *Filter) IsActive() bool {
-	return f.isActive
-}
-
-// shouldNamePass returns true if the metric should pass, false if should drop
+// 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 {
-
-	pass := func(f *Filter) bool {
-		if f.namePass.Match(key) {
-			return true
+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
 	}

-	drop := func(f *Filter) bool {
-		if f.nameDrop.Match(key) {
-			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
 	}
-
-	if f.namePass != nil && f.nameDrop != nil {
-		return pass(f) && drop(f)
-	} else if f.namePass != nil {
-		return pass(f)
-	} else if f.nameDrop != nil {
-		return drop(f)
-	}
-
 	return true
 }

-// shouldFieldPass returns true if the metric should pass, false if should drop
+// ShouldFieldsPass returns true if the metric should pass, false if should drop
 // based on the drop/pass filter parameters
-func (f *Filter) shouldFieldPass(key string) bool {
-
-	pass := func(f *Filter) bool {
-		if f.fieldPass.Match(key) {
-			return true
+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
 	}

-	drop := func(f *Filter) bool {
-		if f.fieldDrop.Match(key) {
-			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
 	}
-
-	if f.fieldPass != nil && f.fieldDrop != nil {
-		return pass(f) && drop(f)
-	} else if f.fieldPass != nil {
-		return pass(f)
-	} else if f.fieldDrop != nil {
-		return drop(f)
-	}
-
 	return true
 }

-// shouldTagsPass returns true if the metric should pass, false if should drop
+// 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 {
-
-	pass := func(f *Filter) bool {
+func (f Filter) ShouldTagsPass(tags map[string]string) bool {
+	if f.TagPass != nil {
 		for _, pat := range f.TagPass {
-			if pat.filter == nil {
-				continue
-			}
 			if tagval, ok := tags[pat.Name]; ok {
-				if pat.filter.Match(tagval) {
-					return true
+				for _, filter := range pat.Filter {
+					if internal.Glob(filter, tagval) {
+						return true
+					}
 				}
 			}
 		}
 		return false
 	}

-	drop := func(f *Filter) bool {
+	if f.TagDrop != nil {
 		for _, pat := range f.TagDrop {
-			if pat.filter == nil {
-				continue
-			}
 			if tagval, ok := tags[pat.Name]; ok {
-				if pat.filter.Match(tagval) {
-					return false
+				for _, filter := range pat.Filter {
+					if internal.Glob(filter, tagval) {
+						return false
+					}
 				}
 			}
 		}
 		return true
 	}

-	// Add additional logic in case where both parameters are set.
-	// see: https://github.com/influxdata/telegraf/issues/2860
-	if f.TagPass != nil && f.TagDrop != nil {
-		// return true only in case when tag pass and won't be dropped (true, true).
-		// in case when the same tag should be passed and dropped it will be dropped (true, false).
-		return pass(f) && drop(f)
-	} else if f.TagPass != nil {
-		return pass(f)
-	} else if f.TagDrop != nil {
-		return drop(f)
-	}
-
 	return true
 }
-
-// Apply TagInclude and TagExclude filters.
-// modifies the tags map in-place.
-func (f *Filter) filterTags(tags map[string]string) {
-	if f.tagInclude != nil {
-		for k, _ := range tags {
-			if !f.tagInclude.Match(k) {
-				delete(tags, k)
-			}
-		}
-	}
-
-	if f.tagExclude != nil {
-		for k, _ := range tags {
-			if f.tagExclude.Match(k) {
-				delete(tags, k)
-			}
-		}
-	}
-}
--- a/internal/models/filter_test.go
+++ b/internal/models/filter_test.go
@@ -1,64 +1,9 @@
-package models
+package internal_models

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

-func TestFilter_ApplyEmpty(t *testing.T) {
-	f := Filter{}
-	require.NoError(t, f.Compile())
-	assert.False(t, f.IsActive())
-
-	assert.True(t, f.Apply("m", map[string]interface{}{"value": int64(1)}, map[string]string{}))
-}
-
-func TestFilter_ApplyTagsDontPass(t *testing.T) {
-	filters := []TagFilter{
-		TagFilter{
-			Name:   "cpu",
-			Filter: []string{"cpu-*"},
-		},
-	}
-	f := Filter{
-		TagDrop: filters,
-	}
-	require.NoError(t, f.Compile())
-	require.NoError(t, f.Compile())
-	assert.True(t, f.IsActive())
-
-	assert.False(t, f.Apply("m",
-		map[string]interface{}{"value": int64(1)},
-		map[string]string{"cpu": "cpu-total"}))
-}
-
-func TestFilter_ApplyDeleteFields(t *testing.T) {
-	f := Filter{
-		FieldDrop: []string{"value"},
-	}
-	require.NoError(t, f.Compile())
-	require.NoError(t, f.Compile())
-	assert.True(t, f.IsActive())
-
-	fields := map[string]interface{}{"value": int64(1), "value2": int64(2)}
-	assert.True(t, f.Apply("m", fields, nil))
-	assert.Equal(t, map[string]interface{}{"value2": int64(2)}, fields)
-}
-
-func TestFilter_ApplyDeleteAllFields(t *testing.T) {
-	f := Filter{
-		FieldDrop: []string{"value*"},
-	}
-	require.NoError(t, f.Compile())
-	require.NoError(t, f.Compile())
-	assert.True(t, f.IsActive())
-
-	fields := map[string]interface{}{"value": int64(1), "value2": int64(2)}
-	assert.False(t, f.Apply("m", fields, nil))
-}
-
 func TestFilter_Empty(t *testing.T) {
 	f := Filter{}

@@ -73,7 +18,7 @@ func TestFilter_Empty(t *testing.T) {
 	}

 	for _, measurement := range measurements {
-		if !f.shouldFieldPass(measurement) {
+		if !f.ShouldFieldsPass(measurement) {
 			t.Errorf("Expected measurement %s to pass", measurement)
 		}
 	}
@@ -83,7 +28,6 @@ func TestFilter_NamePass(t *testing.T) {
 	f := Filter{
 		NamePass: []string{"foo*", "cpu_usage_idle"},
 	}
-	require.NoError(t, f.Compile())

 	passes := []string{
 		"foo",
@@ -101,13 +45,13 @@ func TestFilter_NamePass(t *testing.T) {
 	}

 	for _, measurement := range passes {
-		if !f.shouldNamePass(measurement) {
+		if !f.ShouldNamePass(measurement) {
 			t.Errorf("Expected measurement %s to pass", measurement)
 		}
 	}

 	for _, measurement := range drops {
-		if f.shouldNamePass(measurement) {
+		if f.ShouldNamePass(measurement) {
 			t.Errorf("Expected measurement %s to drop", measurement)
 		}
 	}
@@ -117,7 +61,6 @@ func TestFilter_NameDrop(t *testing.T) {
 	f := Filter{
 		NameDrop: []string{"foo*", "cpu_usage_idle"},
 	}
-	require.NoError(t, f.Compile())

 	drops := []string{
 		"foo",
@@ -135,13 +78,13 @@ func TestFilter_NameDrop(t *testing.T) {
 	}

 	for _, measurement := range passes {
-		if !f.shouldNamePass(measurement) {
+		if !f.ShouldNamePass(measurement) {
 			t.Errorf("Expected measurement %s to pass", measurement)
 		}
 	}

 	for _, measurement := range drops {
-		if f.shouldNamePass(measurement) {
+		if f.ShouldNamePass(measurement) {
 			t.Errorf("Expected measurement %s to drop", measurement)
 		}
 	}
@@ -151,7 +94,6 @@ func TestFilter_FieldPass(t *testing.T) {
 	f := Filter{
 		FieldPass: []string{"foo*", "cpu_usage_idle"},
 	}
-	require.NoError(t, f.Compile())

 	passes := []string{
 		"foo",
@@ -169,13 +111,13 @@ func TestFilter_FieldPass(t *testing.T) {
 	}

 	for _, measurement := range passes {
-		if !f.shouldFieldPass(measurement) {
+		if !f.ShouldFieldsPass(measurement) {
 			t.Errorf("Expected measurement %s to pass", measurement)
 		}
 	}

 	for _, measurement := range drops {
-		if f.shouldFieldPass(measurement) {
+		if f.ShouldFieldsPass(measurement) {
 			t.Errorf("Expected measurement %s to drop", measurement)
 		}
 	}
@@ -185,7 +127,6 @@ func TestFilter_FieldDrop(t *testing.T) {
 	f := Filter{
 		FieldDrop: []string{"foo*", "cpu_usage_idle"},
 	}
-	require.NoError(t, f.Compile())

 	drops := []string{
 		"foo",
@@ -203,13 +144,13 @@ func TestFilter_FieldDrop(t *testing.T) {
 	}

 	for _, measurement := range passes {
-		if !f.shouldFieldPass(measurement) {
+		if !f.ShouldFieldsPass(measurement) {
 			t.Errorf("Expected measurement %s to pass", measurement)
 		}
 	}

 	for _, measurement := range drops {
-		if f.shouldFieldPass(measurement) {
+		if f.ShouldFieldsPass(measurement) {
 			t.Errorf("Expected measurement %s to drop", measurement)
 		}
 	}
@@ -228,7 +169,6 @@ func TestFilter_TagPass(t *testing.T) {
 	f := Filter{
 		TagPass: filters,
 	}
-	require.NoError(t, f.Compile())

 	passes := []map[string]string{
 		{"cpu": "cpu-total"},
@@ -247,13 +187,13 @@ func TestFilter_TagPass(t *testing.T) {
 	}

 	for _, tags := range passes {
-		if !f.shouldTagsPass(tags) {
+		if !f.ShouldTagsPass(tags) {
 			t.Errorf("Expected tags %v to pass", tags)
 		}
 	}

 	for _, tags := range drops {
-		if f.shouldTagsPass(tags) {
+		if f.ShouldTagsPass(tags) {
 			t.Errorf("Expected tags %v to drop", tags)
 		}
 	}
@@ -272,7 +212,6 @@ func TestFilter_TagDrop(t *testing.T) {
 	f := Filter{
 		TagDrop: filters,
 	}
-	require.NoError(t, f.Compile())

 	drops := []map[string]string{
 		{"cpu": "cpu-total"},
@@ -291,154 +230,14 @@ func TestFilter_TagDrop(t *testing.T) {
 	}

 	for _, tags := range passes {
-		if !f.shouldTagsPass(tags) {
+		if !f.ShouldTagsPass(tags) {
 			t.Errorf("Expected tags %v to pass", tags)
 		}
 	}

 	for _, tags := range drops {
-		if f.shouldTagsPass(tags) {
+		if f.ShouldTagsPass(tags) {
 			t.Errorf("Expected tags %v to drop", tags)
 		}
 	}
 }
-
-func TestFilter_FilterTagsNoMatches(t *testing.T) {
-	pretags := map[string]string{
-		"host":  "localhost",
-		"mytag": "foobar",
-	}
-	f := Filter{
-		TagExclude: []string{"nomatch"},
-	}
-	require.NoError(t, f.Compile())
-
-	f.filterTags(pretags)
-	assert.Equal(t, map[string]string{
-		"host":  "localhost",
-		"mytag": "foobar",
-	}, pretags)
-
-	f = Filter{
-		TagInclude: []string{"nomatch"},
-	}
-	require.NoError(t, f.Compile())
-
-	f.filterTags(pretags)
-	assert.Equal(t, map[string]string{}, pretags)
-}
-
-func TestFilter_FilterTagsMatches(t *testing.T) {
-	pretags := map[string]string{
-		"host":  "localhost",
-		"mytag": "foobar",
-	}
-	f := Filter{
-		TagExclude: []string{"ho*"},
-	}
-	require.NoError(t, f.Compile())
-
-	f.filterTags(pretags)
-	assert.Equal(t, map[string]string{
-		"mytag": "foobar",
-	}, pretags)
-
-	pretags = map[string]string{
-		"host":  "localhost",
-		"mytag": "foobar",
-	}
-	f = Filter{
-		TagInclude: []string{"my*"},
-	}
-	require.NoError(t, f.Compile())
-
-	f.filterTags(pretags)
-	assert.Equal(t, map[string]string{
-		"mytag": "foobar",
-	}, pretags)
-}
-
-// TestFilter_FilterNamePassAndDrop used for check case when
-// both parameters were defined
-// see: https://github.com/influxdata/telegraf/issues/2860
-func TestFilter_FilterNamePassAndDrop(t *testing.T) {
-
-	inputData := []string{"name1", "name2", "name3", "name4"}
-	expectedResult := []bool{false, true, false, false}
-
-	f := Filter{
-		NamePass: []string{"name1", "name2"},
-		NameDrop: []string{"name1", "name3"},
-	}
-
-	require.NoError(t, f.Compile())
-
-	for i, name := range inputData {
-		assert.Equal(t, f.shouldNamePass(name), expectedResult[i])
-	}
-}
-
-// TestFilter_FilterFieldPassAndDrop used for check case when
-// both parameters were defined
-// see: https://github.com/influxdata/telegraf/issues/2860
-func TestFilter_FilterFieldPassAndDrop(t *testing.T) {
-
-	inputData := []string{"field1", "field2", "field3", "field4"}
-	expectedResult := []bool{false, true, false, false}
-
-	f := Filter{
-		FieldPass: []string{"field1", "field2"},
-		FieldDrop: []string{"field1", "field3"},
-	}
-
-	require.NoError(t, f.Compile())
-
-	for i, field := range inputData {
-		assert.Equal(t, f.shouldFieldPass(field), expectedResult[i])
-	}
-}
-
-// TestFilter_FilterTagsPassAndDrop used for check case when
-// both parameters were defined
-// see: https://github.com/influxdata/telegraf/issues/2860
-func TestFilter_FilterTagsPassAndDrop(t *testing.T) {
-
-	inputData := []map[string]string{
-		{"tag1": "1", "tag2": "3"},
-		{"tag1": "1", "tag2": "2"},
-		{"tag1": "2", "tag2": "1"},
-		{"tag1": "4", "tag2": "1"},
-	}
-
-	expectedResult := []bool{false, true, false, false}
-
-	filterPass := []TagFilter{
-		TagFilter{
-			Name:   "tag1",
-			Filter: []string{"1", "4"},
-		},
-	}
-
-	filterDrop := []TagFilter{
-		TagFilter{
-			Name:   "tag1",
-			Filter: []string{"4"},
-		},
-		TagFilter{
-			Name:   "tag2",
-			Filter: []string{"3"},
-		},
-	}
-
-	f := Filter{
-		TagDrop: filterDrop,
-		TagPass: filterPass,
-	}
-
-	require.NoError(t, f.Compile())
-
-	for i, tag := range inputData {
-		assert.Equal(t, f.shouldTagsPass(tag), expectedResult[i])
-	}
-
-}
--- a/internal/models/makemetric.go
+++ b/internal/models/makemetric.go
@@ -1,166 +0,0 @@
-package models
-
-import (
-	"log"
-	"math"
-	"strings"
-	"time"
-
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/metric"
-)
-
-// makemetric is used by both RunningAggregator & RunningInput
-// to make metrics.
-//   nameOverride: override the name of the measurement being made.
-//   namePrefix:   add this prefix to each measurement name.
-//   nameSuffix:   add this suffix to each measurement name.
-//   pluginTags:   these are tags that are specific to this plugin.
-//   daemonTags:   these are daemon-wide global tags, and get applied after pluginTags.
-//   filter:       this is a filter to apply to each metric being made.
-//   applyFilter:  if false, the above filter is not applied to each metric.
-//                 This is used by Aggregators, because aggregators use filters
-//                 on incoming metrics instead of on created metrics.
-// TODO refactor this to not have such a huge func signature.
-func makemetric(
-	measurement string,
-	fields map[string]interface{},
-	tags map[string]string,
-	nameOverride string,
-	namePrefix string,
-	nameSuffix string,
-	pluginTags map[string]string,
-	daemonTags map[string]string,
-	filter Filter,
-	applyFilter bool,
-	mType telegraf.ValueType,
-	t time.Time,
-) telegraf.Metric {
-	if len(fields) == 0 || len(measurement) == 0 {
-		return nil
-	}
-	if tags == nil {
-		tags = make(map[string]string)
-	}
-
-	// Override measurement name if set
-	if len(nameOverride) != 0 {
-		measurement = nameOverride
-	}
-	// Apply measurement prefix and suffix if set
-	if len(namePrefix) != 0 {
-		measurement = namePrefix + measurement
-	}
-	if len(nameSuffix) != 0 {
-		measurement = measurement + nameSuffix
-	}
-
-	// Apply plugin-wide tags if set
-	for k, v := range pluginTags {
-		if _, ok := tags[k]; !ok {
-			tags[k] = v
-		}
-	}
-	// Apply daemon-wide tags if set
-	for k, v := range daemonTags {
-		if _, ok := tags[k]; !ok {
-			tags[k] = v
-		}
-	}
-
-	// Apply the metric filter(s)
-	// for aggregators, the filter does not get applied when the metric is made.
-	// instead, the filter is applied to metric incoming into the plugin.
-	//   ie, it gets applied in the RunningAggregator.Apply function.
-	if applyFilter {
-		if ok := filter.Apply(measurement, fields, tags); !ok {
-			return nil
-		}
-	}
-
-	for k, v := range tags {
-		if strings.HasSuffix(k, `\`) {
-			log.Printf("D! Measurement [%s] tag [%s] "+
-				"ends with a backslash, skipping", measurement, k)
-			delete(tags, k)
-			continue
-		} else if strings.HasSuffix(v, `\`) {
-			log.Printf("D! Measurement [%s] tag [%s] has a value "+
-				"ending with a backslash, skipping", measurement, k)
-			delete(tags, k)
-			continue
-		}
-	}
-
-	for k, v := range fields {
-		if strings.HasSuffix(k, `\`) {
-			log.Printf("D! Measurement [%s] field [%s] "+
-				"ends with a backslash, skipping", measurement, k)
-			delete(fields, k)
-			continue
-		}
-		// Validate uint64 and float64 fields
-		// convert all int & uint types to int64
-		switch val := v.(type) {
-		case nil:
-			// delete nil fields
-			delete(fields, k)
-		case uint:
-			fields[k] = int64(val)
-			continue
-		case uint8:
-			fields[k] = int64(val)
-			continue
-		case uint16:
-			fields[k] = int64(val)
-			continue
-		case uint32:
-			fields[k] = int64(val)
-			continue
-		case int:
-			fields[k] = int64(val)
-			continue
-		case int8:
-			fields[k] = int64(val)
-			continue
-		case int16:
-			fields[k] = int64(val)
-			continue
-		case int32:
-			fields[k] = int64(val)
-			continue
-		case uint64:
-			// InfluxDB does not support writing uint64
-			if val < uint64(9223372036854775808) {
-				fields[k] = int64(val)
-			} else {
-				fields[k] = int64(9223372036854775807)
-			}
-			continue
-		case float32:
-			fields[k] = float64(val)
-			continue
-		case float64:
-			// NaNs are invalid values in influxdb, skip measurement
-			if math.IsNaN(val) || math.IsInf(val, 0) {
-				log.Printf("D! Measurement [%s] field [%s] has a NaN or Inf "+
-					"field, skipping",
-					measurement, k)
-				delete(fields, k)
-				continue
-			}
-		case string:
-			fields[k] = v
-		default:
-			fields[k] = v
-		}
-	}
-
-	m, err := metric.New(measurement, tags, fields, t, mType)
-	if err != nil {
-		log.Printf("Error adding point [%s]: %s\n", measurement, err.Error())
-		return nil
-	}
-
-	return m
-}
--- a/internal/models/running_aggregator.go
+++ b/internal/models/running_aggregator.go
@@ -1,166 +0,0 @@
-package models
-
-import (
-	"time"
-
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/metric"
-)
-
-type RunningAggregator struct {
-	a      telegraf.Aggregator
-	Config *AggregatorConfig
-
-	metrics chan telegraf.Metric
-
-	periodStart time.Time
-	periodEnd   time.Time
-}
-
-func NewRunningAggregator(
-	a telegraf.Aggregator,
-	conf *AggregatorConfig,
-) *RunningAggregator {
-	return &RunningAggregator{
-		a:       a,
-		Config:  conf,
-		metrics: make(chan telegraf.Metric, 100),
-	}
-}
-
-// AggregatorConfig containing configuration parameters for the running
-// aggregator plugin.
-type AggregatorConfig struct {
-	Name string
-
-	DropOriginal      bool
-	NameOverride      string
-	MeasurementPrefix string
-	MeasurementSuffix string
-	Tags              map[string]string
-	Filter            Filter
-
-	Period time.Duration
-	Delay  time.Duration
-}
-
-func (r *RunningAggregator) Name() string {
-	return "aggregators." + r.Config.Name
-}
-
-func (r *RunningAggregator) MakeMetric(
-	measurement string,
-	fields map[string]interface{},
-	tags map[string]string,
-	mType telegraf.ValueType,
-	t time.Time,
-) telegraf.Metric {
-	m := makemetric(
-		measurement,
-		fields,
-		tags,
-		r.Config.NameOverride,
-		r.Config.MeasurementPrefix,
-		r.Config.MeasurementSuffix,
-		r.Config.Tags,
-		nil,
-		r.Config.Filter,
-		false,
-		mType,
-		t,
-	)
-
-	if m != nil {
-		m.SetAggregate(true)
-	}
-
-	return m
-}
-
-// Add applies the given metric to the aggregator.
-// Before applying to the plugin, it will run any defined filters on the metric.
-// Apply returns true if the original metric should be dropped.
-func (r *RunningAggregator) Add(in telegraf.Metric) bool {
-	if r.Config.Filter.IsActive() {
-		// check if the aggregator should apply this metric
-		name := in.Name()
-		fields := in.Fields()
-		tags := in.Tags()
-		t := in.Time()
-		if ok := r.Config.Filter.Apply(name, fields, tags); !ok {
-			// aggregator should not apply this metric
-			return false
-		}
-
-		in, _ = metric.New(name, tags, fields, t)
-	}
-
-	r.metrics <- in
-	return r.Config.DropOriginal
-}
-func (r *RunningAggregator) add(in telegraf.Metric) {
-	r.a.Add(in)
-}
-
-func (r *RunningAggregator) push(acc telegraf.Accumulator) {
-	r.a.Push(acc)
-}
-
-func (r *RunningAggregator) reset() {
-	r.a.Reset()
-}
-
-// Run runs the running aggregator, listens for incoming metrics, and waits
-// for period ticks to tell it when to push and reset the aggregator.
-func (r *RunningAggregator) Run(
-	acc telegraf.Accumulator,
-	shutdown chan struct{},
-) {
-	// The start of the period is truncated to the nearest second.
-	//
-	// Every metric then gets it's timestamp checked and is dropped if it
-	// is not within:
-	//
-	//   start < t < end + truncation + delay
-	//
-	// So if we start at now = 00:00.2 with a 10s period and 0.3s delay:
-	//   now = 00:00.2
-	//   start = 00:00
-	//   truncation = 00:00.2
-	//   end = 00:10
-	// 1st interval: 00:00 - 00:10.5
-	// 2nd interval: 00:10 - 00:20.5
-	// etc.
-	//
-	now := time.Now()
-	r.periodStart = now.Truncate(time.Second)
-	truncation := now.Sub(r.periodStart)
-	r.periodEnd = r.periodStart.Add(r.Config.Period)
-	time.Sleep(r.Config.Delay)
-	periodT := time.NewTicker(r.Config.Period)
-	defer periodT.Stop()
-
-	for {
-		select {
-		case <-shutdown:
-			if len(r.metrics) > 0 {
-				// wait until metrics are flushed before exiting
-				continue
-			}
-			return
-		case m := <-r.metrics:
-			if m.Time().Before(r.periodStart) ||
-				m.Time().After(r.periodEnd.Add(truncation).Add(r.Config.Delay)) {
-				// the metric is outside the current aggregation period, so
-				// skip it.
-				continue
-			}
-			r.add(m)
-		case <-periodT.C:
-			r.periodStart = r.periodEnd
-			r.periodEnd = r.periodStart.Add(r.Config.Period)
-			r.push(acc)
-			r.reset()
-		}
-	}
-}
--- a/internal/models/running_aggregator_test.go
+++ b/internal/models/running_aggregator_test.go
@@ -1,256 +0,0 @@
-package models
-
-import (
-	"fmt"
-	"sync"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/testutil"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestAdd(t *testing.T) {
-	a := &TestAggregator{}
-	ra := NewRunningAggregator(a, &AggregatorConfig{
-		Name: "TestRunningAggregator",
-		Filter: Filter{
-			NamePass: []string{"*"},
-		},
-		Period: time.Millisecond * 500,
-	})
-	assert.NoError(t, ra.Config.Filter.Compile())
-	acc := testutil.Accumulator{}
-	go ra.Run(&acc, make(chan struct{}))
-
-	m := ra.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
-		map[string]string{},
-		telegraf.Untyped,
-		time.Now().Add(time.Millisecond*150),
-	)
-	assert.False(t, ra.Add(m))
-
-	for {
-		time.Sleep(time.Millisecond)
-		if atomic.LoadInt64(&a.sum) > 0 {
-			break
-		}
-	}
-	assert.Equal(t, int64(101), atomic.LoadInt64(&a.sum))
-}
-
-func TestAddMetricsOutsideCurrentPeriod(t *testing.T) {
-	a := &TestAggregator{}
-	ra := NewRunningAggregator(a, &AggregatorConfig{
-		Name: "TestRunningAggregator",
-		Filter: Filter{
-			NamePass: []string{"*"},
-		},
-		Period: time.Millisecond * 500,
-	})
-	assert.NoError(t, ra.Config.Filter.Compile())
-	acc := testutil.Accumulator{}
-	go ra.Run(&acc, make(chan struct{}))
-
-	// metric before current period
-	m := ra.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
-		map[string]string{},
-		telegraf.Untyped,
-		time.Now().Add(-time.Hour),
-	)
-	assert.False(t, ra.Add(m))
-
-	// metric after current period
-	m = ra.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
-		map[string]string{},
-		telegraf.Untyped,
-		time.Now().Add(time.Hour),
-	)
-	assert.False(t, ra.Add(m))
-
-	// "now" metric
-	m = ra.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
-		map[string]string{},
-		telegraf.Untyped,
-		time.Now().Add(time.Millisecond*50),
-	)
-	assert.False(t, ra.Add(m))
-
-	for {
-		time.Sleep(time.Millisecond)
-		if atomic.LoadInt64(&a.sum) > 0 {
-			break
-		}
-	}
-	assert.Equal(t, int64(101), atomic.LoadInt64(&a.sum))
-}
-
-func TestAddAndPushOnePeriod(t *testing.T) {
-	a := &TestAggregator{}
-	ra := NewRunningAggregator(a, &AggregatorConfig{
-		Name: "TestRunningAggregator",
-		Filter: Filter{
-			NamePass: []string{"*"},
-		},
-		Period: time.Millisecond * 500,
-	})
-	assert.NoError(t, ra.Config.Filter.Compile())
-	acc := testutil.Accumulator{}
-	shutdown := make(chan struct{})
-
-	var wg sync.WaitGroup
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		ra.Run(&acc, shutdown)
-	}()
-
-	m := ra.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
-		map[string]string{},
-		telegraf.Untyped,
-		time.Now().Add(time.Millisecond*100),
-	)
-	assert.False(t, ra.Add(m))
-
-	for {
-		time.Sleep(time.Millisecond)
-		if acc.NMetrics() > 0 {
-			break
-		}
-	}
-	acc.AssertContainsFields(t, "TestMetric", map[string]interface{}{"sum": int64(101)})
-
-	close(shutdown)
-	wg.Wait()
-}
-
-func TestAddDropOriginal(t *testing.T) {
-	ra := NewRunningAggregator(&TestAggregator{}, &AggregatorConfig{
-		Name: "TestRunningAggregator",
-		Filter: Filter{
-			NamePass: []string{"RI*"},
-		},
-		DropOriginal: true,
-	})
-	assert.NoError(t, ra.Config.Filter.Compile())
-
-	m := ra.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
-		map[string]string{},
-		telegraf.Untyped,
-		time.Now(),
-	)
-	assert.True(t, ra.Add(m))
-
-	// this metric name doesn't match the filter, so Add will return false
-	m2 := ra.MakeMetric(
-		"foobar",
-		map[string]interface{}{"value": int(101)},
-		map[string]string{},
-		telegraf.Untyped,
-		time.Now(),
-	)
-	assert.False(t, ra.Add(m2))
-}
-
-// make an untyped, counter, & gauge metric
-func TestMakeMetricA(t *testing.T) {
-	now := time.Now()
-	ra := NewRunningAggregator(&TestAggregator{}, &AggregatorConfig{
-		Name: "TestRunningAggregator",
-	})
-	assert.Equal(t, "aggregators.TestRunningAggregator", ra.Name())
-
-	m := ra.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
-		map[string]string{},
-		telegraf.Untyped,
-		now,
-	)
-	assert.Equal(
-		t,
-		fmt.Sprintf("RITest value=101i %d\n", now.UnixNano()),
-		m.String(),
-	)
-	assert.Equal(
-		t,
-		m.Type(),
-		telegraf.Untyped,
-	)
-
-	m = ra.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
-		map[string]string{},
-		telegraf.Counter,
-		now,
-	)
-	assert.Equal(
-		t,
-		fmt.Sprintf("RITest value=101i %d\n", now.UnixNano()),
-		m.String(),
-	)
-	assert.Equal(
-		t,
-		m.Type(),
-		telegraf.Counter,
-	)
-
-	m = ra.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
-		map[string]string{},
-		telegraf.Gauge,
-		now,
-	)
-	assert.Equal(
-		t,
-		fmt.Sprintf("RITest value=101i %d\n", now.UnixNano()),
-		m.String(),
-	)
-	assert.Equal(
-		t,
-		m.Type(),
-		telegraf.Gauge,
-	)
-}
-
-type TestAggregator struct {
-	sum int64
-}
-
-func (t *TestAggregator) Description() string  { return "" }
-func (t *TestAggregator) SampleConfig() string { return "" }
-func (t *TestAggregator) Reset() {
-	atomic.StoreInt64(&t.sum, 0)
-}
-
-func (t *TestAggregator) Push(acc telegraf.Accumulator) {
-	acc.AddFields("TestMetric",
-		map[string]interface{}{"sum": t.sum},
-		map[string]string{},
-	)
-}
-
-func (t *TestAggregator) Add(in telegraf.Metric) {
-	for _, v := range in.Fields() {
-		if vi, ok := v.(int64); ok {
-			atomic.AddInt64(&t.sum, vi)
-		}
-	}
-}
--- a/internal/models/running_input.go
+++ b/internal/models/running_input.go
@@ -1,38 +1,15 @@
-package models
+package internal_models

 import (
-	"fmt"
 	"time"

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

-var GlobalMetricsGathered = selfstat.Register("agent", "metrics_gathered", map[string]string{})
-
 type RunningInput struct {
+	Name   string
 	Input  telegraf.Input
 	Config *InputConfig
-
-	trace       bool
-	defaultTags map[string]string
-
-	MetricsGathered selfstat.Stat
-}
-
-func NewRunningInput(
-	input telegraf.Input,
-	config *InputConfig,
-) *RunningInput {
-	return &RunningInput{
-		Input:  input,
-		Config: config,
-		MetricsGathered: selfstat.Register(
-			"gather",
-			"metrics_gathered",
-			map[string]string{"input": config.Name},
-		),
-	}
 }

 // InputConfig containing a name, interval, and filter
@@ -45,52 +22,3 @@ type InputConfig struct {
 	Filter            Filter
 	Interval          time.Duration
 }
-
-func (r *RunningInput) Name() string {
-	return "inputs." + r.Config.Name
-}
-
-// MakeMetric either returns a metric, or returns nil if the metric doesn't
-// need to be created (because of filtering, an error, etc.)
-func (r *RunningInput) MakeMetric(
-	measurement string,
-	fields map[string]interface{},
-	tags map[string]string,
-	mType telegraf.ValueType,
-	t time.Time,
-) telegraf.Metric {
-	m := makemetric(
-		measurement,
-		fields,
-		tags,
-		r.Config.NameOverride,
-		r.Config.MeasurementPrefix,
-		r.Config.MeasurementSuffix,
-		r.Config.Tags,
-		r.defaultTags,
-		r.Config.Filter,
-		true,
-		mType,
-		t,
-	)
-
-	if r.trace && m != nil {
-		fmt.Print("> " + m.String())
-	}
-
-	r.MetricsGathered.Incr(1)
-	GlobalMetricsGathered.Incr(1)
-	return m
-}
-
-func (r *RunningInput) Trace() bool {
-	return r.trace
-}
-
-func (r *RunningInput) SetTrace(trace bool) {
-	r.trace = trace
-}
-
-func (r *RunningInput) SetDefaultTags(tags map[string]string) {
-	r.defaultTags = tags
-}
--- a/internal/models/running_input_test.go
+++ b/internal/models/running_input_test.go
@@ -1,463 +0,0 @@
-package models
-
-import (
-	"fmt"
-	"math"
-	"testing"
-	"time"
-
-	"github.com/influxdata/telegraf"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestMakeMetricNoFields(t *testing.T) {
-	now := time.Now()
-	ri := NewRunningInput(&testInput{}, &InputConfig{
-		Name: "TestRunningInput",
-	})
-
-	m := ri.MakeMetric(
-		"RITest",
-		map[string]interface{}{},
-		map[string]string{},
-		telegraf.Untyped,
-		now,
-	)
-	assert.Nil(t, m)
-}
-
-// nil fields should get dropped
-func TestMakeMetricNilFields(t *testing.T) {
-	now := time.Now()
-	ri := NewRunningInput(&testInput{}, &InputConfig{
-		Name: "TestRunningInput",
-	})
-
-	m := ri.MakeMetric(
-		"RITest",
-		map[string]interface{}{
-			"value": int(101),
-			"nil":   nil,
-		},
-		map[string]string{},
-		telegraf.Untyped,
-		now,
-	)
-	assert.Equal(
-		t,
-		fmt.Sprintf("RITest value=101i %d\n", now.UnixNano()),
-		m.String(),
-	)
-}
-
-// make an untyped, counter, & gauge metric
-func TestMakeMetric(t *testing.T) {
-	now := time.Now()
-	ri := NewRunningInput(&testInput{}, &InputConfig{
-		Name: "TestRunningInput",
-	})
-
-	ri.SetTrace(true)
-	assert.Equal(t, true, ri.Trace())
-	assert.Equal(t, "inputs.TestRunningInput", ri.Name())
-
-	m := ri.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
-		map[string]string{},
-		telegraf.Untyped,
-		now,
-	)
-	assert.Equal(
-		t,
-		fmt.Sprintf("RITest value=101i %d\n", now.UnixNano()),
-		m.String(),
-	)
-	assert.Equal(
-		t,
-		m.Type(),
-		telegraf.Untyped,
-	)
-
-	m = ri.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
-		map[string]string{},
-		telegraf.Counter,
-		now,
-	)
-	assert.Equal(
-		t,
-		fmt.Sprintf("RITest value=101i %d\n", now.UnixNano()),
-		m.String(),
-	)
-	assert.Equal(
-		t,
-		m.Type(),
-		telegraf.Counter,
-	)
-
-	m = ri.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
-		map[string]string{},
-		telegraf.Gauge,
-		now,
-	)
-	assert.Equal(
-		t,
-		fmt.Sprintf("RITest value=101i %d\n", now.UnixNano()),
-		m.String(),
-	)
-	assert.Equal(
-		t,
-		m.Type(),
-		telegraf.Gauge,
-	)
-}
-
-func TestMakeMetricWithPluginTags(t *testing.T) {
-	now := time.Now()
-	ri := NewRunningInput(&testInput{}, &InputConfig{
-		Name: "TestRunningInput",
-		Tags: map[string]string{
-			"foo": "bar",
-		},
-	})
-
-	ri.SetTrace(true)
-	assert.Equal(t, true, ri.Trace())
-
-	m := ri.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
-		nil,
-		telegraf.Untyped,
-		now,
-	)
-	assert.Equal(
-		t,
-		fmt.Sprintf("RITest,foo=bar value=101i %d\n", now.UnixNano()),
-		m.String(),
-	)
-}
-
-func TestMakeMetricFilteredOut(t *testing.T) {
-	now := time.Now()
-	ri := NewRunningInput(&testInput{}, &InputConfig{
-		Name: "TestRunningInput",
-		Tags: map[string]string{
-			"foo": "bar",
-		},
-		Filter: Filter{NamePass: []string{"foobar"}},
-	})
-
-	ri.SetTrace(true)
-	assert.Equal(t, true, ri.Trace())
-	assert.NoError(t, ri.Config.Filter.Compile())
-
-	m := ri.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
-		nil,
-		telegraf.Untyped,
-		now,
-	)
-	assert.Nil(t, m)
-}
-
-func TestMakeMetricWithDaemonTags(t *testing.T) {
-	now := time.Now()
-	ri := NewRunningInput(&testInput{}, &InputConfig{
-		Name: "TestRunningInput",
-	})
-	ri.SetDefaultTags(map[string]string{
-		"foo": "bar",
-	})
-
-	ri.SetTrace(true)
-	assert.Equal(t, true, ri.Trace())
-
-	m := ri.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
-		map[string]string{},
-		telegraf.Untyped,
-		now,
-	)
-	assert.Equal(
-		t,
-		fmt.Sprintf("RITest,foo=bar value=101i %d\n", now.UnixNano()),
-		m.String(),
-	)
-}
-
-// make an untyped, counter, & gauge metric
-func TestMakeMetricInfFields(t *testing.T) {
-	inf := math.Inf(1)
-	ninf := math.Inf(-1)
-	now := time.Now()
-	ri := NewRunningInput(&testInput{}, &InputConfig{
-		Name: "TestRunningInput",
-	})
-
-	ri.SetTrace(true)
-	assert.Equal(t, true, ri.Trace())
-
-	m := ri.MakeMetric(
-		"RITest",
-		map[string]interface{}{
-			"value": int(101),
-			"inf":   inf,
-			"ninf":  ninf,
-		},
-		map[string]string{},
-		telegraf.Untyped,
-		now,
-	)
-	assert.Equal(
-		t,
-		fmt.Sprintf("RITest value=101i %d\n", now.UnixNano()),
-		m.String(),
-	)
-}
-
-func TestMakeMetricAllFieldTypes(t *testing.T) {
-	now := time.Now()
-	ri := NewRunningInput(&testInput{}, &InputConfig{
-		Name: "TestRunningInput",
-	})
-
-	ri.SetTrace(true)
-	assert.Equal(t, true, ri.Trace())
-
-	m := ri.MakeMetric(
-		"RITest",
-		map[string]interface{}{
-			"a": int(10),
-			"b": int8(10),
-			"c": int16(10),
-			"d": int32(10),
-			"e": uint(10),
-			"f": uint8(10),
-			"g": uint16(10),
-			"h": uint32(10),
-			"i": uint64(10),
-			"j": float32(10),
-			"k": uint64(9223372036854775810),
-			"l": "foobar",
-			"m": true,
-		},
-		map[string]string{},
-		telegraf.Untyped,
-		now,
-	)
-	assert.Contains(t, m.String(), "a=10i")
-	assert.Contains(t, m.String(), "b=10i")
-	assert.Contains(t, m.String(), "c=10i")
-	assert.Contains(t, m.String(), "d=10i")
-	assert.Contains(t, m.String(), "e=10i")
-	assert.Contains(t, m.String(), "f=10i")
-	assert.Contains(t, m.String(), "g=10i")
-	assert.Contains(t, m.String(), "h=10i")
-	assert.Contains(t, m.String(), "i=10i")
-	assert.Contains(t, m.String(), "j=10")
-	assert.NotContains(t, m.String(), "j=10i")
-	assert.Contains(t, m.String(), "k=9223372036854775807i")
-	assert.Contains(t, m.String(), "l=\"foobar\"")
-	assert.Contains(t, m.String(), "m=true")
-}
-
-func TestMakeMetricNameOverride(t *testing.T) {
-	now := time.Now()
-	ri := NewRunningInput(&testInput{}, &InputConfig{
-		Name:         "TestRunningInput",
-		NameOverride: "foobar",
-	})
-
-	m := ri.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
-		map[string]string{},
-		telegraf.Untyped,
-		now,
-	)
-	assert.Equal(
-		t,
-		fmt.Sprintf("foobar value=101i %d\n", now.UnixNano()),
-		m.String(),
-	)
-}
-
-func TestMakeMetricNamePrefix(t *testing.T) {
-	now := time.Now()
-	ri := NewRunningInput(&testInput{}, &InputConfig{
-		Name:              "TestRunningInput",
-		MeasurementPrefix: "foobar_",
-	})
-
-	m := ri.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
-		map[string]string{},
-		telegraf.Untyped,
-		now,
-	)
-	assert.Equal(
-		t,
-		fmt.Sprintf("foobar_RITest value=101i %d\n", now.UnixNano()),
-		m.String(),
-	)
-}
-
-func TestMakeMetricNameSuffix(t *testing.T) {
-	now := time.Now()
-	ri := NewRunningInput(&testInput{}, &InputConfig{
-		Name:              "TestRunningInput",
-		MeasurementSuffix: "_foobar",
-	})
-
-	m := ri.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
-		map[string]string{},
-		telegraf.Untyped,
-		now,
-	)
-	assert.Equal(
-		t,
-		fmt.Sprintf("RITest_foobar value=101i %d\n", now.UnixNano()),
-		m.String(),
-	)
-}
-
-func TestMakeMetric_TrailingSlash(t *testing.T) {
-	now := time.Now()
-
-	tests := []struct {
-		name                string
-		measurement         string
-		fields              map[string]interface{}
-		tags                map[string]string
-		expectedNil         bool
-		expectedMeasurement string
-		expectedFields      map[string]interface{}
-		expectedTags        map[string]string
-	}{
-		{
-			name:        "Measurement cannot have trailing slash",
-			measurement: `cpu\`,
-			fields: map[string]interface{}{
-				"value": int64(42),
-			},
-			tags:        map[string]string{},
-			expectedNil: true,
-		},
-		{
-			name:        "Field key with trailing slash dropped",
-			measurement: `cpu`,
-			fields: map[string]interface{}{
-				"value": int64(42),
-				`bad\`:  `xyzzy`,
-			},
-			tags:                map[string]string{},
-			expectedMeasurement: `cpu`,
-			expectedFields: map[string]interface{}{
-				"value": int64(42),
-			},
-			expectedTags: map[string]string{},
-		},
-		{
-			name:        "Field value with trailing slash okay",
-			measurement: `cpu`,
-			fields: map[string]interface{}{
-				"value": int64(42),
-				"ok":    `xyzzy\`,
-			},
-			tags:                map[string]string{},
-			expectedMeasurement: `cpu`,
-			expectedFields: map[string]interface{}{
-				"value": int64(42),
-				"ok":    `xyzzy\`,
-			},
-			expectedTags: map[string]string{},
-		},
-		{
-			name:        "Must have one field after dropped",
-			measurement: `cpu`,
-			fields: map[string]interface{}{
-				"bad": math.NaN(),
-			},
-			tags:        map[string]string{},
-			expectedNil: true,
-		},
-		{
-			name:        "Tag key with trailing slash dropped",
-			measurement: `cpu`,
-			fields: map[string]interface{}{
-				"value": int64(42),
-			},
-			tags: map[string]string{
-				`host\`: "localhost",
-				"a":     "x",
-			},
-			expectedMeasurement: `cpu`,
-			expectedFields: map[string]interface{}{
-				"value": int64(42),
-			},
-			expectedTags: map[string]string{
-				"a": "x",
-			},
-		},
-		{
-			name:        "Tag value with trailing slash dropped",
-			measurement: `cpu`,
-			fields: map[string]interface{}{
-				"value": int64(42),
-			},
-			tags: map[string]string{
-				`host`: `localhost\`,
-				"a":    "x",
-			},
-			expectedMeasurement: `cpu`,
-			expectedFields: map[string]interface{}{
-				"value": int64(42),
-			},
-			expectedTags: map[string]string{
-				"a": "x",
-			},
-		},
-	}
-
-	ri := NewRunningInput(&testInput{}, &InputConfig{
-		Name: "TestRunningInput",
-	})
-
-	for _, tc := range tests {
-		t.Run(tc.name, func(t *testing.T) {
-			m := ri.MakeMetric(
-				tc.measurement,
-				tc.fields,
-				tc.tags,
-				telegraf.Untyped,
-				now)
-
-			if tc.expectedNil {
-				require.Nil(t, m)
-			} else {
-				require.NotNil(t, m)
-				require.Equal(t, tc.expectedMeasurement, m.Name())
-				require.Equal(t, tc.expectedFields, m.Fields())
-				require.Equal(t, tc.expectedTags, m.Tags())
-			}
-		})
-	}
-}
-
-type testInput struct{}
-
-func (t *testInput) Description() string                   { return "" }
-func (t *testInput) SampleConfig() string                  { return "" }
-func (t *testInput) Gather(acc telegraf.Accumulator) error { return nil }
--- a/internal/models/running_output.go
+++ b/internal/models/running_output.go
@@ -1,4 +1,4 @@
-package models
+package internal_models

 import (
 	"log"
@@ -6,37 +6,29 @@ import (
 	"time"

 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal/buffer"
-	"github.com/influxdata/telegraf/metric"
-	"github.com/influxdata/telegraf/selfstat"
 )

 const (
-	// Default size of metrics batch size.
-	DEFAULT_METRIC_BATCH_SIZE = 1000
-
-	// Default number of metrics kept. It should be a multiple of batch size.
+	// Default number of metrics kept between flushes.
 	DEFAULT_METRIC_BUFFER_LIMIT = 10000
+
+	// Limit how many full metric buffers are kept due to failed writes.
+	FULL_METRIC_BUFFERS_LIMIT = 100
 )

-// RunningOutput contains the output configuration
 type RunningOutput struct {
-	Name              string
-	Output            telegraf.Output
-	Config            *OutputConfig
-	MetricBufferLimit int
-	MetricBatchSize   int
+	Name                string
+	Output              telegraf.Output
+	Config              *OutputConfig
+	Quiet               bool
+	MetricBufferLimit   int
+	FlushBufferWhenFull bool

-	MetricsFiltered selfstat.Stat
-	MetricsWritten  selfstat.Stat
-	BufferSize      selfstat.Stat
-	BufferLimit     selfstat.Stat
-	WriteTime       selfstat.Stat
+	metrics    []telegraf.Metric
+	tmpmetrics map[int][]telegraf.Metric
+	overwriteI int
+	mapI       int

-	metrics     *buffer.Buffer
-	failMetrics *buffer.Buffer
-
-	// Guards against concurrent calls to the Output as described in #3009
 	sync.Mutex
 }

@@ -44,145 +36,97 @@ func NewRunningOutput(
 	name string,
 	output telegraf.Output,
 	conf *OutputConfig,
-	batchSize int,
-	bufferLimit int,
 ) *RunningOutput {
-	if bufferLimit == 0 {
-		bufferLimit = DEFAULT_METRIC_BUFFER_LIMIT
-	}
-	if batchSize == 0 {
-		batchSize = DEFAULT_METRIC_BATCH_SIZE
-	}
 	ro := &RunningOutput{
 		Name:              name,
-		metrics:           buffer.NewBuffer(batchSize),
-		failMetrics:       buffer.NewBuffer(bufferLimit),
+		metrics:           make([]telegraf.Metric, 0),
+		tmpmetrics:        make(map[int][]telegraf.Metric),
 		Output:            output,
 		Config:            conf,
-		MetricBufferLimit: bufferLimit,
-		MetricBatchSize:   batchSize,
-		MetricsWritten: selfstat.Register(
-			"write",
-			"metrics_written",
-			map[string]string{"output": name},
-		),
-		MetricsFiltered: selfstat.Register(
-			"write",
-			"metrics_filtered",
-			map[string]string{"output": name},
-		),
-		BufferSize: selfstat.Register(
-			"write",
-			"buffer_size",
-			map[string]string{"output": name},
-		),
-		BufferLimit: selfstat.Register(
-			"write",
-			"buffer_limit",
-			map[string]string{"output": name},
-		),
-		WriteTime: selfstat.RegisterTiming(
-			"write",
-			"write_time_ns",
-			map[string]string{"output": name},
-		),
+		MetricBufferLimit: DEFAULT_METRIC_BUFFER_LIMIT,
 	}
-	ro.BufferLimit.Incr(int64(ro.MetricBufferLimit))
 	return ro
 }

 // AddMetric adds a metric to the output. This function can also write cached
 // points if FlushBufferWhenFull is true.
-func (ro *RunningOutput) AddMetric(m telegraf.Metric) {
-	if m == nil {
-		return
-	}
-	// Filter any tagexclude/taginclude parameters before adding metric
-	if ro.Config.Filter.IsActive() {
-		// In order to filter out tags, we need to create a new metric, since
-		// metrics are immutable once created.
-		name := m.Name()
-		tags := m.Tags()
-		fields := m.Fields()
-		t := m.Time()
-		if ok := ro.Config.Filter.Apply(name, fields, tags); !ok {
-			ro.MetricsFiltered.Incr(1)
+func (ro *RunningOutput) AddMetric(metric telegraf.Metric) {
+	if ro.Config.Filter.IsActive {
+		if !ro.Config.Filter.ShouldMetricPass(metric) {
 			return
 		}
-		// error is not possible if creating from another metric, so ignore.
-		m, _ = metric.New(name, tags, fields, t)
 	}
+	ro.Lock()
+	defer ro.Unlock()

-	ro.metrics.Add(m)
-	if ro.metrics.Len() == ro.MetricBatchSize {
-		batch := ro.metrics.Batch(ro.MetricBatchSize)
-		err := ro.write(batch)
-		if err != nil {
-			ro.failMetrics.Add(batch...)
+	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 {
+			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 {
-	nFails, nMetrics := ro.failMetrics.Len(), ro.metrics.Len()
-	ro.BufferSize.Set(int64(nFails + nMetrics))
-	log.Printf("D! Output [%s] buffer fullness: %d / %d metrics. ",
-		ro.Name, nFails+nMetrics, ro.MetricBufferLimit)
-	var err error
-	if !ro.failMetrics.IsEmpty() {
-		// how many batches of failed writes we need to write.
-		nBatches := nFails/ro.MetricBatchSize + 1
-		batchSize := ro.MetricBatchSize
+	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
+	}

-		for i := 0; i < nBatches; i++ {
-			// If it's the last batch, only grab the metrics that have not had
-			// a write attempt already (this is primarily to preserve order).
-			if i == nBatches-1 {
-				batchSize = nFails % ro.MetricBatchSize
-			}
-			batch := ro.failMetrics.Batch(batchSize)
-			// If we've already failed previous writes, don't bother trying to
-			// write to this output again. We are not exiting the loop just so
-			// that we can rotate the metrics to preserve order.
-			if err == nil {
-				err = ro.write(batch)
-			}
-			if err != nil {
-				ro.failMetrics.Add(batch...)
-			}
+	// 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)
 		}
 	}

-	batch := ro.metrics.Batch(ro.MetricBatchSize)
-	// see comment above about not trying to write to an already failed output.
-	// if ro.failMetrics is empty then err will always be nil at this point.
-	if err == nil {
-		err = ro.write(batch)
-	}
-
-	if err != nil {
-		ro.failMetrics.Add(batch...)
-		return err
-	}
 	return nil
 }

 func (ro *RunningOutput) write(metrics []telegraf.Metric) error {
-	nMetrics := len(metrics)
-	if nMetrics == 0 {
-		return nil
-	}
-	ro.Lock()
-	defer ro.Unlock()
 	start := time.Now()
 	err := ro.Output.Write(metrics)
 	elapsed := time.Since(start)
 	if err == nil {
-		log.Printf("D! Output [%s] wrote batch of %d metrics in %s\n",
-			ro.Name, nMetrics, elapsed)
-		ro.MetricsWritten.Incr(int64(nMetrics))
-		ro.WriteTime.Incr(elapsed.Nanoseconds())
+		if !ro.Quiet {
+			log.Printf("Wrote %d metrics to output %s in %s\n",
+				len(metrics), ro.Name, elapsed)
+		}
 	}
 	return err
 }
--- a/internal/models/running_output_test.go
+++ b/internal/models/running_output_test.go
@@ -1,7 +1,8 @@
-package models
+package internal_models

 import (
 	"fmt"
+	"sort"
 	"sync"
 	"testing"

@@ -28,212 +29,16 @@ var next5 = []telegraf.Metric{
 	testutil.TestMetric(101, "metric10"),
 }

-// Benchmark adding metrics.
-func BenchmarkRunningOutputAddWrite(b *testing.B) {
-	conf := &OutputConfig{
-		Filter: Filter{},
-	}
-
-	m := &perfOutput{}
-	ro := NewRunningOutput("test", m, conf, 1000, 10000)
-
-	for n := 0; n < b.N; n++ {
-		ro.AddMetric(testutil.TestMetric(101, "metric1"))
-		ro.Write()
-	}
-}
-
-// Benchmark adding metrics.
-func BenchmarkRunningOutputAddWriteEvery100(b *testing.B) {
-	conf := &OutputConfig{
-		Filter: Filter{},
-	}
-
-	m := &perfOutput{}
-	ro := NewRunningOutput("test", m, conf, 1000, 10000)
-
-	for n := 0; n < b.N; n++ {
-		ro.AddMetric(testutil.TestMetric(101, "metric1"))
-		if n%100 == 0 {
-			ro.Write()
-		}
-	}
-}
-
-// Benchmark adding metrics.
-func BenchmarkRunningOutputAddFailWrites(b *testing.B) {
-	conf := &OutputConfig{
-		Filter: Filter{},
-	}
-
-	m := &perfOutput{}
-	m.failWrite = true
-	ro := NewRunningOutput("test", m, conf, 1000, 10000)
-
-	for n := 0; n < b.N; n++ {
-		ro.AddMetric(testutil.TestMetric(101, "metric1"))
-	}
-}
-
-func TestAddingNilMetric(t *testing.T) {
-	conf := &OutputConfig{
-		Filter: Filter{},
-	}
-
-	m := &mockOutput{}
-	ro := NewRunningOutput("test", m, conf, 1000, 10000)
-
-	ro.AddMetric(nil)
-	ro.AddMetric(nil)
-	ro.AddMetric(nil)
-
-	err := ro.Write()
-	assert.NoError(t, err)
-	assert.Len(t, m.Metrics(), 0)
-}
-
-// Test that NameDrop filters ger properly applied.
-func TestRunningOutput_DropFilter(t *testing.T) {
-	conf := &OutputConfig{
-		Filter: Filter{
-			NameDrop: []string{"metric1", "metric2"},
-		},
-	}
-	assert.NoError(t, conf.Filter.Compile())
-
-	m := &mockOutput{}
-	ro := NewRunningOutput("test", m, conf, 1000, 10000)
-
-	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(), 8)
-}
-
-// Test that NameDrop filters without a match do nothing.
-func TestRunningOutput_PassFilter(t *testing.T) {
-	conf := &OutputConfig{
-		Filter: Filter{
-			NameDrop: []string{"metric1000", "foo*"},
-		},
-	}
-	assert.NoError(t, conf.Filter.Compile())
-
-	m := &mockOutput{}
-	ro := NewRunningOutput("test", m, conf, 1000, 10000)
-
-	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 tags are properly included
-func TestRunningOutput_TagIncludeNoMatch(t *testing.T) {
-	conf := &OutputConfig{
-		Filter: Filter{
-			TagInclude: []string{"nothing*"},
-		},
-	}
-	assert.NoError(t, conf.Filter.Compile())
-
-	m := &mockOutput{}
-	ro := NewRunningOutput("test", m, conf, 1000, 10000)
-
-	ro.AddMetric(testutil.TestMetric(101, "metric1"))
-	assert.Len(t, m.Metrics(), 0)
-
-	err := ro.Write()
-	assert.NoError(t, err)
-	assert.Len(t, m.Metrics(), 1)
-	assert.Empty(t, m.Metrics()[0].Tags())
-}
-
-// Test that tags are properly excluded
-func TestRunningOutput_TagExcludeMatch(t *testing.T) {
-	conf := &OutputConfig{
-		Filter: Filter{
-			TagExclude: []string{"tag*"},
-		},
-	}
-	assert.NoError(t, conf.Filter.Compile())
-
-	m := &mockOutput{}
-	ro := NewRunningOutput("test", m, conf, 1000, 10000)
-
-	ro.AddMetric(testutil.TestMetric(101, "metric1"))
-	assert.Len(t, m.Metrics(), 0)
-
-	err := ro.Write()
-	assert.NoError(t, err)
-	assert.Len(t, m.Metrics(), 1)
-	assert.Len(t, m.Metrics()[0].Tags(), 0)
-}
-
-// Test that tags are properly Excluded
-func TestRunningOutput_TagExcludeNoMatch(t *testing.T) {
-	conf := &OutputConfig{
-		Filter: Filter{
-			TagExclude: []string{"nothing*"},
-		},
-	}
-	assert.NoError(t, conf.Filter.Compile())
-
-	m := &mockOutput{}
-	ro := NewRunningOutput("test", m, conf, 1000, 10000)
-
-	ro.AddMetric(testutil.TestMetric(101, "metric1"))
-	assert.Len(t, m.Metrics(), 0)
-
-	err := ro.Write()
-	assert.NoError(t, err)
-	assert.Len(t, m.Metrics(), 1)
-	assert.Len(t, m.Metrics()[0].Tags(), 1)
-}
-
-// Test that tags are properly included
-func TestRunningOutput_TagIncludeMatch(t *testing.T) {
-	conf := &OutputConfig{
-		Filter: Filter{
-			TagInclude: []string{"tag*"},
-		},
-	}
-	assert.NoError(t, conf.Filter.Compile())
-
-	m := &mockOutput{}
-	ro := NewRunningOutput("test", m, conf, 1000, 10000)
-
-	ro.AddMetric(testutil.TestMetric(101, "metric1"))
-	assert.Len(t, m.Metrics(), 0)
-
-	err := ro.Write()
-	assert.NoError(t, err)
-	assert.Len(t, m.Metrics(), 1)
-	assert.Len(t, m.Metrics()[0].Tags(), 1)
-}
-
 // Test that we can write metrics with simple default setup.
 func TestRunningOutputDefault(t *testing.T) {
 	conf := &OutputConfig{
-		Filter: Filter{},
+		Filter: Filter{
+			IsActive: false,
+		},
 	}

 	m := &mockOutput{}
-	ro := NewRunningOutput("test", m, conf, 1000, 10000)
+	ro := NewRunningOutput("test", m, conf)

 	for _, metric := range first5 {
 		ro.AddMetric(metric)
@@ -248,17 +53,90 @@ func TestRunningOutputDefault(t *testing.T) {
 	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{},
+		Filter: Filter{
+			IsActive: false,
+		},
 	}

 	m := &mockOutput{}
-	ro := NewRunningOutput("test", m, conf, 6, 10)
+	ro := NewRunningOutput("test", m, conf)
+	ro.FlushBufferWhenFull = true
+	ro.MetricBufferLimit = 5

-	// Fill buffer to 1 under limit
+	// Fill buffer to limit
 	for _, metric := range first5 {
 		ro.AddMetric(metric)
 	}
@@ -281,11 +159,15 @@ func TestRunningOutputFlushWhenFull(t *testing.T) {
 // FlushBufferWhenFull is set, twice.
 func TestRunningOutputMultiFlushWhenFull(t *testing.T) {
 	conf := &OutputConfig{
-		Filter: Filter{},
+		Filter: Filter{
+			IsActive: false,
+		},
 	}

 	m := &mockOutput{}
-	ro := NewRunningOutput("test", m, conf, 4, 12)
+	ro := NewRunningOutput("test", m, conf)
+	ro.FlushBufferWhenFull = true
+	ro.MetricBufferLimit = 4

 	// Fill buffer past limit twive
 	for _, metric := range first5 {
@@ -295,19 +177,23 @@ func TestRunningOutputMultiFlushWhenFull(t *testing.T) {
 		ro.AddMetric(metric)
 	}
 	// flushed twice
-	assert.Len(t, m.Metrics(), 8)
+	assert.Len(t, m.Metrics(), 10)
 }

 func TestRunningOutputWriteFail(t *testing.T) {
 	conf := &OutputConfig{
-		Filter: Filter{},
+		Filter: Filter{
+			IsActive: false,
+		},
 	}

 	m := &mockOutput{}
 	m.failWrite = true
-	ro := NewRunningOutput("test", m, conf, 4, 12)
+	ro := NewRunningOutput("test", m, conf)
+	ro.FlushBufferWhenFull = true
+	ro.MetricBufferLimit = 4

-	// Fill buffer to limit twice
+	// Fill buffer past limit twice
 	for _, metric := range first5 {
 		ro.AddMetric(metric)
 	}
@@ -330,155 +216,6 @@ func TestRunningOutputWriteFail(t *testing.T) {
 	assert.Len(t, m.Metrics(), 10)
 }

-// Verify that the order of points is preserved during a write failure.
-func TestRunningOutputWriteFailOrder(t *testing.T) {
-	conf := &OutputConfig{
-		Filter: Filter{},
-	}
-
-	m := &mockOutput{}
-	m.failWrite = true
-	ro := NewRunningOutput("test", m, conf, 100, 1000)
-
-	// add 5 metrics
-	for _, metric := range first5 {
-		ro.AddMetric(metric)
-	}
-	// no successful flush yet
-	assert.Len(t, m.Metrics(), 0)
-
-	// Write fails
-	err := ro.Write()
-	require.Error(t, err)
-	// no successful flush yet
-	assert.Len(t, m.Metrics(), 0)
-
-	m.failWrite = false
-	// add 5 more metrics
-	for _, metric := range next5 {
-		ro.AddMetric(metric)
-	}
-	err = ro.Write()
-	require.NoError(t, err)
-
-	// Verify that 10 metrics were written
-	assert.Len(t, m.Metrics(), 10)
-	// Verify that they are in order
-	expected := append(first5, next5...)
-	assert.Equal(t, expected, m.Metrics())
-}
-
-// Verify that the order of points is preserved during many write failures.
-func TestRunningOutputWriteFailOrder2(t *testing.T) {
-	conf := &OutputConfig{
-		Filter: Filter{},
-	}
-
-	m := &mockOutput{}
-	m.failWrite = true
-	ro := NewRunningOutput("test", m, conf, 5, 100)
-
-	// add 5 metrics
-	for _, metric := range first5 {
-		ro.AddMetric(metric)
-	}
-	// Write fails
-	err := ro.Write()
-	require.Error(t, err)
-	// no successful flush yet
-	assert.Len(t, m.Metrics(), 0)
-
-	// add 5 metrics
-	for _, metric := range next5 {
-		ro.AddMetric(metric)
-	}
-	// Write fails
-	err = ro.Write()
-	require.Error(t, err)
-	// no successful flush yet
-	assert.Len(t, m.Metrics(), 0)
-
-	// add 5 metrics
-	for _, metric := range first5 {
-		ro.AddMetric(metric)
-	}
-	// Write fails
-	err = ro.Write()
-	require.Error(t, err)
-	// no successful flush yet
-	assert.Len(t, m.Metrics(), 0)
-
-	// add 5 metrics
-	for _, metric := range next5 {
-		ro.AddMetric(metric)
-	}
-	// 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)
-
-	// Verify that 10 metrics were written
-	assert.Len(t, m.Metrics(), 20)
-	// Verify that they are in order
-	expected := append(first5, next5...)
-	expected = append(expected, first5...)
-	expected = append(expected, next5...)
-	assert.Equal(t, expected, m.Metrics())
-}
-
-// Verify that the order of points is preserved when there is a remainder
-// of points for the batch.
-//
-// ie, with a batch size of 5:
-//
-//     1 2 3 4 5 6 <-- order, failed points
-//     6 1 2 3 4 5 <-- order, after 1st write failure (1 2 3 4 5 was batch)
-//     1 2 3 4 5 6 <-- order, after 2nd write failure, (6 was batch)
-//
-func TestRunningOutputWriteFailOrder3(t *testing.T) {
-	conf := &OutputConfig{
-		Filter: Filter{},
-	}
-
-	m := &mockOutput{}
-	m.failWrite = true
-	ro := NewRunningOutput("test", m, conf, 5, 1000)
-
-	// add 5 metrics
-	for _, metric := range first5 {
-		ro.AddMetric(metric)
-	}
-	// no successful flush yet
-	assert.Len(t, m.Metrics(), 0)
-
-	// Write fails
-	err := ro.Write()
-	require.Error(t, err)
-	// no successful flush yet
-	assert.Len(t, m.Metrics(), 0)
-
-	// add and attempt to write a single metric:
-	ro.AddMetric(next5[0])
-	err = ro.Write()
-	require.Error(t, err)
-
-	// unset fail and write metrics
-	m.failWrite = false
-	err = ro.Write()
-	require.NoError(t, err)
-
-	// Verify that 6 metrics were written
-	assert.Len(t, m.Metrics(), 6)
-	// Verify that they are in order
-	expected := append(first5, next5[0])
-	assert.Equal(t, expected, m.Metrics())
-}
-
 type mockOutput struct {
 	sync.Mutex

@@ -526,31 +263,3 @@ func (m *mockOutput) Metrics() []telegraf.Metric {
 	defer m.Unlock()
 	return m.metrics
 }
-
-type perfOutput struct {
-	// if true, mock a write failure
-	failWrite bool
-}
-
-func (m *perfOutput) Connect() error {
-	return nil
-}
-
-func (m *perfOutput) Close() error {
-	return nil
-}
-
-func (m *perfOutput) Description() string {
-	return ""
-}
-
-func (m *perfOutput) SampleConfig() string {
-	return ""
-}
-
-func (m *perfOutput) Write(metrics []telegraf.Metric) error {
-	if m.failWrite {
-		return fmt.Errorf("Failed Write!")
-	}
-	return nil
-}
--- a/internal/models/running_processor.go
+++ b/internal/models/running_processor.go
@@ -1,51 +0,0 @@
-package models
-
-import (
-	"sync"
-
-	"github.com/influxdata/telegraf"
-)
-
-type RunningProcessor struct {
-	Name string
-
-	sync.Mutex
-	Processor telegraf.Processor
-	Config    *ProcessorConfig
-}
-
-type RunningProcessors []*RunningProcessor
-
-func (rp RunningProcessors) Len() int           { return len(rp) }
-func (rp RunningProcessors) Swap(i, j int)      { rp[i], rp[j] = rp[j], rp[i] }
-func (rp RunningProcessors) Less(i, j int) bool { return rp[i].Config.Order < rp[j].Config.Order }
-
-// FilterConfig containing a name and filter
-type ProcessorConfig struct {
-	Name   string
-	Order  int64
-	Filter Filter
-}
-
-func (rp *RunningProcessor) Apply(in ...telegraf.Metric) []telegraf.Metric {
-	rp.Lock()
-	defer rp.Unlock()
-
-	ret := []telegraf.Metric{}
-
-	for _, metric := range in {
-		if rp.Config.Filter.IsActive() {
-			// check if the filter should be applied to this metric
-			if ok := rp.Config.Filter.Apply(metric.Name(), metric.Fields(), metric.Tags()); !ok {
-				// this means filter should not be applied
-				ret = append(ret, metric)
-				continue
-			}
-		}
-		// This metric should pass through the filter, so call the filter Apply
-		// function and append results to the output slice.
-		ret = append(ret, rp.Processor.Apply(metric)...)
-	}
-
-	return ret
-}
--- a/internal/models/running_processor_test.go
+++ b/internal/models/running_processor_test.go
@@ -1,117 +0,0 @@
-package models
-
-import (
-	"testing"
-
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/testutil"
-
-	"github.com/stretchr/testify/assert"
-)
-
-type TestProcessor struct {
-}
-
-func (f *TestProcessor) SampleConfig() string { return "" }
-func (f *TestProcessor) Description() string  { return "" }
-
-// Apply renames:
-//   "foo" to "fuz"
-//   "bar" to "baz"
-// And it also drops measurements named "dropme"
-func (f *TestProcessor) Apply(in ...telegraf.Metric) []telegraf.Metric {
-	out := make([]telegraf.Metric, 0)
-	for _, m := range in {
-		switch m.Name() {
-		case "foo":
-			out = append(out, testutil.TestMetric(1, "fuz"))
-		case "bar":
-			out = append(out, testutil.TestMetric(1, "baz"))
-		case "dropme":
-			// drop the metric!
-		default:
-			out = append(out, m)
-		}
-	}
-	return out
-}
-
-func NewTestRunningProcessor() *RunningProcessor {
-	out := &RunningProcessor{
-		Name:      "test",
-		Processor: &TestProcessor{},
-		Config:    &ProcessorConfig{Filter: Filter{}},
-	}
-	return out
-}
-
-func TestRunningProcessor(t *testing.T) {
-	inmetrics := []telegraf.Metric{
-		testutil.TestMetric(1, "foo"),
-		testutil.TestMetric(1, "bar"),
-		testutil.TestMetric(1, "baz"),
-	}
-
-	expectedNames := []string{
-		"fuz",
-		"baz",
-		"baz",
-	}
-	rfp := NewTestRunningProcessor()
-	filteredMetrics := rfp.Apply(inmetrics...)
-
-	actualNames := []string{
-		filteredMetrics[0].Name(),
-		filteredMetrics[1].Name(),
-		filteredMetrics[2].Name(),
-	}
-	assert.Equal(t, expectedNames, actualNames)
-}
-
-func TestRunningProcessor_WithNameDrop(t *testing.T) {
-	inmetrics := []telegraf.Metric{
-		testutil.TestMetric(1, "foo"),
-		testutil.TestMetric(1, "bar"),
-		testutil.TestMetric(1, "baz"),
-	}
-
-	expectedNames := []string{
-		"foo",
-		"baz",
-		"baz",
-	}
-	rfp := NewTestRunningProcessor()
-
-	rfp.Config.Filter.NameDrop = []string{"foo"}
-	assert.NoError(t, rfp.Config.Filter.Compile())
-
-	filteredMetrics := rfp.Apply(inmetrics...)
-
-	actualNames := []string{
-		filteredMetrics[0].Name(),
-		filteredMetrics[1].Name(),
-		filteredMetrics[2].Name(),
-	}
-	assert.Equal(t, expectedNames, actualNames)
-}
-
-func TestRunningProcessor_DroppedMetric(t *testing.T) {
-	inmetrics := []telegraf.Metric{
-		testutil.TestMetric(1, "dropme"),
-		testutil.TestMetric(1, "foo"),
-		testutil.TestMetric(1, "bar"),
-	}
-
-	expectedNames := []string{
-		"fuz",
-		"baz",
-	}
-	rfp := NewTestRunningProcessor()
-	filteredMetrics := rfp.Apply(inmetrics...)
-
-	actualNames := []string{
-		filteredMetrics[0].Name(),
-		filteredMetrics[1].Name(),
-	}
-	assert.Equal(t, expectedNames, actualNames)
-}
--- a/logger/logger.go
+++ b/logger/logger.go
@@ -1,69 +0,0 @@
-package logger
-
-import (
-	"io"
-	"log"
-	"os"
-	"regexp"
-	"time"
-
-	"github.com/influxdata/wlog"
-)
-
-var prefixRegex = regexp.MustCompile("^[DIWE]!")
-
-// newTelegrafWriter returns a logging-wrapped writer.
-func newTelegrafWriter(w io.Writer) io.Writer {
-	return &telegrafLog{
-		writer: wlog.NewWriter(w),
-	}
-}
-
-type telegrafLog struct {
-	writer io.Writer
-}
-
-func (t *telegrafLog) Write(b []byte) (n int, err error) {
-	var line []byte
-	if !prefixRegex.Match(b) {
-		line = append([]byte(time.Now().UTC().Format(time.RFC3339)+" I! "), b...)
-	} else {
-		line = append([]byte(time.Now().UTC().Format(time.RFC3339)+" "), b...)
-	}
-	return t.writer.Write(line)
-}
-
-// SetupLogging configures the logging output.
-//   debug   will set the log level to DEBUG
-//   quiet   will set the log level to ERROR
-//   logfile will direct the logging output to a file. Empty string is
-//           interpreted as stderr. If there is an error opening the file the
-//           logger will fallback to stderr.
-func SetupLogging(debug, quiet bool, logfile string) {
-	log.SetFlags(0)
-	if debug {
-		wlog.SetLevel(wlog.DEBUG)
-	}
-	if quiet {
-		wlog.SetLevel(wlog.ERROR)
-	}
-
-	var oFile *os.File
-	if logfile != "" {
-		if _, err := os.Stat(logfile); os.IsNotExist(err) {
-			if oFile, err = os.Create(logfile); err != nil {
-				log.Printf("E! Unable to create %s (%s), using stderr", logfile, err)
-				oFile = os.Stderr
-			}
-		} else {
-			if oFile, err = os.OpenFile(logfile, os.O_APPEND|os.O_WRONLY, os.ModeAppend); err != nil {
-				log.Printf("E! Unable to append to %s (%s), using stderr", logfile, err)
-				oFile = os.Stderr
-			}
-		}
-	} else {
-		oFile = os.Stderr
-	}
-
-	log.SetOutput(newTelegrafWriter(oFile))
-}
--- a/logger/logger_test.go
+++ b/logger/logger_test.go
@@ -1,75 +0,0 @@
-package logger
-
-import (
-	"bytes"
-	"io/ioutil"
-	"log"
-	"os"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestWriteLogToFile(t *testing.T) {
-	tmpfile, err := ioutil.TempFile("", "")
-	assert.NoError(t, err)
-	defer func() { os.Remove(tmpfile.Name()) }()
-
-	SetupLogging(false, false, tmpfile.Name())
-	log.Printf("I! TEST")
-	log.Printf("D! TEST") // <- should be ignored
-
-	f, err := ioutil.ReadFile(tmpfile.Name())
-	assert.NoError(t, err)
-	assert.Equal(t, f[19:], []byte("Z I! TEST\n"))
-}
-
-func TestDebugWriteLogToFile(t *testing.T) {
-	tmpfile, err := ioutil.TempFile("", "")
-	assert.NoError(t, err)
-	defer func() { os.Remove(tmpfile.Name()) }()
-
-	SetupLogging(true, false, tmpfile.Name())
-	log.Printf("D! TEST")
-
-	f, err := ioutil.ReadFile(tmpfile.Name())
-	assert.NoError(t, err)
-	assert.Equal(t, f[19:], []byte("Z D! TEST\n"))
-}
-
-func TestErrorWriteLogToFile(t *testing.T) {
-	tmpfile, err := ioutil.TempFile("", "")
-	assert.NoError(t, err)
-	defer func() { os.Remove(tmpfile.Name()) }()
-
-	SetupLogging(false, true, tmpfile.Name())
-	log.Printf("E! TEST")
-	log.Printf("I! TEST") // <- should be ignored
-
-	f, err := ioutil.ReadFile(tmpfile.Name())
-	assert.NoError(t, err)
-	assert.Equal(t, f[19:], []byte("Z E! TEST\n"))
-}
-
-func TestAddDefaultLogLevel(t *testing.T) {
-	tmpfile, err := ioutil.TempFile("", "")
-	assert.NoError(t, err)
-	defer func() { os.Remove(tmpfile.Name()) }()
-
-	SetupLogging(true, false, tmpfile.Name())
-	log.Printf("TEST")
-
-	f, err := ioutil.ReadFile(tmpfile.Name())
-	assert.NoError(t, err)
-	assert.Equal(t, f[19:], []byte("Z I! TEST\n"))
-}
-
-func BenchmarkTelegrafLogWrite(b *testing.B) {
-	var msg = []byte("test")
-	var buf bytes.Buffer
-	w := newTelegrafWriter(&buf)
-	for i := 0; i < b.N; i++ {
-		buf.Reset()
-		w.Write(msg)
-	}
-}
--- a/metric.go
+++ b/metric.go
@@ -2,63 +2,93 @@ package telegraf

 import (
 	"time"
-)

-// ValueType is an enumeration of metric types that represent a simple value.
-type ValueType int
-
-// Possible values for the ValueType enum.
-const (
-	_ ValueType = iota
-	Counter
-	Gauge
-	Untyped
-	Summary
-	Histogram
+	"github.com/influxdata/influxdb/client/v2"
 )

 type Metric interface {
-	// Serialize serializes the metric into a line-protocol byte buffer,
-	// including a newline at the end.
-	Serialize() []byte
-	// same as Serialize, but avoids an allocation.
-	// returns number of bytes copied into dst.
-	SerializeTo(dst []byte) int
-	// String is the same as Serialize, but returns a string.
-	String() string
-	// Copy deep-copies the metric.
-	Copy() Metric
-	// Split will attempt to return multiple metrics with the same timestamp
-	// whose string representations are no longer than maxSize.
-	// Metrics with a single field may exceed the requested size.
-	Split(maxSize int) []Metric
-
-	// Tag functions
-	HasTag(key string) bool
-	AddTag(key, value string)
-	RemoveTag(key string)
-
-	// Field functions
-	HasField(key string) bool
-	AddField(key string, value interface{})
-	RemoveField(key string) error
-
-	// Name functions
-	SetName(name string)
-	SetPrefix(prefix string)
-	SetSuffix(suffix string)
-
-	// Getting data structure functions
+	// Name returns the measurement name of the metric
 	Name() string
-	Tags() map[string]string
-	Fields() map[string]interface{}
-	Time() time.Time
-	UnixNano() int64
-	Type() ValueType
-	Len() int // returns the length of the serialized metric, including newline
-	HashID() uint64

-	// aggregator things:
-	SetAggregate(bool)
-	IsAggregate() bool
+	// 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/escape.go
+++ b/metric/escape.go
@@ -1,55 +0,0 @@
-package metric
-
-import (
-	"strings"
-)
-
-var (
-	// escaper is for escaping:
-	//   - tag keys
-	//   - tag values
-	//   - field keys
-	// see https://docs.influxdata.com/influxdb/v1.0/write_protocols/line_protocol_tutorial/#special-characters-and-keywords
-	escaper   = strings.NewReplacer(`,`, `\,`, `"`, `\"`, ` `, `\ `, `=`, `\=`)
-	unEscaper = strings.NewReplacer(`\,`, `,`, `\"`, `"`, `\ `, ` `, `\=`, `=`)
-
-	// nameEscaper is for escaping measurement names only.
-	// see https://docs.influxdata.com/influxdb/v1.0/write_protocols/line_protocol_tutorial/#special-characters-and-keywords
-	nameEscaper   = strings.NewReplacer(`,`, `\,`, ` `, `\ `)
-	nameUnEscaper = strings.NewReplacer(`\,`, `,`, `\ `, ` `)
-
-	// stringFieldEscaper is for escaping string field values only.
-	// see https://docs.influxdata.com/influxdb/v1.0/write_protocols/line_protocol_tutorial/#special-characters-and-keywords
-	stringFieldEscaper = strings.NewReplacer(
-		`"`, `\"`,
-		`\`, `\\`,
-	)
-	stringFieldUnEscaper = strings.NewReplacer(
-		`\"`, `"`,
-		`\\`, `\`,
-	)
-)
-
-func escape(s string, t string) string {
-	switch t {
-	case "fieldkey", "tagkey", "tagval":
-		return escaper.Replace(s)
-	case "name":
-		return nameEscaper.Replace(s)
-	case "fieldval":
-		return stringFieldEscaper.Replace(s)
-	}
-	return s
-}
-
-func unescape(s string, t string) string {
-	switch t {
-	case "fieldkey", "tagkey", "tagval":
-		return unEscaper.Replace(s)
-	case "name":
-		return nameUnEscaper.Replace(s)
-	case "fieldval":
-		return stringFieldUnEscaper.Replace(s)
-	}
-	return s
-}
--- a/metric/inline_strconv_parse.go
+++ b/metric/inline_strconv_parse.go
@@ -1,38 +0,0 @@
-package metric
-
-import (
-	"reflect"
-	"strconv"
-	"unsafe"
-)
-
-// parseIntBytes is a zero-alloc wrapper around strconv.ParseInt.
-func parseIntBytes(b []byte, base int, bitSize int) (i int64, err error) {
-	s := unsafeBytesToString(b)
-	return strconv.ParseInt(s, base, bitSize)
-}
-
-// parseFloatBytes is a zero-alloc wrapper around strconv.ParseFloat.
-func parseFloatBytes(b []byte, bitSize int) (float64, error) {
-	s := unsafeBytesToString(b)
-	return strconv.ParseFloat(s, bitSize)
-}
-
-// parseBoolBytes is a zero-alloc wrapper around strconv.ParseBool.
-func parseBoolBytes(b []byte) (bool, error) {
-	return strconv.ParseBool(unsafeBytesToString(b))
-}
-
-// unsafeBytesToString converts a []byte to a string without a heap allocation.
-//
-// It is unsafe, and is intended to prepare input to short-lived functions
-// that require strings.
-func unsafeBytesToString(in []byte) string {
-	src := *(*reflect.SliceHeader)(unsafe.Pointer(&in))
-	dst := reflect.StringHeader{
-		Data: src.Data,
-		Len:  src.Len,
-	}
-	s := *(*string)(unsafe.Pointer(&dst))
-	return s
-}
--- a/metric/inline_strconv_parse_test.go
+++ b/metric/inline_strconv_parse_test.go
@@ -1,103 +0,0 @@
-package metric
-
-import (
-	"strconv"
-	"testing"
-	"testing/quick"
-)
-
-func TestParseIntBytesEquivalenceFuzz(t *testing.T) {
-	f := func(b []byte, base int, bitSize int) bool {
-		exp, expErr := strconv.ParseInt(string(b), base, bitSize)
-		got, gotErr := parseIntBytes(b, base, bitSize)
-
-		return exp == got && checkErrs(expErr, gotErr)
-	}
-
-	cfg := &quick.Config{
-		MaxCount: 10000,
-	}
-
-	if err := quick.Check(f, cfg); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestParseIntBytesValid64bitBase10EquivalenceFuzz(t *testing.T) {
-	buf := []byte{}
-	f := func(n int64) bool {
-		buf = strconv.AppendInt(buf[:0], n, 10)
-
-		exp, expErr := strconv.ParseInt(string(buf), 10, 64)
-		got, gotErr := parseIntBytes(buf, 10, 64)
-
-		return exp == got && checkErrs(expErr, gotErr)
-	}
-
-	cfg := &quick.Config{
-		MaxCount: 10000,
-	}
-
-	if err := quick.Check(f, cfg); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestParseFloatBytesEquivalenceFuzz(t *testing.T) {
-	f := func(b []byte, bitSize int) bool {
-		exp, expErr := strconv.ParseFloat(string(b), bitSize)
-		got, gotErr := parseFloatBytes(b, bitSize)
-
-		return exp == got && checkErrs(expErr, gotErr)
-	}
-
-	cfg := &quick.Config{
-		MaxCount: 10000,
-	}
-
-	if err := quick.Check(f, cfg); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestParseFloatBytesValid64bitEquivalenceFuzz(t *testing.T) {
-	buf := []byte{}
-	f := func(n float64) bool {
-		buf = strconv.AppendFloat(buf[:0], n, 'f', -1, 64)
-
-		exp, expErr := strconv.ParseFloat(string(buf), 64)
-		got, gotErr := parseFloatBytes(buf, 64)
-
-		return exp == got && checkErrs(expErr, gotErr)
-	}
-
-	cfg := &quick.Config{
-		MaxCount: 10000,
-	}
-
-	if err := quick.Check(f, cfg); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestParseBoolBytesEquivalence(t *testing.T) {
-	var buf []byte
-	for _, s := range []string{"1", "t", "T", "TRUE", "true", "True", "0", "f", "F", "FALSE", "false", "False", "fail", "TrUe", "FAlSE", "numbers", ""} {
-		buf = append(buf[:0], s...)
-
-		exp, expErr := strconv.ParseBool(s)
-		got, gotErr := parseBoolBytes(buf)
-
-		if got != exp || !checkErrs(expErr, gotErr) {
-			t.Errorf("Failed to parse boolean value %q correctly: wanted (%t, %v), got (%t, %v)", s, exp, expErr, got, gotErr)
-		}
-	}
-}
-
-func checkErrs(a, b error) bool {
-	if (a == nil) != (b == nil) {
-		return false
-	}
-
-	return a == nil || a.Error() == b.Error()
-}
--- a/metric/metric.go
+++ b/metric/metric.go
@@ -1,623 +0,0 @@
-package metric
-
-import (
-	"bytes"
-	"fmt"
-	"hash/fnv"
-	"sort"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/influxdata/telegraf"
-)
-
-const MaxInt = int(^uint(0) >> 1)
-
-func New(
-	name string,
-	tags map[string]string,
-	fields map[string]interface{},
-	t time.Time,
-	mType ...telegraf.ValueType,
-) (telegraf.Metric, error) {
-	if len(name) == 0 {
-		return nil, fmt.Errorf("missing measurement name")
-	}
-	if len(fields) == 0 {
-		return nil, fmt.Errorf("%s: must have one or more fields", name)
-	}
-	if strings.HasSuffix(name, `\`) {
-		return nil, fmt.Errorf("%s: measurement name cannot end with a backslash", name)
-	}
-
-	var thisType telegraf.ValueType
-	if len(mType) > 0 {
-		thisType = mType[0]
-	} else {
-		thisType = telegraf.Untyped
-	}
-
-	m := &metric{
-		name:  []byte(escape(name, "name")),
-		t:     []byte(fmt.Sprint(t.UnixNano())),
-		nsec:  t.UnixNano(),
-		mType: thisType,
-	}
-
-	// pre-allocate exact size of the tags slice
-	taglen := 0
-	for k, v := range tags {
-		if strings.HasSuffix(k, `\`) {
-			return nil, fmt.Errorf("%s: tag key cannot end with a backslash: %s", name, k)
-		}
-		if strings.HasSuffix(v, `\`) {
-			return nil, fmt.Errorf("%s: tag value cannot end with a backslash: %s", name, v)
-		}
-
-		if len(k) == 0 || len(v) == 0 {
-			continue
-		}
-		taglen += 2 + len(escape(k, "tagkey")) + len(escape(v, "tagval"))
-	}
-	m.tags = make([]byte, taglen)
-
-	i := 0
-	for k, v := range tags {
-		if len(k) == 0 || len(v) == 0 {
-			continue
-		}
-		m.tags[i] = ','
-		i++
-		i += copy(m.tags[i:], escape(k, "tagkey"))
-		m.tags[i] = '='
-		i++
-		i += copy(m.tags[i:], escape(v, "tagval"))
-	}
-
-	// pre-allocate capacity of the fields slice
-	fieldlen := 0
-	for k, _ := range fields {
-		if strings.HasSuffix(k, `\`) {
-			return nil, fmt.Errorf("%s: field key cannot end with a backslash: %s", name, k)
-		}
-
-		// 10 bytes is completely arbitrary, but will at least prevent some
-		// amount of allocations. There's a small possibility this will create
-		// slightly more allocations for a metric that has many short fields.
-		fieldlen += len(k) + 10
-	}
-	m.fields = make([]byte, 0, fieldlen)
-
-	i = 0
-	for k, v := range fields {
-		if i != 0 {
-			m.fields = append(m.fields, ',')
-		}
-		m.fields = appendField(m.fields, k, v)
-		i++
-	}
-
-	return m, nil
-}
-
-// indexUnescapedByte finds the index of the first byte equal to b in buf that
-// is not escaped.  Does not allow the escape char to be escaped. Returns -1 if
-// not found.
-func indexUnescapedByte(buf []byte, b byte) int {
-	var keyi int
-	for {
-		i := bytes.IndexByte(buf[keyi:], b)
-		if i == -1 {
-			return -1
-		} else if i == 0 {
-			break
-		}
-		keyi += i
-		if buf[keyi-1] != '\\' {
-			break
-		} else {
-			keyi++
-		}
-	}
-	return keyi
-}
-
-// indexUnescapedByteBackslashEscaping finds the index of the first byte equal
-// to b in buf that is not escaped.  Allows for the escape char `\` to be
-// escaped.  Returns -1 if not found.
-func indexUnescapedByteBackslashEscaping(buf []byte, b byte) int {
-	var keyi int
-	for {
-		i := bytes.IndexByte(buf[keyi:], b)
-		if i == -1 {
-			return -1
-		} else if i == 0 {
-			break
-		}
-		keyi += i
-		if countBackslashes(buf, keyi-1)%2 == 0 {
-			break
-		} else {
-			keyi++
-		}
-	}
-	return keyi
-}
-
-// countBackslashes counts the number of preceding backslashes starting at
-// the 'start' index.
-func countBackslashes(buf []byte, index int) int {
-	var count int
-	for {
-		if index < 0 {
-			return count
-		}
-		if buf[index] == '\\' {
-			count++
-			index--
-		} else {
-			break
-		}
-	}
-	return count
-}
-
-type metric struct {
-	name   []byte
-	tags   []byte
-	fields []byte
-	t      []byte
-
-	mType     telegraf.ValueType
-	aggregate bool
-
-	// cached values for reuse in "get" functions
-	hashID uint64
-	nsec   int64
-}
-
-func (m *metric) String() string {
-	return string(m.name) + string(m.tags) + " " + string(m.fields) + " " + string(m.t) + "\n"
-}
-
-func (m *metric) SetAggregate(b bool) {
-	m.aggregate = b
-}
-
-func (m *metric) IsAggregate() bool {
-	return m.aggregate
-}
-
-func (m *metric) Type() telegraf.ValueType {
-	return m.mType
-}
-
-func (m *metric) Len() int {
-	// 3 is for 2 spaces surrounding the fields array + newline at the end.
-	return len(m.name) + len(m.tags) + len(m.fields) + len(m.t) + 3
-}
-
-func (m *metric) Serialize() []byte {
-	tmp := make([]byte, m.Len())
-	i := 0
-	i += copy(tmp[i:], m.name)
-	i += copy(tmp[i:], m.tags)
-	tmp[i] = ' '
-	i++
-	i += copy(tmp[i:], m.fields)
-	tmp[i] = ' '
-	i++
-	i += copy(tmp[i:], m.t)
-	tmp[i] = '\n'
-	return tmp
-}
-
-func (m *metric) SerializeTo(dst []byte) int {
-	i := 0
-	if i >= len(dst) {
-		return i
-	}
-
-	i += copy(dst[i:], m.name)
-	if i >= len(dst) {
-		return i
-	}
-
-	i += copy(dst[i:], m.tags)
-	if i >= len(dst) {
-		return i
-	}
-
-	dst[i] = ' '
-	i++
-	if i >= len(dst) {
-		return i
-	}
-
-	i += copy(dst[i:], m.fields)
-	if i >= len(dst) {
-		return i
-	}
-
-	dst[i] = ' '
-	i++
-	if i >= len(dst) {
-		return i
-	}
-
-	i += copy(dst[i:], m.t)
-	if i >= len(dst) {
-		return i
-	}
-	dst[i] = '\n'
-
-	return i + 1
-}
-
-func (m *metric) Split(maxSize int) []telegraf.Metric {
-	if m.Len() <= maxSize {
-		return []telegraf.Metric{m}
-	}
-	var out []telegraf.Metric
-
-	// constant number of bytes for each metric (in addition to field bytes)
-	constant := len(m.name) + len(m.tags) + len(m.t) + 3
-	// currently selected fields
-	fields := make([]byte, 0, maxSize)
-
-	i := 0
-	for {
-		if i >= len(m.fields) {
-			// hit the end of the field byte slice
-			if len(fields) > 0 {
-				out = append(out, copyWith(m.name, m.tags, fields, m.t))
-			}
-			break
-		}
-
-		// find the end of the next field
-		j := indexUnescapedByte(m.fields[i:], ',')
-		if j == -1 {
-			j = len(m.fields)
-		} else {
-			j += i
-		}
-
-		// if true, then we need to create a metric _not_ including the currently
-		// selected field
-		if len(m.fields[i:j])+len(fields)+constant >= maxSize {
-			// if false, then we'll create a metric including the currently
-			// selected field anyways. This means that the given maxSize is too
-			// small for a single field to fit.
-			if len(fields) > 0 {
-				out = append(out, copyWith(m.name, m.tags, fields, m.t))
-			}
-
-			fields = make([]byte, 0, maxSize)
-		}
-		if len(fields) > 0 {
-			fields = append(fields, ',')
-		}
-		fields = append(fields, m.fields[i:j]...)
-
-		i = j + 1
-	}
-	return out
-}
-
-func (m *metric) Fields() map[string]interface{} {
-	fieldMap := map[string]interface{}{}
-	i := 0
-	for {
-		if i >= len(m.fields) {
-			break
-		}
-		// end index of field key
-		i1 := indexUnescapedByte(m.fields[i:], '=')
-		if i1 == -1 {
-			break
-		}
-		// start index of field value
-		i2 := i1 + 1
-
-		// end index of field value
-		var i3 int
-		if m.fields[i:][i2] == '"' {
-			i3 = indexUnescapedByteBackslashEscaping(m.fields[i:][i2+1:], '"')
-			if i3 == -1 {
-				i3 = len(m.fields[i:])
-			}
-			i3 += i2 + 2 // increment index to the comma
-		} else {
-			i3 = indexUnescapedByte(m.fields[i:], ',')
-			if i3 == -1 {
-				i3 = len(m.fields[i:])
-			}
-		}
-
-		switch m.fields[i:][i2] {
-		case '"':
-			// string field
-			fieldMap[unescape(string(m.fields[i:][0:i1]), "fieldkey")] = unescape(string(m.fields[i:][i2+1:i3-1]), "fieldval")
-		case '-', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9':
-			// number field
-			switch m.fields[i:][i3-1] {
-			case 'i':
-				// integer field
-				n, err := parseIntBytes(m.fields[i:][i2:i3-1], 10, 64)
-				if err == nil {
-					fieldMap[unescape(string(m.fields[i:][0:i1]), "fieldkey")] = n
-				} else {
-					// TODO handle error or just ignore field silently?
-				}
-			default:
-				// float field
-				n, err := parseFloatBytes(m.fields[i:][i2:i3], 64)
-				if err == nil {
-					fieldMap[unescape(string(m.fields[i:][0:i1]), "fieldkey")] = n
-				} else {
-					// TODO handle error or just ignore field silently?
-				}
-			}
-		case 'T', 't':
-			fieldMap[unescape(string(m.fields[i:][0:i1]), "fieldkey")] = true
-		case 'F', 'f':
-			fieldMap[unescape(string(m.fields[i:][0:i1]), "fieldkey")] = false
-		default:
-			// TODO handle unsupported field type
-		}
-
-		i += i3 + 1
-	}
-
-	return fieldMap
-}
-
-func (m *metric) Tags() map[string]string {
-	tagMap := map[string]string{}
-	if len(m.tags) == 0 {
-		return tagMap
-	}
-
-	i := 0
-	for {
-		// start index of tag key
-		i0 := indexUnescapedByte(m.tags[i:], ',') + 1
-		if i0 == 0 {
-			// didn't find a tag start
-			break
-		}
-		// end index of tag key
-		i1 := indexUnescapedByte(m.tags[i:], '=')
-		// start index of tag value
-		i2 := i1 + 1
-		// end index of tag value (starting from i2)
-		i3 := indexUnescapedByte(m.tags[i+i2:], ',')
-		if i3 == -1 {
-			tagMap[unescape(string(m.tags[i:][i0:i1]), "tagkey")] = unescape(string(m.tags[i:][i2:]), "tagval")
-			break
-		}
-		tagMap[unescape(string(m.tags[i:][i0:i1]), "tagkey")] = unescape(string(m.tags[i:][i2:i2+i3]), "tagval")
-		// increment start index for the next tag
-		i += i2 + i3
-	}
-
-	return tagMap
-}
-
-func (m *metric) Name() string {
-	return unescape(string(m.name), "name")
-}
-
-func (m *metric) Time() time.Time {
-	// assume metric has been verified already and ignore error:
-	if m.nsec == 0 {
-		m.nsec, _ = parseIntBytes(m.t, 10, 64)
-	}
-	return time.Unix(0, m.nsec)
-}
-
-func (m *metric) UnixNano() int64 {
-	// assume metric has been verified already and ignore error:
-	if m.nsec == 0 {
-		m.nsec, _ = parseIntBytes(m.t, 10, 64)
-	}
-	return m.nsec
-}
-
-func (m *metric) SetName(name string) {
-	m.hashID = 0
-	m.name = []byte(nameEscaper.Replace(name))
-}
-
-func (m *metric) SetPrefix(prefix string) {
-	m.hashID = 0
-	m.name = append([]byte(nameEscaper.Replace(prefix)), m.name...)
-}
-
-func (m *metric) SetSuffix(suffix string) {
-	m.hashID = 0
-	m.name = append(m.name, []byte(nameEscaper.Replace(suffix))...)
-}
-
-func (m *metric) AddTag(key, value string) {
-	m.RemoveTag(key)
-	m.tags = append(m.tags, []byte(","+escape(key, "tagkey")+"="+escape(value, "tagval"))...)
-}
-
-func (m *metric) HasTag(key string) bool {
-	i := bytes.Index(m.tags, []byte(escape(key, "tagkey")+"="))
-	if i == -1 {
-		return false
-	}
-	return true
-}
-
-func (m *metric) RemoveTag(key string) {
-	m.hashID = 0
-
-	i := bytes.Index(m.tags, []byte(escape(key, "tagkey")+"="))
-	if i == -1 {
-		return
-	}
-
-	tmp := m.tags[0 : i-1]
-	j := indexUnescapedByte(m.tags[i:], ',')
-	if j != -1 {
-		tmp = append(tmp, m.tags[i+j:]...)
-	}
-	m.tags = tmp
-	return
-}
-
-func (m *metric) AddField(key string, value interface{}) {
-	m.fields = append(m.fields, ',')
-	m.fields = appendField(m.fields, key, value)
-}
-
-func (m *metric) HasField(key string) bool {
-	i := bytes.Index(m.fields, []byte(escape(key, "tagkey")+"="))
-	if i == -1 {
-		return false
-	}
-	return true
-}
-
-func (m *metric) RemoveField(key string) error {
-	i := bytes.Index(m.fields, []byte(escape(key, "tagkey")+"="))
-	if i == -1 {
-		return nil
-	}
-
-	var tmp []byte
-	if i != 0 {
-		tmp = m.fields[0 : i-1]
-	}
-	j := indexUnescapedByte(m.fields[i:], ',')
-	if j != -1 {
-		tmp = append(tmp, m.fields[i+j:]...)
-	}
-
-	if len(tmp) == 0 {
-		return fmt.Errorf("Metric cannot remove final field: %s", m.fields)
-	}
-
-	m.fields = tmp
-	return nil
-}
-
-func (m *metric) Copy() telegraf.Metric {
-	return copyWith(m.name, m.tags, m.fields, m.t)
-}
-
-func copyWith(name, tags, fields, t []byte) telegraf.Metric {
-	out := metric{
-		name:   make([]byte, len(name)),
-		tags:   make([]byte, len(tags)),
-		fields: make([]byte, len(fields)),
-		t:      make([]byte, len(t)),
-	}
-	copy(out.name, name)
-	copy(out.tags, tags)
-	copy(out.fields, fields)
-	copy(out.t, t)
-	return &out
-}
-
-func (m *metric) HashID() uint64 {
-	if m.hashID == 0 {
-		h := fnv.New64a()
-		h.Write(m.name)
-
-		tags := m.Tags()
-		tmp := make([]string, len(tags))
-		i := 0
-		for k, v := range tags {
-			tmp[i] = k + v
-			i++
-		}
-		sort.Strings(tmp)
-
-		for _, s := range tmp {
-			h.Write([]byte(s))
-		}
-
-		m.hashID = h.Sum64()
-	}
-	return m.hashID
-}
-
-func appendField(b []byte, k string, v interface{}) []byte {
-	if v == nil {
-		return b
-	}
-	b = append(b, []byte(escape(k, "tagkey")+"=")...)
-
-	// check popular types first
-	switch v := v.(type) {
-	case float64:
-		b = strconv.AppendFloat(b, v, 'f', -1, 64)
-	case int64:
-		b = strconv.AppendInt(b, v, 10)
-		b = append(b, 'i')
-	case string:
-		b = append(b, '"')
-		b = append(b, []byte(escape(v, "fieldval"))...)
-		b = append(b, '"')
-	case bool:
-		b = strconv.AppendBool(b, v)
-	case int32:
-		b = strconv.AppendInt(b, int64(v), 10)
-		b = append(b, 'i')
-	case int16:
-		b = strconv.AppendInt(b, int64(v), 10)
-		b = append(b, 'i')
-	case int8:
-		b = strconv.AppendInt(b, int64(v), 10)
-		b = append(b, 'i')
-	case int:
-		b = strconv.AppendInt(b, int64(v), 10)
-		b = append(b, 'i')
-	case uint64:
-		// Cap uints above the maximum int value
-		var intv int64
-		if v <= uint64(MaxInt) {
-			intv = int64(v)
-		} else {
-			intv = int64(MaxInt)
-		}
-		b = strconv.AppendInt(b, intv, 10)
-		b = append(b, 'i')
-	case uint32:
-		b = strconv.AppendInt(b, int64(v), 10)
-		b = append(b, 'i')
-	case uint16:
-		b = strconv.AppendInt(b, int64(v), 10)
-		b = append(b, 'i')
-	case uint8:
-		b = strconv.AppendInt(b, int64(v), 10)
-		b = append(b, 'i')
-	case uint:
-		// Cap uints above the maximum int value
-		var intv int64
-		if v <= uint(MaxInt) {
-			intv = int64(v)
-		} else {
-			intv = int64(MaxInt)
-		}
-		b = strconv.AppendInt(b, intv, 10)
-		b = append(b, 'i')
-	case float32:
-		b = strconv.AppendFloat(b, float64(v), 'f', -1, 32)
-	case []byte:
-		b = append(b, v...)
-	default:
-		// Can't determine the type, so convert to string
-		b = append(b, '"')
-		b = append(b, []byte(escape(fmt.Sprintf("%v", v), "fieldval"))...)
-		b = append(b, '"')
-	}
-
-	return b
-}
--- a/metric/metric_benchmark_test.go
+++ b/metric/metric_benchmark_test.go
@@ -1,148 +0,0 @@
-package metric
-
-import (
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/influxdata/telegraf"
-)
-
-// vars for making sure that the compiler doesnt optimize out the benchmarks:
-var (
-	s      string
-	I      interface{}
-	tags   map[string]string
-	fields map[string]interface{}
-)
-
-func BenchmarkNewMetric(b *testing.B) {
-	var mt telegraf.Metric
-	for n := 0; n < b.N; n++ {
-		mt, _ = New("test_metric",
-			map[string]string{
-				"test_tag_1": "tag_value_1",
-				"test_tag_2": "tag_value_2",
-				"test_tag_3": "tag_value_3",
-			},
-			map[string]interface{}{
-				"string_field": "string",
-				"int_field":    int64(1000),
-				"float_field":  float64(2.1),
-			},
-			time.Now(),
-		)
-	}
-	s = string(mt.String())
-}
-
-func BenchmarkAddTag(b *testing.B) {
-	var mt telegraf.Metric
-	mt = &metric{
-		name:   []byte("cpu"),
-		tags:   []byte(",host=localhost"),
-		fields: []byte("a=101"),
-		t:      []byte("1480614053000000000"),
-	}
-	for n := 0; n < b.N; n++ {
-		mt.AddTag("foo", "bar")
-	}
-	s = string(mt.String())
-}
-
-func BenchmarkSplit(b *testing.B) {
-	var mt telegraf.Metric
-	mt = &metric{
-		name:   []byte("cpu"),
-		tags:   []byte(",host=localhost"),
-		fields: []byte("a=101,b=10i,c=10101,d=101010,e=42"),
-		t:      []byte("1480614053000000000"),
-	}
-	var metrics []telegraf.Metric
-	for n := 0; n < b.N; n++ {
-		metrics = mt.Split(60)
-	}
-	s = string(metrics[0].String())
-}
-
-func BenchmarkTags(b *testing.B) {
-	for n := 0; n < b.N; n++ {
-		var mt, _ = New("test_metric",
-			map[string]string{
-				"test_tag_1": "tag_value_1",
-				"test_tag_2": "tag_value_2",
-				"test_tag_3": "tag_value_3",
-			},
-			map[string]interface{}{
-				"string_field": "string",
-				"int_field":    int64(1000),
-				"float_field":  float64(2.1),
-			},
-			time.Now(),
-		)
-		tags = mt.Tags()
-	}
-	s = fmt.Sprint(tags)
-}
-
-func BenchmarkFields(b *testing.B) {
-	for n := 0; n < b.N; n++ {
-		var mt, _ = New("test_metric",
-			map[string]string{
-				"test_tag_1": "tag_value_1",
-				"test_tag_2": "tag_value_2",
-				"test_tag_3": "tag_value_3",
-			},
-			map[string]interface{}{
-				"string_field": "string",
-				"int_field":    int64(1000),
-				"float_field":  float64(2.1),
-			},
-			time.Now(),
-		)
-		fields = mt.Fields()
-	}
-	s = fmt.Sprint(fields)
-}
-
-func BenchmarkString(b *testing.B) {
-	mt, _ := New("test_metric",
-		map[string]string{
-			"test_tag_1": "tag_value_1",
-			"test_tag_2": "tag_value_2",
-			"test_tag_3": "tag_value_3",
-		},
-		map[string]interface{}{
-			"string_field": "string",
-			"int_field":    int64(1000),
-			"float_field":  float64(2.1),
-		},
-		time.Now(),
-	)
-	var S string
-	for n := 0; n < b.N; n++ {
-		S = mt.String()
-	}
-	s = S
-}
-
-func BenchmarkSerialize(b *testing.B) {
-	mt, _ := New("test_metric",
-		map[string]string{
-			"test_tag_1": "tag_value_1",
-			"test_tag_2": "tag_value_2",
-			"test_tag_3": "tag_value_3",
-		},
-		map[string]interface{}{
-			"string_field": "string",
-			"int_field":    int64(1000),
-			"float_field":  float64(2.1),
-		},
-		time.Now(),
-	)
-	var B []byte
-	for n := 0; n < b.N; n++ {
-		B = mt.Serialize()
-	}
-	s = string(B)
-}
--- a/metric/metric_test.go
+++ b/metric/metric_test.go
@@ -1,737 +0,0 @@
-package metric
-
-import (
-	"fmt"
-	"math"
-	"regexp"
-	"testing"
-	"time"
-
-	"github.com/influxdata/telegraf"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-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 := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-
-	assert.Equal(t, telegraf.Untyped, m.Type())
-	assert.Equal(t, tags, m.Tags())
-	assert.Equal(t, fields, m.Fields())
-	assert.Equal(t, "cpu", m.Name())
-	assert.Equal(t, now.UnixNano(), m.Time().UnixNano())
-	assert.Equal(t, now.UnixNano(), m.UnixNano())
-}
-
-func TestNewErrors(t *testing.T) {
-	// creating a metric with an empty name produces an error:
-	m, err := New(
-		"",
-		map[string]string{
-			"datacenter": "us-east-1",
-			"mytag":      "foo",
-			"another":    "tag",
-		},
-		map[string]interface{}{
-			"value": float64(1),
-		},
-		time.Now(),
-	)
-	assert.Error(t, err)
-	assert.Nil(t, m)
-
-	// creating a metric with empty fields produces an error:
-	m, err = New(
-		"foobar",
-		map[string]string{
-			"datacenter": "us-east-1",
-			"mytag":      "foo",
-			"another":    "tag",
-		},
-		map[string]interface{}{},
-		time.Now(),
-	)
-	assert.Error(t, err)
-	assert.Nil(t, m)
-}
-
-func TestNewMetric_Tags(t *testing.T) {
-	now := time.Now()
-	tags := map[string]string{
-		"host":       "localhost",
-		"datacenter": "us-east-1",
-	}
-	fields := map[string]interface{}{
-		"value": float64(1),
-	}
-	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-
-	assert.True(t, m.HasTag("host"))
-	assert.True(t, m.HasTag("datacenter"))
-
-	m.AddTag("newtag", "foo")
-	assert.True(t, m.HasTag("newtag"))
-
-	m.RemoveTag("host")
-	assert.False(t, m.HasTag("host"))
-	assert.True(t, m.HasTag("newtag"))
-	assert.True(t, m.HasTag("datacenter"))
-
-	m.RemoveTag("datacenter")
-	assert.False(t, m.HasTag("datacenter"))
-	assert.True(t, m.HasTag("newtag"))
-	assert.Equal(t, map[string]string{"newtag": "foo"}, m.Tags())
-
-	m.RemoveTag("newtag")
-	assert.False(t, m.HasTag("newtag"))
-	assert.Equal(t, map[string]string{}, m.Tags())
-
-	assert.Equal(t, "cpu value=1 "+fmt.Sprint(now.UnixNano())+"\n", m.String())
-}
-
-func TestSerialize(t *testing.T) {
-	now := time.Now()
-	tags := map[string]string{
-		"datacenter": "us-east-1",
-	}
-	fields := map[string]interface{}{
-		"value": float64(1),
-	}
-	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-
-	assert.Equal(t,
-		[]byte("cpu,datacenter=us-east-1 value=1 "+fmt.Sprint(now.UnixNano())+"\n"),
-		m.Serialize())
-
-	m.RemoveTag("datacenter")
-	assert.Equal(t,
-		[]byte("cpu value=1 "+fmt.Sprint(now.UnixNano())+"\n"),
-		m.Serialize())
-}
-
-func TestHashID(t *testing.T) {
-	m, _ := New(
-		"cpu",
-		map[string]string{
-			"datacenter": "us-east-1",
-			"mytag":      "foo",
-			"another":    "tag",
-		},
-		map[string]interface{}{
-			"value": float64(1),
-		},
-		time.Now(),
-	)
-	hash := m.HashID()
-
-	// adding a field doesn't change the hash:
-	m.AddField("foo", int64(100))
-	assert.Equal(t, hash, m.HashID())
-
-	// removing a non-existent tag doesn't change the hash:
-	m.RemoveTag("no-op")
-	assert.Equal(t, hash, m.HashID())
-
-	// adding a tag does change it:
-	m.AddTag("foo", "bar")
-	assert.NotEqual(t, hash, m.HashID())
-	hash = m.HashID()
-
-	// removing a tag also changes it:
-	m.RemoveTag("mytag")
-	assert.NotEqual(t, hash, m.HashID())
-}
-
-func TestHashID_Consistency(t *testing.T) {
-	m, _ := New(
-		"cpu",
-		map[string]string{
-			"datacenter": "us-east-1",
-			"mytag":      "foo",
-			"another":    "tag",
-		},
-		map[string]interface{}{
-			"value": float64(1),
-		},
-		time.Now(),
-	)
-	hash := m.HashID()
-
-	for i := 0; i < 1000; i++ {
-		m2, _ := New(
-			"cpu",
-			map[string]string{
-				"datacenter": "us-east-1",
-				"mytag":      "foo",
-				"another":    "tag",
-			},
-			map[string]interface{}{
-				"value": float64(1),
-			},
-			time.Now(),
-		)
-		assert.Equal(t, hash, m2.HashID())
-	}
-}
-
-func TestNewMetric_NameModifiers(t *testing.T) {
-	now := time.Now()
-	tags := map[string]string{}
-	fields := map[string]interface{}{
-		"value": float64(1),
-	}
-	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-
-	hash := m.HashID()
-	suffix := fmt.Sprintf(" value=1 %d\n", now.UnixNano())
-	assert.Equal(t, "cpu"+suffix, m.String())
-
-	m.SetPrefix("pre_")
-	assert.NotEqual(t, hash, m.HashID())
-	hash = m.HashID()
-	assert.Equal(t, "pre_cpu"+suffix, m.String())
-
-	m.SetSuffix("_post")
-	assert.NotEqual(t, hash, m.HashID())
-	hash = m.HashID()
-	assert.Equal(t, "pre_cpu_post"+suffix, m.String())
-
-	m.SetName("mem")
-	assert.NotEqual(t, hash, m.HashID())
-	assert.Equal(t, "mem"+suffix, m.String())
-}
-
-func TestNewMetric_FieldModifiers(t *testing.T) {
-	now := time.Now()
-	tags := map[string]string{
-		"host": "localhost",
-	}
-	fields := map[string]interface{}{
-		"value": float64(1),
-	}
-	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-
-	assert.True(t, m.HasField("value"))
-	assert.False(t, m.HasField("foo"))
-
-	m.AddField("newfield", "foo")
-	assert.True(t, m.HasField("newfield"))
-
-	assert.NoError(t, m.RemoveField("newfield"))
-	assert.False(t, m.HasField("newfield"))
-
-	// don't allow user to remove all fields:
-	assert.Error(t, m.RemoveField("value"))
-
-	m.AddField("value2", int64(101))
-	assert.NoError(t, m.RemoveField("value"))
-	assert.False(t, m.HasField("value"))
-}
-
-func TestNewMetric_Fields(t *testing.T) {
-	now := time.Now()
-	tags := map[string]string{
-		"host": "localhost",
-	}
-	fields := map[string]interface{}{
-		"float":                  float64(1),
-		"int":                    int64(1),
-		"bool":                   true,
-		"false":                  false,
-		"string":                 "test",
-		"quote_string":           `x"y`,
-		"backslash_quote_string": `x\"y`,
-		"backslash":              `x\y`,
-		"ends_with_backslash":    `x\`,
-	}
-	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-
-	assert.Equal(t, fields, m.Fields())
-}
-
-func TestNewMetric_Time(t *testing.T) {
-	now := time.Now()
-	tags := map[string]string{
-		"host": "localhost",
-	}
-	fields := map[string]interface{}{
-		"float":  float64(1),
-		"int":    int64(1),
-		"bool":   true,
-		"false":  false,
-		"string": "test",
-	}
-	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-	m = m.Copy()
-	m2 := m.Copy()
-
-	assert.Equal(t, now.UnixNano(), m.Time().UnixNano())
-	assert.Equal(t, now.UnixNano(), m2.UnixNano())
-}
-
-func TestNewMetric_Copy(t *testing.T) {
-	now := time.Now()
-	tags := map[string]string{}
-	fields := map[string]interface{}{
-		"float": float64(1),
-	}
-	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-	m2 := m.Copy()
-
-	assert.Equal(t,
-		fmt.Sprintf("cpu float=1 %d\n", now.UnixNano()),
-		m.String())
-	m.AddTag("host", "localhost")
-	assert.Equal(t,
-		fmt.Sprintf("cpu,host=localhost float=1 %d\n", now.UnixNano()),
-		m.String())
-
-	assert.Equal(t,
-		fmt.Sprintf("cpu float=1 %d\n", now.UnixNano()),
-		m2.String())
-}
-
-func TestNewMetric_AllTypes(t *testing.T) {
-	now := time.Now()
-	tags := map[string]string{}
-	fields := map[string]interface{}{
-		"float64":     float64(1),
-		"float32":     float32(1),
-		"int64":       int64(1),
-		"int32":       int32(1),
-		"int16":       int16(1),
-		"int8":        int8(1),
-		"int":         int(1),
-		"uint64":      uint64(1),
-		"uint32":      uint32(1),
-		"uint16":      uint16(1),
-		"uint8":       uint8(1),
-		"uint":        uint(1),
-		"bytes":       []byte("foo"),
-		"nil":         nil,
-		"maxuint64":   uint64(MaxInt) + 10,
-		"maxuint":     uint(MaxInt) + 10,
-		"unsupported": []int{1, 2},
-	}
-	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-
-	assert.Contains(t, m.String(), "float64=1")
-	assert.Contains(t, m.String(), "float32=1")
-	assert.Contains(t, m.String(), "int64=1i")
-	assert.Contains(t, m.String(), "int32=1i")
-	assert.Contains(t, m.String(), "int16=1i")
-	assert.Contains(t, m.String(), "int8=1i")
-	assert.Contains(t, m.String(), "int=1i")
-	assert.Contains(t, m.String(), "uint64=1i")
-	assert.Contains(t, m.String(), "uint32=1i")
-	assert.Contains(t, m.String(), "uint16=1i")
-	assert.Contains(t, m.String(), "uint8=1i")
-	assert.Contains(t, m.String(), "uint=1i")
-	assert.NotContains(t, m.String(), "nil")
-	assert.Contains(t, m.String(), fmt.Sprintf("maxuint64=%di", MaxInt))
-	assert.Contains(t, m.String(), fmt.Sprintf("maxuint=%di", MaxInt))
-}
-
-func TestIndexUnescapedByte(t *testing.T) {
-	tests := []struct {
-		in       []byte
-		b        byte
-		expected int
-	}{
-		{
-			in:       []byte(`foobar`),
-			b:        'b',
-			expected: 3,
-		},
-		{
-			in:       []byte(`foo\bar`),
-			b:        'b',
-			expected: -1,
-		},
-		{
-			in:       []byte(`foo\\bar`),
-			b:        'b',
-			expected: -1,
-		},
-		{
-			in:       []byte(`foobar`),
-			b:        'f',
-			expected: 0,
-		},
-		{
-			in:       []byte(`foobar`),
-			b:        'r',
-			expected: 5,
-		},
-		{
-			in:       []byte(`\foobar`),
-			b:        'f',
-			expected: -1,
-		},
-	}
-
-	for _, test := range tests {
-		got := indexUnescapedByte(test.in, test.b)
-		assert.Equal(t, test.expected, got)
-	}
-}
-
-func TestNewGaugeMetric(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 := New("cpu", tags, fields, now, telegraf.Gauge)
-	assert.NoError(t, err)
-
-	assert.Equal(t, telegraf.Gauge, m.Type())
-	assert.Equal(t, tags, m.Tags())
-	assert.Equal(t, fields, m.Fields())
-	assert.Equal(t, "cpu", m.Name())
-	assert.Equal(t, now.UnixNano(), m.Time().UnixNano())
-	assert.Equal(t, now.UnixNano(), m.UnixNano())
-}
-
-func TestNewCounterMetric(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 := New("cpu", tags, fields, now, telegraf.Counter)
-	assert.NoError(t, err)
-
-	assert.Equal(t, telegraf.Counter, m.Type())
-	assert.Equal(t, tags, m.Tags())
-	assert.Equal(t, fields, m.Fields())
-	assert.Equal(t, "cpu", m.Name())
-	assert.Equal(t, now.UnixNano(), m.Time().UnixNano())
-	assert.Equal(t, now.UnixNano(), m.UnixNano())
-}
-
-// test splitting metric into various max lengths
-func TestSplitMetric(t *testing.T) {
-	now := time.Unix(0, 1480940990034083306)
-	tags := map[string]string{
-		"host": "localhost",
-	}
-	fields := map[string]interface{}{
-		"float":  float64(100001),
-		"int":    int64(100001),
-		"bool":   true,
-		"false":  false,
-		"string": "test",
-	}
-	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-
-	split80 := m.Split(80)
-	assert.Len(t, split80, 2)
-
-	split70 := m.Split(70)
-	assert.Len(t, split70, 3)
-
-	split60 := m.Split(60)
-	assert.Len(t, split60, 5)
-}
-
-// test splitting metric into various max lengths
-// use a simple regex check to verify that the split metrics are valid
-func TestSplitMetric_RegexVerify(t *testing.T) {
-	now := time.Unix(0, 1480940990034083306)
-	tags := map[string]string{
-		"host": "localhost",
-	}
-	fields := map[string]interface{}{
-		"foo":     float64(98934259085),
-		"bar":     float64(19385292),
-		"number":  float64(19385292),
-		"another": float64(19385292),
-		"n":       float64(19385292),
-	}
-	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-
-	// verification regex
-	re := regexp.MustCompile(`cpu,host=localhost \w+=\d+(,\w+=\d+)* 1480940990034083306`)
-
-	split90 := m.Split(90)
-	assert.Len(t, split90, 2)
-	for _, splitM := range split90 {
-		assert.True(t, re.Match(splitM.Serialize()), splitM.String())
-	}
-
-	split70 := m.Split(70)
-	assert.Len(t, split70, 3)
-	for _, splitM := range split70 {
-		assert.True(t, re.Match(splitM.Serialize()), splitM.String())
-	}
-
-	split20 := m.Split(20)
-	assert.Len(t, split20, 5)
-	for _, splitM := range split20 {
-		assert.True(t, re.Match(splitM.Serialize()), splitM.String())
-	}
-}
-
-// test splitting metric even when given length is shorter than
-// shortest possible length
-// Split should split metric as short as possible, ie, 1 field per metric
-func TestSplitMetric_TooShort(t *testing.T) {
-	now := time.Unix(0, 1480940990034083306)
-	tags := map[string]string{
-		"host": "localhost",
-	}
-	fields := map[string]interface{}{
-		"float":  float64(100001),
-		"int":    int64(100001),
-		"bool":   true,
-		"false":  false,
-		"string": "test",
-	}
-	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-
-	split := m.Split(10)
-	assert.Len(t, split, 5)
-	strings := make([]string, 5)
-	for i, splitM := range split {
-		strings[i] = splitM.String()
-	}
-
-	assert.Contains(t, strings, "cpu,host=localhost float=100001 1480940990034083306\n")
-	assert.Contains(t, strings, "cpu,host=localhost int=100001i 1480940990034083306\n")
-	assert.Contains(t, strings, "cpu,host=localhost bool=true 1480940990034083306\n")
-	assert.Contains(t, strings, "cpu,host=localhost false=false 1480940990034083306\n")
-	assert.Contains(t, strings, "cpu,host=localhost string=\"test\" 1480940990034083306\n")
-}
-
-func TestSplitMetric_NoOp(t *testing.T) {
-	now := time.Unix(0, 1480940990034083306)
-	tags := map[string]string{
-		"host": "localhost",
-	}
-	fields := map[string]interface{}{
-		"float":  float64(100001),
-		"int":    int64(100001),
-		"bool":   true,
-		"false":  false,
-		"string": "test",
-	}
-	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-
-	split := m.Split(1000)
-	assert.Len(t, split, 1)
-	assert.Equal(t, m, split[0])
-}
-
-func TestSplitMetric_OneField(t *testing.T) {
-	now := time.Unix(0, 1480940990034083306)
-	tags := map[string]string{
-		"host": "localhost",
-	}
-	fields := map[string]interface{}{
-		"float": float64(100001),
-	}
-	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-
-	assert.Equal(t, "cpu,host=localhost float=100001 1480940990034083306\n", m.String())
-
-	split := m.Split(1000)
-	assert.Len(t, split, 1)
-	assert.Equal(t, "cpu,host=localhost float=100001 1480940990034083306\n", split[0].String())
-
-	split = m.Split(1)
-	assert.Len(t, split, 1)
-	assert.Equal(t, "cpu,host=localhost float=100001 1480940990034083306\n", split[0].String())
-
-	split = m.Split(40)
-	assert.Len(t, split, 1)
-	assert.Equal(t, "cpu,host=localhost float=100001 1480940990034083306\n", split[0].String())
-}
-
-func TestSplitMetric_ExactSize(t *testing.T) {
-	now := time.Unix(0, 1480940990034083306)
-	tags := map[string]string{
-		"host": "localhost",
-	}
-	fields := map[string]interface{}{
-		"float":  float64(100001),
-		"int":    int64(100001),
-		"bool":   true,
-		"false":  false,
-		"string": "test",
-	}
-	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-	actual := m.Split(m.Len())
-	// check that no copy was made
-	require.Equal(t, &m, &actual[0])
-}
-
-func TestSplitMetric_NoRoomForNewline(t *testing.T) {
-	now := time.Unix(0, 1480940990034083306)
-	tags := map[string]string{
-		"host": "localhost",
-	}
-	fields := map[string]interface{}{
-		"float": float64(100001),
-		"int":   int64(100001),
-		"bool":  true,
-		"false": false,
-	}
-	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-	actual := m.Split(m.Len() - 1)
-	require.Equal(t, 2, len(actual))
-}
-
-func TestNewMetricAggregate(t *testing.T) {
-	now := time.Now()
-
-	tags := map[string]string{
-		"host": "localhost",
-	}
-	fields := map[string]interface{}{
-		"usage_idle": float64(99),
-	}
-	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-
-	assert.False(t, m.IsAggregate())
-	m.SetAggregate(true)
-	assert.True(t, m.IsAggregate())
-}
-
-func TestNewMetricString(t *testing.T) {
-	now := time.Now()
-
-	tags := map[string]string{
-		"host": "localhost",
-	}
-	fields := map[string]interface{}{
-		"usage_idle": float64(99),
-	}
-	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-
-	lineProto := fmt.Sprintf("cpu,host=localhost usage_idle=99 %d\n",
-		now.UnixNano())
-	assert.Equal(t, lineProto, m.String())
-}
-
-func TestNewMetricFailNaN(t *testing.T) {
-	now := time.Now()
-
-	tags := map[string]string{
-		"host": "localhost",
-	}
-	fields := map[string]interface{}{
-		"usage_idle": math.NaN(),
-	}
-
-	_, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-}
-
-func TestEmptyTagValueOrKey(t *testing.T) {
-	now := time.Now()
-
-	tags := map[string]string{
-		"host":     "localhost",
-		"emptytag": "",
-		"":         "valuewithoutkey",
-	}
-	fields := map[string]interface{}{
-		"usage_idle": float64(99),
-	}
-	m, err := New("cpu", tags, fields, now)
-
-	assert.True(t, m.HasTag("host"))
-	assert.False(t, m.HasTag("emptytag"))
-	assert.Equal(t,
-		fmt.Sprintf("cpu,host=localhost usage_idle=99 %d\n", now.UnixNano()),
-		m.String())
-
-	assert.NoError(t, err)
-
-}
-
-func TestNewMetric_TrailingSlash(t *testing.T) {
-	now := time.Now()
-
-	tests := []struct {
-		name   string
-		tags   map[string]string
-		fields map[string]interface{}
-	}{
-		{
-			name: `cpu\`,
-			fields: map[string]interface{}{
-				"value": int64(42),
-			},
-		},
-		{
-			name: "cpu",
-			fields: map[string]interface{}{
-				`value\`: "x",
-			},
-		},
-		{
-			name: "cpu",
-			tags: map[string]string{
-				`host\`: "localhost",
-			},
-			fields: map[string]interface{}{
-				"value": int64(42),
-			},
-		},
-		{
-			name: "cpu",
-			tags: map[string]string{
-				"host": `localhost\`,
-			},
-			fields: map[string]interface{}{
-				"value": int64(42),
-			},
-		},
-	}
-
-	for _, tc := range tests {
-		_, err := New(tc.name, tc.tags, tc.fields, now)
-		assert.Error(t, err)
-	}
-}
--- a/metric/parse.go
+++ b/metric/parse.go
@@ -1,680 +0,0 @@
-package metric
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"strconv"
-	"time"
-
-	"github.com/influxdata/telegraf"
-)
-
-var (
-	ErrInvalidNumber = errors.New("invalid number")
-)
-
-const (
-	// the number of characters for the largest possible int64 (9223372036854775807)
-	maxInt64Digits = 19
-
-	// the number of characters for the smallest possible int64 (-9223372036854775808)
-	minInt64Digits = 20
-
-	// the number of characters required for the largest float64 before a range check
-	// would occur during parsing
-	maxFloat64Digits = 25
-
-	// the number of characters required for smallest float64 before a range check occur
-	// would occur during parsing
-	minFloat64Digits = 27
-
-	MaxKeyLength = 65535
-)
-
-// The following constants allow us to specify which state to move to
-// next, when scanning sections of a Point.
-const (
-	tagKeyState = iota
-	tagValueState
-	fieldsState
-)
-
-func Parse(buf []byte) ([]telegraf.Metric, error) {
-	return ParseWithDefaultTimePrecision(buf, time.Now(), "")
-}
-
-func ParseWithDefaultTime(buf []byte, t time.Time) ([]telegraf.Metric, error) {
-	return ParseWithDefaultTimePrecision(buf, t, "")
-}
-
-func ParseWithDefaultTimePrecision(
-	buf []byte,
-	t time.Time,
-	precision string,
-) ([]telegraf.Metric, error) {
-	if len(buf) == 0 {
-		return []telegraf.Metric{}, nil
-	}
-	if len(buf) <= 6 {
-		return []telegraf.Metric{}, makeError("buffer too short", buf, 0)
-	}
-	metrics := make([]telegraf.Metric, 0, bytes.Count(buf, []byte("\n"))+1)
-	var errStr string
-	i := 0
-	for {
-		j := bytes.IndexByte(buf[i:], '\n')
-		if j == -1 {
-			break
-		}
-		if len(buf[i:i+j]) < 2 {
-			i += j + 1 // increment i past the previous newline
-			continue
-		}
-
-		m, err := parseMetric(buf[i:i+j], t, precision)
-		if err != nil {
-			i += j + 1 // increment i past the previous newline
-			errStr += " " + err.Error()
-			continue
-		}
-		i += j + 1 // increment i past the previous newline
-
-		metrics = append(metrics, m)
-	}
-
-	if len(errStr) > 0 {
-		return metrics, fmt.Errorf(errStr)
-	}
-	return metrics, nil
-}
-
-func parseMetric(buf []byte,
-	defaultTime time.Time,
-	precision string,
-) (telegraf.Metric, error) {
-	var dTime string
-	// scan the first block which is measurement[,tag1=value1,tag2=value=2...]
-	pos, key, err := scanKey(buf, 0)
-	if err != nil {
-		return nil, err
-	}
-
-	// measurement name is required
-	if len(key) == 0 {
-		return nil, fmt.Errorf("missing measurement")
-	}
-
-	if len(key) > MaxKeyLength {
-		return nil, fmt.Errorf("max key length exceeded: %v > %v", len(key), MaxKeyLength)
-	}
-
-	// scan the second block is which is field1=value1[,field2=value2,...]
-	pos, fields, err := scanFields(buf, pos)
-	if err != nil {
-		return nil, err
-	}
-
-	// at least one field is required
-	if len(fields) == 0 {
-		return nil, fmt.Errorf("missing fields")
-	}
-
-	// scan the last block which is an optional integer timestamp
-	pos, ts, err := scanTime(buf, pos)
-	if err != nil {
-		return nil, err
-	}
-
-	// apply precision multiplier
-	var nsec int64
-	multiplier := getPrecisionMultiplier(precision)
-	if len(ts) > 0 && multiplier > 1 {
-		tsint, err := parseIntBytes(ts, 10, 64)
-		if err != nil {
-			return nil, err
-		}
-
-		nsec := multiplier * tsint
-		ts = []byte(strconv.FormatInt(nsec, 10))
-	}
-
-	m := &metric{
-		fields: fields,
-		t:      ts,
-		nsec:   nsec,
-	}
-
-	// parse out the measurement name
-	// namei is the index at which the "name" ends
-	namei := indexUnescapedByte(key, ',')
-	if namei < 1 {
-		// no tags
-		m.name = key
-	} else {
-		m.name = key[0:namei]
-		m.tags = key[namei:]
-	}
-
-	if len(m.t) == 0 {
-		if len(dTime) == 0 {
-			dTime = fmt.Sprint(defaultTime.UnixNano())
-		}
-		// use default time
-		m.t = []byte(dTime)
-	}
-
-	// here we copy on return because this allows us to later call
-	// AddTag, AddField, RemoveTag, RemoveField, etc. without worrying about
-	// modifying 'tag' bytes having an affect on 'field' bytes, for example.
-	return m.Copy(), nil
-}
-
-// scanKey scans buf starting at i for the measurement and tag portion of the point.
-// It returns the ending position and the byte slice of key within buf.  If there
-// are tags, they will be sorted if they are not already.
-func scanKey(buf []byte, i int) (int, []byte, error) {
-	start := skipWhitespace(buf, i)
-	i = start
-
-	// First scan the Point's measurement.
-	state, i, err := scanMeasurement(buf, i)
-	if err != nil {
-		return i, buf[start:i], err
-	}
-
-	// Optionally scan tags if needed.
-	if state == tagKeyState {
-		i, err = scanTags(buf, i)
-		if err != nil {
-			return i, buf[start:i], err
-		}
-	}
-
-	return i, buf[start:i], nil
-}
-
-// scanMeasurement examines the measurement part of a Point, returning
-// the next state to move to, and the current location in the buffer.
-func scanMeasurement(buf []byte, i int) (int, int, error) {
-	// Check first byte of measurement, anything except a comma is fine.
-	// It can't be a space, since whitespace is stripped prior to this
-	// function call.
-	if i >= len(buf) || buf[i] == ',' {
-		return -1, i, makeError("missing measurement", buf, i)
-	}
-
-	for {
-		i++
-		if i >= len(buf) {
-			// cpu
-			return -1, i, makeError("missing fields", buf, i)
-		}
-
-		if buf[i-1] == '\\' {
-			// Skip character (it's escaped).
-			continue
-		}
-
-		// Unescaped comma; move onto scanning the tags.
-		if buf[i] == ',' {
-			return tagKeyState, i + 1, nil
-		}
-
-		// Unescaped space; move onto scanning the fields.
-		if buf[i] == ' ' {
-			// cpu value=1.0
-			return fieldsState, i, nil
-		}
-	}
-}
-
-// scanTags examines all the tags in a Point, keeping track of and
-// returning the updated indices slice, number of commas and location
-// in buf where to start examining the Point fields.
-func scanTags(buf []byte, i int) (int, error) {
-	var (
-		err   error
-		state = tagKeyState
-	)
-
-	for {
-		switch state {
-		case tagKeyState:
-			i, err = scanTagsKey(buf, i)
-			state = tagValueState // tag value always follows a tag key
-		case tagValueState:
-			state, i, err = scanTagsValue(buf, i)
-		case fieldsState:
-			return i, nil
-		}
-
-		if err != nil {
-			return i, err
-		}
-	}
-}
-
-// scanTagsKey scans each character in a tag key.
-func scanTagsKey(buf []byte, i int) (int, error) {
-	// First character of the key.
-	if i >= len(buf) || buf[i] == ' ' || buf[i] == ',' || buf[i] == '=' {
-		// cpu,{'', ' ', ',', '='}
-		return i, makeError("missing tag key", buf, i)
-	}
-
-	// Examine each character in the tag key until we hit an unescaped
-	// equals (the tag value), or we hit an error (i.e., unescaped
-	// space or comma).
-	for {
-		i++
-
-		// Either we reached the end of the buffer or we hit an
-		// unescaped comma or space.
-		if i >= len(buf) ||
-			((buf[i] == ' ' || buf[i] == ',') && buf[i-1] != '\\') {
-			// cpu,tag{'', ' ', ','}
-			return i, makeError("missing tag value", buf, i)
-		}
-
-		if buf[i] == '=' && buf[i-1] != '\\' {
-			// cpu,tag=
-			return i + 1, nil
-		}
-	}
-}
-
-// scanTagsValue scans each character in a tag value.
-func scanTagsValue(buf []byte, i int) (int, int, error) {
-	// Tag value cannot be empty.
-	if i >= len(buf) || buf[i] == ',' || buf[i] == ' ' {
-		// cpu,tag={',', ' '}
-		return -1, i, makeError("missing tag value", buf, i)
-	}
-
-	// Examine each character in the tag value until we hit an unescaped
-	// comma (move onto next tag key), an unescaped space (move onto
-	// fields), or we error out.
-	for {
-		i++
-		if i >= len(buf) {
-			// cpu,tag=value
-			return -1, i, makeError("missing fields", buf, i)
-		}
-
-		// An unescaped equals sign is an invalid tag value.
-		if buf[i] == '=' && buf[i-1] != '\\' {
-			// cpu,tag={'=', 'fo=o'}
-			return -1, i, makeError("invalid tag format", buf, i)
-		}
-
-		if buf[i] == ',' && buf[i-1] != '\\' {
-			// cpu,tag=foo,
-			return tagKeyState, i + 1, nil
-		}
-
-		// cpu,tag=foo value=1.0
-		// cpu, tag=foo\= value=1.0
-		if buf[i] == ' ' && buf[i-1] != '\\' {
-			return fieldsState, i, nil
-		}
-	}
-}
-
-// scanFields scans buf, starting at i for the fields section of a point.  It returns
-// the ending position and the byte slice of the fields within buf
-func scanFields(buf []byte, i int) (int, []byte, error) {
-	start := skipWhitespace(buf, i)
-	i = start
-
-	// track how many '"" we've seen since last '='
-	quotes := 0
-
-	// tracks how many '=' we've seen
-	equals := 0
-
-	// tracks how many commas we've seen
-	commas := 0
-
-	for {
-		// reached the end of buf?
-		if i >= len(buf) {
-			break
-		}
-
-		// escaped characters?
-		if buf[i] == '\\' && i+1 < len(buf) {
-			i += 2
-			continue
-		}
-
-		// If the value is quoted, scan until we get to the end quote
-		// Only quote values in the field value since quotes are not significant
-		// in the field key
-		if buf[i] == '"' && equals > commas {
-			i++
-			quotes++
-			if quotes > 2 {
-				break
-			}
-			continue
-		}
-
-		// If we see an =, ensure that there is at least on char before and after it
-		if buf[i] == '=' && quotes != 1 {
-			quotes = 0
-			equals++
-
-			// check for "... =123" but allow "a\ =123"
-			if buf[i-1] == ' ' && buf[i-2] != '\\' {
-				return i, buf[start:i], makeError("missing field key", buf, i)
-			}
-
-			// check for "...a=123,=456" but allow "a=123,a\,=456"
-			if buf[i-1] == ',' && buf[i-2] != '\\' {
-				return i, buf[start:i], makeError("missing field key", buf, i)
-			}
-
-			// check for "... value="
-			if i+1 >= len(buf) {
-				return i, buf[start:i], makeError("missing field value", buf, i)
-			}
-
-			// check for "... value=,value2=..."
-			if buf[i+1] == ',' || buf[i+1] == ' ' {
-				return i, buf[start:i], makeError("missing field value", buf, i)
-			}
-
-			if isNumeric(buf[i+1]) || buf[i+1] == '-' || buf[i+1] == 'N' || buf[i+1] == 'n' {
-				var err error
-				i, err = scanNumber(buf, i+1)
-				if err != nil {
-					return i, buf[start:i], err
-				}
-				continue
-			}
-			// If next byte is not a double-quote, the value must be a boolean
-			if buf[i+1] != '"' {
-				var err error
-				i, _, err = scanBoolean(buf, i+1)
-				if err != nil {
-					return i, buf[start:i], err
-				}
-				continue
-			}
-		}
-
-		if buf[i] == ',' && quotes != 1 {
-			commas++
-		}
-
-		// reached end of block?
-		if buf[i] == ' ' && quotes != 1 {
-			break
-		}
-		i++
-	}
-
-	if quotes != 0 && quotes != 2 {
-		return i, buf[start:i], makeError("unbalanced quotes", buf, i)
-	}
-
-	// check that all field sections had key and values (e.g. prevent "a=1,b"
-	if equals == 0 || commas != equals-1 {
-		return i, buf[start:i], makeError("invalid field format", buf, i)
-	}
-
-	return i, buf[start:i], nil
-}
-
-// scanTime scans buf, starting at i for the time section of a point. It
-// returns the ending position and the byte slice of the timestamp within buf
-// and and error if the timestamp is not in the correct numeric format.
-func scanTime(buf []byte, i int) (int, []byte, error) {
-	start := skipWhitespace(buf, i)
-	i = start
-
-	for {
-		// reached the end of buf?
-		if i >= len(buf) {
-			break
-		}
-
-		// Reached end of block or trailing whitespace?
-		if buf[i] == '\n' || buf[i] == ' ' {
-			break
-		}
-
-		// Handle negative timestamps
-		if i == start && buf[i] == '-' {
-			i++
-			continue
-		}
-
-		// Timestamps should be integers, make sure they are so we don't need
-		// to actually  parse the timestamp until needed.
-		if buf[i] < '0' || buf[i] > '9' {
-			return i, buf[start:i], makeError("invalid timestamp", buf, i)
-		}
-		i++
-	}
-	return i, buf[start:i], nil
-}
-
-func isNumeric(b byte) bool {
-	return (b >= '0' && b <= '9') || b == '.'
-}
-
-// scanNumber returns the end position within buf, start at i after
-// scanning over buf for an integer, or float.  It returns an
-// error if a invalid number is scanned.
-func scanNumber(buf []byte, i int) (int, error) {
-	start := i
-	var isInt bool
-
-	// Is negative number?
-	if i < len(buf) && buf[i] == '-' {
-		i++
-		// There must be more characters now, as just '-' is illegal.
-		if i == len(buf) {
-			return i, ErrInvalidNumber
-		}
-	}
-
-	// how many decimal points we've see
-	decimal := false
-
-	// indicates the number is float in scientific notation
-	scientific := false
-
-	for {
-		if i >= len(buf) {
-			break
-		}
-
-		if buf[i] == ',' || buf[i] == ' ' {
-			break
-		}
-
-		if buf[i] == 'i' && i > start && !isInt {
-			isInt = true
-			i++
-			continue
-		}
-
-		if buf[i] == '.' {
-			// Can't have more than 1 decimal (e.g. 1.1.1 should fail)
-			if decimal {
-				return i, ErrInvalidNumber
-			}
-			decimal = true
-		}
-
-		// `e` is valid for floats but not as the first char
-		if i > start && (buf[i] == 'e' || buf[i] == 'E') {
-			scientific = true
-			i++
-			continue
-		}
-
-		// + and - are only valid at this point if they follow an e (scientific notation)
-		if (buf[i] == '+' || buf[i] == '-') && (buf[i-1] == 'e' || buf[i-1] == 'E') {
-			i++
-			continue
-		}
-
-		// NaN is an unsupported value
-		if i+2 < len(buf) && (buf[i] == 'N' || buf[i] == 'n') {
-			return i, ErrInvalidNumber
-		}
-
-		if !isNumeric(buf[i]) {
-			return i, ErrInvalidNumber
-		}
-		i++
-	}
-
-	if isInt && (decimal || scientific) {
-		return i, ErrInvalidNumber
-	}
-
-	numericDigits := i - start
-	if isInt {
-		numericDigits--
-	}
-	if decimal {
-		numericDigits--
-	}
-	if buf[start] == '-' {
-		numericDigits--
-	}
-
-	if numericDigits == 0 {
-		return i, ErrInvalidNumber
-	}
-
-	// It's more common that numbers will be within min/max range for their type but we need to prevent
-	// out or range numbers from being parsed successfully.  This uses some simple heuristics to decide
-	// if we should parse the number to the actual type.  It does not do it all the time because it incurs
-	// extra allocations and we end up converting the type again when writing points to disk.
-	if isInt {
-		// Make sure the last char is an 'i' for integers (e.g. 9i10 is not valid)
-		if buf[i-1] != 'i' {
-			return i, ErrInvalidNumber
-		}
-		// Parse the int to check bounds the number of digits could be larger than the max range
-		// We subtract 1 from the index to remove the `i` from our tests
-		if len(buf[start:i-1]) >= maxInt64Digits || len(buf[start:i-1]) >= minInt64Digits {
-			if _, err := parseIntBytes(buf[start:i-1], 10, 64); err != nil {
-				return i, makeError(fmt.Sprintf("unable to parse integer %s: %s", buf[start:i-1], err), buf, i)
-			}
-		}
-	} else {
-		// Parse the float to check bounds if it's scientific or the number of digits could be larger than the max range
-		if scientific || len(buf[start:i]) >= maxFloat64Digits || len(buf[start:i]) >= minFloat64Digits {
-			if _, err := parseFloatBytes(buf[start:i], 10); err != nil {
-				return i, makeError("invalid float", buf, i)
-			}
-		}
-	}
-
-	return i, nil
-}
-
-// scanBoolean returns the end position within buf, start at i after
-// scanning over buf for boolean. Valid values for a boolean are
-// t, T, true, TRUE, f, F, false, FALSE. It returns an error if a invalid boolean
-// is scanned.
-func scanBoolean(buf []byte, i int) (int, []byte, error) {
-	start := i
-
-	if i < len(buf) && (buf[i] != 't' && buf[i] != 'f' && buf[i] != 'T' && buf[i] != 'F') {
-		return i, buf[start:i], makeError("invalid value", buf, i)
-	}
-
-	i++
-	for {
-		if i >= len(buf) {
-			break
-		}
-
-		if buf[i] == ',' || buf[i] == ' ' {
-			break
-		}
-		i++
-	}
-
-	// Single char bool (t, T, f, F) is ok
-	if i-start == 1 {
-		return i, buf[start:i], nil
-	}
-
-	// length must be 4 for true or TRUE
-	if (buf[start] == 't' || buf[start] == 'T') && i-start != 4 {
-		return i, buf[start:i], makeError("invalid boolean", buf, i)
-	}
-
-	// length must be 5 for false or FALSE
-	if (buf[start] == 'f' || buf[start] == 'F') && i-start != 5 {
-		return i, buf[start:i], makeError("invalid boolean", buf, i)
-	}
-
-	// Otherwise
-	valid := false
-	switch buf[start] {
-	case 't':
-		valid = bytes.Equal(buf[start:i], []byte("true"))
-	case 'f':
-		valid = bytes.Equal(buf[start:i], []byte("false"))
-	case 'T':
-		valid = bytes.Equal(buf[start:i], []byte("TRUE")) || bytes.Equal(buf[start:i], []byte("True"))
-	case 'F':
-		valid = bytes.Equal(buf[start:i], []byte("FALSE")) || bytes.Equal(buf[start:i], []byte("False"))
-	}
-
-	if !valid {
-		return i, buf[start:i], makeError("invalid boolean", buf, i)
-	}
-
-	return i, buf[start:i], nil
-
-}
-
-// skipWhitespace returns the end position within buf, starting at i after
-// scanning over spaces in tags
-func skipWhitespace(buf []byte, i int) int {
-	for i < len(buf) {
-		if buf[i] != ' ' && buf[i] != '\t' && buf[i] != 0 {
-			break
-		}
-		i++
-	}
-	return i
-}
-
-// makeError is a helper function for making a metric parsing error.
-//   reason is the reason why the error occurred.
-//   buf should be the current buffer we are parsing.
-//   i is the current index, to give some context on where in the buffer we are.
-func makeError(reason string, buf []byte, i int) error {
-	return fmt.Errorf("metric parsing error, reason: [%s], buffer: [%s], index: [%d]",
-		reason, buf, i)
-}
-
-// getPrecisionMultiplier will return a multiplier for the precision specified.
-func getPrecisionMultiplier(precision string) int64 {
-	d := time.Nanosecond
-	switch precision {
-	case "u":
-		d = time.Microsecond
-	case "ms":
-		d = time.Millisecond
-	case "s":
-		d = time.Second
-	case "m":
-		d = time.Minute
-	case "h":
-		d = time.Hour
-	}
-	return int64(d)
-}
--- a/metric/parse_test.go
+++ b/metric/parse_test.go
@@ -1,413 +0,0 @@
-package metric
-
-import (
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-)
-
-const trues = `booltest b=T
-booltest b=t
-booltest b=True
-booltest b=TRUE
-booltest b=true
-`
-
-const falses = `booltest b=F
-booltest b=f
-booltest b=False
-booltest b=FALSE
-booltest b=false
-`
-
-const withEscapes = `w\,\ eather,host=local temp=99 1465839830100400200
-w\,eather,host=local temp=99 1465839830100400200
-weather,location=us\,midwest temperature=82 1465839830100400200
-weather,location=us-midwest temp\=rature=82 1465839830100400200
-weather,location\ place=us-midwest temperature=82 1465839830100400200
-weather,location=us-midwest temperature="too\"hot\"" 1465839830100400200
-`
-
-const withTimestamps = `cpu usage=99 1480595849000000000
-cpu usage=99 1480595850000000000
-cpu usage=99 1480595851700030000
-cpu usage=99 1480595852000000300
-`
-
-const sevenMetrics = `cpu,host=foo,datacenter=us-east idle=99,busy=1i,b=true,s="string"
-cpu,host=foo,datacenter=us-east idle=99,busy=1i,b=true,s="string"
-cpu,host=foo,datacenter=us-east idle=99,busy=1i,b=true,s="string"
-cpu,host=foo,datacenter=us-east idle=99,busy=1i,b=true,s="string"
-cpu,host=foo,datacenter=us-east idle=99,busy=1i,b=true,s="string"
-cpu,host=foo,datacenter=us-east idle=99,busy=1i,b=true,s="string"
-cpu,host=foo,datacenter=us-east idle=99,busy=1i,b=true,s="string"
-`
-
-const negMetrics = `weather,host=local temp=-99i,temp_float=-99.4 1465839830100400200
-`
-
-// some metrics are invalid
-const someInvalid = `cpu,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
-cpu,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
-cpu,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 , usage_idle=99,usage_busy=1
-cpu 1480595852000000300
-cpu usage=99 1480595852foobar300
-cpu,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
-`
-
-func TestParse(t *testing.T) {
-	start := time.Now()
-	metrics, err := Parse([]byte(sevenMetrics))
-	assert.NoError(t, err)
-	assert.Len(t, metrics, 7)
-
-	// all metrics parsed together w/o a timestamp should have the same time.
-	firstTime := metrics[0].Time()
-	for _, m := range metrics {
-		assert.Equal(t,
-			map[string]interface{}{
-				"idle": float64(99),
-				"busy": int64(1),
-				"b":    true,
-				"s":    "string",
-			},
-			m.Fields(),
-		)
-		assert.Equal(t,
-			map[string]string{
-				"host":       "foo",
-				"datacenter": "us-east",
-			},
-			m.Tags(),
-		)
-		assert.True(t, m.Time().After(start))
-		assert.True(t, m.Time().Equal(firstTime))
-	}
-}
-
-func TestParseNegNumbers(t *testing.T) {
-	metrics, err := Parse([]byte(negMetrics))
-	assert.NoError(t, err)
-	assert.Len(t, metrics, 1)
-
-	assert.Equal(t,
-		map[string]interface{}{
-			"temp":       int64(-99),
-			"temp_float": float64(-99.4),
-		},
-		metrics[0].Fields(),
-	)
-	assert.Equal(t,
-		map[string]string{
-			"host": "local",
-		},
-		metrics[0].Tags(),
-	)
-}
-
-func TestParseErrors(t *testing.T) {
-	start := time.Now()
-	metrics, err := Parse([]byte(someInvalid))
-	assert.Error(t, err)
-	assert.Len(t, metrics, 4)
-
-	// all metrics parsed together w/o a timestamp should have the same time.
-	firstTime := metrics[0].Time()
-	for _, m := range metrics {
-		assert.Equal(t,
-			map[string]interface{}{
-				"usage_idle": float64(99),
-				"usage_busy": float64(1),
-			},
-			m.Fields(),
-		)
-		assert.Equal(t,
-			map[string]string{
-				"host":       "foo",
-				"datacenter": "us-east",
-			},
-			m.Tags(),
-		)
-		assert.True(t, m.Time().After(start))
-		assert.True(t, m.Time().Equal(firstTime))
-	}
-}
-
-func TestParseWithTimestamps(t *testing.T) {
-	metrics, err := Parse([]byte(withTimestamps))
-	assert.NoError(t, err)
-	assert.Len(t, metrics, 4)
-
-	expectedTimestamps := []time.Time{
-		time.Unix(0, 1480595849000000000),
-		time.Unix(0, 1480595850000000000),
-		time.Unix(0, 1480595851700030000),
-		time.Unix(0, 1480595852000000300),
-	}
-
-	// all metrics parsed together w/o a timestamp should have the same time.
-	for i, m := range metrics {
-		assert.Equal(t,
-			map[string]interface{}{
-				"usage": float64(99),
-			},
-			m.Fields(),
-		)
-		assert.True(t, m.Time().Equal(expectedTimestamps[i]))
-	}
-}
-
-func TestParseEscapes(t *testing.T) {
-	metrics, err := Parse([]byte(withEscapes))
-	assert.NoError(t, err)
-	assert.Len(t, metrics, 6)
-
-	tests := []struct {
-		name   string
-		fields map[string]interface{}
-		tags   map[string]string
-	}{
-		{
-			name:   `w, eather`,
-			fields: map[string]interface{}{"temp": float64(99)},
-			tags:   map[string]string{"host": "local"},
-		},
-		{
-			name:   `w,eather`,
-			fields: map[string]interface{}{"temp": float64(99)},
-			tags:   map[string]string{"host": "local"},
-		},
-		{
-			name:   `weather`,
-			fields: map[string]interface{}{"temperature": float64(82)},
-			tags:   map[string]string{"location": `us,midwest`},
-		},
-		{
-			name:   `weather`,
-			fields: map[string]interface{}{`temp=rature`: float64(82)},
-			tags:   map[string]string{"location": `us-midwest`},
-		},
-		{
-			name:   `weather`,
-			fields: map[string]interface{}{"temperature": float64(82)},
-			tags:   map[string]string{`location place`: `us-midwest`},
-		},
-		{
-			name:   `weather`,
-			fields: map[string]interface{}{`temperature`: `too"hot"`},
-			tags:   map[string]string{"location": `us-midwest`},
-		},
-	}
-
-	for i, test := range tests {
-		assert.Equal(t, test.name, metrics[i].Name())
-		assert.Equal(t, test.fields, metrics[i].Fields())
-		assert.Equal(t, test.tags, metrics[i].Tags())
-	}
-}
-
-func TestParseTrueBooleans(t *testing.T) {
-	metrics, err := Parse([]byte(trues))
-	assert.NoError(t, err)
-	assert.Len(t, metrics, 5)
-
-	for _, metric := range metrics {
-		assert.Equal(t, "booltest", metric.Name())
-		assert.Equal(t, true, metric.Fields()["b"])
-	}
-}
-
-func TestParseFalseBooleans(t *testing.T) {
-	metrics, err := Parse([]byte(falses))
-	assert.NoError(t, err)
-	assert.Len(t, metrics, 5)
-
-	for _, metric := range metrics {
-		assert.Equal(t, "booltest", metric.Name())
-		assert.Equal(t, false, metric.Fields()["b"])
-	}
-}
-
-func TestParsePointBadNumber(t *testing.T) {
-	for _, tt := range []string{
-		"cpu v=- ",
-		"cpu v=-i ",
-		"cpu v=-. ",
-		"cpu v=. ",
-		"cpu v=1.0i ",
-		"cpu v=1ii ",
-		"cpu v=1a ",
-		"cpu v=-e-e-e ",
-		"cpu v=42+3 ",
-		"cpu v= ",
-	} {
-		_, err := Parse([]byte(tt + "\n"))
-		assert.Error(t, err, tt)
-	}
-}
-
-func TestParseTagsMissingParts(t *testing.T) {
-	for _, tt := range []string{
-		`cpu,host`,
-		`cpu,host,`,
-		`cpu,host=`,
-		`cpu,f=oo=bar value=1`,
-		`cpu,host value=1i`,
-		`cpu,host=serverA,region value=1i`,
-		`cpu,host=serverA,region= value=1i`,
-		`cpu,host=serverA,region=,zone=us-west value=1i`,
-		`cpu, value=1`,
-		`cpu, ,,`,
-		`cpu,,,`,
-		`cpu,host=serverA,=us-east value=1i`,
-		`cpu,host=serverAa\,,=us-east value=1i`,
-		`cpu,host=serverA\,,=us-east value=1i`,
-		`cpu, =serverA value=1i`,
-	} {
-		_, err := Parse([]byte(tt + "\n"))
-		assert.Error(t, err, tt)
-	}
-}
-
-func TestParsePointWhitespace(t *testing.T) {
-	for _, tt := range []string{
-		`cpu    value=1.0 1257894000000000000`,
-		`cpu value=1.0     1257894000000000000`,
-		`cpu      value=1.0     1257894000000000000`,
-		`cpu value=1.0 1257894000000000000   `,
-	} {
-		m, err := Parse([]byte(tt + "\n"))
-		assert.NoError(t, err, tt)
-		assert.Equal(t, "cpu", m[0].Name())
-		assert.Equal(t, map[string]interface{}{"value": float64(1)}, m[0].Fields())
-	}
-}
-
-func TestParsePointInvalidFields(t *testing.T) {
-	for _, tt := range []string{
-		"test,foo=bar a=101,=value",
-		"test,foo=bar =value",
-		"test,foo=bar a=101,key=",
-		"test,foo=bar key=",
-		`test,foo=bar a=101,b="foo`,
-	} {
-		_, err := Parse([]byte(tt + "\n"))
-		assert.Error(t, err, tt)
-	}
-}
-
-func TestParsePointNoFields(t *testing.T) {
-	for _, tt := range []string{
-		"cpu_load_short,host=server01,region=us-west",
-		"very_long_measurement_name",
-		"cpu,host==",
-		"============",
-		"cpu",
-		"cpu\n\n\n\n\n\n\n",
-		"                ",
-	} {
-		_, err := Parse([]byte(tt + "\n"))
-		assert.Error(t, err, tt)
-	}
-}
-
-// a b=1 << this is the shortest possible metric
-// any shorter is just ignored
-func TestParseBufTooShort(t *testing.T) {
-	for _, tt := range []string{
-		"",
-		"a",
-		"a ",
-		"a b=",
-	} {
-		_, err := Parse([]byte(tt + "\n"))
-		assert.Error(t, err, tt)
-	}
-}
-
-func TestParseInvalidBooleans(t *testing.T) {
-	for _, tt := range []string{
-		"test b=tru",
-		"test b=fals",
-		"test b=faLse",
-		"test q=foo",
-		"test b=lambchops",
-	} {
-		_, err := Parse([]byte(tt + "\n"))
-		assert.Error(t, err, tt)
-	}
-}
-
-func TestParseInvalidNumbers(t *testing.T) {
-	for _, tt := range []string{
-		"test b=-",
-		"test b=1.1.1",
-		"test b=nan",
-		"test b=9i10",
-		"test b=9999999999999999999i",
-	} {
-		_, err := Parse([]byte(tt + "\n"))
-		assert.Error(t, err, tt)
-	}
-}
-
-func TestParseNegativeTimestamps(t *testing.T) {
-	for _, tt := range []string{
-		"test foo=101 -1257894000000000000",
-	} {
-		metrics, err := Parse([]byte(tt + "\n"))
-		assert.NoError(t, err, tt)
-		assert.True(t, metrics[0].Time().Equal(time.Unix(0, -1257894000000000000)))
-	}
-}
-
-func TestParsePrecision(t *testing.T) {
-	for _, tt := range []struct {
-		line      string
-		precision string
-		expected  int64
-	}{
-		{"test v=42 1491847420", "s", 1491847420000000000},
-		{"test v=42 1491847420123", "ms", 1491847420123000000},
-		{"test v=42 1491847420123456", "u", 1491847420123456000},
-		{"test v=42 1491847420123456789", "ns", 1491847420123456789},
-
-		{"test v=42 1491847420123456789", "1s", 1491847420123456789},
-		{"test v=42 1491847420123456789", "asdf", 1491847420123456789},
-	} {
-		metrics, err := ParseWithDefaultTimePrecision(
-			[]byte(tt.line+"\n"), time.Now(), tt.precision)
-		assert.NoError(t, err)
-		assert.Equal(t, tt.expected, metrics[0].UnixNano())
-	}
-}
-
-func TestParsePrecisionUnsetTime(t *testing.T) {
-	for _, tt := range []struct {
-		line      string
-		precision string
-	}{
-		{"test v=42", "s"},
-		{"test v=42", "ns"},
-	} {
-		_, err := ParseWithDefaultTimePrecision(
-			[]byte(tt.line+"\n"), time.Now(), tt.precision)
-		assert.NoError(t, err)
-	}
-}
-
-func TestParseMaxKeyLength(t *testing.T) {
-	key := ""
-	for {
-		if len(key) > MaxKeyLength {
-			break
-		}
-		key += "test"
-	}
-
-	_, err := Parse([]byte(key + " value=1\n"))
-	assert.Error(t, err)
-}
--- a/metric/reader.go
+++ b/metric/reader.go
@@ -1,159 +0,0 @@
-package metric
-
-import (
-	"io"
-
-	"github.com/influxdata/telegraf"
-)
-
-type state int
-
-const (
-	_ state = iota
-	// normal state copies whole metrics into the given buffer until we can't
-	// fit the next metric.
-	normal
-	// split state means that we have a metric that we were able to split, so
-	// that we can fit it into multiple metrics (and calls to Read)
-	split
-	// overflow state means that we have a metric that didn't fit into a single
-	// buffer, and needs to be split across multiple calls to Read.
-	overflow
-	// splitOverflow state means that a split metric didn't fit into a single
-	// buffer, and needs to be split across multiple calls to Read.
-	splitOverflow
-	// done means we're done reading metrics, and now always return (0, io.EOF)
-	done
-)
-
-type reader struct {
-	metrics      []telegraf.Metric
-	splitMetrics []telegraf.Metric
-	buf          []byte
-	state        state
-
-	// metric index
-	iM int
-	// split metric index
-	iSM int
-	// buffer index
-	iB int
-}
-
-func NewReader(metrics []telegraf.Metric) io.Reader {
-	return &reader{
-		metrics: metrics,
-		state:   normal,
-	}
-}
-
-func (r *reader) Read(p []byte) (n int, err error) {
-	var i int
-	switch r.state {
-	case done:
-		return 0, io.EOF
-	case normal:
-		for {
-			// this for-loop is the sunny-day scenario, where we are given a
-			// buffer that is large enough to hold at least a single metric.
-			// all of the cases below it are edge-cases.
-			if r.metrics[r.iM].Len() <= len(p[i:]) {
-				i += r.metrics[r.iM].SerializeTo(p[i:])
-			} else {
-				break
-			}
-			r.iM++
-			if r.iM == len(r.metrics) {
-				r.state = done
-				return i, io.EOF
-			}
-		}
-
-		// if we haven't written any bytes, check if we can split the current
-		// metric into multiple full metrics at a smaller size.
-		if i == 0 {
-			tmp := r.metrics[r.iM].Split(len(p))
-			if len(tmp) > 1 {
-				r.splitMetrics = tmp
-				r.state = split
-				if r.splitMetrics[0].Len() <= len(p) {
-					i += r.splitMetrics[0].SerializeTo(p)
-					r.iSM = 1
-				} else {
-					// splitting didn't quite work, so we'll drop down and
-					// overflow the metric.
-					r.state = normal
-					r.iSM = 0
-				}
-			}
-		}
-
-		// if we haven't written any bytes and we're not at the end of the metrics
-		// slice, then it means we have a single metric that is larger than the
-		// provided buffer.
-		if i == 0 {
-			r.buf = r.metrics[r.iM].Serialize()
-			i += copy(p, r.buf[r.iB:])
-			r.iB += i
-			r.state = overflow
-		}
-
-	case split:
-		if r.splitMetrics[r.iSM].Len() <= len(p) {
-			// write the current split metric
-			i += r.splitMetrics[r.iSM].SerializeTo(p)
-			r.iSM++
-			if r.iSM >= len(r.splitMetrics) {
-				// done writing the current split metrics
-				r.iSM = 0
-				r.iM++
-				if r.iM == len(r.metrics) {
-					r.state = done
-					return i, io.EOF
-				}
-				r.state = normal
-			}
-		} else {
-			// This would only happen if we split the metric, and then a
-			// subsequent buffer was smaller than the initial one given,
-			// so that our split metric no longer fits.
-			r.buf = r.splitMetrics[r.iSM].Serialize()
-			i += copy(p, r.buf[r.iB:])
-			r.iB += i
-			r.state = splitOverflow
-		}
-
-	case splitOverflow:
-		i = copy(p, r.buf[r.iB:])
-		r.iB += i
-		if r.iB >= len(r.buf) {
-			r.iB = 0
-			r.iSM++
-			if r.iSM == len(r.splitMetrics) {
-				r.iM++
-				if r.iM == len(r.metrics) {
-					r.state = done
-					return i, io.EOF
-				}
-				r.state = normal
-			} else {
-				r.state = split
-			}
-		}
-
-	case overflow:
-		i = copy(p, r.buf[r.iB:])
-		r.iB += i
-		if r.iB >= len(r.buf) {
-			r.iB = 0
-			r.iM++
-			if r.iM == len(r.metrics) {
-				r.state = done
-				return i, io.EOF
-			}
-			r.state = normal
-		}
-	}
-
-	return i, nil
-}
--- a/metric/reader_test.go
+++ b/metric/reader_test.go
@@ -1,713 +0,0 @@
-package metric
-
-import (
-	"io"
-	"io/ioutil"
-	"regexp"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/influxdata/telegraf"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func BenchmarkMetricReader(b *testing.B) {
-	metrics := make([]telegraf.Metric, 10)
-	for i := 0; i < 10; i++ {
-		metrics[i], _ = New("foo", map[string]string{},
-			map[string]interface{}{"value": int64(1)}, time.Now())
-	}
-	for n := 0; n < b.N; n++ {
-		r := NewReader(metrics)
-		io.Copy(ioutil.Discard, r)
-	}
-}
-
-func TestMetricReader(t *testing.T) {
-	ts := time.Unix(1481032190, 0)
-	metrics := make([]telegraf.Metric, 10)
-	for i := 0; i < 10; i++ {
-		metrics[i], _ = New("foo", map[string]string{},
-			map[string]interface{}{"value": int64(1)}, ts)
-	}
-
-	r := NewReader(metrics)
-
-	buf := make([]byte, 35)
-	for i := 0; i < 10; i++ {
-		n, err := r.Read(buf)
-		if err != nil {
-			assert.True(t, err == io.EOF, err.Error())
-		}
-		assert.Equal(t, 33, n)
-		assert.Equal(t, "foo value=1i 1481032190000000000\n", string(buf[0:n]))
-	}
-
-	// reader should now be done, and always return 0, io.EOF
-	for i := 0; i < 10; i++ {
-		n, err := r.Read(buf)
-		assert.True(t, err == io.EOF, err.Error())
-		assert.Equal(t, 0, n)
-	}
-}
-
-func TestMetricReader_OverflowMetric(t *testing.T) {
-	ts := time.Unix(1481032190, 0)
-	m, _ := New("foo", map[string]string{},
-		map[string]interface{}{"value": int64(10)}, ts)
-	metrics := []telegraf.Metric{m}
-
-	r := NewReader(metrics)
-	buf := make([]byte, 5)
-
-	tests := []struct {
-		exp string
-		err error
-		n   int
-	}{
-		{
-			"foo v",
-			nil,
-			5,
-		},
-		{
-			"alue=",
-			nil,
-			5,
-		},
-		{
-			"10i 1",
-			nil,
-			5,
-		},
-		{
-			"48103",
-			nil,
-			5,
-		},
-		{
-			"21900",
-			nil,
-			5,
-		},
-		{
-			"00000",
-			nil,
-			5,
-		},
-		{
-			"000\n",
-			io.EOF,
-			4,
-		},
-		{
-			"",
-			io.EOF,
-			0,
-		},
-	}
-
-	for _, test := range tests {
-		n, err := r.Read(buf)
-		assert.Equal(t, test.n, n)
-		assert.Equal(t, test.exp, string(buf[0:n]))
-		assert.Equal(t, test.err, err)
-	}
-}
-
-// Regression test for when a metric is the same size as the buffer.
-//
-// Previously EOF would not be set until the next call to Read.
-func TestMetricReader_MetricSizeEqualsBufferSize(t *testing.T) {
-	ts := time.Unix(1481032190, 0)
-	m1, _ := New("foo", map[string]string{},
-		map[string]interface{}{"a": int64(1)}, ts)
-	metrics := []telegraf.Metric{m1}
-
-	r := NewReader(metrics)
-	buf := make([]byte, m1.Len())
-
-	for {
-		n, err := r.Read(buf)
-		// Should never read 0 bytes unless at EOF, unless input buffer is 0 length
-		if n == 0 {
-			require.Equal(t, io.EOF, err)
-			break
-		}
-		// Lines should be terminated with a LF
-		if err == io.EOF {
-			require.Equal(t, uint8('\n'), buf[n-1])
-			break
-		}
-		require.NoError(t, err)
-	}
-}
-
-// Regression test for when a metric requires to be split and one of the
-// split metrics is exactly the size of the buffer.
-//
-// Previously an empty string would be returned on the next Read without error,
-// and then next Read call would panic.
-func TestMetricReader_SplitWithExactLengthSplit(t *testing.T) {
-	ts := time.Unix(1481032190, 0)
-	m1, _ := New("foo", map[string]string{},
-		map[string]interface{}{"a": int64(1), "bb": int64(2)}, ts)
-	metrics := []telegraf.Metric{m1}
-
-	r := NewReader(metrics)
-	buf := make([]byte, 30)
-
-	//  foo a=1i,bb=2i 1481032190000000000\n // len 35
-	//
-	// Requires this specific split order:
-	//  foo a=1i 1481032190000000000\n  // len 29
-	//  foo bb=2i 1481032190000000000\n // len 30
-
-	for {
-		n, err := r.Read(buf)
-		// Should never read 0 bytes unless at EOF, unless input buffer is 0 length
-		if n == 0 {
-			require.Equal(t, io.EOF, err)
-			break
-		}
-		// Lines should be terminated with a LF
-		if err == io.EOF {
-			require.Equal(t, uint8('\n'), buf[n-1])
-			break
-		}
-		require.NoError(t, err)
-	}
-}
-
-// Regression test for when a metric requires to be split and one of the
-// split metrics is larger than the buffer.
-//
-// Previously the metric index would be set incorrectly causing a panic.
-func TestMetricReader_SplitOverflowOversized(t *testing.T) {
-	ts := time.Unix(1481032190, 0)
-	m1, _ := New("foo", map[string]string{},
-		map[string]interface{}{
-			"a":   int64(1),
-			"bbb": int64(2),
-		}, ts)
-	metrics := []telegraf.Metric{m1}
-
-	r := NewReader(metrics)
-	buf := make([]byte, 30)
-
-	// foo a=1i,bbb=2i 1481032190000000000\n // len 36
-	//
-	// foo a=1i 1481032190000000000\n  // len 29
-	// foo bbb=2i 1481032190000000000\n // len 31
-
-	for {
-		n, err := r.Read(buf)
-		// Should never read 0 bytes unless at EOF, unless input buffer is 0 length
-		if n == 0 {
-			require.Equal(t, io.EOF, err)
-			break
-		}
-		// Lines should be terminated with a LF
-		if err == io.EOF {
-			require.Equal(t, uint8('\n'), buf[n-1])
-			break
-		}
-		require.NoError(t, err)
-	}
-}
-
-// Regression test for when a split metric exactly fits in the buffer.
-//
-// Previously the metric would be overflow split when not required.
-func TestMetricReader_SplitOverflowUneeded(t *testing.T) {
-	ts := time.Unix(1481032190, 0)
-	m1, _ := New("foo", map[string]string{},
-		map[string]interface{}{"a": int64(1), "b": int64(2)}, ts)
-	metrics := []telegraf.Metric{m1}
-
-	r := NewReader(metrics)
-	buf := make([]byte, 29)
-
-	// foo a=1i,b=2i 1481032190000000000\n // len 34
-	//
-	// foo a=1i 1481032190000000000\n  // len 29
-	// foo b=2i 1481032190000000000\n // len 29
-
-	for {
-		n, err := r.Read(buf)
-		// Should never read 0 bytes unless at EOF, unless input buffer is 0 length
-		if n == 0 {
-			require.Equal(t, io.EOF, err)
-			break
-		}
-		// Lines should be terminated with a LF
-		if err == io.EOF {
-			require.Equal(t, uint8('\n'), buf[n-1])
-			break
-		}
-		require.NoError(t, err)
-	}
-}
-
-func TestMetricReader_OverflowMultipleMetrics(t *testing.T) {
-	ts := time.Unix(1481032190, 0)
-	m, _ := New("foo", map[string]string{},
-		map[string]interface{}{"value": int64(10)}, ts)
-	metrics := []telegraf.Metric{m, m.Copy()}
-
-	r := NewReader(metrics)
-	buf := make([]byte, 10)
-
-	tests := []struct {
-		exp string
-		err error
-		n   int
-	}{
-		{
-			"foo value=",
-			nil,
-			10,
-		},
-		{
-			"10i 148103",
-			nil,
-			10,
-		},
-		{
-			"2190000000",
-			nil,
-			10,
-		},
-		{
-			"000\n",
-			nil,
-			4,
-		},
-		{
-			"foo value=",
-			nil,
-			10,
-		},
-		{
-			"10i 148103",
-			nil,
-			10,
-		},
-		{
-			"2190000000",
-			nil,
-			10,
-		},
-		{
-			"000\n",
-			io.EOF,
-			4,
-		},
-		{
-			"",
-			io.EOF,
-			0,
-		},
-	}
-
-	for _, test := range tests {
-		n, err := r.Read(buf)
-		assert.Equal(t, test.n, n)
-		assert.Equal(t, test.exp, string(buf[0:n]))
-		assert.Equal(t, test.err, err)
-	}
-}
-
-// test splitting a metric
-func TestMetricReader_SplitMetric(t *testing.T) {
-	ts := time.Unix(1481032190, 0)
-	m1, _ := New("foo", map[string]string{},
-		map[string]interface{}{
-			"value1": int64(10),
-			"value2": int64(10),
-			"value3": int64(10),
-			"value4": int64(10),
-			"value5": int64(10),
-			"value6": int64(10),
-		},
-		ts,
-	)
-	metrics := []telegraf.Metric{m1}
-
-	r := NewReader(metrics)
-	buf := make([]byte, 60)
-
-	tests := []struct {
-		expRegex string
-		err      error
-		n        int
-	}{
-		{
-			`foo value\d=10i,value\d=10i,value\d=10i 1481032190000000000\n`,
-			nil,
-			57,
-		},
-		{
-			`foo value\d=10i,value\d=10i,value\d=10i 1481032190000000000\n`,
-			io.EOF,
-			57,
-		},
-		{
-			"",
-			io.EOF,
-			0,
-		},
-	}
-
-	for _, test := range tests {
-		n, err := r.Read(buf)
-		assert.Equal(t, test.n, n)
-		re := regexp.MustCompile(test.expRegex)
-		assert.True(t, re.MatchString(string(buf[0:n])), string(buf[0:n]))
-		assert.Equal(t, test.err, err)
-	}
-}
-
-// test an array with one split metric and one unsplit
-func TestMetricReader_SplitMetric2(t *testing.T) {
-	ts := time.Unix(1481032190, 0)
-	m1, _ := New("foo", map[string]string{},
-		map[string]interface{}{
-			"value1": int64(10),
-			"value2": int64(10),
-			"value3": int64(10),
-			"value4": int64(10),
-			"value5": int64(10),
-			"value6": int64(10),
-		},
-		ts,
-	)
-	m2, _ := New("foo", map[string]string{},
-		map[string]interface{}{
-			"value1": int64(10),
-		},
-		ts,
-	)
-	metrics := []telegraf.Metric{m1, m2}
-
-	r := NewReader(metrics)
-	buf := make([]byte, 60)
-
-	tests := []struct {
-		expRegex string
-		err      error
-		n        int
-	}{
-		{
-			`foo value\d=10i,value\d=10i,value\d=10i 1481032190000000000\n`,
-			nil,
-			57,
-		},
-		{
-			`foo value\d=10i,value\d=10i,value\d=10i 1481032190000000000\n`,
-			nil,
-			57,
-		},
-		{
-			`foo value1=10i 1481032190000000000\n`,
-			io.EOF,
-			35,
-		},
-		{
-			"",
-			io.EOF,
-			0,
-		},
-	}
-
-	for _, test := range tests {
-		n, err := r.Read(buf)
-		assert.Equal(t, test.n, n)
-		re := regexp.MustCompile(test.expRegex)
-		assert.True(t, re.MatchString(string(buf[0:n])), string(buf[0:n]))
-		assert.Equal(t, test.err, err)
-	}
-}
-
-// test split that results in metrics that are still too long, which results in
-// the reader falling back to regular overflow.
-func TestMetricReader_SplitMetricTooLong(t *testing.T) {
-	ts := time.Unix(1481032190, 0)
-	m1, _ := New("foo", map[string]string{},
-		map[string]interface{}{
-			"value1": int64(10),
-			"value2": int64(10),
-		},
-		ts,
-	)
-	metrics := []telegraf.Metric{m1}
-
-	r := NewReader(metrics)
-	buf := make([]byte, 30)
-
-	tests := []struct {
-		expRegex string
-		err      error
-		n        int
-	}{
-		{
-			`foo value\d=10i,value\d=10i 1481`,
-			nil,
-			30,
-		},
-		{
-			`032190000000000\n`,
-			io.EOF,
-			16,
-		},
-		{
-			"",
-			io.EOF,
-			0,
-		},
-	}
-
-	for _, test := range tests {
-		n, err := r.Read(buf)
-		assert.Equal(t, test.n, n)
-		re := regexp.MustCompile(test.expRegex)
-		assert.True(t, re.MatchString(string(buf[0:n])), string(buf[0:n]))
-		assert.Equal(t, test.err, err)
-	}
-}
-
-// test split with a changing buffer size in the middle of subsequent calls
-// to Read
-func TestMetricReader_SplitMetricChangingBuffer(t *testing.T) {
-	ts := time.Unix(1481032190, 0)
-	m1, _ := New("foo", map[string]string{},
-		map[string]interface{}{
-			"value1": int64(10),
-			"value2": int64(10),
-			"value3": int64(10),
-		},
-		ts,
-	)
-	m2, _ := New("foo", map[string]string{},
-		map[string]interface{}{
-			"value1": int64(10),
-		},
-		ts,
-	)
-	metrics := []telegraf.Metric{m1, m2}
-
-	r := NewReader(metrics)
-
-	tests := []struct {
-		expRegex string
-		err      error
-		n        int
-		buf      []byte
-	}{
-		{
-			`foo value\d=10i 1481032190000000000\n`,
-			nil,
-			35,
-			make([]byte, 36),
-		},
-		{
-			`foo value\d=10i 148103219000000`,
-			nil,
-			30,
-			make([]byte, 30),
-		},
-		{
-			`0000\n`,
-			nil,
-			5,
-			make([]byte, 30),
-		},
-		{
-			`foo value\d=10i 1481032190000000000\n`,
-			nil,
-			35,
-			make([]byte, 36),
-		},
-		{
-			`foo value1=10i 1481032190000000000\n`,
-			io.EOF,
-			35,
-			make([]byte, 36),
-		},
-		{
-			"",
-			io.EOF,
-			0,
-			make([]byte, 36),
-		},
-	}
-
-	for _, test := range tests {
-		n, err := r.Read(test.buf)
-		assert.Equal(t, test.n, n, test.expRegex)
-		re := regexp.MustCompile(test.expRegex)
-		assert.True(t, re.MatchString(string(test.buf[0:n])), string(test.buf[0:n]))
-		assert.Equal(t, test.err, err, test.expRegex)
-	}
-}
-
-// test split with a changing buffer size in the middle of subsequent calls
-// to Read
-func TestMetricReader_SplitMetricChangingBuffer2(t *testing.T) {
-	ts := time.Unix(1481032190, 0)
-	m1, _ := New("foo", map[string]string{},
-		map[string]interface{}{
-			"value1": int64(10),
-			"value2": int64(10),
-		},
-		ts,
-	)
-	m2, _ := New("foo", map[string]string{},
-		map[string]interface{}{
-			"value1": int64(10),
-		},
-		ts,
-	)
-	metrics := []telegraf.Metric{m1, m2}
-
-	r := NewReader(metrics)
-
-	tests := []struct {
-		expRegex string
-		err      error
-		n        int
-		buf      []byte
-	}{
-		{
-			`foo value\d=10i 1481032190000000000\n`,
-			nil,
-			35,
-			make([]byte, 36),
-		},
-		{
-			`foo value\d=10i 148103219000000`,
-			nil,
-			30,
-			make([]byte, 30),
-		},
-		{
-			`0000\n`,
-			nil,
-			5,
-			make([]byte, 30),
-		},
-		{
-			`foo value1=10i 1481032190000000000\n`,
-			io.EOF,
-			35,
-			make([]byte, 36),
-		},
-		{
-			"",
-			io.EOF,
-			0,
-			make([]byte, 36),
-		},
-	}
-
-	for _, test := range tests {
-		n, err := r.Read(test.buf)
-		assert.Equal(t, test.n, n, test.expRegex)
-		re := regexp.MustCompile(test.expRegex)
-		assert.True(t, re.MatchString(string(test.buf[0:n])), string(test.buf[0:n]))
-		assert.Equal(t, test.err, err, test.expRegex)
-	}
-}
-
-func TestReader_Read(t *testing.T) {
-	epoch := time.Unix(0, 0)
-
-	type args struct {
-		name   string
-		tags   map[string]string
-		fields map[string]interface{}
-		t      time.Time
-		mType  []telegraf.ValueType
-	}
-	tests := []struct {
-		name     string
-		args     args
-		expected []byte
-	}{
-		{
-			name: "escape backslashes in string field",
-			args: args{
-				name:   "cpu",
-				tags:   map[string]string{},
-				fields: map[string]interface{}{"value": `test\`},
-				t:      epoch,
-			},
-			expected: []byte(`cpu value="test\\" 0`),
-		},
-		{
-			name: "escape quote in string field",
-			args: args{
-				name:   "cpu",
-				tags:   map[string]string{},
-				fields: map[string]interface{}{"value": `test"`},
-				t:      epoch,
-			},
-			expected: []byte(`cpu value="test\"" 0`),
-		},
-		{
-			name: "escape quote and backslash in string field",
-			args: args{
-				name:   "cpu",
-				tags:   map[string]string{},
-				fields: map[string]interface{}{"value": `test\"`},
-				t:      epoch,
-			},
-			expected: []byte(`cpu value="test\\\"" 0`),
-		},
-		{
-			name: "escape multiple backslash in string field",
-			args: args{
-				name:   "cpu",
-				tags:   map[string]string{},
-				fields: map[string]interface{}{"value": `test\\`},
-				t:      epoch,
-			},
-			expected: []byte(`cpu value="test\\\\" 0`),
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			buf := make([]byte, 512)
-			m, err := New(tt.args.name, tt.args.tags, tt.args.fields, tt.args.t, tt.args.mType...)
-			require.NoError(t, err)
-
-			r := NewReader([]telegraf.Metric{m})
-			num, err := r.Read(buf)
-			if err != io.EOF {
-				require.NoError(t, err)
-			}
-			line := string(buf[:num])
-			// This is done so that we can use raw strings in the test spec
-			noeol := strings.TrimRight(line, "\n")
-			require.Equal(t, string(tt.expected), noeol)
-			require.Equal(t, len(tt.expected)+1, num)
-		})
-	}
-}
-
-func TestMetricRoundtrip(t *testing.T) {
-	const lp = `nstat,bu=linux,cls=server,dc=cer,env=production,host=hostname,name=netstat,sr=database IpExtInBcastOctets=12570626154i,IpExtInBcastPkts=95541226i,IpExtInCEPkts=0i,IpExtInCsumErrors=0i,IpExtInECT0Pkts=55674i,IpExtInECT1Pkts=0i,IpExtInMcastOctets=5928296i,IpExtInMcastPkts=174365i,IpExtInNoECTPkts=17965863529i,IpExtInNoRoutes=20i,IpExtInOctets=3334866321815i,IpExtInTruncatedPkts=0i,IpExtOutBcastOctets=0i,IpExtOutBcastPkts=0i,IpExtOutMcastOctets=0i,IpExtOutMcastPkts=0i,IpExtOutOctets=31397892391399i,TcpExtArpFilter=0i,TcpExtBusyPollRxPackets=0i,TcpExtDelayedACKLocked=14094i,TcpExtDelayedACKLost=302083i,TcpExtDelayedACKs=55486507i,TcpExtEmbryonicRsts=11879i,TcpExtIPReversePathFilter=0i,TcpExtListenDrops=1736i,TcpExtListenOverflows=0i,TcpExtLockDroppedIcmps=0i,TcpExtOfoPruned=0i,TcpExtOutOfWindowIcmps=8i,TcpExtPAWSActive=0i,TcpExtPAWSEstab=974i,TcpExtPAWSPassive=0i,TcpExtPruneCalled=0i,TcpExtRcvPruned=0i,TcpExtSyncookiesFailed=12593i,TcpExtSyncookiesRecv=0i,TcpExtSyncookiesSent=0i,TcpExtTCPACKSkippedChallenge=0i,TcpExtTCPACKSkippedFinWait2=0i,TcpExtTCPACKSkippedPAWS=806i,TcpExtTCPACKSkippedSeq=519i,TcpExtTCPACKSkippedSynRecv=0i,TcpExtTCPACKSkippedTimeWait=0i,TcpExtTCPAbortFailed=0i,TcpExtTCPAbortOnClose=22i,TcpExtTCPAbortOnData=36593i,TcpExtTCPAbortOnLinger=0i,TcpExtTCPAbortOnMemory=0i,TcpExtTCPAbortOnTimeout=674i,TcpExtTCPAutoCorking=494253233i,TcpExtTCPBacklogDrop=0i,TcpExtTCPChallengeACK=281i,TcpExtTCPDSACKIgnoredNoUndo=93354i,TcpExtTCPDSACKIgnoredOld=336i,TcpExtTCPDSACKOfoRecv=0i,TcpExtTCPDSACKOfoSent=7i,TcpExtTCPDSACKOldSent=302073i,TcpExtTCPDSACKRecv=215884i,TcpExtTCPDSACKUndo=7633i,TcpExtTCPDeferAcceptDrop=0i,TcpExtTCPDirectCopyFromBacklog=0i,TcpExtTCPDirectCopyFromPrequeue=0i,TcpExtTCPFACKReorder=1320i,TcpExtTCPFastOpenActive=0i,TcpExtTCPFastOpenActiveFail=0i,TcpExtTCPFastOpenCookieReqd=0i,TcpExtTCPFastOpenListenOverflow=0i,TcpExtTCPFastOpenPassive=0i,TcpExtTCPFastOpenPassiveFail=0i,TcpExtTCPFastRetrans=350681i,TcpExtTCPForwardRetrans=142168i,TcpExtTCPFromZeroWindowAdv=4317i,TcpExtTCPFullUndo=29502i,TcpExtTCPHPAcks=10267073000i,TcpExtTCPHPHits=5629837098i,TcpExtTCPHPHitsToUser=0i,TcpExtTCPHystartDelayCwnd=285127i,TcpExtTCPHystartDelayDetect=12318i,TcpExtTCPHystartTrainCwnd=69160570i,TcpExtTCPHystartTrainDetect=3315799i,TcpExtTCPLossFailures=109i,TcpExtTCPLossProbeRecovery=110819i,TcpExtTCPLossProbes=233995i,TcpExtTCPLossUndo=5276i,TcpExtTCPLostRetransmit=397i,TcpExtTCPMD5NotFound=0i,TcpExtTCPMD5Unexpected=0i,TcpExtTCPMemoryPressures=0i,TcpExtTCPMinTTLDrop=0i,TcpExtTCPOFODrop=0i,TcpExtTCPOFOMerge=7i,TcpExtTCPOFOQueue=15196i,TcpExtTCPOrigDataSent=29055119435i,TcpExtTCPPartialUndo=21320i,TcpExtTCPPrequeueDropped=0i,TcpExtTCPPrequeued=0i,TcpExtTCPPureAcks=1236441827i,TcpExtTCPRcvCoalesce=225590473i,TcpExtTCPRcvCollapsed=0i,TcpExtTCPRenoFailures=0i,TcpExtTCPRenoRecovery=0i,TcpExtTCPRenoRecoveryFail=0i,TcpExtTCPRenoReorder=0i,TcpExtTCPReqQFullDoCookies=0i,TcpExtTCPReqQFullDrop=0i,TcpExtTCPRetransFail=41i,TcpExtTCPSACKDiscard=0i,TcpExtTCPSACKReneging=0i,TcpExtTCPSACKReorder=4307i,TcpExtTCPSYNChallenge=244i,TcpExtTCPSackFailures=1698i,TcpExtTCPSackMerged=184668i,TcpExtTCPSackRecovery=97369i,TcpExtTCPSackRecoveryFail=381i,TcpExtTCPSackShiftFallback=2697079i,TcpExtTCPSackShifted=760299i,TcpExtTCPSchedulerFailed=0i,TcpExtTCPSlowStartRetrans=9276i,TcpExtTCPSpuriousRTOs=959i,TcpExtTCPSpuriousRtxHostQueues=2973i,TcpExtTCPSynRetrans=200970i,TcpExtTCPTSReorder=15221i,TcpExtTCPTimeWaitOverflow=0i,TcpExtTCPTimeouts=70127i,TcpExtTCPToZeroWindowAdv=4317i,TcpExtTCPWantZeroWindowAdv=2133i,TcpExtTW=24809813i,TcpExtTWKilled=0i,TcpExtTWRecycled=0i 1496460785000000000
-nstat,bu=linux,cls=server,dc=cer,env=production,host=hostname,name=snmp,sr=database IcmpInAddrMaskReps=0i,IcmpInAddrMasks=90i,IcmpInCsumErrors=0i,IcmpInDestUnreachs=284401i,IcmpInEchoReps=9i,IcmpInEchos=1761912i,IcmpInErrors=407i,IcmpInMsgs=2047767i,IcmpInParmProbs=0i,IcmpInRedirects=0i,IcmpInSrcQuenchs=0i,IcmpInTimeExcds=46i,IcmpInTimestampReps=0i,IcmpInTimestamps=1309i,IcmpMsgInType0=9i,IcmpMsgInType11=46i,IcmpMsgInType13=1309i,IcmpMsgInType17=90i,IcmpMsgInType3=284401i,IcmpMsgInType8=1761912i,IcmpMsgOutType0=1761912i,IcmpMsgOutType14=1248i,IcmpMsgOutType3=108709i,IcmpMsgOutType8=9i,IcmpOutAddrMaskReps=0i,IcmpOutAddrMasks=0i,IcmpOutDestUnreachs=108709i,IcmpOutEchoReps=1761912i,IcmpOutEchos=9i,IcmpOutErrors=0i,IcmpOutMsgs=1871878i,IcmpOutParmProbs=0i,IcmpOutRedirects=0i,IcmpOutSrcQuenchs=0i,IcmpOutTimeExcds=0i,IcmpOutTimestampReps=1248i,IcmpOutTimestamps=0i,IpDefaultTTL=64i,IpForwDatagrams=0i,IpForwarding=2i,IpFragCreates=0i,IpFragFails=0i,IpFragOKs=0i,IpInAddrErrors=0i,IpInDelivers=17658795773i,IpInDiscards=0i,IpInHdrErrors=0i,IpInReceives=17659269339i,IpInUnknownProtos=0i,IpOutDiscards=236976i,IpOutNoRoutes=1009i,IpOutRequests=23466783734i,IpReasmFails=0i,IpReasmOKs=0i,IpReasmReqds=0i,IpReasmTimeout=0i,TcpActiveOpens=23308977i,TcpAttemptFails=3757543i,TcpCurrEstab=280i,TcpEstabResets=184792i,TcpInCsumErrors=0i,TcpInErrs=232i,TcpInSegs=17536573089i,TcpMaxConn=-1i,TcpOutRsts=4051451i,TcpOutSegs=29836254873i,TcpPassiveOpens=176546974i,TcpRetransSegs=878085i,TcpRtoAlgorithm=1i,TcpRtoMax=120000i,TcpRtoMin=200i,UdpInCsumErrors=0i,UdpInDatagrams=24441661i,UdpInErrors=0i,UdpLiteInCsumErrors=0i,UdpLiteInDatagrams=0i,UdpLiteInErrors=0i,UdpLiteNoPorts=0i,UdpLiteOutDatagrams=0i,UdpLiteRcvbufErrors=0i,UdpLiteSndbufErrors=0i,UdpNoPorts=17660i,UdpOutDatagrams=51807896i,UdpRcvbufErrors=0i,UdpSndbufErrors=236922i 1496460785000000000
-`
-	metrics, err := Parse([]byte(lp))
-	require.NoError(t, err)
-	r := NewReader(metrics)
-	buf := make([]byte, 128)
-	_, err = r.Read(buf)
-	require.NoError(t, err)
-	metrics, err = Parse(buf)
-	require.NoError(t, err)
-}
--- a/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/plugins/aggregators/all/all.go
+++ b/plugins/aggregators/all/all.go
@@ -1,7 +0,0 @@
-package all
-
-import (
-	_ "github.com/influxdata/telegraf/plugins/aggregators/basicstats"
-	_ "github.com/influxdata/telegraf/plugins/aggregators/histogram"
-	_ "github.com/influxdata/telegraf/plugins/aggregators/minmax"
-)
--- a/plugins/aggregators/basicstats/README.md
+++ b/plugins/aggregators/basicstats/README.md
@@ -1,43 +0,0 @@
-# BasicStats Aggregator Plugin
-
-The BasicStats aggregator plugin give us count,max,min,mean,s2(variance), stdev for a set of values,
-emitting the aggregate every `period` seconds.
-
-### Configuration:
-
-```toml
-# Keep the aggregate basicstats of each metric passing through.
-[[aggregators.basicstats]]
-  ## General Aggregator Arguments:
-  ## The period on which to flush & clear the aggregator.
-  period = "30s"
-  ## If true, the original metric will be dropped by the
-  ## aggregator and will not get sent to the output plugins.
-  drop_original = false
-```
-
-### Measurements & Fields:
-
- measurement1
-    - field1_count
-    - field1_max
-    - field1_min
-    - field1_mean
-    - field1_s2 (variance)
-    - field1_stdev (standard deviation)
-
-### Tags:
-
-No tags are applied by this aggregator.
-
-### Example Output:
-
-```
-$ telegraf --config telegraf.conf --quiet
-system,host=tars load1=1 1475583980000000000
-system,host=tars load1=1 1475583990000000000
-system,host=tars load1_count=2,load1_max=1,load1_min=1,load1_mean=1,load1_s2=0,load1_stdev=0 1475584010000000000
-system,host=tars load1=1 1475584020000000000
-system,host=tars load1=3 1475584030000000000
-system,host=tars load1_count=2,load1_max=3,load1_min=1,load1_mean=2,load1_s2=2,load1_stdev=1.414162 1475584010000000000
-```
--- a/plugins/aggregators/basicstats/basicstats.go
+++ b/plugins/aggregators/basicstats/basicstats.go
@@ -1,155 +0,0 @@
-package basicstats
-
-import (
-	"math"
-
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/plugins/aggregators"
-)
-
-type BasicStats struct {
-	cache map[uint64]aggregate
-}
-
-func NewBasicStats() telegraf.Aggregator {
-	mm := &BasicStats{}
-	mm.Reset()
-	return mm
-}
-
-type aggregate struct {
-	fields map[string]basicstats
-	name   string
-	tags   map[string]string
-}
-
-type basicstats struct {
-	count float64
-	min   float64
-	max   float64
-	mean  float64
-	M2    float64 //intermedia value for variance/stdev
-}
-
-var sampleConfig = `
-  ## General Aggregator Arguments:
-  ## The period on which to flush & clear the aggregator.
-  period = "30s"
-  ## If true, the original metric will be dropped by the
-  ## aggregator and will not get sent to the output plugins.
-  drop_original = false
-`
-
-func (m *BasicStats) SampleConfig() string {
-	return sampleConfig
-}
-
-func (m *BasicStats) Description() string {
-	return "Keep the aggregate basicstats of each metric passing through."
-}
-
-func (m *BasicStats) Add(in telegraf.Metric) {
-	id := in.HashID()
-	if _, ok := m.cache[id]; !ok {
-		// hit an uncached metric, create caches for first time:
-		a := aggregate{
-			name:   in.Name(),
-			tags:   in.Tags(),
-			fields: make(map[string]basicstats),
-		}
-		for k, v := range in.Fields() {
-			if fv, ok := convert(v); ok {
-				a.fields[k] = basicstats{
-					count: 1,
-					min:   fv,
-					max:   fv,
-					mean:  fv,
-					M2:    0.0,
-				}
-			}
-		}
-		m.cache[id] = a
-	} else {
-		for k, v := range in.Fields() {
-			if fv, ok := convert(v); ok {
-				if _, ok := m.cache[id].fields[k]; !ok {
-					// hit an uncached field of a cached metric
-					m.cache[id].fields[k] = basicstats{
-						count: 1,
-						min:   fv,
-						max:   fv,
-						mean:  fv,
-						M2:    0.0,
-					}
-					continue
-				}
-
-				tmp := m.cache[id].fields[k]
-				//https://en.m.wikipedia.org/wiki/Algorithms_for_calculating_variance
-				//variable initialization
-				x := fv
-				mean := tmp.mean
-				M2 := tmp.M2
-				//counter compute
-				n := tmp.count + 1
-				tmp.count = n
-				//mean compute
-				delta := x - mean
-				mean = mean + delta/n
-				tmp.mean = mean
-				//variance/stdev compute
-				M2 = M2 + delta*(x-mean)
-				tmp.M2 = M2
-				//max/min compute
-				if fv < tmp.min {
-					tmp.min = fv
-				} else if fv > tmp.max {
-					tmp.max = fv
-				}
-				//store final data
-				m.cache[id].fields[k] = tmp
-			}
-		}
-	}
-}
-
-func (m *BasicStats) Push(acc telegraf.Accumulator) {
-	for _, aggregate := range m.cache {
-		fields := map[string]interface{}{}
-		for k, v := range aggregate.fields {
-			fields[k+"_count"] = v.count
-			fields[k+"_min"] = v.min
-			fields[k+"_max"] = v.max
-			fields[k+"_mean"] = v.mean
-			//v.count always >=1
-			if v.count > 1 {
-				variance := v.M2 / (v.count - 1)
-				fields[k+"_s2"] = variance
-				fields[k+"_stdev"] = math.Sqrt(variance)
-			}
-			//if count == 1 StdDev = infinite => so I won't send data
-		}
-		acc.AddFields(aggregate.name, fields, aggregate.tags)
-	}
-}
-
-func (m *BasicStats) Reset() {
-	m.cache = make(map[uint64]aggregate)
-}
-
-func convert(in interface{}) (float64, bool) {
-	switch v := in.(type) {
-	case float64:
-		return v, true
-	case int64:
-		return float64(v), true
-	default:
-		return 0, false
-	}
-}
-
-func init() {
-	aggregators.Add("basicstats", func() telegraf.Aggregator {
-		return NewBasicStats()
-	})
-}
--- a/plugins/aggregators/basicstats/basicstats_test.go
+++ b/plugins/aggregators/basicstats/basicstats_test.go
@@ -1,151 +0,0 @@
-package basicstats
-
-import (
-	"math"
-	"testing"
-	"time"
-
-	"github.com/influxdata/telegraf/metric"
-	"github.com/influxdata/telegraf/testutil"
-)
-
-var m1, _ = metric.New("m1",
-	map[string]string{"foo": "bar"},
-	map[string]interface{}{
-		"a": int64(1),
-		"b": int64(1),
-		"c": float64(2),
-		"d": float64(2),
-	},
-	time.Now(),
-)
-var m2, _ = metric.New("m1",
-	map[string]string{"foo": "bar"},
-	map[string]interface{}{
-		"a":        int64(1),
-		"b":        int64(3),
-		"c":        float64(4),
-		"d":        float64(6),
-		"e":        float64(200),
-		"ignoreme": "string",
-		"andme":    true,
-	},
-	time.Now(),
-)
-
-func BenchmarkApply(b *testing.B) {
-	minmax := NewBasicStats()
-
-	for n := 0; n < b.N; n++ {
-		minmax.Add(m1)
-		minmax.Add(m2)
-	}
-}
-
-// Test two metrics getting added.
-func TestBasicStatsWithPeriod(t *testing.T) {
-	acc := testutil.Accumulator{}
-	minmax := NewBasicStats()
-
-	minmax.Add(m1)
-	minmax.Add(m2)
-	minmax.Push(&acc)
-
-	expectedFields := map[string]interface{}{
-		"a_count": float64(2), //a
-		"a_max":   float64(1),
-		"a_min":   float64(1),
-		"a_mean":  float64(1),
-		"a_stdev": float64(0),
-		"a_s2":    float64(0),
-		"b_count": float64(2), //b
-		"b_max":   float64(3),
-		"b_min":   float64(1),
-		"b_mean":  float64(2),
-		"b_s2":    float64(2),
-		"b_stdev": math.Sqrt(2),
-		"c_count": float64(2), //c
-		"c_max":   float64(4),
-		"c_min":   float64(2),
-		"c_mean":  float64(3),
-		"c_s2":    float64(2),
-		"c_stdev": math.Sqrt(2),
-		"d_count": float64(2), //d
-		"d_max":   float64(6),
-		"d_min":   float64(2),
-		"d_mean":  float64(4),
-		"d_s2":    float64(8),
-		"d_stdev": math.Sqrt(8),
-		"e_count": float64(1), //e
-		"e_max":   float64(200),
-		"e_min":   float64(200),
-		"e_mean":  float64(200),
-	}
-	expectedTags := map[string]string{
-		"foo": "bar",
-	}
-	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
-}
-
-// Test two metrics getting added with a push/reset in between (simulates
-// getting added in different periods.)
-func TestBasicStatsDifferentPeriods(t *testing.T) {
-	acc := testutil.Accumulator{}
-	minmax := NewBasicStats()
-
-	minmax.Add(m1)
-	minmax.Push(&acc)
-	expectedFields := map[string]interface{}{
-		"a_count": float64(1), //a
-		"a_max":   float64(1),
-		"a_min":   float64(1),
-		"a_mean":  float64(1),
-		"b_count": float64(1), //b
-		"b_max":   float64(1),
-		"b_min":   float64(1),
-		"b_mean":  float64(1),
-		"c_count": float64(1), //c
-		"c_max":   float64(2),
-		"c_min":   float64(2),
-		"c_mean":  float64(2),
-		"d_count": float64(1), //d
-		"d_max":   float64(2),
-		"d_min":   float64(2),
-		"d_mean":  float64(2),
-	}
-	expectedTags := map[string]string{
-		"foo": "bar",
-	}
-	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
-
-	acc.ClearMetrics()
-	minmax.Reset()
-	minmax.Add(m2)
-	minmax.Push(&acc)
-	expectedFields = map[string]interface{}{
-		"a_count": float64(1), //a
-		"a_max":   float64(1),
-		"a_min":   float64(1),
-		"a_mean":  float64(1),
-		"b_count": float64(1), //b
-		"b_max":   float64(3),
-		"b_min":   float64(3),
-		"b_mean":  float64(3),
-		"c_count": float64(1), //c
-		"c_max":   float64(4),
-		"c_min":   float64(4),
-		"c_mean":  float64(4),
-		"d_count": float64(1), //d
-		"d_max":   float64(6),
-		"d_min":   float64(6),
-		"d_mean":  float64(6),
-		"e_count": float64(1), //e
-		"e_max":   float64(200),
-		"e_min":   float64(200),
-		"e_mean":  float64(200),
-	}
-	expectedTags = map[string]string{
-		"foo": "bar",
-	}
-	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
-}
--- a/plugins/aggregators/histogram/README.md
+++ b/plugins/aggregators/histogram/README.md
@@ -1,97 +0,0 @@
-# Histogram Aggregator Plugin
-
-The histogram aggregator plugin creates histograms containing the counts of
-field values within a range.
-
-Values added to a bucket are also added to the larger buckets in the
-distribution.  This creates a [cumulative histogram](https://en.wikipedia.org/wiki/Histogram#/media/File:Cumulative_vs_normal_histogram.svg).
-
-Like other Telegraf aggregators, the metric is emitted every `period` seconds.
-Bucket counts however are not reset between periods and will be non-strictly
-increasing while Telegraf is running.
-
-#### Design
-
-Each metric is passed to the aggregator and this aggregator searches
-histogram buckets for those fields, which have been specified in the
-config. If buckets are found, the aggregator will increment +1 to the appropriate
-bucket otherwise it will be added to the `+Inf` bucket.  Every `period`
-seconds this data will be forwarded to the outputs.
-
-The algorithm of hit counting to buckets was implemented on the base
-of the algorithm which is implemented in the Prometheus
-[client](https://github.com/prometheus/client_golang/blob/master/prometheus/histogram.go).
-
-### Configuration
-
-```toml
-# Configuration for aggregate histogram metrics
-[[aggregators.histogram]]
-  ## The period in which to flush the aggregator.
-  period = "30s"
-
-  ## If true, the original metric will be dropped by the
-  ## aggregator and will not get sent to the output plugins.
-  drop_original = false
-
-  ## Example config that aggregates all fields of the metric.
-  # [[aggregators.histogram.config]]
-  #   ## The set of buckets.
-  #   buckets = [0.0, 15.6, 34.5, 49.1, 71.5, 80.5, 94.5, 100.0]
-  #   ## The name of metric.
-  #   measurement_name = "cpu"
-
-  ## Example config that aggregates only specific fields of the metric.
-  # [[aggregators.histogram.config]]
-  #   ## The set of buckets.
-  #   buckets = [0.0, 10.0, 20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0]
-  #   ## The name of metric.
-  #   measurement_name = "diskio"
-  #   ## The concrete fields of metric
-  #   fields = ["io_time", "read_time", "write_time"]
-```
-
-The user is responsible for defining the bounds of the histogram bucket as
-well as the measurement name and fields to aggregate.
-
-Each histogram config section must contain a `buckets` and `measurement_name`
-option.  Optionally, if `fields` is set only the fields listed will be
-aggregated.  If `fields` is not set all fields are aggregated.
-
-The `buckets` option contains a list of floats which specify the bucket
-boundaries.  Each float value defines the inclusive upper bound of the bucket.
-The `+Inf` bucket is added automatically and does not need to be defined.
-
-### Measurements & Fields:
-
-The postfix `bucket` will be added to each field key.
-
- measurement1
-    - field1_bucket
-    - field2_bucket
-
-### Tags:
-
-All measurements are given the tag `le`. This tag has the border value of
-bucket. It means that the metric value is less than or equal to the value of
-this tag.  For example, let assume that we have the metric value 10 and the
-following buckets: [5, 10, 30, 70, 100]. Then the tag `le` will have the value
-10, because the metrics value is passed into bucket with right border value
-`10`.
-
-### Example Output:
-
-```
-cpu,cpu=cpu1,host=localhost,le=0.0 usage_idle_bucket=0i 1486998330000000000
-cpu,cpu=cpu1,host=localhost,le=10.0 usage_idle_bucket=0i 1486998330000000000
-cpu,cpu=cpu1,host=localhost,le=20.0 usage_idle_bucket=1i 1486998330000000000
-cpu,cpu=cpu1,host=localhost,le=30.0 usage_idle_bucket=2i 1486998330000000000
-cpu,cpu=cpu1,host=localhost,le=40.0 usage_idle_bucket=2i 1486998330000000000
-cpu,cpu=cpu1,host=localhost,le=50.0 usage_idle_bucket=2i 1486998330000000000
-cpu,cpu=cpu1,host=localhost,le=60.0 usage_idle_bucket=2i 1486998330000000000
-cpu,cpu=cpu1,host=localhost,le=70.0 usage_idle_bucket=2i 1486998330000000000
-cpu,cpu=cpu1,host=localhost,le=80.0 usage_idle_bucket=2i 1486998330000000000
-cpu,cpu=cpu1,host=localhost,le=90.0 usage_idle_bucket=2i 1486998330000000000
-cpu,cpu=cpu1,host=localhost,le=100.0 usage_idle_bucket=2i 1486998330000000000
-cpu,cpu=cpu1,host=localhost,le=+Inf usage_idle_bucket=2i 1486998330000000000
-```
--- a/plugins/aggregators/histogram/histogram.go
+++ b/plugins/aggregators/histogram/histogram.go
@@ -1,315 +0,0 @@
-package histogram
-
-import (
-	"sort"
-	"strconv"
-
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/plugins/aggregators"
-)
-
-// bucketTag is the tag, which contains right bucket border
-const bucketTag = "le"
-
-// bucketInf is the right bucket border for infinite values
-const bucketInf = "+Inf"
-
-// HistogramAggregator is aggregator with histogram configs and particular histograms for defined metrics
-type HistogramAggregator struct {
-	Configs []config `toml:"config"`
-
-	buckets bucketsByMetrics
-	cache   map[uint64]metricHistogramCollection
-}
-
-// config is the config, which contains name, field of metric and histogram buckets.
-type config struct {
-	Metric  string   `toml:"measurement_name"`
-	Fields  []string `toml:"fields"`
-	Buckets buckets  `toml:"buckets"`
-}
-
-// bucketsByMetrics contains the buckets grouped by metric and field name
-type bucketsByMetrics map[string]bucketsByFields
-
-// bucketsByFields contains the buckets grouped by field name
-type bucketsByFields map[string]buckets
-
-// buckets contains the right borders buckets
-type buckets []float64
-
-// metricHistogramCollection aggregates the histogram data
-type metricHistogramCollection struct {
-	histogramCollection map[string]counts
-	name                string
-	tags                map[string]string
-}
-
-// counts is the number of hits in the bucket
-type counts []int64
-
-// groupedByCountFields contains grouped fields by their count and fields values
-type groupedByCountFields struct {
-	name            string
-	tags            map[string]string
-	fieldsWithCount map[string]int64
-}
-
-// NewHistogramAggregator creates new histogram aggregator
-func NewHistogramAggregator() telegraf.Aggregator {
-	h := &HistogramAggregator{}
-	h.buckets = make(bucketsByMetrics)
-	h.resetCache()
-
-	return h
-}
-
-var sampleConfig = `
-  ## The period in which to flush the aggregator.
-  period = "30s"
-
-  ## If true, the original metric will be dropped by the
-  ## aggregator and will not get sent to the output plugins.
-  drop_original = false
-
-  ## Example config that aggregates all fields of the metric.
-  # [[aggregators.histogram.config]]
-  #   ## The set of buckets.
-  #   buckets = [0.0, 15.6, 34.5, 49.1, 71.5, 80.5, 94.5, 100.0]
-  #   ## The name of metric.
-  #   measurement_name = "cpu"
-
-  ## Example config that aggregates only specific fields of the metric.
-  # [[aggregators.histogram.config]]
-  #   ## The set of buckets.
-  #   buckets = [0.0, 10.0, 20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0]
-  #   ## The name of metric.
-  #   measurement_name = "diskio"
-  #   ## The concrete fields of metric
-  #   fields = ["io_time", "read_time", "write_time"]
-`
-
-// SampleConfig returns sample of config
-func (h *HistogramAggregator) SampleConfig() string {
-	return sampleConfig
-}
-
-// Description returns description of aggregator plugin
-func (h *HistogramAggregator) Description() string {
-	return "Create aggregate histograms."
-}
-
-// Add adds new hit to the buckets
-func (h *HistogramAggregator) Add(in telegraf.Metric) {
-	bucketsByField := make(map[string][]float64)
-	for field := range in.Fields() {
-		buckets := h.getBuckets(in.Name(), field)
-		if buckets != nil {
-			bucketsByField[field] = buckets
-		}
-	}
-
-	if len(bucketsByField) == 0 {
-		return
-	}
-
-	id := in.HashID()
-	agr, ok := h.cache[id]
-	if !ok {
-		agr = metricHistogramCollection{
-			name:                in.Name(),
-			tags:                in.Tags(),
-			histogramCollection: make(map[string]counts),
-		}
-	}
-
-	for field, value := range in.Fields() {
-		if buckets, ok := bucketsByField[field]; ok {
-			if agr.histogramCollection[field] == nil {
-				agr.histogramCollection[field] = make(counts, len(buckets)+1)
-			}
-
-			if value, ok := convert(value); ok {
-				index := sort.SearchFloat64s(buckets, value)
-				agr.histogramCollection[field][index]++
-			}
-		}
-	}
-
-	h.cache[id] = agr
-}
-
-// Push returns histogram values for metrics
-func (h *HistogramAggregator) Push(acc telegraf.Accumulator) {
-	metricsWithGroupedFields := []groupedByCountFields{}
-
-	for _, aggregate := range h.cache {
-		for field, counts := range aggregate.histogramCollection {
-			h.groupFieldsByBuckets(&metricsWithGroupedFields, aggregate.name, field, copyTags(aggregate.tags), counts)
-		}
-	}
-
-	for _, metric := range metricsWithGroupedFields {
-		acc.AddFields(metric.name, makeFieldsWithCount(metric.fieldsWithCount), metric.tags)
-	}
-}
-
-// groupFieldsByBuckets groups fields by metric buckets which are represented as tags
-func (h *HistogramAggregator) groupFieldsByBuckets(
-	metricsWithGroupedFields *[]groupedByCountFields,
-	name string,
-	field string,
-	tags map[string]string,
-	counts []int64,
-) {
-	count := int64(0)
-	for index, bucket := range h.getBuckets(name, field) {
-		count += counts[index]
-
-		tags[bucketTag] = strconv.FormatFloat(bucket, 'f', -1, 64)
-		h.groupField(metricsWithGroupedFields, name, field, count, copyTags(tags))
-	}
-
-	count += counts[len(counts)-1]
-	tags[bucketTag] = bucketInf
-
-	h.groupField(metricsWithGroupedFields, name, field, count, tags)
-}
-
-// groupField groups field by count value
-func (h *HistogramAggregator) groupField(
-	metricsWithGroupedFields *[]groupedByCountFields,
-	name string,
-	field string,
-	count int64,
-	tags map[string]string,
-) {
-	for key, metric := range *metricsWithGroupedFields {
-		if name == metric.name && isTagsIdentical(tags, metric.tags) {
-			(*metricsWithGroupedFields)[key].fieldsWithCount[field] = count
-			return
-		}
-	}
-
-	fieldsWithCount := map[string]int64{
-		field: count,
-	}
-
-	*metricsWithGroupedFields = append(
-		*metricsWithGroupedFields,
-		groupedByCountFields{name: name, tags: tags, fieldsWithCount: fieldsWithCount},
-	)
-}
-
-// Reset does nothing, because we need to collect counts for a long time, otherwise if config parameter 'reset' has
-// small value, we will get a histogram with a small amount of the distribution.
-func (h *HistogramAggregator) Reset() {}
-
-// resetCache resets cached counts(hits) in the buckets
-func (h *HistogramAggregator) resetCache() {
-	h.cache = make(map[uint64]metricHistogramCollection)
-}
-
-// getBuckets finds buckets and returns them
-func (h *HistogramAggregator) getBuckets(metric string, field string) []float64 {
-	if buckets, ok := h.buckets[metric][field]; ok {
-		return buckets
-	}
-
-	for _, config := range h.Configs {
-		if config.Metric == metric {
-			if !isBucketExists(field, config) {
-				continue
-			}
-
-			if _, ok := h.buckets[metric]; !ok {
-				h.buckets[metric] = make(bucketsByFields)
-			}
-
-			h.buckets[metric][field] = sortBuckets(config.Buckets)
-		}
-	}
-
-	return h.buckets[metric][field]
-}
-
-// isBucketExists checks if buckets exists for the passed field
-func isBucketExists(field string, cfg config) bool {
-	if len(cfg.Fields) == 0 {
-		return true
-	}
-
-	for _, fl := range cfg.Fields {
-		if fl == field {
-			return true
-		}
-	}
-
-	return false
-}
-
-// sortBuckets sorts the buckets if it is needed
-func sortBuckets(buckets []float64) []float64 {
-	for i, bucket := range buckets {
-		if i < len(buckets)-1 && bucket >= buckets[i+1] {
-			sort.Float64s(buckets)
-			break
-		}
-	}
-
-	return buckets
-}
-
-// convert converts interface to concrete type
-func convert(in interface{}) (float64, bool) {
-	switch v := in.(type) {
-	case float64:
-		return v, true
-	case int64:
-		return float64(v), true
-	default:
-		return 0, false
-	}
-}
-
-// copyTags copies tags
-func copyTags(tags map[string]string) map[string]string {
-	copiedTags := map[string]string{}
-	for key, val := range tags {
-		copiedTags[key] = val
-	}
-
-	return copiedTags
-}
-
-// isTagsIdentical checks the identity of two list of tags
-func isTagsIdentical(originalTags, checkedTags map[string]string) bool {
-	if len(originalTags) != len(checkedTags) {
-		return false
-	}
-
-	for tagName, tagValue := range originalTags {
-		if tagValue != checkedTags[tagName] {
-			return false
-		}
-	}
-
-	return true
-}
-
-// makeFieldsWithCount assigns count value to all metric fields
-func makeFieldsWithCount(fieldsWithCountIn map[string]int64) map[string]interface{} {
-	fieldsWithCountOut := map[string]interface{}{}
-	for field, count := range fieldsWithCountIn {
-		fieldsWithCountOut[field+"_bucket"] = count
-	}
-
-	return fieldsWithCountOut
-}
-
-// init initializes histogram aggregator plugin
-func init() {
-	aggregators.Add("histogram", func() telegraf.Aggregator {
-		return NewHistogramAggregator()
-	})
-}
--- a/plugins/aggregators/histogram/histogram_test.go
+++ b/plugins/aggregators/histogram/histogram_test.go
@@ -1,210 +0,0 @@
-package histogram
-
-import (
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/metric"
-	"github.com/influxdata/telegraf/testutil"
-	"github.com/stretchr/testify/assert"
-)
-
-// NewTestHistogram creates new test histogram aggregation with specified config
-func NewTestHistogram(cfg []config) telegraf.Aggregator {
-	htm := &HistogramAggregator{Configs: cfg}
-	htm.buckets = make(bucketsByMetrics)
-	htm.resetCache()
-
-	return htm
-}
-
-// firstMetric1 is the first test metric
-var firstMetric1, _ = metric.New(
-	"first_metric_name",
-	map[string]string{"tag_name": "tag_value"},
-	map[string]interface{}{
-		"a": float64(15.3),
-		"b": float64(40),
-	},
-	time.Now(),
-)
-
-// firstMetric1 is the first test metric with other value
-var firstMetric2, _ = metric.New(
-	"first_metric_name",
-	map[string]string{"tag_name": "tag_value"},
-	map[string]interface{}{
-		"a": float64(15.9),
-		"c": float64(40),
-	},
-	time.Now(),
-)
-
-// secondMetric is the second metric
-var secondMetric, _ = metric.New(
-	"second_metric_name",
-	map[string]string{"tag_name": "tag_value"},
-	map[string]interface{}{
-		"a":        float64(105),
-		"ignoreme": "string",
-		"andme":    true,
-	},
-	time.Now(),
-)
-
-// BenchmarkApply runs benchmarks
-func BenchmarkApply(b *testing.B) {
-	histogram := NewHistogramAggregator()
-
-	for n := 0; n < b.N; n++ {
-		histogram.Add(firstMetric1)
-		histogram.Add(firstMetric2)
-		histogram.Add(secondMetric)
-	}
-}
-
-// TestHistogramWithPeriodAndOneField tests metrics for one period and for one field
-func TestHistogramWithPeriodAndOneField(t *testing.T) {
-	var cfg []config
-	cfg = append(cfg, config{Metric: "first_metric_name", Fields: []string{"a"}, Buckets: []float64{0.0, 10.0, 20.0, 30.0, 40.0}})
-	histogram := NewTestHistogram(cfg)
-
-	acc := &testutil.Accumulator{}
-
-	histogram.Add(firstMetric1)
-	histogram.Add(firstMetric2)
-	histogram.Push(acc)
-
-	if len(acc.Metrics) != 6 {
-		assert.Fail(t, "Incorrect number of metrics")
-	}
-	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(0)}, "0")
-	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(0)}, "10")
-	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2)}, "20")
-	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2)}, "30")
-	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2)}, "40")
-	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2)}, bucketInf)
-}
-
-// TestHistogramWithPeriodAndAllFields tests two metrics for one period and for all fields
-func TestHistogramWithPeriodAndAllFields(t *testing.T) {
-	var cfg []config
-	cfg = append(cfg, config{Metric: "first_metric_name", Buckets: []float64{0.0, 15.5, 20.0, 30.0, 40.0}})
-	cfg = append(cfg, config{Metric: "second_metric_name", Buckets: []float64{0.0, 4.0, 10.0, 23.0, 30.0}})
-	histogram := NewTestHistogram(cfg)
-
-	acc := &testutil.Accumulator{}
-
-	histogram.Add(firstMetric1)
-	histogram.Add(firstMetric2)
-	histogram.Add(secondMetric)
-	histogram.Push(acc)
-
-	if len(acc.Metrics) != 12 {
-		assert.Fail(t, "Incorrect number of metrics")
-	}
-
-	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(0), "b_bucket": int64(0), "c_bucket": int64(0)}, "0")
-	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(1), "b_bucket": int64(0), "c_bucket": int64(0)}, "15.5")
-	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2), "b_bucket": int64(0), "c_bucket": int64(0)}, "20")
-	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2), "b_bucket": int64(0), "c_bucket": int64(0)}, "30")
-	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2), "b_bucket": int64(1), "c_bucket": int64(1)}, "40")
-	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2), "b_bucket": int64(1), "c_bucket": int64(1)}, bucketInf)
-
-	assertContainsTaggedField(t, acc, "second_metric_name", map[string]interface{}{"a_bucket": int64(0), "ignoreme_bucket": int64(0), "andme_bucket": int64(0)}, "0")
-	assertContainsTaggedField(t, acc, "second_metric_name", map[string]interface{}{"a_bucket": int64(0), "ignoreme_bucket": int64(0), "andme_bucket": int64(0)}, "4")
-	assertContainsTaggedField(t, acc, "second_metric_name", map[string]interface{}{"a_bucket": int64(0), "ignoreme_bucket": int64(0), "andme_bucket": int64(0)}, "10")
-	assertContainsTaggedField(t, acc, "second_metric_name", map[string]interface{}{"a_bucket": int64(0), "ignoreme_bucket": int64(0), "andme_bucket": int64(0)}, "23")
-	assertContainsTaggedField(t, acc, "second_metric_name", map[string]interface{}{"a_bucket": int64(0), "ignoreme_bucket": int64(0), "andme_bucket": int64(0)}, "30")
-	assertContainsTaggedField(t, acc, "second_metric_name", map[string]interface{}{"a_bucket": int64(1), "ignoreme_bucket": int64(0), "andme_bucket": int64(0)}, bucketInf)
-}
-
-// TestHistogramDifferentPeriodsAndAllFields tests two metrics getting added with a push/reset in between (simulates
-// getting added in different periods) for all fields
-func TestHistogramDifferentPeriodsAndAllFields(t *testing.T) {
-
-	var cfg []config
-	cfg = append(cfg, config{Metric: "first_metric_name", Buckets: []float64{0.0, 10.0, 20.0, 30.0, 40.0}})
-	histogram := NewTestHistogram(cfg)
-
-	acc := &testutil.Accumulator{}
-	histogram.Add(firstMetric1)
-	histogram.Push(acc)
-
-	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(0), "b_bucket": int64(0)}, "0")
-	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(0), "b_bucket": int64(0)}, "10")
-	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(1), "b_bucket": int64(0)}, "20")
-	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(1), "b_bucket": int64(0)}, "30")
-	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(1), "b_bucket": int64(1)}, "40")
-	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(1), "b_bucket": int64(1)}, bucketInf)
-
-	acc.ClearMetrics()
-	histogram.Add(firstMetric2)
-	histogram.Push(acc)
-
-	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(0), "b_bucket": int64(0), "c_bucket": int64(0)}, "0")
-	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(0), "b_bucket": int64(0), "c_bucket": int64(0)}, "10")
-	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2), "b_bucket": int64(0), "c_bucket": int64(0)}, "20")
-	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2), "b_bucket": int64(0), "c_bucket": int64(0)}, "30")
-	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2), "b_bucket": int64(1), "c_bucket": int64(1)}, "40")
-	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2), "b_bucket": int64(1), "c_bucket": int64(1)}, bucketInf)
-}
-
-// TestWrongBucketsOrder tests the calling panic with incorrect order of buckets
-func TestWrongBucketsOrder(t *testing.T) {
-	defer func() {
-		if r := recover(); r != nil {
-			assert.Equal(
-				t,
-				"histogram buckets must be in increasing order: 90.00 >= 20.00, metrics: first_metric_name, field: a",
-				fmt.Sprint(r),
-			)
-		}
-	}()
-
-	var cfg []config
-	cfg = append(cfg, config{Metric: "first_metric_name", Buckets: []float64{0.0, 90.0, 20.0, 30.0, 40.0}})
-	histogram := NewTestHistogram(cfg)
-	histogram.Add(firstMetric2)
-}
-
-// assertContainsTaggedField is help functions to test histogram data
-func assertContainsTaggedField(t *testing.T, acc *testutil.Accumulator, metricName string, fields map[string]interface{}, le string) {
-	acc.Lock()
-	defer acc.Unlock()
-
-	for _, checkedMetric := range acc.Metrics {
-		// check metric name
-		if checkedMetric.Measurement != metricName {
-			continue
-		}
-
-		// check "le" tag
-		if checkedMetric.Tags[bucketTag] != le {
-			continue
-		}
-
-		// check fields
-		isFieldsIdentical := true
-		for field := range fields {
-			if _, ok := checkedMetric.Fields[field]; !ok {
-				isFieldsIdentical = false
-				break
-			}
-		}
-		if !isFieldsIdentical {
-			continue
-		}
-
-		// check fields with their counts
-		if assert.Equal(t, fields, checkedMetric.Fields) {
-			return
-		}
-
-		assert.Fail(t, fmt.Sprintf("incorrect fields %v of metric %s", fields, metricName))
-	}
-
-	assert.Fail(t, fmt.Sprintf("unknown measurement '%s' with tags: %v, fields: %v", metricName, map[string]string{"le": le}, fields))
-}
--- a/plugins/aggregators/minmax/README.md
+++ b/plugins/aggregators/minmax/README.md
@@ -1,42 +0,0 @@
-# MinMax Aggregator Plugin
-
-The minmax aggregator plugin aggregates min & max values of each field it sees,
-emitting the aggrate every `period` seconds.
-
-### Configuration:
-
-```toml
-# Keep the aggregate min/max of each metric passing through.
-[[aggregators.minmax]]
-  ## General Aggregator Arguments:
-  ## The period on which to flush & clear the aggregator.
-  period = "30s"
-  ## If true, the original metric will be dropped by the
-  ## aggregator and will not get sent to the output plugins.
-  drop_original = false
-```
-
-### Measurements & Fields:
-
- measurement1
-    - field1_max
-    - field1_min
-
-### Tags:
-
-No tags are applied by this aggregator.
-
-### Example Output:
-
-```
-$ telegraf --config telegraf.conf --quiet
-system,host=tars load1=1.72 1475583980000000000
-system,host=tars load1=1.6 1475583990000000000
-system,host=tars load1=1.66 1475584000000000000
-system,host=tars load1=1.63 1475584010000000000
-system,host=tars load1_max=1.72,load1_min=1.6 1475584010000000000
-system,host=tars load1=1.46 1475584020000000000
-system,host=tars load1=1.39 1475584030000000000
-system,host=tars load1=1.41 1475584040000000000
-system,host=tars load1_max=1.46,load1_min=1.39 1475584040000000000
-```
--- a/plugins/aggregators/minmax/minmax.go
+++ b/plugins/aggregators/minmax/minmax.go
@@ -1,119 +0,0 @@
-package minmax
-
-import (
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/plugins/aggregators"
-)
-
-type MinMax struct {
-	cache map[uint64]aggregate
-}
-
-func NewMinMax() telegraf.Aggregator {
-	mm := &MinMax{}
-	mm.Reset()
-	return mm
-}
-
-type aggregate struct {
-	fields map[string]minmax
-	name   string
-	tags   map[string]string
-}
-
-type minmax struct {
-	min float64
-	max float64
-}
-
-var sampleConfig = `
-  ## General Aggregator Arguments:
-  ## The period on which to flush & clear the aggregator.
-  period = "30s"
-  ## If true, the original metric will be dropped by the
-  ## aggregator and will not get sent to the output plugins.
-  drop_original = false
-`
-
-func (m *MinMax) SampleConfig() string {
-	return sampleConfig
-}
-
-func (m *MinMax) Description() string {
-	return "Keep the aggregate min/max of each metric passing through."
-}
-
-func (m *MinMax) Add(in telegraf.Metric) {
-	id := in.HashID()
-	if _, ok := m.cache[id]; !ok {
-		// hit an uncached metric, create caches for first time:
-		a := aggregate{
-			name:   in.Name(),
-			tags:   in.Tags(),
-			fields: make(map[string]minmax),
-		}
-		for k, v := range in.Fields() {
-			if fv, ok := convert(v); ok {
-				a.fields[k] = minmax{
-					min: fv,
-					max: fv,
-				}
-			}
-		}
-		m.cache[id] = a
-	} else {
-		for k, v := range in.Fields() {
-			if fv, ok := convert(v); ok {
-				if _, ok := m.cache[id].fields[k]; !ok {
-					// hit an uncached field of a cached metric
-					m.cache[id].fields[k] = minmax{
-						min: fv,
-						max: fv,
-					}
-					continue
-				}
-				if fv < m.cache[id].fields[k].min {
-					tmp := m.cache[id].fields[k]
-					tmp.min = fv
-					m.cache[id].fields[k] = tmp
-				} else if fv > m.cache[id].fields[k].max {
-					tmp := m.cache[id].fields[k]
-					tmp.max = fv
-					m.cache[id].fields[k] = tmp
-				}
-			}
-		}
-	}
-}
-
-func (m *MinMax) Push(acc telegraf.Accumulator) {
-	for _, aggregate := range m.cache {
-		fields := map[string]interface{}{}
-		for k, v := range aggregate.fields {
-			fields[k+"_min"] = v.min
-			fields[k+"_max"] = v.max
-		}
-		acc.AddFields(aggregate.name, fields, aggregate.tags)
-	}
-}
-
-func (m *MinMax) Reset() {
-	m.cache = make(map[uint64]aggregate)
-}
-
-func convert(in interface{}) (float64, bool) {
-	switch v := in.(type) {
-	case float64:
-		return v, true
-	case int64:
-		return float64(v), true
-	default:
-		return 0, false
-	}
-}
-
-func init() {
-	aggregators.Add("minmax", func() telegraf.Aggregator {
-		return NewMinMax()
-	})
-}
--- a/plugins/aggregators/minmax/minmax_test.go
+++ b/plugins/aggregators/minmax/minmax_test.go
@@ -1,162 +0,0 @@
-package minmax
-
-import (
-	"testing"
-	"time"
-
-	"github.com/influxdata/telegraf/metric"
-	"github.com/influxdata/telegraf/testutil"
-)
-
-var m1, _ = metric.New("m1",
-	map[string]string{"foo": "bar"},
-	map[string]interface{}{
-		"a": int64(1),
-		"b": int64(1),
-		"c": int64(1),
-		"d": int64(1),
-		"e": int64(1),
-		"f": float64(2),
-		"g": float64(2),
-		"h": float64(2),
-		"i": float64(2),
-		"j": float64(3),
-	},
-	time.Now(),
-)
-var m2, _ = metric.New("m1",
-	map[string]string{"foo": "bar"},
-	map[string]interface{}{
-		"a":        int64(1),
-		"b":        int64(3),
-		"c":        int64(3),
-		"d":        int64(3),
-		"e":        int64(3),
-		"f":        float64(1),
-		"g":        float64(1),
-		"h":        float64(1),
-		"i":        float64(1),
-		"j":        float64(1),
-		"k":        float64(200),
-		"ignoreme": "string",
-		"andme":    true,
-	},
-	time.Now(),
-)
-
-func BenchmarkApply(b *testing.B) {
-	minmax := NewMinMax()
-
-	for n := 0; n < b.N; n++ {
-		minmax.Add(m1)
-		minmax.Add(m2)
-	}
-}
-
-// Test two metrics getting added.
-func TestMinMaxWithPeriod(t *testing.T) {
-	acc := testutil.Accumulator{}
-	minmax := NewMinMax()
-
-	minmax.Add(m1)
-	minmax.Add(m2)
-	minmax.Push(&acc)
-
-	expectedFields := map[string]interface{}{
-		"a_max": float64(1),
-		"a_min": float64(1),
-		"b_max": float64(3),
-		"b_min": float64(1),
-		"c_max": float64(3),
-		"c_min": float64(1),
-		"d_max": float64(3),
-		"d_min": float64(1),
-		"e_max": float64(3),
-		"e_min": float64(1),
-		"f_max": float64(2),
-		"f_min": float64(1),
-		"g_max": float64(2),
-		"g_min": float64(1),
-		"h_max": float64(2),
-		"h_min": float64(1),
-		"i_max": float64(2),
-		"i_min": float64(1),
-		"j_max": float64(3),
-		"j_min": float64(1),
-		"k_max": float64(200),
-		"k_min": float64(200),
-	}
-	expectedTags := map[string]string{
-		"foo": "bar",
-	}
-	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
-}
-
-// Test two metrics getting added with a push/reset in between (simulates
-// getting added in different periods.)
-func TestMinMaxDifferentPeriods(t *testing.T) {
-	acc := testutil.Accumulator{}
-	minmax := NewMinMax()
-
-	minmax.Add(m1)
-	minmax.Push(&acc)
-	expectedFields := map[string]interface{}{
-		"a_max": float64(1),
-		"a_min": float64(1),
-		"b_max": float64(1),
-		"b_min": float64(1),
-		"c_max": float64(1),
-		"c_min": float64(1),
-		"d_max": float64(1),
-		"d_min": float64(1),
-		"e_max": float64(1),
-		"e_min": float64(1),
-		"f_max": float64(2),
-		"f_min": float64(2),
-		"g_max": float64(2),
-		"g_min": float64(2),
-		"h_max": float64(2),
-		"h_min": float64(2),
-		"i_max": float64(2),
-		"i_min": float64(2),
-		"j_max": float64(3),
-		"j_min": float64(3),
-	}
-	expectedTags := map[string]string{
-		"foo": "bar",
-	}
-	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
-
-	acc.ClearMetrics()
-	minmax.Reset()
-	minmax.Add(m2)
-	minmax.Push(&acc)
-	expectedFields = map[string]interface{}{
-		"a_max": float64(1),
-		"a_min": float64(1),
-		"b_max": float64(3),
-		"b_min": float64(3),
-		"c_max": float64(3),
-		"c_min": float64(3),
-		"d_max": float64(3),
-		"d_min": float64(3),
-		"e_max": float64(3),
-		"e_min": float64(3),
-		"f_max": float64(1),
-		"f_min": float64(1),
-		"g_max": float64(1),
-		"g_min": float64(1),
-		"h_max": float64(1),
-		"h_min": float64(1),
-		"i_max": float64(1),
-		"i_min": float64(1),
-		"j_max": float64(1),
-		"j_min": float64(1),
-		"k_max": float64(200),
-		"k_min": float64(200),
-	}
-	expectedTags = map[string]string{
-		"foo": "bar",
-	}
-	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
-}
--- a/plugins/aggregators/registry.go
+++ b/plugins/aggregators/registry.go
@@ -1,11 +0,0 @@
-package aggregators
-
-import "github.com/influxdata/telegraf"
-
-type Creator func() telegraf.Aggregator
-
-var Aggregators = map[string]Creator{}
-
-func Add(name string, creator Creator) {
-	Aggregators[name] = creator
-}
--- a/plugins/inputs/EXAMPLE_README.md
+++ b/plugins/inputs/EXAMPLE_README.md
@@ -1,61 +1,39 @@
 # Example Input Plugin

-The example plugin gathers metrics about example things.  This description
-explains at a high level what the plugin does and provides links to where
-additional information can be found.
+The example plugin gathers metrics about example things

 ### Configuration:

-This section contains the default TOML to configure the plugin.  You can
-generate it using `telegraf --usage <plugin-name>`.
-
 ```toml
 # Description
 [[inputs.example]]
-  example_option = "example_value"
+  # SampleConfig
 ```

-### Metrics:
+### Measurements & Fields:

-Here you should add an optional description and links to where the user can
-get more information about the measurements.
-
-If the output is determined dynamically based on the input source, or there
-are more metrics than can reasonably be listed, describe how the input is
-mapped to the output.
+<optional description>

 - measurement1
-  - tags:
-    - tag1 (optional description)
-    - tag2
-  - fields:
    - field1 (type, unit)
    - field2 (float, percent)
-
 - measurement2
-  - tags:
-    - tag3
-  - fields:
    - field3 (integer, bytes)

-### Sample Queries:
+### Tags:

-This section should contain some useful InfluxDB queries that can be used to
-get started with the plugin or to generate dashboards.  For each query listed,
-describe at a high level what data is returned.
-
-Get the max, mean, and min for the measurement in the last hour:
-```
-SELECT max(field1), mean(field1), min(field1) FROM measurement1 WHERE tag1=bar AND time > now() - 1h GROUP BY tag
-```
+- All measurements have the following tags:
+    - tag1 (optional description)
+    - tag2
+- measurement2 has the following tags:
+    - tag3

 ### Example Output:

-This section shows example output in Line Protocol format.  You can often use
-`telegraf --input-filter <plugin-name> --test` or use the `file` output to get
-this information.
+Give an example `-test` output here

 ```
+$ ./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
@@ -1,20 +1,104 @@
 package aerospike

 import (
-	"errors"
-	"log"
+	"bytes"
+	"encoding/binary"
+	"fmt"
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
 	"net"
 	"strconv"
 	"strings"
 	"sync"
-	"time"
-
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/plugins/inputs"
-
-	as "github.com/aerospike/aerospike-client-go"
 )

+const (
+	MSG_HEADER_SIZE = 8
+	MSG_TYPE        = 1 // Info is 1
+	MSG_VERSION     = 2
+)
+
+var (
+	STATISTICS_COMMAND = []byte("statistics\n")
+	NAMESPACES_COMMAND = []byte("namespaces\n")
+)
+
+type aerospikeMessageHeader struct {
+	Version uint8
+	Type    uint8
+	DataLen [6]byte
+}
+
+type aerospikeMessage struct {
+	aerospikeMessageHeader
+	Data []byte
+}
+
+// Taken from aerospike-client-go/types/message.go
+func (msg *aerospikeMessage) Serialize() []byte {
+	msg.DataLen = msgLenToBytes(int64(len(msg.Data)))
+	buf := bytes.NewBuffer([]byte{})
+	binary.Write(buf, binary.BigEndian, msg.aerospikeMessageHeader)
+	binary.Write(buf, binary.BigEndian, msg.Data[:])
+	return buf.Bytes()
+}
+
+type aerospikeInfoCommand struct {
+	msg *aerospikeMessage
+}
+
+// Taken from aerospike-client-go/info.go
+func (nfo *aerospikeInfoCommand) parseMultiResponse() (map[string]string, error) {
+	responses := make(map[string]string)
+	offset := int64(0)
+	begin := int64(0)
+
+	dataLen := int64(len(nfo.msg.Data))
+
+	// Create reusable StringBuilder for performance.
+	for offset < dataLen {
+		b := nfo.msg.Data[offset]
+
+		if b == '\t' {
+			name := nfo.msg.Data[begin:offset]
+			offset++
+			begin = offset
+
+			// Parse field value.
+			for offset < dataLen {
+				if nfo.msg.Data[offset] == '\n' {
+					break
+				}
+				offset++
+			}
+
+			if offset > begin {
+				value := nfo.msg.Data[begin:offset]
+				responses[string(name)] = string(value)
+			} else {
+				responses[string(name)] = ""
+			}
+			offset++
+			begin = offset
+		} else if b == '\n' {
+			if offset > begin {
+				name := nfo.msg.Data[begin:offset]
+				responses[string(name)] = ""
+			}
+			offset++
+			begin = offset
+		} else {
+			offset++
+		}
+	}
+
+	if offset > begin {
+		name := nfo.msg.Data[begin:offset]
+		responses[string(name)] = ""
+	}
+	return responses, nil
+}
+
 type Aerospike struct {
 	Servers []string
 }
@@ -31,7 +115,7 @@ func (a *Aerospike) SampleConfig() string {
 }

 func (a *Aerospike) Description() string {
-	return "Read stats from aerospike server(s)"
+	return "Read stats from an aerospike server"
 }

 func (a *Aerospike) Gather(acc telegraf.Accumulator) error {
@@ -40,111 +124,214 @@ func (a *Aerospike) Gather(acc telegraf.Accumulator) error {
 	}

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

 	wg.Wait()
-	return nil
+	return outerr
 }

-func (a *Aerospike) gatherServer(hostport string, acc telegraf.Accumulator) error {
-	host, port, err := net.SplitHostPort(hostport)
+func (a *Aerospike) gatherServer(host string, acc telegraf.Accumulator) error {
+	aerospikeInfo, err := getMap(STATISTICS_COMMAND, host)
 	if err != nil {
-		return err
+		return fmt.Errorf("Aerospike info failed: %s", err)
 	}
-
-	iport, err := strconv.Atoi(port)
+	readAerospikeStats(aerospikeInfo, acc, host, "")
+	namespaces, err := getList(NAMESPACES_COMMAND, host)
 	if err != nil {
-		iport = 3000
+		return fmt.Errorf("Aerospike namespace list failed: %s", err)
 	}
-
-	c, err := as.NewClient(host, iport)
-	if err != nil {
-		return err
-	}
-	defer c.Close()
-
-	nodes := c.GetNodes()
-	for _, n := range nodes {
-		tags := map[string]string{
-			"aerospike_host": hostport,
-			"node_name":      n.GetName(),
-		}
-		fields := make(map[string]interface{})
-		stats, err := as.RequestNodeStats(n)
+	for ix := range namespaces {
+		nsInfo, err := getMap([]byte("namespace/"+namespaces[ix]+"\n"), host)
 		if err != nil {
-			return err
-		}
-		for k, v := range stats {
-			val, err := parseValue(v)
-			if err == nil {
-				fields[strings.Replace(k, "-", "_", -1)] = val
-			} else {
-				log.Printf("I! skipping aerospike field %v with int64 overflow: %q", k, v)
-			}
-		}
-		acc.AddFields("aerospike_node", fields, tags, time.Now())
-
-		info, err := as.RequestNodeInfo(n, "namespaces")
-		if err != nil {
-			return err
-		}
-		namespaces := strings.Split(info["namespaces"], ";")
-
-		for _, namespace := range namespaces {
-			nTags := map[string]string{
-				"aerospike_host": hostport,
-				"node_name":      n.GetName(),
-			}
-			nTags["namespace"] = namespace
-			nFields := make(map[string]interface{})
-			info, err := as.RequestNodeInfo(n, "namespace/"+namespace)
-			if err != nil {
-				continue
-			}
-			stats := strings.Split(info["namespace/"+namespace], ";")
-			for _, stat := range stats {
-				parts := strings.Split(stat, "=")
-				if len(parts) < 2 {
-					continue
-				}
-				val, err := parseValue(parts[1])
-				if err == nil {
-					nFields[strings.Replace(parts[0], "-", "_", -1)] = val
-				} else {
-					log.Printf("I! skipping aerospike field %v with int64 overflow: %q", parts[0], parts[1])
-				}
-			}
-			acc.AddFields("aerospike_namespace", nFields, nTags, time.Now())
+			return fmt.Errorf("Aerospike namespace '%s' query failed: %s", namespaces[ix], err)
 		}
+		readAerospikeStats(nsInfo, acc, host, namespaces[ix])
 	}
 	return nil
 }

-func parseValue(v string) (interface{}, error) {
-	if parsed, err := strconv.ParseInt(v, 10, 64); err == nil {
-		return parsed, nil
-	} else if _, err := strconv.ParseUint(v, 10, 64); err == nil {
-		// int64 overflow, yet valid uint64
-		return nil, errors.New("Number is too large")
-	} else if parsed, err := strconv.ParseBool(v); err == nil {
-		return parsed, nil
-	} else {
-		return v, nil
+func getMap(key []byte, host string) (map[string]string, error) {
+	data, err := get(key, host)
+	if err != nil {
+		return nil, fmt.Errorf("Failed to get data: %s", err)
 	}
+	parsed, err := unmarshalMapInfo(data, string(key))
+	if err != nil {
+		return nil, fmt.Errorf("Failed to unmarshal data: %s", err)
+	}
+
+	return parsed, nil
 }

-func copyTags(m map[string]string) map[string]string {
-	out := make(map[string]string)
-	for k, v := range m {
-		out[k] = v
+func getList(key []byte, host string) ([]string, error) {
+	data, err := get(key, host)
+	if err != nil {
+		return nil, fmt.Errorf("Failed to get data: %s", err)
 	}
-	return out
+	parsed, err := unmarshalListInfo(data, string(key))
+	if err != nil {
+		return nil, fmt.Errorf("Failed to unmarshal data: %s", err)
+	}
+
+	return parsed, nil
+}
+
+func get(key []byte, host string) (map[string]string, error) {
+	var err error
+	var data map[string]string
+
+	asInfo := &aerospikeInfoCommand{
+		msg: &aerospikeMessage{
+			aerospikeMessageHeader: aerospikeMessageHeader{
+				Version: uint8(MSG_VERSION),
+				Type:    uint8(MSG_TYPE),
+				DataLen: msgLenToBytes(int64(len(key))),
+			},
+			Data: key,
+		},
+	}
+
+	cmd := asInfo.msg.Serialize()
+	addr, err := net.ResolveTCPAddr("tcp", host)
+	if err != nil {
+		return data, fmt.Errorf("Lookup failed for '%s': %s", host, err)
+	}
+
+	conn, err := net.DialTCP("tcp", nil, addr)
+	if err != nil {
+		return data, fmt.Errorf("Connection failed for '%s': %s", host, err)
+	}
+	defer conn.Close()
+
+	_, err = conn.Write(cmd)
+	if err != nil {
+		return data, fmt.Errorf("Failed to send to '%s': %s", host, err)
+	}
+
+	msgHeader := bytes.NewBuffer(make([]byte, MSG_HEADER_SIZE))
+	_, err = readLenFromConn(conn, msgHeader.Bytes(), MSG_HEADER_SIZE)
+	if err != nil {
+		return data, fmt.Errorf("Failed to read header: %s", err)
+	}
+	err = binary.Read(msgHeader, binary.BigEndian, &asInfo.msg.aerospikeMessageHeader)
+	if err != nil {
+		return data, fmt.Errorf("Failed to unmarshal header: %s", err)
+	}
+
+	msgLen := msgLenFromBytes(asInfo.msg.aerospikeMessageHeader.DataLen)
+
+	if int64(len(asInfo.msg.Data)) != msgLen {
+		asInfo.msg.Data = make([]byte, msgLen)
+	}
+
+	_, err = readLenFromConn(conn, asInfo.msg.Data, len(asInfo.msg.Data))
+	if err != nil {
+		return data, fmt.Errorf("Failed to read from connection to '%s': %s", host, err)
+	}
+
+	data, err = asInfo.parseMultiResponse()
+	if err != nil {
+		return data, fmt.Errorf("Failed to parse response from '%s': %s", host, err)
+	}
+
+	return data, err
+}
+
+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 {
+		// 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)
+			}
+			fields[key] = val
+		}
+	}
+	acc.AddFields("aerospike", fields, tags)
+}
+
+func unmarshalMapInfo(infoMap map[string]string, key string) (map[string]string, error) {
+	key = strings.TrimSuffix(key, "\n")
+	res := map[string]string{}
+
+	v, exists := infoMap[key]
+	if !exists {
+		return res, fmt.Errorf("Key '%s' missing from info", key)
+	}
+
+	values := strings.Split(v, ";")
+	for i := range values {
+		kv := strings.Split(values[i], "=")
+		if len(kv) > 1 {
+			res[kv[0]] = kv[1]
+		}
+	}
+
+	return res, nil
+}
+
+func unmarshalListInfo(infoMap map[string]string, key string) ([]string, error) {
+	key = strings.TrimSuffix(key, "\n")
+
+	v, exists := infoMap[key]
+	if !exists {
+		return []string{}, fmt.Errorf("Key '%s' missing from info", key)
+	}
+
+	values := strings.Split(v, ";")
+	return values, nil
+}
+
+func readLenFromConn(c net.Conn, buffer []byte, length int) (total int, err error) {
+	var r int
+	for total < length {
+		r, err = c.Read(buffer[total:length])
+		total += r
+		if err != nil {
+			break
+		}
+	}
+	return
+}
+
+// Taken from aerospike-client-go/types/message.go
+func msgLenToBytes(DataLen int64) [6]byte {
+	b := make([]byte, 8)
+	binary.BigEndian.PutUint64(b, uint64(DataLen))
+	res := [6]byte{}
+	copy(res[:], b[2:])
+	return res
+}
+
+// Taken from aerospike-client-go/types/message.go
+func msgLenFromBytes(buf [6]byte) int64 {
+	nbytes := append([]byte{0, 0}, buf[:]...)
+	DataLen := binary.BigEndian.Uint64(nbytes)
+	return int64(DataLen)
 }

 func init() {
--- a/plugins/inputs/aerospike/aerospike_test.go
+++ b/plugins/inputs/aerospike/aerospike_test.go
@@ -1,6 +1,7 @@
 package aerospike

 import (
+	"reflect"
 	"testing"

 	"github.com/influxdata/telegraf/testutil"
@@ -10,7 +11,7 @@ import (

 func TestAerospikeStatistics(t *testing.T) {
 	if testing.Short() {
-		t.Skip("Skipping aerospike integration tests.")
+		t.Skip("Skipping integration test in short mode")
 	}

 	a := &Aerospike{
@@ -19,50 +20,99 @@ func TestAerospikeStatistics(t *testing.T) {

 	var acc testutil.Accumulator

-	err := acc.GatherError(a.Gather)
+	err := a.Gather(&acc)
 	require.NoError(t, err)

-	assert.True(t, acc.HasMeasurement("aerospike_node"))
-	assert.True(t, acc.HasTag("aerospike_node", "node_name"))
-	assert.True(t, acc.HasMeasurement("aerospike_namespace"))
-	assert.True(t, acc.HasTag("aerospike_namespace", "node_name"))
-	assert.True(t, acc.HasInt64Field("aerospike_node", "batch_error"))
+	// Only use a few of the metrics
+	asMetrics := []string{
+		"transactions",
+		"stat_write_errs",
+		"stat_read_reqs",
+		"stat_write_reqs",
+	}
+
+	for _, metric := range asMetrics {
+		assert.True(t, acc.HasIntField("aerospike", metric), metric)
+	}
+
 }

-func TestAerospikeStatisticsPartialErr(t *testing.T) {
-	if testing.Short() {
-		t.Skip("Skipping aerospike integration tests.")
-	}
-
-	a := &Aerospike{
-		Servers: []string{
-			testutil.GetLocalHost() + ":3000",
-			testutil.GetLocalHost() + ":9999",
-		},
-	}
+func TestAerospikeMsgLenFromToBytes(t *testing.T) {
+	var i int64 = 8
+	assert.True(t, i == msgLenFromBytes(msgLenToBytes(i)))
+}

+func TestReadAerospikeStatsNoNamespace(t *testing.T) {
+	// Also test for re-writing
 	var acc testutil.Accumulator
+	stats := map[string]string{
+		"stat-write-errs": "12345",
+		"stat_read_reqs":  "12345",
+	}
+	readAerospikeStats(stats, &acc, "host1", "")

-	require.Error(t, acc.GatherError(a.Gather))
-
-	assert.True(t, acc.HasMeasurement("aerospike_node"))
-	assert.True(t, acc.HasMeasurement("aerospike_namespace"))
-	assert.True(t, acc.HasInt64Field("aerospike_node", "batch_error"))
+	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 TestAerospikeParseValue(t *testing.T) {
-	// uint64 with value bigger than int64 max
-	val, err := parseValue("18446744041841121751")
-	assert.Nil(t, val)
-	assert.Error(t, err)
+func TestReadAerospikeStatsNamespace(t *testing.T) {
+	var acc testutil.Accumulator
+	stats := map[string]string{
+		"stat_write_errs": "12345",
+		"stat_read_reqs":  "12345",
+	}
+	readAerospikeStats(stats, &acc, "host1", "test")

-	// int values
-	val, err = parseValue("42")
-	assert.NoError(t, err)
-	assert.Equal(t, val, int64(42), "must be parsed as int")
-
-	// string values
-	val, err = parseValue("BB977942A2CA502")
-	assert.NoError(t, err)
-	assert.Equal(t, val, `BB977942A2CA502`, "must be left as string")
+	fields := map[string]interface{}{
+		"stat_write_errs": int64(12345),
+		"stat_read_reqs":  int64(12345),
+	}
+	tags := map[string]string{
+		"aerospike_host": "host1",
+		"namespace":      "test",
+	}
+	acc.AssertContainsTaggedFields(t, "aerospike", fields, tags)
+}
+
+func TestAerospikeUnmarshalList(t *testing.T) {
+	i := map[string]string{
+		"test": "one;two;three",
+	}
+
+	expected := []string{"one", "two", "three"}
+
+	list, err := unmarshalListInfo(i, "test2")
+	assert.True(t, err != nil)
+
+	list, err = unmarshalListInfo(i, "test")
+	assert.True(t, err == nil)
+	equal := true
+	for ix := range expected {
+		if list[ix] != expected[ix] {
+			equal = false
+			break
+		}
+	}
+	assert.True(t, equal)
+}
+
+func TestAerospikeUnmarshalMap(t *testing.T) {
+	i := map[string]string{
+		"test": "key1=value1;key2=value2",
+	}
+
+	expected := map[string]string{
+		"key1": "value1",
+		"key2": "value2",
+	}
+	m, err := unmarshalMapInfo(i, "test")
+	assert.True(t, err == nil)
+	assert.True(t, reflect.DeepEqual(m, expected))
 }
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -2,74 +2,37 @@ package all

 import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/aerospike"
-	_ "github.com/influxdata/telegraf/plugins/inputs/amqp_consumer"
 	_ "github.com/influxdata/telegraf/plugins/inputs/apache"
 	_ "github.com/influxdata/telegraf/plugins/inputs/bcache"
-	_ "github.com/influxdata/telegraf/plugins/inputs/bond"
-	_ "github.com/influxdata/telegraf/plugins/inputs/cassandra"
-	_ "github.com/influxdata/telegraf/plugins/inputs/ceph"
-	_ "github.com/influxdata/telegraf/plugins/inputs/cgroup"
-	_ "github.com/influxdata/telegraf/plugins/inputs/chrony"
-	_ "github.com/influxdata/telegraf/plugins/inputs/cloudwatch"
-	_ "github.com/influxdata/telegraf/plugins/inputs/conntrack"
-	_ "github.com/influxdata/telegraf/plugins/inputs/consul"
-	_ "github.com/influxdata/telegraf/plugins/inputs/couchbase"
 	_ "github.com/influxdata/telegraf/plugins/inputs/couchdb"
-	_ "github.com/influxdata/telegraf/plugins/inputs/dcos"
 	_ "github.com/influxdata/telegraf/plugins/inputs/disque"
-	_ "github.com/influxdata/telegraf/plugins/inputs/dmcache"
 	_ "github.com/influxdata/telegraf/plugins/inputs/dns_query"
 	_ "github.com/influxdata/telegraf/plugins/inputs/docker"
 	_ "github.com/influxdata/telegraf/plugins/inputs/dovecot"
 	_ "github.com/influxdata/telegraf/plugins/inputs/elasticsearch"
 	_ "github.com/influxdata/telegraf/plugins/inputs/exec"
-	_ "github.com/influxdata/telegraf/plugins/inputs/fail2ban"
-	_ "github.com/influxdata/telegraf/plugins/inputs/filestat"
-	_ "github.com/influxdata/telegraf/plugins/inputs/fluentd"
-	_ "github.com/influxdata/telegraf/plugins/inputs/graylog"
+	_ "github.com/influxdata/telegraf/plugins/inputs/github_webhooks"
 	_ "github.com/influxdata/telegraf/plugins/inputs/haproxy"
-	_ "github.com/influxdata/telegraf/plugins/inputs/hddtemp"
-	_ "github.com/influxdata/telegraf/plugins/inputs/http_listener"
-	_ "github.com/influxdata/telegraf/plugins/inputs/http_response"
 	_ "github.com/influxdata/telegraf/plugins/inputs/httpjson"
 	_ "github.com/influxdata/telegraf/plugins/inputs/influxdb"
-	_ "github.com/influxdata/telegraf/plugins/inputs/internal"
-	_ "github.com/influxdata/telegraf/plugins/inputs/interrupts"
-	_ "github.com/influxdata/telegraf/plugins/inputs/ipmi_sensor"
-	_ "github.com/influxdata/telegraf/plugins/inputs/iptables"
 	_ "github.com/influxdata/telegraf/plugins/inputs/jolokia"
-	_ "github.com/influxdata/telegraf/plugins/inputs/jolokia2"
 	_ "github.com/influxdata/telegraf/plugins/inputs/kafka_consumer"
-	_ "github.com/influxdata/telegraf/plugins/inputs/kafka_consumer_legacy"
-	_ "github.com/influxdata/telegraf/plugins/inputs/kapacitor"
-	_ "github.com/influxdata/telegraf/plugins/inputs/kubernetes"
 	_ "github.com/influxdata/telegraf/plugins/inputs/leofs"
-	_ "github.com/influxdata/telegraf/plugins/inputs/logparser"
 	_ "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/minecraft"
 	_ "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/nginx_plus"
 	_ "github.com/influxdata/telegraf/plugins/inputs/nsq"
-	_ "github.com/influxdata/telegraf/plugins/inputs/nsq_consumer"
-	_ "github.com/influxdata/telegraf/plugins/inputs/nstat"
-	_ "github.com/influxdata/telegraf/plugins/inputs/ntpq"
-	_ "github.com/influxdata/telegraf/plugins/inputs/openldap"
-	_ "github.com/influxdata/telegraf/plugins/inputs/opensmtpd"
 	_ "github.com/influxdata/telegraf/plugins/inputs/passenger"
-	_ "github.com/influxdata/telegraf/plugins/inputs/pf"
 	_ "github.com/influxdata/telegraf/plugins/inputs/phpfpm"
 	_ "github.com/influxdata/telegraf/plugins/inputs/ping"
-	_ "github.com/influxdata/telegraf/plugins/inputs/postfix"
 	_ "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"
@@ -79,30 +42,14 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/redis"
 	_ "github.com/influxdata/telegraf/plugins/inputs/rethinkdb"
 	_ "github.com/influxdata/telegraf/plugins/inputs/riak"
-	_ "github.com/influxdata/telegraf/plugins/inputs/salesforce"
 	_ "github.com/influxdata/telegraf/plugins/inputs/sensors"
-	_ "github.com/influxdata/telegraf/plugins/inputs/smart"
 	_ "github.com/influxdata/telegraf/plugins/inputs/snmp"
-	_ "github.com/influxdata/telegraf/plugins/inputs/snmp_legacy"
-	_ "github.com/influxdata/telegraf/plugins/inputs/socket_listener"
-	_ "github.com/influxdata/telegraf/plugins/inputs/solr"
 	_ "github.com/influxdata/telegraf/plugins/inputs/sqlserver"
 	_ "github.com/influxdata/telegraf/plugins/inputs/statsd"
-	_ "github.com/influxdata/telegraf/plugins/inputs/sysstat"
 	_ "github.com/influxdata/telegraf/plugins/inputs/system"
-	_ "github.com/influxdata/telegraf/plugins/inputs/tail"
-	_ "github.com/influxdata/telegraf/plugins/inputs/tcp_listener"
-	_ "github.com/influxdata/telegraf/plugins/inputs/teamspeak"
-	_ "github.com/influxdata/telegraf/plugins/inputs/tomcat"
 	_ "github.com/influxdata/telegraf/plugins/inputs/trig"
 	_ "github.com/influxdata/telegraf/plugins/inputs/twemproxy"
-	_ "github.com/influxdata/telegraf/plugins/inputs/udp_listener"
-	_ "github.com/influxdata/telegraf/plugins/inputs/unbound"
-	_ "github.com/influxdata/telegraf/plugins/inputs/varnish"
-	_ "github.com/influxdata/telegraf/plugins/inputs/webhooks"
 	_ "github.com/influxdata/telegraf/plugins/inputs/win_perf_counters"
-	_ "github.com/influxdata/telegraf/plugins/inputs/win_services"
 	_ "github.com/influxdata/telegraf/plugins/inputs/zfs"
-	_ "github.com/influxdata/telegraf/plugins/inputs/zipkin"
 	_ "github.com/influxdata/telegraf/plugins/inputs/zookeeper"
 )
--- a/plugins/inputs/amqp_consumer/README.md
+++ b/plugins/inputs/amqp_consumer/README.md
@@ -1,47 +0,0 @@
-# AMQP Consumer Input Plugin
-
-This plugin provides a consumer for use with AMQP 0-9-1, a promenent implementation of this protocol being [RabbitMQ](https://www.rabbitmq.com/).
-
-Metrics are read from a topic exchange using the configured queue and binding_key.
-
-Message payload should be formatted in one of the [Telegraf Data Formats](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md).
-
-For an introduction to AMQP see:
- https://www.rabbitmq.com/tutorials/amqp-concepts.html
- https://www.rabbitmq.com/getstarted.html
-
-The following defaults are known to work with RabbitMQ:
-
-```toml
-# AMQP consumer plugin
-[[inputs.amqp_consumer]]
-  ## AMQP url
-  url = "amqp://localhost:5672/influxdb"
-  ## AMQP exchange
-  exchange = "telegraf"
-  ## AMQP queue name
-  queue = "telegraf"
-  ## Binding Key
-  binding_key = "#"
-
-  ## Controls how many messages the server will try to keep on the network
-  ## for consumers before receiving delivery acks.
-  #prefetch_count = 50
-
-  ## Auth method. PLAIN and EXTERNAL are supported.
-  ## Using EXTERNAL requires enabling the rabbitmq_auth_mechanism_ssl plugin as
-  ## described here: https://www.rabbitmq.com/plugins.html
-  # auth_method = "PLAIN"
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
-  # insecure_skip_verify = false
-
-  ## Data format to consume.
-  ## Each data format has its own unique set of configuration options, read
-  ## more about them here:
-  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
-  data_format = "influx"
-```
--- a/plugins/inputs/amqp_consumer/amqp_consumer.go
+++ b/plugins/inputs/amqp_consumer/amqp_consumer.go
@@ -1,280 +0,0 @@
-package amqp_consumer
-
-import (
-	"fmt"
-	"log"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/streadway/amqp"
-
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal"
-	"github.com/influxdata/telegraf/plugins/inputs"
-	"github.com/influxdata/telegraf/plugins/parsers"
-)
-
-// AMQPConsumer is the top level struct for this plugin
-type AMQPConsumer struct {
-	URL string
-	// AMQP exchange
-	Exchange string
-	// Queue Name
-	Queue string
-	// Binding Key
-	BindingKey string `toml:"binding_key"`
-
-	// Controls how many messages the server will try to keep on the network
-	// for consumers before receiving delivery acks.
-	PrefetchCount int
-
-	// AMQP Auth method
-	AuthMethod string
-	// Path to CA file
-	SSLCA string `toml:"ssl_ca"`
-	// Path to host cert file
-	SSLCert string `toml:"ssl_cert"`
-	// Path to cert key file
-	SSLKey string `toml:"ssl_key"`
-	// Use SSL but skip chain & host verification
-	InsecureSkipVerify bool
-
-	parser parsers.Parser
-	conn   *amqp.Connection
-	wg     *sync.WaitGroup
-}
-
-type externalAuth struct{}
-
-func (a *externalAuth) Mechanism() string {
-	return "EXTERNAL"
-}
-func (a *externalAuth) Response() string {
-	return fmt.Sprintf("\000")
-}
-
-const (
-	DefaultAuthMethod    = "PLAIN"
-	DefaultPrefetchCount = 50
-)
-
-func (a *AMQPConsumer) SampleConfig() string {
-	return `
-  ## AMQP url
-  url = "amqp://localhost:5672/influxdb"
-  ## AMQP exchange
-  exchange = "telegraf"
-  ## AMQP queue name
-  queue = "telegraf"
-  ## Binding Key
-  binding_key = "#"
-
-  ## Maximum number of messages server should give to the worker.
-  prefetch_count = 50
-
-  ## Auth method. PLAIN and EXTERNAL are supported
-  ## Using EXTERNAL requires enabling the rabbitmq_auth_mechanism_ssl plugin as
-  ## described here: https://www.rabbitmq.com/plugins.html
-  # auth_method = "PLAIN"
-
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
-  # insecure_skip_verify = false
-
-  ## Data format to consume.
-  ## Each data format has its own unique set of configuration options, read
-  ## more about them here:
-  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
-  data_format = "influx"
-`
-}
-
-func (a *AMQPConsumer) Description() string {
-	return "AMQP consumer plugin"
-}
-
-func (a *AMQPConsumer) SetParser(parser parsers.Parser) {
-	a.parser = parser
-}
-
-// All gathering is done in the Start function
-func (a *AMQPConsumer) Gather(_ telegraf.Accumulator) error {
-	return nil
-}
-
-func (a *AMQPConsumer) createConfig() (*amqp.Config, error) {
-	// make new tls config
-	tls, err := internal.GetTLSConfig(
-		a.SSLCert, a.SSLKey, a.SSLCA, a.InsecureSkipVerify)
-	if err != nil {
-		return nil, err
-	}
-
-	// parse auth method
-	var sasl []amqp.Authentication // nil by default
-
-	if strings.ToUpper(a.AuthMethod) == "EXTERNAL" {
-		sasl = []amqp.Authentication{&externalAuth{}}
-	}
-
-	config := amqp.Config{
-		TLSClientConfig: tls,
-		SASL:            sasl, // if nil, it will be PLAIN
-	}
-	return &config, nil
-}
-
-// Start satisfies the telegraf.ServiceInput interface
-func (a *AMQPConsumer) Start(acc telegraf.Accumulator) error {
-	amqpConf, err := a.createConfig()
-	if err != nil {
-		return err
-	}
-
-	msgs, err := a.connect(amqpConf)
-	if err != nil {
-		return err
-	}
-
-	a.wg = &sync.WaitGroup{}
-	a.wg.Add(1)
-	go a.process(msgs, acc)
-
-	go func() {
-		err := <-a.conn.NotifyClose(make(chan *amqp.Error))
-		if err == nil {
-			return
-		}
-
-		log.Printf("I! AMQP consumer connection closed: %s; trying to reconnect", err)
-		for {
-			msgs, err := a.connect(amqpConf)
-			if err != nil {
-				log.Printf("E! AMQP connection failed: %s", err)
-				time.Sleep(10 * time.Second)
-				continue
-			}
-
-			a.wg.Add(1)
-			go a.process(msgs, acc)
-			break
-		}
-	}()
-
-	return nil
-}
-
-func (a *AMQPConsumer) connect(amqpConf *amqp.Config) (<-chan amqp.Delivery, error) {
-	conn, err := amqp.DialConfig(a.URL, *amqpConf)
-	if err != nil {
-		return nil, err
-	}
-	a.conn = conn
-
-	ch, err := conn.Channel()
-	if err != nil {
-		return nil, fmt.Errorf("Failed to open a channel: %s", err)
-	}
-
-	err = ch.ExchangeDeclare(
-		a.Exchange, // name
-		"topic",    // type
-		true,       // durable
-		false,      // auto-deleted
-		false,      // internal
-		false,      // no-wait
-		nil,        // arguments
-	)
-	if err != nil {
-		return nil, fmt.Errorf("Failed to declare an exchange: %s", err)
-	}
-
-	q, err := ch.QueueDeclare(
-		a.Queue, // queue
-		true,    // durable
-		false,   // delete when unused
-		false,   // exclusive
-		false,   // no-wait
-		nil,     // arguments
-	)
-	if err != nil {
-		return nil, fmt.Errorf("Failed to declare a queue: %s", err)
-	}
-
-	err = ch.QueueBind(
-		q.Name,       // queue
-		a.BindingKey, // binding-key
-		a.Exchange,   // exchange
-		false,
-		nil,
-	)
-	if err != nil {
-		return nil, fmt.Errorf("Failed to bind a queue: %s", err)
-	}
-
-	err = ch.Qos(
-		a.PrefetchCount,
-		0,     // prefetch-size
-		false, // global
-	)
-	if err != nil {
-		return nil, fmt.Errorf("Failed to set QoS: %s", err)
-	}
-
-	msgs, err := ch.Consume(
-		q.Name, // queue
-		"",     // consumer
-		false,  // auto-ack
-		false,  // exclusive
-		false,  // no-local
-		false,  // no-wait
-		nil,    // arguments
-	)
-	if err != nil {
-		return nil, fmt.Errorf("Failed establishing connection to queue: %s", err)
-	}
-
-	log.Println("I! Started AMQP consumer")
-	return msgs, err
-}
-
-// Read messages from queue and add them to the Accumulator
-func (a *AMQPConsumer) process(msgs <-chan amqp.Delivery, acc telegraf.Accumulator) {
-	defer a.wg.Done()
-	for d := range msgs {
-		metrics, err := a.parser.Parse(d.Body)
-		if err != nil {
-			log.Printf("E! %v: error parsing metric - %v", err, string(d.Body))
-		} else {
-			for _, m := range metrics {
-				acc.AddFields(m.Name(), m.Fields(), m.Tags(), m.Time())
-			}
-		}
-
-		d.Ack(false)
-	}
-	log.Printf("I! AMQP consumer queue closed")
-}
-
-func (a *AMQPConsumer) Stop() {
-	err := a.conn.Close()
-	if err != nil && err != amqp.ErrClosed {
-		log.Printf("E! Error closing AMQP connection: %s", err)
-		return
-	}
-	a.wg.Wait()
-	log.Println("I! Stopped AMQP service")
-}
-
-func init() {
-	inputs.Add("amqp_consumer", func() telegraf.Input {
-		return &AMQPConsumer{
-			AuthMethod:    DefaultAuthMethod,
-			PrefetchCount: DefaultPrefetchCount,
-		}
-	})
-}
--- a/plugins/inputs/apache/README.md
+++ b/plugins/inputs/apache/README.md
@@ -1,84 +1,45 @@
-# Apache Input Plugin
+# Telegraf plugin: Apache

-The Apache plugin collects server performance information using the [`mod_status`](https://httpd.apache.org/docs/2.4/mod/mod_status.html) module of the [Apache HTTP Server](https://httpd.apache.org/).
+#### Plugin arguments:
+- **urls** []string: List of apache-status URLs to collect from.

-Typically, the `mod_status` module is configured to expose a page at the `/server-status?auto` location of the Apache server.  The [ExtendedStatus](https://httpd.apache.org/docs/2.4/mod/core.html#extendedstatus) option must be enabled in order to collect all available fields.  For information about how to configure your server reference the [module documenation](https://httpd.apache.org/docs/2.4/mod/mod_status.html#enable).
+#### Description

-### Configuration:
+The Apache plugin collects from the /server-status?auto URL. See
+[apache.org/server-status?auto](http://www.apache.org/server-status?auto) for an
+example. And
+[here](http://httpd.apache.org/docs/2.2/mod/mod_status.html) for the apache
+mod_status documentation.

-```toml
-# Read Apache status information (mod_status)
-[[inputs.apache]]
-  ## An array of URLs to gather from, must be directed at the machine
-  ## readable version of the mod_status page including the auto query string.
-  ## Default is "http://localhost/server-status?auto".
-  urls = ["http://localhost/server-status?auto"]
+# Measurements:

-  ## Credentials for basic HTTP authentication.
-  # username = "myuser"
-  # password = "mypassword"
+Meta:
+- tags: `port=<port>`, `server=url`

-  ## Maximum time to receive response.
-  # response_timeout = "5s"
+- apache_TotalAccesses
+- apache_TotalkBytes
+- apache_CPULoad
+- apache_Uptime
+- apache_ReqPerSec
+- apache_BytesPerSec
+- apache_BytesPerReq
+- apache_BusyWorkers
+- apache_IdleWorkers
+- apache_ConnsTotal
+- apache_ConnsAsyncWriting
+- apache_ConnsAsyncKeepAlive
+- apache_ConnsAsyncClosing

-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
-  # insecure_skip_verify = false
-```
+### Scoreboard measurements

-### Measurements & Fields:
-
- apache
-  - BusyWorkers (float)
-  - BytesPerReq (float)
-  - BytesPerSec (float)
-  - ConnsAsyncClosing (float)
-  - ConnsAsyncKeepAlive (float)
-  - ConnsAsyncWriting (float)
-  - ConnsTotal (float)
-  - CPUChildrenSystem (float)
-  - CPUChildrenUser (float)
-  - CPULoad (float)
-  - CPUSystem (float)
-  - CPUUser (float)
-  - IdleWorkers (float)
-  - Load1 (float)
-  - Load5 (float)
-  - Load15 (float)
-  - ParentServerConfigGeneration (float)
-  - ParentServerMPMGeneration (float)
-  - ReqPerSec (float)
-  - ServerUptimeSeconds (float)
-  - TotalAccesses (float)
-  - TotalkBytes (float)
-  - Uptime (float)
-
-The following fields are collected from the `Scoreboard`, and represent the number of requests in the given state:
-
- apache
-  - scboard_closing (float)
-  - scboard_dnslookup (float)
-  - scboard_finishing (float)
-  - scboard_idle_cleanup (float)
-  - scboard_keepalive (float)
-  - scboard_logging (float)
-  - scboard_open (float)
-  - scboard_reading (float)
-  - scboard_sending (float)
-  - scboard_starting (float)
-  - scboard_waiting (float)
-
-### Tags:
-
- All measurements have the following tags:
-    - port
-    - server
-
-### Example Output:
-
-```
-apache,port=80,server=debian-stretch-apache BusyWorkers=1,BytesPerReq=0,BytesPerSec=0,CPUChildrenSystem=0,CPUChildrenUser=0,CPULoad=0.00995025,CPUSystem=0.01,CPUUser=0.01,ConnsAsyncClosing=0,ConnsAsyncKeepAlive=0,ConnsAsyncWriting=0,ConnsTotal=0,IdleWorkers=49,Load1=0.01,Load15=0,Load5=0,ParentServerConfigGeneration=3,ParentServerMPMGeneration=2,ReqPerSec=0.00497512,ServerUptimeSeconds=201,TotalAccesses=1,TotalkBytes=0,Uptime=201,scboard_closing=0,scboard_dnslookup=0,scboard_finishing=0,scboard_idle_cleanup=0,scboard_keepalive=0,scboard_logging=0,scboard_open=100,scboard_reading=0,scboard_sending=1,scboard_starting=0,scboard_waiting=49 1502489900000000000
-```
+- apache_scboard_waiting
+- apache_scboard_starting
+- apache_scboard_reading
+- apache_scboard_sending
+- apache_scboard_keepalive
+- apache_scboard_dnslookup
+- apache_scboard_closing
+- apache_scboard_logging
+- apache_scboard_finishing
+- apache_scboard_idle_cleanup
+- apache_scboard_open
--- a/plugins/inputs/apache/apache.go
+++ b/plugins/inputs/apache/apache.go
@@ -12,46 +12,16 @@ import (
 	"time"

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

 type Apache struct {
-	Urls            []string
-	Username        string
-	Password        string
-	ResponseTimeout internal.Duration
-	// Path to CA file
-	SSLCA string `toml:"ssl_ca"`
-	// Path to host cert file
-	SSLCert string `toml:"ssl_cert"`
-	// Path to cert key file
-	SSLKey string `toml:"ssl_key"`
-	// Use SSL but skip chain & host verification
-	InsecureSkipVerify bool
-
-	client *http.Client
+	Urls []string
 }

 var sampleConfig = `
-  ## An array of URLs to gather from, must be directed at the machine
-  ## readable version of the mod_status page including the auto query string.
-  ## Default is "http://localhost/server-status?auto".
+  ## An array of Apache status URI to gather stats.
  urls = ["http://localhost/server-status?auto"]
-
-  ## Credentials for basic HTTP authentication.
-  # username = "myuser"
-  # password = "mypassword"
-
-  ## Maximum time to receive response.
-  # response_timeout = "5s"
-
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
-  # insecure_skip_verify = false
 `

 func (n *Apache) SampleConfig() string {
@@ -63,73 +33,39 @@ func (n *Apache) Description() string {
 }

 func (n *Apache) Gather(acc telegraf.Accumulator) error {
-	if len(n.Urls) == 0 {
-		n.Urls = []string{"http://localhost/server-status?auto"}
-	}
-	if n.ResponseTimeout.Duration < time.Second {
-		n.ResponseTimeout.Duration = time.Second * 5
-	}
-
-	if n.client == nil {
-		client, err := n.createHttpClient()
-		if err != nil {
-			return err
-		}
-		n.client = client
-	}
-
 	var wg sync.WaitGroup
-	wg.Add(len(n.Urls))
+	var outerr error
+
 	for _, u := range n.Urls {
 		addr, err := url.Parse(u)
 		if err != nil {
-			acc.AddError(fmt.Errorf("Unable to parse address '%s': %s", u, err))
-			continue
+			return fmt.Errorf("Unable to parse address '%s': %s", u, err)
 		}

+		wg.Add(1)
 		go func(addr *url.URL) {
 			defer wg.Done()
-			acc.AddError(n.gatherUrl(addr, acc))
+			outerr = n.gatherUrl(addr, acc)
 		}(addr)
 	}

 	wg.Wait()
-	return nil
+
+	return outerr
 }

-func (n *Apache) createHttpClient() (*http.Client, error) {
-	tlsCfg, err := internal.GetTLSConfig(
-		n.SSLCert, n.SSLKey, n.SSLCA, n.InsecureSkipVerify)
-	if err != nil {
-		return nil, err
-	}
-
-	client := &http.Client{
-		Transport: &http.Transport{
-			TLSClientConfig: tlsCfg,
-		},
-		Timeout: n.ResponseTimeout.Duration,
-	}
-
-	return client, nil
+var tr = &http.Transport{
+	ResponseHeaderTimeout: time.Duration(3 * time.Second),
 }

+var client = &http.Client{Transport: tr}
+
 func (n *Apache) gatherUrl(addr *url.URL, acc telegraf.Accumulator) error {
-	req, err := http.NewRequest("GET", addr.String(), nil)
+	resp, err := client.Get(addr.String())
 	if err != nil {
-		return fmt.Errorf("error on new request to %s : %s\n", addr.String(), err)
-	}
-
-	if len(n.Username) != 0 && len(n.Password) != 0 {
-		req.SetBasicAuth(n.Username, n.Password)
-	}
-
-	resp, err := n.client.Do(req)
-	if err != nil {
-		return fmt.Errorf("error on request to %s : %s\n", addr.String(), err)
+		return fmt.Errorf("error making HTTP request to %s: %s", addr.String(), err)
 	}
 	defer resp.Body.Close()
-
 	if resp.StatusCode != http.StatusOK {
 		return fmt.Errorf("%s returned HTTP status %s", addr.String(), resp.Status)
 	}
--- a/plugins/inputs/apache/apache_test.go
+++ b/plugins/inputs/apache/apache_test.go
@@ -36,12 +36,11 @@ func TestHTTPApache(t *testing.T) {
 	defer ts.Close()

 	a := Apache{
-		// Fetch it 2 times to catch possible data races.
-		Urls: []string{ts.URL, ts.URL},
+		Urls: []string{ts.URL},
 	}

 	var acc testutil.Accumulator
-	err := acc.GatherError(a.Gather)
+	err := a.Gather(&acc)
 	require.NoError(t, err)

 	fields := map[string]interface{}{
--- a/plugins/inputs/bcache/README.md
+++ b/plugins/inputs/bcache/README.md
@@ -70,7 +70,7 @@ Using this configuration:
 When run with:

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

 It produces:
--- a/plugins/inputs/bond/README.md
+++ b/plugins/inputs/bond/README.md
@@ -1,85 +0,0 @@
-# Bond Input Plugin
-
-The Bond Input plugin collects network bond interface status, bond's slaves interfaces
-status and failures count of bond's slaves interfaces.
-The plugin collects these metrics from `/proc/net/bonding/*` files.
-
-### Configuration:
-
-```toml
-[[inputs.bond]]
-  ## Sets 'proc' directory path
-  ## If not specified, then default is /proc
-  # host_proc = "/proc"
-
-  ## By default, telegraf gather stats for all bond interfaces
-  ## Setting interfaces will restrict the stats to the specified
-  ## bond interfaces.
-  # bond_interfaces = ["bond0"]
-```
-
-### Measurements & Fields:
-
- bond
-  - active_slave (for active-backup mode)
-  - status
-
- bond_slave
-  - failures
-  - status
-
-### Description:
-
-```
-active_slave
-  Currently active slave interface for active-backup mode.
-
-status
-  Status of bond interface or bonds's slave interface (down = 0, up = 1).
-
-failures
-  Amount of failures for bond's slave interface.
-```
-
-### Tags:
-
- bond
-  - bond
-
- bond_slave
-  - bond
-  - interface
-
-### Example output:
-
-Configuration:
-
-```
-[[inputs.bond]]
-  ## Sets 'proc' directory path
-  ## If not specified, then default is /proc
-  host_proc = "/proc"
-
-  ## By default, telegraf gather stats for all bond interfaces
-  ## Setting interfaces will restrict the stats to the specified
-  ## bond interfaces.
-  bond_interfaces = ["bond0", "bond1"]
-```
-
-Run:
-
-```
-telegraf --config telegraf.conf --input-filter bond --test
-```
-
-Output:
-
-```
-* Plugin: inputs.bond, Collection 1
-> bond,bond=bond1,host=local active_slave="eth0",status=1i 1509704525000000000
-> bond_slave,bond=bond1,interface=eth0,host=local status=1i,failures=0i 1509704525000000000
-> bond_slave,host=local,bond=bond1,interface=eth1 status=1i,failures=0i 1509704525000000000
-> bond,bond=bond0,host=isvetlov-mac.local status=1i 1509704525000000000
-> bond_slave,bond=bond0,interface=eth1,host=local status=1i,failures=0i 1509704525000000000
-> bond_slave,bond=bond0,interface=eth2,host=local status=1i,failures=0i 1509704525000000000
-```
--- a/plugins/inputs/bond/bond.go
+++ b/plugins/inputs/bond/bond.go
@@ -1,204 +0,0 @@
-package bond
-
-import (
-	"bufio"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/plugins/inputs"
-)
-
-// default host proc path
-const defaultHostProc = "/proc"
-
-// env host proc variable name
-const envProc = "HOST_PROC"
-
-type Bond struct {
-	HostProc       string   `toml:"host_proc"`
-	BondInterfaces []string `toml:"bond_interfaces"`
-}
-
-var sampleConfig = `
-  ## Sets 'proc' directory path
-  ## If not specified, then default is /proc
-  # host_proc = "/proc"
-
-  ## By default, telegraf gather stats for all bond interfaces
-  ## Setting interfaces will restrict the stats to the specified
-  ## bond interfaces.
-  # bond_interfaces = ["bond0"]
-`
-
-func (bond *Bond) Description() string {
-	return "Collect bond interface status, slaves statuses and failures count"
-}
-
-func (bond *Bond) SampleConfig() string {
-	return sampleConfig
-}
-
-func (bond *Bond) Gather(acc telegraf.Accumulator) error {
-	// load proc path, get default value if config value and env variable are empty
-	bond.loadPath()
-	// list bond interfaces from bonding directory or gather all interfaces.
-	bondNames, err := bond.listInterfaces()
-	if err != nil {
-		return err
-	}
-	for _, bondName := range bondNames {
-		bondAbsPath := bond.HostProc + "/net/bonding/" + bondName
-		file, err := ioutil.ReadFile(bondAbsPath)
-		if err != nil {
-			acc.AddError(fmt.Errorf("error inspecting '%s' interface: %v", bondAbsPath, err))
-			continue
-		}
-		rawFile := strings.TrimSpace(string(file))
-		err = bond.gatherBondInterface(bondName, rawFile, acc)
-		if err != nil {
-			acc.AddError(fmt.Errorf("error inspecting '%s' interface: %v", bondName, err))
-		}
-	}
-	return nil
-}
-
-func (bond *Bond) gatherBondInterface(bondName string, rawFile string, acc telegraf.Accumulator) error {
-	splitIndex := strings.Index(rawFile, "Slave Interface:")
-	if splitIndex == -1 {
-		splitIndex = len(rawFile)
-	}
-	bondPart := rawFile[:splitIndex]
-	slavePart := rawFile[splitIndex:]
-
-	err := bond.gatherBondPart(bondName, bondPart, acc)
-	if err != nil {
-		return err
-	}
-	err = bond.gatherSlavePart(bondName, slavePart, acc)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func (bond *Bond) gatherBondPart(bondName string, rawFile string, acc telegraf.Accumulator) error {
-	fields := make(map[string]interface{})
-	tags := map[string]string{
-		"bond": bondName,
-	}
-
-	scanner := bufio.NewScanner(strings.NewReader(rawFile))
-	for scanner.Scan() {
-		line := scanner.Text()
-		stats := strings.Split(line, ":")
-		if len(stats) < 2 {
-			continue
-		}
-		name := strings.TrimSpace(stats[0])
-		value := strings.TrimSpace(stats[1])
-		if strings.Contains(name, "Currently Active Slave") {
-			fields["active_slave"] = value
-		}
-		if strings.Contains(name, "MII Status") {
-			fields["status"] = 0
-			if value == "up" {
-				fields["status"] = 1
-			}
-			acc.AddFields("bond", fields, tags)
-			return nil
-		}
-	}
-	if err := scanner.Err(); err != nil {
-		return err
-	}
-	return fmt.Errorf("Couldn't find status info for '%s' ", bondName)
-}
-
-func (bond *Bond) gatherSlavePart(bondName string, rawFile string, acc telegraf.Accumulator) error {
-	var slave string
-	var status int
-
-	scanner := bufio.NewScanner(strings.NewReader(rawFile))
-	for scanner.Scan() {
-		line := scanner.Text()
-		stats := strings.Split(line, ":")
-		if len(stats) < 2 {
-			continue
-		}
-		name := strings.TrimSpace(stats[0])
-		value := strings.TrimSpace(stats[1])
-		if strings.Contains(name, "Slave Interface") {
-			slave = value
-		}
-		if strings.Contains(name, "MII Status") {
-			status = 0
-			if value == "up" {
-				status = 1
-			}
-		}
-		if strings.Contains(name, "Link Failure Count") {
-			count, err := strconv.Atoi(value)
-			if err != nil {
-				return err
-			}
-			fields := map[string]interface{}{
-				"status":   status,
-				"failures": count,
-			}
-			tags := map[string]string{
-				"bond":      bondName,
-				"interface": slave,
-			}
-			acc.AddFields("bond_slave", fields, tags)
-		}
-	}
-	if err := scanner.Err(); err != nil {
-		return err
-	}
-	return nil
-}
-
-// loadPath can be used to read path firstly from config
-// if it is empty then try read from env variable
-func (bond *Bond) loadPath() {
-	if bond.HostProc == "" {
-		bond.HostProc = proc(envProc, defaultHostProc)
-	}
-}
-
-// proc can be used to read file paths from env
-func proc(env, path string) string {
-	// try to read full file path
-	if p := os.Getenv(env); p != "" {
-		return p
-	}
-	// return default path
-	return path
-}
-
-func (bond *Bond) listInterfaces() ([]string, error) {
-	var interfaces []string
-	if len(bond.BondInterfaces) > 0 {
-		interfaces = bond.BondInterfaces
-	} else {
-		paths, err := filepath.Glob(bond.HostProc + "/net/bonding/*")
-		if err != nil {
-			return nil, err
-		}
-		for _, p := range paths {
-			interfaces = append(interfaces, filepath.Base(p))
-		}
-	}
-	return interfaces, nil
-}
-
-func init() {
-	inputs.Add("bond", func() telegraf.Input {
-		return &Bond{}
-	})
-}
--- a/plugins/inputs/bond/bond_test.go
+++ b/plugins/inputs/bond/bond_test.go
@@ -1,77 +0,0 @@
-package bond
-
-import (
-	"testing"
-
-	"github.com/influxdata/telegraf/testutil"
-)
-
-var sampleTest802 = `
-Ethernet Channel Bonding Driver: v3.5.0 (November 4, 2008)
-
-Bonding Mode: IEEE 802.3ad Dynamic link aggregation
-Transmit Hash Policy: layer2 (0)
-MII Status: up
-MII Polling Interval (ms): 100
-Up Delay (ms): 0
-Down Delay (ms): 0
-
-802.3ad info
-LACP rate: fast
-Aggregator selection policy (ad_select): stable
-bond bond0 has no active aggregator
-
-Slave Interface: eth1
-MII Status: up
-Link Failure Count: 0
-Permanent HW addr: 00:0c:29:f5:b7:11
-Aggregator ID: N/A
-
-Slave Interface: eth2
-MII Status: up
-Link Failure Count: 3
-Permanent HW addr: 00:0c:29:f5:b7:1b
-Aggregator ID: N/A
-`
-
-var sampleTestAB = `
-Ethernet Channel Bonding Driver: v3.6.0 (September 26, 2009)
-
-Bonding Mode: fault-tolerance (active-backup)
-Primary Slave: eth2 (primary_reselect always)
-Currently Active Slave: eth2
-MII Status: up
-MII Polling Interval (ms): 100
-Up Delay (ms): 0
-Down Delay (ms): 0
-
-Slave Interface: eth3
-MII Status: down
-Speed: 1000 Mbps
-Duplex: full
-Link Failure Count: 2
-Permanent HW addr:
-Slave queue ID: 0
-
-Slave Interface: eth2
-MII Status: up
-Speed: 100 Mbps
-Duplex: full
-Link Failure Count: 0
-Permanent HW addr:
-`
-
-func TestGatherBondInterface(t *testing.T) {
-	var acc testutil.Accumulator
-	bond := &Bond{}
-
-	bond.gatherBondInterface("bond802", sampleTest802, &acc)
-	acc.AssertContainsTaggedFields(t, "bond", map[string]interface{}{"status": 1}, map[string]string{"bond": "bond802"})
-	acc.AssertContainsTaggedFields(t, "bond_slave", map[string]interface{}{"failures": 0, "status": 1}, map[string]string{"bond": "bond802", "interface": "eth1"})
-	acc.AssertContainsTaggedFields(t, "bond_slave", map[string]interface{}{"failures": 3, "status": 1}, map[string]string{"bond": "bond802", "interface": "eth2"})
-
-	bond.gatherBondInterface("bondAB", sampleTestAB, &acc)
-	acc.AssertContainsTaggedFields(t, "bond", map[string]interface{}{"active_slave": "eth2", "status": 1}, map[string]string{"bond": "bondAB"})
-	acc.AssertContainsTaggedFields(t, "bond_slave", map[string]interface{}{"failures": 2, "status": 0}, map[string]string{"bond": "bondAB", "interface": "eth3"})
-	acc.AssertContainsTaggedFields(t, "bond_slave", map[string]interface{}{"failures": 0, "status": 1}, map[string]string{"bond": "bondAB", "interface": "eth2"})
-}
--- a/plugins/inputs/cassandra/README.md
+++ b/plugins/inputs/cassandra/README.md
@@ -1,125 +0,0 @@
-# Telegraf plugin: Cassandra
-
-#### Plugin arguments:
- **context** string: Context root used for jolokia url
- **servers** []string: List of servers with the format "<user:passwd@><host>:port"
- **metrics** []string: List of Jmx paths that identify mbeans attributes
-
-#### Description
-
-The Cassandra plugin collects Cassandra 3 / JVM metrics exposed as MBean's attributes through jolokia REST endpoint. All metrics are collected for each server configured.
-
-See: https://jolokia.org/ and [Cassandra Documentation](http://docs.datastax.com/en/cassandra/3.x/cassandra/operations/monitoringCassandraTOC.html)
-
-# Measurements:
-Cassandra plugin produces one or more measurements for each metric configured, adding Server's name  as `host` tag. More than one measurement is generated when querying table metrics with a wildcard for the keyspace or table name.
-
-Given a configuration like:
-
-```toml
-[[inputs.cassandra]]
-  context = "/jolokia/read"
-  servers = [":8778"]
-  metrics = ["/java.lang:type=Memory/HeapMemoryUsage"]
-```
-
-The collected metrics will be:
-
-```
-javaMemory,host=myHost,mname=HeapMemoryUsage HeapMemoryUsage_committed=1040187392,HeapMemoryUsage_init=1050673152,HeapMemoryUsage_max=1040187392,HeapMemoryUsage_used=368155000 1459551767230567084
-```
-
-# Useful Metrics:
-
-Here is a list of metrics that might be useful to monitor your cassandra cluster. This was put together from multiple sources on the web.
-
- [How to monitor Cassandra performance metrics](https://www.datadoghq.com/blog/how-to-monitor-cassandra-performance-metrics)
- [Cassandra Documentation](http://docs.datastax.com/en/cassandra/3.x/cassandra/operations/monitoringCassandraTOC.html)
-
-####measurement = javaGarbageCollector
-
- /java.lang:type=GarbageCollector,name=ConcurrentMarkSweep/CollectionTime
- /java.lang:type=GarbageCollector,name=ConcurrentMarkSweep/CollectionCount
- /java.lang:type=GarbageCollector,name=ParNew/CollectionTime
- /java.lang:type=GarbageCollector,name=ParNew/CollectionCount
-
-####measurement = javaMemory
-
- /java.lang:type=Memory/HeapMemoryUsage
- /java.lang:type=Memory/NonHeapMemoryUsage
-
-####measurement = cassandraCache
-
- /org.apache.cassandra.metrics:type=Cache,scope=KeyCache,name=Hits
- /org.apache.cassandra.metrics:type=Cache,scope=KeyCache,name=Requests
- /org.apache.cassandra.metrics:type=Cache,scope=KeyCache,name=Entries
- /org.apache.cassandra.metrics:type=Cache,scope=KeyCache,name=Size
- /org.apache.cassandra.metrics:type=Cache,scope=KeyCache,name=Capacity
- /org.apache.cassandra.metrics:type=Cache,scope=RowCache,name=Hits
- /org.apache.cassandra.metrics:type=Cache,scope=RowCache,name=Requests
- /org.apache.cassandra.metrics:type=Cache,scope=RowCache,name=Entries
- /org.apache.cassandra.metrics:type=Cache,scope=RowCache,name=Size
- /org.apache.cassandra.metrics:type=Cache,scope=RowCache,name=Capacity
-
-####measurement = cassandraClient
-
- /org.apache.cassandra.metrics:type=Client,name=connectedNativeClients
-
-####measurement = cassandraClientRequest
-
- /org.apache.cassandra.metrics:type=ClientRequest,scope=Read,name=TotalLatency
- /org.apache.cassandra.metrics:type=ClientRequest,scope=Write,name=TotalLatency
- /org.apache.cassandra.metrics:type=ClientRequest,scope=Read,name=Latency
- /org.apache.cassandra.metrics:type=ClientRequest,scope=Write,name=Latency
- /org.apache.cassandra.metrics:type=ClientRequest,scope=Read,name=Timeouts
- /org.apache.cassandra.metrics:type=ClientRequest,scope=Write,name=Timeouts
- /org.apache.cassandra.metrics:type=ClientRequest,scope=Read,name=Unavailables
- /org.apache.cassandra.metrics:type=ClientRequest,scope=Write,name=Unavailables
- /org.apache.cassandra.metrics:type=ClientRequest,scope=Read,name=Failures
- /org.apache.cassandra.metrics:type=ClientRequest,scope=Write,name=Failures
-
-####measurement = cassandraCommitLog
-
- /org.apache.cassandra.metrics:type=CommitLog,name=PendingTasks
- /org.apache.cassandra.metrics:type=CommitLog,name=TotalCommitLogSize
-
-####measurement = cassandraCompaction
-
- /org.apache.cassandra.metrics:type=Compaction,name=CompletedTasks
- /org.apache.cassandra.metrics:type=Compaction,name=PendingTasks
- /org.apache.cassandra.metrics:type=Compaction,name=TotalCompactionsCompleted
- /org.apache.cassandra.metrics:type=Compaction,name=BytesCompacted
-
-####measurement = cassandraStorage
-
- /org.apache.cassandra.metrics:type=Storage,name=Load
-  /org.apache.cassandra.metrics:type=Storage,name=Exceptions
-
-####measurement = cassandraTable
-Using wildcards for "keyspace" and "scope" can create a lot of series as metrics will be reported for every table and keyspace including internal system tables. Specify a keyspace name and/or a table name to limit them.
-
- /org.apache.cassandra.metrics:type=Table,keyspace=\*,scope=\*,name=LiveDiskSpaceUsed
- /org.apache.cassandra.metrics:type=Table,keyspace=\*,scope=\*,name=TotalDiskSpaceUsed
- /org.apache.cassandra.metrics:type=Table,keyspace=\*,scope=\*,name=ReadLatency
- /org.apache.cassandra.metrics:type=Table,keyspace=\*,scope=\*,name=CoordinatorReadLatency
- /org.apache.cassandra.metrics:type=Table,keyspace=\*,scope=\*,name=WriteLatency
- /org.apache.cassandra.metrics:type=Table,keyspace=\*,scope=\*,name=ReadTotalLatency
- /org.apache.cassandra.metrics:type=Table,keyspace=\*,scope=\*,name=WriteTotalLatency
-
-
-####measurement = cassandraThreadPools
-
- /org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=CompactionExecutor,name=ActiveTasks
- /org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=AntiEntropyStage,name=ActiveTasks
-  /org.apache.cassandra.metrics:type=ThreadPools,path=request,scope=CounterMutationStage,name=PendingTasks
- /org.apache.cassandra.metrics:type=ThreadPools,path=request,scope=CounterMutationStage,name=CurrentlyBlockedTasks        
- /org.apache.cassandra.metrics:type=ThreadPools,path=request,scope=MutationStage,name=PendingTasks
- /org.apache.cassandra.metrics:type=ThreadPools,path=request,scope=MutationStage,name=CurrentlyBlockedTasks
- /org.apache.cassandra.metrics:type=ThreadPools,path=request,scope=ReadRepairStage,name=PendingTasks
- /org.apache.cassandra.metrics:type=ThreadPools,path=request,scope=ReadRepairStage,name=CurrentlyBlockedTasks
- /org.apache.cassandra.metrics:type=ThreadPools,path=request,scope=ReadStage,name=PendingTasks
- /org.apache.cassandra.metrics:type=ThreadPools,path=request,scope=ReadStage,name=CurrentlyBlockedTasks
-  /org.apache.cassandra.metrics:type=ThreadPools,path=request,scope=RequestResponseStage,name=PendingTasks        
- /org.apache.cassandra.metrics:type=ThreadPools,path=request,scope=RequestResponseStage,name=CurrentlyBlockedTasks
-
-
--- a/plugins/inputs/cassandra/cassandra.go
+++ b/plugins/inputs/cassandra/cassandra.go
@@ -1,312 +0,0 @@
-package cassandra
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/plugins/inputs"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-	"strings"
-)
-
-type JolokiaClient interface {
-	MakeRequest(req *http.Request) (*http.Response, error)
-}
-
-type JolokiaClientImpl struct {
-	client *http.Client
-}
-
-func (c JolokiaClientImpl) MakeRequest(req *http.Request) (*http.Response, error) {
-	return c.client.Do(req)
-}
-
-type Cassandra struct {
-	jClient JolokiaClient
-	Context string
-	Servers []string
-	Metrics []string
-}
-
-type javaMetric struct {
-	host   string
-	metric string
-	acc    telegraf.Accumulator
-}
-
-type cassandraMetric struct {
-	host   string
-	metric string
-	acc    telegraf.Accumulator
-}
-
-type jmxMetric interface {
-	addTagsFields(out map[string]interface{})
-}
-
-func newJavaMetric(host string, metric string,
-	acc telegraf.Accumulator) *javaMetric {
-	return &javaMetric{host: host, metric: metric, acc: acc}
-}
-
-func newCassandraMetric(host string, metric string,
-	acc telegraf.Accumulator) *cassandraMetric {
-	return &cassandraMetric{host: host, metric: metric, acc: acc}
-}
-
-func addValuesAsFields(values map[string]interface{}, fields map[string]interface{},
-	mname string) {
-	for k, v := range values {
-		if v != nil {
-			fields[mname+"_"+k] = v
-		}
-	}
-}
-
-func parseJmxMetricRequest(mbean string) map[string]string {
-	tokens := make(map[string]string)
-	classAndPairs := strings.Split(mbean, ":")
-	if classAndPairs[0] == "org.apache.cassandra.metrics" {
-		tokens["class"] = "cassandra"
-	} else if classAndPairs[0] == "java.lang" {
-		tokens["class"] = "java"
-	} else {
-		return tokens
-	}
-	pairs := strings.Split(classAndPairs[1], ",")
-	for _, pair := range pairs {
-		p := strings.Split(pair, "=")
-		tokens[p[0]] = p[1]
-	}
-	return tokens
-}
-
-func addTokensToTags(tokens map[string]string, tags map[string]string) {
-	for k, v := range tokens {
-		if k == "name" {
-			tags["mname"] = v // name seems to a reserved word in influxdb
-		} else if k == "class" || k == "type" {
-			continue // class and type are used in the metric name
-		} else {
-			tags[k] = v
-		}
-	}
-}
-
-func (j javaMetric) addTagsFields(out map[string]interface{}) {
-	tags := make(map[string]string)
-	fields := make(map[string]interface{})
-
-	a := out["request"].(map[string]interface{})
-	attribute := a["attribute"].(string)
-	mbean := a["mbean"].(string)
-
-	tokens := parseJmxMetricRequest(mbean)
-	addTokensToTags(tokens, tags)
-	tags["cassandra_host"] = j.host
-
-	if _, ok := tags["mname"]; !ok {
-		//Queries for a single value will not return a "name" tag in the response.
-		tags["mname"] = attribute
-	}
-
-	if values, ok := out["value"]; ok {
-		switch t := values.(type) {
-		case map[string]interface{}:
-			addValuesAsFields(values.(map[string]interface{}), fields, attribute)
-		case interface{}:
-			fields[attribute] = t
-		}
-		j.acc.AddFields(tokens["class"]+tokens["type"], fields, tags)
-	} else {
-		j.acc.AddError(fmt.Errorf("Missing key 'value' in '%s' output response\n%v\n",
-			j.metric, out))
-	}
-}
-
-func addCassandraMetric(mbean string, c cassandraMetric,
-	values map[string]interface{}) {
-
-	tags := make(map[string]string)
-	fields := make(map[string]interface{})
-	tokens := parseJmxMetricRequest(mbean)
-	addTokensToTags(tokens, tags)
-	tags["cassandra_host"] = c.host
-	addValuesAsFields(values, fields, tags["mname"])
-	c.acc.AddFields(tokens["class"]+tokens["type"], fields, tags)
-
-}
-
-func (c cassandraMetric) addTagsFields(out map[string]interface{}) {
-
-	r := out["request"]
-
-	tokens := parseJmxMetricRequest(r.(map[string]interface{})["mbean"].(string))
-	// Requests with wildcards for keyspace or table names will return nested
-	// maps in the json response
-	if (tokens["type"] == "Table" || tokens["type"] == "ColumnFamily") && (tokens["keyspace"] == "*" ||
-		tokens["scope"] == "*") {
-		if valuesMap, ok := out["value"]; ok {
-			for k, v := range valuesMap.(map[string]interface{}) {
-				addCassandraMetric(k, c, v.(map[string]interface{}))
-			}
-		} else {
-			c.acc.AddError(fmt.Errorf("Missing key 'value' in '%s' output response\n%v\n",
-				c.metric, out))
-			return
-		}
-	} else {
-		if values, ok := out["value"]; ok {
-			addCassandraMetric(r.(map[string]interface{})["mbean"].(string),
-				c, values.(map[string]interface{}))
-		} else {
-			c.acc.AddError(fmt.Errorf("Missing key 'value' in '%s' output response\n%v\n",
-				c.metric, out))
-			return
-		}
-	}
-}
-
-func (j *Cassandra) SampleConfig() string {
-	return `
-  # This is the context root used to compose the jolokia url
-  context = "/jolokia/read"
-  ## List of cassandra servers exposing jolokia read service
-  servers = ["myuser:mypassword@10.10.10.1:8778","10.10.10.2:8778",":8778"]
-  ## List of metrics collected on above servers
-  ## Each metric consists of a jmx path.
-  ## This will collect all heap memory usage metrics from the jvm and
-  ## ReadLatency metrics for all keyspaces and tables.
-  ## "type=Table" in the query works with Cassandra3.0. Older versions might
-  ## need to use "type=ColumnFamily"
-  metrics  = [
-    "/java.lang:type=Memory/HeapMemoryUsage",
-    "/org.apache.cassandra.metrics:type=Table,keyspace=*,scope=*,name=ReadLatency"
-  ]
-`
-}
-
-func (j *Cassandra) Description() string {
-	return "Read Cassandra metrics through Jolokia"
-}
-
-func (j *Cassandra) getAttr(requestUrl *url.URL) (map[string]interface{}, error) {
-	// Create + send request
-	req, err := http.NewRequest("GET", requestUrl.String(), nil)
-	if err != nil {
-		return nil, err
-	}
-
-	resp, err := j.jClient.MakeRequest(req)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	// Process response
-	if resp.StatusCode != http.StatusOK {
-		err = fmt.Errorf("Response from url \"%s\" has status code %d (%s), expected %d (%s)",
-			requestUrl,
-			resp.StatusCode,
-			http.StatusText(resp.StatusCode),
-			http.StatusOK,
-			http.StatusText(http.StatusOK))
-		return nil, err
-	}
-
-	// read body
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-
-	// Unmarshal json
-	var jsonOut map[string]interface{}
-	if err = json.Unmarshal([]byte(body), &jsonOut); err != nil {
-		return nil, errors.New("Error decoding JSON response")
-	}
-
-	return jsonOut, nil
-}
-
-func parseServerTokens(server string) map[string]string {
-	serverTokens := make(map[string]string)
-
-	hostAndUser := strings.Split(server, "@")
-	hostPort := ""
-	userPasswd := ""
-	if len(hostAndUser) == 2 {
-		hostPort = hostAndUser[1]
-		userPasswd = hostAndUser[0]
-	} else {
-		hostPort = hostAndUser[0]
-	}
-	hostTokens := strings.Split(hostPort, ":")
-	serverTokens["host"] = hostTokens[0]
-	serverTokens["port"] = hostTokens[1]
-
-	if userPasswd != "" {
-		userTokens := strings.Split(userPasswd, ":")
-		serverTokens["user"] = userTokens[0]
-		serverTokens["passwd"] = userTokens[1]
-	}
-	return serverTokens
-}
-
-func (c *Cassandra) Gather(acc telegraf.Accumulator) error {
-	context := c.Context
-	servers := c.Servers
-	metrics := c.Metrics
-
-	for _, server := range servers {
-		for _, metric := range metrics {
-			serverTokens := parseServerTokens(server)
-
-			var m jmxMetric
-			if strings.HasPrefix(metric, "/java.lang:") {
-				m = newJavaMetric(serverTokens["host"], metric, acc)
-			} else if strings.HasPrefix(metric,
-				"/org.apache.cassandra.metrics:") {
-				m = newCassandraMetric(serverTokens["host"], metric, acc)
-			} else {
-				// unsupported metric type
-				acc.AddError(fmt.Errorf("E! Unsupported Cassandra metric [%s], skipping",
-					metric))
-				continue
-			}
-
-			// Prepare URL
-			requestUrl, err := url.Parse("http://" + serverTokens["host"] + ":" +
-				serverTokens["port"] + context + metric)
-			if err != nil {
-				acc.AddError(err)
-				continue
-			}
-			if serverTokens["user"] != "" && serverTokens["passwd"] != "" {
-				requestUrl.User = url.UserPassword(serverTokens["user"],
-					serverTokens["passwd"])
-			}
-
-			out, err := c.getAttr(requestUrl)
-			if err != nil {
-				acc.AddError(err)
-				continue
-			}
-			if out["status"] != 200.0 {
-				acc.AddError(fmt.Errorf("URL returned with status %v - %s\n", out["status"], requestUrl))
-				continue
-			}
-			m.addTagsFields(out)
-		}
-	}
-	return nil
-}
-
-func init() {
-	inputs.Add("cassandra", func() telegraf.Input {
-		return &Cassandra{jClient: &JolokiaClientImpl{client: &http.Client{}}}
-	})
-}
--- a/Show More
+++ b/Show More