influxdb output: treat field type conflicts as a successful write

If we write a batch of points and get a "field type conflict" error message in return, we should drop the entire batch of points because this indicates that one or more points have a type that doesnt match the database. These errors will never go away on their own, and InfluxDB will successfully write the points that dont have a conflict. closes #2245
Add newline to influx line-protocol if not present
2017-01-23 18:26:37 -08:00 · 2017-01-23 14:12:28 -08:00 · 2017-01-23 13:45:56 -08:00 · 2017-01-13 11:44:28 +00:00 · 2017-01-13 11:43:50 +00:00 · 2017-01-12 11:14:12 +00:00
234 changed files with 12504 additions and 2951 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,108 @@
-## v1.1 [unreleased]
+## v1.2 [unreleased]

 ### Release Notes

+- The StatsD plugin will now default all "delete_" config options to "true". This
+will change te default behavior for users who were not specifying these parameters
+in their config file.
+
+- The StatsD plugin will also no longer save it's state on a service reload.
+Essentially we have reverted PR [#887](https://github.com/influxdata/telegraf/pull/887).
+The reason for this is that saving the state in a global variable is not
+thread-safe (see [#1975](https://github.com/influxdata/telegraf/issues/1975) & [#2102](https://github.com/influxdata/telegraf/issues/2102)),
+and this creates issues if users want to define multiple instances
+of the statsd plugin. Saving state on reload may be considered in the future,
+but this would need to be implemented at a higher level and applied to all
+plugins, not just statsd.
+
 ### Features

+- [#2123](https://github.com/influxdata/telegraf/pull/2123): Fix improper calculation of CPU percentages
+- [#1564](https://github.com/influxdata/telegraf/issues/1564): Use RFC3339 timestamps in log output.
+- [#1997](https://github.com/influxdata/telegraf/issues/1997): Non-default HTTP timeouts for RabbitMQ plugin.
+- [#2074](https://github.com/influxdata/telegraf/pull/2074): "discard" output plugin added, primarily for testing purposes.
+- [#1965](https://github.com/influxdata/telegraf/pull/1965): The JSON parser can now parse an array of objects using the same configuration.
+- [#1807](https://github.com/influxdata/telegraf/pull/1807): Option to use device name rather than path for reporting disk stats.
+- [#1348](https://github.com/influxdata/telegraf/issues/1348): Telegraf "internal" plugin for collecting stats on itself.
+- [#2127](https://github.com/influxdata/telegraf/pull/2127): Update Go version to 1.7.4.
+- [#2126](https://github.com/influxdata/telegraf/pull/2126): Support a metric.Split function.
+- [#2026](https://github.com/influxdata/telegraf/pull/2065): elasticsearch "shield" (basic auth) support doc.
+- [#1885](https://github.com/influxdata/telegraf/pull/1885): Fix over-querying of cloudwatch metrics
+- [#1913](https://github.com/influxdata/telegraf/pull/1913): OpenTSDB basic auth support.
+- [#1908](https://github.com/influxdata/telegraf/pull/1908): RabbitMQ Connection metrics.
+- [#1937](https://github.com/influxdata/telegraf/pull/1937): HAProxy session limit metric.
+- [#2068](https://github.com/influxdata/telegraf/issues/2068): Accept strings for StatsD sets.
+- [#1893](https://github.com/influxdata/telegraf/issues/1893): Change StatsD default "reset" behavior.
+- [#2079](https://github.com/influxdata/telegraf/pull/2079): Enable setting ClientID in MQTT output.
+- [#2001](https://github.com/influxdata/telegraf/pull/2001): MongoDB input plugin: Improve state data.
+- [#2078](https://github.com/influxdata/telegraf/pull/2078): Ping input: add standard deviation field.
+- [#2121](https://github.com/influxdata/telegraf/pull/2121): Add GC pause metric to InfluxDB input plugin.
+- [#2006](https://github.com/influxdata/telegraf/pull/2006): Added response_timeout property to prometheus input plugin.
+- [#1763](https://github.com/influxdata/telegraf/issues/1763): Pulling github.com/lxn/win's pdh wrapper into telegraf.
+- [#1898](https://github.com/influxdata/telegraf/issues/1898): Support negative statsd counters.
+- [#1921](https://github.com/influxdata/telegraf/issues/1921): Elasticsearch cluster stats support.
+- [#1942](https://github.com/influxdata/telegraf/pull/1942): Change Amazon Kinesis output plugin to use the built-in serializer plugins.
+- [#1980](https://github.com/influxdata/telegraf/issues/1980): Hide username/password from elasticsearch error log messages.
+- [#2097](https://github.com/influxdata/telegraf/issues/2097): Configurable HTTP timeouts in Jolokia plugin
+- [#2255](https://github.com/influxdata/telegraf/pull/2255): Allow changing jolokia attribute delimiter
+
+### Bugfixes
+
+- [#2049](https://github.com/influxdata/telegraf/pull/2049): Fix the Value data format not trimming null characters from input.
+- [#1949](https://github.com/influxdata/telegraf/issues/1949): Fix windows `net` plugin.
+- [#1775](https://github.com/influxdata/telegraf/issues/1775): Cache & expire metrics for delivery to prometheus
+- [#1775](https://github.com/influxdata/telegraf/issues/1775): Cache & expire metrics for delivery to prometheus.
+- [#2146](https://github.com/influxdata/telegraf/issues/2146): Fix potential panic in aggregator plugin metric maker.
+- [#1843](https://github.com/influxdata/telegraf/pull/1843) & [#1668](https://github.com/influxdata/telegraf/issues/1668): Add optional ability to define PID as a tag.
+- [#1730](https://github.com/influxdata/telegraf/issues/1730): Fix win_perf_counters not gathering non-English counters.
+- [#2061](https://github.com/influxdata/telegraf/issues/2061): Fix panic when file stat info cannot be collected due to permissions or other issue(s).
+- [#2045](https://github.com/influxdata/telegraf/issues/2045): Graylog output should set short_message field.
+- [#1904](https://github.com/influxdata/telegraf/issues/1904): Hddtemp always put the value in the field temperature.
+- [#1693](https://github.com/influxdata/telegraf/issues/1693): Properly collect nested jolokia struct data.
+- [#1917](https://github.com/influxdata/telegraf/pull/1917): fix puppetagent inputs plugin to support string for config variable.
+- [#1987](https://github.com/influxdata/telegraf/issues/1987): fix docker input plugin tags when registry has port.
+- [#2089](https://github.com/influxdata/telegraf/issues/2089): Fix tail input when reading from a pipe.
+- [#1449](https://github.com/influxdata/telegraf/issues/1449): MongoDB plugin always shows 0 replication lag.
+- [#1825](https://github.com/influxdata/telegraf/issues/1825): Consul plugin: add check_id as a tag in metrics to avoid overwrites.
+- [#1973](https://github.com/influxdata/telegraf/issues/1973): Partial fix: logparser CLF pattern with IPv6 addresses.
+- [#1975](https://github.com/influxdata/telegraf/issues/1975) & [#2102](https://github.com/influxdata/telegraf/issues/2102): Fix thread-safety when using multiple instances of the statsd input plugin.
+- [#2027](https://github.com/influxdata/telegraf/issues/2027): docker input: interface conversion panic fix.
+- [#1814](https://github.com/influxdata/telegraf/issues/1814): snmp: ensure proper context is present on error messages.
+- [#2299](https://github.com/influxdata/telegraf/issues/2299): opentsdb: add tcp:// prefix if no scheme provided.
+- [#2297](https://github.com/influxdata/telegraf/issues/2297): influx parser: parse line-protocol without newlines.
+- [#2245](https://github.com/influxdata/telegraf/issues/2245): influxdb output: fix field type conflict blocking output buffer.
+
+## v1.1.2 [2016-12-12]
+
+### Bugfixes
+
+- [#2007](https://github.com/influxdata/telegraf/issues/2007): Make snmptranslate not required when using numeric OID.
+- [#2104](https://github.com/influxdata/telegraf/issues/2104): Add a global snmp translation cache.
+
+## v1.1.1 [2016-11-14]
+
+### Bugfixes
+
+- [#2023](https://github.com/influxdata/telegraf/issues/2023): Fix issue parsing toml durations with single quotes.
+
+## v1.1.0 [2016-11-07]
+
+### Release Notes
+
+- Telegraf now supports two new types of plugins: processors & aggregators.
+
+- On systemd Telegraf will no longer redirect it's stdout to /var/log/telegraf/telegraf.log.
+On most systems, the logs will be directed to the systemd journal and can be
+accessed by `journalctl -u telegraf.service`. Consult the systemd journal
+documentation for configuring journald. There is also a [`logfile` config option](https://github.com/influxdata/telegraf/blob/master/etc/telegraf.conf#L70)
+available in 1.1, which will allow users to easily configure telegraf to
+continue sending logs to /var/log/telegraf/telegraf.log.
+
+### Features
+
+- [#1726](https://github.com/influxdata/telegraf/issues/1726): Processor & Aggregator plugin support.
+- [#1861](https://github.com/influxdata/telegraf/pull/1861): adding the tags in the graylog output plugin
+- [#1732](https://github.com/influxdata/telegraf/pull/1732): Telegraf systemd service, log to journal.
 - [#1782](https://github.com/influxdata/telegraf/pull/1782): Allow numeric and non-string values for tag_keys.
 - [#1694](https://github.com/influxdata/telegraf/pull/1694): Adding Gauge and Counter metric types.
 - [#1606](https://github.com/influxdata/telegraf/pull/1606): Remove carraige returns from exec plugin output on Windows
@@ -18,18 +117,22 @@
 - [#1542](https://github.com/influxdata/telegraf/pull/1542): Add filestack webhook plugin.
 - [#1599](https://github.com/influxdata/telegraf/pull/1599): Add server hostname for each docker measurements.
 - [#1697](https://github.com/influxdata/telegraf/pull/1697): Add NATS output plugin.
- [#1407](https://github.com/influxdata/telegraf/pull/1407): HTTP service listener input plugin.
+- [#1407](https://github.com/influxdata/telegraf/pull/1407) & [#1915](https://github.com/influxdata/telegraf/pull/1915): HTTP service listener input plugin.
 - [#1699](https://github.com/influxdata/telegraf/pull/1699): Add database blacklist option for Postgresql
 - [#1791](https://github.com/influxdata/telegraf/pull/1791): Add Docker container state metrics to Docker input plugin output
 - [#1755](https://github.com/influxdata/telegraf/issues/1755): Add support to SNMP for IP & MAC address conversion.
 - [#1729](https://github.com/influxdata/telegraf/issues/1729): Add support to SNMP for OID index suffixes.
 - [#1813](https://github.com/influxdata/telegraf/pull/1813): Change default arguments for SNMP plugin.
 - [#1686](https://github.com/influxdata/telegraf/pull/1686): Mesos input plugin: very high-cardinality mesos-task metrics removed.
- [#1839](https://github.com/influxdata/telegraf/pull/1839): Exact match with pgrep -x option in procstat
 - [#1838](https://github.com/influxdata/telegraf/pull/1838): Logging overhaul to centralize the logger & log levels, & provide a logfile config option.
+- [#1700](https://github.com/influxdata/telegraf/pull/1700): HAProxy plugin socket glob matching.
+- [#1847](https://github.com/influxdata/telegraf/pull/1847): Add Kubernetes plugin for retrieving pod metrics.

 ### Bugfixes

+- [#1955](https://github.com/influxdata/telegraf/issues/1955): Fix NATS plug-ins reconnection logic.
+- [#1936](https://github.com/influxdata/telegraf/issues/1936): Set required default values in udp_listener & tcp_listener.
+- [#1926](https://github.com/influxdata/telegraf/issues/1926): Fix toml unmarshal panic in Duration objects.
 - [#1746](https://github.com/influxdata/telegraf/issues/1746): Fix handling of non-string values for JSON keys listed in tag_keys.
 - [#1628](https://github.com/influxdata/telegraf/issues/1628): Fix mongodb input panic on version 2.2.
 - [#1733](https://github.com/influxdata/telegraf/issues/1733): Fix statsd scientific notation parsing
@@ -44,8 +147,22 @@
 - [#1772](https://github.com/influxdata/telegraf/pull/1772): Windows remote management interactive service fix.
 - [#1702](https://github.com/influxdata/telegraf/issues/1702): sqlserver, fix issue when case sensitive collation is activated.
 - [#1823](https://github.com/influxdata/telegraf/issues/1823): Fix huge allocations in http_listener when dealing with huge payloads.
+- [#1833](https://github.com/influxdata/telegraf/issues/1833): Fix translating SNMP fields not in MIB.
+- [#1835](https://github.com/influxdata/telegraf/issues/1835): Fix SNMP emitting empty fields.
+- [#1854](https://github.com/influxdata/telegraf/pull/1853): SQL Server waitstats truncation bug.
+- [#1810](https://github.com/influxdata/telegraf/issues/1810): Fix logparser common log format: numbers in ident.
+- [#1793](https://github.com/influxdata/telegraf/pull/1793): Fix JSON Serialization in OpenTSDB output.
+- [#1731](https://github.com/influxdata/telegraf/issues/1731): Fix Graphite template ordering, use most specific.
+- [#1836](https://github.com/influxdata/telegraf/pull/1836): Fix snmp table field initialization for non-automatic table.
+- [#1724](https://github.com/influxdata/telegraf/issues/1724): cgroups path being parsed as metric.
+- [#1886](https://github.com/influxdata/telegraf/issues/1886): Fix phpfpm fcgi client panic when URL does not exist.
+- [#1344](https://github.com/influxdata/telegraf/issues/1344): Fix config file parse error logging.
+- [#1771](https://github.com/influxdata/telegraf/issues/1771): Delete nil fields in the metric maker.
+- [#870](https://github.com/influxdata/telegraf/issues/870): Fix MySQL special characters in DSN parsing.
+- [#1742](https://github.com/influxdata/telegraf/issues/1742): Ping input odd timeout behavior.
+- [#1950](https://github.com/influxdata/telegraf/pull/1950): Switch to github.com/kballard/go-shellquote.

-## v1.0.1 [unreleased]
+## v1.0.1 [2016-09-26]

 ### Bugfixes

--- 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 `plugins/inputs/all/all.go` or `plugins/outputs/all/all.go`
+1. Add your plugin to one of: `plugins/{inputs,outputs,aggregators,processors}/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
@@ -16,8 +16,8 @@ for a good example.

 ## GoDoc

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

@@ -46,7 +46,7 @@ and submit new inputs.

 ### Input Plugin Guidelines

-* A plugin must conform to the `telegraf.Input` interface.
+* A plugin must conform to the [`telegraf.Input`](https://godoc.org/github.com/influxdata/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
@@ -177,7 +177,7 @@ similar constructs.

 ### Output Plugin Guidelines

-* An output must conform to the `outputs.Output` interface.
+* An output must conform to the [`telegraf.Output`](https://godoc.org/github.com/influxdata/telegraf#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
@@ -275,6 +275,186 @@ 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 `telegraf -sample-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 -sample-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

 ### Execute short tests
--- a/14
+++ b/14
@@ -19,19 +19,19 @@ github.com/eclipse/paho.mqtt.golang 0f7a459f04f13a41b7ed752d47944528d4bf9a86
 github.com/go-sql-driver/mysql 1fca743146605a172a266e1654e01e5cd5669bee
 github.com/gobwas/glob 49571a1557cd20e6a2410adc6421f85b66c730b5
 github.com/golang/protobuf 552c7b9542c194800fd493123b3798ef0a832032
-github.com/golang/snappy 427fb6fc07997f43afa32f35e850833760e489a7
-github.com/gonuts/go-shellquote e842a11b24c6abfb3dd27af69a17f482e4b483c2
+github.com/golang/snappy d9eb7a3d35ec988b8585d4a0068e462c27d28380
 github.com/gorilla/context 1ea25387ff6f684839d82767c1733ff4d4d15d0a
 github.com/gorilla/mux c9e326e2bdec29039a3761c07bece13133863e1e
 github.com/hailocab/go-hostpool e80d13ce29ede4452c43dea11e79b9bc8a15b478
 github.com/hashicorp/consul 5aa90455ce78d4d41578bafc86305e6e6b28d7d2
 github.com/hpcloud/tail b2940955ab8b26e19d43a43c4da0475dd81bdb56
 github.com/influxdata/config b79f6829346b8d6e78ba73544b1e1038f1f1c9da
-github.com/influxdata/influxdb e094138084855d444195b252314dfee9eae34cab
+github.com/influxdata/influxdb fc57c0f7c635df3873f3d64f0ed2100ddc94d5ae
 github.com/influxdata/toml af4df43894b16e3fd2b788d01bd27ad0776ef2d0
 github.com/influxdata/wlog 7c63b0a71ef8300adc255344d275e10e5c3a71ec
 github.com/kardianos/osext 29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc
 github.com/kardianos/service 5e335590050d6d00f3aa270217d288dda1c94d0a
+github.com/kballard/go-shellquote d8ec1a69a250a17bb0e419c386eac1f3711dc142
 github.com/klauspost/crc32 19b0b332c9e4516a6370a0456e6182c3b5036720
 github.com/lib/pq e182dc4027e2ded4b19396d638610f2653295f36
 github.com/matttproud/golang_protobuf_extensions d0c3fe89de86839aecf2e0579c40ba3bb336a453
@@ -47,16 +47,16 @@ github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6
 github.com/prometheus/common e8eabff8812b05acf522b45fdcd725a785188e37
 github.com/prometheus/procfs 406e5b7bfd8201a36e2bb5f7bdae0b03380c2ce8
 github.com/samuel/go-zookeeper 218e9c81c0dd8b3b18172b2bbfad92cc7d6db55f
-github.com/shirou/gopsutil 4d0c402af66c78735c5ccf820dc2ca7de5e4ff08
-github.com/soniah/gosnmp eb32571c2410868d85849ad67d1e51d01273eb84
+github.com/shirou/gopsutil 1516eb9ddc5e61ba58874047a98f8b44b5e585e8
+github.com/soniah/gosnmp 3fe3beb30fa9700988893c56a63b1df8e1b68c26
 github.com/streadway/amqp b4f3ceab0337f013208d31348b578d83c0064744
 github.com/stretchr/testify 1f4a1643a57e798696635ea4c126e9127adb7d3c
 github.com/vjeantet/grok 83bfdfdfd1a8146795b28e547a8e3c8b28a466c2
-github.com/wvanbergen/kafka 46f9a1cf3f670edec492029fadded9c2d9e18866
+github.com/wvanbergen/kafka bc265fedb9ff5b5c5d3c0fdcef4a819b3523d3ee
 github.com/wvanbergen/kazoo-go 0f768712ae6f76454f987c3356177e138df258f8
 github.com/yuin/gopher-lua bf3808abd44b1e55143a2d7f08571aaa80db1808
 github.com/zensqlmonitor/go-mssqldb ffe5510c6fa5e15e6d983210ab501c815b56b363
-golang.org/x/crypto 5dc8cb4b8a8eb076cbb5a06bc3b8682c15bdbbd3
+golang.org/x/crypto c197bcf24cde29d3f73c7b4ac6fd41f4384e8af6
 golang.org/x/net 6acef71eb69611914f7a30939ea9f6e194c78172
 golang.org/x/text a71fd10341b064c10f4a81ceac72bcf70f26ea34
 gopkg.in/dancannon/gorethink.v1 7d1af5be49cb5ecc7b177bf387d232050299d6ef
--- a/1
+++ b/1
@@ -1,7 +1,6 @@
 github.com/Microsoft/go-winio ce2922f643c8fd76b46cadc7f404a06282678b34
 github.com/StackExchange/wmi f3e2bae1e0cb5aef83e319133eabfee30013a4a5
 github.com/go-ole/go-ole be49f7c07711fcb603cff39e1de7c67926dc0ba7
-github.com/lxn/win 950a0e81e7678e63d8e6cd32412bdecb325ccd88
 github.com/shirou/w32 3c9377fc6748f222729a8270fe2775d149a249ad
 golang.org/x/sys a646d33e2ee3172a661fc09bca23bb4889a41bc8
 github.com/go-ini/ini 9144852efba7c4daf409943ee90767da62d55438
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 VERSION := $(shell sh -c 'git describe --always --tags')
 BRANCH := $(shell sh -c 'git rev-parse --abbrev-ref HEAD')
-COMMIT := $(shell sh -c 'git rev-parse HEAD')
+COMMIT := $(shell sh -c 'git rev-parse --short HEAD')
 ifdef GOBIN
 PATH := $(GOBIN):$(PATH)
 else
--- a/README.md
+++ b/README.md
@@ -1,15 +1,23 @@
 # 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 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).
+Telegraf is an agent written in Go for collecting, processing, aggregating,
+and writing metrics.

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

-New input and output plugins are designed to be easy to contribute,
+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,
 we'll eagerly accept pull
 requests and will manage the set of plugins that Telegraf supports.
 See the [contributing guide](CONTRIBUTING.md) for instructions on writing
@@ -20,12 +28,12 @@ new plugins.
 ### Linux deb and rpm Packages:

 Latest:
-* https://dl.influxdata.com/telegraf/releases/telegraf_1.0.0_amd64.deb
-* https://dl.influxdata.com/telegraf/releases/telegraf-1.0.0.x86_64.rpm
+* https://dl.influxdata.com/telegraf/releases/telegraf_1.1.1_amd64.deb
+* https://dl.influxdata.com/telegraf/releases/telegraf-1.1.1.x86_64.rpm

 Latest (arm):
-* https://dl.influxdata.com/telegraf/releases/telegraf_1.0.0_armhf.deb
-* https://dl.influxdata.com/telegraf/releases/telegraf-1.0.0.armhf.rpm
+* https://dl.influxdata.com/telegraf/releases/telegraf_1.1.1_armhf.deb
+* https://dl.influxdata.com/telegraf/releases/telegraf-1.1.1.armhf.rpm

 ##### Package Instructions:

@@ -39,21 +47,21 @@ 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.10/introduction/installation/#installation)
+[here](https://docs.influxdata.com/influxdb/latest/introduction/installation/#installation)
 for instructions on setting up the repo. Once it is configured, you will be able
 to use this repo to install & update telegraf.

 ### Linux tarballs:

 Latest:
-* https://dl.influxdata.com/telegraf/releases/telegraf-1.0.0_linux_amd64.tar.gz
-* https://dl.influxdata.com/telegraf/releases/telegraf-1.0.0_linux_i386.tar.gz
-* https://dl.influxdata.com/telegraf/releases/telegraf-1.0.0_linux_armhf.tar.gz
+* https://dl.influxdata.com/telegraf/releases/telegraf-1.1.1_linux_amd64.tar.gz
+* https://dl.influxdata.com/telegraf/releases/telegraf-1.1.1_linux_i386.tar.gz
+* https://dl.influxdata.com/telegraf/releases/telegraf-1.1.1_linux_armhf.tar.gz

 ### FreeBSD tarball:

 Latest:
-* https://dl.influxdata.com/telegraf/releases/telegraf-1.0.0_freebsd_amd64.tar.gz
+* https://dl.influxdata.com/telegraf/releases/telegraf-1.1.1_freebsd_amd64.tar.gz

 ### Ansible Role:

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

 Latest:
-* https://dl.influxdata.com/telegraf/releases/telegraf-1.0.0_windows_amd64.zip
+* https://dl.influxdata.com/telegraf/releases/telegraf-1.1.1_windows_amd64.zip

 ### From Source:

@@ -85,121 +93,114 @@ if you don't have it already. You also must build with golang version 1.5+.

 ## How to use it:

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

-Usage:
-
-  telegraf <flags>
-
-The flags are:
-
-  -config <file>     configuration file to load
-  -test              gather metrics once, print them to stdout, and exit
-  -sample-config     print out full sample configuration to stdout
-  -config-directory  directory containing additional *.conf files
-  -input-filter      filter the input plugins to enable, separator is :
-  -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 -sample-config > telegraf.conf
-
-  # generate config with only cpu input & influxdb output plugins defined
-  telegraf -sample-config -input-filter cpu -output-filter influxdb
-
-  # run a single telegraf collection, outputing metrics to stdout
-  telegraf -config telegraf.conf -test
-
-  # run telegraf with all plugins defined in config file
-  telegraf -config telegraf.conf
-
-  # run telegraf, enabling the cpu & memory input, and influxdb output plugins
-  telegraf -config telegraf.conf -input-filter cpu:mem -output-filter influxdb
 ```
+telegraf --help
+```
+
+### Generate a telegraf config file:
+
+```
+telegraf config > telegraf.conf
+```
+
+### Generate config with only cpu input & influxdb output plugins defined
+
+```
+telegraf --input-filter cpu --output-filter influxdb config
+```
+
+### Run a single telegraf collection, outputing metrics to stdout
+
+```
+telegraf --config telegraf.conf -test
+```
+
+### Run telegraf with all plugins defined in config file
+
+```
+telegraf --config telegraf.conf
+```
+
+### Run telegraf, enabling the cpu & memory input, and influxdb output plugins
+
+```
+telegraf --config telegraf.conf -input-filter cpu:mem -output-filter influxdb
+```
+

 ## Configuration

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

-## Supported Input Plugins
+## Input Plugins

-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:
-
-* [aws cloudwatch](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/cloudwatch)
-* [aerospike](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/aerospike)
-* [apache](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/apache)
-* [bcache](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/bcache)
-* [cassandra](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/cassandra)
-* [ceph](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/ceph)
-* [chrony](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/chrony)
-* [consul](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/consul)
-* [conntrack](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/conntrack)
-* [couchbase](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/couchbase)
-* [couchdb](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/couchdb)
-* [disque](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/disque)
-* [dns query time](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/dns_query)
-* [docker](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/docker)
-* [dovecot](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/dovecot)
-* [elasticsearch](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/elasticsearch)
-* [exec](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/exec) (generic executable plugin, support JSON, influx, graphite and nagios)
-* [filestat](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/filestat)
-* [haproxy](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/haproxy)
-* [hddtemp](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/hddtemp)
-* [http_response](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/http_response)
-* [httpjson](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/httpjson) (generic JSON-emitting http service plugin)
-* [influxdb](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/influxdb)
-* [ipmi_sensor](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/ipmi_sensor)
-* [iptables](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/iptables)
-* [jolokia](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/jolokia)
-* [leofs](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/leofs)
-* [lustre2](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/lustre2)
-* [mailchimp](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/mailchimp)
-* [memcached](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/memcached)
-* [mesos](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/mesos)
-* [mongodb](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/mongodb)
-* [mysql](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/mysql)
-* [net_response](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/net_response)
-* [nginx](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/nginx)
-* [nsq](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/nsq)
-* [nstat](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/nstat)
-* [ntpq](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/ntpq)
-* [phpfpm](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/phpfpm)
-* [phusion passenger](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/passenger)
-* [ping](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/ping)
-* [postgresql](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/postgresql)
-* [postgresql_extensible](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/postgresql_extensible)
-* [powerdns](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/powerdns)
-* [procstat](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/procstat)
-* [prometheus](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/prometheus)
-* [puppetagent](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/puppetagent)
-* [rabbitmq](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/rabbitmq)
-* [raindrops](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/raindrops)
-* [redis](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/redis)
-* [rethinkdb](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/rethinkdb)
-* [riak](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/riak)
-* [sensors](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/sensors)
-* [snmp](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/snmp)
-* [snmp_legacy](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/snmp_legacy)
-* [sql server](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/sqlserver) (microsoft)
-* [twemproxy](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/twemproxy)
-* [varnish](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/varnish)
-* [zfs](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/zfs)
-* [zookeeper](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/zookeeper)
-* [win_perf_counters ](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/win_perf_counters) (windows performance counters)
-* [sysstat](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/sysstat)
-* [system](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/system)
+* [aws cloudwatch](./plugins/inputs/cloudwatch)
+* [aerospike](./plugins/inputs/aerospike)
+* [apache](./plugins/inputs/apache)
+* [bcache](./plugins/inputs/bcache)
+* [cassandra](./plugins/inputs/cassandra)
+* [ceph](./plugins/inputs/ceph)
+* [chrony](./plugins/inputs/chrony)
+* [consul](./plugins/inputs/consul)
+* [conntrack](./plugins/inputs/conntrack)
+* [couchbase](./plugins/inputs/couchbase)
+* [couchdb](./plugins/inputs/couchdb)
+* [disque](./plugins/inputs/disque)
+* [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)
+* [filestat](./plugins/inputs/filestat)
+* [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)
+* [ipmi_sensor](./plugins/inputs/ipmi_sensor)
+* [iptables](./plugins/inputs/iptables)
+* [jolokia](./plugins/inputs/jolokia)
+* [leofs](./plugins/inputs/leofs)
+* [lustre2](./plugins/inputs/lustre2)
+* [mailchimp](./plugins/inputs/mailchimp)
+* [memcached](./plugins/inputs/memcached)
+* [mesos](./plugins/inputs/mesos)
+* [mongodb](./plugins/inputs/mongodb)
+* [mysql](./plugins/inputs/mysql)
+* [net_response](./plugins/inputs/net_response)
+* [nginx](./plugins/inputs/nginx)
+* [nsq](./plugins/inputs/nsq)
+* [nstat](./plugins/inputs/nstat)
+* [ntpq](./plugins/inputs/ntpq)
+* [phpfpm](./plugins/inputs/phpfpm)
+* [phusion passenger](./plugins/inputs/passenger)
+* [ping](./plugins/inputs/ping)
+* [postgresql](./plugins/inputs/postgresql)
+* [postgresql_extensible](./plugins/inputs/postgresql_extensible)
+* [powerdns](./plugins/inputs/powerdns)
+* [procstat](./plugins/inputs/procstat)
+* [prometheus](./plugins/inputs/prometheus)
+* [puppetagent](./plugins/inputs/puppetagent)
+* [rabbitmq](./plugins/inputs/rabbitmq)
+* [raindrops](./plugins/inputs/raindrops)
+* [redis](./plugins/inputs/redis)
+* [rethinkdb](./plugins/inputs/rethinkdb)
+* [riak](./plugins/inputs/riak)
+* [sensors](./plugins/inputs/sensors)
+* [snmp](./plugins/inputs/snmp)
+* [snmp_legacy](./plugins/inputs/snmp_legacy)
+* [sql server](./plugins/inputs/sqlserver) (microsoft)
+* [twemproxy](./plugins/inputs/twemproxy)
+* [varnish](./plugins/inputs/varnish)
+* [zfs](./plugins/inputs/zfs)
+* [zookeeper](./plugins/inputs/zookeeper)
+* [win_perf_counters ](./plugins/inputs/win_perf_counters) (windows performance counters)
+* [sysstat](./plugins/inputs/sysstat)
+* [system](./plugins/inputs/system)
    * cpu
    * mem
    * net
@@ -213,45 +214,51 @@ Currently implemented sources:

 Telegraf can also collect metrics via the following service plugins:

-* [http_listener](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/http_listener)
-* [kafka_consumer](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/kafka_consumer)
-* [mqtt_consumer](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/mqtt_consumer)
-* [nats_consumer](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/nats_consumer)
-* [nsq_consumer](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/nsq_consumer)
-* [logparser](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/logparser)
-* [statsd](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/statsd)
-* [tail](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/tail)
-* [tcp_listener](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/tcp_listener)
-* [udp_listener](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/udp_listener)
-* [webhooks](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/webhooks)
-  * [filestack](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/webhooks/filestack)
-  * [github](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/webhooks/github)
-  * [mandrill](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/webhooks/mandrill)
-  * [rollbar](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/webhooks/rollbar)
+* [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)
+* [tail](./plugins/inputs/tail)
+* [tcp_listener](./plugins/inputs/tcp_listener)
+* [udp_listener](./plugins/inputs/udp_listener)
+* [webhooks](./plugins/inputs/webhooks)
+  * [filestack](./plugins/inputs/webhooks/filestack)
+  * [github](./plugins/inputs/webhooks/github)
+  * [mandrill](./plugins/inputs/webhooks/mandrill)
+  * [rollbar](./plugins/inputs/webhooks/rollbar)

-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.
+## Processor Plugins

-## Supported Output Plugins
+* [printer](./plugins/processors/printer)

-* [influxdb](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/influxdb)
-* [amon](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/amon)
-* [amqp](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/amqp)
-* [aws kinesis](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/kinesis)
-* [aws cloudwatch](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/cloudwatch)
-* [datadog](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/datadog)
-* [file](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/file)
-* [graphite](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/graphite)
-* [graylog](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/graylog)
-* [instrumental](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/instrumental)
-* [kafka](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/kafka)
-* [librato](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/librato)
-* [mqtt](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/mqtt)
-* [nats](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/nats)
-* [nsq](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/nsq)
-* [opentsdb](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/opentsdb)
-* [prometheus](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/prometheus_client)
-* [riemann](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/riemann)
+## Aggregator Plugins
+
+* [minmax](./plugins/aggregators/minmax)
+
+## Output Plugins
+
+* [influxdb](./plugins/outputs/influxdb)
+* [amon](./plugins/outputs/amon)
+* [amqp](./plugins/outputs/amqp)
+* [aws kinesis](./plugins/outputs/kinesis)
+* [aws cloudwatch](./plugins/outputs/cloudwatch)
+* [datadog](./plugins/outputs/datadog)
+* [discard](./plugins/outputs/discard)
+* [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)

 ## Contributing

--- a/accumulator.go
+++ b/accumulator.go
@@ -2,9 +2,8 @@ package telegraf

 import "time"

-// Accumulator is an interface for "accumulating" metrics from input plugin(s).
-// The metrics are sent down a channel shared between all input plugins and then
-// flushed on the configured flush_interval.
+// 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,
@@ -29,12 +28,7 @@ type Accumulator interface {
 		tags map[string]string,
 		t ...time.Time)

-	AddError(err error)
-
-	Debug() bool
-	SetDebug(enabled bool)
-
 	SetPrecision(precision, interval time.Duration)

-	DisablePrecision()
+	AddError(err error)
 }
--- a/agent/accumulator.go
+++ b/agent/accumulator.go
@@ -1,41 +1,46 @@
 package agent

 import (
-	"fmt"
 	"log"
-	"math"
-	"sync/atomic"
 	"time"

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

+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(
-	inputConfig *models.InputConfig,
+	maker MetricMaker,
 	metrics chan telegraf.Metric,
 ) *accumulator {
-	acc := accumulator{}
-	acc.metrics = metrics
-	acc.inputConfig = inputConfig
-	acc.precision = time.Nanosecond
+	acc := accumulator{
+		maker:     maker,
+		metrics:   metrics,
+		precision: time.Nanosecond,
+	}
 	return &acc
 }

 type accumulator struct {
 	metrics chan telegraf.Metric

-	defaultTags map[string]string
-
-	debug bool
-	// print every point added to the accumulator
-	trace bool
-
-	inputConfig *models.InputConfig
+	maker MetricMaker

 	precision time.Duration
-
-	errCount uint64
 }

 func (ac *accumulator) AddFields(
@@ -44,7 +49,7 @@ func (ac *accumulator) AddFields(
 	tags map[string]string,
 	t ...time.Time,
 ) {
-	if m := ac.makeMetric(measurement, fields, tags, telegraf.Untyped, t...); m != nil {
+	if m := ac.maker.MakeMetric(measurement, fields, tags, telegraf.Untyped, ac.getTime(t)); m != nil {
 		ac.metrics <- m
 	}
 }
@@ -55,7 +60,7 @@ func (ac *accumulator) AddGauge(
 	tags map[string]string,
 	t ...time.Time,
 ) {
-	if m := ac.makeMetric(measurement, fields, tags, telegraf.Gauge, t...); m != nil {
+	if m := ac.maker.MakeMetric(measurement, fields, tags, telegraf.Gauge, ac.getTime(t)); m != nil {
 		ac.metrics <- m
 	}
 }
@@ -66,139 +71,20 @@ func (ac *accumulator) AddCounter(
 	tags map[string]string,
 	t ...time.Time,
 ) {
-	if m := ac.makeMetric(measurement, fields, tags, telegraf.Counter, t...); m != nil {
+	if m := ac.maker.MakeMetric(measurement, fields, tags, telegraf.Counter, ac.getTime(t)); m != nil {
 		ac.metrics <- m
 	}
 }

-// makeMetric either returns a metric, or returns nil if the metric doesn't
-// need to be created (because of filtering, an error, etc.)
-func (ac *accumulator) makeMetric(
-	measurement string,
-	fields map[string]interface{},
-	tags map[string]string,
-	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(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
-	}
-
-	// 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
-		}
-	}
-
-	// Apply the metric filter(s)
-	if ok := ac.inputConfig.Filter.Apply(measurement, fields, tags); !ok {
-		return nil
-	}
-
-	for k, v := range fields {
-		// Validate uint64 and float64 fields
-		switch val := v.(type) {
-		case uint64:
-			// InfluxDB does not support writing uint64
-			if val < uint64(9223372036854775808) {
-				fields[k] = int64(val)
-			} else {
-				fields[k] = int64(9223372036854775807)
-			}
-			continue
-		case float64:
-			// NaNs are invalid values in influxdb, skip measurement
-			if math.IsNaN(val) || math.IsInf(val, 0) {
-				if ac.debug {
-					log.Printf("I! Measurement [%s] field [%s] has a NaN or Inf "+
-						"field, skipping",
-						measurement, k)
-				}
-				delete(fields, k)
-				continue
-			}
-		}
-
-		fields[k] = v
-	}
-
-	var timestamp time.Time
-	if len(t) > 0 {
-		timestamp = t[0]
-	} else {
-		timestamp = time.Now()
-	}
-	timestamp = timestamp.Round(ac.precision)
-
-	var m telegraf.Metric
-	var err error
-	switch mType {
-	case telegraf.Counter:
-		m, err = telegraf.NewCounterMetric(measurement, tags, fields, timestamp)
-	case telegraf.Gauge:
-		m, err = telegraf.NewGaugeMetric(measurement, tags, fields, timestamp)
-	default:
-		m, err = telegraf.NewMetric(measurement, tags, fields, timestamp)
-	}
-	if err != nil {
-		log.Printf("E! Error adding point [%s]: %s\n", measurement, err.Error())
-		return nil
-	}
-
-	if ac.trace {
-		fmt.Println("> " + m.String())
-	}
-
-	return 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 {
 		return
 	}
-	atomic.AddUint64(&ac.errCount, 1)
+	NErrors.Incr(1)
 	//TODO suppress/throttle consecutive duplicate errors?
-	log.Printf("E! Error in input [%s]: %s", ac.inputConfig.Name, err)
-}
-
-func (ac *accumulator) Debug() bool {
-	return ac.debug
-}
-
-func (ac *accumulator) SetDebug(debug bool) {
-	ac.debug = debug
-}
-
-func (ac *accumulator) Trace() bool {
-	return ac.trace
-}
-
-func (ac *accumulator) SetTrace(trace bool) {
-	ac.trace = trace
+	log.Printf("E! Error in plugin [%s]: %s", ac.maker.Name(), err)
 }

 // SetPrecision takes two time.Duration objects. If the first is non-zero,
@@ -222,17 +108,12 @@ func (ac *accumulator) SetPrecision(precision, interval time.Duration) {
 	}
 }

-func (ac *accumulator) DisablePrecision() {
-	ac.precision = time.Nanosecond
-}
-
-func (ac *accumulator) setDefaultTags(tags map[string]string) {
-	ac.defaultTags = tags
-}
-
-func (ac *accumulator) addDefaultTag(key, value string) {
-	if ac.defaultTags == nil {
-		ac.defaultTags = make(map[string]string)
+func (ac accumulator) getTime(t []time.Time) time.Time {
+	var timestamp time.Time
+	if len(t) > 0 {
+		timestamp = t[0]
+	} else {
+		timestamp = time.Now()
 	}
-	ac.defaultTags[key] = value
+	return timestamp.Round(ac.precision)
 }
--- a/agent/accumulator_test.go
+++ b/agent/accumulator_test.go
@@ -4,24 +4,22 @@ import (
 	"bytes"
 	"fmt"
 	"log"
-	"math"
 	"os"
 	"testing"
 	"time"

 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal/models"
+	"github.com/influxdata/telegraf/metric"

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

 func TestAdd(t *testing.T) {
-	a := accumulator{}
 	now := time.Now()
-	a.metrics = make(chan telegraf.Metric, 10)
-	defer close(a.metrics)
-	a.inputConfig = &models.InputConfig{}
+	metrics := make(chan telegraf.Metric, 10)
+	defer close(metrics)
+	a := NewAccumulator(&TestMetricMaker{}, metrics)

 	a.AddFields("acctest",
 		map[string]interface{}{"value": float64(101)},
@@ -33,132 +31,80 @@ func TestAdd(t *testing.T) {
 		map[string]interface{}{"value": float64(101)},
 		map[string]string{"acc": "test"}, now)

-	testm := <-a.metrics
+	testm := <-metrics
 	actual := testm.String()
 	assert.Contains(t, actual, "acctest value=101")

-	testm = <-a.metrics
+	testm = <-metrics
 	actual = testm.String()
 	assert.Contains(t, actual, "acctest,acc=test value=101")

-	testm = <-a.metrics
+	testm = <-metrics
 	actual = testm.String()
 	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test value=101 %d", now.UnixNano()),
+		fmt.Sprintf("acctest,acc=test value=101 %d\n", now.UnixNano()),
 		actual)
 }

-func TestAddGauge(t *testing.T) {
-	a := accumulator{}
+func TestAddFields(t *testing.T) {
 	now := time.Now()
-	a.metrics = make(chan telegraf.Metric, 10)
-	defer close(a.metrics)
-	a.inputConfig = &models.InputConfig{}
+	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)
+	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 := <-a.metrics
+	testm := <-metrics
 	actual := testm.String()
-	assert.Contains(t, actual, "acctest value=101")
-	assert.Equal(t, testm.Type(), telegraf.Gauge)
+	assert.Contains(t, actual, "acctest usage=99")

-	testm = <-a.metrics
+	testm = <-metrics
 	actual = testm.String()
-	assert.Contains(t, actual, "acctest,acc=test value=101")
-	assert.Equal(t, testm.Type(), telegraf.Gauge)
+	assert.Contains(t, actual, "acctest,acc=test usage=99")

-	testm = <-a.metrics
+	testm = <-metrics
 	actual = testm.String()
 	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test value=101 %d", now.UnixNano()),
+		fmt.Sprintf("acctest,acc=test usage=99 %d\n", now.UnixNano()),
 		actual)
-	assert.Equal(t, testm.Type(), telegraf.Gauge)
 }

-func TestAddCounter(t *testing.T) {
-	a := accumulator{}
-	now := time.Now()
-	a.metrics = make(chan telegraf.Metric, 10)
-	defer close(a.metrics)
-	a.inputConfig = &models.InputConfig{}
+func TestAccAddError(t *testing.T) {
+	errBuf := bytes.NewBuffer(nil)
+	log.SetOutput(errBuf)
+	defer log.SetOutput(os.Stderr)

-	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)
+	metrics := make(chan telegraf.Metric, 10)
+	defer close(metrics)
+	a := NewAccumulator(&TestMetricMaker{}, metrics)

-	testm := <-a.metrics
-	actual := testm.String()
-	assert.Contains(t, actual, "acctest value=101")
-	assert.Equal(t, testm.Type(), telegraf.Counter)
+	a.AddError(fmt.Errorf("foo"))
+	a.AddError(fmt.Errorf("bar"))
+	a.AddError(fmt.Errorf("baz"))

-	testm = <-a.metrics
-	actual = testm.String()
-	assert.Contains(t, actual, "acctest,acc=test value=101")
-	assert.Equal(t, testm.Type(), telegraf.Counter)
-
-	testm = <-a.metrics
-	actual = testm.String()
-	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test value=101 %d", now.UnixNano()),
-		actual)
-	assert.Equal(t, testm.Type(), telegraf.Counter)
-}
-
-func TestAddNoPrecisionWithInterval(t *testing.T) {
-	a := accumulator{}
-	now := time.Date(2006, time.February, 10, 12, 0, 0, 82912748, time.UTC)
-	a.metrics = make(chan telegraf.Metric, 10)
-	defer close(a.metrics)
-	a.inputConfig = &models.InputConfig{}
-
-	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", int64(1139572800000000000)),
-		actual)
+	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) {
-	a := accumulator{}
 	now := time.Date(2006, time.February, 10, 12, 0, 0, 82912748, time.UTC)
-	a.metrics = make(chan telegraf.Metric, 10)
-	defer close(a.metrics)
-	a.inputConfig = &models.InputConfig{}
+	metrics := make(chan telegraf.Metric, 10)
+	defer close(metrics)
+	a := NewAccumulator(&TestMetricMaker{}, metrics)
+	a.SetPrecision(0, time.Second)

-	a.SetPrecision(time.Second, time.Millisecond)
 	a.AddFields("acctest",
 		map[string]interface{}{"value": float64(101)},
 		map[string]string{})
@@ -180,19 +126,17 @@ func TestAddNoIntervalWithPrecision(t *testing.T) {
 	testm = <-a.metrics
 	actual = testm.String()
 	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test value=101 %d", int64(1139572800000000000)),
+		fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800000000000)),
 		actual)
 }

 func TestAddDisablePrecision(t *testing.T) {
-	a := accumulator{}
 	now := time.Date(2006, time.February, 10, 12, 0, 0, 82912748, time.UTC)
-	a.metrics = make(chan telegraf.Metric, 10)
-	defer close(a.metrics)
-	a.inputConfig = &models.InputConfig{}
+	metrics := make(chan telegraf.Metric, 10)
+	defer close(metrics)
+	a := NewAccumulator(&TestMetricMaker{}, metrics)

-	a.SetPrecision(time.Second, time.Millisecond)
-	a.DisablePrecision()
+	a.SetPrecision(time.Nanosecond, 0)
 	a.AddFields("acctest",
 		map[string]interface{}{"value": float64(101)},
 		map[string]string{})
@@ -214,16 +158,47 @@ func TestAddDisablePrecision(t *testing.T) {
 	testm = <-a.metrics
 	actual = testm.String()
 	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test value=101 %d", int64(1139572800082912748)),
+		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) {
-	a := accumulator{}
 	now := time.Date(2006, time.February, 10, 12, 0, 0, 82912748, time.UTC)
-	a.metrics = make(chan telegraf.Metric, 10)
-	defer close(a.metrics)
-	a.inputConfig = &models.InputConfig{}
+	metrics := make(chan telegraf.Metric, 10)
+	defer close(metrics)
+	a := NewAccumulator(&TestMetricMaker{}, metrics)

 	a.SetPrecision(0, time.Second)
 	a.AddFields("acctest",
@@ -232,7 +207,7 @@ func TestDifferentPrecisions(t *testing.T) {
 	testm := <-a.metrics
 	actual := testm.String()
 	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test value=101 %d", int64(1139572800000000000)),
+		fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800000000000)),
 		actual)

 	a.SetPrecision(0, time.Millisecond)
@@ -242,7 +217,7 @@ func TestDifferentPrecisions(t *testing.T) {
 	testm = <-a.metrics
 	actual = testm.String()
 	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test value=101 %d", int64(1139572800083000000)),
+		fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800083000000)),
 		actual)

 	a.SetPrecision(0, time.Microsecond)
@@ -252,7 +227,7 @@ func TestDifferentPrecisions(t *testing.T) {
 	testm = <-a.metrics
 	actual = testm.String()
 	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test value=101 %d", int64(1139572800082913000)),
+		fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800082913000)),
 		actual)

 	a.SetPrecision(0, time.Nanosecond)
@@ -262,353 +237,104 @@ func TestDifferentPrecisions(t *testing.T) {
 	testm = <-a.metrics
 	actual = testm.String()
 	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test value=101 %d", int64(1139572800082912748)),
+		fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800082912748)),
 		actual)
 }

-func TestAddDefaultTags(t *testing.T) {
-	a := accumulator{}
-	a.addDefaultTag("default", "tag")
+func TestAddGauge(t *testing.T) {
 	now := time.Now()
-	a.metrics = make(chan telegraf.Metric, 10)
-	defer close(a.metrics)
-	a.inputConfig = &models.InputConfig{}
+	metrics := make(chan telegraf.Metric, 10)
+	defer close(metrics)
+	a := NewAccumulator(&TestMetricMaker{}, metrics)

-	a.AddFields("acctest",
+	a.AddGauge("acctest",
 		map[string]interface{}{"value": float64(101)},
 		map[string]string{})
-	a.AddFields("acctest",
+	a.AddGauge("acctest",
 		map[string]interface{}{"value": float64(101)},
 		map[string]string{"acc": "test"})
-	a.AddFields("acctest",
+	a.AddGauge("acctest",
 		map[string]interface{}{"value": float64(101)},
 		map[string]string{"acc": "test"}, now)

-	testm := <-a.metrics
-	actual := testm.String()
-	assert.Contains(t, actual, "acctest,default=tag value=101")
-
-	testm = <-a.metrics
-	actual = testm.String()
-	assert.Contains(t, actual, "acctest,acc=test,default=tag value=101")
-
-	testm = <-a.metrics
-	actual = testm.String()
-	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test,default=tag value=101 %d", now.UnixNano()),
-		actual)
-}
-
-func TestAddFields(t *testing.T) {
-	a := accumulator{}
-	now := time.Now()
-	a.metrics = make(chan telegraf.Metric, 10)
-	defer close(a.metrics)
-	a.inputConfig = &models.InputConfig{}
-
-	fields := map[string]interface{}{
-		"usage": float64(99),
-	}
-	a.AddFields("acctest", fields, map[string]string{})
-	a.AddFields("acctest", fields, map[string]string{"acc": "test"})
-	a.AddFields("acctest", fields, map[string]string{"acc": "test"}, now)
-
-	testm := <-a.metrics
-	actual := testm.String()
-	assert.Contains(t, actual, "acctest usage=99")
-
-	testm = <-a.metrics
-	actual = testm.String()
-	assert.Contains(t, actual, "acctest,acc=test usage=99")
-
-	testm = <-a.metrics
-	actual = testm.String()
-	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test usage=99 %d", now.UnixNano()),
-		actual)
-}
-
-// Test that all Inf fields get dropped, and not added to metrics channel
-func TestAddInfFields(t *testing.T) {
-	inf := math.Inf(1)
-	ninf := math.Inf(-1)
-
-	a := accumulator{}
-	now := time.Now()
-	a.metrics = make(chan telegraf.Metric, 10)
-	defer close(a.metrics)
-	a.inputConfig = &models.InputConfig{}
-
-	fields := map[string]interface{}{
-		"usage":  inf,
-		"nusage": ninf,
-	}
-	a.AddFields("acctest", fields, map[string]string{})
-	a.AddFields("acctest", fields, map[string]string{"acc": "test"})
-	a.AddFields("acctest", fields, map[string]string{"acc": "test"}, now)
-
-	assert.Len(t, a.metrics, 0)
-
-	// test that non-inf fields are kept and not dropped
-	fields["notinf"] = float64(100)
-	a.AddFields("acctest", fields, map[string]string{})
-	testm := <-a.metrics
-	actual := testm.String()
-	assert.Contains(t, actual, "acctest notinf=100")
-}
-
-// Test that nan fields are dropped and not added
-func TestAddNaNFields(t *testing.T) {
-	nan := math.NaN()
-
-	a := accumulator{}
-	now := time.Now()
-	a.metrics = make(chan telegraf.Metric, 10)
-	defer close(a.metrics)
-	a.inputConfig = &models.InputConfig{}
-
-	fields := map[string]interface{}{
-		"usage": nan,
-	}
-	a.AddFields("acctest", fields, map[string]string{})
-	a.AddFields("acctest", fields, map[string]string{"acc": "test"})
-	a.AddFields("acctest", fields, map[string]string{"acc": "test"}, now)
-
-	assert.Len(t, a.metrics, 0)
-
-	// test that non-nan fields are kept and not dropped
-	fields["notnan"] = float64(100)
-	a.AddFields("acctest", fields, map[string]string{})
-	testm := <-a.metrics
-	actual := testm.String()
-	assert.Contains(t, actual, "acctest notnan=100")
-}
-
-func TestAddUint64Fields(t *testing.T) {
-	a := accumulator{}
-	now := time.Now()
-	a.metrics = make(chan telegraf.Metric, 10)
-	defer close(a.metrics)
-	a.inputConfig = &models.InputConfig{}
-
-	fields := map[string]interface{}{
-		"usage": uint64(99),
-	}
-	a.AddFields("acctest", fields, map[string]string{})
-	a.AddFields("acctest", fields, map[string]string{"acc": "test"})
-	a.AddFields("acctest", fields, map[string]string{"acc": "test"}, now)
-
-	testm := <-a.metrics
-	actual := testm.String()
-	assert.Contains(t, actual, "acctest usage=99i")
-
-	testm = <-a.metrics
-	actual = testm.String()
-	assert.Contains(t, actual, "acctest,acc=test usage=99i")
-
-	testm = <-a.metrics
-	actual = testm.String()
-	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test usage=99i %d", now.UnixNano()),
-		actual)
-}
-
-func TestAddUint64Overflow(t *testing.T) {
-	a := accumulator{}
-	now := time.Now()
-	a.metrics = make(chan telegraf.Metric, 10)
-	defer close(a.metrics)
-	a.inputConfig = &models.InputConfig{}
-
-	fields := map[string]interface{}{
-		"usage": uint64(9223372036854775808),
-	}
-	a.AddFields("acctest", fields, map[string]string{})
-	a.AddFields("acctest", fields, map[string]string{"acc": "test"})
-	a.AddFields("acctest", fields, map[string]string{"acc": "test"}, now)
-
-	testm := <-a.metrics
-	actual := testm.String()
-	assert.Contains(t, actual, "acctest usage=9223372036854775807i")
-
-	testm = <-a.metrics
-	actual = testm.String()
-	assert.Contains(t, actual, "acctest,acc=test usage=9223372036854775807i")
-
-	testm = <-a.metrics
-	actual = testm.String()
-	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test usage=9223372036854775807i %d", now.UnixNano()),
-		actual)
-}
-
-func TestAddInts(t *testing.T) {
-	a := accumulator{}
-	a.addDefaultTag("default", "tag")
-	now := time.Now()
-	a.metrics = make(chan telegraf.Metric, 10)
-	defer close(a.metrics)
-	a.inputConfig = &models.InputConfig{}
-
-	a.AddFields("acctest",
-		map[string]interface{}{"value": int(101)},
-		map[string]string{})
-	a.AddFields("acctest",
-		map[string]interface{}{"value": int32(101)},
-		map[string]string{"acc": "test"})
-	a.AddFields("acctest",
-		map[string]interface{}{"value": int64(101)},
-		map[string]string{"acc": "test"}, now)
-
-	testm := <-a.metrics
-	actual := testm.String()
-	assert.Contains(t, actual, "acctest,default=tag value=101i")
-
-	testm = <-a.metrics
-	actual = testm.String()
-	assert.Contains(t, actual, "acctest,acc=test,default=tag value=101i")
-
-	testm = <-a.metrics
-	actual = testm.String()
-	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test,default=tag value=101i %d", now.UnixNano()),
-		actual)
-}
-
-func TestAddFloats(t *testing.T) {
-	a := accumulator{}
-	a.addDefaultTag("default", "tag")
-	now := time.Now()
-	a.metrics = make(chan telegraf.Metric, 10)
-	defer close(a.metrics)
-	a.inputConfig = &models.InputConfig{}
-
-	a.AddFields("acctest",
-		map[string]interface{}{"value": float32(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,acc=test,default=tag value=101")
-
-	testm = <-a.metrics
-	actual = testm.String()
-	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test,default=tag value=101 %d", now.UnixNano()),
-		actual)
-}
-
-func TestAddStrings(t *testing.T) {
-	a := accumulator{}
-	a.addDefaultTag("default", "tag")
-	now := time.Now()
-	a.metrics = make(chan telegraf.Metric, 10)
-	defer close(a.metrics)
-	a.inputConfig = &models.InputConfig{}
-
-	a.AddFields("acctest",
-		map[string]interface{}{"value": "test"},
-		map[string]string{"acc": "test"})
-	a.AddFields("acctest",
-		map[string]interface{}{"value": "foo"},
-		map[string]string{"acc": "test"}, now)
-
-	testm := <-a.metrics
-	actual := testm.String()
-	assert.Contains(t, actual, "acctest,acc=test,default=tag value=\"test\"")
-
-	testm = <-a.metrics
-	actual = testm.String()
-	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test,default=tag value=\"foo\" %d", now.UnixNano()),
-		actual)
-}
-
-func TestAddBools(t *testing.T) {
-	a := accumulator{}
-	a.addDefaultTag("default", "tag")
-	now := time.Now()
-	a.metrics = make(chan telegraf.Metric, 10)
-	defer close(a.metrics)
-	a.inputConfig = &models.InputConfig{}
-
-	a.AddFields("acctest",
-		map[string]interface{}{"value": true}, map[string]string{"acc": "test"})
-	a.AddFields("acctest",
-		map[string]interface{}{"value": false}, map[string]string{"acc": "test"}, now)
-
-	testm := <-a.metrics
-	actual := testm.String()
-	assert.Contains(t, actual, "acctest,acc=test,default=tag value=true")
-
-	testm = <-a.metrics
-	actual = testm.String()
-	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test,default=tag value=false %d", now.UnixNano()),
-		actual)
-}
-
-// Test that tag filters get applied to metrics.
-func TestAccFilterTags(t *testing.T) {
-	a := accumulator{}
-	now := time.Now()
-	a.metrics = make(chan telegraf.Metric, 10)
-	defer close(a.metrics)
-	filter := models.Filter{
-		TagExclude: []string{"acc"},
-	}
-	assert.NoError(t, filter.Compile())
-	a.inputConfig = &models.InputConfig{}
-	a.inputConfig.Filter = filter
-
-	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
+	testm := <-metrics
 	actual := testm.String()
 	assert.Contains(t, actual, "acctest value=101")
+	assert.Equal(t, testm.Type(), telegraf.Gauge)

-	testm = <-a.metrics
+	testm = <-metrics
 	actual = testm.String()
-	assert.Contains(t, actual, "acctest value=101")
+	assert.Contains(t, actual, "acctest,acc=test value=101")
+	assert.Equal(t, testm.Type(), telegraf.Gauge)

-	testm = <-a.metrics
+	testm = <-metrics
 	actual = testm.String()
 	assert.Equal(t,
-		fmt.Sprintf("acctest value=101 %d", now.UnixNano()),
+		fmt.Sprintf("acctest,acc=test value=101 %d\n", now.UnixNano()),
 		actual)
+	assert.Equal(t, testm.Type(), telegraf.Gauge)
 }

-func TestAccAddError(t *testing.T) {
-	errBuf := bytes.NewBuffer(nil)
-	log.SetOutput(errBuf)
-	defer log.SetOutput(os.Stderr)
+func TestAddCounter(t *testing.T) {
+	now := time.Now()
+	metrics := make(chan telegraf.Metric, 10)
+	defer close(metrics)
+	a := NewAccumulator(&TestMetricMaker{}, metrics)

-	a := accumulator{}
-	a.inputConfig = &models.InputConfig{}
-	a.inputConfig.Name = "mock_plugin"
+	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)

-	a.AddError(fmt.Errorf("foo"))
-	a.AddError(fmt.Errorf("bar"))
-	a.AddError(fmt.Errorf("baz"))
+	testm := <-metrics
+	actual := testm.String()
+	assert.Contains(t, actual, "acctest value=101")
+	assert.Equal(t, testm.Type(), telegraf.Counter)

-	errs := bytes.Split(errBuf.Bytes(), []byte{'\n'})
-	assert.EqualValues(t, 3, a.errCount)
-	require.Len(t, errs, 4) // 4 because of trailing newline
-	assert.Contains(t, string(errs[0]), "mock_plugin")
-	assert.Contains(t, string(errs[0]), "foo")
-	assert.Contains(t, string(errs[1]), "mock_plugin")
-	assert.Contains(t, string(errs[1]), "bar")
-	assert.Contains(t, string(errs[2]), "mock_plugin")
-	assert.Contains(t, string(errs[2]), "baz")
+	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
@@ -12,6 +12,7 @@ import (
 	"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
@@ -44,8 +45,6 @@ func NewAgent(config *config.Config) (*Agent, error) {
 // 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 {
@@ -89,7 +88,7 @@ func panicRecover(input *models.RunningInput) {
 		trace := make([]byte, 2048)
 		runtime.Stack(trace, true)
 		log.Printf("E! FATAL: Input [%s] panicked: %s, Stack:\n%s\n",
-			input.Name, err, trace)
+			input.Name(), err, trace)
 		log.Println("E! PLEASE REPORT THIS PANIC ON GITHUB with " +
 			"stack trace, configuration, and OS information: " +
 			"https://github.com/influxdata/telegraf/issues/new")
@@ -103,35 +102,33 @@ func (a *Agent) gatherer(
 	input *models.RunningInput,
 	interval time.Duration,
 	metricC chan telegraf.Metric,
-) error {
+) {
 	defer panicRecover(input)

+	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 {
-		var outerr error
-
-		acc := NewAccumulator(input.Config, metricC)
-		acc.SetPrecision(a.Config.Agent.Precision.Duration,
-			a.Config.Agent.Interval.Duration)
-		acc.setDefaultTags(a.Config.Tags)
-
 		internal.RandomSleep(a.Config.Agent.CollectionJitter.Duration, shutdown)

 		start := time.Now()
 		gatherWithTimeout(shutdown, input, acc, interval)
 		elapsed := time.Since(start)

-		if outerr != nil {
-			return outerr
-		}
-		log.Printf("D! Input [%s] gathered metrics, (%s interval) in %s\n",
-			input.Name, interval, elapsed)
+		GatherTime.Incr(elapsed.Nanoseconds())

 		select {
 		case <-shutdown:
-			return nil
+			return
 		case <-ticker.C:
 			continue
 		}
@@ -160,13 +157,13 @@ func gatherWithTimeout(
 		select {
 		case err := <-done:
 			if err != nil {
-				log.Printf("E! ERROR in input [%s]: %s", input.Name, err)
+				log.Printf("E! ERROR in input [%s]: %s", input.Name(), err)
 			}
 			return
 		case <-ticker.C:
 			log.Printf("E! ERROR: input [%s] took longer to collect than "+
 				"collection interval (%s)",
-				input.Name, timeout)
+				input.Name(), timeout)
 			continue
 		case <-shutdown:
 			return
@@ -194,13 +191,13 @@ func (a *Agent) Test() error {
 	}()

 	for _, input := range a.Config.Inputs {
-		acc := NewAccumulator(input.Config, metricC)
-		acc.SetTrace(true)
+		acc := NewAccumulator(input, metricC)
 		acc.SetPrecision(a.Config.Agent.Precision.Duration,
 			a.Config.Agent.Interval.Duration)
-		acc.setDefaultTags(a.Config.Tags)
+		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)
 		}
@@ -208,16 +205,13 @@ func (a *Agent) Test() error {
 		if err := input.Input.Gather(acc); err != nil {
 			return err
 		}
-		if acc.errCount > 0 {
-			return fmt.Errorf("Errors encountered during processing")
-		}

 		// Special instructions for some inputs. cpu, for example, needs to be
 		// run twice in order to return cpu usage percentages.
-		switch input.Name {
+		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
 			}
@@ -250,47 +244,73 @@ func (a *Agent) flush() {
 func (a *Agent) flusher(shutdown chan struct{}, metricC chan telegraf.Metric) error {
 	// Inelegant, but this sleep is to allow the Gather threads to run, so that
 	// the flusher will flush after metrics are collected.
-	time.Sleep(time.Millisecond * 200)
+	time.Sleep(time.Millisecond * 300)
+
+	// create an output metric channel and a gorouting that continously 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())
+						}
+					}
+				}
+			}
+		}
+	}()

 	ticker := time.NewTicker(a.Config.Agent.FlushInterval.Duration)
-
 	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()
 			a.flush()
 			return nil
 		case <-ticker.C:
 			internal.RandomSleep(a.Config.Agent.FlushJitter.Duration, shutdown)
 			a.flush()
-		case m := <-metricC:
-			for i, o := range a.Config.Outputs {
-				if i == len(a.Config.Outputs)-1 {
-					o.AddMetric(m)
-				} else {
-					o.AddMetric(copyMetric(m))
-				}
+		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
 			}
 		}
 	}
 }

-func copyMetric(m telegraf.Metric) telegraf.Metric {
-	t := time.Time(m.Time())
-
-	tags := make(map[string]string)
-	fields := make(map[string]interface{})
-	for k, v := range m.Tags() {
-		tags[k] = v
-	}
-	for k, v := range m.Fields() {
-		fields[k] = v
-	}
-
-	out, _ := telegraf.NewMetric(m.Name(), tags, fields, t)
-	return out
-}
-
 // Run runs the agent daemon, gathering every Interval
 func (a *Agent) Run(shutdown chan struct{}) error {
 	var wg sync.WaitGroup
@@ -301,20 +321,20 @@ func (a *Agent) Run(shutdown chan struct{}) error {
 		a.Config.Agent.Hostname, a.Config.Agent.FlushInterval.Duration)

 	// channel shared between all input threads for accumulating metrics
-	metricC := make(chan telegraf.Metric, 10000)
+	metricC := make(chan telegraf.Metric, 100)

+	// Start all ServicePlugins
 	for _, input := range a.Config.Inputs {
-		// Start service of any ServicePlugins
+		input.SetDefaultTags(a.Config.Tags)
 		switch p := input.Input.(type) {
 		case telegraf.ServiceInput:
-			acc := NewAccumulator(input.Config, metricC)
+			acc := NewAccumulator(input, metricC)
 			// Service input plugins should set their own precision of their
 			// metrics.
-			acc.DisablePrecision()
-			acc.setDefaultTags(a.Config.Tags)
+			acc.SetPrecision(time.Nanosecond, 0)
 			if err := p.Start(acc); err != nil {
 				log.Printf("E! Service for input %s failed to start, exiting\n%s\n",
-					input.Name, err.Error())
+					input.Name(), err.Error())
 				return err
 			}
 			defer p.Stop()
@@ -336,6 +356,17 @@ func (a *Agent) Run(shutdown chan struct{}) error {
 		}
 	}()

+	wg.Add(len(a.Config.Aggregators))
+	for _, aggregator := range a.Config.Aggregators {
+		go func(agg *models.RunningAggregator) {
+			defer wg.Done()
+			acc := NewAccumulator(agg, metricC)
+			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
@@ -345,9 +376,7 @@ func (a *Agent) Run(shutdown chan struct{}) error {
 		}
 		go func(in *models.RunningInput, interv time.Duration) {
 			defer wg.Done()
-			if err := a.gatherer(shutdown, in, interv, metricC); err != nil {
-				log.Printf("E! " + err.Error())
-			}
+			a.gatherer(shutdown, in, interv, metricC)
 		}(input, interval)
 	}

--- a/aggregator.go
+++ b/aggregator.go
@@ -0,0 +1,22 @@
+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/circle.yml
+++ b/circle.yml
@@ -4,17 +4,14 @@ machine:
  post:
    - sudo service zookeeper stop
    - go version
-    - go version | grep 1.7.1 || sudo rm -rf /usr/local/go
-    - wget https://storage.googleapis.com/golang/go1.7.1.linux-amd64.tar.gz
-    - sudo tar -C /usr/local -xzf go1.7.1.linux-amd64.tar.gz
+    - go version | grep 1.7.4 || sudo rm -rf /usr/local/go
+    - wget https://storage.googleapis.com/golang/go1.7.4.linux-amd64.tar.gz
+    - sudo tar -C /usr/local -xzf go1.7.4.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
@@ -13,11 +13,12 @@ import (
 	"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"
 )

@@ -41,6 +42,10 @@ 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", "",
@@ -68,47 +73,38 @@ const usage = `Telegraf, The plugin-driven server agent for collecting and repor

 Usage:

-  telegraf <flags>
+  telegraf [commands|flags]

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

-  -config <file>     configuration file to load
-  -test              gather metrics once, print them to stdout, and exit
-  -sample-config     print out full sample configuration to stdout
-  -config-directory  directory containing additional *.conf files
-  -input-filter      filter the input plugins to enable, separator is :
-  -input-list        print all the plugins inputs
-  -output-filter     filter the output plugins to enable, separator is :
-  -output-list       print all the available outputs
-  -usage             print usage for a plugin, ie, 'telegraf -usage mysql'
-  -debug             print metrics as they're generated to stdout
-  -quiet             run in quiet mode
-  -version           print the version to stdout
-  -service           Control the service, ie, 'telegraf -service install (windows only)'
+  config             print out full sample configuration to stdout
+  version            print the version to stdout

-In addition to the -config flag, telegraf will also load the config file from
-an environment variable or default location. Precedence is:
-  1. -config flag
-  2. $TELEGRAF_CONFIG_PATH environment variable
-  3. $HOME/.telegraf/telegraf.conf
-  4. /etc/telegraf/telegraf.conf
+  --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
+  --quiet             run in quiet mode

 Examples:

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

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

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

  # run telegraf with all plugins defined in config file
-  telegraf -config telegraf.conf
+  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
 `

 var stop chan struct{}
@@ -128,7 +124,6 @@ func reloadLoop(stop chan struct{}, s service.Service) {
 	reload <- true
 	for <-reload {
 		reload <- false
-		flag.Usage = func() { usageExit(0) }
 		flag.Parse()
 		args := flag.Args()

@@ -142,6 +137,16 @@ func reloadLoop(stop chan struct{}, s service.Service) {
 			outputFilter := strings.TrimSpace(*fOutputFilters)
 			outputFilters = strings.Split(":"+outputFilter+":", ":")
 		}
+		var aggregatorFilters []string
+		if *fAggregatorFilters != "" {
+			aggregatorFilter := strings.TrimSpace(*fAggregatorFilters)
+			aggregatorFilters = strings.Split(":"+aggregatorFilter+":", ":")
+		}
+		var processorFilters []string
+		if *fProcessorFilters != "" {
+			processorFilter := strings.TrimSpace(*fProcessorFilters)
+			processorFilters = strings.Split(":"+processorFilter+":", ":")
+		}

 		if len(args) > 0 {
 			switch args[0] {
@@ -149,7 +154,12 @@ func reloadLoop(stop chan struct{}, s service.Service) {
 				fmt.Printf("Telegraf v%s (git: %s %s)\n", version, branch, commit)
 				return
 			case "config":
-				config.PrintSampleConfig(inputFilters, outputFilters)
+				config.PrintSampleConfig(
+					inputFilters,
+					outputFilters,
+					aggregatorFilters,
+					processorFilters,
+				)
 				return
 			}
 		}
@@ -172,12 +182,17 @@ func reloadLoop(stop chan struct{}, s service.Service) {
 			fmt.Printf("Telegraf v%s (git: %s %s)\n", version, branch, commit)
 			return
 		case *fSampleConfig:
-			config.PrintSampleConfig(inputFilters, outputFilters)
+			config.PrintSampleConfig(
+				inputFilters,
+				outputFilters,
+				aggregatorFilters,
+				processorFilters,
+			)
 			return
 		case *fUsage != "":
 			if err := config.PrintInputConfig(*fUsage); err != nil {
 				if err2 := config.PrintOutputConfig(*fUsage); err2 != nil {
-					log.Fatalf("%s and %s", err, err2)
+					log.Fatalf("E! %s and %s", err, err2)
 				}
 			}
 			return
@@ -189,26 +204,25 @@ func reloadLoop(stop chan struct{}, s service.Service) {
 		c.InputFilters = inputFilters
 		err := c.LoadConfig(*fConfig)
 		if err != nil {
-			fmt.Println(err)
-			os.Exit(1)
+			log.Fatal("E! " + err.Error())
 		}

 		if *fConfigDirectory != "" {
 			err = c.LoadDirectory(*fConfigDirectory)
 			if err != nil {
-				log.Fatal(err)
+				log.Fatal("E! " + err.Error())
 			}
 		}
 		if len(c.Outputs) == 0 {
-			log.Fatalf("Error: no outputs found, did you provide a valid config file?")
+			log.Fatalf("E! Error: no outputs found, did you provide a valid config file?")
 		}
 		if len(c.Inputs) == 0 {
-			log.Fatalf("Error: no inputs found, did you provide a valid config file?")
+			log.Fatalf("E! Error: no inputs found, did you provide a valid config file?")
 		}

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

 		// Setup logging
@@ -221,14 +235,14 @@ func reloadLoop(stop chan struct{}, s service.Service) {
 		if *fTest {
 			err = ag.Test()
 			if err != nil {
-				log.Fatal(err)
+				log.Fatal("E! " + err.Error())
 			}
 			return
 		}

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

 		shutdown := make(chan struct{})
@@ -259,7 +273,7 @@ func reloadLoop(stop chan struct{}, s service.Service) {
 		if *fPidfile != "" {
 			f, err := os.Create(*fPidfile)
 			if err != nil {
-				log.Fatalf("Unable to create pidfile: %s", err)
+				log.Fatalf("E! Unable to create pidfile: %s", err)
 			}

 			fmt.Fprintf(f, "%d\n", os.Getpid())
@@ -291,6 +305,7 @@ func (p *program) Stop(s service.Service) error {
 }

 func main() {
+	flag.Usage = func() { usageExit(0) }
 	flag.Parse()
 	if runtime.GOOS == "windows" {
 		svcConfig := &service.Config{
@@ -304,7 +319,7 @@ func main() {
 		prg := &program{}
 		s, err := service.New(prg, svcConfig)
 		if err != nil {
-			log.Fatal(err)
+			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.
@@ -314,7 +329,7 @@ func main() {
 			}
 			err := service.Control(s, *fService)
 			if err != nil {
-				log.Fatal(err)
+				log.Fatal("E! " + err.Error())
 			}
 		} else {
 			err = s.Run()
--- a/docs/AGGREGATORS_AND_PROCESSORS.md
+++ b/docs/AGGREGATORS_AND_PROCESSORS.md
@@ -0,0 +1,59 @@
+# 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.
+
+**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,38 +1,38 @@
 # Telegraf Configuration

-## Generating a Configuration File
-
-A default Telegraf config file can be generated using the -sample-config flag:
-
-```
-telegraf -sample-config > telegraf.conf
-```
-
-To generate a file with specific inputs and outputs, you can use the
-input-filter and -output-filter flags:
-
-```
-telegraf -sample-config -input-filter cpu:mem:net:swap -output-filter influxdb:kafka
-```
-
 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
+```
+
+To generate a file with specific inputs and outputs, you can use the
+--input-filter and --output-filter flags:
+
+```
+telegraf --input-filter cpu:mem:net:swap --output-filter influxdb:kafka config
+```
+
 ## Environment Variables

 Environment variables can be used anywhere in the config file, simply prepend
 them with $. For strings the variable must be within quotes (ie, "$STR_VAR"),
 for numbers and booleans they should be plain (ie, $INT_VAR, $BOOL_VAR)

-## `[global_tags]` Configuration
+# Global Tags

 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
 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
@@ -56,13 +56,63 @@ 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, 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, such as logparser and statsd. Valid values are
+"ns", "us" (or "µs"), "ms", "s".
+* **logfile**: Specify the log file name. The empty string means to log to stdout.
 * **debug**: Run telegraf in debug mode.
-* **quiet**: Run telegraf in quiet mode.
+* **quiet**: Run telegraf in quiet mode (error messages only).
 * **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
+
+The following config parameters are available for all inputs:
+
+* **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.
+
+## Output Configuration
+
+There are no generic configuration options available for all outputs.
+
+## 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.
+
+## 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.

 #### Measurement Filtering

-Filters can be configured per input or output, see below for examples.
+Filters can be configured per input, output, processor, or aggregator,
+see below for examples.

 * **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
@@ -90,19 +140,6 @@ the tag keys in the final measurement.
 the plugin definition, otherwise subsequent plugin config options will be
 interpreted as part of the tagpass/tagdrop map.

-## Input Configuration
-
-Some configuration options are configurable per input:
-
-* **name_override**: Override the base name of the measurement.
-(Default is the name of the input).
-* **name_prefix**: Specifies a prefix to attach to the measurement name.
-* **name_suffix**: Specifies a suffix to attach to the measurement name.
-* **tags**: A map of tags to apply to a specific input's measurements.
-* **interval**: How often to gather this metric. Normal plugins use a single
-global interval, but if one particular input should be run less or more often,
-you can configure that here.
-
 #### Input Configuration Examples

 This is a full working config that will output CPU data to an InfluxDB instance
@@ -254,11 +291,7 @@ to avoid measurement collisions:
  fielddrop = ["cpu_time*"]
 ```

-## Output 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`.
+#### Output Configuration Examples:

 ```toml
 [[outputs.influxdb]]
@@ -283,3 +316,39 @@ found by running `telegraf -sample-config`.
  [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"]
+```
--- a/docs/DATA_FORMATS_INPUT.md
+++ b/docs/DATA_FORMATS_INPUT.md
@@ -147,6 +147,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 it's own unique set of configuration options, read
+  ## more about them here:
+  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
+  data_format = "json"
+
+  ## List of tag names to extract from top-level of JSON server response
+  tag_keys = [
+    "my_tag_1",
+    "my_tag_2"
+  ]
+```
+
+with this JSON output from a command:
+
+```json
+[
+    {
+        "a": 5,
+        "b": {
+            "c": 6
+        },
+        "my_tag_1": "foo",
+        "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
@@ -232,6 +288,16 @@ 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.
+]
+```
+
 #### Field Templates:

 The field keyword tells Telegraf to give the metric that field name.
--- a/docs/LICENSE_OF_DEPENDENCIES.md
+++ b/docs/LICENSE_OF_DEPENDENCIES.md
@@ -12,11 +12,11 @@
 - 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/kardianos/service [ZLIB LICENSE](https://github.com/kardianos/service/blob/master/LICENSE) (License not named but matches word for word with ZLib)
+- github.com/kballard/go-shellquote [MIT LICENSE](https://github.com/kballard/go-shellquote/blob/master/LICENSE)
 - github.com/lib/pq [MIT LICENSE](https://github.com/lib/pq/blob/master/LICENSE.md)
 - github.com/matttproud/golang_protobuf_extensions [APACHE LICENSE](https://github.com/matttproud/golang_protobuf_extensions/blob/master/LICENSE)
 - github.com/naoina/go-stringutil [MIT LICENSE](https://github.com/naoina/go-stringutil/blob/master/LICENSE)
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -66,7 +66,7 @@
  debug = false
  ## Run telegraf in quiet mode (error log messages only).
  quiet = false
-  ## Specify the log file name. The empty string means to log to stdout.
+  ## Specify the log file name. The empty string means to log to stderr.
  logfile = ""

  ## Override default hostname, if empty use os.Hostname()
@@ -140,8 +140,6 @@
 #   # retention_policy = "default"
 #   ## InfluxDB database
 #   # database = "telegraf"
-#   ## InfluxDB precision
-#   # precision = "s"
 #
 #   ## Optional SSL Config
 #   # ssl_ca = "/etc/telegraf/ca.pem"
@@ -160,7 +158,7 @@
 # # Configuration for AWS CloudWatch output.
 # [[outputs.cloudwatch]]
 #   ## Amazon REGION
-#   region = 'us-east-1'
+#   region = "us-east-1"
 #
 #   ## Amazon Credentials
 #   ## Credentials are loaded in the following order
@@ -178,7 +176,7 @@
 #   #shared_credential_file = ""
 #
 #   ## Namespace for the CloudWatch MetricDatums
-#   namespace = 'InfluxData/Telegraf'
+#   namespace = "InfluxData/Telegraf"


 # # Configuration for DataDog API to send metrics to.
@@ -190,6 +188,11 @@
 #   # timeout = "5s"


+# # Send metrics to nowhere at all
+# [[outputs.discard]]
+#   # no configuration
+
+
 # # Send telegraf metrics to file(s)
 # [[outputs.file]]
 #   ## Files to write to, "stdout" is a specially handled file.
@@ -219,7 +222,7 @@

 # # Send telegraf metrics to graylog(s)
 # [[outputs.graylog]]
-#   ## Udp endpoint for your graylog instance.
+#   ## UDP endpoint for your graylog instance.
 #   servers = ["127.0.0.1:12201", "192.168.1.1:12201"]


@@ -312,9 +315,13 @@
 #   streamname = "StreamName"
 #   ## PartitionKey as used for sharding data.
 #   partitionkey = "PartitionKey"
-#   ## format of the Data payload in the kinesis PutRecord, supported
-#   ## String and Custom.
-#   format = "string"
+#
+#   ## Data format to output.
+#   ## 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"
+#
 #   ## debug will show upstream aws messages.
 #   debug = false

@@ -351,6 +358,9 @@
 #   # username = "telegraf"
 #   # password = "metricsmetricsmetricsmetrics"
 #
+#   ## client ID, if not set a random ID is generated
+#   # client_id = ""
+#
 #   ## Optional SSL Config
 #   # ssl_ca = "/etc/telegraf/ca.pem"
 #   # ssl_cert = "/etc/telegraf/cert.pem"
@@ -428,6 +438,9 @@
 # [[outputs.prometheus_client]]
 #   ## Address to listen on
 #   # listen = ":9126"
+#
+#   ## Interval to expire metrics and not deliver to prometheus, 0 == no expiration
+#   # expiration_interval = "60s"


 # # Configuration for the Riemann server to send metrics to
@@ -441,6 +454,30 @@



+###############################################################################
+#                            PROCESSOR PLUGINS                                #
+###############################################################################
+
+# # Print all metrics that pass through this filter.
+# [[processors.printer]]
+
+
+
+###############################################################################
+#                            AGGREGATOR PLUGINS                               #
+###############################################################################
+
+# # 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
+
+
+
 ###############################################################################
 #                            INPUT PLUGINS                                    #
 ###############################################################################
@@ -514,6 +551,19 @@
 #   ## An array of Apache status URI to gather stats.
 #   ## Default is "http://localhost/server-status?auto".
 #   urls = ["http://localhost/server-status?auto"]
+#   ## user credentials for basic HTTP authentication
+#   username = "myuser"
+#   password = "mypassword"
+#
+#   ## Timeout to the complete conection and reponse time in seconds
+#   response_timeout = "25s" ## default to 5 seconds
+#
+#   ## Optional SSL Config
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
+#   ## Use SSL but skip chain & host verification
+#   # insecure_skip_verify = false


 # # Read metrics of bcache from stats_total and dirty_data
@@ -582,21 +632,24 @@

 # # Read specific statistics per cgroup
 # [[inputs.cgroup]]
-#     ## Directories in which to look for files, globs are supported.
-# 	# paths = [
-# 	#   "/cgroup/memory",
-# 	#   "/cgroup/memory/child1",
-# 	#   "/cgroup/memory/child2/*",
-# 	# ]
-# 	## cgroup stat fields, as file names, globs are supported.
-# 	## these file names are appended to each path from above.
-# 	# files = ["memory.*usage*", "memory.limit_in_bytes"]
+#   ## Directories in which to look for files, globs are supported.
+#   ## Consider restricting paths to the set of cgroups you really
+#   ## want to monitor if you have a large number of cgroups, to avoid
+#   ## any cardinality issues.
+#   # paths = [
+#   #   "/cgroup/memory",
+#   #   "/cgroup/memory/child1",
+#   #   "/cgroup/memory/child2/*",
+#   # ]
+#   ## cgroup stat fields, as file names, globs are supported.
+#   ## these file names are appended to each path from above.
+#   # files = ["memory.*usage*", "memory.limit_in_bytes"]


 # # Pull Metric Statistics from Amazon CloudWatch
 # [[inputs.cloudwatch]]
 #   ## Amazon Region
-#   region = 'us-east-1'
+#   region = "us-east-1"
 #
 #   ## Amazon Credentials
 #   ## Credentials are loaded in the following order
@@ -613,22 +666,29 @@
 #   #profile = ""
 #   #shared_credential_file = ""
 #
+#   # The minimum period for Cloudwatch metrics is 1 minute (60s). However not all
+#   # metrics are made available to the 1 minute period. Some are collected at
+#   # 3 minute and 5 minutes intervals. See https://aws.amazon.com/cloudwatch/faqs/#monitoring.
+#   # Note that if a period is configured that is smaller than the minimum for a
+#   # particular metric, that metric will not be returned by the Cloudwatch API
+#   # and will not be collected by Telegraf.
+#   #
 #   ## Requested CloudWatch aggregation Period (required - must be a multiple of 60s)
-#   period = '1m'
+#   period = "5m"
 #
 #   ## Collection Delay (required - must account for metrics availability via CloudWatch API)
-#   delay = '1m'
+#   delay = "5m"
 #
 #   ## Recomended: use metric 'interval' that is a multiple of 'period' to avoid
 #   ## gaps or overlap in pulled data
-#   interval = '1m'
+#   interval = "5m"
 #
 #   ## Configure the TTL for the internal cache of metrics.
 #   ## Defaults to 1 hr if not specified
-#   #cache_ttl = '10m'
+#   #cache_ttl = "10m"
 #
 #   ## Metric Statistic Namespace (required)
-#   namespace = 'AWS/ELB'
+#   namespace = "AWS/ELB"
 #
 #   ## Maximum requests per second. Note that the global default AWS rate limit is
 #   ## 10 reqs/sec, so if you define multiple namespaces, these should add up to a
@@ -639,12 +699,12 @@
 #   ## Defaults to all Metrics in Namespace if nothing is provided
 #   ## Refreshes Namespace available metrics every 1h
 #   #[[inputs.cloudwatch.metrics]]
-#   #  names = ['Latency', 'RequestCount']
+#   #  names = ["Latency", "RequestCount"]
 #   #
 #   #  ## Dimension filters for Metric (optional)
 #   #  [[inputs.cloudwatch.metrics.dimensions]]
-#   #    name = 'LoadBalancerName'
-#   #    value = 'p-example'
+#   #    name = "LoadBalancerName"
+#   #    value = "p-example"


 # # Gather health check statuses from services registered in Consul
@@ -750,18 +810,25 @@
 # # Read stats from one or more Elasticsearch servers or clusters
 # [[inputs.elasticsearch]]
 #   ## specify a list of one or more Elasticsearch servers
+#   # you can add username and password to your url to use basic authentication:
+#   # servers = ["http://user:pass@localhost:9200"]
 #   servers = ["http://localhost:9200"]
 #
 #   ## Timeout for HTTP requests to the elastic search server(s)
 #   http_timeout = "5s"
 #
-#   ## set local to false when you want to read the indices stats from all nodes
-#   ## within the cluster
+#   ## When local is true (the default), the node will read only its own stats.
+#   ## Set local to false when you want to read the node stats from all nodes
+#   ## of the cluster.
 #   local = true
 #
-#   ## set cluster_health to true when you want to also obtain cluster level stats
+#   ## Set cluster_health to true when you want to also obtain cluster health stats
 #   cluster_health = false
 #
+#   ## Set cluster_stats to true when you want to also obtain cluster stats from the
+#   ## Master node.
+#   cluster_stats = false
+#
 #   ## Optional SSL Config
 #   # ssl_ca = "/etc/telegraf/ca.pem"
 #   # ssl_cert = "/etc/telegraf/cert.pem"
@@ -850,12 +917,15 @@
 #   ## An array of address to gather stats about. Specify an ip on hostname
 #   ## with optional port. ie localhost, 10.10.3.33:1936, etc.
 #   ## Make sure you specify the complete path to the stats endpoint
-#   ## ie 10.10.3.33:1936/haproxy?stats
+#   ## including the protocol, ie http://10.10.3.33:1936/haproxy?stats
 #   #
 #   ## If no servers are specified, then default to 127.0.0.1:1936/haproxy?stats
 #   servers = ["http://myhaproxy.com:1936/haproxy?stats"]
-#   ## Or you can also use local socket
-#   ## servers = ["socket:/run/haproxy/admin.sock"]
+#   ##
+#   ## You can also use local socket with standard wildcard globbing.
+#   ## Server address not starting with 'http' will be treated as a possible
+#   ## socket, so both examples below are valid.
+#   ## servers = ["socket:/run/haproxy/admin.sock", "/run/haproxy/*.sock"]


 # # HTTP/HTTPS request given an address a method and a timeout
@@ -943,6 +1013,12 @@
 #   timeout = "5s"


+# # Collect statistics about itself
+# [[inputs.internal]]
+#   ## If true, collect telegraf memory stats.
+#   # collect_memstats = true
+
+
 # # Read metrics from one or many bare metal servers
 # [[inputs.ipmi_sensor]]
 #   ## specify servers via a url matching:
@@ -956,8 +1032,9 @@
 # # Read JMX metrics through Jolokia
 # [[inputs.jolokia]]
 #   ## This is the context root used to compose the jolokia url
+#   ## NOTE that Jolokia requires a trailing slash at the end of the context root
 #   ## NOTE that your jolokia security policy must allow for POST requests.
-#   context = "/jolokia"
+#   context = "/jolokia/"
 #
 #   ## This specifies the mode used
 #   # mode = "proxy"
@@ -969,6 +1046,15 @@
 #   #   host = "127.0.0.1"
 #   #   port = "8080"
 #
+#   ## Optional http timeouts
+#   ##
+#   ## response_header_timeout, if non-zero, specifies the amount of time to wait
+#   ## for a server's response headers after fully writing the request.
+#   # response_header_timeout = "3s"
+#   ##
+#   ## client_timeout specifies a time limit for requests made by this client.
+#   ## Includes connection time, any redirects, and reading the response body.
+#   # client_timeout = "4s"
 #
 #   ## List of servers exposing jolokia read service
 #   [[inputs.jolokia.servers]]
@@ -1000,6 +1086,22 @@
 #     attribute = "LoadedClassCount,UnloadedClassCount,TotalLoadedClassCount"


+# # Read metrics from the kubernetes kubelet api
+# [[inputs.kubernetes]]
+#   ## URL for the kubelet
+#   url = "http://1.1.1.1:10255"
+#
+#   ## Use bearer token for authorization
+#   # bearer_token = /path/to/bearer/token
+#
+#   ## Optional SSL Config
+#   # ssl_ca = /path/to/cafile
+#   # ssl_cert = /path/to/certfile
+#   # ssl_key = /path/to/keyfile
+#   ## Use SSL but skip chain & host verification
+#   # insecure_skip_verify = false
+
+
 # # Read metrics from a LeoFS Server via SNMP
 # [[inputs.leofs]]
 #   ## An array of URI to gather stats about LeoFS.
@@ -1091,8 +1193,8 @@
 #   ##  [username[:password]@][protocol[(address)]]/[?tls=[true|false|skip-verify]]
 #   ##  see https://github.com/go-sql-driver/mysql#dsn-data-source-name
 #   ##  e.g.
-#   ##    db_user:passwd@tcp(127.0.0.1:3306)/?tls=false
-#   ##    db_user@tcp(127.0.0.1:3306)/?tls=false
+#   ##    servers = ["user:passwd@tcp(127.0.0.1:3306)/?tls=false"]
+#   ##    servers = ["user@tcp(127.0.0.1:3306)/?tls=false"]
 #   #
 #   ## If no servers are specified, then localhost is used as the host.
 #   servers = ["tcp(127.0.0.1:3306)/"]
@@ -1119,13 +1221,13 @@
 #   ## gather metrics from SHOW BINARY LOGS command output
 #   gather_binary_logs                        = false
 #   #
-#   ## gather metrics from PERFORMANCE_SCHEMA.TABLE_IO_WAITS_SUMMART_BY_TABLE
+#   ## gather metrics from PERFORMANCE_SCHEMA.TABLE_IO_WAITS_SUMMARY_BY_TABLE
 #   gather_table_io_waits                     = false
 #   #
 #   ## gather metrics from PERFORMANCE_SCHEMA.TABLE_LOCK_WAITS
 #   gather_table_lock_waits                   = false
 #   #
-#   ## gather metrics from PERFORMANCE_SCHEMA.TABLE_IO_WAITS_SUMMART_BY_INDEX_USAGE
+#   ## gather metrics from PERFORMANCE_SCHEMA.TABLE_IO_WAITS_SUMMARY_BY_INDEX_USAGE
 #   gather_index_io_waits                     = false
 #   #
 #   ## gather metrics from PERFORMANCE_SCHEMA.EVENT_WAITS
@@ -1153,18 +1255,24 @@
 # # TCP or UDP 'ping' given url and collect response time in seconds
 # [[inputs.net_response]]
 #   ## Protocol, must be "tcp" or "udp"
+#   ## NOTE: because the "udp" protocol does not respond to requests, it requires
+#   ## a send/expect string pair (see below).
 #   protocol = "tcp"
 #   ## Server address (default localhost)
-#   address = "github.com:80"
+#   address = "localhost:80"
 #   ## Set timeout
 #   timeout = "1s"
 #
-#   ## Optional string sent to the server
-#   # send = "ssh"
-#   ## Optional expected string in answer
-#   # expect = "ssh"
 #   ## Set read timeout (only used if expecting a response)
 #   read_timeout = "1s"
+#
+#   ## The following options are required for UDP checks. For TCP, they are
+#   ## optional. The plugin will send the given string to the server and then
+#   ## expect to receive the given 'expect' string back.
+#   ## string sent to the server
+#   # send = "ssh"
+#   ## expected string in answer
+#   # expect = "ssh"


 # # Read TCP metrics such as established, time wait and sockets counts.
@@ -1247,13 +1355,13 @@
 #   ## urls to ping
 #   urls = ["www.google.com"] # required
 #   ## number of pings to send per collection (ping -c <COUNT>)
-#   count = 1 # required
+#   # count = 1
 #   ## interval, in s, at which to ping. 0 == default (ping -i <PING_INTERVAL>)
-#   ping_interval = 0.0
+#   # ping_interval = 1.0
 #   ## per-ping timeout, in s. 0 == no timeout (ping -W <TIMEOUT>)
-#   timeout = 1.0
+#   # timeout = 1.0
 #   ## interface to send ping from (ping -I <INTERFACE>)
-#   interface = ""
+#   # interface = ""


 # # Read metrics from one or many postgresql servers
@@ -1356,8 +1464,6 @@
 #   # exe = "nginx"
 #   ## pattern as argument for pgrep (ie, pgrep -f <pattern>)
 #   # pattern = "nginx"
-#   ## match the exact name of the process (ie, pgrep -xf <pattern>)
-#   # exact = false
 #   ## user as argument for pgrep (ie, pgrep -u <user>)
 #   # user = "nginx"
 #
@@ -1368,6 +1474,8 @@
 #   prefix = ""
 #   ## comment this out if you want raw cpu_time stats
 #   fielddrop = ["cpu_time_*"]
+#   ## This is optional; moves pid into a tag instead of a field
+#   pid_tag = false


 # # Read metrics from one or many prometheus clients
@@ -1378,6 +1486,9 @@
 #   ## Use bearer token for authorization
 #   # bearer_token = /path/to/bearer/token
 #
+#   ## Specify timeout duration for slower prometheus clients (default is 3s)
+#   # response_timeout = "3s"
+#
 #   ## Optional SSL Config
 #   # ssl_ca = /path/to/cafile
 #   # ssl_cert = /path/to/certfile
@@ -1406,6 +1517,16 @@
 #   ## Use SSL but skip chain & host verification
 #   # insecure_skip_verify = false
 #
+#   ## Optional request timeouts
+#   ##
+#   ## ResponseHeaderTimeout, if non-zero, specifies the amount of time to wait
+#   ## for a server's response headers after fully writing the request.
+#   # header_timeout = "3s"
+#   ##
+#   ## client_timeout specifies a time limit for requests made by this client.
+#   ## Includes connection time, any redirects, and reading the response body.
+#   # client_timeout = "4s"
+#
 #   ## A list of nodes to pull metrics about. If not specified, metrics for
 #   ## all nodes are gathered.
 #   # nodes = ["rabbit@node1", "rabbit@node2"]
@@ -1683,9 +1804,18 @@
 #   ## Address and port to host HTTP listener on
 #   service_address = ":8186"
 #
-#   ## timeouts
+#   ## maximum duration before timing out read of the request
 #   read_timeout = "10s"
+#   ## maximum duration before timing out write of the response
 #   write_timeout = "10s"
+#
+#   ## Maximum allowed http request body size in bytes.
+#   ## 0 means to use the default of 536,870,912 bytes (500 mebibytes)
+#   max_body_size = 0
+#
+#   ## Maximum line size allowed to be sent in bytes.
+#   ## 0 means to use the default of 65536 bytes (64 kibibytes)
+#   max_line_size = 0


 # # Read metrics from Kafka topic(s)
@@ -1780,13 +1910,18 @@
 # # Read metrics from NATS subject(s)
 # [[inputs.nats_consumer]]
 #   ## urls of NATS servers
-#   servers = ["nats://localhost:4222"]
+#   # servers = ["nats://localhost:4222"]
 #   ## Use Transport Layer Security
-#   secure = false
+#   # secure = false
 #   ## subject(s) to consume
-#   subjects = ["telegraf"]
+#   # subjects = ["telegraf"]
 #   ## name a queue group
-#   queue_group = "telegraf_consumers"
+#   # queue_group = "telegraf_consumers"
+#
+#   ## Sets the limits for pending msgs and bytes for each subscription
+#   ## These shouldn't need to be adjusted except in very high throughput scenarios
+#   # pending_message_limit = 65536
+#   # pending_bytes_limit = 67108864
 #
 #   ## Data format to consume.
 #   ## Each data format has it's own unique set of configuration options, read
@@ -1814,14 +1949,19 @@
 # [[inputs.statsd]]
 #   ## Address and port to host UDP listener on
 #   service_address = ":8125"
-#   ## Delete gauges every interval (default=false)
-#   delete_gauges = false
-#   ## Delete counters every interval (default=false)
-#   delete_counters = false
-#   ## Delete sets every interval (default=false)
-#   delete_sets = false
-#   ## Delete timings & histograms every interval (default=true)
+#
+#   ## The following configuration options control when telegraf clears it's cache
+#   ## of previous values. If set to false, then telegraf will only clear it's
+#   ## cache when the daemon is restarted.
+#   ## Reset gauges every interval (default=true)
+#   delete_gauges = true
+#   ## Reset counters every interval (default=true)
+#   delete_counters = true
+#   ## Reset sets every interval (default=true)
+#   delete_sets = true
+#   ## Reset timings & histograms every interval (default=true)
 #   delete_timings = true
+#
 #   ## Percentiles to calculate for timing & histogram stats
 #   percentiles = [90]
 #
@@ -1862,6 +2002,8 @@
 #   files = ["/var/mymetrics.out"]
 #   ## Read file from beginning.
 #   from_beginning = false
+#   ## Whether file is a named pipe
+#   pipe = false
 #
 #   ## Data format to consume.
 #   ## Each data format has it's own unique set of configuration options, read
@@ -1873,14 +2015,14 @@
 # # Generic TCP listener
 # [[inputs.tcp_listener]]
 #   ## Address and port to host TCP listener on
-#   service_address = ":8094"
+#   # service_address = ":8094"
 #
 #   ## Number of TCP messages allowed to queue up. Once filled, the
 #   ## TCP listener will start dropping packets.
-#   allowed_pending_messages = 10000
+#   # allowed_pending_messages = 10000
 #
 #   ## Maximum number of concurrent TCP connections to allow
-#   max_tcp_connections = 250
+#   # max_tcp_connections = 250
 #
 #   ## Data format to consume.
 #   ## Each data format has it's own unique set of configuration options, read
@@ -1892,11 +2034,15 @@
 # # Generic UDP listener
 # [[inputs.udp_listener]]
 #   ## Address and port to host UDP listener on
-#   service_address = ":8092"
+#   # service_address = ":8092"
 #
 #   ## Number of UDP messages allowed to queue up. Once filled, the
 #   ## UDP listener will start dropping packets.
-#   allowed_pending_messages = 10000
+#   # allowed_pending_messages = 10000
+#
+#   ## Set the buffer size of the UDP connection outside of OS default (in bytes)
+#   ## If set to 0, take OS default
+#   udp_buffer_size = 16777216
 #
 #   ## Data format to consume.
 #   ## Each data format has it's own unique set of configuration options, read
--- a/etc/telegraf_windows.conf
+++ b/etc/telegraf_windows.conf
@@ -130,6 +130,7 @@
    Counters = [
      "Context Switches/sec",
      "System Calls/sec",
+      "Processor Queue Length",
    ]
    Instances = ["------"]
    Measurement = "win_system"
--- a/internal/buffer/buffer.go
+++ b/internal/buffer/buffer.go
@@ -1,16 +1,22 @@
 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
-	// total dropped metrics
-	drops int
-	// total metrics added
-	total int
+
+	mu sync.Mutex
 }

 // NewBuffer returns a Buffer
@@ -32,25 +38,14 @@ func (b *Buffer) Len() int {
 	return len(b.buf)
 }

-// Drops returns the total number of dropped metrics that have occured in this
-// buffer since instantiation.
-func (b *Buffer) Drops() int {
-	return b.drops
-}
-
-// Total returns the total number of metrics that have been added to this buffer.
-func (b *Buffer) Total() int {
-	return b.total
-}
-
 // Add adds metrics to the buffer.
 func (b *Buffer) Add(metrics ...telegraf.Metric) {
 	for i, _ := range metrics {
-		b.total++
+		MetricsWritten.Incr(1)
 		select {
 		case b.buf <- metrics[i]:
 		default:
-			b.drops++
+			MetricsDropped.Incr(1)
 			<-b.buf
 			b.buf <- metrics[i]
 		}
@@ -61,11 +56,13 @@ func (b *Buffer) Add(metrics ...telegraf.Metric) {
 // 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
 }

--- a/internal/buffer/buffer_test.go
+++ b/internal/buffer/buffer_test.go
@@ -27,47 +27,53 @@ func BenchmarkAddMetrics(b *testing.B) {

 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, b.Drops())
-	assert.Zero(t, b.Total())
+	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, b.Drops(), 0)
-	assert.Equal(t, b.Total(), 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, b.Drops(), 0)
-	assert.Equal(t, b.Total(), 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, b.Drops(), 0)
-	assert.Equal(t, b.Total(), 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, b.Drops(), 5)
-	assert.Equal(t, b.Total(), 15)
+	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.
@@ -78,8 +84,8 @@ func TestGettingBatches(t *testing.T) {
 	// Verify that the buffer is now empty
 	assert.True(t, b.IsEmpty())
 	assert.Zero(t, b.Len())
-	assert.Zero(t, b.Drops())
-	assert.Equal(t, b.Total(), 5)
+	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...)
@@ -89,6 +95,6 @@ func TestGettingBatches(t *testing.T) {
 	// Verify that buffer is not empty
 	assert.False(t, b.IsEmpty())
 	assert.Equal(t, b.Len(), 2)
-	assert.Equal(t, b.Drops(), 0)
-	assert.Equal(t, b.Total(), 10)
+	assert.Equal(t, int64(0), MetricsDropped.Get())
+	assert.Equal(t, int64(10), MetricsWritten.Get())
 }
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -11,15 +11,18 @@ import (
 	"regexp"
 	"runtime"
 	"sort"
+	"strconv"
 	"strings"
 	"time"

 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/internal/models"
+	"github.com/influxdata/telegraf/plugins/aggregators"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"github.com/influxdata/telegraf/plugins/outputs"
 	"github.com/influxdata/telegraf/plugins/parsers"
+	"github.com/influxdata/telegraf/plugins/processors"
 	"github.com/influxdata/telegraf/plugins/serializers"

 	"github.com/influxdata/config"
@@ -47,9 +50,12 @@ type Config struct {
 	InputFilters  []string
 	OutputFilters []string

-	Agent   *AgentConfig
-	Inputs  []*models.RunningInput
-	Outputs []*models.RunningOutput
+	Agent       *AgentConfig
+	Inputs      []*models.RunningInput
+	Outputs     []*models.RunningOutput
+	Aggregators []*models.RunningAggregator
+	// Processors have a slice wrapper type because they need to be sorted
+	Processors models.RunningProcessors
 }

 func NewConfig() *Config {
@@ -64,6 +70,7 @@ func NewConfig() *Config {
 		Tags:          make(map[string]string),
 		Inputs:        make([]*models.RunningInput, 0),
 		Outputs:       make([]*models.RunningOutput, 0),
+		Processors:    make([]*models.RunningProcessor, 0),
 		InputFilters:  make([]string, 0),
 		OutputFilters: make([]string, 0),
 	}
@@ -138,7 +145,7 @@ type AgentConfig struct {
 func (c *Config) InputNames() []string {
 	var name []string
 	for _, input := range c.Inputs {
-		name = append(name, input.Name)
+		name = append(name, input.Name())
 	}
 	return name
 }
@@ -234,7 +241,7 @@ var header = `# Telegraf Configuration
  debug = false
  ## Run telegraf in quiet mode (error log messages only).
  quiet = false
-  ## Specify the log file name. The empty string means to log to stdout.
+  ## Specify the log file name. The empty string means to log to stderr.
  logfile = ""

  ## Override default hostname, if empty use os.Hostname()
@@ -248,6 +255,20 @@ var header = `# Telegraf Configuration
 ###############################################################################
 `

+var processorHeader = `
+
+###############################################################################
+#                            PROCESSOR PLUGINS                                #
+###############################################################################
+`
+
+var aggregatorHeader = `
+
+###############################################################################
+#                            AGGREGATOR PLUGINS                               #
+###############################################################################
+`
+
 var inputHeader = `

 ###############################################################################
@@ -263,9 +284,15 @@ var serviceInputHeader = `
 `

 // PrintSampleConfig prints the sample config
-func PrintSampleConfig(inputFilters []string, outputFilters []string) {
+func PrintSampleConfig(
+	inputFilters []string,
+	outputFilters []string,
+	aggregatorFilters []string,
+	processorFilters []string,
+) {
 	fmt.Printf(header)

+	// print output plugins
 	if len(outputFilters) != 0 {
 		printFilteredOutputs(outputFilters, false)
 	} else {
@@ -281,6 +308,33 @@ func PrintSampleConfig(inputFilters []string, outputFilters []string) {
 		printFilteredOutputs(pnames, true)
 	}

+	// print processor plugins
+	fmt.Printf(processorHeader)
+	if len(processorFilters) != 0 {
+		printFilteredProcessors(processorFilters, false)
+	} else {
+		pnames := []string{}
+		for pname := range processors.Processors {
+			pnames = append(pnames, pname)
+		}
+		sort.Strings(pnames)
+		printFilteredProcessors(pnames, true)
+	}
+
+	// pring aggregator plugins
+	fmt.Printf(aggregatorHeader)
+	if len(aggregatorFilters) != 0 {
+		printFilteredAggregators(aggregatorFilters, false)
+	} else {
+		pnames := []string{}
+		for pname := range aggregators.Aggregators {
+			pnames = append(pnames, pname)
+		}
+		sort.Strings(pnames)
+		printFilteredAggregators(pnames, true)
+	}
+
+	// print input plugins
 	fmt.Printf(inputHeader)
 	if len(inputFilters) != 0 {
 		printFilteredInputs(inputFilters, false)
@@ -298,6 +352,42 @@ func PrintSampleConfig(inputFilters []string, outputFilters []string) {
 	}
 }

+func printFilteredProcessors(processorFilters []string, commented bool) {
+	// Filter processors
+	var pnames []string
+	for pname := range processors.Processors {
+		if sliceContains(pname, processorFilters) {
+			pnames = append(pnames, pname)
+		}
+	}
+	sort.Strings(pnames)
+
+	// Print Outputs
+	for _, pname := range pnames {
+		creator := processors.Processors[pname]
+		output := creator()
+		printConfig(pname, output, "processors", commented)
+	}
+}
+
+func printFilteredAggregators(aggregatorFilters []string, commented bool) {
+	// Filter outputs
+	var anames []string
+	for aname := range aggregators.Aggregators {
+		if sliceContains(aname, aggregatorFilters) {
+			anames = append(anames, aname)
+		}
+	}
+	sort.Strings(anames)
+
+	// Print Outputs
+	for _, aname := range anames {
+		creator := aggregators.Aggregators[aname]
+		output := creator()
+		printConfig(aname, output, "aggregators", commented)
+	}
+}
+
 func printFilteredInputs(inputFilters []string, commented bool) {
 	// Filter inputs
 	var pnames []string
@@ -507,6 +597,7 @@ func (c *Config) LoadConfig(path string) error {
 		case "outputs":
 			for pluginName, pluginVal := range subTable.Fields {
 				switch pluginSubTable := pluginVal.(type) {
+				// legacy [outputs.influxdb] support
 				case *ast.Table:
 					if err = c.addOutput(pluginName, pluginSubTable); err != nil {
 						return fmt.Errorf("Error parsing %s, %s", path, err)
@@ -525,6 +616,7 @@ func (c *Config) LoadConfig(path string) error {
 		case "inputs", "plugins":
 			for pluginName, pluginVal := range subTable.Fields {
 				switch pluginSubTable := pluginVal.(type) {
+				// legacy [inputs.cpu] support
 				case *ast.Table:
 					if err = c.addInput(pluginName, pluginSubTable); err != nil {
 						return fmt.Errorf("Error parsing %s, %s", path, err)
@@ -540,6 +632,34 @@ func (c *Config) LoadConfig(path string) error {
 						pluginName, path)
 				}
 			}
+		case "processors":
+			for pluginName, pluginVal := range subTable.Fields {
+				switch pluginSubTable := pluginVal.(type) {
+				case []*ast.Table:
+					for _, t := range pluginSubTable {
+						if err = c.addProcessor(pluginName, t); err != nil {
+							return fmt.Errorf("Error parsing %s, %s", path, err)
+						}
+					}
+				default:
+					return fmt.Errorf("Unsupported config format: %s, file %s",
+						pluginName, path)
+				}
+			}
+		case "aggregators":
+			for pluginName, pluginVal := range subTable.Fields {
+				switch pluginSubTable := pluginVal.(type) {
+				case []*ast.Table:
+					for _, t := range pluginSubTable {
+						if err = c.addAggregator(pluginName, t); err != nil {
+							return fmt.Errorf("Error parsing %s, %s", path, err)
+						}
+					}
+				default:
+					return fmt.Errorf("Unsupported config format: %s, file %s",
+						pluginName, path)
+				}
+			}
 		// Assume it's an input input for legacy config file support if no other
 		// identifiers are present
 		default:
@@ -548,6 +668,10 @@ func (c *Config) LoadConfig(path string) error {
 			}
 		}
 	}
+
+	if len(c.Processors) > 1 {
+		sort.Sort(c.Processors)
+	}
 	return nil
 }

@@ -580,6 +704,52 @@ func parseFile(fpath string) (*ast.Table, error) {
 	return toml.Parse(contents)
 }

+func (c *Config) addAggregator(name string, table *ast.Table) error {
+	creator, ok := aggregators.Aggregators[name]
+	if !ok {
+		return fmt.Errorf("Undefined but requested aggregator: %s", name)
+	}
+	aggregator := creator()
+
+	conf, err := buildAggregator(name, table)
+	if err != nil {
+		return err
+	}
+
+	if err := config.UnmarshalTable(table, aggregator); err != nil {
+		return err
+	}
+
+	c.Aggregators = append(c.Aggregators, models.NewRunningAggregator(aggregator, conf))
+	return nil
+}
+
+func (c *Config) addProcessor(name string, table *ast.Table) error {
+	creator, ok := processors.Processors[name]
+	if !ok {
+		return fmt.Errorf("Undefined but requested processor: %s", name)
+	}
+	processor := creator()
+
+	processorConfig, err := buildProcessor(name, table)
+	if err != nil {
+		return err
+	}
+
+	if err := config.UnmarshalTable(table, processor); err != nil {
+		return err
+	}
+
+	rf := &models.RunningProcessor{
+		Name:      name,
+		Processor: processor,
+		Config:    processorConfig,
+	}
+
+	c.Processors = append(c.Processors, rf)
+	return nil
+}
+
 func (c *Config) addOutput(name string, table *ast.Table) error {
 	if len(c.OutputFilters) > 0 && !sliceContains(name, c.OutputFilters) {
 		return nil
@@ -651,15 +821,149 @@ func (c *Config) addInput(name string, table *ast.Table) error {
 		return err
 	}

-	rp := &models.RunningInput{
-		Name:   name,
-		Input:  input,
-		Config: pluginConfig,
-	}
+	rp := models.NewRunningInput(input, pluginConfig)
 	c.Inputs = append(c.Inputs, rp)
 	return nil
 }

+// buildAggregator parses Aggregator specific items from the ast.Table,
+// builds the filter and returns a
+// models.AggregatorConfig to be inserted into models.RunningAggregator
+func buildAggregator(name string, tbl *ast.Table) (*models.AggregatorConfig, error) {
+	unsupportedFields := []string{"tagexclude", "taginclude"}
+	for _, field := range unsupportedFields {
+		if _, ok := tbl.Fields[field]; ok {
+			return nil, fmt.Errorf("%s is not supported for aggregator plugins (%s).",
+				field, name)
+		}
+	}
+
+	conf := &models.AggregatorConfig{
+		Name:   name,
+		Delay:  time.Millisecond * 100,
+		Period: time.Second * 30,
+	}
+
+	if node, ok := tbl.Fields["period"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if str, ok := kv.Value.(*ast.String); ok {
+				dur, err := time.ParseDuration(str.Value)
+				if err != nil {
+					return nil, err
+				}
+
+				conf.Period = dur
+			}
+		}
+	}
+
+	if node, ok := tbl.Fields["delay"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if str, ok := kv.Value.(*ast.String); ok {
+				dur, err := time.ParseDuration(str.Value)
+				if err != nil {
+					return nil, err
+				}
+
+				conf.Delay = dur
+			}
+		}
+	}
+
+	if node, ok := tbl.Fields["drop_original"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if b, ok := kv.Value.(*ast.Boolean); ok {
+				var err error
+				conf.DropOriginal, err = strconv.ParseBool(b.Value)
+				if err != nil {
+					log.Printf("Error parsing boolean value for %s: %s\n", name, err)
+				}
+			}
+		}
+	}
+
+	if node, ok := tbl.Fields["name_prefix"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if str, ok := kv.Value.(*ast.String); ok {
+				conf.MeasurementPrefix = str.Value
+			}
+		}
+	}
+
+	if node, ok := tbl.Fields["name_suffix"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if str, ok := kv.Value.(*ast.String); ok {
+				conf.MeasurementSuffix = str.Value
+			}
+		}
+	}
+
+	if node, ok := tbl.Fields["name_override"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if str, ok := kv.Value.(*ast.String); ok {
+				conf.NameOverride = str.Value
+			}
+		}
+	}
+
+	conf.Tags = make(map[string]string)
+	if node, ok := tbl.Fields["tags"]; ok {
+		if subtbl, ok := node.(*ast.Table); ok {
+			if err := config.UnmarshalTable(subtbl, conf.Tags); err != nil {
+				log.Printf("Could not parse tags for input %s\n", name)
+			}
+		}
+	}
+
+	delete(tbl.Fields, "period")
+	delete(tbl.Fields, "delay")
+	delete(tbl.Fields, "drop_original")
+	delete(tbl.Fields, "name_prefix")
+	delete(tbl.Fields, "name_suffix")
+	delete(tbl.Fields, "name_override")
+	delete(tbl.Fields, "tags")
+	var err error
+	conf.Filter, err = buildFilter(tbl)
+	if err != nil {
+		return conf, err
+	}
+	return conf, nil
+}
+
+// buildProcessor parses Processor specific items from the ast.Table,
+// builds the filter and returns a
+// models.ProcessorConfig to be inserted into models.RunningProcessor
+func buildProcessor(name string, tbl *ast.Table) (*models.ProcessorConfig, error) {
+	conf := &models.ProcessorConfig{Name: name}
+	unsupportedFields := []string{"tagexclude", "taginclude", "fielddrop", "fieldpass"}
+	for _, field := range unsupportedFields {
+		if _, ok := tbl.Fields[field]; ok {
+			return nil, fmt.Errorf("%s is not supported for processor plugins (%s).",
+				field, name)
+		}
+	}
+
+	if node, ok := tbl.Fields["order"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if b, ok := kv.Value.(*ast.Integer); ok {
+				var err error
+				conf.Order, err = strconv.ParseInt(b.Value, 10, 64)
+				if err != nil {
+					log.Printf("Error parsing int value for %s: %s\n", name, err)
+				}
+			}
+		}
+	}
+
+	delete(tbl.Fields, "order")
+	var err error
+	conf.Filter, err = buildFilter(tbl)
+	if err != nil {
+		return conf, err
+	}
+	return conf, nil
+}
+
 // buildFilter builds a Filter
 // (tagpass/tagdrop/namepass/namedrop/fieldpass/fielddrop) to
 // be inserted into the models.OutputConfig/models.InputConfig
--- a/internal/internal.go
+++ b/internal/internal.go
@@ -35,12 +35,22 @@ type Duration struct {
 // UnmarshalTOML parses the duration from the TOML config file
 func (d *Duration) UnmarshalTOML(b []byte) error {
 	var err error
-	// Parse string duration, ie, "1s"
-	d.Duration, err = time.ParseDuration(string(b[1 : len(b)-1]))
+	b = bytes.Trim(b, `'`)
+
+	// see if we can directly convert it
+	d.Duration, err = time.ParseDuration(string(b))
 	if err == nil {
 		return nil
 	}

+	// 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 {
--- a/internal/internal_test.go
+++ b/internal/internal_test.go
@@ -131,3 +131,26 @@ func TestRandomSleep(t *testing.T) {
 	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/models/filter.go
+++ b/internal/models/filter.go
@@ -96,7 +96,7 @@ func (f *Filter) Compile() error {
 // 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 in-place if they need to be deleted.
+// It will modify tags & fields in-place if they need to be deleted.
 func (f *Filter) Apply(
 	measurement string,
 	fields map[string]interface{},
--- a/internal/models/makemetric.go
+++ b/internal/models/makemetric.go
@@ -0,0 +1,143 @@
+package models
+
+import (
+	"log"
+	"math"
+	"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 fields {
+		// 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
+			}
+		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
@@ -0,0 +1,166 @@
+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
@@ -0,0 +1,256 @@
+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,15 +1,38 @@
 package 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
@@ -22,3 +45,52 @@ 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
@@ -0,0 +1,339 @@
+package models
+
+import (
+	"fmt"
+	"math"
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf"
+
+	"github.com/stretchr/testify/assert"
+)
+
+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(),
+	)
+}
+
+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
@@ -6,6 +6,8 @@ import (

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

 const (
@@ -21,10 +23,15 @@ type RunningOutput struct {
 	Name              string
 	Output            telegraf.Output
 	Config            *OutputConfig
-	Quiet             bool
 	MetricBufferLimit int
 	MetricBatchSize   int

+	MetricsFiltered selfstat.Stat
+	MetricsWritten  selfstat.Stat
+	BufferSize      selfstat.Stat
+	BufferLimit     selfstat.Stat
+	WriteTime       selfstat.Stat
+
 	metrics     *buffer.Buffer
 	failMetrics *buffer.Buffer
 }
@@ -50,29 +57,56 @@ func NewRunningOutput(
 		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},
+		),
 	}
+	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(metric telegraf.Metric) {
+func (ro *RunningOutput) AddMetric(m telegraf.Metric) {
 	// 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 := metric.Name()
-		tags := metric.Tags()
-		fields := metric.Fields()
-		t := metric.Time()
+		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)
 			return
 		}
 		// error is not possible if creating from another metric, so ignore.
-		metric, _ = telegraf.NewMetric(name, tags, fields, t)
+		m, _ = metric.New(name, tags, fields, t)
 	}

-	ro.metrics.Add(metric)
+	ro.metrics.Add(m)
 	if ro.metrics.Len() == ro.MetricBatchSize {
 		batch := ro.metrics.Batch(ro.MetricBatchSize)
 		err := ro.write(batch)
@@ -84,28 +118,21 @@ func (ro *RunningOutput) AddMetric(metric telegraf.Metric) {

 // Write writes all cached points to this output.
 func (ro *RunningOutput) Write() error {
-	if !ro.Quiet {
-		log.Printf("I! Output [%s] buffer fullness: %d / %d metrics. "+
-			"Total gathered metrics: %d. Total dropped metrics: %d.",
-			ro.Name,
-			ro.failMetrics.Len()+ro.metrics.Len(),
-			ro.MetricBufferLimit,
-			ro.metrics.Total(),
-			ro.metrics.Drops()+ro.failMetrics.Drops())
-	}
-
+	nFails, nMetrics := ro.failMetrics.Len(), ro.metrics.Len()
+	log.Printf("D! Output [%s] buffer fullness: %d / %d metrics. ",
+		ro.Name, nFails+nMetrics, ro.MetricBufferLimit)
+	ro.BufferSize.Incr(int64(nFails + nMetrics))
 	var err error
 	if !ro.failMetrics.IsEmpty() {
-		bufLen := ro.failMetrics.Len()
 		// how many batches of failed writes we need to write.
-		nBatches := bufLen/ro.MetricBatchSize + 1
+		nBatches := nFails/ro.MetricBatchSize + 1
 		batchSize := ro.MetricBatchSize

 		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 = bufLen % ro.MetricBatchSize
+				batchSize = nFails % ro.MetricBatchSize
 			}
 			batch := ro.failMetrics.Batch(batchSize)
 			// If we've already failed previous writes, don't bother trying to
@@ -126,6 +153,7 @@ func (ro *RunningOutput) Write() error {
 	if err == nil {
 		err = ro.write(batch)
 	}
+
 	if err != nil {
 		ro.failMetrics.Add(batch...)
 		return err
@@ -134,17 +162,19 @@ func (ro *RunningOutput) Write() error {
 }

 func (ro *RunningOutput) write(metrics []telegraf.Metric) error {
-	if metrics == nil || len(metrics) == 0 {
+	nMetrics := len(metrics)
+	if nMetrics == 0 {
 		return nil
 	}
 	start := time.Now()
 	err := ro.Output.Write(metrics)
 	elapsed := time.Since(start)
 	if err == nil {
-		if !ro.Quiet {
-			log.Printf("I! Output [%s] wrote batch of %d metrics in %s\n",
-				ro.Name, len(metrics), elapsed)
-		}
+		log.Printf("D! Output [%s] wrote batch of %d metrics in %s\n",
+			ro.Name, nMetrics, elapsed)
+		ro.MetricsWritten.Incr(int64(nMetrics))
+		ro.BufferSize.Incr(-int64(nMetrics))
+		ro.WriteTime.Incr(elapsed.Nanoseconds())
 	}
 	return err
 }
--- a/internal/models/running_output_test.go
+++ b/internal/models/running_output_test.go
@@ -36,10 +36,9 @@ func BenchmarkRunningOutputAddWrite(b *testing.B) {

 	m := &perfOutput{}
 	ro := NewRunningOutput("test", m, conf, 1000, 10000)
-	ro.Quiet = true

 	for n := 0; n < b.N; n++ {
-		ro.AddMetric(first5[0])
+		ro.AddMetric(testutil.TestMetric(101, "metric1"))
 		ro.Write()
 	}
 }
@@ -52,10 +51,9 @@ func BenchmarkRunningOutputAddWriteEvery100(b *testing.B) {

 	m := &perfOutput{}
 	ro := NewRunningOutput("test", m, conf, 1000, 10000)
-	ro.Quiet = true

 	for n := 0; n < b.N; n++ {
-		ro.AddMetric(first5[0])
+		ro.AddMetric(testutil.TestMetric(101, "metric1"))
 		if n%100 == 0 {
 			ro.Write()
 		}
@@ -71,10 +69,9 @@ func BenchmarkRunningOutputAddFailWrites(b *testing.B) {
 	m := &perfOutput{}
 	m.failWrite = true
 	ro := NewRunningOutput("test", m, conf, 1000, 10000)
-	ro.Quiet = true

 	for n := 0; n < b.N; n++ {
-		ro.AddMetric(first5[0])
+		ro.AddMetric(testutil.TestMetric(101, "metric1"))
 	}
 }

@@ -132,7 +129,6 @@ func TestRunningOutput_PassFilter(t *testing.T) {
 func TestRunningOutput_TagIncludeNoMatch(t *testing.T) {
 	conf := &OutputConfig{
 		Filter: Filter{
-
 			TagInclude: []string{"nothing*"},
 		},
 	}
@@ -141,7 +137,7 @@ func TestRunningOutput_TagIncludeNoMatch(t *testing.T) {
 	m := &mockOutput{}
 	ro := NewRunningOutput("test", m, conf, 1000, 10000)

-	ro.AddMetric(first5[0])
+	ro.AddMetric(testutil.TestMetric(101, "metric1"))
 	assert.Len(t, m.Metrics(), 0)

 	err := ro.Write()
@@ -154,7 +150,6 @@ func TestRunningOutput_TagIncludeNoMatch(t *testing.T) {
 func TestRunningOutput_TagExcludeMatch(t *testing.T) {
 	conf := &OutputConfig{
 		Filter: Filter{
-
 			TagExclude: []string{"tag*"},
 		},
 	}
@@ -163,7 +158,7 @@ func TestRunningOutput_TagExcludeMatch(t *testing.T) {
 	m := &mockOutput{}
 	ro := NewRunningOutput("test", m, conf, 1000, 10000)

-	ro.AddMetric(first5[0])
+	ro.AddMetric(testutil.TestMetric(101, "metric1"))
 	assert.Len(t, m.Metrics(), 0)

 	err := ro.Write()
@@ -176,7 +171,6 @@ func TestRunningOutput_TagExcludeMatch(t *testing.T) {
 func TestRunningOutput_TagExcludeNoMatch(t *testing.T) {
 	conf := &OutputConfig{
 		Filter: Filter{
-
 			TagExclude: []string{"nothing*"},
 		},
 	}
@@ -185,7 +179,7 @@ func TestRunningOutput_TagExcludeNoMatch(t *testing.T) {
 	m := &mockOutput{}
 	ro := NewRunningOutput("test", m, conf, 1000, 10000)

-	ro.AddMetric(first5[0])
+	ro.AddMetric(testutil.TestMetric(101, "metric1"))
 	assert.Len(t, m.Metrics(), 0)

 	err := ro.Write()
@@ -198,7 +192,6 @@ func TestRunningOutput_TagExcludeNoMatch(t *testing.T) {
 func TestRunningOutput_TagIncludeMatch(t *testing.T) {
 	conf := &OutputConfig{
 		Filter: Filter{
-
 			TagInclude: []string{"tag*"},
 		},
 	}
@@ -207,7 +200,7 @@ func TestRunningOutput_TagIncludeMatch(t *testing.T) {
 	m := &mockOutput{}
 	ro := NewRunningOutput("test", m, conf, 1000, 10000)

-	ro.AddMetric(first5[0])
+	ro.AddMetric(testutil.TestMetric(101, "metric1"))
 	assert.Len(t, m.Metrics(), 0)

 	err := ro.Write()
--- a/internal/models/running_processor.go
+++ b/internal/models/running_processor.go
@@ -0,0 +1,44 @@
+package models
+
+import (
+	"github.com/influxdata/telegraf"
+)
+
+type RunningProcessor struct {
+	Name      string
+	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 {
+	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
@@ -0,0 +1,117 @@
+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
@@ -4,6 +4,7 @@ import (
 	"io"
 	"log"
 	"os"
+	"time"

 	"github.com/influxdata/wlog"
 )
@@ -19,17 +20,18 @@ type telegrafLog struct {
 	writer io.Writer
 }

-func (t *telegrafLog) Write(p []byte) (n int, err error) {
-	return t.writer.Write(p)
+func (t *telegrafLog) Write(b []byte) (n int, err error) {
+	return t.writer.Write(append([]byte(time.Now().UTC().Format(time.RFC3339)+" "), b...))
 }

 // 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 stdout. If there is an error opening the file the
-//           logger will fallback to stdout.
+//           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)
 	}
@@ -41,17 +43,17 @@ func SetupLogging(debug, quiet bool, logfile string) {
 	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 stdout", logfile, err)
-				oFile = os.Stdout
+				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 stdout", logfile, err)
-				oFile = os.Stdout
+				log.Printf("E! Unable to append to %s (%s), using stderr", logfile, err)
+				oFile = os.Stderr
 			}
 		}
 	} else {
-		oFile = os.Stdout
+		oFile = os.Stderr
 	}

 	log.SetOutput(newTelegrafWriter(oFile))
--- a/logger/logger_test.go
+++ b/logger/logger_test.go
@@ -0,0 +1,62 @@
+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 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
@@ -3,6 +3,7 @@ package telegraf
 import (
 	"time"

+	// TODO remove
 	"github.com/influxdata/influxdb/client/v2"
 )

@@ -18,128 +19,44 @@ const (
 )

 type Metric interface {
-	// Name returns the measurement name of the metric
+	Serialize() []byte
+	String() string // convenience function for string(Serialize())
+	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() string
-
-	// Name returns the tags associated with the metric
 	Tags() map[string]string
-
-	// Time return the timestamp for the metric
-	Time() time.Time
-
-	// Type returns the metric type. Can be either telegraf.Gauge or telegraf.Counter
-	Type() ValueType
-
-	// UnixNano returns the unix nano time of the metric
-	UnixNano() int64
-
-	// Fields returns the fields for the metric
 	Fields() map[string]interface{}
+	Time() time.Time
+	UnixNano() int64
+	Type() ValueType
+	Len() int // returns the length of the serialized metric, including newline
+	HashID() uint64

-	// 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
+	// aggregator things:
+	SetAggregate(bool)
+	IsAggregate() bool

 	// Point returns a influxdb client.Point object
+	// TODO remove this function
 	Point() *client.Point
 }
-
-// metric is a wrapper of the influxdb client.Point struct
-type metric struct {
-	pt *client.Point
-
-	mType ValueType
-}
-
-// NewMetric returns an untyped metric.
-func NewMetric(
-	name string,
-	tags map[string]string,
-	fields map[string]interface{},
-	t time.Time,
-) (Metric, error) {
-	pt, err := client.NewPoint(name, tags, fields, t)
-	if err != nil {
-		return nil, err
-	}
-	return &metric{
-		pt:    pt,
-		mType: Untyped,
-	}, nil
-}
-
-// NewGaugeMetric returns a gauge metric.
-// Gauge metrics should be used when the metric is can arbitrarily go up and
-// down. ie, temperature, memory usage, cpu usage, etc.
-func NewGaugeMetric(
-	name string,
-	tags map[string]string,
-	fields map[string]interface{},
-	t time.Time,
-) (Metric, error) {
-	pt, err := client.NewPoint(name, tags, fields, t)
-	if err != nil {
-		return nil, err
-	}
-	return &metric{
-		pt:    pt,
-		mType: Gauge,
-	}, nil
-}
-
-// NewCounterMetric returns a Counter metric.
-// Counter metrics should be used when the metric being created is an
-// always-increasing counter. ie, net bytes received, requests served, errors, etc.
-func NewCounterMetric(
-	name string,
-	tags map[string]string,
-	fields map[string]interface{},
-	t time.Time,
-) (Metric, error) {
-	pt, err := client.NewPoint(name, tags, fields, t)
-	if err != nil {
-		return nil, err
-	}
-	return &metric{
-		pt:    pt,
-		mType: Counter,
-	}, 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) Type() ValueType {
-	return m.mType
-}
-
-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
@@ -0,0 +1,49 @@
+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
@@ -0,0 +1,38 @@
+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
@@ -0,0 +1,103 @@
+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
@@ -0,0 +1,546 @@
+package metric
+
+import (
+	"bytes"
+	"fmt"
+	"hash/fnv"
+	"sort"
+	"strconv"
+	"time"
+
+	"github.com/influxdata/telegraf"
+
+	// TODO remove
+	"github.com/influxdata/influxdb/client/v2"
+)
+
+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(fields) == 0 {
+		return nil, fmt.Errorf("Metric cannot be made without any fields")
+	}
+	if len(name) == 0 {
+		return nil, fmt.Errorf("Metric cannot be made with an empty 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 {
+		// TODO check that length of tag key & value are > 0
+		taglen += 2 + len(escape(k, "tagkey")) + len(escape(v, "tagval"))
+	}
+	m.tags = make([]byte, taglen)
+
+	i := 0
+	for k, v := range tags {
+		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 {
+		// 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. 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 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) Point() *client.Point {
+	c, _ := client.NewPoint(m.Name(), m.Tags(), m.Fields(), m.Time())
+	return c
+}
+
+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) 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 = indexUnescapedByte(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
@@ -0,0 +1,148 @@
+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
@@ -0,0 +1,646 @@
+package metric
+
+import (
+	"fmt"
+	"math"
+	"regexp"
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf"
+
+	"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 := 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, m.Time())
+	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",
+	}
+	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: 5,
+		},
+		{
+			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, m.Time())
+	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, m.Time())
+	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, 4)
+}
+
+// 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 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 TestNewMetricPoint(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)
+
+	p := m.Point()
+
+	assert.Equal(t, fields, m.Fields())
+	assert.Equal(t, fields, p.Fields())
+	assert.Equal(t, "cpu", p.Name())
+}
+
+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)
+}
--- a/metric/parse.go
+++ b/metric/parse.go
@@ -0,0 +1,627 @@
+package metric
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"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 ParseWithDefaultTime(buf, time.Now())
+}
+
+func ParseWithDefaultTime(buf []byte, t time.Time) ([]telegraf.Metric, error) {
+	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)
+		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) (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
+	}
+
+	m := &metric{
+		fields: fields,
+		t:      ts,
+	}
+
+	// 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
+	quoted := false
+
+	// 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 {
+			quoted = !quoted
+			i++
+			continue
+		}
+
+		// If we see an =, ensure that there is at least on char before and after it
+		if buf[i] == '=' && !quoted {
+			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] == ',' && !quoted {
+			commas++
+		}
+
+		// reached end of block?
+		if buf[i] == ' ' && !quoted {
+			break
+		}
+		i++
+	}
+
+	if quoted {
+		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 that the error occured.
+//   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)
+}
--- a/metric/parse_test.go
+++ b/metric/parse_test.go
@@ -0,0 +1,355 @@
+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"
+`
+
+// 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 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 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_test.go
+++ b/metric_test.go
@@ -1,111 +0,0 @@
-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, 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, m.Time())
-	assert.Equal(t, now.UnixNano(), m.UnixNano())
-}
-
-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 := NewGaugeMetric("cpu", tags, fields, now)
-	assert.NoError(t, err)
-
-	assert.Equal(t, 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, m.Time())
-	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 := NewCounterMetric("cpu", tags, fields, now)
-	assert.NoError(t, err)
-
-	assert.Equal(t, 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, 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 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
@@ -0,0 +1,5 @@
+package all
+
+import (
+	_ "github.com/influxdata/telegraf/plugins/aggregators/minmax"
+)
--- a/plugins/aggregators/minmax/README.md
+++ b/plugins/aggregators/minmax/README.md
@@ -0,0 +1,42 @@
+# 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
@@ -0,0 +1,119 @@
+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
@@ -0,0 +1,162 @@
+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
@@ -0,0 +1,11 @@
+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/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -27,10 +27,12 @@ import (
 	_ "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/ipmi_sensor"
 	_ "github.com/influxdata/telegraf/plugins/inputs/iptables"
 	_ "github.com/influxdata/telegraf/plugins/inputs/jolokia"
 	_ "github.com/influxdata/telegraf/plugins/inputs/kafka_consumer"
+	_ "github.com/influxdata/telegraf/plugins/inputs/kubernetes"
 	_ "github.com/influxdata/telegraf/plugins/inputs/leofs"
 	_ "github.com/influxdata/telegraf/plugins/inputs/logparser"
 	_ "github.com/influxdata/telegraf/plugins/inputs/lustre2"
--- a/plugins/inputs/apache/README.md
+++ b/plugins/inputs/apache/README.md
@@ -2,6 +2,16 @@

 #### Plugin arguments:
 - **urls** []string: List of apache-status URLs to collect from. Default is "http://localhost/server-status?auto".
+- **username** string: Username for HTTP basic authentication
+- **password** string: Password for HTTP basic authentication
+- **timeout** duration: time that the HTTP connection will remain waiting for response. Defalt 4 seconds ("4s")
+
+##### Optional SSL Config
+
+- **ssl_ca** string: the full path for the SSL CA certicate
+- **ssl_cert** string: the full path for the SSL certificate
+- **ssl_key** string: the full path for the key file
+- **insecure_skip_verify** bool: if true HTTP client will skip all SSL verifications related to peer and host. Default to false

 #### Description

--- a/plugins/inputs/apache/apache.go
+++ b/plugins/inputs/apache/apache.go
@@ -11,17 +11,42 @@ import (
 	"time"

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

 type Apache struct {
-	Urls []string
+	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
 }

 var sampleConfig = `
  ## An array of Apache status URI to gather stats.
  ## Default is "http://localhost/server-status?auto".
  urls = ["http://localhost/server-status?auto"]
+  ## user credentials for basic HTTP authentication
+  username = "myuser"
+  password = "mypassword"
+
+  ## Timeout to the complete conection and reponse time in seconds
+  response_timeout = "25s" ## default to 5 seconds
+
+  ## 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 {
@@ -36,6 +61,9 @@ 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
+	}

 	var outerr error
 	var errch = make(chan error)
@@ -61,21 +89,46 @@ func (n *Apache) Gather(acc telegraf.Accumulator) error {
 	return outerr
 }

-var tr = &http.Transport{
-	ResponseHeaderTimeout: time.Duration(3 * time.Second),
-}
-
-var client = &http.Client{
-	Transport: tr,
-	Timeout:   time.Duration(4 * time.Second),
-}
-
 func (n *Apache) gatherUrl(addr *url.URL, acc telegraf.Accumulator) error {
-	resp, err := client.Get(addr.String())
+
+	var tr *http.Transport
+
+	if addr.Scheme == "https" {
+		tlsCfg, err := internal.GetTLSConfig(
+			n.SSLCert, n.SSLKey, n.SSLCA, n.InsecureSkipVerify)
+		if err != nil {
+			return err
+		}
+		tr = &http.Transport{
+			ResponseHeaderTimeout: time.Duration(3 * time.Second),
+			TLSClientConfig:       tlsCfg,
+		}
+	} else {
+		tr = &http.Transport{
+			ResponseHeaderTimeout: time.Duration(3 * time.Second),
+		}
+	}
+
+	client := &http.Client{
+		Transport: tr,
+		Timeout:   n.ResponseTimeout.Duration,
+	}
+
+	req, err := http.NewRequest("GET", addr.String(), nil)
 	if err != nil {
-		return fmt.Errorf("error making HTTP request to %s: %s", addr.String(), err)
+		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 := client.Do(req)
+	if err != nil {
+		return fmt.Errorf("error on request to %s : %s\n", 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/cassandra/README.md
+++ b/plugins/inputs/cassandra/README.md
@@ -7,7 +7,7 @@

 #### Description

-The Cassandra plugin collects Cassandra/JVM metrics exposed as MBean's attributes through jolokia REST endpoint. All metrics are collected for each server configured.
+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)

@@ -38,9 +38,9 @@ Here is a list of metrics that might be useful to monitor your cassandra cluster

 ####measurement = javaGarbageCollector

- /java.lang:type=GarbageCollector,name=ConcurrentMarkSweep/CollectionTime       
+- /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/CollectionTime
 - /java.lang:type=GarbageCollector,name=ParNew/CollectionCount

 ####measurement = javaMemory
@@ -50,13 +50,13 @@ Here is a list of metrics that might be useful to monitor your cassandra cluster

 ####measurement = cassandraCache

- /org.apache.cassandra.metrics:type=Cache,scope=KeyCache,name=Hit
+- /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=Hit
- /org.apache.cassandra.metrics:type=Cache,scope=RowCache,name=Requests     
+- /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
@@ -67,33 +67,33 @@ Here is a list of metrics that might be useful to monitor your cassandra cluster

 ####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=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 
+- /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=PendingTasks
 - /org.apache.cassandra.metrics:type=CommitLog,name=TotalCommitLogSize

 ####measurement = cassandraCompaction

- /org.apache.cassandra.metrics:type=Compaction,name=CompletedTask
- /org.apache.cassandra.metrics:type=Compaction,name=PendingTasks    
+- /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 
+-  /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.
@@ -101,25 +101,25 @@ Using wildcards for "keyspace" and "scope" can create a lot of series as metrics
 - /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              
+- /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=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=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=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 
+- /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
@@ -289,7 +289,6 @@ func (c *Cassandra) Gather(acc telegraf.Accumulator) error {
 				requestUrl.User = url.UserPassword(serverTokens["user"],
 					serverTokens["passwd"])
 			}
-			fmt.Printf("host %s url %s\n", serverTokens["host"], requestUrl)

 			out, err := c.getAttr(requestUrl)
 			if out["status"] != 200.0 {
--- a/plugins/inputs/ceph/README.md
+++ b/plugins/inputs/ceph/README.md
@@ -82,7 +82,7 @@ the cluster.  The currently supported commands are:

  ## Whether to gather statistics via ceph commands, requires ceph_user and ceph_config
  ## to be specified
-  gather_cluster_stats = true
+  gather_cluster_stats = false
 ```

 ### Measurements & Fields:
--- a/plugins/inputs/ceph/ceph.go
+++ b/plugins/inputs/ceph/ceph.go
@@ -68,7 +68,7 @@ var sampleConfig = `
  gather_admin_socket_stats = true

  ## Whether to gather statistics via ceph commands
-  gather_cluster_stats = true
+  gather_cluster_stats = false
 `

 func (c *Ceph) SampleConfig() string {
--- a/plugins/inputs/cgroup/README.md
+++ b/plugins/inputs/cgroup/README.md
@@ -2,6 +2,10 @@

 This input plugin will capture specific statistics per cgroup.

+Consider restricting paths to the set of cgroups you really
+want to monitor if you have a large number of cgroups, to avoid
+any cardinality issues.
+
 Following file formats are supported:

 * Single value
@@ -33,9 +37,8 @@ KEY1 VAL1\n

 ### Tags:

-Measurements don't have any specific tags unless you define them at the telegraf level (defaults). We
-used to have the path listed as a tag, but to keep cardinality in check it's easier to move this 
-value to a field. Thanks @sebito91!
+All measurements have the following tags:
+  - path


 ### Configuration:
--- a/plugins/inputs/cgroup/cgroup.go
+++ b/plugins/inputs/cgroup/cgroup.go
@@ -11,15 +11,18 @@ type CGroup struct {
 }

 var sampleConfig = `
-    ## Directories in which to look for files, globs are supported.
-	# paths = [
-	#   "/cgroup/memory",
-	#   "/cgroup/memory/child1",
-	#   "/cgroup/memory/child2/*",
-	# ]
-	## cgroup stat fields, as file names, globs are supported.
-	## these file names are appended to each path from above.
-	# files = ["memory.*usage*", "memory.limit_in_bytes"]
+  ## Directories in which to look for files, globs are supported.
+  ## Consider restricting paths to the set of cgroups you really
+  ## want to monitor if you have a large number of cgroups, to avoid
+  ## any cardinality issues.
+  # paths = [
+  #   "/cgroup/memory",
+  #   "/cgroup/memory/child1",
+  #   "/cgroup/memory/child2/*",
+  # ]
+  ## cgroup stat fields, as file names, globs are supported.
+  ## these file names are appended to each path from above.
+  # files = ["memory.*usage*", "memory.limit_in_bytes"]
 `

 func (g *CGroup) SampleConfig() string {
--- a/plugins/inputs/cgroup/cgroup_linux.go
+++ b/plugins/inputs/cgroup/cgroup_linux.go
@@ -56,9 +56,10 @@ func (g *CGroup) gatherDir(dir string, acc telegraf.Accumulator) error {
 			return err
 		}
 	}
-	fields["path"] = dir

-	acc.AddFields(metricName, fields, nil)
+	tags := map[string]string{"path": dir}
+
+	acc.AddFields(metricName, fields, tags)

 	return nil
 }
--- a/plugins/inputs/cgroup/cgroup_test.go
+++ b/plugins/inputs/cgroup/cgroup_test.go
@@ -3,13 +3,10 @@
 package cgroup

 import (
-	"fmt"
 	"testing"

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

 var cg1 = &CGroup{
@@ -24,32 +21,15 @@ var cg1 = &CGroup{
 	},
 }

-func assertContainsFields(a *testutil.Accumulator, t *testing.T, measurement string, fieldSet []map[string]interface{}) {
-	a.Lock()
-	defer a.Unlock()
-
-	numEquals := 0
-	for _, p := range a.Metrics {
-		if p.Measurement == measurement {
-			for _, fields := range fieldSet {
-				if reflect.DeepEqual(fields, p.Fields) {
-					numEquals++
-				}
-			}
-		}
-	}
-
-	if numEquals != len(fieldSet) {
-		assert.Fail(t, fmt.Sprintf("only %d of %d are equal", numEquals, len(fieldSet)))
-	}
-}
-
 func TestCgroupStatistics_1(t *testing.T) {
 	var acc testutil.Accumulator

 	err := cg1.Gather(&acc)
 	require.NoError(t, err)

+	tags := map[string]string{
+		"path": "testdata/memory",
+	}
 	fields := map[string]interface{}{
 		"memory.stat.cache":           1739362304123123123,
 		"memory.stat.rss":             1775325184,
@@ -62,9 +42,8 @@ func TestCgroupStatistics_1(t *testing.T) {
 		"memory.limit_in_bytes":       223372036854771712,
 		"memory.use_hierarchy":        "12-781",
 		"notify_on_release":           0,
-		"path":                        "testdata/memory",
 	}
-	assertContainsFields(&acc, t, "cgroup", []map[string]interface{}{fields})
+	acc.AssertContainsTaggedFields(t, "cgroup", fields, tags)
 }

 // ======================================================================
@@ -80,14 +59,16 @@ func TestCgroupStatistics_2(t *testing.T) {
 	err := cg2.Gather(&acc)
 	require.NoError(t, err)

+	tags := map[string]string{
+		"path": "testdata/cpu",
+	}
 	fields := map[string]interface{}{
 		"cpuacct.usage_percpu.0": -1452543795404,
 		"cpuacct.usage_percpu.1": 1376681271659,
 		"cpuacct.usage_percpu.2": 1450950799997,
 		"cpuacct.usage_percpu.3": -1473113374257,
-		"path": "testdata/cpu",
 	}
-	assertContainsFields(&acc, t, "cgroup", []map[string]interface{}{fields})
+	acc.AssertContainsTaggedFields(t, "cgroup", fields, tags)
 }

 // ======================================================================
@@ -103,16 +84,18 @@ func TestCgroupStatistics_3(t *testing.T) {
 	err := cg3.Gather(&acc)
 	require.NoError(t, err)

+	tags := map[string]string{
+		"path": "testdata/memory/group_1",
+	}
 	fields := map[string]interface{}{
 		"memory.limit_in_bytes": 223372036854771712,
-		"path":                  "testdata/memory/group_1",
 	}
+	acc.AssertContainsTaggedFields(t, "cgroup", fields, tags)

-	fieldsTwo := map[string]interface{}{
-		"memory.limit_in_bytes": 223372036854771712,
-		"path":                  "testdata/memory/group_2",
+	tags = map[string]string{
+		"path": "testdata/memory/group_2",
 	}
-	assertContainsFields(&acc, t, "cgroup", []map[string]interface{}{fields, fieldsTwo})
+	acc.AssertContainsTaggedFields(t, "cgroup", fields, tags)
 }

 // ======================================================================
@@ -128,22 +111,23 @@ func TestCgroupStatistics_4(t *testing.T) {
 	err := cg4.Gather(&acc)
 	require.NoError(t, err)

+	tags := map[string]string{
+		"path": "testdata/memory/group_1/group_1_1",
+	}
 	fields := map[string]interface{}{
 		"memory.limit_in_bytes": 223372036854771712,
-		"path":                  "testdata/memory/group_1/group_1_1",
 	}
+	acc.AssertContainsTaggedFields(t, "cgroup", fields, tags)

-	fieldsTwo := map[string]interface{}{
-		"memory.limit_in_bytes": 223372036854771712,
-		"path":                  "testdata/memory/group_1/group_1_2",
+	tags = map[string]string{
+		"path": "testdata/memory/group_1/group_1_2",
 	}
+	acc.AssertContainsTaggedFields(t, "cgroup", fields, tags)

-	fieldsThree := map[string]interface{}{
-		"memory.limit_in_bytes": 223372036854771712,
-		"path":                  "testdata/memory/group_2",
+	tags = map[string]string{
+		"path": "testdata/memory/group_2",
 	}
-
-	assertContainsFields(&acc, t, "cgroup", []map[string]interface{}{fields, fieldsTwo, fieldsThree})
+	acc.AssertContainsTaggedFields(t, "cgroup", fields, tags)
 }

 // ======================================================================
@@ -159,16 +143,18 @@ func TestCgroupStatistics_5(t *testing.T) {
 	err := cg5.Gather(&acc)
 	require.NoError(t, err)

+	tags := map[string]string{
+		"path": "testdata/memory/group_1/group_1_1",
+	}
 	fields := map[string]interface{}{
 		"memory.limit_in_bytes": 223372036854771712,
-		"path":                  "testdata/memory/group_1/group_1_1",
 	}
+	acc.AssertContainsTaggedFields(t, "cgroup", fields, tags)

-	fieldsTwo := map[string]interface{}{
-		"memory.limit_in_bytes": 223372036854771712,
-		"path":                  "testdata/memory/group_2/group_1_1",
+	tags = map[string]string{
+		"path": "testdata/memory/group_2/group_1_1",
 	}
-	assertContainsFields(&acc, t, "cgroup", []map[string]interface{}{fields, fieldsTwo})
+	acc.AssertContainsTaggedFields(t, "cgroup", fields, tags)
 }

 // ======================================================================
@@ -184,11 +170,13 @@ func TestCgroupStatistics_6(t *testing.T) {
 	err := cg6.Gather(&acc)
 	require.NoError(t, err)

+	tags := map[string]string{
+		"path": "testdata/memory",
+	}
 	fields := map[string]interface{}{
 		"memory.usage_in_bytes":      3513667584,
 		"memory.use_hierarchy":       "12-781",
 		"memory.kmem.limit_in_bytes": 9223372036854771712,
-		"path": "testdata/memory",
 	}
-	assertContainsFields(&acc, t, "cgroup", []map[string]interface{}{fields})
+	acc.AssertContainsTaggedFields(t, "cgroup", fields, tags)
 }
--- a/plugins/inputs/chrony/chrony.go
+++ b/plugins/inputs/chrony/chrony.go
@@ -103,9 +103,13 @@ func processChronycOutput(out string) (map[string]interface{}, map[string]string
 			tags["stratum"] = valueFields[0]
 			continue
 		}
+		if strings.Contains(strings.ToLower(name), "reference_id") {
+			tags["reference_id"] = valueFields[0]
+			continue
+		}
 		value, err := strconv.ParseFloat(valueFields[0], 64)
 		if err != nil {
-			tags[name] = strings.ToLower(valueFields[0])
+			tags[name] = strings.ToLower(strings.Join(valueFields, " "))
 			continue
 		}
 		if strings.Contains(stats[1], "slow") {
--- a/plugins/inputs/chrony/chrony_test.go
+++ b/plugins/inputs/chrony/chrony_test.go
@@ -27,7 +27,7 @@ func TestGather(t *testing.T) {

 	tags := map[string]string{
 		"reference_id": "192.168.1.22",
-		"leap_status":  "normal",
+		"leap_status":  "not synchronized",
 		"stratum":      "3",
 	}
 	fields := map[string]interface{}{
@@ -85,7 +85,7 @@ Skew            : 0.006 ppm
 Root delay      : 0.001655 seconds
 Root dispersion : 0.003307 seconds
 Update interval : 507.2 seconds
-Leap status     : Normal
+Leap status     : Not synchronized
 `

 	args := os.Args
--- a/plugins/inputs/cloudwatch/README.md
+++ b/plugins/inputs/cloudwatch/README.md
@@ -18,21 +18,28 @@ API endpoint. In the following order the plugin will attempt to authenticate.
 ```toml
 [[inputs.cloudwatch]]
  ## Amazon Region (required)
-  region = 'us-east-1'
+  region = "us-east-1"

+  # The minimum period for Cloudwatch metrics is 1 minute (60s). However not all
+  # metrics are made available to the 1 minute period. Some are collected at
+  # 3 minute and 5 minutes intervals. See https://aws.amazon.com/cloudwatch/faqs/#monitoring.
+  # Note that if a period is configured that is smaller than the minimum for a
+  # particular metric, that metric will not be returned by the Cloudwatch API
+  # and will not be collected by Telegraf.
+  #
  ## Requested CloudWatch aggregation Period (required - must be a multiple of 60s)
-  period = '1m'
+  period = "5m"

  ## Collection Delay (required - must account for metrics availability via CloudWatch API)
-  delay = '1m'
+  delay = "5m"

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

  ## Metric Statistic Namespace (required)
-  namespace = 'AWS/ELB'
+  namespace = "AWS/ELB"

  ## Maximum requests per second. Note that the global default AWS rate limit is
  ## 10 reqs/sec, so if you define multiple namespaces, these should add up to a
@@ -43,16 +50,16 @@ API endpoint. In the following order the plugin will attempt to authenticate.
  ## Defaults to all Metrics in Namespace if nothing is provided
  ## Refreshes Namespace available metrics every 1h
  [[inputs.cloudwatch.metrics]]
-    names = ['Latency', 'RequestCount']
+    names = ["Latency", "RequestCount"]

    ## Dimension filters for Metric (optional)
    [[inputs.cloudwatch.metrics.dimensions]]
-      name = 'LoadBalancerName'
-      value = 'p-example'
+      name = "LoadBalancerName"
+      value = "p-example"

    [[inputs.cloudwatch.metrics.dimensions]]
-      name = 'AvailabilityZone'
-      value = '*'
+      name = "AvailabilityZone"
+      value = "*"
 ```
 #### Requirements and Terminology

@@ -71,16 +78,16 @@ wildcard dimension is ignored.
 Example:
 ```
 [[inputs.cloudwatch.metrics]]
-  names = ['Latency']
+  names = ["Latency"]

  ## Dimension filters for Metric (optional)
  [[inputs.cloudwatch.metrics.dimensions]]
-    name = 'LoadBalancerName'
-    value = 'p-example'
+    name = "LoadBalancerName"
+    value = "p-example"

  [[inputs.cloudwatch.metrics.dimensions]]
-    name = 'AvailabilityZone'
-    value = '*'
+    name = "AvailabilityZone"
+    value = "*"
 ```

 If the following ELBs are available:
--- a/plugins/inputs/cloudwatch/cloudwatch.go
+++ b/plugins/inputs/cloudwatch/cloudwatch.go
@@ -63,7 +63,7 @@ type (
 func (c *CloudWatch) SampleConfig() string {
 	return `
  ## Amazon Region
-  region = 'us-east-1'
+  region = "us-east-1"

  ## Amazon Credentials
  ## Credentials are loaded in the following order
@@ -80,22 +80,29 @@ func (c *CloudWatch) SampleConfig() string {
  #profile = ""
  #shared_credential_file = ""

+  # The minimum period for Cloudwatch metrics is 1 minute (60s). However not all
+  # metrics are made available to the 1 minute period. Some are collected at
+  # 3 minute and 5 minutes intervals. See https://aws.amazon.com/cloudwatch/faqs/#monitoring.
+  # Note that if a period is configured that is smaller than the minimum for a
+  # particular metric, that metric will not be returned by the Cloudwatch API
+  # and will not be collected by Telegraf.
+  #
  ## Requested CloudWatch aggregation Period (required - must be a multiple of 60s)
-  period = '1m'
+  period = "5m"

  ## Collection Delay (required - must account for metrics availability via CloudWatch API)
-  delay = '1m'
+  delay = "5m"

  ## Recomended: use metric 'interval' that is a multiple of 'period' to avoid
  ## gaps or overlap in pulled data
-  interval = '1m'
+  interval = "5m"

  ## Configure the TTL for the internal cache of metrics.
  ## Defaults to 1 hr if not specified
-  #cache_ttl = '10m'
+  #cache_ttl = "10m"

  ## Metric Statistic Namespace (required)
-  namespace = 'AWS/ELB'
+  namespace = "AWS/ELB"

  ## Maximum requests per second. Note that the global default AWS rate limit is
  ## 10 reqs/sec, so if you define multiple namespaces, these should add up to a
@@ -106,12 +113,12 @@ func (c *CloudWatch) SampleConfig() string {
  ## Defaults to all Metrics in Namespace if nothing is provided
  ## Refreshes Namespace available metrics every 1h
  #[[inputs.cloudwatch.metrics]]
-  #  names = ['Latency', 'RequestCount']
+  #  names = ["Latency", "RequestCount"]
  #
  #  ## Dimension filters for Metric (optional)
  #  [[inputs.cloudwatch.metrics.dimensions]]
-  #    name = 'LoadBalancerName'
-  #    value = 'p-example'
+  #    name = "LoadBalancerName"
+  #    value = "p-example"
 `
 }

@@ -119,11 +126,7 @@ func (c *CloudWatch) Description() string {
 	return "Pull Metric Statistics from Amazon CloudWatch"
 }

-func (c *CloudWatch) Gather(acc telegraf.Accumulator) error {
-	if c.client == nil {
-		c.initializeCloudWatch()
-	}
-
+func SelectMetrics(c *CloudWatch) ([]*cloudwatch.Metric, error) {
 	var metrics []*cloudwatch.Metric

 	// check for provided metric filter
@@ -133,7 +136,6 @@ func (c *CloudWatch) Gather(acc telegraf.Accumulator) error {
 			if !hasWilcard(m.Dimensions) {
 				dimensions := make([]*cloudwatch.Dimension, len(m.Dimensions))
 				for k, d := range m.Dimensions {
-					fmt.Printf("Dimension [%s]:[%s]\n", d.Name, d.Value)
 					dimensions[k] = &cloudwatch.Dimension{
 						Name:  aws.String(d.Name),
 						Value: aws.String(d.Value),
@@ -149,11 +151,11 @@ func (c *CloudWatch) Gather(acc telegraf.Accumulator) error {
 			} else {
 				allMetrics, err := c.fetchNamespaceMetrics()
 				if err != nil {
-					return err
+					return nil, err
 				}
 				for _, name := range m.MetricNames {
 					for _, metric := range allMetrics {
-						if isSelected(metric, m.Dimensions) {
+						if isSelected(name, metric, m.Dimensions) {
 							metrics = append(metrics, &cloudwatch.Metric{
 								Namespace:  aws.String(c.Namespace),
 								MetricName: aws.String(name),
@@ -163,16 +165,26 @@ func (c *CloudWatch) Gather(acc telegraf.Accumulator) error {
 					}
 				}
 			}
-
 		}
 	} else {
 		var err error
 		metrics, err = c.fetchNamespaceMetrics()
 		if err != nil {
-			return err
+			return nil, err
 		}
 	}
+	return metrics, nil
+}

+func (c *CloudWatch) Gather(acc telegraf.Accumulator) error {
+	if c.client == nil {
+		c.initializeCloudWatch()
+	}
+
+	metrics, err := SelectMetrics(c)
+	if err != nil {
+		return err
+	}
 	metricCount := len(metrics)
 	errChan := errchan.New(metricCount)

@@ -229,13 +241,12 @@ func (c *CloudWatch) initializeCloudWatch() error {
 /*
 * Fetch available metrics for given CloudWatch Namespace
 */
-func (c *CloudWatch) fetchNamespaceMetrics() (metrics []*cloudwatch.Metric, err error) {
+func (c *CloudWatch) fetchNamespaceMetrics() ([]*cloudwatch.Metric, error) {
 	if c.metricCache != nil && c.metricCache.IsValid() {
-		metrics = c.metricCache.Metrics
-		return
+		return c.metricCache.Metrics, nil
 	}

-	metrics = []*cloudwatch.Metric{}
+	metrics := []*cloudwatch.Metric{}

 	var token *string
 	for more := true; more; {
@@ -263,7 +274,7 @@ func (c *CloudWatch) fetchNamespaceMetrics() (metrics []*cloudwatch.Metric, err
 		TTL:     c.CacheTTL.Duration,
 	}

-	return
+	return metrics, nil
 }

 /*
@@ -375,7 +386,10 @@ func hasWilcard(dimensions []*Dimension) bool {
 	return false
 }

-func isSelected(metric *cloudwatch.Metric, dimensions []*Dimension) bool {
+func isSelected(name string, metric *cloudwatch.Metric, dimensions []*Dimension) bool {
+	if name != *metric.MetricName {
+		return false
+	}
 	if len(metric.Dimensions) != len(dimensions) {
 		return false
 	}
--- a/plugins/inputs/cloudwatch/cloudwatch_test.go
+++ b/plugins/inputs/cloudwatch/cloudwatch_test.go
@@ -11,9 +11,9 @@ import (
 	"github.com/stretchr/testify/assert"
 )

-type mockCloudWatchClient struct{}
+type mockGatherCloudWatchClient struct{}

-func (m *mockCloudWatchClient) ListMetrics(params *cloudwatch.ListMetricsInput) (*cloudwatch.ListMetricsOutput, error) {
+func (m *mockGatherCloudWatchClient) ListMetrics(params *cloudwatch.ListMetricsInput) (*cloudwatch.ListMetricsOutput, error) {
 	metric := &cloudwatch.Metric{
 		Namespace:  params.Namespace,
 		MetricName: aws.String("Latency"),
@@ -31,7 +31,7 @@ func (m *mockCloudWatchClient) ListMetrics(params *cloudwatch.ListMetricsInput)
 	return result, nil
 }

-func (m *mockCloudWatchClient) GetMetricStatistics(params *cloudwatch.GetMetricStatisticsInput) (*cloudwatch.GetMetricStatisticsOutput, error) {
+func (m *mockGatherCloudWatchClient) GetMetricStatistics(params *cloudwatch.GetMetricStatisticsInput) (*cloudwatch.GetMetricStatisticsOutput, error) {
 	dataPoint := &cloudwatch.Datapoint{
 		Timestamp:   params.EndTime,
 		Minimum:     aws.Float64(0.1),
@@ -62,7 +62,7 @@ func TestGather(t *testing.T) {
 	}

 	var acc testutil.Accumulator
-	c.client = &mockCloudWatchClient{}
+	c.client = &mockGatherCloudWatchClient{}

 	c.Gather(&acc)

@@ -83,6 +83,94 @@ func TestGather(t *testing.T) {

 }

+type mockSelectMetricsCloudWatchClient struct{}
+
+func (m *mockSelectMetricsCloudWatchClient) ListMetrics(params *cloudwatch.ListMetricsInput) (*cloudwatch.ListMetricsOutput, error) {
+	metrics := []*cloudwatch.Metric{}
+	// 4 metrics are available
+	metricNames := []string{"Latency", "RequestCount", "HealthyHostCount", "UnHealthyHostCount"}
+	// for 3 ELBs
+	loadBalancers := []string{"lb-1", "lb-2", "lb-3"}
+	// in 2 AZs
+	availabilityZones := []string{"us-east-1a", "us-east-1b"}
+	for _, m := range metricNames {
+		for _, lb := range loadBalancers {
+			// For each metric/ELB pair, we get an aggregate value across all AZs.
+			metrics = append(metrics, &cloudwatch.Metric{
+				Namespace:  aws.String("AWS/ELB"),
+				MetricName: aws.String(m),
+				Dimensions: []*cloudwatch.Dimension{
+					&cloudwatch.Dimension{
+						Name:  aws.String("LoadBalancerName"),
+						Value: aws.String(lb),
+					},
+				},
+			})
+			for _, az := range availabilityZones {
+				// We get a metric for each metric/ELB/AZ triplet.
+				metrics = append(metrics, &cloudwatch.Metric{
+					Namespace:  aws.String("AWS/ELB"),
+					MetricName: aws.String(m),
+					Dimensions: []*cloudwatch.Dimension{
+						&cloudwatch.Dimension{
+							Name:  aws.String("LoadBalancerName"),
+							Value: aws.String(lb),
+						},
+						&cloudwatch.Dimension{
+							Name:  aws.String("AvailabilityZone"),
+							Value: aws.String(az),
+						},
+					},
+				})
+			}
+		}
+	}
+
+	result := &cloudwatch.ListMetricsOutput{
+		Metrics: metrics,
+	}
+	return result, nil
+}
+
+func (m *mockSelectMetricsCloudWatchClient) GetMetricStatistics(params *cloudwatch.GetMetricStatisticsInput) (*cloudwatch.GetMetricStatisticsOutput, error) {
+	return nil, nil
+}
+
+func TestSelectMetrics(t *testing.T) {
+	duration, _ := time.ParseDuration("1m")
+	internalDuration := internal.Duration{
+		Duration: duration,
+	}
+	c := &CloudWatch{
+		Region:    "us-east-1",
+		Namespace: "AWS/ELB",
+		Delay:     internalDuration,
+		Period:    internalDuration,
+		RateLimit: 10,
+		Metrics: []*Metric{
+			&Metric{
+				MetricNames: []string{"Latency", "RequestCount"},
+				Dimensions: []*Dimension{
+					&Dimension{
+						Name:  "LoadBalancerName",
+						Value: "*",
+					},
+					&Dimension{
+						Name:  "AvailabilityZone",
+						Value: "*",
+					},
+				},
+			},
+		},
+	}
+	c.client = &mockSelectMetricsCloudWatchClient{}
+	metrics, err := SelectMetrics(c)
+	// We've asked for 2 (out of 4) metrics, over all 3 load balancers in all 2
+	// AZs. We should get 12 metrics.
+	assert.Equal(t, 12, len(metrics))
+	assert.Nil(t, err)
+}
+
 func TestGenerateStatisticsInputParams(t *testing.T) {
 	d := &cloudwatch.Dimension{
 		Name:  aws.String("LoadBalancerName"),
--- a/plugins/inputs/consul/README.md
+++ b/plugins/inputs/consul/README.md
@@ -29,9 +29,9 @@ to query the data. It will not report the [telemetry](https://www.consul.io/docs
 Tags:
 - node: on which node check/service is registered on
 - service_name: name of the service (this is the service name not the service ID)
+- check_id

 Fields:
- check_id
 - check_name
 - service_id
 - status
@@ -41,6 +41,6 @@ Fields:
 ```
 $ telegraf --config ./telegraf.conf -input-filter consul -test
 * Plugin: consul, Collection 1
-> consul_health_checks,host=wolfpit,node=consul-server-node check_id="serfHealth",check_name="Serf Health Status",service_id="",status="passing" 1464698464486439902
-> consul_health_checks,host=wolfpit,node=consul-server-node,service_name=www.example.com check_id="service:www-example-com.test01",check_name="Service 'www.example.com' check",service_id="www-example-com.test01",status="critical" 1464698464486519036
+> consul_health_checks,host=wolfpit,node=consul-server-node,check_id="serfHealth" check_name="Serf Health Status",service_id="",status="passing" 1464698464486439902
+> consul_health_checks,host=wolfpit,node=consul-server-node,service_name=www.example.com,check_id="service:www-example-com.test01" check_name="Service 'www.example.com' check",service_id="www-example-com.test01",status="critical" 1464698464486519036
 ```
--- a/plugins/inputs/consul/consul.go
+++ b/plugins/inputs/consul/consul.go
@@ -95,13 +95,13 @@ func (c *Consul) GatherHealthCheck(acc telegraf.Accumulator, checks []*api.Healt
 		record := make(map[string]interface{})
 		tags := make(map[string]string)

-		record["check_id"] = check.CheckID
 		record["check_name"] = check.Name
 		record["service_id"] = check.ServiceID
 		record["status"] = check.Status

 		tags["node"] = check.Node
 		tags["service_name"] = check.ServiceName
+		tags["check_id"] = check.CheckID

 		acc.AddFields("consul_health_checks", record, tags)
 	}
--- a/plugins/inputs/consul/consul_test.go
+++ b/plugins/inputs/consul/consul_test.go
@@ -22,7 +22,6 @@ var sampleChecks = []*api.HealthCheck{

 func TestGatherHealtCheck(t *testing.T) {
 	expectedFields := map[string]interface{}{
-		"check_id":   "foo.health123",
 		"check_name": "foo.health",
 		"status":     "passing",
 		"service_id": "foo.123",
@@ -31,6 +30,7 @@ func TestGatherHealtCheck(t *testing.T) {
 	expectedTags := map[string]string{
 		"node":         "localhost",
 		"service_name": "foo",
+		"check_id":     "foo.health123",
 	}

 	var acc testutil.Accumulator
--- a/plugins/inputs/docker/docker.go
+++ b/plugins/inputs/docker/docker.go
@@ -221,14 +221,18 @@ func (d *Docker) gatherContainer(
 		cname = strings.TrimPrefix(container.Names[0], "/")
 	}

-	// the image name sometimes has a version part.
-	//   ie, rabbitmq:3-management
-	imageParts := strings.Split(container.Image, ":")
-	imageName := imageParts[0]
+	// the image name sometimes has a version part, or a private repo
+	//   ie, rabbitmq:3-management or docker.someco.net:4443/rabbitmq:3-management
+	imageName := ""
 	imageVersion := "unknown"
-	if len(imageParts) > 1 {
-		imageVersion = imageParts[1]
+	i := strings.LastIndex(container.Image, ":") // index of last ':' character
+	if i > -1 {
+		imageVersion = container.Image[i+1:]
+		imageName = container.Image[:i]
+	} else {
+		imageName = container.Image
 	}
+
 	tags := map[string]string{
 		"engine_host":       d.engine_host,
 		"container_name":    cname,
@@ -364,11 +368,22 @@ func gatherContainerStats(
 				if field == "container_id" {
 					continue
 				}
+
+				var uintV uint64
+				switch v := value.(type) {
+				case uint64:
+					uintV = v
+				case int64:
+					uintV = uint64(v)
+				default:
+					continue
+				}
+
 				_, ok := totalNetworkStatMap[field]
 				if ok {
-					totalNetworkStatMap[field] = totalNetworkStatMap[field].(uint64) + value.(uint64)
+					totalNetworkStatMap[field] = totalNetworkStatMap[field].(uint64) + uintV
 				} else {
-					totalNetworkStatMap[field] = value
+					totalNetworkStatMap[field] = uintV
 				}
 			}
 		}
@@ -487,11 +502,22 @@ func gatherBlockIOMetrics(
 				if field == "container_id" {
 					continue
 				}
+
+				var uintV uint64
+				switch v := value.(type) {
+				case uint64:
+					uintV = v
+				case int64:
+					uintV = uint64(v)
+				default:
+					continue
+				}
+
 				_, ok := totalStatMap[field]
 				if ok {
-					totalStatMap[field] = totalStatMap[field].(uint64) + value.(uint64)
+					totalStatMap[field] = totalStatMap[field].(uint64) + uintV
 				} else {
-					totalStatMap[field] = value
+					totalStatMap[field] = uintV
 				}
 			}
 		}
--- a/plugins/inputs/docker/docker_test.go
+++ b/plugins/inputs/docker/docker_test.go
@@ -340,7 +340,7 @@ func (d FakeDockerClient) ContainerList(octx context.Context, options types.Cont
 	container2 := types.Container{
 		ID:      "b7dfbb9478a6ae55e237d4d74f8bbb753f0817192b5081334dc78476296e2173",
 		Names:   []string{"/etcd2"},
-		Image:   "quay.io/coreos/etcd:v2.2.2",
+		Image:   "quay.io:4443/coreos/etcd:v2.2.2",
 		Command: "/etcd -name etcd2 -advertise-client-urls http://localhost:2379 -listen-client-urls http://0.0.0.0:2379",
 		Created: 1455941933,
 		Status:  "Up 4 hours",
@@ -429,7 +429,7 @@ func TestDockerGatherInfo(t *testing.T) {
 		},
 		map[string]string{
 			"container_name":    "etcd2",
-			"container_image":   "quay.io/coreos/etcd",
+			"container_image":   "quay.io:4443/coreos/etcd",
 			"cpu":               "cpu3",
 			"container_version": "v2.2.2",
 			"engine_host":       "absol",
@@ -477,7 +477,7 @@ func TestDockerGatherInfo(t *testing.T) {
 		map[string]string{
 			"engine_host":       "absol",
 			"container_name":    "etcd2",
-			"container_image":   "quay.io/coreos/etcd",
+			"container_image":   "quay.io:4443/coreos/etcd",
 			"container_version": "v2.2.2",
 		},
 	)
--- a/plugins/inputs/elasticsearch/README.md
+++ b/plugins/inputs/elasticsearch/README.md
@@ -2,7 +2,8 @@

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

 ### Configuration:

@@ -14,13 +15,18 @@ and optionally [cluster](https://www.elastic.co/guide/en/elasticsearch/reference
  ## Timeout for HTTP requests to the elastic search server(s)
  http_timeout = "5s"

-  ## set local to false when you want to read the indices stats from all nodes
-  ## within the cluster
+  ## When local is true (the default), the node will read only its own stats.
+  ## Set local to false when you want to read the node stats from all nodes
+  ## of the cluster. 
  local = true

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

+  ## Set cluster_stats to true when you want to obtain cluster stats from the 
+  ## Master node. 
+  cluster_stats = false
+
  ## Optional SSL Config
  # ssl_ca = "/etc/telegraf/ca.pem"
  # ssl_cert = "/etc/telegraf/cert.pem"
--- a/plugins/inputs/elasticsearch/elasticsearch.go
+++ b/plugins/inputs/elasticsearch/elasticsearch.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"regexp"
 	"sync"
 	"time"

@@ -12,13 +13,18 @@ import (
 	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	jsonparser "github.com/influxdata/telegraf/plugins/parsers/json"
+	"io/ioutil"
+	"strings"
 )

+// mask for masking username/password from error messages
+var mask = regexp.MustCompile(`https?:\/\/\S+:\S+@`)
+
+// Nodestats are always generated, so simply define a constant for these endpoints
 const statsPath = "/_nodes/stats"
 const statsPathLocal = "/_nodes/_local/stats"
-const healthPath = "/_cluster/health"

-type node struct {
+type nodeStat struct {
 	Host       string            `json:"host"`
 	Name       string            `json:"name"`
 	Attributes map[string]string `json:"attributes"`
@@ -58,20 +64,41 @@ type indexHealth struct {
 	UnassignedShards    int    `json:"unassigned_shards"`
 }

+type clusterStats struct {
+	NodeName    string      `json:"node_name"`
+	ClusterName string      `json:"cluster_name"`
+	Status      string      `json:"status"`
+	Indices     interface{} `json:"indices"`
+	Nodes       interface{} `json:"nodes"`
+}
+
+type catMaster struct {
+	NodeID   string `json:"id"`
+	NodeIP   string `json:"ip"`
+	NodeName string `json:"node"`
+}
+
 const sampleConfig = `
  ## specify a list of one or more Elasticsearch servers
+  # you can add username and password to your url to use basic authentication:
+  # servers = ["http://user:pass@localhost:9200"]
  servers = ["http://localhost:9200"]

  ## Timeout for HTTP requests to the elastic search server(s)
  http_timeout = "5s"

-  ## set local to false when you want to read the indices stats from all nodes
-  ## within the cluster
+  ## When local is true (the default), the node will read only its own stats.
+  ## Set local to false when you want to read the node stats from all nodes
+  ## of the cluster.
  local = true

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

+  ## Set cluster_stats to true when you want to also obtain cluster stats from the
+  ## Master node.
+  cluster_stats = false
+
  ## Optional SSL Config
  # ssl_ca = "/etc/telegraf/ca.pem"
  # ssl_cert = "/etc/telegraf/cert.pem"
@@ -83,15 +110,18 @@ const sampleConfig = `
 // Elasticsearch is a plugin to read stats from one or many Elasticsearch
 // servers.
 type Elasticsearch struct {
-	Local              bool
-	Servers            []string
-	HttpTimeout        internal.Duration
-	ClusterHealth      bool
-	SSLCA              string `toml:"ssl_ca"`   // Path to CA file
-	SSLCert            string `toml:"ssl_cert"` // Path to host cert file
-	SSLKey             string `toml:"ssl_key"`  // Path to cert key file
-	InsecureSkipVerify bool   // Use SSL but skip chain & host verification
-	client             *http.Client
+	Local                   bool
+	Servers                 []string
+	HttpTimeout             internal.Duration
+	ClusterHealth           bool
+	ClusterStats            bool
+	SSLCA                   string `toml:"ssl_ca"`   // Path to CA file
+	SSLCert                 string `toml:"ssl_cert"` // Path to host cert file
+	SSLKey                  string `toml:"ssl_key"`  // Path to cert key file
+	InsecureSkipVerify      bool   // Use SSL but skip chain & host verification
+	client                  *http.Client
+	catMasterResponseTokens []string
+	isMaster                bool
 }

 // NewElasticsearch return a new instance of Elasticsearch
@@ -123,7 +153,7 @@ func (e *Elasticsearch) Gather(acc telegraf.Accumulator) error {
 		e.client = client
 	}

-	errChan := errchan.New(len(e.Servers))
+	errChan := errchan.New(len(e.Servers) * 3)
 	var wg sync.WaitGroup
 	wg.Add(len(e.Servers))

@@ -136,12 +166,36 @@ func (e *Elasticsearch) Gather(acc telegraf.Accumulator) error {
 			} else {
 				url = s + statsPath
 			}
+			e.isMaster = false
+
+			if e.ClusterStats {
+				// get cat/master information here so NodeStats can determine
+				// whether this node is the Master
+				e.setCatMaster(s + "/_cat/master")
+			}
+
+			// Always gather node states
 			if err := e.gatherNodeStats(url, acc); err != nil {
+				err = fmt.Errorf(mask.ReplaceAllString(err.Error(), "http(s)://XXX:XXX@"))
 				errChan.C <- err
 				return
 			}
+
 			if e.ClusterHealth {
-				e.gatherClusterStats(fmt.Sprintf("%s/_cluster/health?level=indices", s), acc)
+				url = s + "/_cluster/health?level=indices"
+				if err := e.gatherClusterHealth(url, acc); err != nil {
+					err = fmt.Errorf(mask.ReplaceAllString(err.Error(), "http(s)://XXX:XXX@"))
+					errChan.C <- err
+					return
+				}
+			}
+
+			if e.ClusterStats && e.isMaster {
+				if err := e.gatherClusterStats(s+"/_cluster/stats", acc); err != nil {
+					err = fmt.Errorf(mask.ReplaceAllString(err.Error(), "http(s)://XXX:XXX@"))
+					errChan.C <- err
+					return
+				}
 			}
 		}(serv, acc)
 	}
@@ -169,12 +223,13 @@ func (e *Elasticsearch) createHttpClient() (*http.Client, error) {

 func (e *Elasticsearch) gatherNodeStats(url string, acc telegraf.Accumulator) error {
 	nodeStats := &struct {
-		ClusterName string           `json:"cluster_name"`
-		Nodes       map[string]*node `json:"nodes"`
+		ClusterName string               `json:"cluster_name"`
+		Nodes       map[string]*nodeStat `json:"nodes"`
 	}{}
-	if err := e.gatherData(url, nodeStats); err != nil {
+	if err := e.gatherJsonData(url, nodeStats); err != nil {
 		return err
 	}
+
 	for id, n := range nodeStats.Nodes {
 		tags := map[string]string{
 			"node_id":      id,
@@ -183,6 +238,11 @@ func (e *Elasticsearch) gatherNodeStats(url string, acc telegraf.Accumulator) er
 			"cluster_name": nodeStats.ClusterName,
 		}

+		if e.ClusterStats {
+			// check for master
+			e.isMaster = (id == e.catMasterResponseTokens[0])
+		}
+
 		for k, v := range n.Attributes {
 			tags["node_attribute_"+k] = v
 		}
@@ -202,6 +262,7 @@ func (e *Elasticsearch) gatherNodeStats(url string, acc telegraf.Accumulator) er
 		now := time.Now()
 		for p, s := range stats {
 			f := jsonparser.JSONFlattener{}
+			// parse Json, ignoring strings and bools
 			err := f.FlattenJSON("", s)
 			if err != nil {
 				return err
@@ -212,31 +273,31 @@ func (e *Elasticsearch) gatherNodeStats(url string, acc telegraf.Accumulator) er
 	return nil
 }

-func (e *Elasticsearch) gatherClusterStats(url string, acc telegraf.Accumulator) error {
-	clusterStats := &clusterHealth{}
-	if err := e.gatherData(url, clusterStats); err != nil {
+func (e *Elasticsearch) gatherClusterHealth(url string, acc telegraf.Accumulator) error {
+	healthStats := &clusterHealth{}
+	if err := e.gatherJsonData(url, healthStats); err != nil {
 		return err
 	}
 	measurementTime := time.Now()
 	clusterFields := map[string]interface{}{
-		"status":                clusterStats.Status,
-		"timed_out":             clusterStats.TimedOut,
-		"number_of_nodes":       clusterStats.NumberOfNodes,
-		"number_of_data_nodes":  clusterStats.NumberOfDataNodes,
-		"active_primary_shards": clusterStats.ActivePrimaryShards,
-		"active_shards":         clusterStats.ActiveShards,
-		"relocating_shards":     clusterStats.RelocatingShards,
-		"initializing_shards":   clusterStats.InitializingShards,
-		"unassigned_shards":     clusterStats.UnassignedShards,
+		"status":                healthStats.Status,
+		"timed_out":             healthStats.TimedOut,
+		"number_of_nodes":       healthStats.NumberOfNodes,
+		"number_of_data_nodes":  healthStats.NumberOfDataNodes,
+		"active_primary_shards": healthStats.ActivePrimaryShards,
+		"active_shards":         healthStats.ActiveShards,
+		"relocating_shards":     healthStats.RelocatingShards,
+		"initializing_shards":   healthStats.InitializingShards,
+		"unassigned_shards":     healthStats.UnassignedShards,
 	}
 	acc.AddFields(
 		"elasticsearch_cluster_health",
 		clusterFields,
-		map[string]string{"name": clusterStats.ClusterName},
+		map[string]string{"name": healthStats.ClusterName},
 		measurementTime,
 	)

-	for name, health := range clusterStats.Indices {
+	for name, health := range healthStats.Indices {
 		indexFields := map[string]interface{}{
 			"status":                health.Status,
 			"number_of_shards":      health.NumberOfShards,
@@ -257,7 +318,60 @@ func (e *Elasticsearch) gatherClusterStats(url string, acc telegraf.Accumulator)
 	return nil
 }

-func (e *Elasticsearch) gatherData(url string, v interface{}) error {
+func (e *Elasticsearch) gatherClusterStats(url string, acc telegraf.Accumulator) error {
+	clusterStats := &clusterStats{}
+	if err := e.gatherJsonData(url, clusterStats); err != nil {
+		return err
+	}
+	now := time.Now()
+	tags := map[string]string{
+		"node_name":    clusterStats.NodeName,
+		"cluster_name": clusterStats.ClusterName,
+		"status":       clusterStats.Status,
+	}
+
+	stats := map[string]interface{}{
+		"nodes":   clusterStats.Nodes,
+		"indices": clusterStats.Indices,
+	}
+
+	for p, s := range stats {
+		f := jsonparser.JSONFlattener{}
+		// parse json, including bools and strings
+		err := f.FullFlattenJSON("", s, true, true)
+		if err != nil {
+			return err
+		}
+		acc.AddFields("elasticsearch_clusterstats_"+p, f.Fields, tags, now)
+	}
+
+	return nil
+}
+
+func (e *Elasticsearch) setCatMaster(url string) error {
+	r, err := e.client.Get(url)
+	if err != nil {
+		return err
+	}
+	defer r.Body.Close()
+	if r.StatusCode != http.StatusOK {
+		// NOTE: we are not going to read/discard r.Body under the assumption we'd prefer
+		// to let the underlying transport close the connection and re-establish a new one for
+		// future calls.
+		return fmt.Errorf("status-code %d, expected %d", r.StatusCode, http.StatusOK)
+	}
+	response, err := ioutil.ReadAll(r.Body)
+
+	if err != nil {
+		return err
+	}
+
+	e.catMasterResponseTokens = strings.Split(string(response), " ")
+
+	return nil
+}
+
+func (e *Elasticsearch) gatherJsonData(url string, v interface{}) error {
 	r, err := e.client.Get(url)
 	if err != nil {
 		return err
@@ -270,9 +384,11 @@ func (e *Elasticsearch) gatherData(url string, v interface{}) error {
 		return fmt.Errorf("elasticsearch: API responded with status-code %d, expected %d",
 			r.StatusCode, http.StatusOK)
 	}
+
 	if err = json.NewDecoder(r.Body).Decode(v); err != nil {
 		return err
 	}
+
 	return nil
 }

--- a/plugins/inputs/elasticsearch/elasticsearch_test.go
+++ b/plugins/inputs/elasticsearch/elasticsearch_test.go
@@ -8,6 +8,8 @@ import (

 	"github.com/influxdata/telegraf/testutil"

+	"fmt"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

@@ -37,16 +39,13 @@ func (t *transportMock) RoundTrip(r *http.Request) (*http.Response, error) {
 func (t *transportMock) CancelRequest(_ *http.Request) {
 }

-func TestElasticsearch(t *testing.T) {
-	es := newElasticsearchWithClient()
-	es.Servers = []string{"http://example.com:9200"}
-	es.client.Transport = newTransportMock(http.StatusOK, statsResponse)
-
-	var acc testutil.Accumulator
-	if err := es.Gather(&acc); err != nil {
-		t.Fatal(err)
+func checkIsMaster(es *Elasticsearch, expected bool, t *testing.T) {
+	if es.isMaster != expected {
+		msg := fmt.Sprintf("IsMaster set incorrectly")
+		assert.Fail(t, msg)
 	}
-
+}
+func checkNodeStatsResult(t *testing.T, acc *testutil.Accumulator) {
 	tags := map[string]string{
 		"cluster_name":          "es-testcluster",
 		"node_attribute_master": "true",
@@ -55,25 +54,55 @@ func TestElasticsearch(t *testing.T) {
 		"node_host":             "test",
 	}

-	acc.AssertContainsTaggedFields(t, "elasticsearch_indices", indicesExpected, tags)
-	acc.AssertContainsTaggedFields(t, "elasticsearch_os", osExpected, tags)
-	acc.AssertContainsTaggedFields(t, "elasticsearch_process", processExpected, tags)
-	acc.AssertContainsTaggedFields(t, "elasticsearch_jvm", jvmExpected, tags)
-	acc.AssertContainsTaggedFields(t, "elasticsearch_thread_pool", threadPoolExpected, tags)
-	acc.AssertContainsTaggedFields(t, "elasticsearch_fs", fsExpected, tags)
-	acc.AssertContainsTaggedFields(t, "elasticsearch_transport", transportExpected, tags)
-	acc.AssertContainsTaggedFields(t, "elasticsearch_http", httpExpected, tags)
-	acc.AssertContainsTaggedFields(t, "elasticsearch_breakers", breakersExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_indices", nodestatsIndicesExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_os", nodestatsOsExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_process", nodestatsProcessExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_jvm", nodestatsJvmExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_thread_pool", nodestatsThreadPoolExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_fs", nodestatsFsExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_transport", nodestatsTransportExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_http", nodestatsHttpExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_breakers", nodestatsBreakersExpected, tags)
 }

-func TestGatherClusterStats(t *testing.T) {
+func TestGather(t *testing.T) {
+	es := newElasticsearchWithClient()
+	es.Servers = []string{"http://example.com:9200"}
+	es.client.Transport = newTransportMock(http.StatusOK, nodeStatsResponse)
+
+	var acc testutil.Accumulator
+	if err := es.Gather(&acc); err != nil {
+		t.Fatal(err)
+	}
+
+	checkIsMaster(es, false, t)
+	checkNodeStatsResult(t, &acc)
+}
+
+func TestGatherNodeStats(t *testing.T) {
+	es := newElasticsearchWithClient()
+	es.Servers = []string{"http://example.com:9200"}
+	es.client.Transport = newTransportMock(http.StatusOK, nodeStatsResponse)
+
+	var acc testutil.Accumulator
+	if err := es.gatherNodeStats("junk", &acc); err != nil {
+		t.Fatal(err)
+	}
+
+	checkIsMaster(es, false, t)
+	checkNodeStatsResult(t, &acc)
+}
+
+func TestGatherClusterHealth(t *testing.T) {
 	es := newElasticsearchWithClient()
 	es.Servers = []string{"http://example.com:9200"}
 	es.ClusterHealth = true
-	es.client.Transport = newTransportMock(http.StatusOK, clusterResponse)
+	es.client.Transport = newTransportMock(http.StatusOK, clusterHealthResponse)

 	var acc testutil.Accumulator
-	require.NoError(t, es.Gather(&acc))
+	require.NoError(t, es.gatherClusterHealth("junk", &acc))
+
+	checkIsMaster(es, false, t)

 	acc.AssertContainsTaggedFields(t, "elasticsearch_cluster_health",
 		clusterHealthExpected,
@@ -88,6 +117,77 @@ func TestGatherClusterStats(t *testing.T) {
 		map[string]string{"index": "v2"})
 }

+func TestGatherClusterStatsMaster(t *testing.T) {
+	// This needs multiple steps to replicate the multiple calls internally.
+	es := newElasticsearchWithClient()
+	es.ClusterStats = true
+	es.Servers = []string{"http://example.com:9200"}
+
+	// first get catMaster
+	es.client.Transport = newTransportMock(http.StatusOK, IsMasterResult)
+	require.NoError(t, es.setCatMaster("junk"))
+
+	IsMasterResultTokens := strings.Split(string(IsMasterResult), " ")
+	if es.catMasterResponseTokens[0] != IsMasterResultTokens[0] {
+		msg := fmt.Sprintf("catmaster is incorrect")
+		assert.Fail(t, msg)
+	}
+
+	// now get node status, which determines whether we're master
+	var acc testutil.Accumulator
+	es.Local = true
+	es.client.Transport = newTransportMock(http.StatusOK, nodeStatsResponse)
+	if err := es.gatherNodeStats("junk", &acc); err != nil {
+		t.Fatal(err)
+	}
+
+	checkIsMaster(es, true, t)
+	checkNodeStatsResult(t, &acc)
+
+	// now test the clusterstats method
+	es.client.Transport = newTransportMock(http.StatusOK, clusterStatsResponse)
+	require.NoError(t, es.gatherClusterStats("junk", &acc))
+
+	tags := map[string]string{
+		"cluster_name": "es-testcluster",
+		"node_name":    "test.host.com",
+		"status":       "red",
+	}
+
+	acc.AssertContainsTaggedFields(t, "elasticsearch_clusterstats_nodes", clusterstatsNodesExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_clusterstats_indices", clusterstatsIndicesExpected, tags)
+}
+
+func TestGatherClusterStatsNonMaster(t *testing.T) {
+	// This needs multiple steps to replicate the multiple calls internally.
+	es := newElasticsearchWithClient()
+	es.ClusterStats = true
+	es.Servers = []string{"http://example.com:9200"}
+
+	// first get catMaster
+	es.client.Transport = newTransportMock(http.StatusOK, IsNotMasterResult)
+	require.NoError(t, es.setCatMaster("junk"))
+
+	IsNotMasterResultTokens := strings.Split(string(IsNotMasterResult), " ")
+	if es.catMasterResponseTokens[0] != IsNotMasterResultTokens[0] {
+		msg := fmt.Sprintf("catmaster is incorrect")
+		assert.Fail(t, msg)
+	}
+
+	// now get node status, which determines whether we're master
+	var acc testutil.Accumulator
+	es.Local = true
+	es.client.Transport = newTransportMock(http.StatusOK, nodeStatsResponse)
+	if err := es.gatherNodeStats("junk", &acc); err != nil {
+		t.Fatal(err)
+	}
+
+	// ensure flag is clear so Cluster Stats would not be done
+	checkIsMaster(es, false, t)
+	checkNodeStatsResult(t, &acc)
+
+}
+
 func newElasticsearchWithClient() *Elasticsearch {
 	es := NewElasticsearch()
 	es.client = &http.Client{}
--- a/plugins/inputs/elasticsearch/testdata_test.go
+++ b/plugins/inputs/elasticsearch/testdata_test.go
@@ -1,6 +1,6 @@
 package elasticsearch

-const clusterResponse = `
+const clusterHealthResponse = `
 {
   "cluster_name": "elasticsearch_telegraf",
   "status": "green",
@@ -71,7 +71,7 @@ var v2IndexExpected = map[string]interface{}{
 	"unassigned_shards":     20,
 }

-const statsResponse = `
+const nodeStatsResponse = `
 {
  "cluster_name": "es-testcluster",
  "nodes": {
@@ -489,7 +489,7 @@ const statsResponse = `
 }
 `

-var indicesExpected = map[string]interface{}{
+var nodestatsIndicesExpected = map[string]interface{}{
 	"id_cache_memory_size_in_bytes":             float64(0),
 	"completion_size_in_bytes":                  float64(0),
 	"suggest_total":                             float64(0),
@@ -561,7 +561,7 @@ var indicesExpected = map[string]interface{}{
 	"segments_fixed_bit_set_memory_in_bytes":    float64(0),
 }

-var osExpected = map[string]interface{}{
+var nodestatsOsExpected = map[string]interface{}{
 	"load_average_0":           float64(0.01),
 	"load_average_1":           float64(0.04),
 	"load_average_2":           float64(0.05),
@@ -576,7 +576,7 @@ var osExpected = map[string]interface{}{
 	"mem_used_in_bytes":        float64(1621868544),
 }

-var processExpected = map[string]interface{}{
+var nodestatsProcessExpected = map[string]interface{}{
 	"mem_total_virtual_in_bytes": float64(4747890688),
 	"timestamp":                  float64(1436460392945),
 	"open_file_descriptors":      float64(160),
@@ -586,7 +586,7 @@ var processExpected = map[string]interface{}{
 	"cpu_user_in_millis":         float64(13610),
 }

-var jvmExpected = map[string]interface{}{
+var nodestatsJvmExpected = map[string]interface{}{
 	"timestamp":                                     float64(1436460392945),
 	"uptime_in_millis":                              float64(202245),
 	"mem_non_heap_used_in_bytes":                    float64(39634576),
@@ -621,7 +621,7 @@ var jvmExpected = map[string]interface{}{
 	"buffer_pools_mapped_total_capacity_in_bytes":   float64(0),
 }

-var threadPoolExpected = map[string]interface{}{
+var nodestatsThreadPoolExpected = map[string]interface{}{
 	"merge_threads":                 float64(6),
 	"merge_queue":                   float64(4),
 	"merge_active":                  float64(5),
@@ -726,7 +726,7 @@ var threadPoolExpected = map[string]interface{}{
 	"flush_completed":               float64(3),
 }

-var fsExpected = map[string]interface{}{
+var nodestatsFsExpected = map[string]interface{}{
 	"data_0_total_in_bytes":     float64(19507089408),
 	"data_0_free_in_bytes":      float64(16909316096),
 	"data_0_available_in_bytes": float64(15894814720),
@@ -736,7 +736,7 @@ var fsExpected = map[string]interface{}{
 	"total_total_in_bytes":      float64(19507089408),
 }

-var transportExpected = map[string]interface{}{
+var nodestatsTransportExpected = map[string]interface{}{
 	"server_open":      float64(13),
 	"rx_count":         float64(6),
 	"rx_size_in_bytes": float64(1380),
@@ -744,12 +744,12 @@ var transportExpected = map[string]interface{}{
 	"tx_size_in_bytes": float64(1380),
 }

-var httpExpected = map[string]interface{}{
+var nodestatsHttpExpected = map[string]interface{}{
 	"current_open": float64(3),
 	"total_opened": float64(3),
 }

-var breakersExpected = map[string]interface{}{
+var nodestatsBreakersExpected = map[string]interface{}{
 	"fielddata_estimated_size_in_bytes": float64(0),
 	"fielddata_overhead":                float64(1.03),
 	"fielddata_tripped":                 float64(0),
@@ -763,3 +763,273 @@ var breakersExpected = map[string]interface{}{
 	"parent_limit_size_in_bytes":        float64(727213670),
 	"parent_estimated_size_in_bytes":    float64(0),
 }
+
+const clusterStatsResponse = `
+{
+   "host":"ip-10-0-1-214",
+   "log_type":"metrics",
+   "timestamp":1475767451229,
+   "log_level":"INFO",
+   "node_name":"test.host.com",
+   "cluster_name":"es-testcluster",
+   "status":"red",
+   "indices":{
+      "count":1,
+      "shards":{
+         "total":4,
+         "primaries":4,
+         "replication":0.0,
+         "index":{
+            "shards":{
+               "min":4,
+               "max":4,
+               "avg":4.0
+            },
+            "primaries":{
+               "min":4,
+               "max":4,
+               "avg":4.0
+            },
+            "replication":{
+               "min":0.0,
+               "max":0.0,
+               "avg":0.0
+            }
+         }
+      },
+      "docs":{
+         "count":4,
+         "deleted":0
+      },
+      "store":{
+         "size_in_bytes":17084,
+         "throttle_time_in_millis":0
+      },
+      "fielddata":{
+         "memory_size_in_bytes":0,
+         "evictions":0
+      },
+      "query_cache":{
+         "memory_size_in_bytes":0,
+         "total_count":0,
+         "hit_count":0,
+         "miss_count":0,
+         "cache_size":0,
+         "cache_count":0,
+         "evictions":0
+      },
+      "completion":{
+         "size_in_bytes":0
+      },
+      "segments":{
+         "count":4,
+         "memory_in_bytes":11828,
+         "terms_memory_in_bytes":8932,
+         "stored_fields_memory_in_bytes":1248,
+         "term_vectors_memory_in_bytes":0,
+         "norms_memory_in_bytes":1280,
+         "doc_values_memory_in_bytes":368,
+         "index_writer_memory_in_bytes":0,
+         "index_writer_max_memory_in_bytes":2048000,
+         "version_map_memory_in_bytes":0,
+         "fixed_bit_set_memory_in_bytes":0
+      },
+      "percolate":{
+         "total":0,
+         "time_in_millis":0,
+         "current":0,
+         "memory_size_in_bytes":-1,
+         "memory_size":"-1b",
+         "queries":0
+      }
+   },
+   "nodes":{
+      "count":{
+         "total":1,
+         "master_only":0,
+         "data_only":0,
+         "master_data":1,
+         "client":0
+      },
+      "versions":[
+         {
+         "version": "2.3.3"
+         }
+      ],
+      "os":{
+         "available_processors":1,
+         "allocated_processors":1,
+         "mem":{
+            "total_in_bytes":593301504
+         },
+         "names":[
+            {
+               "name":"Linux",
+               "count":1
+            }
+         ]
+      },
+      "process":{
+         "cpu":{
+            "percent":0
+         },
+         "open_file_descriptors":{
+            "min":145,
+            "max":145,
+            "avg":145
+         }
+      },
+      "jvm":{
+         "max_uptime_in_millis":11580527,
+         "versions":[
+            {
+               "version":"1.8.0_101",
+               "vm_name":"OpenJDK 64-Bit Server VM",
+               "vm_version":"25.101-b13",
+               "vm_vendor":"Oracle Corporation",
+               "count":1
+            }
+         ],
+         "mem":{
+            "heap_used_in_bytes":70550288,
+            "heap_max_in_bytes":1065025536
+         },
+         "threads":30
+      },
+      "fs":{
+         "total_in_bytes":8318783488,
+         "free_in_bytes":6447439872,
+         "available_in_bytes":6344785920
+      },
+      "plugins":[
+         {
+            "name":"cloud-aws",
+            "version":"2.3.3",
+            "description":"The Amazon Web Service (AWS) Cloud plugin allows to use AWS API for the unicast discovery mechanism and add S3 repositories.",
+            "jvm":true,
+            "classname":"org.elasticsearch.plugin.cloud.aws.CloudAwsPlugin",
+            "isolated":true,
+            "site":false
+         },
+         {
+            "name":"kopf",
+            "version":"2.0.1",
+            "description":"kopf - simple web administration tool for Elasticsearch",
+            "url":"/_plugin/kopf/",
+            "jvm":false,
+            "site":true
+         },
+         {
+            "name":"tr-metrics",
+            "version":"7bd5b4b",
+            "description":"Logs cluster and node stats for performance monitoring.",
+            "jvm":true,
+            "classname":"com.trgr.elasticsearch.plugin.metrics.MetricsPlugin",
+            "isolated":true,
+            "site":false
+         }
+      ]
+   }
+}
+`
+
+var clusterstatsIndicesExpected = map[string]interface{}{
+	"completion_size_in_bytes":                  float64(0),
+	"count":                                     float64(1),
+	"docs_count":                                float64(4),
+	"docs_deleted":                              float64(0),
+	"fielddata_evictions":                       float64(0),
+	"fielddata_memory_size_in_bytes":            float64(0),
+	"percolate_current":                         float64(0),
+	"percolate_memory_size_in_bytes":            float64(-1),
+	"percolate_queries":                         float64(0),
+	"percolate_time_in_millis":                  float64(0),
+	"percolate_total":                           float64(0),
+	"percolate_memory_size":                     "-1b",
+	"query_cache_cache_count":                   float64(0),
+	"query_cache_cache_size":                    float64(0),
+	"query_cache_evictions":                     float64(0),
+	"query_cache_hit_count":                     float64(0),
+	"query_cache_memory_size_in_bytes":          float64(0),
+	"query_cache_miss_count":                    float64(0),
+	"query_cache_total_count":                   float64(0),
+	"segments_count":                            float64(4),
+	"segments_doc_values_memory_in_bytes":       float64(368),
+	"segments_fixed_bit_set_memory_in_bytes":    float64(0),
+	"segments_index_writer_max_memory_in_bytes": float64(2.048e+06),
+	"segments_index_writer_memory_in_bytes":     float64(0),
+	"segments_memory_in_bytes":                  float64(11828),
+	"segments_norms_memory_in_bytes":            float64(1280),
+	"segments_stored_fields_memory_in_bytes":    float64(1248),
+	"segments_term_vectors_memory_in_bytes":     float64(0),
+	"segments_terms_memory_in_bytes":            float64(8932),
+	"segments_version_map_memory_in_bytes":      float64(0),
+	"shards_index_primaries_avg":                float64(4),
+	"shards_index_primaries_max":                float64(4),
+	"shards_index_primaries_min":                float64(4),
+	"shards_index_replication_avg":              float64(0),
+	"shards_index_replication_max":              float64(0),
+	"shards_index_replication_min":              float64(0),
+	"shards_index_shards_avg":                   float64(4),
+	"shards_index_shards_max":                   float64(4),
+	"shards_index_shards_min":                   float64(4),
+	"shards_primaries":                          float64(4),
+	"shards_replication":                        float64(0),
+	"shards_total":                              float64(4),
+	"store_size_in_bytes":                       float64(17084),
+	"store_throttle_time_in_millis":             float64(0),
+}
+
+var clusterstatsNodesExpected = map[string]interface{}{
+	"count_client":                      float64(0),
+	"count_data_only":                   float64(0),
+	"count_master_data":                 float64(1),
+	"count_master_only":                 float64(0),
+	"count_total":                       float64(1),
+	"fs_available_in_bytes":             float64(6.34478592e+09),
+	"fs_free_in_bytes":                  float64(6.447439872e+09),
+	"fs_total_in_bytes":                 float64(8.318783488e+09),
+	"jvm_max_uptime_in_millis":          float64(1.1580527e+07),
+	"jvm_mem_heap_max_in_bytes":         float64(1.065025536e+09),
+	"jvm_mem_heap_used_in_bytes":        float64(7.0550288e+07),
+	"jvm_threads":                       float64(30),
+	"jvm_versions_0_count":              float64(1),
+	"jvm_versions_0_version":            "1.8.0_101",
+	"jvm_versions_0_vm_name":            "OpenJDK 64-Bit Server VM",
+	"jvm_versions_0_vm_vendor":          "Oracle Corporation",
+	"jvm_versions_0_vm_version":         "25.101-b13",
+	"os_allocated_processors":           float64(1),
+	"os_available_processors":           float64(1),
+	"os_mem_total_in_bytes":             float64(5.93301504e+08),
+	"os_names_0_count":                  float64(1),
+	"os_names_0_name":                   "Linux",
+	"process_cpu_percent":               float64(0),
+	"process_open_file_descriptors_avg": float64(145),
+	"process_open_file_descriptors_max": float64(145),
+	"process_open_file_descriptors_min": float64(145),
+	"versions_0_version":                "2.3.3",
+	"plugins_0_classname":               "org.elasticsearch.plugin.cloud.aws.CloudAwsPlugin",
+	"plugins_0_description":             "The Amazon Web Service (AWS) Cloud plugin allows to use AWS API for the unicast discovery mechanism and add S3 repositories.",
+	"plugins_0_isolated":                true,
+	"plugins_0_jvm":                     true,
+	"plugins_0_name":                    "cloud-aws",
+	"plugins_0_site":                    false,
+	"plugins_0_version":                 "2.3.3",
+	"plugins_1_description":             "kopf - simple web administration tool for Elasticsearch",
+	"plugins_1_jvm":                     false,
+	"plugins_1_name":                    "kopf",
+	"plugins_1_site":                    true,
+	"plugins_1_url":                     "/_plugin/kopf/",
+	"plugins_1_version":                 "2.0.1",
+	"plugins_2_classname":               "com.trgr.elasticsearch.plugin.metrics.MetricsPlugin",
+	"plugins_2_description":             "Logs cluster and node stats for performance monitoring.",
+	"plugins_2_isolated":                true,
+	"plugins_2_jvm":                     true,
+	"plugins_2_name":                    "tr-metrics",
+	"plugins_2_site":                    false,
+	"plugins_2_version":                 "7bd5b4b",
+}
+
+const IsMasterResult = "SDFsfSDFsdfFSDSDfSFDSDF 10.206.124.66 10.206.124.66 test.host.com "
+
+const IsNotMasterResult = "junk 10.206.124.66 10.206.124.66 test.junk.com "
--- a/plugins/inputs/exec/exec.go
+++ b/plugins/inputs/exec/exec.go
@@ -11,7 +11,7 @@ import (
 	"syscall"
 	"time"

-	"github.com/gonuts/go-shellquote"
+	"github.com/kballard/go-shellquote"

 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
--- a/plugins/inputs/exec/exec_test.go
+++ b/plugins/inputs/exec/exec_test.go
@@ -36,7 +36,7 @@ const malformedJson = `
    "status": "green",
 `

-const lineProtocol = "cpu,host=foo,datacenter=us-east usage_idle=99,usage_busy=1"
+const lineProtocol = "cpu,host=foo,datacenter=us-east usage_idle=99,usage_busy=1\n"

 const lineProtocolMulti = `
 cpu,cpu=cpu0,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
--- a/plugins/inputs/filestat/filestat.go
+++ b/plugins/inputs/filestat/filestat.go
@@ -4,6 +4,7 @@ import (
 	"crypto/md5"
 	"fmt"
 	"io"
+	"log"
 	"os"

 	"github.com/influxdata/telegraf"
@@ -78,8 +79,14 @@ func (f *FileStat) Gather(acc telegraf.Accumulator) error {
 				"file": fileName,
 			}
 			fields := map[string]interface{}{
-				"exists":     int64(1),
-				"size_bytes": fileInfo.Size(),
+				"exists": int64(1),
+			}
+
+			if fileInfo == nil {
+				log.Printf("E! Unable to get info for file [%s], possible permissions issue",
+					fileName)
+			} else {
+				fields["size_bytes"] = fileInfo.Size()
 			}

 			if f.Md5 {
--- a/plugins/inputs/haproxy/README.md
+++ b/plugins/inputs/haproxy/README.md
@@ -0,0 +1,39 @@
+# HAproxy Input Plugin
+
+[HAproxy](http://www.haproxy.org/) input plugin gathers metrics directly from any running HAproxy instance. It can do so by using CSV generated by HAproxy status page or from admin socket(s).
+
+### Configuration:
+
+```toml
+# SampleConfig
+[[inputs.haproxy]]
+  servers = ["http://1.2.3.4/haproxy?stats", "/var/run/haproxy*.sock"]
+```
+
+Server addresses need to explicitly start with 'http' if you wish to use HAproxy status page. Otherwise, address will be assumed to be an UNIX socket and protocol (if present) will be discarded.
+
+For basic authentication you need to add username and password in the URL: `http://user:password@1.2.3.4/haproxy?stats`.
+
+Following examples will all resolve to the same socket:
+```
+socket:/var/run/haproxy.sock
+unix:/var/run/haproxy.sock
+foo:/var/run/haproxy.sock
+/var/run/haproxy.sock
+```
+
+When using socket names, wildcard expansion is supported so plugin can gather stats from multiple sockets at once.
+
+If no servers are specified, then the default address of `http://127.0.0.1:1936/haproxy?stats` will be used.
+
+### Measurements & Fields:
+
+Plugin will gather measurements outlined in [HAproxy CSV format documentation](https://cbonte.github.io/haproxy-dconv/1.5/configuration.html#9.1).
+
+### Tags:
+
+- All measurements have the following tags:
+    - server - address of server data is gathered from
+    - proxy - proxy name as reported in `pxname`
+	- sv - service name as reported in `svname`
+
--- a/plugins/inputs/haproxy/haproxy.go
+++ b/plugins/inputs/haproxy/haproxy.go
@@ -7,6 +7,7 @@ import (
 	"net"
 	"net/http"
 	"net/url"
+	"path/filepath"
 	"strconv"
 	"strings"
 	"sync"
@@ -17,7 +18,7 @@ import (
 	"github.com/influxdata/telegraf/plugins/inputs"
 )

-//CSV format: https://cbonte.github.io/haproxy-dconv/configuration-1.5.html#9.1
+//CSV format: https://cbonte.github.io/haproxy-dconv/1.5/configuration.html#9.1
 const (
 	HF_PXNAME         = 0  // 0. pxname [LFBS]: proxy name
 	HF_SVNAME         = 1  // 1. svname [LFBS]: service name (FRONTEND for frontend, BACKEND for backend, any name for server/listener)
@@ -93,12 +94,15 @@ var sampleConfig = `
  ## An array of address to gather stats about. Specify an ip on hostname
  ## with optional port. ie localhost, 10.10.3.33:1936, etc.
  ## Make sure you specify the complete path to the stats endpoint
-  ## ie 10.10.3.33:1936/haproxy?stats
+  ## including the protocol, ie http://10.10.3.33:1936/haproxy?stats
  #
  ## If no servers are specified, then default to 127.0.0.1:1936/haproxy?stats
  servers = ["http://myhaproxy.com:1936/haproxy?stats"]
-  ## Or you can also use local socket
-  ## servers = ["socket:/run/haproxy/admin.sock"]
+  ##
+  ## You can also use local socket with standard wildcard globbing.
+  ## Server address not starting with 'http' will be treated as a possible
+  ## socket, so both examples below are valid.
+  ## servers = ["socket:/run/haproxy/admin.sock", "/run/haproxy/*.sock"]
 `

 func (r *haproxy) SampleConfig() string {
@@ -116,10 +120,36 @@ func (g *haproxy) Gather(acc telegraf.Accumulator) error {
 		return g.gatherServer("http://127.0.0.1:1936/haproxy?stats", acc)
 	}

+	endpoints := make([]string, 0, len(g.Servers))
+
+	for _, endpoint := range g.Servers {
+
+		if strings.HasPrefix(endpoint, "http") {
+			endpoints = append(endpoints, endpoint)
+			continue
+		}
+
+		socketPath := getSocketAddr(endpoint)
+
+		matches, err := filepath.Glob(socketPath)
+
+		if err != nil {
+			return err
+		}
+
+		if len(matches) == 0 {
+			endpoints = append(endpoints, socketPath)
+		} else {
+			for _, match := range matches {
+				endpoints = append(endpoints, match)
+			}
+		}
+	}
+
 	var wg sync.WaitGroup
-	errChan := errchan.New(len(g.Servers))
-	wg.Add(len(g.Servers))
-	for _, server := range g.Servers {
+	errChan := errchan.New(len(endpoints))
+	wg.Add(len(endpoints))
+	for _, server := range endpoints {
 		go func(serv string) {
 			defer wg.Done()
 			errChan.C <- g.gatherServer(serv, acc)
@@ -131,14 +161,7 @@ func (g *haproxy) Gather(acc telegraf.Accumulator) error {
 }

 func (g *haproxy) gatherServerSocket(addr string, acc telegraf.Accumulator) error {
-	var socketPath string
-	socketAddr := strings.Split(addr, ":")
-
-	if len(socketAddr) >= 2 {
-		socketPath = socketAddr[1]
-	} else {
-		socketPath = socketAddr[0]
-	}
+	socketPath := getSocketAddr(addr)

 	c, err := net.Dial("unix", socketPath)

@@ -196,6 +219,16 @@ func (g *haproxy) gatherServer(addr string, acc telegraf.Accumulator) error {
 	return importCsvResult(res.Body, acc, u.Host)
 }

+func getSocketAddr(sock string) string {
+	socketAddr := strings.Split(sock, ":")
+
+	if len(socketAddr) >= 2 {
+		return socketAddr[1]
+	} else {
+		return socketAddr[0]
+	}
+}
+
 func importCsvResult(r io.Reader, acc telegraf.Accumulator, host string) error {
 	csv := csv.NewReader(r)
 	result, err := csv.ReadAll()
@@ -230,6 +263,11 @@ func importCsvResult(r io.Reader, acc telegraf.Accumulator, host string) error {
 				if err == nil {
 					fields["smax"] = ival
 				}
+			case HF_SLIM:
+				ival, err := strconv.ParseUint(v, 10, 64)
+				if err == nil {
+					fields["slim"] = ival
+				}
 			case HF_STOT:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
--- a/plugins/inputs/haproxy/haproxy_test.go
+++ b/plugins/inputs/haproxy/haproxy_test.go
@@ -72,38 +72,7 @@ func TestHaproxyGeneratesMetricsWithAuthentication(t *testing.T) {
 		"sv":     "host0",
 	}

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

 	//Here, we should get error because we don't pass authentication data
@@ -136,102 +105,58 @@ func TestHaproxyGeneratesMetricsWithoutAuthentication(t *testing.T) {
 		"sv":     "host0",
 	}

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

 func TestHaproxyGeneratesMetricsUsingSocket(t *testing.T) {
 	var randomNumber int64
-	binary.Read(rand.Reader, binary.LittleEndian, &randomNumber)
-	sock, err := net.Listen("unix", fmt.Sprintf("/tmp/test-haproxy%d.sock", randomNumber))
-	if err != nil {
-		t.Fatal("Cannot initialize socket ")
+	var sockets [5]net.Listener
+	_globmask := "/tmp/test-haproxy*.sock"
+	_badmask := "/tmp/test-fail-haproxy*.sock"
+
+	for i := 0; i < 5; i++ {
+		binary.Read(rand.Reader, binary.LittleEndian, &randomNumber)
+		sockname := fmt.Sprintf("/tmp/test-haproxy%d.sock", randomNumber)
+
+		sock, err := net.Listen("unix", sockname)
+		if err != nil {
+			t.Fatal("Cannot initialize socket ")
+		}
+
+		sockets[i] = sock
+		defer sock.Close()
+
+		s := statServer{}
+		go s.serverSocket(sock)
 	}

-	defer sock.Close()
-
-	s := statServer{}
-	go s.serverSocket(sock)
-
 	r := &haproxy{
-		Servers: []string{sock.Addr().String()},
+		Servers: []string{_globmask},
 	}

 	var acc testutil.Accumulator

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

-	tags := map[string]string{
-		"proxy":  "be_app",
-		"server": sock.Addr().String(),
-		"sv":     "host0",
+	fields := HaproxyGetFieldValues()
+
+	for _, sock := range sockets {
+		tags := map[string]string{
+			"proxy":  "be_app",
+			"server": sock.Addr().String(),
+			"sv":     "host0",
+		}
+
+		acc.AssertContainsTaggedFields(t, "haproxy", fields, tags)
 	}

-	fields := map[string]interface{}{
-		"active_servers":    uint64(1),
-		"backup_servers":    uint64(0),
-		"bin":               uint64(510913516),
-		"bout":              uint64(2193856571),
-		"check_duration":    uint64(10),
-		"cli_abort":         uint64(73),
-		"ctime":             uint64(2),
-		"downtime":          uint64(0),
-		"dresp":             uint64(0),
-		"econ":              uint64(0),
-		"eresp":             uint64(1),
-		"http_response.1xx": uint64(0),
-		"http_response.2xx": uint64(119534),
-		"http_response.3xx": uint64(48051),
-		"http_response.4xx": uint64(2345),
-		"http_response.5xx": uint64(1056),
-		"lbtot":             uint64(171013),
-		"qcur":              uint64(0),
-		"qmax":              uint64(0),
-		"qtime":             uint64(0),
-		"rate":              uint64(3),
-		"rate_max":          uint64(12),
-		"rtime":             uint64(312),
-		"scur":              uint64(1),
-		"smax":              uint64(32),
-		"srv_abort":         uint64(1),
-		"stot":              uint64(171014),
-		"ttime":             uint64(2341),
-		"wredis":            uint64(0),
-		"wretr":             uint64(1),
-	}
-	acc.AssertContainsTaggedFields(t, "haproxy", fields, tags)
+	// This mask should not match any socket
+	r.Servers = []string{_badmask}
+
+	err = r.Gather(&acc)
+	require.Error(t, err)
 }

 //When not passing server config, we default to localhost
@@ -246,6 +171,43 @@ func TestHaproxyDefaultGetFromLocalhost(t *testing.T) {
 	assert.Contains(t, err.Error(), "127.0.0.1:1936/haproxy?stats/;csv")
 }

+func HaproxyGetFieldValues() map[string]interface{} {
+	fields := map[string]interface{}{
+		"active_servers":    uint64(1),
+		"backup_servers":    uint64(0),
+		"bin":               uint64(510913516),
+		"bout":              uint64(2193856571),
+		"check_duration":    uint64(10),
+		"cli_abort":         uint64(73),
+		"ctime":             uint64(2),
+		"downtime":          uint64(0),
+		"dresp":             uint64(0),
+		"econ":              uint64(0),
+		"eresp":             uint64(1),
+		"http_response.1xx": uint64(0),
+		"http_response.2xx": uint64(119534),
+		"http_response.3xx": uint64(48051),
+		"http_response.4xx": uint64(2345),
+		"http_response.5xx": uint64(1056),
+		"lbtot":             uint64(171013),
+		"qcur":              uint64(0),
+		"qmax":              uint64(0),
+		"qtime":             uint64(0),
+		"rate":              uint64(3),
+		"rate_max":          uint64(12),
+		"rtime":             uint64(312),
+		"scur":              uint64(1),
+		"smax":              uint64(32),
+		"slim":              uint64(32),
+		"srv_abort":         uint64(1),
+		"stot":              uint64(171014),
+		"ttime":             uint64(2341),
+		"wredis":            uint64(0),
+		"wretr":             uint64(1),
+	}
+	return fields
+}
+
 const csvOutputSample = `
 # pxname,svname,qcur,qmax,scur,smax,slim,stot,bin,bout,dreq,dresp,ereq,econ,eresp,wretr,wredis,status,weight,act,bck,chkfail,chkdown,lastchg,downtime,qlimit,pid,iid,sid,throttle,lbtot,tracked,type,rate,rate_lim,rate_max,check_status,check_code,check_duration,hrsp_1xx,hrsp_2xx,hrsp_3xx,hrsp_4xx,hrsp_5xx,hrsp_other,hanafail,req_rate,req_rate_max,req_tot,cli_abrt,srv_abrt,comp_in,comp_out,comp_byp,comp_rsp,lastsess,last_chk,last_agt,qtime,ctime,rtime,ttime,
 fe_app,FRONTEND,,81,288,713,2000,1094063,5557055817,24096715169,1102,80,95740,,,17,19,OPEN,,,,,,,,,2,16,113,13,114,,0,18,0,102,,,,0,1314093,537036,123452,11966,1360,,35,140,1987928,,,0,0,0,0,,,,,,,,
@@ -262,6 +224,6 @@ be_static,host1,0,0,0,1,,28,7873,1209688,,0,,0,0,0,0,UP,1,1,0,0,0,70698,0,,2,18,
 be_static,host2,0,0,0,1,,28,13830,1085929,,0,,0,0,0,0,UP,1,1,0,0,0,70698,0,,2,18,9,,28,,2,0,,1,L4OK,,0,0,19,6,3,0,0,0,,,,0,0,,,,,338,,,0,1,1,38,
 be_static,host3,0,0,0,1,,28,17959,1259760,,0,,0,0,0,0,UP,1,1,0,0,0,70698,0,,2,18,10,,28,,2,0,,1,L4OK,,1,0,20,6,2,0,0,0,,,,0,0,,,,,92,,,0,1,1,17,
 be_static,BACKEND,0,0,0,2,200,307,160276,13322728,0,0,,0,0,0,0,UP,11,11,0,,0,70698,0,,2,18,0,,307,,1,0,,4,,,,0,205,73,29,0,0,,,,,0,0,0,0,0,0,92,,,0,1,3,381,
-be_app,host0,0,0,1,32,,171014,510913516,2193856571,,0,,0,1,1,0,UP,100,1,0,1,0,70698,0,,2,19,1,,171013,,2,3,,12,L7OK,301,10,0,119534,48051,2345,1056,0,0,,,,73,1,,,,,0,Moved Permanently,,0,2,312,2341,
-be_app,host4,0,0,2,29,,171013,499318742,2195595896,12,34,,0,2,0,0,UP,100,1,0,2,0,70698,0,,2,19,2,,171013,,2,3,,12,L7OK,301,12,0,119572,47882,2441,1088,0,0,,,,84,2,,,,,0,Moved Permanently,,0,2,316,2355,
+be_app,host0,0,0,1,32,32,171014,510913516,2193856571,,0,,0,1,1,0,UP,100,1,0,1,0,70698,0,,2,19,1,,171013,,2,3,,12,L7OK,301,10,0,119534,48051,2345,1056,0,0,,,,73,1,,,,,0,Moved Permanently,,0,2,312,2341,
+be_app,host4,0,0,2,29,32,171013,499318742,2195595896,12,34,,0,2,0,0,UP,100,1,0,2,0,70698,0,,2,19,2,,171013,,2,3,,12,L7OK,301,12,0,119572,47882,2441,1088,0,0,,,,84,2,,,,,0,Moved Permanently,,0,2,316,2355,
 `
--- a/plugins/inputs/hddtemp/README.md
+++ b/plugins/inputs/hddtemp/README.md
@@ -8,7 +8,7 @@ Hddtemp should be installed and its daemon running

 ## Configuration

-```
+```toml
 [[inputs.hddtemp]]
 ## By default, telegraf gathers temps data from all disks detected by the
 ## hddtemp.
@@ -20,3 +20,24 @@ Hddtemp should be installed and its daemon running
 # address = "127.0.0.1:7634"
 # devices = ["sda", "*"]
 ```
+
+## Measurements
+
+- hddtemp
+  - temperature
+
+Tags:
+- device
+- model
+- unit
+- status
+
+
+
+## Example output
+
+```
+> hddtemp,unit=C,status=,host=server1,device=sdb,model=WDC\ WD740GD-00FLA1 temperature=43i 1481655647000000000
+> hddtemp,device=sdc,model=SAMSUNG\ HD103UI,unit=C,status=,host=server1 temperature=38i 148165564700000000
+> hddtemp,device=sdd,model=SAMSUNG\ HD103UI,unit=C,status=,host=server1 temperature=36i 1481655647000000000
+```
--- a/plugins/inputs/hddtemp/go-hddtemp/hddtemp.go
+++ b/plugins/inputs/hddtemp/go-hddtemp/hddtemp.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 )

-type disk struct {
+type Disk struct {
 	DeviceName  string
 	Model       string
 	Temperature int32
@@ -16,12 +16,19 @@ type disk struct {
 	Status      string
 }

-func Fetch(address string) ([]disk, error) {
+type hddtemp struct {
+}
+
+func New() *hddtemp {
+	return &hddtemp{}
+}
+
+func (h *hddtemp) Fetch(address string) ([]Disk, error) {
 	var (
 		err    error
 		conn   net.Conn
 		buffer bytes.Buffer
-		disks  []disk
+		disks  []Disk
 	)

 	if conn, err = net.Dial("tcp", address); err != nil {
@@ -48,7 +55,7 @@ func Fetch(address string) ([]disk, error) {
 			status = temperatureField
 		}

-		disks = append(disks, disk{
+		disks = append(disks, Disk{
 			DeviceName:  device,
 			Model:       fields[offset+2],
 			Temperature: int32(temperature),
--- a/plugins/inputs/hddtemp/go-hddtemp/hddtemp_test.go
+++ b/plugins/inputs/hddtemp/go-hddtemp/hddtemp_test.go
@@ -10,13 +10,13 @@ func TestFetch(t *testing.T) {
 	l := serve(t, []byte("|/dev/sda|foobar|36|C|"))
 	defer l.Close()

-	disks, err := Fetch(l.Addr().String())
+	disks, err := New().Fetch(l.Addr().String())

 	if err != nil {
 		t.Error("expecting err to be nil")
 	}

-	expected := []disk{
+	expected := []Disk{
 		{
 			DeviceName:  "sda",
 			Model:       "foobar",
@@ -31,7 +31,7 @@ func TestFetch(t *testing.T) {
 }

 func TestFetchWrongAddress(t *testing.T) {
-	_, err := Fetch("127.0.0.1:1")
+	_, err := New().Fetch("127.0.0.1:1")

 	if err == nil {
 		t.Error("expecting err to be non-nil")
@@ -42,13 +42,13 @@ func TestFetchStatus(t *testing.T) {
 	l := serve(t, []byte("|/dev/sda|foobar|SLP|C|"))
 	defer l.Close()

-	disks, err := Fetch(l.Addr().String())
+	disks, err := New().Fetch(l.Addr().String())

 	if err != nil {
 		t.Error("expecting err to be nil")
 	}

-	expected := []disk{
+	expected := []Disk{
 		{
 			DeviceName:  "sda",
 			Model:       "foobar",
@@ -67,13 +67,13 @@ func TestFetchTwoDisks(t *testing.T) {
 	l := serve(t, []byte("|/dev/hda|ST380011A|46|C||/dev/hdd|ST340016A|SLP|*|"))
 	defer l.Close()

-	disks, err := Fetch(l.Addr().String())
+	disks, err := New().Fetch(l.Addr().String())

 	if err != nil {
 		t.Error("expecting err to be nil")
 	}

-	expected := []disk{
+	expected := []Disk{
 		{
 			DeviceName:  "hda",
 			Model:       "ST380011A",
--- a/plugins/inputs/hddtemp/hddtemp.go
+++ b/plugins/inputs/hddtemp/hddtemp.go
@@ -13,6 +13,11 @@ const defaultAddress = "127.0.0.1:7634"
 type HDDTemp struct {
 	Address string
 	Devices []string
+	fetcher Fetcher
+}
+
+type Fetcher interface {
+	Fetch(address string) ([]gohddtemp.Disk, error)
 }

 func (_ *HDDTemp) Description() string {
@@ -36,7 +41,10 @@ func (_ *HDDTemp) SampleConfig() string {
 }

 func (h *HDDTemp) Gather(acc telegraf.Accumulator) error {
-	disks, err := gohddtemp.Fetch(h.Address)
+	if h.fetcher == nil {
+		h.fetcher = gohddtemp.New()
+	}
+	disks, err := h.fetcher.Fetch(h.Address)

 	if err != nil {
 		return err
@@ -53,7 +61,7 @@ func (h *HDDTemp) Gather(acc telegraf.Accumulator) error {
 				}

 				fields := map[string]interface{}{
-					disk.DeviceName: disk.Temperature,
+					"temperature": disk.Temperature,
 				}

 				acc.AddFields("hddtemp", fields, tags)
--- a/plugins/inputs/hddtemp/hddtemp_test.go
+++ b/plugins/inputs/hddtemp/hddtemp_test.go
@@ -0,0 +1,80 @@
+package hddtemp
+
+import (
+	"testing"
+
+	hddtemp "github.com/influxdata/telegraf/plugins/inputs/hddtemp/go-hddtemp"
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+type mockFetcher struct {
+}
+
+func (h *mockFetcher) Fetch(address string) ([]hddtemp.Disk, error) {
+	return []hddtemp.Disk{
+		hddtemp.Disk{
+			DeviceName:  "Disk1",
+			Model:       "Model1",
+			Temperature: 13,
+			Unit:        "C",
+		},
+		hddtemp.Disk{
+			DeviceName:  "Disk2",
+			Model:       "Model2",
+			Temperature: 14,
+			Unit:        "C",
+		},
+	}, nil
+
+}
+func newMockFetcher() *mockFetcher {
+	return &mockFetcher{}
+}
+
+func TestFetch(t *testing.T) {
+	hddtemp := &HDDTemp{
+		fetcher: newMockFetcher(),
+		Devices: []string{"*"},
+	}
+
+	acc := &testutil.Accumulator{}
+	err := hddtemp.Gather(acc)
+
+	require.NoError(t, err)
+	assert.Equal(t, acc.NFields(), 2)
+
+	var tests = []struct {
+		fields map[string]interface{}
+		tags   map[string]string
+	}{
+		{
+			map[string]interface{}{
+				"temperature": int32(13),
+			},
+			map[string]string{
+				"device": "Disk1",
+				"model":  "Model1",
+				"unit":   "C",
+				"status": "",
+			},
+		},
+		{
+			map[string]interface{}{
+				"temperature": int32(14),
+			},
+			map[string]string{
+				"device": "Disk2",
+				"model":  "Model2",
+				"unit":   "C",
+				"status": "",
+			},
+		},
+	}
+
+	for _, test := range tests {
+		acc.AssertContainsTaggedFields(t, "hddtemp", test.fields, test.tags)
+	}
+
+}
--- a/plugins/inputs/http_listener/bufferpool.go
+++ b/plugins/inputs/http_listener/bufferpool.go
@@ -0,0 +1,43 @@
+package http_listener
+
+import (
+	"sync/atomic"
+)
+
+type pool struct {
+	buffers chan []byte
+	size    int
+
+	created int64
+}
+
+// NewPool returns a new pool object.
+// n is the number of buffers
+// bufSize is the size (in bytes) of each buffer
+func NewPool(n, bufSize int) *pool {
+	return &pool{
+		buffers: make(chan []byte, n),
+		size:    bufSize,
+	}
+}
+
+func (p *pool) get() []byte {
+	select {
+	case b := <-p.buffers:
+		return b
+	default:
+		atomic.AddInt64(&p.created, 1)
+		return make([]byte, p.size)
+	}
+}
+
+func (p *pool) put(b []byte) {
+	select {
+	case p.buffers <- b:
+	default:
+	}
+}
+
+func (p *pool) ncreated() int64 {
+	return atomic.LoadInt64(&p.created)
+}
--- a/plugins/inputs/http_listener/http_listener.go
+++ b/plugins/inputs/http_listener/http_listener.go
@@ -1,9 +1,9 @@
 package http_listener

 import (
-	"bufio"
 	"bytes"
-	"fmt"
+	"compress/gzip"
+	"io"
 	"log"
 	"net"
 	"net/http"
@@ -13,136 +13,172 @@ import (
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
-	"github.com/influxdata/telegraf/plugins/inputs/http_listener/stoppableListener"
-	"github.com/influxdata/telegraf/plugins/parsers"
+	"github.com/influxdata/telegraf/plugins/parsers/influx"
+	"github.com/influxdata/telegraf/selfstat"
 )

-type HttpListener struct {
+const (
+	// DEFAULT_MAX_BODY_SIZE is the default maximum request body size, in bytes.
+	// if the request body is over this size, we will return an HTTP 413 error.
+	// 500 MB
+	DEFAULT_MAX_BODY_SIZE = 500 * 1024 * 1024
+
+	// MAX_LINE_SIZE is the maximum size, in bytes, that can be allocated for
+	// a single InfluxDB point.
+	// 64 KB
+	DEFAULT_MAX_LINE_SIZE = 64 * 1024
+)
+
+type HTTPListener struct {
 	ServiceAddress string
 	ReadTimeout    internal.Duration
 	WriteTimeout   internal.Duration
+	MaxBodySize    int64
+	MaxLineSize    int

-	sync.Mutex
+	mu sync.Mutex
 	wg sync.WaitGroup

-	listener *stoppableListener.StoppableListener
+	listener net.Listener

-	parser parsers.Parser
+	parser influx.InfluxParser
 	acc    telegraf.Accumulator
+	pool   *pool
+
+	BytesRecv       selfstat.Stat
+	RequestsServed  selfstat.Stat
+	WritesServed    selfstat.Stat
+	QueriesServed   selfstat.Stat
+	PingsServed     selfstat.Stat
+	RequestsRecv    selfstat.Stat
+	WritesRecv      selfstat.Stat
+	QueriesRecv     selfstat.Stat
+	PingsRecv       selfstat.Stat
+	NotFoundsServed selfstat.Stat
+	BuffersCreated  selfstat.Stat
 }

 const sampleConfig = `
  ## Address and port to host HTTP listener on
  service_address = ":8186"

-  ## timeouts
+  ## maximum duration before timing out read of the request
  read_timeout = "10s"
+  ## maximum duration before timing out write of the response
  write_timeout = "10s"
+
+  ## Maximum allowed http request body size in bytes.
+  ## 0 means to use the default of 536,870,912 bytes (500 mebibytes)
+  max_body_size = 0
+
+  ## Maximum line size allowed to be sent in bytes.
+  ## 0 means to use the default of 65536 bytes (64 kibibytes)
+  max_line_size = 0
 `

-func (t *HttpListener) SampleConfig() string {
+func (h *HTTPListener) SampleConfig() string {
 	return sampleConfig
 }

-func (t *HttpListener) Description() string {
+func (h *HTTPListener) Description() string {
 	return "Influx HTTP write listener"
 }

-func (t *HttpListener) Gather(_ telegraf.Accumulator) error {
+func (h *HTTPListener) Gather(_ telegraf.Accumulator) error {
+	h.BuffersCreated.Set(h.pool.ncreated())
 	return nil
 }

-func (t *HttpListener) SetParser(parser parsers.Parser) {
-	t.parser = parser
-}
-
 // Start starts the http listener service.
-func (t *HttpListener) Start(acc telegraf.Accumulator) error {
-	t.Lock()
-	defer t.Unlock()
+func (h *HTTPListener) Start(acc telegraf.Accumulator) error {
+	h.mu.Lock()
+	defer h.mu.Unlock()

-	t.acc = acc
+	tags := map[string]string{
+		"address": h.ServiceAddress,
+	}
+	h.BytesRecv = selfstat.Register("http_listener", "bytes_received", tags)
+	h.RequestsServed = selfstat.Register("http_listener", "requests_served", tags)
+	h.WritesServed = selfstat.Register("http_listener", "writes_served", tags)
+	h.QueriesServed = selfstat.Register("http_listener", "queries_served", tags)
+	h.PingsServed = selfstat.Register("http_listener", "pings_served", tags)
+	h.RequestsRecv = selfstat.Register("http_listener", "requests_received", tags)
+	h.WritesRecv = selfstat.Register("http_listener", "writes_received", tags)
+	h.QueriesRecv = selfstat.Register("http_listener", "queries_received", tags)
+	h.PingsRecv = selfstat.Register("http_listener", "pings_received", tags)
+	h.NotFoundsServed = selfstat.Register("http_listener", "not_founds_served", tags)
+	h.BuffersCreated = selfstat.Register("http_listener", "buffers_created", tags)

-	var rawListener, err = net.Listen("tcp", t.ServiceAddress)
-	if err != nil {
-		return err
-	}
-	t.listener, err = stoppableListener.New(rawListener)
+	if h.MaxBodySize == 0 {
+		h.MaxBodySize = DEFAULT_MAX_BODY_SIZE
+	}
+	if h.MaxLineSize == 0 {
+		h.MaxLineSize = DEFAULT_MAX_LINE_SIZE
+	}
+
+	h.acc = acc
+	h.pool = NewPool(200, h.MaxLineSize)
+
+	var listener, err = net.Listen("tcp", h.ServiceAddress)
 	if err != nil {
 		return err
 	}
+	h.listener = listener

-	go t.httpListen()
+	h.wg.Add(1)
+	go func() {
+		defer h.wg.Done()
+		h.httpListen()
+	}()

-	log.Printf("I! Started HTTP listener service on %s\n", t.ServiceAddress)
+	log.Printf("I! Started HTTP listener service on %s\n", h.ServiceAddress)

 	return nil
 }

 // Stop cleans up all resources
-func (t *HttpListener) Stop() {
-	t.Lock()
-	defer t.Unlock()
+func (h *HTTPListener) Stop() {
+	h.mu.Lock()
+	defer h.mu.Unlock()

-	t.listener.Stop()
-	t.listener.Close()
+	h.listener.Close()
+	h.wg.Wait()

-	t.wg.Wait()
-
-	log.Println("I! Stopped HTTP listener service on ", t.ServiceAddress)
+	log.Println("I! Stopped HTTP listener service on ", h.ServiceAddress)
 }

-// httpListen listens for HTTP requests.
-func (t *HttpListener) httpListen() error {
-	if t.ReadTimeout.Duration < time.Second {
-		t.ReadTimeout.Duration = time.Second * 10
+// httpListen sets up an http.Server and calls server.Serve.
+// like server.Serve, httpListen will always return a non-nil error, for this
+// reason, the error returned should probably be ignored.
+// see https://golang.org/pkg/net/http/#Server.Serve
+func (h *HTTPListener) httpListen() error {
+	if h.ReadTimeout.Duration < time.Second {
+		h.ReadTimeout.Duration = time.Second * 10
 	}
-	if t.WriteTimeout.Duration < time.Second {
-		t.WriteTimeout.Duration = time.Second * 10
+	if h.WriteTimeout.Duration < time.Second {
+		h.WriteTimeout.Duration = time.Second * 10
 	}

 	var server = http.Server{
-		Handler:      t,
-		ReadTimeout:  t.ReadTimeout.Duration,
-		WriteTimeout: t.WriteTimeout.Duration,
+		Handler:      h,
+		ReadTimeout:  h.ReadTimeout.Duration,
+		WriteTimeout: h.WriteTimeout.Duration,
 	}

-	return server.Serve(t.listener)
+	return server.Serve(h.listener)
 }

-func (t *HttpListener) ServeHTTP(res http.ResponseWriter, req *http.Request) {
-	t.wg.Add(1)
-	defer t.wg.Done()
-
+func (h *HTTPListener) ServeHTTP(res http.ResponseWriter, req *http.Request) {
+	h.RequestsRecv.Incr(1)
+	defer h.RequestsServed.Incr(1)
 	switch req.URL.Path {
 	case "/write":
-		var http400msg bytes.Buffer
-		var partial string
-		scanner := bufio.NewScanner(req.Body)
-		scanner.Buffer([]byte(""), 128*1024)
-		for scanner.Scan() {
-			metrics, err := t.parser.Parse(scanner.Bytes())
-			if err == nil {
-				for _, m := range metrics {
-					t.acc.AddFields(m.Name(), m.Fields(), m.Tags(), m.Time())
-				}
-				partial = "partial write: "
-			} else {
-				http400msg.WriteString(err.Error() + " ")
-			}
-		}
-
-		if err := scanner.Err(); err != nil {
-			http.Error(res, "Internal server error: "+err.Error(), http.StatusInternalServerError)
-		} else if http400msg.Len() > 0 {
-			res.Header().Set("Content-Type", "application/json")
-			res.Header().Set("X-Influxdb-Version", "1.0")
-			res.WriteHeader(http.StatusBadRequest)
-			res.Write([]byte(fmt.Sprintf(`{"error":"%s%s"}`, partial, http400msg.String())))
-		} else {
-			res.WriteHeader(http.StatusNoContent)
-		}
+		h.WritesRecv.Incr(1)
+		defer h.WritesServed.Incr(1)
+		h.serveWrite(res, req)
 	case "/query":
+		h.QueriesRecv.Incr(1)
+		defer h.QueriesServed.Incr(1)
 		// Deliver a dummy response to the query endpoint, as some InfluxDB
 		// clients test endpoint availability with a query
 		res.Header().Set("Content-Type", "application/json")
@@ -150,16 +186,147 @@ func (t *HttpListener) ServeHTTP(res http.ResponseWriter, req *http.Request) {
 		res.WriteHeader(http.StatusOK)
 		res.Write([]byte("{\"results\":[]}"))
 	case "/ping":
+		h.PingsRecv.Incr(1)
+		defer h.PingsServed.Incr(1)
 		// respond to ping requests
 		res.WriteHeader(http.StatusNoContent)
 	default:
+		defer h.NotFoundsServed.Incr(1)
 		// Don't know how to respond to calls to other endpoints
 		http.NotFound(res, req)
 	}
 }

+func (h *HTTPListener) serveWrite(res http.ResponseWriter, req *http.Request) {
+	// Check that the content length is not too large for us to handle.
+	if req.ContentLength > h.MaxBodySize {
+		tooLarge(res)
+		return
+	}
+	now := time.Now()
+
+	// Handle gzip request bodies
+	body := req.Body
+	var err error
+	if req.Header.Get("Content-Encoding") == "gzip" {
+		body, err = gzip.NewReader(req.Body)
+		defer body.Close()
+		if err != nil {
+			log.Println("E! " + err.Error())
+			badRequest(res)
+			return
+		}
+	}
+	body = http.MaxBytesReader(res, body, h.MaxBodySize)
+
+	var return400 bool
+	var hangingBytes bool
+	buf := h.pool.get()
+	defer h.pool.put(buf)
+	bufStart := 0
+	for {
+		n, err := io.ReadFull(body, buf[bufStart:])
+		if err != nil && err != io.ErrUnexpectedEOF && err != io.EOF {
+			log.Println("E! " + err.Error())
+			// problem reading the request body
+			badRequest(res)
+			return
+		}
+		h.BytesRecv.Incr(int64(n))
+
+		if err == io.EOF {
+			if return400 {
+				badRequest(res)
+			} else {
+				res.WriteHeader(http.StatusNoContent)
+			}
+			return
+		}
+
+		if hangingBytes {
+			i := bytes.IndexByte(buf, '\n')
+			if i == -1 {
+				// still didn't find a newline, keep scanning
+				continue
+			}
+			// rotate the bit remaining after the first newline to the front of the buffer
+			i++ // start copying after the newline
+			bufStart = len(buf) - i
+			if bufStart > 0 {
+				copy(buf, buf[i:])
+			}
+			hangingBytes = false
+			continue
+		}
+
+		if err == io.ErrUnexpectedEOF {
+			// finished reading the request body
+			if err := h.parse(buf[:n+bufStart], now); err != nil {
+				log.Println("E! " + err.Error())
+				return400 = true
+			}
+			if return400 {
+				badRequest(res)
+			} else {
+				res.WriteHeader(http.StatusNoContent)
+			}
+			return
+		}
+
+		// if we got down here it means that we filled our buffer, and there
+		// are still bytes remaining to be read. So we will parse up until the
+		// final newline, then push the rest of the bytes into the next buffer.
+		i := bytes.LastIndexByte(buf, '\n')
+		if i == -1 {
+			// drop any line longer than the max buffer size
+			log.Printf("E! http_listener received a single line longer than the maximum of %d bytes",
+				len(buf))
+			hangingBytes = true
+			return400 = true
+			bufStart = 0
+			continue
+		}
+		if err := h.parse(buf[:i+1], now); err != nil {
+			log.Println("E! " + err.Error())
+			return400 = true
+		}
+		// rotate the bit remaining after the last newline to the front of the buffer
+		i++ // start copying after the newline
+		bufStart = len(buf) - i
+		if bufStart > 0 {
+			copy(buf, buf[i:])
+		}
+	}
+}
+
+func (h *HTTPListener) parse(b []byte, t time.Time) error {
+	metrics, err := h.parser.ParseWithDefaultTime(b, t)
+
+	for _, m := range metrics {
+		h.acc.AddFields(m.Name(), m.Fields(), m.Tags(), m.Time())
+	}
+
+	return err
+}
+
+func tooLarge(res http.ResponseWriter) {
+	res.Header().Set("Content-Type", "application/json")
+	res.Header().Set("X-Influxdb-Version", "1.0")
+	res.WriteHeader(http.StatusRequestEntityTooLarge)
+	res.Write([]byte(`{"error":"http: request body too large"}`))
+}
+
+func badRequest(res http.ResponseWriter) {
+	res.Header().Set("Content-Type", "application/json")
+	res.Header().Set("X-Influxdb-Version", "1.0")
+	res.WriteHeader(http.StatusBadRequest)
+	res.Write([]byte(`{"error":"http: bad request"}`))
+}
+
 func init() {
 	inputs.Add("http_listener", func() telegraf.Input {
-		return &HttpListener{}
+		return &HTTPListener{
+			ServiceAddress: ":8186",
+		}
 	})
 }
--- a/plugins/inputs/http_listener/http_listener_test.go
+++ b/plugins/inputs/http_listener/http_listener_test.go
@@ -1,21 +1,23 @@
 package http_listener

 import (
+	"bytes"
+	"io/ioutil"
+	"net/http"
 	"sync"
 	"testing"
 	"time"

-	"github.com/influxdata/telegraf/plugins/parsers"
 	"github.com/influxdata/telegraf/testutil"

-	"bytes"
 	"github.com/stretchr/testify/require"
-	"net/http"
 )

 const (
 	testMsg = "cpu_load_short,host=server01 value=12.0 1422568543702900257\n"

+	testMsgNoNewline = "cpu_load_short,host=server01 value=12.0 1422568543702900257"
+
 	testMsgs = `cpu_load_short,host=server02 value=12.0 1422568543702900257
 cpu_load_short,host=server03 value=12.0 1422568543702900257
 cpu_load_short,host=server04 value=12.0 1422568543702900257
@@ -27,17 +29,15 @@ cpu_load_short,host=server06 value=12.0 1422568543702900257
 	emptyMsg = ""
 )

-func newTestHttpListener() *HttpListener {
-	listener := &HttpListener{
+func newTestHTTPListener() *HTTPListener {
+	listener := &HTTPListener{
 		ServiceAddress: ":8186",
 	}
 	return listener
 }

 func TestWriteHTTP(t *testing.T) {
-	listener := newTestHttpListener()
-	parser, _ := parsers.NewInfluxParser()
-	listener.SetParser(parser)
+	listener := newTestHTTPListener()

 	acc := &testutil.Accumulator{}
 	require.NoError(t, listener.Start(acc))
@@ -71,9 +71,31 @@ func TestWriteHTTP(t *testing.T) {
 		)
 	}

-	// Post a gigantic metric to the listener:
+	// Post a gigantic metric to the listener and verify that an error is returned:
 	resp, err = http.Post("http://localhost:8186/write?db=mydb", "", bytes.NewBuffer([]byte(hugeMetric)))
 	require.NoError(t, err)
+	require.EqualValues(t, 400, resp.StatusCode)
+
+	time.Sleep(time.Millisecond * 15)
+	acc.AssertContainsTaggedFields(t, "cpu_load_short",
+		map[string]interface{}{"value": float64(12)},
+		map[string]string{"host": "server01"},
+	)
+}
+
+// http listener should add a newline at the end of the buffer if it's not there
+func TestWriteHTTPNoNewline(t *testing.T) {
+	listener := newTestHTTPListener()
+
+	acc := &testutil.Accumulator{}
+	require.NoError(t, listener.Start(acc))
+	defer listener.Stop()
+
+	time.Sleep(time.Millisecond * 25)
+
+	// post single message to listener
+	resp, err := http.Post("http://localhost:8186/write?db=mydb", "", bytes.NewBuffer([]byte(testMsgNoNewline)))
+	require.NoError(t, err)
 	require.EqualValues(t, 204, resp.StatusCode)

 	time.Sleep(time.Millisecond * 15)
@@ -83,11 +105,133 @@ func TestWriteHTTP(t *testing.T) {
 	)
 }

+func TestWriteHTTPMaxLineSizeIncrease(t *testing.T) {
+	listener := &HTTPListener{
+		ServiceAddress: ":8296",
+		MaxLineSize:    128 * 1000,
+	}
+
+	acc := &testutil.Accumulator{}
+	require.NoError(t, listener.Start(acc))
+	defer listener.Stop()
+
+	time.Sleep(time.Millisecond * 25)
+
+	// Post a gigantic metric to the listener and verify that it writes OK this time:
+	resp, err := http.Post("http://localhost:8296/write?db=mydb", "", bytes.NewBuffer([]byte(hugeMetric)))
+	require.NoError(t, err)
+	require.EqualValues(t, 204, resp.StatusCode)
+}
+
+func TestWriteHTTPVerySmallMaxBody(t *testing.T) {
+	listener := &HTTPListener{
+		ServiceAddress: ":8297",
+		MaxBodySize:    4096,
+	}
+
+	acc := &testutil.Accumulator{}
+	require.NoError(t, listener.Start(acc))
+	defer listener.Stop()
+
+	time.Sleep(time.Millisecond * 25)
+
+	resp, err := http.Post("http://localhost:8297/write", "", bytes.NewBuffer([]byte(hugeMetric)))
+	require.NoError(t, err)
+	require.EqualValues(t, 413, resp.StatusCode)
+}
+
+func TestWriteHTTPVerySmallMaxLineSize(t *testing.T) {
+	listener := &HTTPListener{
+		ServiceAddress: ":8298",
+		MaxLineSize:    70,
+	}
+
+	acc := &testutil.Accumulator{}
+	require.NoError(t, listener.Start(acc))
+	defer listener.Stop()
+
+	time.Sleep(time.Millisecond * 25)
+
+	resp, err := http.Post("http://localhost:8298/write", "", bytes.NewBuffer([]byte(testMsgs)))
+	require.NoError(t, err)
+	require.EqualValues(t, 204, resp.StatusCode)
+
+	time.Sleep(time.Millisecond * 15)
+	hostTags := []string{"server02", "server03",
+		"server04", "server05", "server06"}
+	for _, hostTag := range hostTags {
+		acc.AssertContainsTaggedFields(t, "cpu_load_short",
+			map[string]interface{}{"value": float64(12)},
+			map[string]string{"host": hostTag},
+		)
+	}
+}
+
+func TestWriteHTTPLargeLinesSkipped(t *testing.T) {
+	listener := &HTTPListener{
+		ServiceAddress: ":8300",
+		MaxLineSize:    100,
+	}
+
+	acc := &testutil.Accumulator{}
+	require.NoError(t, listener.Start(acc))
+	defer listener.Stop()
+
+	time.Sleep(time.Millisecond * 25)
+
+	resp, err := http.Post("http://localhost:8300/write", "", bytes.NewBuffer([]byte(hugeMetric+testMsgs)))
+	require.NoError(t, err)
+	require.EqualValues(t, 400, resp.StatusCode)
+
+	time.Sleep(time.Millisecond * 15)
+	hostTags := []string{"server02", "server03",
+		"server04", "server05", "server06"}
+	for _, hostTag := range hostTags {
+		acc.AssertContainsTaggedFields(t, "cpu_load_short",
+			map[string]interface{}{"value": float64(12)},
+			map[string]string{"host": hostTag},
+		)
+	}
+}
+
+// test that writing gzipped data works
+func TestWriteHTTPGzippedData(t *testing.T) {
+	listener := &HTTPListener{
+		ServiceAddress: ":8299",
+	}
+
+	acc := &testutil.Accumulator{}
+	require.NoError(t, listener.Start(acc))
+	defer listener.Stop()
+
+	time.Sleep(time.Millisecond * 25)
+
+	data, err := ioutil.ReadFile("./testdata/testmsgs.gz")
+	require.NoError(t, err)
+
+	req, err := http.NewRequest("POST", "http://localhost:8299/write", bytes.NewBuffer(data))
+	require.NoError(t, err)
+	req.Header.Set("Content-Encoding", "gzip")
+
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	require.NoError(t, err)
+	require.EqualValues(t, 204, resp.StatusCode)
+
+	time.Sleep(time.Millisecond * 50)
+	hostTags := []string{"server02", "server03",
+		"server04", "server05", "server06"}
+	for _, hostTag := range hostTags {
+		acc.AssertContainsTaggedFields(t, "cpu_load_short",
+			map[string]interface{}{"value": float64(12)},
+			map[string]string{"host": hostTag},
+		)
+	}
+}
+
 // writes 25,000 metrics to the listener with 10 different writers
 func TestWriteHTTPHighTraffic(t *testing.T) {
-	listener := &HttpListener{ServiceAddress: ":8286"}
-	parser, _ := parsers.NewInfluxParser()
-	listener.SetParser(parser)
+	listener := &HTTPListener{ServiceAddress: ":8286"}

 	acc := &testutil.Accumulator{}
 	require.NoError(t, listener.Start(acc))
@@ -99,26 +243,25 @@ func TestWriteHTTPHighTraffic(t *testing.T) {
 	var wg sync.WaitGroup
 	for i := 0; i < 10; i++ {
 		wg.Add(1)
-		go func() {
+		go func(innerwg *sync.WaitGroup) {
+			defer innerwg.Done()
 			for i := 0; i < 500; i++ {
 				resp, err := http.Post("http://localhost:8286/write?db=mydb", "", bytes.NewBuffer([]byte(testMsgs)))
 				require.NoError(t, err)
 				require.EqualValues(t, 204, resp.StatusCode)
 			}
-			wg.Done()
-		}()
+		}(&wg)
 	}

 	wg.Wait()
-	time.Sleep(time.Millisecond * 50)
+	time.Sleep(time.Millisecond * 250)
 	listener.Gather(acc)

 	require.Equal(t, int64(25000), int64(acc.NMetrics()))
 }

 func TestReceive404ForInvalidEndpoint(t *testing.T) {
-	listener := newTestHttpListener()
-	listener.parser, _ = parsers.NewInfluxParser()
+	listener := newTestHTTPListener()

 	acc := &testutil.Accumulator{}
 	require.NoError(t, listener.Start(acc))
@@ -135,8 +278,7 @@ func TestReceive404ForInvalidEndpoint(t *testing.T) {
 func TestWriteHTTPInvalid(t *testing.T) {
 	time.Sleep(time.Millisecond * 250)

-	listener := newTestHttpListener()
-	listener.parser, _ = parsers.NewInfluxParser()
+	listener := newTestHTTPListener()

 	acc := &testutil.Accumulator{}
 	require.NoError(t, listener.Start(acc))
@@ -153,8 +295,7 @@ func TestWriteHTTPInvalid(t *testing.T) {
 func TestWriteHTTPEmpty(t *testing.T) {
 	time.Sleep(time.Millisecond * 250)

-	listener := newTestHttpListener()
-	listener.parser, _ = parsers.NewInfluxParser()
+	listener := newTestHTTPListener()

 	acc := &testutil.Accumulator{}
 	require.NoError(t, listener.Start(acc))
@@ -171,8 +312,7 @@ func TestWriteHTTPEmpty(t *testing.T) {
 func TestQueryAndPingHTTP(t *testing.T) {
 	time.Sleep(time.Millisecond * 250)

-	listener := newTestHttpListener()
-	listener.parser, _ = parsers.NewInfluxParser()
+	listener := newTestHTTPListener()

 	acc := &testutil.Accumulator{}
 	require.NoError(t, listener.Start(acc))
--- a/plugins/inputs/http_listener/stoppableListener/LICENSE
+++ b/plugins/inputs/http_listener/stoppableListener/LICENSE
@@ -1,10 +0,0 @@
-Copyright (c) 2014, Eric Urban
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/plugins/inputs/http_listener/stoppableListener/listener.go
+++ b/plugins/inputs/http_listener/stoppableListener/listener.go
@@ -1,62 +0,0 @@
-package stoppableListener
-
-import (
-	"errors"
-	"net"
-	"time"
-)
-
-type StoppableListener struct {
-	*net.TCPListener          //Wrapped listener
-	stop             chan int //Channel used only to indicate listener should shutdown
-}
-
-func New(l net.Listener) (*StoppableListener, error) {
-	tcpL, ok := l.(*net.TCPListener)
-
-	if !ok {
-		return nil, errors.New("Cannot wrap listener")
-	}
-
-	retval := &StoppableListener{}
-	retval.TCPListener = tcpL
-	retval.stop = make(chan int)
-
-	return retval, nil
-}
-
-var StoppedError = errors.New("Listener stopped")
-
-func (sl *StoppableListener) Accept() (net.Conn, error) {
-
-	for {
-		//Wait up to one second for a new connection
-		sl.SetDeadline(time.Now().Add(time.Second))
-
-		newConn, err := sl.TCPListener.Accept()
-
-		//Check for the channel being closed
-		select {
-		case <-sl.stop:
-			return nil, StoppedError
-		default:
-			//If the channel is still open, continue as normal
-		}
-
-		if err != nil {
-			netErr, ok := err.(net.Error)
-
-			//If this is a timeout, then continue to wait for
-			//new connections
-			if ok && netErr.Timeout() && netErr.Temporary() {
-				continue
-			}
-		}
-
-		return newConn, err
-	}
-}
-
-func (sl *StoppableListener) Stop() {
-	close(sl.stop)
-}
--- a/plugins/inputs/http_listener/testdata/testmsgs.gz
+++ b/plugins/inputs/http_listener/testdata/testmsgs.gz
--- a/plugins/inputs/httpjson/README.md
+++ b/plugins/inputs/httpjson/README.md
@@ -37,6 +37,8 @@ You can also specify which keys from server response should be considered tags:
  ]
 ```

+If the JSON response is an array of objects, then each object will be parsed with the same configuration.
+
 You can also specify additional request parameters for the service:

 ```
@@ -150,3 +152,53 @@ httpjson_mycollector1_b_e,server='http://my.service.com/_stats' value=5
 httpjson_mycollector2_load,server='http://service.net/json/stats' value=100
 httpjson_mycollector2_users,server='http://service.net/json/stats' value=1335
 ```
+
+# Example 3, Multiple Metrics in Response:
+
+The response JSON can be treated as an array of data points that are all parsed with the same configuration.
+
+```
+[[inputs.httpjson]]
+  name = "mycollector"
+  servers = [
+    "http://my.service.com/_stats"
+  ]
+  # HTTP method to use (case-sensitive)
+  method = "GET"
+  tag_keys = ["service"]
+```
+
+which responds with the following JSON:
+
+```json
+[
+    {
+        "service": "service01",
+        "a": 0.5,
+        "b": {
+            "c": "some text",
+            "d": 0.1,
+            "e": 5
+        }
+    },
+    {
+        "service": "service02",
+        "a": 0.6,
+        "b": {
+            "c": "some text",
+            "d": 0.2,
+            "e": 6
+        }
+    }
+]
+```
+
+The collected metrics will be:
+```
+httpjson_mycollector_a,service='service01',server='http://my.service.com/_stats' value=0.5
+httpjson_mycollector_b_d,service='service01',server='http://my.service.com/_stats' value=0.1
+httpjson_mycollector_b_e,service='service01',server='http://my.service.com/_stats' value=5
+httpjson_mycollector_a,service='service02',server='http://my.service.com/_stats' value=0.6
+httpjson_mycollector_b_d,service='service02',server='http://my.service.com/_stats' value=0.2
+httpjson_mycollector_b_e,service='service02',server='http://my.service.com/_stats' value=6
+```
--- a/plugins/inputs/httpjson/httpjson_test.go
+++ b/plugins/inputs/httpjson/httpjson_test.go
@@ -511,3 +511,52 @@ func TestHttpJson200Tags(t *testing.T) {
 		}
 	}
 }
+
+const validJSONArrayTags = `
+[
+	{
+		"value": 15,
+		"role": "master",
+		"build": "123"
+	},
+	{
+		"value": 17,
+		"role": "slave",
+		"build": "456"
+	}
+]`
+
+// Test that array data is collected correctly
+func TestHttpJsonArray200Tags(t *testing.T) {
+	httpjson := genMockHttpJson(validJSONArrayTags, 200)
+
+	for _, service := range httpjson {
+		if service.Name == "other_webapp" {
+			var acc testutil.Accumulator
+			err := service.Gather(&acc)
+			// Set responsetime
+			for _, p := range acc.Metrics {
+				p.Fields["response_time"] = 1.0
+			}
+			require.NoError(t, err)
+			assert.Equal(t, 8, acc.NFields())
+			assert.Equal(t, uint64(4), acc.NMetrics())
+
+			for _, m := range acc.Metrics {
+				if m.Tags["role"] == "master" {
+					assert.Equal(t, "123", m.Tags["build"])
+					assert.Equal(t, float64(15), m.Fields["value"])
+					assert.Equal(t, float64(1), m.Fields["response_time"])
+					assert.Equal(t, "httpjson_"+service.Name, m.Measurement)
+				} else if m.Tags["role"] == "slave" {
+					assert.Equal(t, "456", m.Tags["build"])
+					assert.Equal(t, float64(17), m.Fields["value"])
+					assert.Equal(t, float64(1), m.Fields["response_time"])
+					assert.Equal(t, "httpjson_"+service.Name, m.Measurement)
+				} else {
+					assert.FailNow(t, "unknown metric")
+				}
+			}
+		}
+	}
+}
--- a/plugins/inputs/influxdb/influxdb.go
+++ b/plugins/inputs/influxdb/influxdb.go
@@ -94,32 +94,33 @@ type point struct {
 }

 type memstats struct {
-	Alloc         int64   `json:"Alloc"`
-	TotalAlloc    int64   `json:"TotalAlloc"`
-	Sys           int64   `json:"Sys"`
-	Lookups       int64   `json:"Lookups"`
-	Mallocs       int64   `json:"Mallocs"`
-	Frees         int64   `json:"Frees"`
-	HeapAlloc     int64   `json:"HeapAlloc"`
-	HeapSys       int64   `json:"HeapSys"`
-	HeapIdle      int64   `json:"HeapIdle"`
-	HeapInuse     int64   `json:"HeapInuse"`
-	HeapReleased  int64   `json:"HeapReleased"`
-	HeapObjects   int64   `json:"HeapObjects"`
-	StackInuse    int64   `json:"StackInuse"`
-	StackSys      int64   `json:"StackSys"`
-	MSpanInuse    int64   `json:"MSpanInuse"`
-	MSpanSys      int64   `json:"MSpanSys"`
-	MCacheInuse   int64   `json:"MCacheInuse"`
-	MCacheSys     int64   `json:"MCacheSys"`
-	BuckHashSys   int64   `json:"BuckHashSys"`
-	GCSys         int64   `json:"GCSys"`
-	OtherSys      int64   `json:"OtherSys"`
-	NextGC        int64   `json:"NextGC"`
-	LastGC        int64   `json:"LastGC"`
-	PauseTotalNs  int64   `json:"PauseTotalNs"`
-	NumGC         int64   `json:"NumGC"`
-	GCCPUFraction float64 `json:"GCCPUFraction"`
+	Alloc         int64      `json:"Alloc"`
+	TotalAlloc    int64      `json:"TotalAlloc"`
+	Sys           int64      `json:"Sys"`
+	Lookups       int64      `json:"Lookups"`
+	Mallocs       int64      `json:"Mallocs"`
+	Frees         int64      `json:"Frees"`
+	HeapAlloc     int64      `json:"HeapAlloc"`
+	HeapSys       int64      `json:"HeapSys"`
+	HeapIdle      int64      `json:"HeapIdle"`
+	HeapInuse     int64      `json:"HeapInuse"`
+	HeapReleased  int64      `json:"HeapReleased"`
+	HeapObjects   int64      `json:"HeapObjects"`
+	StackInuse    int64      `json:"StackInuse"`
+	StackSys      int64      `json:"StackSys"`
+	MSpanInuse    int64      `json:"MSpanInuse"`
+	MSpanSys      int64      `json:"MSpanSys"`
+	MCacheInuse   int64      `json:"MCacheInuse"`
+	MCacheSys     int64      `json:"MCacheSys"`
+	BuckHashSys   int64      `json:"BuckHashSys"`
+	GCSys         int64      `json:"GCSys"`
+	OtherSys      int64      `json:"OtherSys"`
+	NextGC        int64      `json:"NextGC"`
+	LastGC        int64      `json:"LastGC"`
+	PauseTotalNs  int64      `json:"PauseTotalNs"`
+	PauseNs       [256]int64 `json:"PauseNs"`
+	NumGC         int64      `json:"NumGC"`
+	GCCPUFraction float64    `json:"GCCPUFraction"`
 }

 // Gathers data from a particular URL
@@ -202,6 +203,7 @@ func (i *InfluxDB) gatherURL(
 						"next_gc":         m.NextGC,
 						"last_gc":         m.LastGC,
 						"pause_total_ns":  m.PauseTotalNs,
+						"pause_ns":        m.PauseNs[(m.NumGC+255)%256],
 						"num_gc":          m.NumGC,
 						"gcc_pu_fraction": m.GCCPUFraction,
 					},
--- a/plugins/inputs/influxdb/influxdb_test.go
+++ b/plugins/inputs/influxdb/influxdb_test.go
@@ -86,6 +86,7 @@ func TestInfluxDB(t *testing.T) {
 		"frees":           int64(381008),
 		"heap_idle":       int64(15802368),
 		"pause_total_ns":  int64(5132914),
+		"pause_ns":        int64(127053),
 		"lookups":         int64(77),
 		"heap_sys":        int64(33849344),
 		"mcache_sys":      int64(16384),
--- a/plugins/inputs/internal/README.md
+++ b/plugins/inputs/internal/README.md
@@ -0,0 +1,83 @@
+# Internal Input Plugin
+
+The `internal` plugin collects metrics about the telegraf agent itself.
+
+Note that some metrics are aggregates across all instances of one type of
+plugin.
+
+### Configuration:
+
+```toml
+# Collect statistics about itself
+[[inputs.internal]]
+  ## If true, collect telegraf memory stats.
+  # collect_memstats = true
+```
+
+### Measurements & Fields:
+
+memstats are taken from the Go runtime: https://golang.org/pkg/runtime/#MemStats
+
+- internal\_memstats
+    - alloc\_bytes
+    - frees
+    - heap\_alloc\_bytes
+    - heap\_idle\_bytes
+    - heap\_in\_use\_bytes
+    - heap\_objects\_bytes
+    - heap\_released\_bytes
+    - heap\_sys\_bytes
+    - mallocs
+    - num\_gc
+    - pointer\_lookups
+    - sys\_bytes
+    - total\_alloc\_bytes
+
+agent stats collect aggregate stats on all telegraf plugins.
+
+- internal\_agent
+    - gather\_errors
+    - metrics\_dropped
+    - metrics\_gathered
+    - metrics\_written
+
+internal\_gather stats collect aggregate stats on all input plugins
+that are of the same input type. They are tagged with `input=<plugin_name>`.
+
+- internal\_gather
+    - gather\_time\_ns
+    - metrics\_gathered
+
+internal\_write stats collect aggregate stats on all output plugins
+that are of the same input type. They are tagged with `output=<plugin_name>`.
+
+
+- internal\_write
+    - buffer\_limit
+    - buffer\_size
+    - metrics\_written
+    - metrics\_filtered
+    - write\_time\_ns
+
+internal\_\<plugin\_name\> are metrics which are defined on a per-plugin basis, and
+usually contain tags which differentiate each instance of a particular type of
+plugin.
+
+- internal\_\<plugin\_name\>
+    - individual plugin-specific fields, such as requests counts.
+
+### Tags:
+
+All measurements for specific plugins are tagged with information relevant
+to each particular plugin.
+
+### Example Output:
+
+```
+internal_memstats,host=tyrion alloc_bytes=4457408i,sys_bytes=10590456i,pointer_lookups=7i,mallocs=17642i,frees=7473i,heap_sys_bytes=6848512i,heap_idle_bytes=1368064i,heap_in_use_bytes=5480448i,heap_released_bytes=0i,total_alloc_bytes=6875560i,heap_alloc_bytes=4457408i,heap_objects_bytes=10169i,num_gc=2i 1480682800000000000
+internal_agent,host=tyrion metrics_written=18i,metrics_dropped=0i,metrics_gathered=19i,gather_errors=0i 1480682800000000000
+internal_write,output=file,host=tyrion buffer_limit=10000i,write_time_ns=636609i,metrics_written=18i,buffer_size=0i 1480682800000000000
+internal_gather,input=internal,host=tyrion metrics_gathered=19i,gather_time_ns=442114i 1480682800000000000
+internal_gather,input=http_listener,host=tyrion metrics_gathered=0i,gather_time_ns=167285i 1480682800000000000
+internal_http_listener,address=:8186,host=tyrion queries_received=0i,writes_received=0i,requests_received=0i,buffers_created=0i,requests_served=0i,pings_received=0i,bytes_received=0i,not_founds_served=0i,pings_served=0i,queries_served=0i,writes_served=0i 1480682800000000000
+```
--- a/plugins/inputs/internal/internal.go
+++ b/plugins/inputs/internal/internal.go
@@ -0,0 +1,66 @@
+package internal
+
+import (
+	"runtime"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/selfstat"
+)
+
+type Self struct {
+	CollectMemstats bool
+}
+
+func NewSelf() telegraf.Input {
+	return &Self{
+		CollectMemstats: true,
+	}
+}
+
+var sampleConfig = `
+  ## If true, collect telegraf memory stats.
+  # collect_memstats = true
+`
+
+func (s *Self) Description() string {
+	return "Collect statistics about itself"
+}
+
+func (s *Self) SampleConfig() string {
+	return sampleConfig
+}
+
+func (s *Self) Gather(acc telegraf.Accumulator) error {
+	if s.CollectMemstats {
+		m := &runtime.MemStats{}
+		runtime.ReadMemStats(m)
+		fields := map[string]interface{}{
+			"alloc_bytes":       m.Alloc,      // bytes allocated and not yet freed
+			"total_alloc_bytes": m.TotalAlloc, // bytes allocated (even if freed)
+			"sys_bytes":         m.Sys,        // bytes obtained from system (sum of XxxSys below)
+			"pointer_lookups":   m.Lookups,    // number of pointer lookups
+			"mallocs":           m.Mallocs,    // number of mallocs
+			"frees":             m.Frees,      // number of frees
+			// Main allocation heap statistics.
+			"heap_alloc_bytes":    m.HeapAlloc,    // bytes allocated and not yet freed (same as Alloc above)
+			"heap_sys_bytes":      m.HeapSys,      // bytes obtained from system
+			"heap_idle_bytes":     m.HeapIdle,     // bytes in idle spans
+			"heap_in_use_bytes":   m.HeapInuse,    // bytes in non-idle span
+			"heap_released_bytes": m.HeapReleased, // bytes released to the OS
+			"heap_objects_bytes":  m.HeapObjects,  // total number of allocated objects
+			"num_gc":              m.NumGC,
+		}
+		acc.AddFields("internal_memstats", fields, map[string]string{})
+	}
+
+	for _, m := range selfstat.Metrics() {
+		acc.AddFields(m.Name(), m.Fields(), m.Tags(), m.Time())
+	}
+
+	return nil
+}
+
+func init() {
+	inputs.Add("internal", NewSelf)
+}
--- a/plugins/inputs/internal/internal_test.go
+++ b/plugins/inputs/internal/internal_test.go
@@ -0,0 +1,62 @@
+package internal
+
+import (
+	"testing"
+
+	"github.com/influxdata/telegraf/selfstat"
+	"github.com/influxdata/telegraf/testutil"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestSelfPlugin(t *testing.T) {
+	s := NewSelf()
+	acc := &testutil.Accumulator{}
+
+	s.Gather(acc)
+	assert.True(t, acc.HasMeasurement("internal_memstats"))
+
+	// test that a registered stat is incremented
+	stat := selfstat.Register("mytest", "test", map[string]string{"test": "foo"})
+	stat.Incr(1)
+	stat.Incr(2)
+	s.Gather(acc)
+	acc.AssertContainsTaggedFields(t, "internal_mytest",
+		map[string]interface{}{
+			"test": int64(3),
+		},
+		map[string]string{
+			"test": "foo",
+		},
+	)
+	acc.ClearMetrics()
+
+	// test that a registered stat is set properly
+	stat.Set(101)
+	s.Gather(acc)
+	acc.AssertContainsTaggedFields(t, "internal_mytest",
+		map[string]interface{}{
+			"test": int64(101),
+		},
+		map[string]string{
+			"test": "foo",
+		},
+	)
+	acc.ClearMetrics()
+
+	// test that regular and timing stats can share the same measurement, and
+	// that timings are set properly.
+	timing := selfstat.RegisterTiming("mytest", "test_ns", map[string]string{"test": "foo"})
+	timing.Incr(100)
+	timing.Incr(200)
+	s.Gather(acc)
+	acc.AssertContainsTaggedFields(t, "internal_mytest",
+		map[string]interface{}{
+			"test":    int64(101),
+			"test_ns": int64(150),
+		},
+		map[string]string{
+			"test": "foo",
+		},
+	)
+}
--- a/Show More
+++ b/Show More