Set release date for 1.5.0

Remove AWS credential check from cloudwatch output (#3583 )
This method is reported to not work with IAM Instance Profiles, and we do not want to make any calls that would require additional permissions. (cherry picked from commit 5b40173bcb)
2017-12-14 10:59:13 -08:00 · 2017-12-13 17:52:45 -08:00 · 2017-12-13 11:18:34 -08:00 · 2017-12-13 11:17:55 -08:00 · 2017-12-13 10:58:16 -08:00 · 2017-12-13 10:57:28 -08:00
257 changed files with 10788 additions and 39473 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,50 +0,0 @@
---
-defaults: &defaults
-  docker:
-    - image: 'circleci/golang:1.9.4'
-  working_directory: '/go/src/github.com/influxdata/telegraf'
-version: 2
-jobs:
-  build:
-    <<: *defaults
-    steps:
-      - checkout
-      - run: 'make deps'
-      - run: 'make test-ci'
-  release:
-    <<: *defaults
-    steps:
-      - checkout
-      - run: './scripts/release.sh'
-      - store_artifacts:
-          path: './artifacts'
-          destination: '.'
-  nightly:
-    <<: *defaults
-    steps:
-      - checkout
-      - run: './scripts/release.sh'
-      - store_artifacts:
-          path: './artifacts'
-          destination: '.'
-workflows:
-  version: 2
-  build_and_release:
-    jobs:
-      - 'build'
-      - 'release':
-          requires:
-            - 'build'
-  nightly:
-    jobs:
-      - 'build'
-      - 'nightly':
-          requires:
-            - 'build'
-    triggers:
-      - schedule:
-          cron: "0 18 * * *"
-          filters:
-            branches:
-              only:
-                - master
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
-/build
+build
+tivan
+.vagrant
 /telegraf
-/telegraf.gz
+.idea
+*~
+*#
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,154 +1,9 @@
-## v1.6 [unreleased]
-
-### Release Notes
-
- The `mysql` input plugin has been updated fix a number of type convertion
-  issues.  This may cause a `field type error` when inserting into InfluxDB due
-  the change of types.
-
-  To address this we have introduced a new `metric_version` option to control
-  enabling the new format.  For in depth recommendations on upgrading please
-  reference the [mysql plugin documentation](./plugins/inputs/mysql/README.md#metric-version).
-
-  It is encouraged to migrate to the new model when possible as the old version
-  is deprecated and will be removed in a future version.
-
- The `postgresql` plugins now defaults to using a persistent connection to the database.
-  In environments where TCP connections are terminated the `max_lifetime`
-  setting should be set less than the collection `interval` to prevent errors.
-
- The `sqlserver` input plugin has a new query and data model that can be enabled
-  by setting `query_version = 2`.  It is encouraged to migrate to the new
-  model when possible as the old version is deprecated and will be removed in
-  a future version.
-
- An option has been added to the `openldap` input plugin that reverses metric
-  name to improve grouping.  This change is enabled when `reverse_metric_names = true`
-  is set.  It is encouraged to enable this option when possible as the old
-  ordering is deprecated.
-
- The new `http` input configured with `data_format = "json"` can perform the
-  same task as the, now deprecated, `httpjson` input.
-
-
-### New Inputs
-
- [http](./plugins/inputs/http/README.md) - Thanks to @grange74
- [ipset](./plugins/inputs/ipset/README.md) - Thanks to @sajoupa
- [nats](./plugins/inputs/nats/README.md) - Thanks to @mjs & @levex
-
-### New Processors
-
- [override](./plugins/processors/override/README.md) - Thanks to @KarstenSchnitter
-
-### New Parsers
-
- [dropwizard](./docs/DATA_FORMATS_INPUT.md#dropwizard) - Thanks to @atzoum
-
-### Features
-
- [#3551](https://github.com/influxdata/telegraf/pull/3551): Add health status mapping from string to int in elasticsearch input.
- [#3580](https://github.com/influxdata/telegraf/pull/3580): Add control over which stats to gather in basicstats aggregator.
- [#3596](https://github.com/influxdata/telegraf/pull/3596): Add messages_delivered_get to rabbitmq input.
- [#3632](https://github.com/influxdata/telegraf/pull/3632): Add wired field to mem input.
- [#3619](https://github.com/influxdata/telegraf/pull/3619): Add support for gathering exchange metrics to the rabbitmq input.
- [#3565](https://github.com/influxdata/telegraf/pull/3565): Add support for additional metrics on Linux in zfs input.
- [#3524](https://github.com/influxdata/telegraf/pull/3524): Add available_entropy field to kernel input plugin.
- [#3643](https://github.com/influxdata/telegraf/pull/3643): Add user privilege level setting to IPMI sensors.
- [#2701](https://github.com/influxdata/telegraf/pull/2701): Use persistent connection to postgresql database.
- [#2846](https://github.com/influxdata/telegraf/pull/2846): Add support for dropwizard input format.
- [#3666](https://github.com/influxdata/telegraf/pull/3666): Add container health metrics to docker input.
- [#3687](https://github.com/influxdata/telegraf/pull/3687): Add support for using globs in devices list of diskio input plugin.
- [#2754](https://github.com/influxdata/telegraf/pull/2754): Allow running as console application on Windows.
- [#3703](https://github.com/influxdata/telegraf/pull/3703): Add listener counts and node running status to rabbitmq input.
- [#3674](https://github.com/influxdata/telegraf/pull/3674): Add NATS Monitoring Input Plugin.
- [#3702](https://github.com/influxdata/telegraf/pull/3702): Add ability to select which queues will be gathered in rabbitmq input.
- [#3726](https://github.com/influxdata/telegraf/pull/3726): Add support for setting bsd source address to the ping input.
- [#3346](https://github.com/influxdata/telegraf/pull/3346): Add Ipset input plugin.
- [#3719](https://github.com/influxdata/telegraf/pull/3719): Add TLS and HTTP basic auth to prometheus_client output.
- [#3618](https://github.com/influxdata/telegraf/pull/3618): Add new sqlserver output data model.
- [#3559](https://github.com/influxdata/telegraf/pull/3559): Add native Go method for finding pids to procstat.
- [#3722](https://github.com/influxdata/telegraf/pull/3722): Add additional metrics and reverse metric names option to openldap.
- [#3769](https://github.com/influxdata/telegraf/pull/3769): Add TLS support to the mesos input plugin.
- [#3546](https://github.com/influxdata/telegraf/pull/3546): Add http input plugin.
- [#3781](https://github.com/influxdata/telegraf/pull/3781): Add keep alive support to the TCP mode of statsd.
- [#3783](https://github.com/influxdata/telegraf/pull/3783): Support deadline in ping plugin.
- [#3765](https://github.com/influxdata/telegraf/pull/3765): Add option to disable labels in prometheus output for string fields.
- [#3808](https://github.com/influxdata/telegraf/pull/3808): Add shard server stats to the mongodb input plugin.
- [#3713](https://github.com/influxdata/telegraf/pull/3713): Add server option to unbound plugin.
- [#3804](https://github.com/influxdata/telegraf/pull/3804): Convert boolean metric values to float in datadog output.
- [#3799](https://github.com/influxdata/telegraf/pull/3799): Add Solr 3 compatibility.
- [#3797](https://github.com/influxdata/telegraf/pull/3797): Add sum stat to basicstats aggregator.
- [#3626](https://github.com/influxdata/telegraf/pull/3626): Add ability to override proxy from environment in http response.
- [#3853](https://github.com/influxdata/telegraf/pull/3853): Add host to ping timeout log message.
- [#3773](https://github.com/influxdata/telegraf/pull/3773): Add override processor.
- [#3814](https://github.com/influxdata/telegraf/pull/3814): Add status_code and result tags and result_type field to http_response input.
- [#3880](https://github.com/influxdata/telegraf/pull/3880): Added config flag to skip collection of network protocol metrics.
- [#3927](https://github.com/influxdata/telegraf/pull/3927): Add TLS support to kapacitor input.
- [#3496](https://github.com/influxdata/telegraf/pull/3496): Add HTTP basic auth support to the http_listener input.
- [#3452](https://github.com/influxdata/telegraf/issues/3452): Tags in output InfluxDB Line Protocol are now sorted.
- [#3631](https://github.com/influxdata/telegraf/issues/3631): InfluxDB Line Protocol parser now accepts DOS line endings.
- [#2496](https://github.com/influxdata/telegraf/issues/2496): An option has been added to skip database creation in the InfluxDB output.
- [#3366](https://github.com/influxdata/telegraf/issues/3366): Add support for connecting to InfluxDB over a unix domain socket.
- [#3946](https://github.com/influxdata/telegraf/pull/3946): Add optional unsigned integer support to the influx data format.
- [#3811](https://github.com/influxdata/telegraf/pull/3811): Add TLS support to zookeeper input.
- [#2737](https://github.com/influxdata/telegraf/issues/2737): Add filters for container state to docker input.
-
-### Bugfixes
-
- [#1896](https://github.com/influxdata/telegraf/issues/1896): Fix various mysql data type conversions.
- [#3810](https://github.com/influxdata/telegraf/issues/3810): Fix metric buffer limit in internal plugin after reload.
- [#3801](https://github.com/influxdata/telegraf/issues/3801): Fix panic in http_response on invalid regex.
- [#3973](https://github.com/influxdata/telegraf/issues/3873): Fix socket_listener setting ReadBufferSize on tcp sockets.
- [#1575](https://github.com/influxdata/telegraf/issues/1575): Add tag for target url to phpfpm input.
- [#3868](https://github.com/influxdata/telegraf/issues/3868): Fix cannot unmarshal object error in DC/OS input.
- [#3648](https://github.com/influxdata/telegraf/issues/3648): Fix InfluxDB output not able to reconnect when server address changes.
- [#3957](https://github.com/influxdata/telegraf/issues/3957): Fix parsing of dos line endings in the smart input.
- [#3754](https://github.com/influxdata/telegraf/issues/3754): Fix precision truncation when no timestamp included.
-
-## v1.5.3 [2018-03-14]
-
-### Bugfixes
-
- [#3729](https://github.com/influxdata/telegraf/issues/3729): Set path to / if HOST_MOUNT_PREFIX matches full path.
- [#3739](https://github.com/influxdata/telegraf/issues/3739): Remove userinfo from url tag in prometheus input.
- [#3778](https://github.com/influxdata/telegraf/issues/3778): Fix ping plugin not reporting zero durations.
- [#3697](https://github.com/influxdata/telegraf/issues/3697): Disable keepalive in mqtt output to prevent deadlock.
- [#3786](https://github.com/influxdata/telegraf/pull/3786): Fix collation difference in sqlserver input.
- [#3871](https://github.com/influxdata/telegraf/pull/3871): Fix uptime metric in passenger input plugin.
- [#3851](https://github.com/influxdata/telegraf/issues/3851): Add output of stderr in case of error to exec log message.
-
-## v1.5.2 [2018-01-30]
-
-### Bugfixes
-
- [#3684](https://github.com/influxdata/telegraf/pull/3684): Ignore empty lines in Graphite plaintext.
- [#3604](https://github.com/influxdata/telegraf/issues/3604): Fix index out of bounds error in solr input plugin.
- [#3680](https://github.com/influxdata/telegraf/pull/3680): Reconnect before sending graphite metrics if disconnected.
- [#3693](https://github.com/influxdata/telegraf/pull/3693): Align aggregator period with internal ticker to avoid skipping metrics.
- [#3629](https://github.com/influxdata/telegraf/issues/3629): Fix a potential deadlock when using aggregators.
- [#3697](https://github.com/influxdata/telegraf/issues/3697): Limit wait time for writes in mqtt output.
- [#3698](https://github.com/influxdata/telegraf/issues/3698): Revert change in graphite output where dot in field key was replaced by underscore.
- [#3710](https://github.com/influxdata/telegraf/issues/3710): Add timeout to wavefront output write.
- [#3725](https://github.com/influxdata/telegraf/issues/3725): Exclude master_replid fields from redis input.
-
-## v1.5.1 [2018-01-10]
-
-### Bugfixes
-
- [#3624](https://github.com/influxdata/telegraf/pull/3624): Fix name error in jolokia2_agent sample config.
- [#3625](https://github.com/influxdata/telegraf/pull/3625): Fix DC/OS login expiration time.
- [#3593](https://github.com/influxdata/telegraf/pull/3593): Set Content-Type charset in influxdb output and allow it be overridden.
- [#3594](https://github.com/influxdata/telegraf/pull/3594): Document permissions setup for postfix input.
- [#3633](https://github.com/influxdata/telegraf/pull/3633): Fix deliver_get field in rabbitmq input.
- [#3607](https://github.com/influxdata/telegraf/issues/3607): Escape environment variables during config toml parsing.
-
 ## v1.5 [2017-12-14]

 ### New Plugins
 - [basicstats](./plugins/aggregators/basicstats/README.md) - Thanks to @toni-moreno
 - [bond](./plugins/inputs/bond/README.md) - Thanks to @ildarsv
- [cratedb](./plugins/outputs/cratedb/README.md) - Thanks to @felixge
+- [cratedb](./plugins/outputs/wavefront/README.md) - Thanks to @felixge
 - [dcos](./plugins/inputs/dcos/README.md) - Thanks to @influxdata
 - [jolokia2](./plugins/inputs/jolokia2/README.md) - Thanks to @dylanmei
 - [nginx_plus](./plugins/inputs/nginx_plus/README.md) - Thanks to @mplonka & @poblahblahblah
@@ -173,11 +28,6 @@
  plugin is deprecated and will be removed in a future release.  Users of this
  plugin are encouraged to update to the new `jolokia2` plugin.

- In the `postgresql` and `postgresql_extensible` plugins, the type of the oid
-  data type has changed from string to integer.  It is recommended to drop
-  affected fields until a new shard is started. For details on how to
-  workaround this issue please see [#3622](https://github.com/influxdata/telegraf/issues/3622).
-
 ### Features

 - [#3170](https://github.com/influxdata/telegraf/pull/3170): Add support for sharding based on metric name.
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -79,10 +79,7 @@ func (s *Simple) Description() string {
 }

 func (s *Simple) SampleConfig() string {
-    return `
-  ## Indicate if everything is fine
-  ok = true
-`
+    return "ok = true # indicate if everything is fine"
 }

 func (s *Simple) Gather(acc telegraf.Accumulator) error {
@@ -170,7 +167,7 @@ and `Stop()` methods.
 ### Service Plugin Guidelines

 * Same as the `Plugin` guidelines, except that they must conform to the
-[`telegraf.ServiceInput`](https://godoc.org/github.com/influxdata/telegraf#ServiceInput) interface.
+`inputs.ServiceInput` interface.

 ## Output Plugins

@@ -210,9 +207,7 @@ func (s *Simple) Description() string {
 }

 func (s *Simple) SampleConfig() string {
-    return `
-  ok = true
-`
+    return "url = localhost"
 }

 func (s *Simple) Connect() error {
--- a/16
+++ b/16
@@ -16,7 +16,7 @@ github.com/docker/go-connections 990a1a1a70b0da4c4cb70e117971a4f0babfbf1a
 github.com/eapache/go-resiliency b86b1ec0dd4209a588dc1285cdd471e73525c0b3
 github.com/eapache/go-xerial-snappy bb955e01b9346ac19dc29eb16586c90ded99a98c
 github.com/eapache/queue 44cc805cf13205b55f69e14bcb69867d1ae92f98
-github.com/eclipse/paho.mqtt.golang aff15770515e3c57fc6109da73d42b0d46f7f483
+github.com/eclipse/paho.mqtt.golang d4f545eb108a2d19f9b1a735689dbfb719bc21fb
 github.com/go-logfmt/logfmt 390ab7935ee28ec6b286364bba9b4dd6410cb3d5
 github.com/go-sql-driver/mysql 2e00b5cd70399450106cec6431c2e2ce3cae5034
 github.com/gobwas/glob bea32b9cd2d6f55753d94a28e959b13f0244797a
@@ -27,14 +27,12 @@ github.com/golang/snappy 7db9049039a047d955fe8c19b83c8ff5abd765c7
 github.com/go-ole/go-ole be49f7c07711fcb603cff39e1de7c67926dc0ba7
 github.com/google/go-cmp f94e52cad91c65a63acc1e75d4be223ea22e99bc
 github.com/gorilla/mux 392c28fe23e1c45ddba891b0320b3b5df220beea
-github.com/go-redis/redis 73b70592cdaa9e6abdfcfbf97b4a90d80728c836
 github.com/go-sql-driver/mysql 2e00b5cd70399450106cec6431c2e2ce3cae5034
 github.com/hailocab/go-hostpool e80d13ce29ede4452c43dea11e79b9bc8a15b478
 github.com/hashicorp/consul 63d2fc68239b996096a1c55a0d4b400ea4c2583f
-github.com/influxdata/tail c43482518d410361b6c383d7aebce33d0471d7bc
+github.com/influxdata/tail a395bf99fe07c233f41fba0735fa2b13b58588ea
 github.com/influxdata/toml 5d1d907f22ead1cd47adde17ceec5bda9cacaf8f
 github.com/influxdata/wlog 7c63b0a71ef8300adc255344d275e10e5c3a71ec
-github.com/fsnotify/fsnotify c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9
 github.com/jackc/pgx 63f58fd32edb5684b9e9f4cfaac847c6b42b3917
 github.com/jmespath/go-jmespath bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d
 github.com/kardianos/osext c2c54e542fb797ad986b31721e1baedf214ca413
@@ -46,7 +44,6 @@ github.com/miekg/dns 99f84ae56e75126dd77e5de4fae2ea034a468ca1
 github.com/mitchellh/mapstructure d0303fe809921458f417bcf828397a65db30a7e4
 github.com/multiplay/go-ts3 07477f49b8dfa3ada231afc7b7b17617d42afe8e
 github.com/naoina/go-stringutil 6b638e95a32d0c1131db0e7fe83775cbea4a0d0b
-github.com/nats-io/gnatsd 393bbb7c031433e68707c8810fda0bfcfbe6ab9b
 github.com/nats-io/go-nats ea9585611a4ab58a205b9b125ebd74c389a6b898
 github.com/nats-io/nats ea9585611a4ab58a205b9b125ebd74c389a6b898
 github.com/nats-io/nuid 289cccf02c178dc782430d534e3c1f5b72af807f
@@ -66,17 +63,15 @@ github.com/prometheus/procfs 1878d9fbb537119d24b21ca07effd591627cd160
 github.com/rcrowley/go-metrics 1f30fe9094a513ce4c700b9a54458bbb0c96996c
 github.com/samuel/go-zookeeper 1d7be4effb13d2d908342d349d71a284a7542693
 github.com/satori/go.uuid 5bf94b69c6b68ee1b541973bb8e1144db23a194b
-github.com/shirou/gopsutil fc04d2dd9a512906a2604242b35275179e250eda
+github.com/shirou/gopsutil 384a55110aa5ae052eb93ea94940548c1e305a99
 github.com/shirou/w32 3c9377fc6748f222729a8270fe2775d149a249ad
 github.com/Shopify/sarama 3b1b38866a79f06deddf0487d5c27ba0697ccd65
 github.com/Sirupsen/logrus 61e43dc76f7ee59a82bdf3d71033dc12bea4c77d
 github.com/soniah/gosnmp 5ad50dc75ab389f8a1c9f8a67d3a1cd85f67ed15
 github.com/StackExchange/wmi f3e2bae1e0cb5aef83e319133eabfee30013a4a5
 github.com/streadway/amqp 63795daa9a446c920826655f26ba31c81c860fd6
-github.com/stretchr/objx facf9a85c22f48d2f52f2380e4efce1768749a89
-github.com/stretchr/testify 12b6f73e6084dad08a7c6e575284b177ecafbc71
-github.com/tidwall/gjson 0623bd8fbdbf97cc62b98d15108832851a658e59
-github.com/tidwall/match 173748da739a410c5b0b813b956f89ff94730b4c
+github.com/stretchr/objx 1a9d0bb9f541897e62256577b352fdbc1fb4fd94
+github.com/stretchr/testify 4d4bfba8f1d1027c4fdbe371823030df51419987
 github.com/vjeantet/grok d73e972b60935c7fec0b4ffbc904ed39ecaf7efe
 github.com/wvanbergen/kafka bc265fedb9ff5b5c5d3c0fdcef4a819b3523d3ee
 github.com/wvanbergen/kazoo-go 968957352185472eacb69215fa3dbfcfdbac1096
@@ -88,6 +83,7 @@ golang.org/x/sys 739734461d1c916b6c72a63d7efda2b27edb369f
 golang.org/x/text 506f9d5c962f284575e88337e7d9296d27e729d3
 gopkg.in/asn1-ber.v1 4e86f4367175e39f69d9358a5f17b4dda270378d
 gopkg.in/fatih/pool.v2 6e328e67893eb46323ad06f0e92cb9536babbabc
+gopkg.in/fsnotify.v1 a8a77c9133d2d6fd8334f3260d06f60e8d80a5fb
 gopkg.in/gorethink/gorethink.v3 7ab832f7b65573104a555d84a27992ae9ea1f659
 gopkg.in/ldap.v2 8168ee085ee43257585e50c6441aadf54ecb2c9f
 gopkg.in/mgo.v2 3f83fa5005286a7fe593b055f0d7771a7dce4655
--- a/115
+++ b/115
@@ -2,10 +2,6 @@ PREFIX := /usr/local
 VERSION := $(shell git describe --exact-match --tags 2>/dev/null)
 BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
 COMMIT := $(shell git rev-parse --short HEAD)
-GOFILES ?= $(shell git ls-files '*.go')
-GOFMT ?= $(shell gofmt -l $(filter-out plugins/parsers/influx/machine.go, $(GOFILES)))
-BUILDFLAGS ?= 
-
 ifdef GOBIN
 PATH := $(GOBIN):$(PATH)
 else
@@ -24,7 +20,6 @@ all:
 	$(MAKE) telegraf

 deps:
-	go get -u github.com/golang/lint/golint
 	go get github.com/sparrc/gdm
 	gdm restore

@@ -41,56 +36,98 @@ install: telegraf
 test:
 	go test -short ./...

-fmt:
-	@gofmt -w $(filter-out plugins/parsers/influx/machine.go, $(GOFILES))
-
-fmtcheck:
-	@echo '[INFO] running gofmt to identify incorrectly formatted code...'
-	@if [ ! -z $(GOFMT) ]; then \
-		echo "[ERROR] gofmt has found errors in the following files:"  ; \
-		echo "$(GOFMT)" ; \
-		echo "" ;\
-		echo "Run make fmt to fix them." ; \
-		exit 1 ;\
-	fi
-	@echo '[INFO] done.'
-
 test-windows:
 	go test ./plugins/inputs/ping/...
 	go test ./plugins/inputs/win_perf_counters/...
 	go test ./plugins/inputs/win_services/...
-	go test ./plugins/inputs/procstat/...

-# vet runs the Go source code static analysis tool `vet` to find
-# any common errors.
-vet:
-	@echo 'go vet $$(go list ./... | grep -v ./plugins/parsers/influx)'
-	@go vet $$(go list ./... | grep -v ./plugins/parsers/influx) ; if [ $$? -eq 1 ]; then \
-		echo ""; \
-		echo "go vet has found suspicious constructs. Please remediate any reported errors"; \
-		echo "to fix them before submitting code for review."; \
-		exit 1; \
-	fi
+lint:
+	go vet ./...

-test-ci: fmtcheck vet
-	go test -short./...
-
-test-all: fmtcheck vet
+test-all: lint
 	go test ./...

 package:
 	./scripts/build.py --package --platform=all --arch=all

 clean:
-	rm -f telegraf
-	rm -f telegraf.exe
+	-rm -f telegraf
+	-rm -f telegraf.exe

 docker-image:
 	./scripts/build.py --package --platform=linux --arch=amd64
 	cp build/telegraf*$(COMMIT)*.deb .
 	docker build -f scripts/dev.docker --build-arg "package=telegraf*$(COMMIT)*.deb" -t "telegraf-dev:$(COMMIT)" .

-plugins/parsers/influx/machine.go: plugins/parsers/influx/machine.go.rl
-	ragel -Z -G2 $^ -o $@
+# Run all docker containers necessary for integration tests
+docker-run:
+	docker run --name aerospike -p "3000:3000" -d aerospike/aerospike-server:3.9.0
+	docker run --name zookeeper -p "2181:2181" -d wurstmeister/zookeeper
+	docker run --name kafka \
+		--link zookeeper:zookeeper \
+		-e KAFKA_ADVERTISED_HOST_NAME=localhost \
+		-e KAFKA_ADVERTISED_PORT=9092 \
+		-e KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181 \
+		-e KAFKA_CREATE_TOPICS="test:1:1" \
+		-p "9092:9092" \
+		-d wurstmeister/kafka
+	docker run --name elasticsearch -p "9200:9200" -p "9300:9300" -d elasticsearch:5
+	docker run --name mysql -p "3306:3306" -e MYSQL_ALLOW_EMPTY_PASSWORD=yes -d mysql
+	docker run --name memcached -p "11211:11211" -d memcached
+	docker run --name postgres -p "5432:5432" -d postgres
+	docker run --name rabbitmq -p "15672:15672" -p "5672:5672" -d rabbitmq:3-management
+	docker run --name redis -p "6379:6379" -d redis
+	docker run --name nsq -p "4150:4150" -d nsqio/nsq /nsqd
+	docker run --name mqtt -p "1883:1883" -d ncarlier/mqtt
+	docker run --name riemann -p "5555:5555" -d stealthly/docker-riemann
+	docker run --name nats -p "4222:4222" -d nats
+	docker run --name openldap \
+		-e SLAPD_CONFIG_ROOTDN="cn=manager,cn=config" \
+		-e SLAPD_CONFIG_ROOTPW="secret" \
+		-p "389:389" -p "636:636" \
+		-d cobaugh/openldap-alpine
+	docker run --name cratedb \
+		-p "6543:5432" \
+		-d crate crate \
+		-Cnetwork.host=0.0.0.0 \
+		-Ctransport.host=localhost \
+		-Clicense.enterprise=false

-.PHONY: deps telegraf install test test-windows lint vet test-all package clean docker-image fmtcheck uint64
+# Run docker containers necessary for integration tests; skipping services provided
+# by CircleCI
+docker-run-circle:
+	docker run --name aerospike -p "3000:3000" -d aerospike/aerospike-server:3.9.0
+	docker run --name zookeeper -p "2181:2181" -d wurstmeister/zookeeper
+	docker run --name kafka \
+		--link zookeeper:zookeeper \
+		-e KAFKA_ADVERTISED_HOST_NAME=localhost \
+		-e KAFKA_ADVERTISED_PORT=9092 \
+		-e KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181 \
+		-e KAFKA_CREATE_TOPICS="test:1:1" \
+		-p "9092:9092" \
+		-d wurstmeister/kafka
+	docker run --name elasticsearch -p "9200:9200" -p "9300:9300" -d elasticsearch:5
+	docker run --name nsq -p "4150:4150" -d nsqio/nsq /nsqd
+	docker run --name mqtt -p "1883:1883" -d ncarlier/mqtt
+	docker run --name riemann -p "5555:5555" -d stealthly/docker-riemann
+	docker run --name nats -p "4222:4222" -d nats
+	docker run --name openldap \
+		-e SLAPD_CONFIG_ROOTDN="cn=manager,cn=config" \
+		-e SLAPD_CONFIG_ROOTPW="secret" \
+		-p "389:389" -p "636:636" \
+		-d cobaugh/openldap-alpine
+	docker run --name cratedb \
+		-p "6543:5432" \
+		-d crate crate \
+		-Cnetwork.host=0.0.0.0 \
+		-Ctransport.host=localhost \
+		-Clicense.enterprise=false
+
+docker-kill:
+	-docker kill aerospike elasticsearch kafka memcached mqtt mysql nats nsq \
+		openldap postgres rabbitmq redis riemann zookeeper cratedb
+	-docker rm aerospike elasticsearch kafka memcached mqtt mysql nats nsq \
+		openldap postgres rabbitmq redis riemann zookeeper cratedb
+
+.PHONY: deps telegraf telegraf.exe install test test-windows lint test-all \
+	package clean docker-run docker-run-circle docker-kill docker-image
--- a/README.md
+++ b/README.md
@@ -152,7 +152,6 @@ configuration options.
 * [graylog](./plugins/inputs/graylog)
 * [haproxy](./plugins/inputs/haproxy)
 * [hddtemp](./plugins/inputs/hddtemp)
-* [http](./plugins/inputs/http) (generic HTTP plugin, supports using input data formats)
 * [http_response](./plugins/inputs/http_response)
 * [httpjson](./plugins/inputs/httpjson) (generic JSON-emitting http service plugin)
 * [internal](./plugins/inputs/internal)
@@ -160,7 +159,6 @@ configuration options.
 * [interrupts](./plugins/inputs/interrupts)
 * [ipmi_sensor](./plugins/inputs/ipmi_sensor)
 * [iptables](./plugins/inputs/iptables)
-* [ipset](./plugins/inputs/ipset)
 * [jolokia](./plugins/inputs/jolokia) (deprecated, use [jolokia2](./plugins/inputs/jolokia2))
 * [jolokia2](./plugins/inputs/jolokia2)
 * [kapacitor](./plugins/inputs/kapacitor)
@@ -173,7 +171,6 @@ configuration options.
 * [minecraft](./plugins/inputs/minecraft)
 * [mongodb](./plugins/inputs/mongodb)
 * [mysql](./plugins/inputs/mysql)
-* [nats](./plugins/inputs/nats)
 * [net_response](./plugins/inputs/net_response)
 * [nginx](./plugins/inputs/nginx)
 * [nginx_plus](./plugins/inputs/nginx_plus)
@@ -208,7 +205,7 @@ configuration options.
 * [teamspeak](./plugins/inputs/teamspeak)
 * [tomcat](./plugins/inputs/tomcat)
 * [twemproxy](./plugins/inputs/twemproxy)
-* [unbound](./plugins/inputs/unbound)
+* [unbound](./plugins/input/unbound)
 * [varnish](./plugins/inputs/varnish)
 * [zfs](./plugins/inputs/zfs)
 * [zookeeper](./plugins/inputs/zookeeper)
@@ -259,12 +256,10 @@ formats may be used with input plugins supporting the `data_format` option:
 * [Value](./docs/DATA_FORMATS_INPUT.md#value)
 * [Nagios](./docs/DATA_FORMATS_INPUT.md#nagios)
 * [Collectd](./docs/DATA_FORMATS_INPUT.md#collectd)
-* [Dropwizard](./docs/DATA_FORMATS_INPUT.md#dropwizard)

 ## Processor Plugins

 * [printer](./plugins/processors/printer)
-* [override](./plugins/processors/override)

 ## Aggregator Plugins

--- a/agent/accumulator.go
+++ b/agent/accumulator.go
@@ -26,7 +26,7 @@ type MetricMaker interface {
 func NewAccumulator(
 	maker MetricMaker,
 	metrics chan telegraf.Metric,
-) telegraf.Accumulator {
+) *accumulator {
 	acc := accumulator{
 		maker:     maker,
 		metrics:   metrics,
--- a/agent/accumulator_test.go
+++ b/agent/accumulator_test.go
@@ -15,36 +15,63 @@ import (
 	"github.com/stretchr/testify/require"
 )

-func TestAddFields(t *testing.T) {
+func TestAdd(t *testing.T) {
+	now := time.Now()
+	metrics := make(chan telegraf.Metric, 10)
+	defer close(metrics)
+	a := NewAccumulator(&TestMetricMaker{}, metrics)
+
+	a.AddFields("acctest",
+		map[string]interface{}{"value": float64(101)},
+		map[string]string{})
+	a.AddFields("acctest",
+		map[string]interface{}{"value": float64(101)},
+		map[string]string{"acc": "test"})
+	a.AddFields("acctest",
+		map[string]interface{}{"value": float64(101)},
+		map[string]string{"acc": "test"}, now)
+
+	testm := <-metrics
+	actual := testm.String()
+	assert.Contains(t, actual, "acctest value=101")
+
+	testm = <-metrics
+	actual = testm.String()
+	assert.Contains(t, actual, "acctest,acc=test value=101")
+
+	testm = <-metrics
+	actual = testm.String()
+	assert.Equal(t,
+		fmt.Sprintf("acctest,acc=test value=101 %d\n", now.UnixNano()),
+		actual)
+}
+
+func TestAddFields(t *testing.T) {
+	now := time.Now()
 	metrics := make(chan telegraf.Metric, 10)
 	defer close(metrics)
 	a := NewAccumulator(&TestMetricMaker{}, metrics)

-	tags := map[string]string{"foo": "bar"}
 	fields := map[string]interface{}{
 		"usage": float64(99),
 	}
-	now := time.Now()
-	a.AddCounter("acctest", fields, tags, now)
+	a.AddFields("acctest", fields, map[string]string{})
+	a.AddGauge("acctest", fields, map[string]string{"acc": "test"})
+	a.AddCounter("acctest", fields, map[string]string{"acc": "test"}, now)

 	testm := <-metrics
+	actual := testm.String()
+	assert.Contains(t, actual, "acctest usage=99")

-	require.Equal(t, "acctest", testm.Name())
-	actual, ok := testm.GetField("usage")
+	testm = <-metrics
+	actual = testm.String()
+	assert.Contains(t, actual, "acctest,acc=test usage=99")

-	require.True(t, ok)
-	require.Equal(t, float64(99), actual)
-
-	actual, ok = testm.GetTag("foo")
-	require.True(t, ok)
-	require.Equal(t, "bar", actual)
-
-	tm := testm.Time()
-	// okay if monotonic clock differs
-	require.True(t, now.Equal(tm))
-
-	tp := testm.Type()
-	require.Equal(t, telegraf.Counter, tp)
+	testm = <-metrics
+	actual = testm.String()
+	assert.Equal(t,
+		fmt.Sprintf("acctest,acc=test usage=99 %d\n", now.UnixNano()),
+		actual)
 }

 func TestAccAddError(t *testing.T) {
@@ -71,61 +98,215 @@ func TestAccAddError(t *testing.T) {
 	assert.Contains(t, string(errs[2]), "baz")
 }

-func TestSetPrecision(t *testing.T) {
-	tests := []struct {
-		name      string
-		unset     bool
-		precision time.Duration
-		interval  time.Duration
-		timestamp time.Time
-		expected  time.Time
-	}{
-		{
-			name:      "default precision is nanosecond",
-			unset:     true,
-			timestamp: time.Date(2006, time.February, 10, 12, 0, 0, 82912748, time.UTC),
-			expected:  time.Date(2006, time.February, 10, 12, 0, 0, 82912748, time.UTC),
-		},
-		{
-			name:      "second interval",
-			interval:  time.Second,
-			timestamp: time.Date(2006, time.February, 10, 12, 0, 0, 82912748, time.UTC),
-			expected:  time.Date(2006, time.February, 10, 12, 0, 0, 0, time.UTC),
-		},
-		{
-			name:      "microsecond interval",
-			interval:  time.Microsecond,
-			timestamp: time.Date(2006, time.February, 10, 12, 0, 0, 82912748, time.UTC),
-			expected:  time.Date(2006, time.February, 10, 12, 0, 0, 82913000, time.UTC),
-		},
-		{
-			name:      "2 second precision",
-			precision: 2 * time.Second,
-			timestamp: time.Date(2006, time.February, 10, 12, 0, 2, 4, time.UTC),
-			expected:  time.Date(2006, time.February, 10, 12, 0, 2, 0, time.UTC),
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			metrics := make(chan telegraf.Metric, 10)
+func TestAddNoIntervalWithPrecision(t *testing.T) {
+	now := time.Date(2006, time.February, 10, 12, 0, 0, 82912748, time.UTC)
+	metrics := make(chan telegraf.Metric, 10)
+	defer close(metrics)
+	a := NewAccumulator(&TestMetricMaker{}, metrics)
+	a.SetPrecision(0, time.Second)

-			a := NewAccumulator(&TestMetricMaker{}, metrics)
-			if !tt.unset {
-				a.SetPrecision(tt.precision, tt.interval)
-			}
+	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)

-			a.AddFields("acctest",
-				map[string]interface{}{"value": float64(101)},
-				map[string]string{},
-				tt.timestamp,
-			)
+	testm := <-a.metrics
+	actual := testm.String()
+	assert.Contains(t, actual, "acctest value=101")

-			testm := <-metrics
-			require.Equal(t, tt.expected, testm.Time())
+	testm = <-a.metrics
+	actual = testm.String()
+	assert.Contains(t, actual, "acctest,acc=test value=101")

-			close(metrics)
-		})
-	}
+	testm = <-a.metrics
+	actual = testm.String()
+	assert.Equal(t,
+		fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800000000000)),
+		actual)
+}
+
+func TestAddDisablePrecision(t *testing.T) {
+	now := time.Date(2006, time.February, 10, 12, 0, 0, 82912748, time.UTC)
+	metrics := make(chan telegraf.Metric, 10)
+	defer close(metrics)
+	a := NewAccumulator(&TestMetricMaker{}, metrics)
+
+	a.SetPrecision(time.Nanosecond, 0)
+	a.AddFields("acctest",
+		map[string]interface{}{"value": float64(101)},
+		map[string]string{})
+	a.AddFields("acctest",
+		map[string]interface{}{"value": float64(101)},
+		map[string]string{"acc": "test"})
+	a.AddFields("acctest",
+		map[string]interface{}{"value": float64(101)},
+		map[string]string{"acc": "test"}, now)
+
+	testm := <-a.metrics
+	actual := testm.String()
+	assert.Contains(t, actual, "acctest value=101")
+
+	testm = <-a.metrics
+	actual = testm.String()
+	assert.Contains(t, actual, "acctest,acc=test value=101")
+
+	testm = <-a.metrics
+	actual = testm.String()
+	assert.Equal(t,
+		fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800082912748)),
+		actual)
+}
+
+func TestAddNoPrecisionWithInterval(t *testing.T) {
+	now := time.Date(2006, time.February, 10, 12, 0, 0, 82912748, time.UTC)
+	metrics := make(chan telegraf.Metric, 10)
+	defer close(metrics)
+	a := NewAccumulator(&TestMetricMaker{}, metrics)
+
+	a.SetPrecision(0, time.Second)
+	a.AddFields("acctest",
+		map[string]interface{}{"value": float64(101)},
+		map[string]string{})
+	a.AddFields("acctest",
+		map[string]interface{}{"value": float64(101)},
+		map[string]string{"acc": "test"})
+	a.AddFields("acctest",
+		map[string]interface{}{"value": float64(101)},
+		map[string]string{"acc": "test"}, now)
+
+	testm := <-a.metrics
+	actual := testm.String()
+	assert.Contains(t, actual, "acctest value=101")
+
+	testm = <-a.metrics
+	actual = testm.String()
+	assert.Contains(t, actual, "acctest,acc=test value=101")
+
+	testm = <-a.metrics
+	actual = testm.String()
+	assert.Equal(t,
+		fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800000000000)),
+		actual)
+}
+
+func TestDifferentPrecisions(t *testing.T) {
+	now := time.Date(2006, time.February, 10, 12, 0, 0, 82912748, time.UTC)
+	metrics := make(chan telegraf.Metric, 10)
+	defer close(metrics)
+	a := NewAccumulator(&TestMetricMaker{}, metrics)
+
+	a.SetPrecision(0, time.Second)
+	a.AddFields("acctest",
+		map[string]interface{}{"value": float64(101)},
+		map[string]string{"acc": "test"}, now)
+	testm := <-a.metrics
+	actual := testm.String()
+	assert.Equal(t,
+		fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800000000000)),
+		actual)
+
+	a.SetPrecision(0, time.Millisecond)
+	a.AddFields("acctest",
+		map[string]interface{}{"value": float64(101)},
+		map[string]string{"acc": "test"}, now)
+	testm = <-a.metrics
+	actual = testm.String()
+	assert.Equal(t,
+		fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800083000000)),
+		actual)
+
+	a.SetPrecision(0, time.Microsecond)
+	a.AddFields("acctest",
+		map[string]interface{}{"value": float64(101)},
+		map[string]string{"acc": "test"}, now)
+	testm = <-a.metrics
+	actual = testm.String()
+	assert.Equal(t,
+		fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800082913000)),
+		actual)
+
+	a.SetPrecision(0, time.Nanosecond)
+	a.AddFields("acctest",
+		map[string]interface{}{"value": float64(101)},
+		map[string]string{"acc": "test"}, now)
+	testm = <-a.metrics
+	actual = testm.String()
+	assert.Equal(t,
+		fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800082912748)),
+		actual)
+}
+
+func TestAddGauge(t *testing.T) {
+	now := time.Now()
+	metrics := make(chan telegraf.Metric, 10)
+	defer close(metrics)
+	a := NewAccumulator(&TestMetricMaker{}, metrics)
+
+	a.AddGauge("acctest",
+		map[string]interface{}{"value": float64(101)},
+		map[string]string{})
+	a.AddGauge("acctest",
+		map[string]interface{}{"value": float64(101)},
+		map[string]string{"acc": "test"})
+	a.AddGauge("acctest",
+		map[string]interface{}{"value": float64(101)},
+		map[string]string{"acc": "test"}, now)
+
+	testm := <-metrics
+	actual := testm.String()
+	assert.Contains(t, actual, "acctest value=101")
+	assert.Equal(t, testm.Type(), telegraf.Gauge)
+
+	testm = <-metrics
+	actual = testm.String()
+	assert.Contains(t, actual, "acctest,acc=test value=101")
+	assert.Equal(t, testm.Type(), telegraf.Gauge)
+
+	testm = <-metrics
+	actual = testm.String()
+	assert.Equal(t,
+		fmt.Sprintf("acctest,acc=test value=101 %d\n", now.UnixNano()),
+		actual)
+	assert.Equal(t, testm.Type(), telegraf.Gauge)
+}
+
+func TestAddCounter(t *testing.T) {
+	now := time.Now()
+	metrics := make(chan telegraf.Metric, 10)
+	defer close(metrics)
+	a := NewAccumulator(&TestMetricMaker{}, metrics)
+
+	a.AddCounter("acctest",
+		map[string]interface{}{"value": float64(101)},
+		map[string]string{})
+	a.AddCounter("acctest",
+		map[string]interface{}{"value": float64(101)},
+		map[string]string{"acc": "test"})
+	a.AddCounter("acctest",
+		map[string]interface{}{"value": float64(101)},
+		map[string]string{"acc": "test"}, now)
+
+	testm := <-metrics
+	actual := testm.String()
+	assert.Contains(t, actual, "acctest value=101")
+	assert.Equal(t, testm.Type(), telegraf.Counter)
+
+	testm = <-metrics
+	actual = testm.String()
+	assert.Contains(t, actual, "acctest,acc=test value=101")
+	assert.Equal(t, testm.Type(), telegraf.Counter)
+
+	testm = <-metrics
+	actual = testm.String()
+	assert.Equal(t,
+		fmt.Sprintf("acctest,acc=test value=101 %d\n", now.UnixNano()),
+		actual)
+	assert.Equal(t, testm.Type(), telegraf.Counter)
 }

 type TestMetricMaker struct {
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -143,7 +143,7 @@ func (a *Agent) gatherer(
 func gatherWithTimeout(
 	shutdown chan struct{},
 	input *models.RunningInput,
-	acc telegraf.Accumulator,
+	acc *accumulator,
 	timeout time.Duration,
 ) {
 	ticker := time.NewTicker(timeout)
@@ -271,9 +271,11 @@ func (a *Agent) flusher(shutdown chan struct{}, metricC chan telegraf.Metric, ag
 				// if dropOriginal is set to true, then we will only send this
 				// metric to the aggregators, not the outputs.
 				var dropOriginal bool
-				for _, agg := range a.Config.Aggregators {
-					if ok := agg.Add(m.Copy()); ok {
-						dropOriginal = true
+				if !m.IsAggregate() {
+					for _, agg := range a.Config.Aggregators {
+						if ok := agg.Add(m.Copy()); ok {
+							dropOriginal = true
+						}
 					}
 				}
 				if !dropOriginal {
@@ -306,13 +308,7 @@ func (a *Agent) flusher(shutdown chan struct{}, metricC chan telegraf.Metric, ag
 					metrics = processor.Apply(metrics...)
 				}
 				for _, m := range metrics {
-					for i, o := range a.Config.Outputs {
-						if i == len(a.Config.Outputs)-1 {
-							o.AddMetric(m)
-						} else {
-							o.AddMetric(m.Copy())
-						}
-					}
+					outMetricC <- m
 				}
 			}
 		}
@@ -368,6 +364,8 @@ func (a *Agent) Run(shutdown chan struct{}) error {
 	metricC := make(chan telegraf.Metric, 100)
 	aggC := make(chan telegraf.Metric, 100)

+	now := time.Now()
+
 	// Start all ServicePlugins
 	for _, input := range a.Config.Inputs {
 		input.SetDefaultTags(a.Config.Tags)
@@ -408,7 +406,7 @@ func (a *Agent) Run(shutdown chan struct{}) error {
 			acc := NewAccumulator(agg, aggC)
 			acc.SetPrecision(a.Config.Agent.Precision.Duration,
 				a.Config.Agent.Interval.Duration)
-			agg.Run(acc, shutdown)
+			agg.Run(acc, now, shutdown)
 		}(aggregator)
 	}

--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,3 @@
-image: Previous Visual Studio 2015
 version: "{build}"

 cache:
@@ -13,19 +12,18 @@ platform: x64

 install:
  - IF NOT EXIST "C:\Cache" mkdir C:\Cache
-  - IF NOT EXIST "C:\Cache\go1.9.4.msi" curl -o "C:\Cache\go1.9.4.msi" https://storage.googleapis.com/golang/go1.9.4.windows-amd64.msi
+  - IF NOT EXIST "C:\Cache\go1.9.2.msi" curl -o "C:\Cache\go1.9.2.msi" https://storage.googleapis.com/golang/go1.9.2.windows-amd64.msi
  - IF NOT EXIST "C:\Cache\gnuwin32-bin.zip" curl -o "C:\Cache\gnuwin32-bin.zip" https://dl.influxdata.com/telegraf/ci/make-3.81-bin.zip
  - IF NOT EXIST "C:\Cache\gnuwin32-dep.zip" curl -o "C:\Cache\gnuwin32-dep.zip" https://dl.influxdata.com/telegraf/ci/make-3.81-dep.zip
  - IF EXIST "C:\Go" rmdir /S /Q C:\Go
-  - msiexec.exe /i "C:\Cache\go1.9.4.msi" /quiet
+  - msiexec.exe /i "C:\Cache\go1.9.2.msi" /quiet
  - 7z x "C:\Cache\gnuwin32-bin.zip" -oC:\GnuWin32 -y
  - 7z x "C:\Cache\gnuwin32-dep.zip" -oC:\GnuWin32 -y
  - go version
  - go env

 build_script:
-  - cmd: C:\GnuWin32\bin\make deps
-  - cmd: C:\GnuWin32\bin\make telegraf
+  - cmd: C:\GnuWin32\bin\make

 test_script:
  - cmd: C:\GnuWin32\bin\make test-windows
--- a/circle.yml
+++ b/circle.yml
@@ -0,0 +1,19 @@
+machine:
+  services:
+    - docker
+    - memcached
+    - redis
+    - rabbitmq-server
+  post:
+    - sudo rm -rf /usr/local/go
+    - wget https://storage.googleapis.com/golang/go1.9.2.linux-amd64.tar.gz
+    - sudo tar -C /usr/local -xzf go1.9.2.linux-amd64.tar.gz
+    - go version
+
+dependencies:
+  override:
+    - docker info
+
+test:
+  override:
+    - bash scripts/circle-test.sh
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -54,10 +54,9 @@ var fUsage = flag.String("usage", "",
 	"print usage for a plugin, ie, 'telegraf --usage mysql'")
 var fService = flag.String("service", "",
 	"operate on the service")
-var fRunAsConsole = flag.Bool("console", false, "run as console application (windows only)")

 var (
-	nextVersion = "1.6.0"
+	nextVersion = "1.5.0"
 	version     string
 	commit      string
 	branch      string
@@ -359,7 +358,7 @@ func main() {
 		return
 	}

-	if runtime.GOOS == "windows" && !(*fRunAsConsole) {
+	if runtime.GOOS == "windows" {
 		svcConfig := &service.Config{
 			Name:        "telegraf",
 			DisplayName: "Telegraf Data Collector Service",
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,93 +0,0 @@
-version: '3'
-
-services:
-  aerospike:
-    image: aerospike/aerospike-server:3.9.0
-    ports:
-      - "3000:3000"
-  zookeeper:
-    image: wurstmeister/zookeeper
-    environment:
-      - JAVA_OPTS="-Xms256m -Xmx256m"
-    ports:
-      - "2181:2181"
-  kafka:
-    image: wurstmeister/kafka
-    environment:
-      - KAFKA_ADVERTISED_HOST_NAME=localhost
-      - KAFKA_ADVERTISED_PORT=9092
-      - KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181
-      - KAFKA_CREATE_TOPICS="test:1:1"
-      - JAVA_OPTS="-Xms256m -Xmx256m"
-    ports:
-      - "9092:9092"
-    depends_on:
-      - zookeeper
-  elasticsearch:
-    image: elasticsearch:5
-    environment:
-    - JAVA_OPTS="-Xms256m -Xmx256m"
-    ports:
-      - "9200:9200"
-      - "9300:9300"
-  mysql:
-    image: mysql
-    environment:
-      - MYSQL_ALLOW_EMPTY_PASSWORD=yes
-    ports:
-      - "3306:3306"
-  memcached:
-    image: memcached
-    ports: 
-      - "11211:11211"
-  postgres:
-    image: postgres:alpine
-    ports:
-      - "5432:5432"
-  rabbitmq:
-    image: rabbitmq:3-management
-    ports:
-      - "15672:15672"
-      - "5672:5672"
-  redis:
-    image: redis:alpine
-    ports:
-      - "6379:6379"
-  nsq:
-    image: nsqio/nsq
-    ports:
-      - "4150:4150"
-    command: "/nsqd"
-  mqtt:
-    image: ncarlier/mqtt
-    ports:
-      - "1883:1883"
-  riemann:
-    image: stealthly/docker-riemann
-    ports:
-      - "5555:5555"
-  nats:
-    image: nats
-    ports:
-      - "4222:4222"
-  openldap:
-    image: cobaugh/openldap-alpine
-    environment:
-      - SLAPD_CONFIG_ROOTDN="cn=manager,cn=config"
-      - SLAPD_CONFIG_ROOTPW="secret"
-    ports:
-      - "389:389"
-      - "636:636"
-  crate:
-   image: crate/crate
-   ports:
-    - "4200:4200"
-    - "4230:4230"
-   command:
-    - crate
-    - -Cnetwork.host=0.0.0.0
-    - -Ctransport.host=localhost
-    - -Clicense.enterprise=false
-   environment:
-    - CRATE_HEAP_SIZE=128m
-    - JAVA_OPTS='-Xms256m -Xmx256m'
--- a/docs/CONFIGURATION.md
+++ b/docs/CONFIGURATION.md
@@ -125,7 +125,7 @@ aggregator and will not get sent to the output plugins.
 * **name_suffix**: Specifies a suffix to attach to the measurement name.
 * **tags**: A map of tags to apply to a specific input's measurements.

-The [measurement filtering](#measurement-filtering) parameters can be used to
+The [measurement filtering](#measurement-filtering) parameters be used to
 limit what metrics are handled by the aggregator.  Excluded metrics are passed
 downstream to the next aggregator.

@@ -136,7 +136,7 @@ The following config parameters are available for all processors:
 * **order**: This is the order in which the processor(s) get executed. If this
 is not specified then processor execution order will be random.

-The [measurement filtering](#measurement-filtering) parameters can be used
+The [measurement filtering](#measurement-filtering) can parameters may be used
 to limit what metrics are handled by the processor.  Excluded metrics are
 passed downstream to the next processor.

--- a/docs/DATA_FORMATS_INPUT.md
+++ b/docs/DATA_FORMATS_INPUT.md
@@ -8,7 +8,6 @@ Telegraf is able to parse the following input data formats into metrics:
 1. [Value](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#value), ie: 45 or "booyah"
 1. [Nagios](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#nagios) (exec input only)
 1. [Collectd](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#collectd)
-1. [Dropwizard](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#dropwizard)

 Telegraf metrics, like InfluxDB
 [points](https://docs.influxdata.com/influxdb/v0.10/write_protocols/line/),
@@ -480,176 +479,3 @@ You can also change the path to the typesdb or add additional typesdb using
  ## Path of to TypesDB specifications
  collectd_typesdb = ["/usr/share/collectd/types.db"]
 ```
-
-# Dropwizard:
-
-The dropwizard format can parse the JSON representation of a single dropwizard metric registry. By default, tags are parsed from metric names as if they were actual influxdb line protocol keys (`measurement<,tag_set>`) which can be overriden by defining custom [measurement & tag templates](./DATA_FORMATS_INPUT.md#measurement--tag-templates). All field value types are supported, `string`, `number` and `boolean`.
-
-A typical JSON of a dropwizard metric registry:
-
-```json
-{
-	"version": "3.0.0",
-	"counters" : {
-		"measurement,tag1=green" : {
-			"count" : 1
-		}
-	},
-	"meters" : {
-		"measurement" : {
-			"count" : 1,
-			"m15_rate" : 1.0,
-			"m1_rate" : 1.0,
-			"m5_rate" : 1.0,
-			"mean_rate" : 1.0,
-			"units" : "events/second"
-		}
-	},
-	"gauges" : {
-		"measurement" : {
-			"value" : 1
-		}
-	},
-	"histograms" : {
-		"measurement" : {
-			"count" : 1,
-			"max" : 1.0,
-			"mean" : 1.0,
-			"min" : 1.0,
-			"p50" : 1.0,
-			"p75" : 1.0,
-			"p95" : 1.0,
-			"p98" : 1.0,
-			"p99" : 1.0,
-			"p999" : 1.0,
-			"stddev" : 1.0
-		}
-	},
-	"timers" : {
-		"measurement" : {
-			"count" : 1,
-			"max" : 1.0,
-			"mean" : 1.0,
-			"min" : 1.0,
-			"p50" : 1.0,
-			"p75" : 1.0,
-			"p95" : 1.0,
-			"p98" : 1.0,
-			"p99" : 1.0,
-			"p999" : 1.0,
-			"stddev" : 1.0,
-			"m15_rate" : 1.0,
-			"m1_rate" : 1.0,
-			"m5_rate" : 1.0,
-			"mean_rate" : 1.0,
-			"duration_units" : "seconds",
-			"rate_units" : "calls/second"
-		}
-	}
-}
-```
-
-Would get translated into 4 different measurements:
-
-```
-measurement,metric_type=counter,tag1=green count=1
-measurement,metric_type=meter count=1,m15_rate=1.0,m1_rate=1.0,m5_rate=1.0,mean_rate=1.0
-measurement,metric_type=gauge value=1
-measurement,metric_type=histogram count=1,max=1.0,mean=1.0,min=1.0,p50=1.0,p75=1.0,p95=1.0,p98=1.0,p99=1.0,p999=1.0
-measurement,metric_type=timer count=1,max=1.0,mean=1.0,min=1.0,p50=1.0,p75=1.0,p95=1.0,p98=1.0,p99=1.0,p999=1.0,stddev=1.0,m15_rate=1.0,m1_rate=1.0,m5_rate=1.0,mean_rate=1.0
-```
-
-You may also parse a dropwizard registry from any JSON document which contains a dropwizard registry in some inner field. 
-Eg. to parse the following JSON document:
-
-```json
-{
-	"time" : "2017-02-22T14:33:03.662+02:00",
-	"tags" : {
-		"tag1" : "green",
-		"tag2" : "yellow"
-	},
-	"metrics" : {
-		"counters" : 	{ 
-			"measurement" : {
-				"count" : 1
-			}
-		},
-		"meters" : {},
-		"gauges" : {},
-		"histograms" : {},
-		"timers" : {}
-	}
-}
-```
-and translate it into:
-
-```
-measurement,metric_type=counter,tag1=green,tag2=yellow count=1 1487766783662000000
-```
-
-you simply need to use the following additional configuration properties:
-
-```toml
-dropwizard_metric_registry_path = "metrics"
-dropwizard_time_path = "time"
-dropwizard_time_format = "2006-01-02T15:04:05Z07:00"
-dropwizard_tags_path = "tags"
-## tag paths per tag are supported too, eg.
-#[inputs.yourinput.dropwizard_tag_paths]
-#  tag1 = "tags.tag1"
-#  tag2 = "tags.tag2"
-```
-
-
-For more information about the dropwizard json format see
-[here](http://metrics.dropwizard.io/3.1.0/manual/json/).
-
-#### Dropwizard Configuration:
-
-```toml
-[[inputs.exec]]
-  ## Commands array
-  commands = ["curl http://localhost:8080/sys/metrics"]
-  timeout = "5s"
-
-  ## Data format to consume.
-  ## Each data format has its own unique set of configuration options, read
-  ## more about them here:
-  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
-  data_format = "dropwizard"
-
-  ## Used by the templating engine to join matched values when cardinality is > 1
-  separator = "_"
-
-  ## Each template line requires a template pattern. It can have an optional
-  ## filter before the template and separated by spaces. It can also have optional extra
-  ## tags following the template. Multiple tags should be separated by commas and no spaces
-  ## similar to the line protocol format. There can be only one default template.
-  ## Templates support below format:
-  ## 1. filter + template
-  ## 2. filter + template + extra tag(s)
-  ## 3. filter + template with field key
-  ## 4. default template
-  ## By providing an empty template array, templating is disabled and measurements are parsed as influxdb line protocol keys (measurement<,tag_set>)
-  templates = []
-
-  ## You may use an appropriate [gjson path](https://github.com/tidwall/gjson#path-syntax) 
-  ## to locate the metric registry within the JSON document
-  # dropwizard_metric_registry_path = "metrics"
-  
-  ## You may use an appropriate [gjson path](https://github.com/tidwall/gjson#path-syntax) 
-  ## to locate the default time of the measurements within the JSON document
-  # dropwizard_time_path = "time"
-  # dropwizard_time_format = "2006-01-02T15:04:05Z07:00"
-  
-  ## You may use an appropriate [gjson path](https://github.com/tidwall/gjson#path-syntax) 
-  ## to locate the tags map within the JSON document
-  # dropwizard_tags_path = "tags"
-
-  ## You may even use tag paths per tag
-  # [inputs.exec.dropwizard_tag_paths]
-  #   tag1 = "tags.tag1"
-  #   tag2 = "tags.tag2"
-
-```
--- a/docs/DATA_FORMATS_OUTPUT.md
+++ b/docs/DATA_FORMATS_OUTPUT.md
@@ -2,12 +2,12 @@

 Telegraf is able to serialize metrics into the following output data formats:

-1. [InfluxDB Line Protocol](#influx)
-1. [JSON](#json)
-1. [Graphite](#graphite)
+1. [InfluxDB Line Protocol](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md#influx)
+1. [JSON](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md#json)
+1. [Graphite](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md#graphite)

 Telegraf metrics, like InfluxDB
-[points](https://docs.influxdata.com/influxdb/latest/concepts/glossary/#point),
+[points](https://docs.influxdata.com/influxdb/v0.10/write_protocols/line/),
 are a combination of four basic parts:

 1. Measurement Name
@@ -49,10 +49,8 @@ I'll go over below.

 # Influx:

-The `influx` format outputs data as
-[InfluxDB Line Protocol](https://docs.influxdata.com/influxdb/latest/write_protocols/line_protocol_tutorial/).
-This is the recommended format to use unless another format is required for
-interoperability.
+There are no additional configuration options for InfluxDB line-protocol. The
+metrics are serialized directly into InfluxDB line-protocol.

 ### Influx Configuration:

@@ -66,20 +64,6 @@ interoperability.
  ## more about them here:
  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
  data_format = "influx"
-
-  ## Maximum line length in bytes.  Useful only for debugging.
-  # influx_max_line_bytes = 0
-
-  ## When true, fields will be output in ascending lexical order.  Enabling
-  ## this option will result in decreased performance and is only recommended
-  ## when you need predictable ordering while debugging.
-  # influx_sort_fields = false
-
-  ## When true, Telegraf will output unsigned integers as unsigned values,
-  ## i.e.: `42u`.  You will need a version of InfluxDB supporting unsigned
-  ## integer values.  Enabling this option will result in field type errors if
-  ## existing data has been written.
-  # influx_uint_support = false
 ```

 # Graphite:
--- a/docs/LICENSE_OF_DEPENDENCIES.md
+++ b/docs/LICENSE_OF_DEPENDENCIES.md
@@ -24,7 +24,6 @@ following works:
 - github.com/eapache/go-xerial-snappy [MIT](https://github.com/eapache/go-xerial-snappy/blob/master/LICENSE)
 - github.com/eapache/queue [MIT](https://github.com/eapache/queue/blob/master/LICENSE)
 - github.com/eclipse/paho.mqtt.golang [ECLIPSE](https://github.com/eclipse/paho.mqtt.golang/blob/master/LICENSE)
- github.com/fsnotify/fsnotify [BSD](https://github.com/fsnotify/fsnotify/blob/master/LICENSE)
 - github.com/fsouza/go-dockerclient [BSD](https://github.com/fsouza/go-dockerclient/blob/master/LICENSE)
 - github.com/gobwas/glob [MIT](https://github.com/gobwas/glob/blob/master/LICENSE)
 - github.com/google/go-cmp [BSD](https://github.com/google/go-cmp/blob/master/LICENSE)
@@ -55,7 +54,6 @@ following works:
 - github.com/miekg/dns [BSD](https://github.com/miekg/dns/blob/master/LICENSE)
 - github.com/naoina/go-stringutil [MIT](https://github.com/naoina/go-stringutil/blob/master/LICENSE)
 - github.com/naoina/toml [MIT](https://github.com/naoina/toml/blob/master/LICENSE)
- github.com/nats-io/gnatsd [MIT](https://github.com/nats-io/gnatsd/blob/master/LICENSE)
 - github.com/nats-io/go-nats [MIT](https://github.com/nats-io/go-nats/blob/master/LICENSE)
 - github.com/nats-io/nats [MIT](https://github.com/nats-io/nats/blob/master/LICENSE)
 - github.com/nats-io/nuid [MIT](https://github.com/nats-io/nuid/blob/master/LICENSE)
@@ -84,8 +82,6 @@ following works:
 - github.com/streadway/amqp [BSD](https://github.com/streadway/amqp/blob/master/LICENSE)
 - github.com/stretchr/objx [MIT](https://github.com/stretchr/objx/blob/master/LICENSE.md)
 - github.com/stretchr/testify [MIT](https://github.com/stretchr/testify/blob/master/LICENCE.txt)
- github.com/tidwall/gjson [MIT](https://github.com/tidwall/gjson/blob/master/LICENSE)
- github.com/tidwall/match [MIT](https://github.com/tidwall/match/blob/master/LICENSE)
 - github.com/mitchellh/mapstructure [MIT](https://github.com/mitchellh/mapstructure/blob/master/LICENSE)
 - github.com/multiplay/go-ts3 [BSD](https://github.com/multiplay/go-ts3/blob/master/LICENSE)
 - github.com/vjeantet/grok [APACHE](https://github.com/vjeantet/grok/blob/master/LICENSE)
@@ -100,6 +96,7 @@ following works:
 - gopkg.in/asn1-ber.v1 [MIT](https://github.com/go-asn1-ber/asn1-ber/blob/v1.2/LICENSE)
 - gopkg.in/dancannon/gorethink.v1 [APACHE](https://github.com/dancannon/gorethink/blob/v1.1.2/LICENSE)
 - gopkg.in/fatih/pool.v2 [MIT](https://github.com/fatih/pool/blob/v2.0.0/LICENSE)
+- gopkg.in/fsnotify.v1 [BSD](https://github.com/fsnotify/fsnotify/blob/v1.4.2/LICENSE)
 - gopkg.in/ldap.v2 [MIT](https://github.com/go-ldap/ldap/blob/v2.5.0/LICENSE)
 - gopkg.in/mgo.v2 [BSD](https://github.com/go-mgo/mgo/blob/v2/LICENSE)
 - gopkg.in/olivere/elastic.v5 [MIT](https://github.com/olivere/elastic/blob/v5.0.38/LICENSE)
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -82,42 +82,31 @@
 #                            OUTPUT PLUGINS                                   #
 ###############################################################################

-# Configuration for sending metrics to InfluxDB
+# Configuration for influxdb server to send metrics to
 [[outputs.influxdb]]
  ## The full HTTP or UDP URL for your InfluxDB instance.
  ##
-  ## Multiple URLs can be specified for a single cluster, only ONE of the
-  ## urls will be written to each interval.
-  # urls = ["unix:///var/run/influxdb.sock"]
-  # urls = ["udp://127.0.0.1:8089"]
-  # urls = ["http://127.0.0.1:8086"]
-
-  ## The target database for metrics; will be created as needed.
-  # database = "telegraf"
-
-  ## If true, no CREATE DATABASE queries will be sent.  Set to true when using
-  ## Telegraf with a user without permissions to create databases or when the
-  ## database already exists.
-  # skip_database_creation = false
+  ## Multiple urls can be specified as part of the same cluster,
+  ## this means that only ONE of the urls will be written to each interval.
+  # urls = ["udp://127.0.0.1:8089"] # UDP endpoint example
+  urls = ["http://127.0.0.1:8086"] # required
+  ## The target database for metrics (telegraf will create it if not exists).
+  database = "telegraf" # required

  ## Name of existing retention policy to write to.  Empty string writes to
  ## the default retention policy.
-  # retention_policy = ""
-
+  retention_policy = ""
  ## Write consistency (clusters only), can be: "any", "one", "quorum", "all"
-  # write_consistency = "any"
+  write_consistency = "any"

-  ## Timeout for HTTP messages.
-  # timeout = "5s"
-
-  ## HTTP Basic Auth
+  ## Write timeout (for the InfluxDB client), formatted as a string.
+  ## If not provided, will default to 5s. 0s means no timeout (not recommended).
+  timeout = "5s"
  # username = "telegraf"
  # password = "metricsmetricsmetricsmetrics"
-
-  ## HTTP User-Agent
+  ## Set the user agent for HTTP POSTs (can be useful for log differentiation)
  # user_agent = "telegraf"
-
-  ## UDP payload size is the maximum packet size to send.
+  ## Set UDP payload size, defaults to InfluxDB UDP Client default (512 bytes)
  # udp_payload = 512

  ## Optional SSL Config
@@ -127,22 +116,14 @@
  ## Use SSL but skip chain & host verification
  # insecure_skip_verify = false

-  ## HTTP Proxy override, if unset values the standard proxy environment
-  ## variables are consulted to determine which proxy, if any, should be used.
+  ## HTTP Proxy Config
  # http_proxy = "http://corporate.proxy:3128"

-  ## Additional HTTP headers
+  ## Optional HTTP headers
  # http_headers = {"X-Special-Header" = "Special-Value"}

-  ## HTTP Content-Encoding for write request body, can be set to "gzip" to
-  ## compress body or "identity" to apply no encoding.
-  # content_encoding = "identity"
-
-  ## When true, Telegraf will output unsigned integers as unsigned values,
-  ## i.e.: "42u".  You will need a version of InfluxDB supporting unsigned
-  ## integer values.  Enabling this option will result in field type errors if
-  ## existing data has been written.
-  # influx_uint_support = false
+  ## Compress each HTTP request payload using GZIP.
+  # content_encoding = "gzip"


 # # Configuration for Amon Server to send metrics to.
@@ -529,9 +510,6 @@
 #   # username = "telegraf"
 #   # password = "metricsmetricsmetricsmetrics"
 #
-#   ## Timeout for write operations. default: 5s
-#   # timeout = "5s"
-#
 #   ## client ID, if not set a random ID is generated
 #   # client_id = ""
 #
@@ -616,24 +594,12 @@
 #   ## Address to listen on
 #   # listen = ":9273"
 #
-#   ## Use TLS
-#   #tls_cert = "/etc/ssl/telegraf.crt"
-#   #tls_key = "/etc/ssl/telegraf.key"
-#
-#   ## Use http basic authentication
-#   #basic_username = "Foo"
-#   #basic_password = "Bar"
-#
 #   ## Interval to expire metrics and not deliver to prometheus, 0 == no expiration
 #   # expiration_interval = "60s"
 #
 #   ## Collectors to enable, valid entries are "gocollector" and "process".
 #   ## If unset, both are enabled.
 #   collectors_exclude = ["gocollector", "process"]
-#
-#   # Send string metrics as Prometheus labels.
-#   # Unless set to false all string metrics will be sent as labels.
-#   string_as_label = true


 # # Configuration for the Riemann server to send metrics to
@@ -733,7 +699,7 @@
 #   #use_regex = false
 #
 #   ## point tags to use as the source name for Wavefront (if none found, host will be used)
-#   #source_override = ["hostname", "agent_host", "node_host"]
+#   #source_override = ["hostname", "snmp_host", "node_host"]
 #
 #   ## whether to convert boolean values to numeric values, with false -> 0.0 and true -> 1.0.  default true
 #   #convert_bool = true
@@ -752,18 +718,6 @@
 #                            PROCESSOR PLUGINS                                #
 ###############################################################################

-# # Apply metric modifications using override semantics.
-# [[processors.override]]
-#   ## All modifications on inputs and aggregators can be overridden:
-#   # name_override = "new_name"
-#   # name_prefix = "new_name_prefix"
-#   # name_suffix = "new_name_suffix"
-#
-#   ## Tags to be added (all values must be strings)
-#   # [processors.override.tags]
-#   #   additional_tag = "tag_value"
-
-
 # # Print all metrics that pass through this filter.
 # [[processors.printer]]

@@ -838,11 +792,12 @@

 # Read metrics about disk usage by mount point
 [[inputs.disk]]
-  ## By default stats will be gathered for all mount points.
-  ## Set mount_points will restrict the stats to only the specified mount points.
+  ## By default, telegraf gather stats for all mountpoints.
+  ## Setting mountpoints will restrict the stats to the specified mountpoints.
  # mount_points = ["/"]

-  ## Ignore mount points by filesystem type.
+  ## Ignore some mountpoints by filesystem type. For example (dev)tmpfs (usually
+  ## present on /run, /var/run, /dev/shm or /dev).
  ignore_fs = ["tmpfs", "devtmpfs", "devfs"]


@@ -851,7 +806,7 @@
  ## By default, telegraf will gather stats for all devices including
  ## disk partitions.
  ## Setting devices will restrict the stats to the specified devices.
-  # devices = ["sda", "sdb", "vd*"]
+  # devices = ["sda", "sdb"]
  ## Uncomment the following line if you need disk serial numbers.
  # skip_serial_number = false
  #
@@ -1106,28 +1061,19 @@

 # # Gather health check statuses from services registered in Consul
 # [[inputs.consul]]
-#   ## Consul server address
+#   ## Most of these values defaults to the one configured on a Consul's agent level.
+#   ## Optional Consul server address (default: "localhost")
 #   # address = "localhost"
-#
-#   ## URI scheme for the Consul server, one of "http", "https"
+#   ## Optional URI scheme for the Consul server (default: "http")
 #   # scheme = "http"
-#
-#   ## ACL token used in every request
+#   ## Optional ACL token used in every request (default: "")
 #   # token = ""
-#
-#   ## HTTP Basic Authentication username and password.
+#   ## Optional username used for request HTTP Basic Authentication (default: "")
 #   # username = ""
+#   ## Optional password used for HTTP Basic Authentication (default: "")
 #   # password = ""
-#
-#   ## Data centre to query the health checks from
+#   ## Optional data centre to query the health checks from (default: "")
 #   # datacentre = ""
-#
-#   ## SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## If false, skip chain & host verification
-#   # insecure_skip_verify = true


 # # Read metrics from one or many couchbase clusters
@@ -1250,11 +1196,6 @@
 #   container_name_include = []
 #   container_name_exclude = []
 #
-#   ## Container states to include and exclude. Globs accepted.
-#   ## When empty only containers in the "running" state will be captured.
-#   # container_state_include = []
-#   # container_state_exclude = []
-#
 #   ## Timeout for docker list, info, and stats commands
 #   timeout = "5s"
 #
@@ -1324,7 +1265,7 @@
 #
 #   ## node_stats is a list of sub-stats that you want to have gathered. Valid options
 #   ## are "indices", "os", "process", "jvm", "thread_pool", "fs", "transport", "http",
-#   ## "breaker". Per default, all stats are gathered.
+#   ## "breakers". Per default, all stats are gathered.
 #   # node_stats = ["jvm", "http"]
 #
 #   ## Optional SSL Config
@@ -1450,7 +1391,7 @@
 #   ## By default, some of the fields are renamed from what haproxy calls them.
 #   ## Setting this option to true results in the plugin keeping the original
 #   ## field names.
-#   # keep_field_names = false
+#   # keep_field_names = true
 #
 #   ## Optional SSL Config
 #   # ssl_ca = "/etc/telegraf/ca.pem"
@@ -1473,51 +1414,11 @@
 #   # devices = ["sda", "*"]


-# # Read formatted metrics from one or more HTTP endpoints
-# [[inputs.http]]
-#   ## One or more URLs from which to read formatted metrics
-#   urls = [
-#     "http://localhost/metrics"
-#   ]
-#
-#   ## HTTP method
-#   # method = "GET"
-#
-#   ## Optional HTTP headers
-#   # headers = {"X-Special-Header" = "Special-Value"}
-#
-#   ## Optional HTTP Basic Auth Credentials
-#   # username = "username"
-#   # password = "pa$$word"
-#
-#   ## Tag all metrics with the url
-#   # tag_url = true
-#
-#   ## 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
-#
-#   ## Amount of time allowed to complete the HTTP request
-#   # timeout = "5s"
-#
-#   ## Data format to consume.
-#   ## Each data format has its own unique set of configuration options, read
-#   ## more about them here:
-#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
-#   # data_format = "influx"
-
-
 # # HTTP/HTTPS request given an address a method and a timeout
 # [[inputs.http_response]]
 #   ## Server address (default http://localhost)
 #   # address = "http://localhost"
 #
-#   ## Set http_proxy (telegraf uses the system wide proxy settings if it's is not set)
-#   # http_proxy = "http://localhost:8888"
-#
 #   ## Set response_timeout (default 5 seconds)
 #   # response_timeout = "5s"
 #
@@ -1577,13 +1478,6 @@
 #   #   "my_tag_2"
 #   # ]
 #
-#   ## 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
-#
 #   ## HTTP parameters (all values must be strings).  For "GET" requests, data
 #   ## will be included in the query.  For "POST" requests, data will be included
 #   ## in the request body as "x-www-form-urlencoded".
@@ -1595,6 +1489,13 @@
 #   # [inputs.httpjson.headers]
 #   #   X-Auth-Token = "my-xauth-token"
 #   #   apiVersion = "v1"
+#
+#   ## Optional SSL Config
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
+#   ## Use SSL but skip chain & host verification
+#   # insecure_skip_verify = false


 # # Read InfluxDB-formatted JSON metrics from one or more HTTP endpoints
@@ -1637,10 +1538,7 @@
 # [[inputs.ipmi_sensor]]
 #   ## optionally specify the path to the ipmitool executable
 #   # path = "/usr/bin/ipmitool"
-#   ##
-#   ## optionally force session privilege level. Can be CALLBACK, USER, OPERATOR, ADMINISTRATOR
-#   # privilege = "ADMINISTRATOR"
-#   ##
+#   #
 #   ## optionally specify one or more servers via a url matching
 #   ##  [username[:password]@][protocol[(address)]]
 #   ##  e.g.
@@ -1658,17 +1556,6 @@
 #   timeout = "20s"


-# # Gather packets and bytes counters from Linux ipsets
-# [[inputs.ipset]]
-#   ## By default, we only show sets which have already matched at least 1 packet.
-#   ## set include_unmatched_sets = true to gather them all.
-#   include_unmatched_sets = false
-#   ## Adjust your sudo settings appropriately if using this option ("sudo ipset save")
-#   use_sudo = false
-#   ## The default timeout of 1s for ipset execution can be overridden here:
-#   # timeout = "1s"
-
-
 # # Gather packets and bytes throughput from iptables
 # [[inputs.iptables]]
 #   ## iptables require root access on most systems.
@@ -1774,7 +1661,7 @@
 #   # insecure_skip_verify = false
 #
 #   ## Add metrics to read
-#   [[inputs.jolokia2_agent.metric]]
+#   [[inputs.jolokia2.metric]]
 #     name  = "java_runtime"
 #     mbean = "java.lang:type=Runtime"
 #     paths = ["Uptime"]
@@ -1823,13 +1710,6 @@
 #
 #   ## Time limit for http requests
 #   timeout = "5s"
-#
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
-#   # insecure_skip_verify = false


 # # Get kernel statistics from /proc/vmstat
@@ -1909,7 +1789,7 @@
 #   ## Timeout, in ms.
 #   timeout = 100
 #   ## A list of Mesos masters.
-#   masters = ["http://localhost:5050"]
+#   masters = ["localhost:5050"]
 #   ## Master metrics groups to be collected, by default, all enabled.
 #   master_collections = [
 #     "resources",
@@ -1933,13 +1813,6 @@
 #   #   "tasks",
 #   #   "messages",
 #   # ]
-#
-#   ## 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


 # # Collects scores from a minecraft server's scoreboard using the RCON protocol
@@ -1981,20 +1854,6 @@
 #   #
 #   ## If no servers are specified, then localhost is used as the host.
 #   servers = ["tcp(127.0.0.1:3306)/"]
-#
-#   ## Selects the metric output format.
-#   ##
-#   ## This option exists to maintain backwards compatibility, if you have
-#   ## existing metrics do not set or change this value until you are ready to
-#   ## migrate to the new format.
-#   ##
-#   ## If you do not have existing metrics from this plugin set to the latest
-#   ## version.
-#   ##
-#   ## Telegraf >=1.6: metric_version = 2
-#   ##           <1.6: metric_version = 1 (or unset)
-#   metric_version = 2
-#
 #   ## the limits for metrics form perf_events_statements
 #   perf_events_statements_digest_text_limit  = 120
 #   perf_events_statements_limit              = 250
@@ -2051,15 +1910,6 @@
 #   ssl_key = "/etc/telegraf/key.pem"


-# # Provides metrics about the state of a NATS server
-# [[inputs.nats]]
-#   ## The address of the monitoring endpoint of the NATS server
-#   server = "http://localhost:8222"
-#
-#   ## Maximum time to receive response
-#   # response_timeout = "5s"
-
-
 # # Read metrics about network interface usage
 # [[inputs.net]]
 #   ## By default, telegraf gathers stats from any up interface (excluding loopback)
@@ -2067,12 +1917,6 @@
 #   ## regardless of status.
 #   ##
 #   # interfaces = ["eth0"]
-#   ##
-#   ## On linux systems telegraf also collects protocol stats.
-#   ## Setting ignore_protocol_stats to true will skip reporting of protocol metrics.
-#   ##
-#   # ignore_protocol_stats = false
-#   ##


 # # TCP or UDP 'ping' given url and collect response time in seconds
@@ -2170,10 +2014,6 @@
 #   # dn/password to bind with. If bind_dn is empty, an anonymous bind is performed.
 #   bind_dn = ""
 #   bind_password = ""
-#
-#   # Reverse metric names so they sort more naturally. Recommended.
-#   # This defaults to false if unset, but is set to true when generating a new config
-#   reverse_metric_names = true


 # # A plugin to collect stats from Opensmtpd - a validating, recursive, and caching DNS resolver 
@@ -2247,10 +2087,7 @@
 #   # ping_interval = 1.0
 #   ## per-ping timeout, in s. 0 == no timeout (ping -W <TIMEOUT>)
 #   # timeout = 1.0
-#   ## total-ping deadline, in s. 0 == no deadline (ping -w <DEADLINE>)
-#   # deadline = 10
-#   ## interface or source address to send ping from (ping -I <INTERFACE/SRC_ADDR>)
-#   ## on Darwin and Freebsd only source address possible: (ping -S <SRC_ADDR>)
+#   ## interface to send ping from (ping -I <INTERFACE>)
 #   # interface = ""


@@ -2261,6 +2098,90 @@
 #   # queue_directory = "/var/spool/postfix"


+# # Read metrics from one or many postgresql servers
+# [[inputs.postgresql]]
+#   ## specify address via a url matching:
+#   ##   postgres://[pqgotest[:password]]@localhost[/dbname]\
+#   ##       ?sslmode=[disable|verify-ca|verify-full]
+#   ## or a simple string:
+#   ##   host=localhost user=pqotest password=... sslmode=... dbname=app_production
+#   ##
+#   ## All connection parameters are optional.
+#   ##
+#   ## Without the dbname parameter, the driver will default to a database
+#   ## with the same name as the user. This dbname is just for instantiating a
+#   ## connection with the server and doesn't restrict the databases we are trying
+#   ## to grab metrics for.
+#   ##
+#   address = "host=localhost user=postgres sslmode=disable"
+#
+#   ## A  list of databases to explicitly ignore.  If not specified, metrics for all
+#   ## databases are gathered.  Do NOT use with the 'databases' option.
+#   # ignored_databases = ["postgres", "template0", "template1"]
+#
+#   ## A list of databases to pull metrics about. If not specified, metrics for all
+#   ## databases are gathered.  Do NOT use with the 'ignored_databases' option.
+#   # databases = ["app_production", "testing"]
+
+
+# # Read metrics from one or many postgresql servers
+# [[inputs.postgresql_extensible]]
+#   ## specify address via a url matching:
+#   ##   postgres://[pqgotest[:password]]@localhost[/dbname]\
+#   ##       ?sslmode=[disable|verify-ca|verify-full]
+#   ## or a simple string:
+#   ##   host=localhost user=pqotest password=... sslmode=... dbname=app_production
+#   #
+#   ## All connection parameters are optional.  #
+#   ## Without the dbname parameter, the driver will default to a database
+#   ## with the same name as the user. This dbname is just for instantiating a
+#   ## connection with the server and doesn't restrict the databases we are trying
+#   ## to grab metrics for.
+#   #
+#   address = "host=localhost user=postgres sslmode=disable"
+#   ## A list of databases to pull metrics about. If not specified, metrics for all
+#   ## databases are gathered.
+#   ## databases = ["app_production", "testing"]
+#   #
+#   # outputaddress = "db01"
+#   ## A custom name for the database that will be used as the "server" tag in the
+#   ## measurement output. If not specified, a default one generated from
+#   ## the connection address is used.
+#   #
+#   ## Define the toml config where the sql queries are stored
+#   ## New queries can be added, if the withdbname is set to true and there is no
+#   ## databases defined in the 'databases field', the sql query is ended by a
+#   ## 'is not null' in order to make the query succeed.
+#   ## Example :
+#   ## The sqlquery : "SELECT * FROM pg_stat_database where datname" become
+#   ## "SELECT * FROM pg_stat_database where datname IN ('postgres', 'pgbench')"
+#   ## because the databases variable was set to ['postgres', 'pgbench' ] and the
+#   ## withdbname was true. Be careful that if the withdbname is set to false you
+#   ## don't have to define the where clause (aka with the dbname) the tagvalue
+#   ## field is used to define custom tags (separated by commas)
+#   ## The optional "measurement" value can be used to override the default
+#   ## output measurement name ("postgresql").
+#   #
+#   ## Structure :
+#   ## [[inputs.postgresql_extensible.query]]
+#   ##   sqlquery string
+#   ##   version string
+#   ##   withdbname boolean
+#   ##   tagvalue string (comma separated)
+#   ##   measurement string
+#   [[inputs.postgresql_extensible.query]]
+#     sqlquery="SELECT * FROM pg_stat_database"
+#     version=901
+#     withdbname=false
+#     tagvalue=""
+#     measurement=""
+#   [[inputs.postgresql_extensible.query]]
+#     sqlquery="SELECT * FROM pg_stat_bgwriter"
+#     version=901
+#     withdbname=false
+#     tagvalue="postgresql.stats"
+
+
 # # Read metrics from one or many PowerDNS servers
 # [[inputs.powerdns]]
 #   ## An array of sockets to gather stats about.
@@ -2270,6 +2191,7 @@

 # # Monitor process cpu and memory usage
 # [[inputs.procstat]]
+#   ## Must specify one of: pid_file, exe, or pattern
 #   ## PID file to monitor process
 #   pid_file = "/var/run/nginx.pid"
 #   ## executable name (ie, pgrep <exe>)
@@ -2286,20 +2208,12 @@
 #   ## override for process_name
 #   ## This is optional; default is sourced from /proc/<pid>/status
 #   # process_name = "bar"
-#
 #   ## Field name prefix
-#   # prefix = ""
-#
-#   ## Add PID as a tag instead of a field; useful to differentiate between
-#   ## processes whose tags are otherwise the same.  Can create a large number
-#   ## of series, use judiciously.
-#   # pid_tag = false
-#
-#   ## Method to use when finding process IDs.  Can be one of 'pgrep', or
-#   ## 'native'.  The pgrep finder calls the pgrep executable in the PATH while
-#   ## the native finder performs the search directly in a manor dependent on the
-#   ## platform.  Default is 'pgrep'
-#   # pid_finder = "pgrep"
+#   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
@@ -2364,15 +2278,6 @@
 #   ## A list of queues to gather as the rabbitmq_queue measurement. If not
 #   ## specified, metrics for all queues are gathered.
 #   # queues = ["telegraf"]
-#
-#   ## A list of exchanges to gather as the rabbitmq_exchange measurement. If not
-#   ## specified, metrics for all exchanges are gathered.
-#   # exchanges = ["telegraf"]
-#
-#   ## Queues to include and exclude. Globs accepted.
-#   ## Note that an empty array for both will include all queues
-#   queue_name_include = []
-#   queue_name_exclude = []


 # # Read raindrops stats (raindrops - real-time stats for preforking Rack servers)
@@ -2663,28 +2568,6 @@
 #   # servers = [
 #   #  "Server=192.168.1.10;Port=1433;User Id=<user>;Password=<pw>;app name=telegraf;log=1;",
 #   # ]
-#
-#   ## Optional parameter, setting this to 2 will use a new version
-#   ## of the collection queries that break compatibility with the original
-#   ## dashboards.
-#   query_version = 2
-#
-#   ## If you are using AzureDB, setting this to true will gather resource utilization metrics
-#   # azuredb = false
-#
-#   ## If you would like to exclude some of the metrics queries, list them here
-#   ## Possible choices:
-#   ## - PerformanceCounters
-#   ## - WaitStatsCategorized
-#   ## - DatabaseIO
-#   ## - DatabaseProperties
-#   ## - CPUHistory
-#   ## - DatabaseSize
-#   ## - DatabaseStats
-#   ## - MemoryClerk
-#   ## - VolumeSpace
-#   ## - PerformanceMetrics
-#   # exclude_query = [ 'DatabaseIO' ]


 # # Sysstat metrics collector
@@ -2808,10 +2691,6 @@
 #
 #   ## Use the builtin fielddrop/fieldpass telegraf filters in order to keep/remove specific fields
 #   fieldpass = ["total_*", "num_*","time_up", "mem_*"]
-#
-#   ## IP of server to connect to, read from unbound conf default, optionally ':port'
-#   ## Will lookup IP if given a hostname
-#   server = "127.0.0.1:8953"


 # # A plugin to collect stats from Varnish HTTP Cache
@@ -2842,9 +2721,7 @@
 #   ## By default, telegraf gather all zfs stats
 #   ## If not specified, then default is:
 #   # kstatMetrics = ["arcstats", "zfetchstats", "vdev_cache_stats"]
-#   ## For Linux, the default is:
-#   # kstatMetrics = ["abdstats", "arcstats", "dnodestats", "dbufcachestats",
-#   #   "dmu_tx", "fm", "vdev_mirror_stats", "zfetchstats", "zil"]
+#
 #   ## By default, don't gather zpool stats
 #   # poolMetrics = false

@@ -2857,17 +2734,6 @@
 #   ## If no servers are specified, then localhost is used as the host.
 #   ## If no port is specified, 2181 is used
 #   servers = [":2181"]
-#
-#   ## Timeout for metric collections from all servers.  Minimum timeout is "1s".
-#   # timeout = "5s"
-#
-#   ## Optional SSL Config
-#   # enable_ssl = true
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## If false, skip chain & host verification
-#   # insecure_skip_verify = true



@@ -2933,11 +2799,6 @@
 #   ## Add service certificate and key
 #   tls_cert = "/etc/telegraf/cert.pem"
 #   tls_key = "/etc/telegraf/key.pem"
-#
-#   ## Optional username and password to accept for HTTP basic authentication.
-#   ## You probably want to make sure you have TLS configured above for this.
-#   # basic_username = "foobar"
-#   # basic_password = "barfoo"


 # # Read metrics from Kafka topic(s)
@@ -3134,105 +2995,6 @@
 #   data_format = "influx"


-# # Read metrics from one or many postgresql servers
-# [[inputs.postgresql]]
-#   ## specify address via a url matching:
-#   ##   postgres://[pqgotest[:password]]@localhost[/dbname]\
-#   ##       ?sslmode=[disable|verify-ca|verify-full]
-#   ## or a simple string:
-#   ##   host=localhost user=pqotest password=... sslmode=... dbname=app_production
-#   ##
-#   ## All connection parameters are optional.
-#   ##
-#   ## Without the dbname parameter, the driver will default to a database
-#   ## with the same name as the user. This dbname is just for instantiating a
-#   ## connection with the server and doesn't restrict the databases we are trying
-#   ## to grab metrics for.
-#   ##
-#   address = "host=localhost user=postgres sslmode=disable"
-#   ## A custom name for the database that will be used as the "server" tag in the
-#   ## measurement output. If not specified, a default one generated from
-#   ## the connection address is used.
-#   # outputaddress = "db01"
-#
-#   ## connection configuration.
-#   ## maxlifetime - specify the maximum lifetime of a connection.
-#   ## default is forever (0s)
-#   max_lifetime = "0s"
-#
-#   ## A  list of databases to explicitly ignore.  If not specified, metrics for all
-#   ## databases are gathered.  Do NOT use with the 'databases' option.
-#   # ignored_databases = ["postgres", "template0", "template1"]
-#
-#   ## A list of databases to pull metrics about. If not specified, metrics for all
-#   ## databases are gathered.  Do NOT use with the 'ignored_databases' option.
-#   # databases = ["app_production", "testing"]
-
-
-# # Read metrics from one or many postgresql servers
-# [[inputs.postgresql_extensible]]
-#   ## specify address via a url matching:
-#   ##   postgres://[pqgotest[:password]]@localhost[/dbname]\
-#   ##       ?sslmode=[disable|verify-ca|verify-full]
-#   ## or a simple string:
-#   ##   host=localhost user=pqotest password=... sslmode=... dbname=app_production
-#   #
-#   ## All connection parameters are optional.  #
-#   ## Without the dbname parameter, the driver will default to a database
-#   ## with the same name as the user. This dbname is just for instantiating a
-#   ## connection with the server and doesn't restrict the databases we are trying
-#   ## to grab metrics for.
-#   #
-#   address = "host=localhost user=postgres sslmode=disable"
-#
-#   ## connection configuration.
-#   ## maxlifetime - specify the maximum lifetime of a connection.
-#   ## default is forever (0s)
-#   max_lifetime = "0s"
-#
-#   ## A list of databases to pull metrics about. If not specified, metrics for all
-#   ## databases are gathered.
-#   ## databases = ["app_production", "testing"]
-#   #
-#   ## A custom name for the database that will be used as the "server" tag in the
-#   ## measurement output. If not specified, a default one generated from
-#   ## the connection address is used.
-#   # outputaddress = "db01"
-#   #
-#   ## Define the toml config where the sql queries are stored
-#   ## New queries can be added, if the withdbname is set to true and there is no
-#   ## databases defined in the 'databases field', the sql query is ended by a
-#   ## 'is not null' in order to make the query succeed.
-#   ## Example :
-#   ## The sqlquery : "SELECT * FROM pg_stat_database where datname" become
-#   ## "SELECT * FROM pg_stat_database where datname IN ('postgres', 'pgbench')"
-#   ## because the databases variable was set to ['postgres', 'pgbench' ] and the
-#   ## withdbname was true. Be careful that if the withdbname is set to false you
-#   ## don't have to define the where clause (aka with the dbname) the tagvalue
-#   ## field is used to define custom tags (separated by commas)
-#   ## The optional "measurement" value can be used to override the default
-#   ## output measurement name ("postgresql").
-#   #
-#   ## Structure :
-#   ## [[inputs.postgresql_extensible.query]]
-#   ##   sqlquery string
-#   ##   version string
-#   ##   withdbname boolean
-#   ##   tagvalue string (comma separated)
-#   ##   measurement string
-#   [[inputs.postgresql_extensible.query]]
-#     sqlquery="SELECT * FROM pg_stat_database"
-#     version=901
-#     withdbname=false
-#     tagvalue=""
-#     measurement=""
-#   [[inputs.postgresql_extensible.query]]
-#     sqlquery="SELECT * FROM pg_stat_bgwriter"
-#     version=901
-#     withdbname=false
-#     tagvalue="postgresql.stats"
-
-
 # # Generic socket listener capable of handling multiple socket types.
 # [[inputs.socket_listener]]
 #   ## URL to listen on
@@ -3284,14 +3046,6 @@
 #   ## MaxTCPConnection - applicable when protocol is set to tcp (default=250)
 #   max_tcp_connections = 250
 #
-#   ## Enable TCP keep alive probes (default=false)
-#   tcp_keep_alive = false
-#
-#   ## Specifies the keep-alive period for an active network connection.
-#   ## Only applies to TCP sockets and will be ignored if tcp_keep_alive is false.
-#   ## Defaults to the OS configuration.
-#   # tcp_keep_alive_period = "2h"
-#
 #   ## Address and port to host UDP listener on
 #   service_address = ":8125"
 #
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -9,7 +9,6 @@ import (
 	"math"
 	"os"
 	"path/filepath"
-
 	"regexp"
 	"runtime"
 	"sort"
@@ -41,11 +40,6 @@ var (

 	// envVarRe is a regex to find environment variables in the config file
 	envVarRe = regexp.MustCompile(`\$\w+`)
-
-	envVarEscaper = strings.NewReplacer(
-		`"`, `\"`,
-		`\`, `\\`,
-	)
 )

 // Config specifies the URL/user/password for the database that telegraf
@@ -695,11 +689,6 @@ func trimBOM(f []byte) []byte {
 	return bytes.TrimPrefix(f, []byte("\xef\xbb\xbf"))
 }

-// escapeEnv escapes a value for inserting into a TOML string.
-func escapeEnv(value string) string {
-	return envVarEscaper.Replace(value)
-}
-
 // parseFile loads a TOML configuration from a provided path and
 // returns the AST produced from the TOML parser. When loading the file, it
 // will find environment variables and replace them.
@@ -713,9 +702,8 @@ func parseFile(fpath string) (*ast.Table, error) {

 	env_vars := envVarRe.FindAll(contents, -1)
 	for _, env_var := range env_vars {
-		env_val, ok := os.LookupEnv(strings.TrimPrefix(string(env_var), "$"))
-		if ok {
-			env_val = escapeEnv(env_val)
+		env_val := os.Getenv(strings.TrimPrefix(string(env_var), "$"))
+		if env_val != "" {
 			contents = bytes.Replace(contents, env_var, []byte(env_val), 1)
 		}
 	}
@@ -1273,47 +1261,6 @@ func buildParser(name string, tbl *ast.Table) (parsers.Parser, error) {
 		}
 	}

-	if node, ok := tbl.Fields["dropwizard_metric_registry_path"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if str, ok := kv.Value.(*ast.String); ok {
-				c.DropwizardMetricRegistryPath = str.Value
-			}
-		}
-	}
-	if node, ok := tbl.Fields["dropwizard_time_path"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if str, ok := kv.Value.(*ast.String); ok {
-				c.DropwizardTimePath = str.Value
-			}
-		}
-	}
-	if node, ok := tbl.Fields["dropwizard_time_format"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if str, ok := kv.Value.(*ast.String); ok {
-				c.DropwizardTimeFormat = str.Value
-			}
-		}
-	}
-	if node, ok := tbl.Fields["dropwizard_tags_path"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if str, ok := kv.Value.(*ast.String); ok {
-				c.DropwizardTagsPath = str.Value
-			}
-		}
-	}
-	c.DropwizardTagPathsMap = make(map[string]string)
-	if node, ok := tbl.Fields["dropwizard_tag_paths"]; ok {
-		if subtbl, ok := node.(*ast.Table); ok {
-			for name, val := range subtbl.Fields {
-				if kv, ok := val.(*ast.KeyValue); ok {
-					if str, ok := kv.Value.(*ast.String); ok {
-						c.DropwizardTagPathsMap[name] = str.Value
-					}
-				}
-			}
-		}
-	}
-
 	c.MetricName = name

 	delete(tbl.Fields, "data_format")
@@ -1324,11 +1271,6 @@ func buildParser(name string, tbl *ast.Table) (parsers.Parser, error) {
 	delete(tbl.Fields, "collectd_auth_file")
 	delete(tbl.Fields, "collectd_security_level")
 	delete(tbl.Fields, "collectd_typesdb")
-	delete(tbl.Fields, "dropwizard_metric_registry_path")
-	delete(tbl.Fields, "dropwizard_time_path")
-	delete(tbl.Fields, "dropwizard_time_format")
-	delete(tbl.Fields, "dropwizard_tags_path")
-	delete(tbl.Fields, "dropwizard_tag_paths")

 	return parsers.NewParser(c)
 }
@@ -1367,42 +1309,6 @@ func buildSerializer(name string, tbl *ast.Table) (serializers.Serializer, error
 		}
 	}

-	if node, ok := tbl.Fields["influx_max_line_bytes"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if integer, ok := kv.Value.(*ast.Integer); ok {
-				v, err := integer.Int()
-				if err != nil {
-					return nil, err
-				}
-				c.InfluxMaxLineBytes = int(v)
-			}
-		}
-	}
-
-	if node, ok := tbl.Fields["influx_sort_fields"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if b, ok := kv.Value.(*ast.Boolean); ok {
-				var err error
-				c.InfluxSortFields, err = b.Boolean()
-				if err != nil {
-					return nil, err
-				}
-			}
-		}
-	}
-
-	if node, ok := tbl.Fields["influx_uint_support"]; ok {
-		if kv, ok := node.(*ast.KeyValue); ok {
-			if b, ok := kv.Value.(*ast.Boolean); ok {
-				var err error
-				c.InfluxUintSupport, err = b.Boolean()
-				if err != nil {
-					return nil, err
-				}
-			}
-		}
-	}
-
 	if node, ok := tbl.Fields["json_timestamp_units"]; ok {
 		if kv, ok := node.(*ast.KeyValue); ok {
 			if str, ok := kv.Value.(*ast.String); ok {
@@ -1419,9 +1325,6 @@ func buildSerializer(name string, tbl *ast.Table) (serializers.Serializer, error
 		}
 	}

-	delete(tbl.Fields, "influx_max_line_bytes")
-	delete(tbl.Fields, "influx_sort_fields")
-	delete(tbl.Fields, "influx_uint_support")
 	delete(tbl.Fields, "data_format")
 	delete(tbl.Fields, "prefix")
 	delete(tbl.Fields, "template")
--- a/internal/internal_test.go
+++ b/internal/internal_test.go
@@ -44,9 +44,6 @@ var (
 )

 func TestRunTimeout(t *testing.T) {
-	if testing.Short() {
-		t.Skip("Skipping test due to random failures.")
-	}
 	if sleepbin == "" {
 		t.Skip("'sleep' binary not available on OS, skipping.")
 	}
@@ -61,8 +58,6 @@ func TestRunTimeout(t *testing.T) {
 }

 func TestCombinedOutputTimeout(t *testing.T) {
-	// TODO: Fix this test
-	t.Skip("Test failing too often, skip for now and revisit later.")
 	if sleepbin == "" {
 		t.Skip("'sleep' binary not available on OS, skipping.")
 	}
@@ -114,8 +109,6 @@ func TestRunError(t *testing.T) {
 }

 func TestRandomSleep(t *testing.T) {
-	// TODO: Fix this test
-	t.Skip("Test failing too often, skip for now and revisit later.")
 	// test that zero max returns immediately
 	s := time.Now()
 	RandomSleep(time.Duration(0), make(chan struct{}))
--- a/internal/models/makemetric.go
+++ b/internal/models/makemetric.go
@@ -2,6 +2,8 @@ package models

 import (
 	"log"
+	"math"
+	"strings"
 	"time"

 	"github.com/influxdata/telegraf"
@@ -76,6 +78,84 @@ func makemetric(
 		}
 	}

+	for k, v := range tags {
+		if strings.HasSuffix(k, `\`) {
+			log.Printf("D! Measurement [%s] tag [%s] "+
+				"ends with a backslash, skipping", measurement, k)
+			delete(tags, k)
+			continue
+		} else if strings.HasSuffix(v, `\`) {
+			log.Printf("D! Measurement [%s] tag [%s] has a value "+
+				"ending with a backslash, skipping", measurement, k)
+			delete(tags, k)
+			continue
+		}
+	}
+
+	for k, v := range fields {
+		if strings.HasSuffix(k, `\`) {
+			log.Printf("D! Measurement [%s] field [%s] "+
+				"ends with a backslash, skipping", measurement, k)
+			delete(fields, k)
+			continue
+		}
+		// Validate uint64 and float64 fields
+		// convert all int & uint types to int64
+		switch val := v.(type) {
+		case nil:
+			// delete nil fields
+			delete(fields, k)
+		case uint:
+			fields[k] = int64(val)
+			continue
+		case uint8:
+			fields[k] = int64(val)
+			continue
+		case uint16:
+			fields[k] = int64(val)
+			continue
+		case uint32:
+			fields[k] = int64(val)
+			continue
+		case int:
+			fields[k] = int64(val)
+			continue
+		case int8:
+			fields[k] = int64(val)
+			continue
+		case int16:
+			fields[k] = int64(val)
+			continue
+		case int32:
+			fields[k] = int64(val)
+			continue
+		case uint64:
+			// InfluxDB does not support writing uint64
+			if val < uint64(9223372036854775808) {
+				fields[k] = int64(val)
+			} else {
+				fields[k] = int64(9223372036854775807)
+			}
+			continue
+		case float32:
+			fields[k] = float64(val)
+			continue
+		case float64:
+			// NaNs are invalid values in influxdb, skip measurement
+			if math.IsNaN(val) || math.IsInf(val, 0) {
+				log.Printf("D! Measurement [%s] field [%s] has a NaN or Inf "+
+					"field, skipping",
+					measurement, k)
+				delete(fields, k)
+				continue
+			}
+		case string:
+			fields[k] = v
+		default:
+			fields[k] = v
+		}
+	}
+
 	m, err := metric.New(measurement, tags, fields, t, mType)
 	if err != nil {
 		log.Printf("Error adding point [%s]: %s\n", measurement, err.Error())
--- a/internal/models/running_aggregator.go
+++ b/internal/models/running_aggregator.go
@@ -114,6 +114,7 @@ func (r *RunningAggregator) reset() {
 // for period ticks to tell it when to push and reset the aggregator.
 func (r *RunningAggregator) Run(
 	acc telegraf.Accumulator,
+	now time.Time,
 	shutdown chan struct{},
 ) {
 	// The start of the period is truncated to the nearest second.
@@ -132,7 +133,6 @@ func (r *RunningAggregator) Run(
 	// 2nd interval: 00:10 - 00:20.5
 	// etc.
 	//
-	now := time.Now()
 	r.periodStart = now.Truncate(time.Second)
 	truncation := now.Sub(r.periodStart)
 	r.periodEnd = r.periodStart.Add(r.Config.Period)
--- a/internal/models/running_aggregator_test.go
+++ b/internal/models/running_aggregator_test.go
@@ -1,6 +1,7 @@
 package models

 import (
+	"fmt"
 	"sync"
 	"sync/atomic"
 	"testing"
@@ -23,7 +24,7 @@ func TestAdd(t *testing.T) {
 	})
 	assert.NoError(t, ra.Config.Filter.Compile())
 	acc := testutil.Accumulator{}
-	go ra.Run(&acc, make(chan struct{}))
+	go ra.Run(&acc, time.Now(), make(chan struct{}))

 	m := ra.MakeMetric(
 		"RITest",
@@ -54,7 +55,7 @@ func TestAddMetricsOutsideCurrentPeriod(t *testing.T) {
 	})
 	assert.NoError(t, ra.Config.Filter.Compile())
 	acc := testutil.Accumulator{}
-	go ra.Run(&acc, make(chan struct{}))
+	go ra.Run(&acc, time.Now(), make(chan struct{}))

 	// metric before current period
 	m := ra.MakeMetric(
@@ -112,7 +113,7 @@ func TestAddAndPushOnePeriod(t *testing.T) {
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
-		ra.Run(&acc, shutdown)
+		ra.Run(&acc, time.Now(), shutdown)
 	}()

 	m := ra.MakeMetric(
@@ -166,6 +167,69 @@ func TestAddDropOriginal(t *testing.T) {
 	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
 }
--- a/internal/models/running_input.go
+++ b/internal/models/running_input.go
@@ -5,7 +5,6 @@ import (
 	"time"

 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/plugins/serializers/influx"
 	"github.com/influxdata/telegraf/selfstat"
 )

@@ -76,11 +75,7 @@ func (r *RunningInput) MakeMetric(
 	)

 	if r.trace && m != nil {
-		s := influx.NewSerializer()
-		octets, err := s.Serialize(m)
-		if err == nil {
-			fmt.Print("> " + string(octets))
-		}
+		fmt.Print("> " + m.String())
 	}

 	r.MetricsGathered.Incr(1)
--- a/internal/models/running_input_test.go
+++ b/internal/models/running_input_test.go
@@ -1,11 +1,12 @@
 package models

 import (
+	"fmt"
+	"math"
 	"testing"
 	"time"

 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/metric"

 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -44,17 +45,77 @@ func TestMakeMetricNilFields(t *testing.T) {
 		telegraf.Untyped,
 		now,
 	)
+	assert.Equal(
+		t,
+		fmt.Sprintf("RITest value=101i %d\n", now.UnixNano()),
+		m.String(),
+	)
+}

-	expected, err := metric.New("RITest",
+// 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{},
-		map[string]interface{}{
-			"value": int(101),
-		},
+		telegraf.Untyped,
 		now,
 	)
-	require.NoError(t, err)
+	assert.Equal(
+		t,
+		fmt.Sprintf("RITest value=101i %d\n", now.UnixNano()),
+		m.String(),
+	)
+	assert.Equal(
+		t,
+		m.Type(),
+		telegraf.Untyped,
+	)

-	require.Equal(t, expected, m)
+	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) {
@@ -76,18 +137,11 @@ func TestMakeMetricWithPluginTags(t *testing.T) {
 		telegraf.Untyped,
 		now,
 	)
-
-	expected, err := metric.New("RITest",
-		map[string]string{
-			"foo": "bar",
-		},
-		map[string]interface{}{
-			"value": 101,
-		},
-		now,
+	assert.Equal(
+		t,
+		fmt.Sprintf("RITest,foo=bar value=101i %d\n", now.UnixNano()),
+		m.String(),
 	)
-	require.NoError(t, err)
-	require.Equal(t, expected, m)
 }

 func TestMakeMetricFilteredOut(t *testing.T) {
@@ -133,17 +187,87 @@ func TestMakeMetricWithDaemonTags(t *testing.T) {
 		telegraf.Untyped,
 		now,
 	)
-	expected, err := metric.New("RITest",
-		map[string]string{
-			"foo": "bar",
-		},
+	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": 101,
+			"value": int(101),
+			"inf":   inf,
+			"ninf":  ninf,
 		},
+		map[string]string{},
+		telegraf.Untyped,
 		now,
 	)
-	require.NoError(t, err)
-	require.Equal(t, expected, m)
+	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) {
@@ -160,15 +284,11 @@ func TestMakeMetricNameOverride(t *testing.T) {
 		telegraf.Untyped,
 		now,
 	)
-	expected, err := metric.New("foobar",
-		nil,
-		map[string]interface{}{
-			"value": 101,
-		},
-		now,
+	assert.Equal(
+		t,
+		fmt.Sprintf("foobar value=101i %d\n", now.UnixNano()),
+		m.String(),
 	)
-	require.NoError(t, err)
-	require.Equal(t, expected, m)
 }

 func TestMakeMetricNamePrefix(t *testing.T) {
@@ -185,15 +305,11 @@ func TestMakeMetricNamePrefix(t *testing.T) {
 		telegraf.Untyped,
 		now,
 	)
-	expected, err := metric.New("foobar_RITest",
-		nil,
-		map[string]interface{}{
-			"value": 101,
-		},
-		now,
+	assert.Equal(
+		t,
+		fmt.Sprintf("foobar_RITest value=101i %d\n", now.UnixNano()),
+		m.String(),
 	)
-	require.NoError(t, err)
-	require.Equal(t, expected, m)
 }

 func TestMakeMetricNameSuffix(t *testing.T) {
@@ -210,15 +326,134 @@ func TestMakeMetricNameSuffix(t *testing.T) {
 		telegraf.Untyped,
 		now,
 	)
-	expected, err := metric.New("RITest_foobar",
-		nil,
-		map[string]interface{}{
-			"value": 101,
-		},
-		now,
+	assert.Equal(
+		t,
+		fmt.Sprintf("RITest_foobar value=101i %d\n", now.UnixNano()),
+		m.String(),
 	)
-	require.NoError(t, err)
-	require.Equal(t, expected, m)
+}
+
+func TestMakeMetric_TrailingSlash(t *testing.T) {
+	now := time.Now()
+
+	tests := []struct {
+		name                string
+		measurement         string
+		fields              map[string]interface{}
+		tags                map[string]string
+		expectedNil         bool
+		expectedMeasurement string
+		expectedFields      map[string]interface{}
+		expectedTags        map[string]string
+	}{
+		{
+			name:        "Measurement cannot have trailing slash",
+			measurement: `cpu\`,
+			fields: map[string]interface{}{
+				"value": int64(42),
+			},
+			tags:        map[string]string{},
+			expectedNil: true,
+		},
+		{
+			name:        "Field key with trailing slash dropped",
+			measurement: `cpu`,
+			fields: map[string]interface{}{
+				"value": int64(42),
+				`bad\`:  `xyzzy`,
+			},
+			tags:                map[string]string{},
+			expectedMeasurement: `cpu`,
+			expectedFields: map[string]interface{}{
+				"value": int64(42),
+			},
+			expectedTags: map[string]string{},
+		},
+		{
+			name:        "Field value with trailing slash okay",
+			measurement: `cpu`,
+			fields: map[string]interface{}{
+				"value": int64(42),
+				"ok":    `xyzzy\`,
+			},
+			tags:                map[string]string{},
+			expectedMeasurement: `cpu`,
+			expectedFields: map[string]interface{}{
+				"value": int64(42),
+				"ok":    `xyzzy\`,
+			},
+			expectedTags: map[string]string{},
+		},
+		{
+			name:        "Must have one field after dropped",
+			measurement: `cpu`,
+			fields: map[string]interface{}{
+				"bad": math.NaN(),
+			},
+			tags:        map[string]string{},
+			expectedNil: true,
+		},
+		{
+			name:        "Tag key with trailing slash dropped",
+			measurement: `cpu`,
+			fields: map[string]interface{}{
+				"value": int64(42),
+			},
+			tags: map[string]string{
+				`host\`: "localhost",
+				"a":     "x",
+			},
+			expectedMeasurement: `cpu`,
+			expectedFields: map[string]interface{}{
+				"value": int64(42),
+			},
+			expectedTags: map[string]string{
+				"a": "x",
+			},
+		},
+		{
+			name:        "Tag value with trailing slash dropped",
+			measurement: `cpu`,
+			fields: map[string]interface{}{
+				"value": int64(42),
+			},
+			tags: map[string]string{
+				`host`: `localhost\`,
+				"a":    "x",
+			},
+			expectedMeasurement: `cpu`,
+			expectedFields: map[string]interface{}{
+				"value": int64(42),
+			},
+			expectedTags: map[string]string{
+				"a": "x",
+			},
+		},
+	}
+
+	ri := NewRunningInput(&testInput{}, &InputConfig{
+		Name: "TestRunningInput",
+	})
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			m := ri.MakeMetric(
+				tc.measurement,
+				tc.fields,
+				tc.tags,
+				telegraf.Untyped,
+				now)
+
+			if tc.expectedNil {
+				require.Nil(t, m)
+			} else {
+				require.NotNil(t, m)
+				require.Equal(t, tc.expectedMeasurement, m.Name())
+				require.Equal(t, tc.expectedFields, m.Fields())
+				require.Equal(t, tc.expectedTags, m.Tags())
+			}
+		})
+	}
 }

 type testInput struct{}
--- a/internal/models/running_output.go
+++ b/internal/models/running_output.go
@@ -87,7 +87,7 @@ func NewRunningOutput(
 			map[string]string{"output": name},
 		),
 	}
-	ro.BufferLimit.Set(int64(ro.MetricBufferLimit))
+	ro.BufferLimit.Incr(int64(ro.MetricBufferLimit))
 	return ro
 }

--- a/internal/templating/engine.go
+++ b/internal/templating/engine.go
@@ -1,86 +0,0 @@
-package templating
-
-import (
-	"sort"
-	"strings"
-)
-
-const (
-	// DefaultSeparator is the default separation character to use when separating template parts.
-	DefaultSeparator = "."
-)
-
-// Engine uses a Matcher to retrieve the appropriate template and applies the template
-// to the input string
-type Engine struct {
-	joiner  string
-	matcher *matcher
-}
-
-// Apply extracts the template fields from the given line and returns the measurement
-// name, tags and field name
-func (e *Engine) Apply(line string) (string, map[string]string, string, error) {
-	return e.matcher.match(line).Apply(line, e.joiner)
-}
-
-// NewEngine creates a new templating engine
-func NewEngine(joiner string, defaultTemplate *Template, templates []string) (*Engine, error) {
-	engine := Engine{
-		joiner:  joiner,
-		matcher: newMatcher(defaultTemplate),
-	}
-	templateSpecs := parseTemplateSpecs(templates)
-
-	for _, templateSpec := range templateSpecs {
-		if err := engine.matcher.addSpec(templateSpec); err != nil {
-			return nil, err
-		}
-	}
-
-	return &engine, nil
-}
-
-func parseTemplateSpecs(templates []string) templateSpecs {
-	tmplts := templateSpecs{}
-	for _, pattern := range templates {
-		tmplt := templateSpec{
-			separator: DefaultSeparator,
-		}
-
-		// Format is [separator] [filter] <template> [tag1=value1,tag2=value2]
-		parts := strings.Fields(pattern)
-		partsLength := len(parts)
-		if partsLength < 1 {
-			// ignore
-			continue
-		}
-		if partsLength == 1 {
-			tmplt.template = pattern
-		} else if partsLength == 4 {
-			tmplt.separator = parts[0]
-			tmplt.filter = parts[1]
-			tmplt.template = parts[2]
-			tmplt.tagstring = parts[3]
-		} else {
-			hasTagstring := strings.Contains(parts[partsLength-1], "=")
-			if hasTagstring {
-				tmplt.tagstring = parts[partsLength-1]
-				tmplt.template = parts[partsLength-2]
-				if partsLength == 3 {
-					tmplt.filter = parts[0]
-				}
-			} else {
-				tmplt.template = parts[partsLength-1]
-				if partsLength == 2 {
-					tmplt.filter = parts[0]
-				} else { // length == 3
-					tmplt.separator = parts[0]
-					tmplt.filter = parts[1]
-				}
-			}
-		}
-		tmplts = append(tmplts, tmplt)
-	}
-	sort.Sort(tmplts)
-	return tmplts
-}
--- a/internal/templating/matcher.go
+++ b/internal/templating/matcher.go
@@ -1,58 +0,0 @@
-package templating
-
-import (
-	"strings"
-)
-
-// matcher determines which template should be applied to a given metric
-// based on a filter tree.
-type matcher struct {
-	root            *node
-	defaultTemplate *Template
-}
-
-// newMatcher creates a new matcher.
-func newMatcher(defaultTemplate *Template) *matcher {
-	return &matcher{
-		root:            &node{},
-		defaultTemplate: defaultTemplate,
-	}
-}
-
-func (m *matcher) addSpec(tmplt templateSpec) error {
-	// Parse out the default tags specific to this template
-	tags := map[string]string{}
-	if tmplt.tagstring != "" {
-		for _, kv := range strings.Split(tmplt.tagstring, ",") {
-			parts := strings.Split(kv, "=")
-			tags[parts[0]] = parts[1]
-		}
-	}
-
-	tmpl, err := NewTemplate(tmplt.separator, tmplt.template, tags)
-	if err != nil {
-		return err
-	}
-	m.add(tmplt.filter, tmpl)
-	return nil
-}
-
-// add inserts the template in the filter tree based the given filter
-func (m *matcher) add(filter string, template *Template) {
-	if filter == "" {
-		m.defaultTemplate = template
-		m.root.separator = template.separator
-		return
-	}
-	m.root.insert(filter, template)
-}
-
-// match returns the template that matches the given measurement line.
-// If no template matches, the default template is returned.
-func (m *matcher) match(line string) *Template {
-	tmpl := m.root.search(line)
-	if tmpl != nil {
-		return tmpl
-	}
-	return m.defaultTemplate
-}
--- a/internal/templating/node.go
+++ b/internal/templating/node.go
@@ -1,122 +0,0 @@
-package templating
-
-import (
-	"sort"
-	"strings"
-)
-
-// node is an item in a sorted k-ary tree of filter parts. Each child is sorted by its part value.
-// The special value of "*", is always sorted last.
-type node struct {
-	separator string
-	value     string
-	children  nodes
-	template  *Template
-}
-
-// insert inserts the given string template into the tree.  The filter string is separated
-// on the template separator and each part is used as the path in the tree.
-func (n *node) insert(filter string, template *Template) {
-	n.separator = template.separator
-	n.recursiveInsert(strings.Split(filter, n.separator), template)
-}
-
-// recursiveInsert does the actual recursive insertion
-func (n *node) recursiveInsert(values []string, template *Template) {
-	// Add the end, set the template
-	if len(values) == 0 {
-		n.template = template
-		return
-	}
-
-	// See if the the current element already exists in the tree. If so, insert the
-	// into that sub-tree
-	for _, v := range n.children {
-		if v.value == values[0] {
-			v.recursiveInsert(values[1:], template)
-			return
-		}
-	}
-
-	// New element, add it to the tree and sort the children
-	newNode := &node{value: values[0]}
-	n.children = append(n.children, newNode)
-	sort.Sort(&n.children)
-
-	// Now insert the rest of the tree into the new element
-	newNode.recursiveInsert(values[1:], template)
-}
-
-// search searches for a template matching the input string
-func (n *node) search(line string) *Template {
-	separator := n.separator
-	return n.recursiveSearch(strings.Split(line, separator))
-}
-
-// recursiveSearch performs the actual recursive search
-func (n *node) recursiveSearch(lineParts []string) *Template {
-	// Nothing to search
-	if len(lineParts) == 0 || len(n.children) == 0 {
-		return n.template
-	}
-
-	// If last element is a wildcard, don't include it in this search since it's sorted
-	// to the end but lexicographically it would not always be and sort.Search assumes
-	// the slice is sorted.
-	length := len(n.children)
-	if n.children[length-1].value == "*" {
-		length--
-	}
-
-	// Find the index of child with an exact match
-	i := sort.Search(length, func(i int) bool {
-		return n.children[i].value >= lineParts[0]
-	})
-
-	// Found an exact match, so search that child sub-tree
-	if i < len(n.children) && n.children[i].value == lineParts[0] {
-		return n.children[i].recursiveSearch(lineParts[1:])
-	}
-	// Not an exact match, see if we have a wildcard child to search
-	if n.children[len(n.children)-1].value == "*" {
-		return n.children[len(n.children)-1].recursiveSearch(lineParts[1:])
-	}
-	return n.template
-}
-
-// nodes is simply an array of nodes implementing the sorting interface.
-type nodes []*node
-
-// Less returns a boolean indicating whether the filter at position j
-// is less than the filter at position k. Filters are order by string
-// comparison of each component parts.  A wildcard value "*" is never
-// less than a non-wildcard value.
-//
-// For example, the filters:
-//             "*.*"
-//             "servers.*"
-//             "servers.localhost"
-//             "*.localhost"
-//
-// Would be sorted as:
-//             "servers.localhost"
-//             "servers.*"
-//             "*.localhost"
-//             "*.*"
-func (n *nodes) Less(j, k int) bool {
-	if (*n)[j].value == "*" && (*n)[k].value != "*" {
-		return false
-	}
-
-	if (*n)[j].value != "*" && (*n)[k].value == "*" {
-		return true
-	}
-
-	return (*n)[j].value < (*n)[k].value
-}
-
-// Swap swaps two elements of the array
-func (n *nodes) Swap(i, j int) { (*n)[i], (*n)[j] = (*n)[j], (*n)[i] }
-
-// Len returns the length of the array
-func (n *nodes) Len() int { return len(*n) }
--- a/internal/templating/template.go
+++ b/internal/templating/template.go
@@ -1,148 +0,0 @@
-package templating
-
-import (
-	"fmt"
-	"strings"
-)
-
-// Template represents a pattern and tags to map a metric string to a influxdb Point
-type Template struct {
-	separator         string
-	parts             []string
-	defaultTags       map[string]string
-	greedyField       bool
-	greedyMeasurement bool
-}
-
-// apply extracts the template fields from the given line and returns the measurement
-// name, tags and field name
-func (t *Template) Apply(line string, joiner string) (string, map[string]string, string, error) {
-	fields := strings.Split(line, t.separator)
-	var (
-		measurement []string
-		tags        = make(map[string][]string)
-		field       []string
-	)
-
-	// Set any default tags
-	for k, v := range t.defaultTags {
-		tags[k] = append(tags[k], v)
-	}
-
-	// See if an invalid combination has been specified in the template:
-	for _, tag := range t.parts {
-		if tag == "measurement*" {
-			t.greedyMeasurement = true
-		} else if tag == "field*" {
-			t.greedyField = true
-		}
-	}
-	if t.greedyField && t.greedyMeasurement {
-		return "", nil, "",
-			fmt.Errorf("either 'field*' or 'measurement*' can be used in each "+
-				"template (but not both together): %q",
-				strings.Join(t.parts, joiner))
-	}
-
-	for i, tag := range t.parts {
-		if i >= len(fields) {
-			continue
-		}
-		if tag == "" {
-			continue
-		}
-
-		switch tag {
-		case "measurement":
-			measurement = append(measurement, fields[i])
-		case "field":
-			field = append(field, fields[i])
-		case "field*":
-			field = append(field, fields[i:]...)
-			break
-		case "measurement*":
-			measurement = append(measurement, fields[i:]...)
-			break
-		default:
-			tags[tag] = append(tags[tag], fields[i])
-		}
-	}
-
-	// Convert to map of strings.
-	outtags := make(map[string]string)
-	for k, values := range tags {
-		outtags[k] = strings.Join(values, joiner)
-	}
-
-	return strings.Join(measurement, joiner), outtags, strings.Join(field, joiner), nil
-}
-
-func NewDefaultTemplateWithPattern(pattern string) (*Template, error) {
-	return NewTemplate(DefaultSeparator, pattern, nil)
-}
-
-// NewTemplate returns a new template ensuring it has a measurement
-// specified.
-func NewTemplate(separator string, pattern string, defaultTags map[string]string) (*Template, error) {
-	parts := strings.Split(pattern, separator)
-	hasMeasurement := false
-	template := &Template{
-		separator:   separator,
-		parts:       parts,
-		defaultTags: defaultTags,
-	}
-
-	for _, part := range parts {
-		if strings.HasPrefix(part, "measurement") {
-			hasMeasurement = true
-		}
-		if part == "measurement*" {
-			template.greedyMeasurement = true
-		} else if part == "field*" {
-			template.greedyField = true
-		}
-	}
-
-	if !hasMeasurement {
-		return nil, fmt.Errorf("no measurement specified for template. %q", pattern)
-	}
-
-	return template, nil
-}
-
-// templateSpec is a template string split in its constituent parts
-type templateSpec struct {
-	separator string
-	filter    string
-	template  string
-	tagstring string
-}
-
-// templateSpecs is simply an array of template specs implementing the sorting interface
-type templateSpecs []templateSpec
-
-// Less reports whether the element with
-// index j should sort before the element with index k.
-func (e templateSpecs) Less(j, k int) bool {
-	if len(e[j].filter) == 0 && len(e[k].filter) == 0 {
-		jlength := len(strings.Split(e[j].template, e[j].separator))
-		klength := len(strings.Split(e[k].template, e[k].separator))
-		return jlength < klength
-	}
-	if len(e[j].filter) == 0 {
-		return true
-	}
-	if len(e[k].filter) == 0 {
-		return false
-	}
-
-	jlength := len(strings.Split(e[j].template, e[j].separator))
-	klength := len(strings.Split(e[k].template, e[k].separator))
-	return jlength < klength
-}
-
-// Swap swaps the elements with indexes i and j.
-func (e templateSpecs) Swap(i, j int) { e[i], e[j] = e[j], e[i] }
-
-// Len is the number of elements in the collection.
-func (e templateSpecs) Len() int { return len(e) }
--- a/metric.go
+++ b/metric.go
@@ -17,50 +17,48 @@ const (
 	Histogram
 )

-type Tag struct {
-	Key   string
-	Value string
-}
-
-type Field struct {
-	Key   string
-	Value interface{}
-}
-
 type Metric interface {
-	// Getting data structure functions
-	Name() string
-	Tags() map[string]string
-	TagList() []*Tag
-	Fields() map[string]interface{}
-	FieldList() []*Field
-	Time() time.Time
-	Type() ValueType
-
-	// Name functions
-	SetName(name string)
-	AddPrefix(prefix string)
-	AddSuffix(suffix string)
+	// Serialize serializes the metric into a line-protocol byte buffer,
+	// including a newline at the end.
+	Serialize() []byte
+	// same as Serialize, but avoids an allocation.
+	// returns number of bytes copied into dst.
+	SerializeTo(dst []byte) int
+	// String is the same as Serialize, but returns a string.
+	String() string
+	// Copy deep-copies the metric.
+	Copy() Metric
+	// Split will attempt to return multiple metrics with the same timestamp
+	// whose string representations are no longer than maxSize.
+	// Metrics with a single field may exceed the requested size.
+	Split(maxSize int) []Metric

 	// Tag functions
-	GetTag(key string) (string, bool)
 	HasTag(key string) bool
 	AddTag(key, value string)
 	RemoveTag(key string)

 	// Field functions
-	GetField(key string) (interface{}, bool)
 	HasField(key string) bool
 	AddField(key string, value interface{})
-	RemoveField(key string)
+	RemoveField(key string) error

-	// HashID returns an unique identifier for the series.
+	// Name functions
+	SetName(name string)
+	SetPrefix(prefix string)
+	SetSuffix(suffix string)
+
+	// Getting data structure functions
+	Name() string
+	Tags() map[string]string
+	Fields() map[string]interface{}
+	Time() time.Time
+	UnixNano() int64
+	Type() ValueType
+	Len() int // returns the length of the serialized metric, including newline
 	HashID() uint64

-	// Copy returns a deep copy of the Metric.
-	Copy() Metric
-
-	// Mark Metric as an aggregate
+	// aggregator things:
 	SetAggregate(bool)
 	IsAggregate() bool
 }
--- a/metric/builder.go
+++ b/metric/builder.go
@@ -1,53 +0,0 @@
-package metric
-
-import (
-	"time"
-
-	"github.com/influxdata/telegraf"
-)
-
-type TimeFunc func() time.Time
-
-type Builder struct {
-	TimeFunc
-	TimePrecision time.Duration
-
-	*metric
-}
-
-func NewBuilder() *Builder {
-	b := &Builder{
-		TimeFunc:      time.Now,
-		TimePrecision: 1 * time.Nanosecond,
-	}
-	b.Reset()
-	return b
-}
-
-func (b *Builder) SetName(name string) {
-	b.name = name
-}
-
-func (b *Builder) AddTag(key string, value string) {
-	b.metric.AddTag(key, value)
-}
-
-func (b *Builder) AddField(key string, value interface{}) {
-	b.metric.AddField(key, value)
-}
-
-func (b *Builder) SetTime(tm time.Time) {
-	b.tm = tm
-}
-
-func (b *Builder) Reset() {
-	b.metric = &metric{}
-}
-
-func (b *Builder) Metric() (telegraf.Metric, error) {
-	if b.tm.IsZero() {
-		b.tm = b.TimeFunc().Truncate(b.TimePrecision)
-	}
-
-	return b.metric, nil
-}
--- a/metric/escape.go
+++ b/metric/escape.go
@@ -0,0 +1,55 @@
+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
@@ -1,278 +1,623 @@
 package metric

 import (
+	"bytes"
 	"fmt"
 	"hash/fnv"
 	"sort"
+	"strconv"
+	"strings"
 	"time"

 	"github.com/influxdata/telegraf"
 )

-type metric struct {
-	name   string
-	tags   []*telegraf.Tag
-	fields []*telegraf.Field
-	tm     time.Time
-
-	tp        telegraf.ValueType
-	aggregate bool
-}
+const MaxInt = int(^uint(0) >> 1)

 func New(
 	name string,
 	tags map[string]string,
 	fields map[string]interface{},
-	tm time.Time,
-	tp ...telegraf.ValueType,
+	t time.Time,
+	mType ...telegraf.ValueType,
 ) (telegraf.Metric, error) {
-	var vtype telegraf.ValueType
-	if len(tp) > 0 {
-		vtype = tp[0]
+	if len(name) == 0 {
+		return nil, fmt.Errorf("missing measurement name")
+	}
+	if len(fields) == 0 {
+		return nil, fmt.Errorf("%s: must have one or more fields", name)
+	}
+	if strings.HasSuffix(name, `\`) {
+		return nil, fmt.Errorf("%s: measurement name cannot end with a backslash", name)
+	}
+
+	var thisType telegraf.ValueType
+	if len(mType) > 0 {
+		thisType = mType[0]
 	} else {
-		vtype = telegraf.Untyped
+		thisType = telegraf.Untyped
 	}

 	m := &metric{
-		name:   name,
-		tags:   nil,
-		fields: nil,
-		tm:     tm,
-		tp:     vtype,
+		name:  []byte(escape(name, "name")),
+		t:     []byte(fmt.Sprint(t.UnixNano())),
+		nsec:  t.UnixNano(),
+		mType: thisType,
 	}

-	if len(tags) > 0 {
-		m.tags = make([]*telegraf.Tag, 0, len(tags))
-		for k, v := range tags {
-			m.tags = append(m.tags,
-				&telegraf.Tag{Key: k, Value: v})
+	// pre-allocate exact size of the tags slice
+	taglen := 0
+	for k, v := range tags {
+		if strings.HasSuffix(k, `\`) {
+			return nil, fmt.Errorf("%s: tag key cannot end with a backslash: %s", name, k)
+		}
+		if strings.HasSuffix(v, `\`) {
+			return nil, fmt.Errorf("%s: tag value cannot end with a backslash: %s", name, v)
 		}
-		sort.Slice(m.tags, func(i, j int) bool { return m.tags[i].Key < m.tags[j].Key })
-	}

-	m.fields = make([]*telegraf.Field, 0, len(fields))
-	for k, v := range fields {
-		v := convertField(v)
-		if v == nil {
+		if len(k) == 0 || len(v) == 0 {
 			continue
 		}
-		m.AddField(k, v)
+		taglen += 2 + len(escape(k, "tagkey")) + len(escape(v, "tagval"))
+	}
+	m.tags = make([]byte, taglen)
+
+	i := 0
+	for k, v := range tags {
+		if len(k) == 0 || len(v) == 0 {
+			continue
+		}
+		m.tags[i] = ','
+		i++
+		i += copy(m.tags[i:], escape(k, "tagkey"))
+		m.tags[i] = '='
+		i++
+		i += copy(m.tags[i:], escape(v, "tagval"))
+	}
+
+	// pre-allocate capacity of the fields slice
+	fieldlen := 0
+	for k, _ := range fields {
+		if strings.HasSuffix(k, `\`) {
+			return nil, fmt.Errorf("%s: field key cannot end with a backslash: %s", name, k)
+		}
+
+		// 10 bytes is completely arbitrary, but will at least prevent some
+		// amount of allocations. There's a small possibility this will create
+		// slightly more allocations for a metric that has many short fields.
+		fieldlen += len(k) + 10
+	}
+	m.fields = make([]byte, 0, fieldlen)
+
+	i = 0
+	for k, v := range fields {
+		if i != 0 {
+			m.fields = append(m.fields, ',')
+		}
+		m.fields = appendField(m.fields, k, v)
+		i++
 	}

 	return m, nil
 }

+// indexUnescapedByte finds the index of the first byte equal to b in buf that
+// is not escaped.  Does not allow the escape char to be escaped. Returns -1 if
+// not found.
+func indexUnescapedByte(buf []byte, b byte) int {
+	var keyi int
+	for {
+		i := bytes.IndexByte(buf[keyi:], b)
+		if i == -1 {
+			return -1
+		} else if i == 0 {
+			break
+		}
+		keyi += i
+		if buf[keyi-1] != '\\' {
+			break
+		} else {
+			keyi++
+		}
+	}
+	return keyi
+}
+
+// indexUnescapedByteBackslashEscaping finds the index of the first byte equal
+// to b in buf that is not escaped.  Allows for the escape char `\` to be
+// escaped.  Returns -1 if not found.
+func indexUnescapedByteBackslashEscaping(buf []byte, b byte) int {
+	var keyi int
+	for {
+		i := bytes.IndexByte(buf[keyi:], b)
+		if i == -1 {
+			return -1
+		} else if i == 0 {
+			break
+		}
+		keyi += i
+		if countBackslashes(buf, keyi-1)%2 == 0 {
+			break
+		} else {
+			keyi++
+		}
+	}
+	return keyi
+}
+
+// countBackslashes counts the number of preceding backslashes starting at
+// the 'start' index.
+func countBackslashes(buf []byte, index int) int {
+	var count int
+	for {
+		if index < 0 {
+			return count
+		}
+		if buf[index] == '\\' {
+			count++
+			index--
+		} else {
+			break
+		}
+	}
+	return count
+}
+
+type metric struct {
+	name   []byte
+	tags   []byte
+	fields []byte
+	t      []byte
+
+	mType     telegraf.ValueType
+	aggregate bool
+
+	// cached values for reuse in "get" functions
+	hashID uint64
+	nsec   int64
+}
+
 func (m *metric) String() string {
-	return fmt.Sprintf("%s %v %v %d", m.name, m.Tags(), m.Fields(), m.tm.UnixNano())
-}
-
-func (m *metric) Name() string {
-	return m.name
-}
-
-func (m *metric) Tags() map[string]string {
-	tags := make(map[string]string, len(m.tags))
-	for _, tag := range m.tags {
-		tags[tag.Key] = tag.Value
-	}
-	return tags
-}
-
-func (m *metric) TagList() []*telegraf.Tag {
-	return m.tags
-}
-
-func (m *metric) Fields() map[string]interface{} {
-	fields := make(map[string]interface{}, len(m.fields))
-	for _, field := range m.fields {
-		fields[field.Key] = field.Value
-	}
-
-	return fields
-}
-
-func (m *metric) FieldList() []*telegraf.Field {
-	return m.fields
-}
-
-func (m *metric) Time() time.Time {
-	return m.tm
-}
-
-func (m *metric) Type() telegraf.ValueType {
-	return m.tp
-}
-
-func (m *metric) SetName(name string) {
-	m.name = name
-}
-
-func (m *metric) AddPrefix(prefix string) {
-	m.name = prefix + m.name
-}
-
-func (m *metric) AddSuffix(suffix string) {
-	m.name = m.name + suffix
-}
-
-func (m *metric) AddTag(key, value string) {
-	for i, tag := range m.tags {
-		if key > tag.Key {
-			continue
-		}
-
-		if key == tag.Key {
-			tag.Value = value
-		}
-
-		m.tags = append(m.tags, nil)
-		copy(m.tags[i+1:], m.tags[i:])
-		m.tags[i] = &telegraf.Tag{Key: key, Value: value}
-		return
-	}
-
-	m.tags = append(m.tags, &telegraf.Tag{Key: key, Value: value})
-}
-
-func (m *metric) HasTag(key string) bool {
-	for _, tag := range m.tags {
-		if tag.Key == key {
-			return true
-		}
-	}
-	return false
-}
-
-func (m *metric) GetTag(key string) (string, bool) {
-	for _, tag := range m.tags {
-		if tag.Key == key {
-			return tag.Value, true
-		}
-	}
-	return "", false
-}
-
-func (m *metric) RemoveTag(key string) {
-	for i, tag := range m.tags {
-		if tag.Key == key {
-			copy(m.tags[i:], m.tags[i+1:])
-			m.tags[len(m.tags)-1] = nil
-			m.tags = m.tags[:len(m.tags)-1]
-			return
-		}
-	}
-}
-
-func (m *metric) AddField(key string, value interface{}) {
-	for i, field := range m.fields {
-		if key == field.Key {
-			m.fields[i] = &telegraf.Field{Key: key, Value: convertField(value)}
-		}
-	}
-	m.fields = append(m.fields, &telegraf.Field{Key: key, Value: convertField(value)})
-}
-
-func (m *metric) HasField(key string) bool {
-	for _, field := range m.fields {
-		if field.Key == key {
-			return true
-		}
-	}
-	return false
-}
-
-func (m *metric) GetField(key string) (interface{}, bool) {
-	for _, field := range m.fields {
-		if field.Key == key {
-			return field.Value, true
-		}
-	}
-	return nil, false
-}
-
-func (m *metric) RemoveField(key string) {
-	for i, field := range m.fields {
-		if field.Key == key {
-			copy(m.fields[i:], m.fields[i+1:])
-			m.fields[len(m.fields)-1] = nil
-			m.fields = m.fields[:len(m.fields)-1]
-			return
-		}
-	}
-}
-
-func (m *metric) Copy() telegraf.Metric {
-	m2 := &metric{
-		name:      m.name,
-		tags:      make([]*telegraf.Tag, len(m.tags)),
-		fields:    make([]*telegraf.Field, len(m.fields)),
-		tm:        m.tm,
-		tp:        m.tp,
-		aggregate: m.aggregate,
-	}
-
-	for i, tag := range m.tags {
-		m2.tags[i] = tag
-	}
-
-	for i, field := range m.fields {
-		m2.fields[i] = field
-	}
-	return m2
+	return string(m.name) + string(m.tags) + " " + string(m.fields) + " " + string(m.t) + "\n"
 }

 func (m *metric) SetAggregate(b bool) {
-	m.aggregate = true
+	m.aggregate = b
 }

 func (m *metric) IsAggregate() bool {
 	return m.aggregate
 }

-func (m *metric) HashID() uint64 {
-	h := fnv.New64a()
-	h.Write([]byte(m.name))
-	for _, tag := range m.tags {
-		h.Write([]byte(tag.Key))
-		h.Write([]byte(tag.Value))
-	}
-	return h.Sum64()
+func (m *metric) Type() telegraf.ValueType {
+	return m.mType
 }

-// Convert field to a supported type or nil if unconvertible
-func convertField(v interface{}) interface{} {
-	switch v := v.(type) {
-	case float64:
-		return v
-	case int64:
-		return v
-	case string:
-		return v
-	case bool:
-		return v
-	case int:
-		return int64(v)
-	case uint:
-		return uint64(v)
-	case uint64:
-		return uint64(v)
-	case []byte:
-		return string(v)
-	case int32:
-		return int64(v)
-	case int16:
-		return int64(v)
-	case int8:
-		return int64(v)
-	case uint32:
-		return uint64(v)
-	case uint16:
-		return uint64(v)
-	case uint8:
-		return uint64(v)
-	case float32:
-		return float64(v)
-	default:
+func (m *metric) Len() int {
+	// 3 is for 2 spaces surrounding the fields array + newline at the end.
+	return len(m.name) + len(m.tags) + len(m.fields) + len(m.t) + 3
+}
+
+func (m *metric) Serialize() []byte {
+	tmp := make([]byte, m.Len())
+	i := 0
+	i += copy(tmp[i:], m.name)
+	i += copy(tmp[i:], m.tags)
+	tmp[i] = ' '
+	i++
+	i += copy(tmp[i:], m.fields)
+	tmp[i] = ' '
+	i++
+	i += copy(tmp[i:], m.t)
+	tmp[i] = '\n'
+	return tmp
+}
+
+func (m *metric) SerializeTo(dst []byte) int {
+	i := 0
+	if i >= len(dst) {
+		return i
+	}
+
+	i += copy(dst[i:], m.name)
+	if i >= len(dst) {
+		return i
+	}
+
+	i += copy(dst[i:], m.tags)
+	if i >= len(dst) {
+		return i
+	}
+
+	dst[i] = ' '
+	i++
+	if i >= len(dst) {
+		return i
+	}
+
+	i += copy(dst[i:], m.fields)
+	if i >= len(dst) {
+		return i
+	}
+
+	dst[i] = ' '
+	i++
+	if i >= len(dst) {
+		return i
+	}
+
+	i += copy(dst[i:], m.t)
+	if i >= len(dst) {
+		return i
+	}
+	dst[i] = '\n'
+
+	return i + 1
+}
+
+func (m *metric) Split(maxSize int) []telegraf.Metric {
+	if m.Len() <= maxSize {
+		return []telegraf.Metric{m}
+	}
+	var out []telegraf.Metric
+
+	// constant number of bytes for each metric (in addition to field bytes)
+	constant := len(m.name) + len(m.tags) + len(m.t) + 3
+	// currently selected fields
+	fields := make([]byte, 0, maxSize)
+
+	i := 0
+	for {
+		if i >= len(m.fields) {
+			// hit the end of the field byte slice
+			if len(fields) > 0 {
+				out = append(out, copyWith(m.name, m.tags, fields, m.t))
+			}
+			break
+		}
+
+		// find the end of the next field
+		j := indexUnescapedByte(m.fields[i:], ',')
+		if j == -1 {
+			j = len(m.fields)
+		} else {
+			j += i
+		}
+
+		// if true, then we need to create a metric _not_ including the currently
+		// selected field
+		if len(m.fields[i:j])+len(fields)+constant >= maxSize {
+			// if false, then we'll create a metric including the currently
+			// selected field anyways. This means that the given maxSize is too
+			// small for a single field to fit.
+			if len(fields) > 0 {
+				out = append(out, copyWith(m.name, m.tags, fields, m.t))
+			}
+
+			fields = make([]byte, 0, maxSize)
+		}
+		if len(fields) > 0 {
+			fields = append(fields, ',')
+		}
+		fields = append(fields, m.fields[i:j]...)
+
+		i = j + 1
+	}
+	return out
+}
+
+func (m *metric) Fields() map[string]interface{} {
+	fieldMap := map[string]interface{}{}
+	i := 0
+	for {
+		if i >= len(m.fields) {
+			break
+		}
+		// end index of field key
+		i1 := indexUnescapedByte(m.fields[i:], '=')
+		if i1 == -1 {
+			break
+		}
+		// start index of field value
+		i2 := i1 + 1
+
+		// end index of field value
+		var i3 int
+		if m.fields[i:][i2] == '"' {
+			i3 = indexUnescapedByteBackslashEscaping(m.fields[i:][i2+1:], '"')
+			if i3 == -1 {
+				i3 = len(m.fields[i:])
+			}
+			i3 += i2 + 2 // increment index to the comma
+		} else {
+			i3 = indexUnescapedByte(m.fields[i:], ',')
+			if i3 == -1 {
+				i3 = len(m.fields[i:])
+			}
+		}
+
+		switch m.fields[i:][i2] {
+		case '"':
+			// string field
+			fieldMap[unescape(string(m.fields[i:][0:i1]), "fieldkey")] = unescape(string(m.fields[i:][i2+1:i3-1]), "fieldval")
+		case '-', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9':
+			// number field
+			switch m.fields[i:][i3-1] {
+			case 'i':
+				// integer field
+				n, err := parseIntBytes(m.fields[i:][i2:i3-1], 10, 64)
+				if err == nil {
+					fieldMap[unescape(string(m.fields[i:][0:i1]), "fieldkey")] = n
+				} else {
+					// TODO handle error or just ignore field silently?
+				}
+			default:
+				// float field
+				n, err := parseFloatBytes(m.fields[i:][i2:i3], 64)
+				if err == nil {
+					fieldMap[unescape(string(m.fields[i:][0:i1]), "fieldkey")] = n
+				} else {
+					// TODO handle error or just ignore field silently?
+				}
+			}
+		case 'T', 't':
+			fieldMap[unescape(string(m.fields[i:][0:i1]), "fieldkey")] = true
+		case 'F', 'f':
+			fieldMap[unescape(string(m.fields[i:][0:i1]), "fieldkey")] = false
+		default:
+			// TODO handle unsupported field type
+		}
+
+		i += i3 + 1
+	}
+
+	return fieldMap
+}
+
+func (m *metric) Tags() map[string]string {
+	tagMap := map[string]string{}
+	if len(m.tags) == 0 {
+		return tagMap
+	}
+
+	i := 0
+	for {
+		// start index of tag key
+		i0 := indexUnescapedByte(m.tags[i:], ',') + 1
+		if i0 == 0 {
+			// didn't find a tag start
+			break
+		}
+		// end index of tag key
+		i1 := indexUnescapedByte(m.tags[i:], '=')
+		// start index of tag value
+		i2 := i1 + 1
+		// end index of tag value (starting from i2)
+		i3 := indexUnescapedByte(m.tags[i+i2:], ',')
+		if i3 == -1 {
+			tagMap[unescape(string(m.tags[i:][i0:i1]), "tagkey")] = unescape(string(m.tags[i:][i2:]), "tagval")
+			break
+		}
+		tagMap[unescape(string(m.tags[i:][i0:i1]), "tagkey")] = unescape(string(m.tags[i:][i2:i2+i3]), "tagval")
+		// increment start index for the next tag
+		i += i2 + i3
+	}
+
+	return tagMap
+}
+
+func (m *metric) Name() string {
+	return unescape(string(m.name), "name")
+}
+
+func (m *metric) Time() time.Time {
+	// assume metric has been verified already and ignore error:
+	if m.nsec == 0 {
+		m.nsec, _ = parseIntBytes(m.t, 10, 64)
+	}
+	return time.Unix(0, m.nsec)
+}
+
+func (m *metric) UnixNano() int64 {
+	// assume metric has been verified already and ignore error:
+	if m.nsec == 0 {
+		m.nsec, _ = parseIntBytes(m.t, 10, 64)
+	}
+	return m.nsec
+}
+
+func (m *metric) SetName(name string) {
+	m.hashID = 0
+	m.name = []byte(nameEscaper.Replace(name))
+}
+
+func (m *metric) SetPrefix(prefix string) {
+	m.hashID = 0
+	m.name = append([]byte(nameEscaper.Replace(prefix)), m.name...)
+}
+
+func (m *metric) SetSuffix(suffix string) {
+	m.hashID = 0
+	m.name = append(m.name, []byte(nameEscaper.Replace(suffix))...)
+}
+
+func (m *metric) AddTag(key, value string) {
+	m.RemoveTag(key)
+	m.tags = append(m.tags, []byte(","+escape(key, "tagkey")+"="+escape(value, "tagval"))...)
+}
+
+func (m *metric) HasTag(key string) bool {
+	i := bytes.Index(m.tags, []byte(escape(key, "tagkey")+"="))
+	if i == -1 {
+		return false
+	}
+	return true
+}
+
+func (m *metric) RemoveTag(key string) {
+	m.hashID = 0
+
+	i := bytes.Index(m.tags, []byte(escape(key, "tagkey")+"="))
+	if i == -1 {
+		return
+	}
+
+	tmp := m.tags[0 : i-1]
+	j := indexUnescapedByte(m.tags[i:], ',')
+	if j != -1 {
+		tmp = append(tmp, m.tags[i+j:]...)
+	}
+	m.tags = tmp
+	return
+}
+
+func (m *metric) AddField(key string, value interface{}) {
+	m.fields = append(m.fields, ',')
+	m.fields = appendField(m.fields, key, value)
+}
+
+func (m *metric) HasField(key string) bool {
+	i := bytes.Index(m.fields, []byte(escape(key, "tagkey")+"="))
+	if i == -1 {
+		return false
+	}
+	return true
+}
+
+func (m *metric) RemoveField(key string) error {
+	i := bytes.Index(m.fields, []byte(escape(key, "tagkey")+"="))
+	if i == -1 {
 		return nil
 	}
+
+	var tmp []byte
+	if i != 0 {
+		tmp = m.fields[0 : i-1]
+	}
+	j := indexUnescapedByte(m.fields[i:], ',')
+	if j != -1 {
+		tmp = append(tmp, m.fields[i+j:]...)
+	}
+
+	if len(tmp) == 0 {
+		return fmt.Errorf("Metric cannot remove final field: %s", m.fields)
+	}
+
+	m.fields = tmp
+	return nil
+}
+
+func (m *metric) Copy() telegraf.Metric {
+	return copyWith(m.name, m.tags, m.fields, m.t)
+}
+
+func copyWith(name, tags, fields, t []byte) telegraf.Metric {
+	out := metric{
+		name:   make([]byte, len(name)),
+		tags:   make([]byte, len(tags)),
+		fields: make([]byte, len(fields)),
+		t:      make([]byte, len(t)),
+	}
+	copy(out.name, name)
+	copy(out.tags, tags)
+	copy(out.fields, fields)
+	copy(out.t, t)
+	return &out
+}
+
+func (m *metric) HashID() uint64 {
+	if m.hashID == 0 {
+		h := fnv.New64a()
+		h.Write(m.name)
+
+		tags := m.Tags()
+		tmp := make([]string, len(tags))
+		i := 0
+		for k, v := range tags {
+			tmp[i] = k + v
+			i++
+		}
+		sort.Strings(tmp)
+
+		for _, s := range tmp {
+			h.Write([]byte(s))
+		}
+
+		m.hashID = h.Sum64()
+	}
+	return m.hashID
+}
+
+func appendField(b []byte, k string, v interface{}) []byte {
+	if v == nil {
+		return b
+	}
+	b = append(b, []byte(escape(k, "tagkey")+"=")...)
+
+	// check popular types first
+	switch v := v.(type) {
+	case float64:
+		b = strconv.AppendFloat(b, v, 'f', -1, 64)
+	case int64:
+		b = strconv.AppendInt(b, v, 10)
+		b = append(b, 'i')
+	case string:
+		b = append(b, '"')
+		b = append(b, []byte(escape(v, "fieldval"))...)
+		b = append(b, '"')
+	case bool:
+		b = strconv.AppendBool(b, v)
+	case int32:
+		b = strconv.AppendInt(b, int64(v), 10)
+		b = append(b, 'i')
+	case int16:
+		b = strconv.AppendInt(b, int64(v), 10)
+		b = append(b, 'i')
+	case int8:
+		b = strconv.AppendInt(b, int64(v), 10)
+		b = append(b, 'i')
+	case int:
+		b = strconv.AppendInt(b, int64(v), 10)
+		b = append(b, 'i')
+	case uint64:
+		// Cap uints above the maximum int value
+		var intv int64
+		if v <= uint64(MaxInt) {
+			intv = int64(v)
+		} else {
+			intv = int64(MaxInt)
+		}
+		b = strconv.AppendInt(b, intv, 10)
+		b = append(b, 'i')
+	case uint32:
+		b = strconv.AppendInt(b, int64(v), 10)
+		b = append(b, 'i')
+	case uint16:
+		b = strconv.AppendInt(b, int64(v), 10)
+		b = append(b, 'i')
+	case uint8:
+		b = strconv.AppendInt(b, int64(v), 10)
+		b = append(b, 'i')
+	case uint:
+		// Cap uints above the maximum int value
+		var intv int64
+		if v <= uint(MaxInt) {
+			intv = int64(v)
+		} else {
+			intv = int64(MaxInt)
+		}
+		b = strconv.AppendInt(b, intv, 10)
+		b = append(b, 'i')
+	case float32:
+		b = strconv.AppendFloat(b, float64(v), 'f', -1, 32)
+	case []byte:
+		b = append(b, v...)
+	default:
+		// Can't determine the type, so convert to string
+		b = append(b, '"')
+		b = append(b, []byte(escape(fmt.Sprintf("%v", v), "fieldval"))...)
+		b = append(b, '"')
+	}
+
+	return b
 }
--- a/metric/metric_benchmark_test.go
+++ b/metric/metric_benchmark_test.go
@@ -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
@@ -1,10 +1,14 @@
 package metric

 import (
+	"fmt"
+	"math"
+	"regexp"
 	"testing"
 	"time"

 	"github.com/influxdata/telegraf"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -21,184 +25,102 @@ func TestNewMetric(t *testing.T) {
 		"usage_busy": float64(1),
 	}
 	m, err := New("cpu", tags, fields, now)
-	require.NoError(t, err)
+	assert.NoError(t, err)

-	require.Equal(t, "cpu", m.Name())
-	require.Equal(t, tags, m.Tags())
-	require.Equal(t, fields, m.Fields())
-	require.Equal(t, 2, len(m.FieldList()))
-	require.Equal(t, now, m.Time())
+	assert.Equal(t, telegraf.Untyped, m.Type())
+	assert.Equal(t, tags, m.Tags())
+	assert.Equal(t, fields, m.Fields())
+	assert.Equal(t, "cpu", m.Name())
+	assert.Equal(t, now.UnixNano(), m.Time().UnixNano())
+	assert.Equal(t, now.UnixNano(), m.UnixNano())
 }

-func baseMetric() telegraf.Metric {
-	tags := map[string]string{}
+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),
 	}
-	now := time.Now()
-
 	m, err := New("cpu", tags, fields, now)
-	if err != nil {
-		panic(err)
-	}
-	return m
-}
+	assert.NoError(t, err)

-func TestHasTag(t *testing.T) {
-	m := baseMetric()
+	assert.True(t, m.HasTag("host"))
+	assert.True(t, m.HasTag("datacenter"))

-	require.False(t, m.HasTag("host"))
-	m.AddTag("host", "localhost")
-	require.True(t, m.HasTag("host"))
-	m.RemoveTag("host")
-	require.False(t, m.HasTag("host"))
-}
-
-func TestAddTagOverwrites(t *testing.T) {
-	m := baseMetric()
-
-	m.AddTag("host", "localhost")
-	m.AddTag("host", "example.org")
-
-	value, ok := m.GetTag("host")
-	require.True(t, ok)
-	require.Equal(t, "example.org", value)
-}
-
-func TestRemoveTagNoEffectOnMissingTags(t *testing.T) {
-	m := baseMetric()
-
-	m.RemoveTag("foo")
-	m.AddTag("a", "x")
-	m.RemoveTag("foo")
-	m.RemoveTag("bar")
-	value, ok := m.GetTag("a")
-	require.True(t, ok)
-	require.Equal(t, "x", value)
-}
-
-func TestGetTag(t *testing.T) {
-	m := baseMetric()
-
-	value, ok := m.GetTag("host")
-	require.False(t, ok)
-
-	m.AddTag("host", "localhost")
-
-	value, ok = m.GetTag("host")
-	require.True(t, ok)
-	require.Equal(t, "localhost", value)
+	m.AddTag("newtag", "foo")
+	assert.True(t, m.HasTag("newtag"))

 	m.RemoveTag("host")
-	value, ok = m.GetTag("host")
-	require.False(t, ok)
+	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 TestHasField(t *testing.T) {
-	m := baseMetric()
-
-	require.False(t, m.HasField("x"))
-	m.AddField("x", 42.0)
-	require.True(t, m.HasField("x"))
-	m.RemoveTag("x")
-	require.False(t, m.HasTag("x"))
-}
-
-func TestAddFieldOverwrites(t *testing.T) {
-	m := baseMetric()
-
-	m.AddField("value", 1.0)
-	m.AddField("value", 42.0)
-
-	value, ok := m.GetField("value")
-	require.True(t, ok)
-	require.Equal(t, 42.0, value)
-}
-
-func TestAddFieldChangesType(t *testing.T) {
-	m := baseMetric()
-
-	m.AddField("value", 1.0)
-	m.AddField("value", "xyzzy")
-
-	value, ok := m.GetField("value")
-	require.True(t, ok)
-	require.Equal(t, "xyzzy", value)
-}
-
-func TestRemoveFieldNoEffectOnMissingFields(t *testing.T) {
-	m := baseMetric()
-
-	m.RemoveField("foo")
-	m.AddField("a", "x")
-	m.RemoveField("foo")
-	m.RemoveField("bar")
-	value, ok := m.GetField("a")
-	require.True(t, ok)
-	require.Equal(t, "x", value)
-}
-
-func TestGetField(t *testing.T) {
-	m := baseMetric()
-
-	value, ok := m.GetField("foo")
-	require.False(t, ok)
-
-	m.AddField("foo", "bar")
-
-	value, ok = m.GetField("foo")
-	require.True(t, ok)
-	require.Equal(t, "bar", value)
-
-	m.RemoveTag("foo")
-	value, ok = m.GetTag("foo")
-	require.False(t, ok)
-}
-
-func TestTagList_Sorted(t *testing.T) {
-	m := baseMetric()
-
-	m.AddTag("b", "y")
-	m.AddTag("c", "z")
-	m.AddTag("a", "x")
-
-	taglist := m.TagList()
-	require.Equal(t, "a", taglist[0].Key)
-	require.Equal(t, "b", taglist[1].Key)
-	require.Equal(t, "c", taglist[2].Key)
-}
-
-func TestEquals(t *testing.T) {
+func TestSerialize(t *testing.T) {
 	now := time.Now()
-	m1, err := New("cpu",
-		map[string]string{
-			"host": "localhost",
-		},
-		map[string]interface{}{
-			"value": 42.0,
-		},
-		now,
-	)
-	require.NoError(t, err)
+	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)

-	m2, err := New("cpu",
-		map[string]string{
-			"host": "localhost",
-		},
-		map[string]interface{}{
-			"value": 42.0,
-		},
-		now,
-	)
-	require.NoError(t, err)
+	assert.Equal(t,
+		[]byte("cpu,datacenter=us-east-1 value=1 "+fmt.Sprint(now.UnixNano())+"\n"),
+		m.Serialize())

-	lhs := m1.(*metric)
-	require.Equal(t, lhs, m2)
-
-	m3 := m2.Copy()
-	require.Equal(t, lhs, m3)
-	m3.AddTag("a", "x")
-	require.NotEqual(t, lhs, m3)
+	m.RemoveTag("datacenter")
+	assert.Equal(t,
+		[]byte("cpu value=1 "+fmt.Sprint(now.UnixNano())+"\n"),
+		m.Serialize())
 }

 func TestHashID(t *testing.T) {
@@ -249,62 +171,567 @@ func TestHashID_Consistency(t *testing.T) {
 	)
 	hash := m.HashID()

-	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())
-
-	m3 := m.Copy()
-	assert.Equal(t, m2.HashID(), m3.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 TestSetName(t *testing.T) {
-	m := baseMetric()
-	m.SetName("foo")
-	require.Equal(t, "foo", m.Name())
-}
-
-func TestAddPrefix(t *testing.T) {
-	m := baseMetric()
-	m.AddPrefix("foo_")
-	require.Equal(t, "foo_cpu", m.Name())
-	m.AddPrefix("foo_")
-	require.Equal(t, "foo_foo_cpu", m.Name())
-}
-
-func TestAddSuffix(t *testing.T) {
-	m := baseMetric()
-	m.AddSuffix("_foo")
-	require.Equal(t, "cpu_foo", m.Name())
-	m.AddSuffix("_foo")
-	require.Equal(t, "cpu_foo_foo", m.Name())
-}
-
-func TestValueType(t *testing.T) {
+func TestNewMetric_NameModifiers(t *testing.T) {
 	now := time.Now()
-
 	tags := map[string]string{}
 	fields := map[string]interface{}{
-		"value": float64(42),
+		"value": float64(1),
+	}
+	m, err := New("cpu", tags, fields, now)
+	assert.NoError(t, err)
+
+	hash := m.HashID()
+	suffix := fmt.Sprintf(" value=1 %d\n", now.UnixNano())
+	assert.Equal(t, "cpu"+suffix, m.String())
+
+	m.SetPrefix("pre_")
+	assert.NotEqual(t, hash, m.HashID())
+	hash = m.HashID()
+	assert.Equal(t, "pre_cpu"+suffix, m.String())
+
+	m.SetSuffix("_post")
+	assert.NotEqual(t, hash, m.HashID())
+	hash = m.HashID()
+	assert.Equal(t, "pre_cpu_post"+suffix, m.String())
+
+	m.SetName("mem")
+	assert.NotEqual(t, hash, m.HashID())
+	assert.Equal(t, "mem"+suffix, m.String())
+}
+
+func TestNewMetric_FieldModifiers(t *testing.T) {
+	now := time.Now()
+	tags := map[string]string{
+		"host": "localhost",
+	}
+	fields := map[string]interface{}{
+		"value": float64(1),
+	}
+	m, err := New("cpu", tags, fields, now)
+	assert.NoError(t, err)
+
+	assert.True(t, m.HasField("value"))
+	assert.False(t, m.HasField("foo"))
+
+	m.AddField("newfield", "foo")
+	assert.True(t, m.HasField("newfield"))
+
+	assert.NoError(t, m.RemoveField("newfield"))
+	assert.False(t, m.HasField("newfield"))
+
+	// don't allow user to remove all fields:
+	assert.Error(t, m.RemoveField("value"))
+
+	m.AddField("value2", int64(101))
+	assert.NoError(t, m.RemoveField("value"))
+	assert.False(t, m.HasField("value"))
+}
+
+func TestNewMetric_Fields(t *testing.T) {
+	now := time.Now()
+	tags := map[string]string{
+		"host": "localhost",
+	}
+	fields := map[string]interface{}{
+		"float":                  float64(1),
+		"int":                    int64(1),
+		"bool":                   true,
+		"false":                  false,
+		"string":                 "test",
+		"quote_string":           `x"y`,
+		"backslash_quote_string": `x\"y`,
+		"backslash":              `x\y`,
+		"ends_with_backslash":    `x\`,
+	}
+	m, err := New("cpu", tags, fields, now)
+	assert.NoError(t, err)
+
+	assert.Equal(t, fields, m.Fields())
+}
+
+func TestNewMetric_Time(t *testing.T) {
+	now := time.Now()
+	tags := map[string]string{
+		"host": "localhost",
+	}
+	fields := map[string]interface{}{
+		"float":  float64(1),
+		"int":    int64(1),
+		"bool":   true,
+		"false":  false,
+		"string": "test",
+	}
+	m, err := New("cpu", tags, fields, now)
+	assert.NoError(t, err)
+	m = m.Copy()
+	m2 := m.Copy()
+
+	assert.Equal(t, now.UnixNano(), m.Time().UnixNano())
+	assert.Equal(t, now.UnixNano(), m2.UnixNano())
+}
+
+func TestNewMetric_Copy(t *testing.T) {
+	now := time.Now()
+	tags := map[string]string{}
+	fields := map[string]interface{}{
+		"float": float64(1),
+	}
+	m, err := New("cpu", tags, fields, now)
+	assert.NoError(t, err)
+	m2 := m.Copy()
+
+	assert.Equal(t,
+		fmt.Sprintf("cpu float=1 %d\n", now.UnixNano()),
+		m.String())
+	m.AddTag("host", "localhost")
+	assert.Equal(t,
+		fmt.Sprintf("cpu,host=localhost float=1 %d\n", now.UnixNano()),
+		m.String())
+
+	assert.Equal(t,
+		fmt.Sprintf("cpu float=1 %d\n", now.UnixNano()),
+		m2.String())
+}
+
+func TestNewMetric_AllTypes(t *testing.T) {
+	now := time.Now()
+	tags := map[string]string{}
+	fields := map[string]interface{}{
+		"float64":     float64(1),
+		"float32":     float32(1),
+		"int64":       int64(1),
+		"int32":       int32(1),
+		"int16":       int16(1),
+		"int8":        int8(1),
+		"int":         int(1),
+		"uint64":      uint64(1),
+		"uint32":      uint32(1),
+		"uint16":      uint16(1),
+		"uint8":       uint8(1),
+		"uint":        uint(1),
+		"bytes":       []byte("foo"),
+		"nil":         nil,
+		"maxuint64":   uint64(MaxInt) + 10,
+		"maxuint":     uint(MaxInt) + 10,
+		"unsupported": []int{1, 2},
+	}
+	m, err := New("cpu", tags, fields, now)
+	assert.NoError(t, err)
+
+	assert.Contains(t, m.String(), "float64=1")
+	assert.Contains(t, m.String(), "float32=1")
+	assert.Contains(t, m.String(), "int64=1i")
+	assert.Contains(t, m.String(), "int32=1i")
+	assert.Contains(t, m.String(), "int16=1i")
+	assert.Contains(t, m.String(), "int8=1i")
+	assert.Contains(t, m.String(), "int=1i")
+	assert.Contains(t, m.String(), "uint64=1i")
+	assert.Contains(t, m.String(), "uint32=1i")
+	assert.Contains(t, m.String(), "uint16=1i")
+	assert.Contains(t, m.String(), "uint8=1i")
+	assert.Contains(t, m.String(), "uint=1i")
+	assert.NotContains(t, m.String(), "nil")
+	assert.Contains(t, m.String(), fmt.Sprintf("maxuint64=%di", MaxInt))
+	assert.Contains(t, m.String(), fmt.Sprintf("maxuint=%di", MaxInt))
+}
+
+func TestIndexUnescapedByte(t *testing.T) {
+	tests := []struct {
+		in       []byte
+		b        byte
+		expected int
+	}{
+		{
+			in:       []byte(`foobar`),
+			b:        'b',
+			expected: 3,
+		},
+		{
+			in:       []byte(`foo\bar`),
+			b:        'b',
+			expected: -1,
+		},
+		{
+			in:       []byte(`foo\\bar`),
+			b:        'b',
+			expected: -1,
+		},
+		{
+			in:       []byte(`foobar`),
+			b:        'f',
+			expected: 0,
+		},
+		{
+			in:       []byte(`foobar`),
+			b:        'r',
+			expected: 5,
+		},
+		{
+			in:       []byte(`\foobar`),
+			b:        'f',
+			expected: -1,
+		},
+	}
+
+	for _, test := range tests {
+		got := indexUnescapedByte(test.in, test.b)
+		assert.Equal(t, test.expected, got)
+	}
+}
+
+func TestNewGaugeMetric(t *testing.T) {
+	now := time.Now()
+
+	tags := map[string]string{
+		"host":       "localhost",
+		"datacenter": "us-east-1",
+	}
+	fields := map[string]interface{}{
+		"usage_idle": float64(99),
+		"usage_busy": float64(1),
 	}
 	m, err := New("cpu", tags, fields, now, telegraf.Gauge)
 	assert.NoError(t, err)

 	assert.Equal(t, telegraf.Gauge, m.Type())
+	assert.Equal(t, tags, m.Tags())
+	assert.Equal(t, fields, m.Fields())
+	assert.Equal(t, "cpu", m.Name())
+	assert.Equal(t, now.UnixNano(), m.Time().UnixNano())
+	assert.Equal(t, now.UnixNano(), m.UnixNano())
 }

-func TestCopyAggreate(t *testing.T) {
-	m1 := baseMetric()
-	m1.SetAggregate(true)
-	m2 := m1.Copy()
-	assert.True(t, m2.IsAggregate())
+func TestNewCounterMetric(t *testing.T) {
+	now := time.Now()
+
+	tags := map[string]string{
+		"host":       "localhost",
+		"datacenter": "us-east-1",
+	}
+	fields := map[string]interface{}{
+		"usage_idle": float64(99),
+		"usage_busy": float64(1),
+	}
+	m, err := New("cpu", tags, fields, now, telegraf.Counter)
+	assert.NoError(t, err)
+
+	assert.Equal(t, telegraf.Counter, m.Type())
+	assert.Equal(t, tags, m.Tags())
+	assert.Equal(t, fields, m.Fields())
+	assert.Equal(t, "cpu", m.Name())
+	assert.Equal(t, now.UnixNano(), m.Time().UnixNano())
+	assert.Equal(t, now.UnixNano(), m.UnixNano())
+}
+
+// test splitting metric into various max lengths
+func TestSplitMetric(t *testing.T) {
+	now := time.Unix(0, 1480940990034083306)
+	tags := map[string]string{
+		"host": "localhost",
+	}
+	fields := map[string]interface{}{
+		"float":  float64(100001),
+		"int":    int64(100001),
+		"bool":   true,
+		"false":  false,
+		"string": "test",
+	}
+	m, err := New("cpu", tags, fields, now)
+	assert.NoError(t, err)
+
+	split80 := m.Split(80)
+	assert.Len(t, split80, 2)
+
+	split70 := m.Split(70)
+	assert.Len(t, split70, 3)
+
+	split60 := m.Split(60)
+	assert.Len(t, split60, 5)
+}
+
+// test splitting metric into various max lengths
+// use a simple regex check to verify that the split metrics are valid
+func TestSplitMetric_RegexVerify(t *testing.T) {
+	now := time.Unix(0, 1480940990034083306)
+	tags := map[string]string{
+		"host": "localhost",
+	}
+	fields := map[string]interface{}{
+		"foo":     float64(98934259085),
+		"bar":     float64(19385292),
+		"number":  float64(19385292),
+		"another": float64(19385292),
+		"n":       float64(19385292),
+	}
+	m, err := New("cpu", tags, fields, now)
+	assert.NoError(t, err)
+
+	// verification regex
+	re := regexp.MustCompile(`cpu,host=localhost \w+=\d+(,\w+=\d+)* 1480940990034083306`)
+
+	split90 := m.Split(90)
+	assert.Len(t, split90, 2)
+	for _, splitM := range split90 {
+		assert.True(t, re.Match(splitM.Serialize()), splitM.String())
+	}
+
+	split70 := m.Split(70)
+	assert.Len(t, split70, 3)
+	for _, splitM := range split70 {
+		assert.True(t, re.Match(splitM.Serialize()), splitM.String())
+	}
+
+	split20 := m.Split(20)
+	assert.Len(t, split20, 5)
+	for _, splitM := range split20 {
+		assert.True(t, re.Match(splitM.Serialize()), splitM.String())
+	}
+}
+
+// test splitting metric even when given length is shorter than
+// shortest possible length
+// Split should split metric as short as possible, ie, 1 field per metric
+func TestSplitMetric_TooShort(t *testing.T) {
+	now := time.Unix(0, 1480940990034083306)
+	tags := map[string]string{
+		"host": "localhost",
+	}
+	fields := map[string]interface{}{
+		"float":  float64(100001),
+		"int":    int64(100001),
+		"bool":   true,
+		"false":  false,
+		"string": "test",
+	}
+	m, err := New("cpu", tags, fields, now)
+	assert.NoError(t, err)
+
+	split := m.Split(10)
+	assert.Len(t, split, 5)
+	strings := make([]string, 5)
+	for i, splitM := range split {
+		strings[i] = splitM.String()
+	}
+
+	assert.Contains(t, strings, "cpu,host=localhost float=100001 1480940990034083306\n")
+	assert.Contains(t, strings, "cpu,host=localhost int=100001i 1480940990034083306\n")
+	assert.Contains(t, strings, "cpu,host=localhost bool=true 1480940990034083306\n")
+	assert.Contains(t, strings, "cpu,host=localhost false=false 1480940990034083306\n")
+	assert.Contains(t, strings, "cpu,host=localhost string=\"test\" 1480940990034083306\n")
+}
+
+func TestSplitMetric_NoOp(t *testing.T) {
+	now := time.Unix(0, 1480940990034083306)
+	tags := map[string]string{
+		"host": "localhost",
+	}
+	fields := map[string]interface{}{
+		"float":  float64(100001),
+		"int":    int64(100001),
+		"bool":   true,
+		"false":  false,
+		"string": "test",
+	}
+	m, err := New("cpu", tags, fields, now)
+	assert.NoError(t, err)
+
+	split := m.Split(1000)
+	assert.Len(t, split, 1)
+	assert.Equal(t, m, split[0])
+}
+
+func TestSplitMetric_OneField(t *testing.T) {
+	now := time.Unix(0, 1480940990034083306)
+	tags := map[string]string{
+		"host": "localhost",
+	}
+	fields := map[string]interface{}{
+		"float": float64(100001),
+	}
+	m, err := New("cpu", tags, fields, now)
+	assert.NoError(t, err)
+
+	assert.Equal(t, "cpu,host=localhost float=100001 1480940990034083306\n", m.String())
+
+	split := m.Split(1000)
+	assert.Len(t, split, 1)
+	assert.Equal(t, "cpu,host=localhost float=100001 1480940990034083306\n", split[0].String())
+
+	split = m.Split(1)
+	assert.Len(t, split, 1)
+	assert.Equal(t, "cpu,host=localhost float=100001 1480940990034083306\n", split[0].String())
+
+	split = m.Split(40)
+	assert.Len(t, split, 1)
+	assert.Equal(t, "cpu,host=localhost float=100001 1480940990034083306\n", split[0].String())
+}
+
+func TestSplitMetric_ExactSize(t *testing.T) {
+	now := time.Unix(0, 1480940990034083306)
+	tags := map[string]string{
+		"host": "localhost",
+	}
+	fields := map[string]interface{}{
+		"float":  float64(100001),
+		"int":    int64(100001),
+		"bool":   true,
+		"false":  false,
+		"string": "test",
+	}
+	m, err := New("cpu", tags, fields, now)
+	assert.NoError(t, err)
+	actual := m.Split(m.Len())
+	// check that no copy was made
+	require.Equal(t, &m, &actual[0])
+}
+
+func TestSplitMetric_NoRoomForNewline(t *testing.T) {
+	now := time.Unix(0, 1480940990034083306)
+	tags := map[string]string{
+		"host": "localhost",
+	}
+	fields := map[string]interface{}{
+		"float": float64(100001),
+		"int":   int64(100001),
+		"bool":  true,
+		"false": false,
+	}
+	m, err := New("cpu", tags, fields, now)
+	assert.NoError(t, err)
+	actual := m.Split(m.Len() - 1)
+	require.Equal(t, 2, len(actual))
+}
+
+func TestNewMetricAggregate(t *testing.T) {
+	now := time.Now()
+
+	tags := map[string]string{
+		"host": "localhost",
+	}
+	fields := map[string]interface{}{
+		"usage_idle": float64(99),
+	}
+	m, err := New("cpu", tags, fields, now)
+	assert.NoError(t, err)
+
+	assert.False(t, m.IsAggregate())
+	m.SetAggregate(true)
+	assert.True(t, m.IsAggregate())
+}
+
+func TestNewMetricString(t *testing.T) {
+	now := time.Now()
+
+	tags := map[string]string{
+		"host": "localhost",
+	}
+	fields := map[string]interface{}{
+		"usage_idle": float64(99),
+	}
+	m, err := New("cpu", tags, fields, now)
+	assert.NoError(t, err)
+
+	lineProto := fmt.Sprintf("cpu,host=localhost usage_idle=99 %d\n",
+		now.UnixNano())
+	assert.Equal(t, lineProto, m.String())
+}
+
+func TestNewMetricFailNaN(t *testing.T) {
+	now := time.Now()
+
+	tags := map[string]string{
+		"host": "localhost",
+	}
+	fields := map[string]interface{}{
+		"usage_idle": math.NaN(),
+	}
+
+	_, err := New("cpu", tags, fields, now)
+	assert.NoError(t, err)
+}
+
+func TestEmptyTagValueOrKey(t *testing.T) {
+	now := time.Now()
+
+	tags := map[string]string{
+		"host":     "localhost",
+		"emptytag": "",
+		"":         "valuewithoutkey",
+	}
+	fields := map[string]interface{}{
+		"usage_idle": float64(99),
+	}
+	m, err := New("cpu", tags, fields, now)
+
+	assert.True(t, m.HasTag("host"))
+	assert.False(t, m.HasTag("emptytag"))
+	assert.Equal(t,
+		fmt.Sprintf("cpu,host=localhost usage_idle=99 %d\n", now.UnixNano()),
+		m.String())
+
+	assert.NoError(t, err)
+
+}
+
+func TestNewMetric_TrailingSlash(t *testing.T) {
+	now := time.Now()
+
+	tests := []struct {
+		name   string
+		tags   map[string]string
+		fields map[string]interface{}
+	}{
+		{
+			name: `cpu\`,
+			fields: map[string]interface{}{
+				"value": int64(42),
+			},
+		},
+		{
+			name: "cpu",
+			fields: map[string]interface{}{
+				`value\`: "x",
+			},
+		},
+		{
+			name: "cpu",
+			tags: map[string]string{
+				`host\`: "localhost",
+			},
+			fields: map[string]interface{}{
+				"value": int64(42),
+			},
+		},
+		{
+			name: "cpu",
+			tags: map[string]string{
+				"host": `localhost\`,
+			},
+			fields: map[string]interface{}{
+				"value": int64(42),
+			},
+		},
+	}
+
+	for _, tc := range tests {
+		_, err := New(tc.name, tc.tags, tc.fields, now)
+		assert.Error(t, err)
+	}
 }
--- a/metric/parse.go
+++ b/metric/parse.go
@@ -0,0 +1,680 @@
+package metric
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"strconv"
+	"time"
+
+	"github.com/influxdata/telegraf"
+)
+
+var (
+	ErrInvalidNumber = errors.New("invalid number")
+)
+
+const (
+	// the number of characters for the largest possible int64 (9223372036854775807)
+	maxInt64Digits = 19
+
+	// the number of characters for the smallest possible int64 (-9223372036854775808)
+	minInt64Digits = 20
+
+	// the number of characters required for the largest float64 before a range check
+	// would occur during parsing
+	maxFloat64Digits = 25
+
+	// the number of characters required for smallest float64 before a range check occur
+	// would occur during parsing
+	minFloat64Digits = 27
+
+	MaxKeyLength = 65535
+)
+
+// The following constants allow us to specify which state to move to
+// next, when scanning sections of a Point.
+const (
+	tagKeyState = iota
+	tagValueState
+	fieldsState
+)
+
+func Parse(buf []byte) ([]telegraf.Metric, error) {
+	return ParseWithDefaultTimePrecision(buf, time.Now(), "")
+}
+
+func ParseWithDefaultTime(buf []byte, t time.Time) ([]telegraf.Metric, error) {
+	return ParseWithDefaultTimePrecision(buf, t, "")
+}
+
+func ParseWithDefaultTimePrecision(
+	buf []byte,
+	t time.Time,
+	precision string,
+) ([]telegraf.Metric, error) {
+	if len(buf) == 0 {
+		return []telegraf.Metric{}, nil
+	}
+	if len(buf) <= 6 {
+		return []telegraf.Metric{}, makeError("buffer too short", buf, 0)
+	}
+	metrics := make([]telegraf.Metric, 0, bytes.Count(buf, []byte("\n"))+1)
+	var errStr string
+	i := 0
+	for {
+		j := bytes.IndexByte(buf[i:], '\n')
+		if j == -1 {
+			break
+		}
+		if len(buf[i:i+j]) < 2 {
+			i += j + 1 // increment i past the previous newline
+			continue
+		}
+
+		m, err := parseMetric(buf[i:i+j], t, precision)
+		if err != nil {
+			i += j + 1 // increment i past the previous newline
+			errStr += " " + err.Error()
+			continue
+		}
+		i += j + 1 // increment i past the previous newline
+
+		metrics = append(metrics, m)
+	}
+
+	if len(errStr) > 0 {
+		return metrics, fmt.Errorf(errStr)
+	}
+	return metrics, nil
+}
+
+func parseMetric(buf []byte,
+	defaultTime time.Time,
+	precision string,
+) (telegraf.Metric, error) {
+	var dTime string
+	// scan the first block which is measurement[,tag1=value1,tag2=value=2...]
+	pos, key, err := scanKey(buf, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	// measurement name is required
+	if len(key) == 0 {
+		return nil, fmt.Errorf("missing measurement")
+	}
+
+	if len(key) > MaxKeyLength {
+		return nil, fmt.Errorf("max key length exceeded: %v > %v", len(key), MaxKeyLength)
+	}
+
+	// scan the second block is which is field1=value1[,field2=value2,...]
+	pos, fields, err := scanFields(buf, pos)
+	if err != nil {
+		return nil, err
+	}
+
+	// at least one field is required
+	if len(fields) == 0 {
+		return nil, fmt.Errorf("missing fields")
+	}
+
+	// scan the last block which is an optional integer timestamp
+	pos, ts, err := scanTime(buf, pos)
+	if err != nil {
+		return nil, err
+	}
+
+	// apply precision multiplier
+	var nsec int64
+	multiplier := getPrecisionMultiplier(precision)
+	if len(ts) > 0 && multiplier > 1 {
+		tsint, err := parseIntBytes(ts, 10, 64)
+		if err != nil {
+			return nil, err
+		}
+
+		nsec := multiplier * tsint
+		ts = []byte(strconv.FormatInt(nsec, 10))
+	}
+
+	m := &metric{
+		fields: fields,
+		t:      ts,
+		nsec:   nsec,
+	}
+
+	// parse out the measurement name
+	// namei is the index at which the "name" ends
+	namei := indexUnescapedByte(key, ',')
+	if namei < 1 {
+		// no tags
+		m.name = key
+	} else {
+		m.name = key[0:namei]
+		m.tags = key[namei:]
+	}
+
+	if len(m.t) == 0 {
+		if len(dTime) == 0 {
+			dTime = fmt.Sprint(defaultTime.UnixNano())
+		}
+		// use default time
+		m.t = []byte(dTime)
+	}
+
+	// here we copy on return because this allows us to later call
+	// AddTag, AddField, RemoveTag, RemoveField, etc. without worrying about
+	// modifying 'tag' bytes having an affect on 'field' bytes, for example.
+	return m.Copy(), nil
+}
+
+// scanKey scans buf starting at i for the measurement and tag portion of the point.
+// It returns the ending position and the byte slice of key within buf.  If there
+// are tags, they will be sorted if they are not already.
+func scanKey(buf []byte, i int) (int, []byte, error) {
+	start := skipWhitespace(buf, i)
+	i = start
+
+	// First scan the Point's measurement.
+	state, i, err := scanMeasurement(buf, i)
+	if err != nil {
+		return i, buf[start:i], err
+	}
+
+	// Optionally scan tags if needed.
+	if state == tagKeyState {
+		i, err = scanTags(buf, i)
+		if err != nil {
+			return i, buf[start:i], err
+		}
+	}
+
+	return i, buf[start:i], nil
+}
+
+// scanMeasurement examines the measurement part of a Point, returning
+// the next state to move to, and the current location in the buffer.
+func scanMeasurement(buf []byte, i int) (int, int, error) {
+	// Check first byte of measurement, anything except a comma is fine.
+	// It can't be a space, since whitespace is stripped prior to this
+	// function call.
+	if i >= len(buf) || buf[i] == ',' {
+		return -1, i, makeError("missing measurement", buf, i)
+	}
+
+	for {
+		i++
+		if i >= len(buf) {
+			// cpu
+			return -1, i, makeError("missing fields", buf, i)
+		}
+
+		if buf[i-1] == '\\' {
+			// Skip character (it's escaped).
+			continue
+		}
+
+		// Unescaped comma; move onto scanning the tags.
+		if buf[i] == ',' {
+			return tagKeyState, i + 1, nil
+		}
+
+		// Unescaped space; move onto scanning the fields.
+		if buf[i] == ' ' {
+			// cpu value=1.0
+			return fieldsState, i, nil
+		}
+	}
+}
+
+// scanTags examines all the tags in a Point, keeping track of and
+// returning the updated indices slice, number of commas and location
+// in buf where to start examining the Point fields.
+func scanTags(buf []byte, i int) (int, error) {
+	var (
+		err   error
+		state = tagKeyState
+	)
+
+	for {
+		switch state {
+		case tagKeyState:
+			i, err = scanTagsKey(buf, i)
+			state = tagValueState // tag value always follows a tag key
+		case tagValueState:
+			state, i, err = scanTagsValue(buf, i)
+		case fieldsState:
+			return i, nil
+		}
+
+		if err != nil {
+			return i, err
+		}
+	}
+}
+
+// scanTagsKey scans each character in a tag key.
+func scanTagsKey(buf []byte, i int) (int, error) {
+	// First character of the key.
+	if i >= len(buf) || buf[i] == ' ' || buf[i] == ',' || buf[i] == '=' {
+		// cpu,{'', ' ', ',', '='}
+		return i, makeError("missing tag key", buf, i)
+	}
+
+	// Examine each character in the tag key until we hit an unescaped
+	// equals (the tag value), or we hit an error (i.e., unescaped
+	// space or comma).
+	for {
+		i++
+
+		// Either we reached the end of the buffer or we hit an
+		// unescaped comma or space.
+		if i >= len(buf) ||
+			((buf[i] == ' ' || buf[i] == ',') && buf[i-1] != '\\') {
+			// cpu,tag{'', ' ', ','}
+			return i, makeError("missing tag value", buf, i)
+		}
+
+		if buf[i] == '=' && buf[i-1] != '\\' {
+			// cpu,tag=
+			return i + 1, nil
+		}
+	}
+}
+
+// scanTagsValue scans each character in a tag value.
+func scanTagsValue(buf []byte, i int) (int, int, error) {
+	// Tag value cannot be empty.
+	if i >= len(buf) || buf[i] == ',' || buf[i] == ' ' {
+		// cpu,tag={',', ' '}
+		return -1, i, makeError("missing tag value", buf, i)
+	}
+
+	// Examine each character in the tag value until we hit an unescaped
+	// comma (move onto next tag key), an unescaped space (move onto
+	// fields), or we error out.
+	for {
+		i++
+		if i >= len(buf) {
+			// cpu,tag=value
+			return -1, i, makeError("missing fields", buf, i)
+		}
+
+		// An unescaped equals sign is an invalid tag value.
+		if buf[i] == '=' && buf[i-1] != '\\' {
+			// cpu,tag={'=', 'fo=o'}
+			return -1, i, makeError("invalid tag format", buf, i)
+		}
+
+		if buf[i] == ',' && buf[i-1] != '\\' {
+			// cpu,tag=foo,
+			return tagKeyState, i + 1, nil
+		}
+
+		// cpu,tag=foo value=1.0
+		// cpu, tag=foo\= value=1.0
+		if buf[i] == ' ' && buf[i-1] != '\\' {
+			return fieldsState, i, nil
+		}
+	}
+}
+
+// scanFields scans buf, starting at i for the fields section of a point.  It returns
+// the ending position and the byte slice of the fields within buf
+func scanFields(buf []byte, i int) (int, []byte, error) {
+	start := skipWhitespace(buf, i)
+	i = start
+
+	// track how many '"" we've seen since last '='
+	quotes := 0
+
+	// tracks how many '=' we've seen
+	equals := 0
+
+	// tracks how many commas we've seen
+	commas := 0
+
+	for {
+		// reached the end of buf?
+		if i >= len(buf) {
+			break
+		}
+
+		// escaped characters?
+		if buf[i] == '\\' && i+1 < len(buf) {
+			i += 2
+			continue
+		}
+
+		// If the value is quoted, scan until we get to the end quote
+		// Only quote values in the field value since quotes are not significant
+		// in the field key
+		if buf[i] == '"' && equals > commas {
+			i++
+			quotes++
+			if quotes > 2 {
+				break
+			}
+			continue
+		}
+
+		// If we see an =, ensure that there is at least on char before and after it
+		if buf[i] == '=' && quotes != 1 {
+			quotes = 0
+			equals++
+
+			// check for "... =123" but allow "a\ =123"
+			if buf[i-1] == ' ' && buf[i-2] != '\\' {
+				return i, buf[start:i], makeError("missing field key", buf, i)
+			}
+
+			// check for "...a=123,=456" but allow "a=123,a\,=456"
+			if buf[i-1] == ',' && buf[i-2] != '\\' {
+				return i, buf[start:i], makeError("missing field key", buf, i)
+			}
+
+			// check for "... value="
+			if i+1 >= len(buf) {
+				return i, buf[start:i], makeError("missing field value", buf, i)
+			}
+
+			// check for "... value=,value2=..."
+			if buf[i+1] == ',' || buf[i+1] == ' ' {
+				return i, buf[start:i], makeError("missing field value", buf, i)
+			}
+
+			if isNumeric(buf[i+1]) || buf[i+1] == '-' || buf[i+1] == 'N' || buf[i+1] == 'n' {
+				var err error
+				i, err = scanNumber(buf, i+1)
+				if err != nil {
+					return i, buf[start:i], err
+				}
+				continue
+			}
+			// If next byte is not a double-quote, the value must be a boolean
+			if buf[i+1] != '"' {
+				var err error
+				i, _, err = scanBoolean(buf, i+1)
+				if err != nil {
+					return i, buf[start:i], err
+				}
+				continue
+			}
+		}
+
+		if buf[i] == ',' && quotes != 1 {
+			commas++
+		}
+
+		// reached end of block?
+		if buf[i] == ' ' && quotes != 1 {
+			break
+		}
+		i++
+	}
+
+	if quotes != 0 && quotes != 2 {
+		return i, buf[start:i], makeError("unbalanced quotes", buf, i)
+	}
+
+	// check that all field sections had key and values (e.g. prevent "a=1,b"
+	if equals == 0 || commas != equals-1 {
+		return i, buf[start:i], makeError("invalid field format", buf, i)
+	}
+
+	return i, buf[start:i], nil
+}
+
+// scanTime scans buf, starting at i for the time section of a point. It
+// returns the ending position and the byte slice of the timestamp within buf
+// and and error if the timestamp is not in the correct numeric format.
+func scanTime(buf []byte, i int) (int, []byte, error) {
+	start := skipWhitespace(buf, i)
+	i = start
+
+	for {
+		// reached the end of buf?
+		if i >= len(buf) {
+			break
+		}
+
+		// Reached end of block or trailing whitespace?
+		if buf[i] == '\n' || buf[i] == ' ' {
+			break
+		}
+
+		// Handle negative timestamps
+		if i == start && buf[i] == '-' {
+			i++
+			continue
+		}
+
+		// Timestamps should be integers, make sure they are so we don't need
+		// to actually  parse the timestamp until needed.
+		if buf[i] < '0' || buf[i] > '9' {
+			return i, buf[start:i], makeError("invalid timestamp", buf, i)
+		}
+		i++
+	}
+	return i, buf[start:i], nil
+}
+
+func isNumeric(b byte) bool {
+	return (b >= '0' && b <= '9') || b == '.'
+}
+
+// scanNumber returns the end position within buf, start at i after
+// scanning over buf for an integer, or float.  It returns an
+// error if a invalid number is scanned.
+func scanNumber(buf []byte, i int) (int, error) {
+	start := i
+	var isInt bool
+
+	// Is negative number?
+	if i < len(buf) && buf[i] == '-' {
+		i++
+		// There must be more characters now, as just '-' is illegal.
+		if i == len(buf) {
+			return i, ErrInvalidNumber
+		}
+	}
+
+	// how many decimal points we've see
+	decimal := false
+
+	// indicates the number is float in scientific notation
+	scientific := false
+
+	for {
+		if i >= len(buf) {
+			break
+		}
+
+		if buf[i] == ',' || buf[i] == ' ' {
+			break
+		}
+
+		if buf[i] == 'i' && i > start && !isInt {
+			isInt = true
+			i++
+			continue
+		}
+
+		if buf[i] == '.' {
+			// Can't have more than 1 decimal (e.g. 1.1.1 should fail)
+			if decimal {
+				return i, ErrInvalidNumber
+			}
+			decimal = true
+		}
+
+		// `e` is valid for floats but not as the first char
+		if i > start && (buf[i] == 'e' || buf[i] == 'E') {
+			scientific = true
+			i++
+			continue
+		}
+
+		// + and - are only valid at this point if they follow an e (scientific notation)
+		if (buf[i] == '+' || buf[i] == '-') && (buf[i-1] == 'e' || buf[i-1] == 'E') {
+			i++
+			continue
+		}
+
+		// NaN is an unsupported value
+		if i+2 < len(buf) && (buf[i] == 'N' || buf[i] == 'n') {
+			return i, ErrInvalidNumber
+		}
+
+		if !isNumeric(buf[i]) {
+			return i, ErrInvalidNumber
+		}
+		i++
+	}
+
+	if isInt && (decimal || scientific) {
+		return i, ErrInvalidNumber
+	}
+
+	numericDigits := i - start
+	if isInt {
+		numericDigits--
+	}
+	if decimal {
+		numericDigits--
+	}
+	if buf[start] == '-' {
+		numericDigits--
+	}
+
+	if numericDigits == 0 {
+		return i, ErrInvalidNumber
+	}
+
+	// It's more common that numbers will be within min/max range for their type but we need to prevent
+	// out or range numbers from being parsed successfully.  This uses some simple heuristics to decide
+	// if we should parse the number to the actual type.  It does not do it all the time because it incurs
+	// extra allocations and we end up converting the type again when writing points to disk.
+	if isInt {
+		// Make sure the last char is an 'i' for integers (e.g. 9i10 is not valid)
+		if buf[i-1] != 'i' {
+			return i, ErrInvalidNumber
+		}
+		// Parse the int to check bounds the number of digits could be larger than the max range
+		// We subtract 1 from the index to remove the `i` from our tests
+		if len(buf[start:i-1]) >= maxInt64Digits || len(buf[start:i-1]) >= minInt64Digits {
+			if _, err := parseIntBytes(buf[start:i-1], 10, 64); err != nil {
+				return i, makeError(fmt.Sprintf("unable to parse integer %s: %s", buf[start:i-1], err), buf, i)
+			}
+		}
+	} else {
+		// Parse the float to check bounds if it's scientific or the number of digits could be larger than the max range
+		if scientific || len(buf[start:i]) >= maxFloat64Digits || len(buf[start:i]) >= minFloat64Digits {
+			if _, err := parseFloatBytes(buf[start:i], 10); err != nil {
+				return i, makeError("invalid float", buf, i)
+			}
+		}
+	}
+
+	return i, nil
+}
+
+// scanBoolean returns the end position within buf, start at i after
+// scanning over buf for boolean. Valid values for a boolean are
+// t, T, true, TRUE, f, F, false, FALSE. It returns an error if a invalid boolean
+// is scanned.
+func scanBoolean(buf []byte, i int) (int, []byte, error) {
+	start := i
+
+	if i < len(buf) && (buf[i] != 't' && buf[i] != 'f' && buf[i] != 'T' && buf[i] != 'F') {
+		return i, buf[start:i], makeError("invalid value", buf, i)
+	}
+
+	i++
+	for {
+		if i >= len(buf) {
+			break
+		}
+
+		if buf[i] == ',' || buf[i] == ' ' {
+			break
+		}
+		i++
+	}
+
+	// Single char bool (t, T, f, F) is ok
+	if i-start == 1 {
+		return i, buf[start:i], nil
+	}
+
+	// length must be 4 for true or TRUE
+	if (buf[start] == 't' || buf[start] == 'T') && i-start != 4 {
+		return i, buf[start:i], makeError("invalid boolean", buf, i)
+	}
+
+	// length must be 5 for false or FALSE
+	if (buf[start] == 'f' || buf[start] == 'F') && i-start != 5 {
+		return i, buf[start:i], makeError("invalid boolean", buf, i)
+	}
+
+	// Otherwise
+	valid := false
+	switch buf[start] {
+	case 't':
+		valid = bytes.Equal(buf[start:i], []byte("true"))
+	case 'f':
+		valid = bytes.Equal(buf[start:i], []byte("false"))
+	case 'T':
+		valid = bytes.Equal(buf[start:i], []byte("TRUE")) || bytes.Equal(buf[start:i], []byte("True"))
+	case 'F':
+		valid = bytes.Equal(buf[start:i], []byte("FALSE")) || bytes.Equal(buf[start:i], []byte("False"))
+	}
+
+	if !valid {
+		return i, buf[start:i], makeError("invalid boolean", buf, i)
+	}
+
+	return i, buf[start:i], nil
+
+}
+
+// skipWhitespace returns the end position within buf, starting at i after
+// scanning over spaces in tags
+func skipWhitespace(buf []byte, i int) int {
+	for i < len(buf) {
+		if buf[i] != ' ' && buf[i] != '\t' && buf[i] != 0 {
+			break
+		}
+		i++
+	}
+	return i
+}
+
+// makeError is a helper function for making a metric parsing error.
+//   reason is the reason why the error occurred.
+//   buf should be the current buffer we are parsing.
+//   i is the current index, to give some context on where in the buffer we are.
+func makeError(reason string, buf []byte, i int) error {
+	return fmt.Errorf("metric parsing error, reason: [%s], buffer: [%s], index: [%d]",
+		reason, buf, i)
+}
+
+// getPrecisionMultiplier will return a multiplier for the precision specified.
+func getPrecisionMultiplier(precision string) int64 {
+	d := time.Nanosecond
+	switch precision {
+	case "u":
+		d = time.Microsecond
+	case "ms":
+		d = time.Millisecond
+	case "s":
+		d = time.Second
+	case "m":
+		d = time.Minute
+	case "h":
+		d = time.Hour
+	}
+	return int64(d)
+}
--- a/metric/parse_test.go
+++ b/metric/parse_test.go
@@ -0,0 +1,413 @@
+package metric
+
+import (
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+)
+
+const trues = `booltest b=T
+booltest b=t
+booltest b=True
+booltest b=TRUE
+booltest b=true
+`
+
+const falses = `booltest b=F
+booltest b=f
+booltest b=False
+booltest b=FALSE
+booltest b=false
+`
+
+const withEscapes = `w\,\ eather,host=local temp=99 1465839830100400200
+w\,eather,host=local temp=99 1465839830100400200
+weather,location=us\,midwest temperature=82 1465839830100400200
+weather,location=us-midwest temp\=rature=82 1465839830100400200
+weather,location\ place=us-midwest temperature=82 1465839830100400200
+weather,location=us-midwest temperature="too\"hot\"" 1465839830100400200
+`
+
+const withTimestamps = `cpu usage=99 1480595849000000000
+cpu usage=99 1480595850000000000
+cpu usage=99 1480595851700030000
+cpu usage=99 1480595852000000300
+`
+
+const sevenMetrics = `cpu,host=foo,datacenter=us-east idle=99,busy=1i,b=true,s="string"
+cpu,host=foo,datacenter=us-east idle=99,busy=1i,b=true,s="string"
+cpu,host=foo,datacenter=us-east idle=99,busy=1i,b=true,s="string"
+cpu,host=foo,datacenter=us-east idle=99,busy=1i,b=true,s="string"
+cpu,host=foo,datacenter=us-east idle=99,busy=1i,b=true,s="string"
+cpu,host=foo,datacenter=us-east idle=99,busy=1i,b=true,s="string"
+cpu,host=foo,datacenter=us-east idle=99,busy=1i,b=true,s="string"
+`
+
+const negMetrics = `weather,host=local temp=-99i,temp_float=-99.4 1465839830100400200
+`
+
+// some metrics are invalid
+const someInvalid = `cpu,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
+cpu,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
+cpu,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
+cpu,cpu=cpu3, host=foo,datacenter=us-east usage_idle=99,usage_busy=1
+cpu,cpu=cpu4 , usage_idle=99,usage_busy=1
+cpu 1480595852000000300
+cpu usage=99 1480595852foobar300
+cpu,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
+`
+
+func TestParse(t *testing.T) {
+	start := time.Now()
+	metrics, err := Parse([]byte(sevenMetrics))
+	assert.NoError(t, err)
+	assert.Len(t, metrics, 7)
+
+	// all metrics parsed together w/o a timestamp should have the same time.
+	firstTime := metrics[0].Time()
+	for _, m := range metrics {
+		assert.Equal(t,
+			map[string]interface{}{
+				"idle": float64(99),
+				"busy": int64(1),
+				"b":    true,
+				"s":    "string",
+			},
+			m.Fields(),
+		)
+		assert.Equal(t,
+			map[string]string{
+				"host":       "foo",
+				"datacenter": "us-east",
+			},
+			m.Tags(),
+		)
+		assert.True(t, m.Time().After(start))
+		assert.True(t, m.Time().Equal(firstTime))
+	}
+}
+
+func TestParseNegNumbers(t *testing.T) {
+	metrics, err := Parse([]byte(negMetrics))
+	assert.NoError(t, err)
+	assert.Len(t, metrics, 1)
+
+	assert.Equal(t,
+		map[string]interface{}{
+			"temp":       int64(-99),
+			"temp_float": float64(-99.4),
+		},
+		metrics[0].Fields(),
+	)
+	assert.Equal(t,
+		map[string]string{
+			"host": "local",
+		},
+		metrics[0].Tags(),
+	)
+}
+
+func TestParseErrors(t *testing.T) {
+	start := time.Now()
+	metrics, err := Parse([]byte(someInvalid))
+	assert.Error(t, err)
+	assert.Len(t, metrics, 4)
+
+	// all metrics parsed together w/o a timestamp should have the same time.
+	firstTime := metrics[0].Time()
+	for _, m := range metrics {
+		assert.Equal(t,
+			map[string]interface{}{
+				"usage_idle": float64(99),
+				"usage_busy": float64(1),
+			},
+			m.Fields(),
+		)
+		assert.Equal(t,
+			map[string]string{
+				"host":       "foo",
+				"datacenter": "us-east",
+			},
+			m.Tags(),
+		)
+		assert.True(t, m.Time().After(start))
+		assert.True(t, m.Time().Equal(firstTime))
+	}
+}
+
+func TestParseWithTimestamps(t *testing.T) {
+	metrics, err := Parse([]byte(withTimestamps))
+	assert.NoError(t, err)
+	assert.Len(t, metrics, 4)
+
+	expectedTimestamps := []time.Time{
+		time.Unix(0, 1480595849000000000),
+		time.Unix(0, 1480595850000000000),
+		time.Unix(0, 1480595851700030000),
+		time.Unix(0, 1480595852000000300),
+	}
+
+	// all metrics parsed together w/o a timestamp should have the same time.
+	for i, m := range metrics {
+		assert.Equal(t,
+			map[string]interface{}{
+				"usage": float64(99),
+			},
+			m.Fields(),
+		)
+		assert.True(t, m.Time().Equal(expectedTimestamps[i]))
+	}
+}
+
+func TestParseEscapes(t *testing.T) {
+	metrics, err := Parse([]byte(withEscapes))
+	assert.NoError(t, err)
+	assert.Len(t, metrics, 6)
+
+	tests := []struct {
+		name   string
+		fields map[string]interface{}
+		tags   map[string]string
+	}{
+		{
+			name:   `w, eather`,
+			fields: map[string]interface{}{"temp": float64(99)},
+			tags:   map[string]string{"host": "local"},
+		},
+		{
+			name:   `w,eather`,
+			fields: map[string]interface{}{"temp": float64(99)},
+			tags:   map[string]string{"host": "local"},
+		},
+		{
+			name:   `weather`,
+			fields: map[string]interface{}{"temperature": float64(82)},
+			tags:   map[string]string{"location": `us,midwest`},
+		},
+		{
+			name:   `weather`,
+			fields: map[string]interface{}{`temp=rature`: float64(82)},
+			tags:   map[string]string{"location": `us-midwest`},
+		},
+		{
+			name:   `weather`,
+			fields: map[string]interface{}{"temperature": float64(82)},
+			tags:   map[string]string{`location place`: `us-midwest`},
+		},
+		{
+			name:   `weather`,
+			fields: map[string]interface{}{`temperature`: `too"hot"`},
+			tags:   map[string]string{"location": `us-midwest`},
+		},
+	}
+
+	for i, test := range tests {
+		assert.Equal(t, test.name, metrics[i].Name())
+		assert.Equal(t, test.fields, metrics[i].Fields())
+		assert.Equal(t, test.tags, metrics[i].Tags())
+	}
+}
+
+func TestParseTrueBooleans(t *testing.T) {
+	metrics, err := Parse([]byte(trues))
+	assert.NoError(t, err)
+	assert.Len(t, metrics, 5)
+
+	for _, metric := range metrics {
+		assert.Equal(t, "booltest", metric.Name())
+		assert.Equal(t, true, metric.Fields()["b"])
+	}
+}
+
+func TestParseFalseBooleans(t *testing.T) {
+	metrics, err := Parse([]byte(falses))
+	assert.NoError(t, err)
+	assert.Len(t, metrics, 5)
+
+	for _, metric := range metrics {
+		assert.Equal(t, "booltest", metric.Name())
+		assert.Equal(t, false, metric.Fields()["b"])
+	}
+}
+
+func TestParsePointBadNumber(t *testing.T) {
+	for _, tt := range []string{
+		"cpu v=- ",
+		"cpu v=-i ",
+		"cpu v=-. ",
+		"cpu v=. ",
+		"cpu v=1.0i ",
+		"cpu v=1ii ",
+		"cpu v=1a ",
+		"cpu v=-e-e-e ",
+		"cpu v=42+3 ",
+		"cpu v= ",
+	} {
+		_, err := Parse([]byte(tt + "\n"))
+		assert.Error(t, err, tt)
+	}
+}
+
+func TestParseTagsMissingParts(t *testing.T) {
+	for _, tt := range []string{
+		`cpu,host`,
+		`cpu,host,`,
+		`cpu,host=`,
+		`cpu,f=oo=bar value=1`,
+		`cpu,host value=1i`,
+		`cpu,host=serverA,region value=1i`,
+		`cpu,host=serverA,region= value=1i`,
+		`cpu,host=serverA,region=,zone=us-west value=1i`,
+		`cpu, value=1`,
+		`cpu, ,,`,
+		`cpu,,,`,
+		`cpu,host=serverA,=us-east value=1i`,
+		`cpu,host=serverAa\,,=us-east value=1i`,
+		`cpu,host=serverA\,,=us-east value=1i`,
+		`cpu, =serverA value=1i`,
+	} {
+		_, err := Parse([]byte(tt + "\n"))
+		assert.Error(t, err, tt)
+	}
+}
+
+func TestParsePointWhitespace(t *testing.T) {
+	for _, tt := range []string{
+		`cpu    value=1.0 1257894000000000000`,
+		`cpu value=1.0     1257894000000000000`,
+		`cpu      value=1.0     1257894000000000000`,
+		`cpu value=1.0 1257894000000000000   `,
+	} {
+		m, err := Parse([]byte(tt + "\n"))
+		assert.NoError(t, err, tt)
+		assert.Equal(t, "cpu", m[0].Name())
+		assert.Equal(t, map[string]interface{}{"value": float64(1)}, m[0].Fields())
+	}
+}
+
+func TestParsePointInvalidFields(t *testing.T) {
+	for _, tt := range []string{
+		"test,foo=bar a=101,=value",
+		"test,foo=bar =value",
+		"test,foo=bar a=101,key=",
+		"test,foo=bar key=",
+		`test,foo=bar a=101,b="foo`,
+	} {
+		_, err := Parse([]byte(tt + "\n"))
+		assert.Error(t, err, tt)
+	}
+}
+
+func TestParsePointNoFields(t *testing.T) {
+	for _, tt := range []string{
+		"cpu_load_short,host=server01,region=us-west",
+		"very_long_measurement_name",
+		"cpu,host==",
+		"============",
+		"cpu",
+		"cpu\n\n\n\n\n\n\n",
+		"                ",
+	} {
+		_, err := Parse([]byte(tt + "\n"))
+		assert.Error(t, err, tt)
+	}
+}
+
+// a b=1 << this is the shortest possible metric
+// any shorter is just ignored
+func TestParseBufTooShort(t *testing.T) {
+	for _, tt := range []string{
+		"",
+		"a",
+		"a ",
+		"a b=",
+	} {
+		_, err := Parse([]byte(tt + "\n"))
+		assert.Error(t, err, tt)
+	}
+}
+
+func TestParseInvalidBooleans(t *testing.T) {
+	for _, tt := range []string{
+		"test b=tru",
+		"test b=fals",
+		"test b=faLse",
+		"test q=foo",
+		"test b=lambchops",
+	} {
+		_, err := Parse([]byte(tt + "\n"))
+		assert.Error(t, err, tt)
+	}
+}
+
+func TestParseInvalidNumbers(t *testing.T) {
+	for _, tt := range []string{
+		"test b=-",
+		"test b=1.1.1",
+		"test b=nan",
+		"test b=9i10",
+		"test b=9999999999999999999i",
+	} {
+		_, err := Parse([]byte(tt + "\n"))
+		assert.Error(t, err, tt)
+	}
+}
+
+func TestParseNegativeTimestamps(t *testing.T) {
+	for _, tt := range []string{
+		"test foo=101 -1257894000000000000",
+	} {
+		metrics, err := Parse([]byte(tt + "\n"))
+		assert.NoError(t, err, tt)
+		assert.True(t, metrics[0].Time().Equal(time.Unix(0, -1257894000000000000)))
+	}
+}
+
+func TestParsePrecision(t *testing.T) {
+	for _, tt := range []struct {
+		line      string
+		precision string
+		expected  int64
+	}{
+		{"test v=42 1491847420", "s", 1491847420000000000},
+		{"test v=42 1491847420123", "ms", 1491847420123000000},
+		{"test v=42 1491847420123456", "u", 1491847420123456000},
+		{"test v=42 1491847420123456789", "ns", 1491847420123456789},
+
+		{"test v=42 1491847420123456789", "1s", 1491847420123456789},
+		{"test v=42 1491847420123456789", "asdf", 1491847420123456789},
+	} {
+		metrics, err := ParseWithDefaultTimePrecision(
+			[]byte(tt.line+"\n"), time.Now(), tt.precision)
+		assert.NoError(t, err)
+		assert.Equal(t, tt.expected, metrics[0].UnixNano())
+	}
+}
+
+func TestParsePrecisionUnsetTime(t *testing.T) {
+	for _, tt := range []struct {
+		line      string
+		precision string
+	}{
+		{"test v=42", "s"},
+		{"test v=42", "ns"},
+	} {
+		_, err := ParseWithDefaultTimePrecision(
+			[]byte(tt.line+"\n"), time.Now(), tt.precision)
+		assert.NoError(t, err)
+	}
+}
+
+func TestParseMaxKeyLength(t *testing.T) {
+	key := ""
+	for {
+		if len(key) > MaxKeyLength {
+			break
+		}
+		key += "test"
+	}
+
+	_, err := Parse([]byte(key + " value=1\n"))
+	assert.Error(t, err)
+}
--- a/metric/reader.go
+++ b/metric/reader.go
@@ -0,0 +1,159 @@
+package metric
+
+import (
+	"io"
+
+	"github.com/influxdata/telegraf"
+)
+
+type state int
+
+const (
+	_ state = iota
+	// normal state copies whole metrics into the given buffer until we can't
+	// fit the next metric.
+	normal
+	// split state means that we have a metric that we were able to split, so
+	// that we can fit it into multiple metrics (and calls to Read)
+	split
+	// overflow state means that we have a metric that didn't fit into a single
+	// buffer, and needs to be split across multiple calls to Read.
+	overflow
+	// splitOverflow state means that a split metric didn't fit into a single
+	// buffer, and needs to be split across multiple calls to Read.
+	splitOverflow
+	// done means we're done reading metrics, and now always return (0, io.EOF)
+	done
+)
+
+type reader struct {
+	metrics      []telegraf.Metric
+	splitMetrics []telegraf.Metric
+	buf          []byte
+	state        state
+
+	// metric index
+	iM int
+	// split metric index
+	iSM int
+	// buffer index
+	iB int
+}
+
+func NewReader(metrics []telegraf.Metric) io.Reader {
+	return &reader{
+		metrics: metrics,
+		state:   normal,
+	}
+}
+
+func (r *reader) Read(p []byte) (n int, err error) {
+	var i int
+	switch r.state {
+	case done:
+		return 0, io.EOF
+	case normal:
+		for {
+			// this for-loop is the sunny-day scenario, where we are given a
+			// buffer that is large enough to hold at least a single metric.
+			// all of the cases below it are edge-cases.
+			if r.metrics[r.iM].Len() <= len(p[i:]) {
+				i += r.metrics[r.iM].SerializeTo(p[i:])
+			} else {
+				break
+			}
+			r.iM++
+			if r.iM == len(r.metrics) {
+				r.state = done
+				return i, io.EOF
+			}
+		}
+
+		// if we haven't written any bytes, check if we can split the current
+		// metric into multiple full metrics at a smaller size.
+		if i == 0 {
+			tmp := r.metrics[r.iM].Split(len(p))
+			if len(tmp) > 1 {
+				r.splitMetrics = tmp
+				r.state = split
+				if r.splitMetrics[0].Len() <= len(p) {
+					i += r.splitMetrics[0].SerializeTo(p)
+					r.iSM = 1
+				} else {
+					// splitting didn't quite work, so we'll drop down and
+					// overflow the metric.
+					r.state = normal
+					r.iSM = 0
+				}
+			}
+		}
+
+		// if we haven't written any bytes and we're not at the end of the metrics
+		// slice, then it means we have a single metric that is larger than the
+		// provided buffer.
+		if i == 0 {
+			r.buf = r.metrics[r.iM].Serialize()
+			i += copy(p, r.buf[r.iB:])
+			r.iB += i
+			r.state = overflow
+		}
+
+	case split:
+		if r.splitMetrics[r.iSM].Len() <= len(p) {
+			// write the current split metric
+			i += r.splitMetrics[r.iSM].SerializeTo(p)
+			r.iSM++
+			if r.iSM >= len(r.splitMetrics) {
+				// done writing the current split metrics
+				r.iSM = 0
+				r.iM++
+				if r.iM == len(r.metrics) {
+					r.state = done
+					return i, io.EOF
+				}
+				r.state = normal
+			}
+		} else {
+			// This would only happen if we split the metric, and then a
+			// subsequent buffer was smaller than the initial one given,
+			// so that our split metric no longer fits.
+			r.buf = r.splitMetrics[r.iSM].Serialize()
+			i += copy(p, r.buf[r.iB:])
+			r.iB += i
+			r.state = splitOverflow
+		}
+
+	case splitOverflow:
+		i = copy(p, r.buf[r.iB:])
+		r.iB += i
+		if r.iB >= len(r.buf) {
+			r.iB = 0
+			r.iSM++
+			if r.iSM == len(r.splitMetrics) {
+				r.iM++
+				if r.iM == len(r.metrics) {
+					r.state = done
+					return i, io.EOF
+				}
+				r.state = normal
+			} else {
+				r.state = split
+			}
+		}
+
+	case overflow:
+		i = copy(p, r.buf[r.iB:])
+		r.iB += i
+		if r.iB >= len(r.buf) {
+			r.iB = 0
+			r.iM++
+			if r.iM == len(r.metrics) {
+				r.state = done
+				return i, io.EOF
+			}
+			r.state = normal
+		}
+	}
+
+	return i, nil
+}
--- a/metric/reader_test.go
+++ b/metric/reader_test.go
@@ -0,0 +1,713 @@
+package metric
+
+import (
+	"io"
+	"io/ioutil"
+	"regexp"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func BenchmarkMetricReader(b *testing.B) {
+	metrics := make([]telegraf.Metric, 10)
+	for i := 0; i < 10; i++ {
+		metrics[i], _ = New("foo", map[string]string{},
+			map[string]interface{}{"value": int64(1)}, time.Now())
+	}
+	for n := 0; n < b.N; n++ {
+		r := NewReader(metrics)
+		io.Copy(ioutil.Discard, r)
+	}
+}
+
+func TestMetricReader(t *testing.T) {
+	ts := time.Unix(1481032190, 0)
+	metrics := make([]telegraf.Metric, 10)
+	for i := 0; i < 10; i++ {
+		metrics[i], _ = New("foo", map[string]string{},
+			map[string]interface{}{"value": int64(1)}, ts)
+	}
+
+	r := NewReader(metrics)
+
+	buf := make([]byte, 35)
+	for i := 0; i < 10; i++ {
+		n, err := r.Read(buf)
+		if err != nil {
+			assert.True(t, err == io.EOF, err.Error())
+		}
+		assert.Equal(t, 33, n)
+		assert.Equal(t, "foo value=1i 1481032190000000000\n", string(buf[0:n]))
+	}
+
+	// reader should now be done, and always return 0, io.EOF
+	for i := 0; i < 10; i++ {
+		n, err := r.Read(buf)
+		assert.True(t, err == io.EOF, err.Error())
+		assert.Equal(t, 0, n)
+	}
+}
+
+func TestMetricReader_OverflowMetric(t *testing.T) {
+	ts := time.Unix(1481032190, 0)
+	m, _ := New("foo", map[string]string{},
+		map[string]interface{}{"value": int64(10)}, ts)
+	metrics := []telegraf.Metric{m}
+
+	r := NewReader(metrics)
+	buf := make([]byte, 5)
+
+	tests := []struct {
+		exp string
+		err error
+		n   int
+	}{
+		{
+			"foo v",
+			nil,
+			5,
+		},
+		{
+			"alue=",
+			nil,
+			5,
+		},
+		{
+			"10i 1",
+			nil,
+			5,
+		},
+		{
+			"48103",
+			nil,
+			5,
+		},
+		{
+			"21900",
+			nil,
+			5,
+		},
+		{
+			"00000",
+			nil,
+			5,
+		},
+		{
+			"000\n",
+			io.EOF,
+			4,
+		},
+		{
+			"",
+			io.EOF,
+			0,
+		},
+	}
+
+	for _, test := range tests {
+		n, err := r.Read(buf)
+		assert.Equal(t, test.n, n)
+		assert.Equal(t, test.exp, string(buf[0:n]))
+		assert.Equal(t, test.err, err)
+	}
+}
+
+// Regression test for when a metric is the same size as the buffer.
+//
+// Previously EOF would not be set until the next call to Read.
+func TestMetricReader_MetricSizeEqualsBufferSize(t *testing.T) {
+	ts := time.Unix(1481032190, 0)
+	m1, _ := New("foo", map[string]string{},
+		map[string]interface{}{"a": int64(1)}, ts)
+	metrics := []telegraf.Metric{m1}
+
+	r := NewReader(metrics)
+	buf := make([]byte, m1.Len())
+
+	for {
+		n, err := r.Read(buf)
+		// Should never read 0 bytes unless at EOF, unless input buffer is 0 length
+		if n == 0 {
+			require.Equal(t, io.EOF, err)
+			break
+		}
+		// Lines should be terminated with a LF
+		if err == io.EOF {
+			require.Equal(t, uint8('\n'), buf[n-1])
+			break
+		}
+		require.NoError(t, err)
+	}
+}
+
+// Regression test for when a metric requires to be split and one of the
+// split metrics is exactly the size of the buffer.
+//
+// Previously an empty string would be returned on the next Read without error,
+// and then next Read call would panic.
+func TestMetricReader_SplitWithExactLengthSplit(t *testing.T) {
+	ts := time.Unix(1481032190, 0)
+	m1, _ := New("foo", map[string]string{},
+		map[string]interface{}{"a": int64(1), "bb": int64(2)}, ts)
+	metrics := []telegraf.Metric{m1}
+
+	r := NewReader(metrics)
+	buf := make([]byte, 30)
+
+	//  foo a=1i,bb=2i 1481032190000000000\n // len 35
+	//
+	// Requires this specific split order:
+	//  foo a=1i 1481032190000000000\n  // len 29
+	//  foo bb=2i 1481032190000000000\n // len 30
+
+	for {
+		n, err := r.Read(buf)
+		// Should never read 0 bytes unless at EOF, unless input buffer is 0 length
+		if n == 0 {
+			require.Equal(t, io.EOF, err)
+			break
+		}
+		// Lines should be terminated with a LF
+		if err == io.EOF {
+			require.Equal(t, uint8('\n'), buf[n-1])
+			break
+		}
+		require.NoError(t, err)
+	}
+}
+
+// Regression test for when a metric requires to be split and one of the
+// split metrics is larger than the buffer.
+//
+// Previously the metric index would be set incorrectly causing a panic.
+func TestMetricReader_SplitOverflowOversized(t *testing.T) {
+	ts := time.Unix(1481032190, 0)
+	m1, _ := New("foo", map[string]string{},
+		map[string]interface{}{
+			"a":   int64(1),
+			"bbb": int64(2),
+		}, ts)
+	metrics := []telegraf.Metric{m1}
+
+	r := NewReader(metrics)
+	buf := make([]byte, 30)
+
+	// foo a=1i,bbb=2i 1481032190000000000\n // len 36
+	//
+	// foo a=1i 1481032190000000000\n  // len 29
+	// foo bbb=2i 1481032190000000000\n // len 31
+
+	for {
+		n, err := r.Read(buf)
+		// Should never read 0 bytes unless at EOF, unless input buffer is 0 length
+		if n == 0 {
+			require.Equal(t, io.EOF, err)
+			break
+		}
+		// Lines should be terminated with a LF
+		if err == io.EOF {
+			require.Equal(t, uint8('\n'), buf[n-1])
+			break
+		}
+		require.NoError(t, err)
+	}
+}
+
+// Regression test for when a split metric exactly fits in the buffer.
+//
+// Previously the metric would be overflow split when not required.
+func TestMetricReader_SplitOverflowUneeded(t *testing.T) {
+	ts := time.Unix(1481032190, 0)
+	m1, _ := New("foo", map[string]string{},
+		map[string]interface{}{"a": int64(1), "b": int64(2)}, ts)
+	metrics := []telegraf.Metric{m1}
+
+	r := NewReader(metrics)
+	buf := make([]byte, 29)
+
+	// foo a=1i,b=2i 1481032190000000000\n // len 34
+	//
+	// foo a=1i 1481032190000000000\n  // len 29
+	// foo b=2i 1481032190000000000\n // len 29
+
+	for {
+		n, err := r.Read(buf)
+		// Should never read 0 bytes unless at EOF, unless input buffer is 0 length
+		if n == 0 {
+			require.Equal(t, io.EOF, err)
+			break
+		}
+		// Lines should be terminated with a LF
+		if err == io.EOF {
+			require.Equal(t, uint8('\n'), buf[n-1])
+			break
+		}
+		require.NoError(t, err)
+	}
+}
+
+func TestMetricReader_OverflowMultipleMetrics(t *testing.T) {
+	ts := time.Unix(1481032190, 0)
+	m, _ := New("foo", map[string]string{},
+		map[string]interface{}{"value": int64(10)}, ts)
+	metrics := []telegraf.Metric{m, m.Copy()}
+
+	r := NewReader(metrics)
+	buf := make([]byte, 10)
+
+	tests := []struct {
+		exp string
+		err error
+		n   int
+	}{
+		{
+			"foo value=",
+			nil,
+			10,
+		},
+		{
+			"10i 148103",
+			nil,
+			10,
+		},
+		{
+			"2190000000",
+			nil,
+			10,
+		},
+		{
+			"000\n",
+			nil,
+			4,
+		},
+		{
+			"foo value=",
+			nil,
+			10,
+		},
+		{
+			"10i 148103",
+			nil,
+			10,
+		},
+		{
+			"2190000000",
+			nil,
+			10,
+		},
+		{
+			"000\n",
+			io.EOF,
+			4,
+		},
+		{
+			"",
+			io.EOF,
+			0,
+		},
+	}
+
+	for _, test := range tests {
+		n, err := r.Read(buf)
+		assert.Equal(t, test.n, n)
+		assert.Equal(t, test.exp, string(buf[0:n]))
+		assert.Equal(t, test.err, err)
+	}
+}
+
+// test splitting a metric
+func TestMetricReader_SplitMetric(t *testing.T) {
+	ts := time.Unix(1481032190, 0)
+	m1, _ := New("foo", map[string]string{},
+		map[string]interface{}{
+			"value1": int64(10),
+			"value2": int64(10),
+			"value3": int64(10),
+			"value4": int64(10),
+			"value5": int64(10),
+			"value6": int64(10),
+		},
+		ts,
+	)
+	metrics := []telegraf.Metric{m1}
+
+	r := NewReader(metrics)
+	buf := make([]byte, 60)
+
+	tests := []struct {
+		expRegex string
+		err      error
+		n        int
+	}{
+		{
+			`foo value\d=10i,value\d=10i,value\d=10i 1481032190000000000\n`,
+			nil,
+			57,
+		},
+		{
+			`foo value\d=10i,value\d=10i,value\d=10i 1481032190000000000\n`,
+			io.EOF,
+			57,
+		},
+		{
+			"",
+			io.EOF,
+			0,
+		},
+	}
+
+	for _, test := range tests {
+		n, err := r.Read(buf)
+		assert.Equal(t, test.n, n)
+		re := regexp.MustCompile(test.expRegex)
+		assert.True(t, re.MatchString(string(buf[0:n])), string(buf[0:n]))
+		assert.Equal(t, test.err, err)
+	}
+}
+
+// test an array with one split metric and one unsplit
+func TestMetricReader_SplitMetric2(t *testing.T) {
+	ts := time.Unix(1481032190, 0)
+	m1, _ := New("foo", map[string]string{},
+		map[string]interface{}{
+			"value1": int64(10),
+			"value2": int64(10),
+			"value3": int64(10),
+			"value4": int64(10),
+			"value5": int64(10),
+			"value6": int64(10),
+		},
+		ts,
+	)
+	m2, _ := New("foo", map[string]string{},
+		map[string]interface{}{
+			"value1": int64(10),
+		},
+		ts,
+	)
+	metrics := []telegraf.Metric{m1, m2}
+
+	r := NewReader(metrics)
+	buf := make([]byte, 60)
+
+	tests := []struct {
+		expRegex string
+		err      error
+		n        int
+	}{
+		{
+			`foo value\d=10i,value\d=10i,value\d=10i 1481032190000000000\n`,
+			nil,
+			57,
+		},
+		{
+			`foo value\d=10i,value\d=10i,value\d=10i 1481032190000000000\n`,
+			nil,
+			57,
+		},
+		{
+			`foo value1=10i 1481032190000000000\n`,
+			io.EOF,
+			35,
+		},
+		{
+			"",
+			io.EOF,
+			0,
+		},
+	}
+
+	for _, test := range tests {
+		n, err := r.Read(buf)
+		assert.Equal(t, test.n, n)
+		re := regexp.MustCompile(test.expRegex)
+		assert.True(t, re.MatchString(string(buf[0:n])), string(buf[0:n]))
+		assert.Equal(t, test.err, err)
+	}
+}
+
+// test split that results in metrics that are still too long, which results in
+// the reader falling back to regular overflow.
+func TestMetricReader_SplitMetricTooLong(t *testing.T) {
+	ts := time.Unix(1481032190, 0)
+	m1, _ := New("foo", map[string]string{},
+		map[string]interface{}{
+			"value1": int64(10),
+			"value2": int64(10),
+		},
+		ts,
+	)
+	metrics := []telegraf.Metric{m1}
+
+	r := NewReader(metrics)
+	buf := make([]byte, 30)
+
+	tests := []struct {
+		expRegex string
+		err      error
+		n        int
+	}{
+		{
+			`foo value\d=10i,value\d=10i 1481`,
+			nil,
+			30,
+		},
+		{
+			`032190000000000\n`,
+			io.EOF,
+			16,
+		},
+		{
+			"",
+			io.EOF,
+			0,
+		},
+	}
+
+	for _, test := range tests {
+		n, err := r.Read(buf)
+		assert.Equal(t, test.n, n)
+		re := regexp.MustCompile(test.expRegex)
+		assert.True(t, re.MatchString(string(buf[0:n])), string(buf[0:n]))
+		assert.Equal(t, test.err, err)
+	}
+}
+
+// test split with a changing buffer size in the middle of subsequent calls
+// to Read
+func TestMetricReader_SplitMetricChangingBuffer(t *testing.T) {
+	ts := time.Unix(1481032190, 0)
+	m1, _ := New("foo", map[string]string{},
+		map[string]interface{}{
+			"value1": int64(10),
+			"value2": int64(10),
+			"value3": int64(10),
+		},
+		ts,
+	)
+	m2, _ := New("foo", map[string]string{},
+		map[string]interface{}{
+			"value1": int64(10),
+		},
+		ts,
+	)
+	metrics := []telegraf.Metric{m1, m2}
+
+	r := NewReader(metrics)
+
+	tests := []struct {
+		expRegex string
+		err      error
+		n        int
+		buf      []byte
+	}{
+		{
+			`foo value\d=10i 1481032190000000000\n`,
+			nil,
+			35,
+			make([]byte, 36),
+		},
+		{
+			`foo value\d=10i 148103219000000`,
+			nil,
+			30,
+			make([]byte, 30),
+		},
+		{
+			`0000\n`,
+			nil,
+			5,
+			make([]byte, 30),
+		},
+		{
+			`foo value\d=10i 1481032190000000000\n`,
+			nil,
+			35,
+			make([]byte, 36),
+		},
+		{
+			`foo value1=10i 1481032190000000000\n`,
+			io.EOF,
+			35,
+			make([]byte, 36),
+		},
+		{
+			"",
+			io.EOF,
+			0,
+			make([]byte, 36),
+		},
+	}
+
+	for _, test := range tests {
+		n, err := r.Read(test.buf)
+		assert.Equal(t, test.n, n, test.expRegex)
+		re := regexp.MustCompile(test.expRegex)
+		assert.True(t, re.MatchString(string(test.buf[0:n])), string(test.buf[0:n]))
+		assert.Equal(t, test.err, err, test.expRegex)
+	}
+}
+
+// test split with a changing buffer size in the middle of subsequent calls
+// to Read
+func TestMetricReader_SplitMetricChangingBuffer2(t *testing.T) {
+	ts := time.Unix(1481032190, 0)
+	m1, _ := New("foo", map[string]string{},
+		map[string]interface{}{
+			"value1": int64(10),
+			"value2": int64(10),
+		},
+		ts,
+	)
+	m2, _ := New("foo", map[string]string{},
+		map[string]interface{}{
+			"value1": int64(10),
+		},
+		ts,
+	)
+	metrics := []telegraf.Metric{m1, m2}
+
+	r := NewReader(metrics)
+
+	tests := []struct {
+		expRegex string
+		err      error
+		n        int
+		buf      []byte
+	}{
+		{
+			`foo value\d=10i 1481032190000000000\n`,
+			nil,
+			35,
+			make([]byte, 36),
+		},
+		{
+			`foo value\d=10i 148103219000000`,
+			nil,
+			30,
+			make([]byte, 30),
+		},
+		{
+			`0000\n`,
+			nil,
+			5,
+			make([]byte, 30),
+		},
+		{
+			`foo value1=10i 1481032190000000000\n`,
+			io.EOF,
+			35,
+			make([]byte, 36),
+		},
+		{
+			"",
+			io.EOF,
+			0,
+			make([]byte, 36),
+		},
+	}
+
+	for _, test := range tests {
+		n, err := r.Read(test.buf)
+		assert.Equal(t, test.n, n, test.expRegex)
+		re := regexp.MustCompile(test.expRegex)
+		assert.True(t, re.MatchString(string(test.buf[0:n])), string(test.buf[0:n]))
+		assert.Equal(t, test.err, err, test.expRegex)
+	}
+}
+
+func TestReader_Read(t *testing.T) {
+	epoch := time.Unix(0, 0)
+
+	type args struct {
+		name   string
+		tags   map[string]string
+		fields map[string]interface{}
+		t      time.Time
+		mType  []telegraf.ValueType
+	}
+	tests := []struct {
+		name     string
+		args     args
+		expected []byte
+	}{
+		{
+			name: "escape backslashes in string field",
+			args: args{
+				name:   "cpu",
+				tags:   map[string]string{},
+				fields: map[string]interface{}{"value": `test\`},
+				t:      epoch,
+			},
+			expected: []byte(`cpu value="test\\" 0`),
+		},
+		{
+			name: "escape quote in string field",
+			args: args{
+				name:   "cpu",
+				tags:   map[string]string{},
+				fields: map[string]interface{}{"value": `test"`},
+				t:      epoch,
+			},
+			expected: []byte(`cpu value="test\"" 0`),
+		},
+		{
+			name: "escape quote and backslash in string field",
+			args: args{
+				name:   "cpu",
+				tags:   map[string]string{},
+				fields: map[string]interface{}{"value": `test\"`},
+				t:      epoch,
+			},
+			expected: []byte(`cpu value="test\\\"" 0`),
+		},
+		{
+			name: "escape multiple backslash in string field",
+			args: args{
+				name:   "cpu",
+				tags:   map[string]string{},
+				fields: map[string]interface{}{"value": `test\\`},
+				t:      epoch,
+			},
+			expected: []byte(`cpu value="test\\\\" 0`),
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			buf := make([]byte, 512)
+			m, err := New(tt.args.name, tt.args.tags, tt.args.fields, tt.args.t, tt.args.mType...)
+			require.NoError(t, err)
+
+			r := NewReader([]telegraf.Metric{m})
+			num, err := r.Read(buf)
+			if err != io.EOF {
+				require.NoError(t, err)
+			}
+			line := string(buf[:num])
+			// This is done so that we can use raw strings in the test spec
+			noeol := strings.TrimRight(line, "\n")
+			require.Equal(t, string(tt.expected), noeol)
+			require.Equal(t, len(tt.expected)+1, num)
+		})
+	}
+}
+
+func TestMetricRoundtrip(t *testing.T) {
+	const lp = `nstat,bu=linux,cls=server,dc=cer,env=production,host=hostname,name=netstat,sr=database IpExtInBcastOctets=12570626154i,IpExtInBcastPkts=95541226i,IpExtInCEPkts=0i,IpExtInCsumErrors=0i,IpExtInECT0Pkts=55674i,IpExtInECT1Pkts=0i,IpExtInMcastOctets=5928296i,IpExtInMcastPkts=174365i,IpExtInNoECTPkts=17965863529i,IpExtInNoRoutes=20i,IpExtInOctets=3334866321815i,IpExtInTruncatedPkts=0i,IpExtOutBcastOctets=0i,IpExtOutBcastPkts=0i,IpExtOutMcastOctets=0i,IpExtOutMcastPkts=0i,IpExtOutOctets=31397892391399i,TcpExtArpFilter=0i,TcpExtBusyPollRxPackets=0i,TcpExtDelayedACKLocked=14094i,TcpExtDelayedACKLost=302083i,TcpExtDelayedACKs=55486507i,TcpExtEmbryonicRsts=11879i,TcpExtIPReversePathFilter=0i,TcpExtListenDrops=1736i,TcpExtListenOverflows=0i,TcpExtLockDroppedIcmps=0i,TcpExtOfoPruned=0i,TcpExtOutOfWindowIcmps=8i,TcpExtPAWSActive=0i,TcpExtPAWSEstab=974i,TcpExtPAWSPassive=0i,TcpExtPruneCalled=0i,TcpExtRcvPruned=0i,TcpExtSyncookiesFailed=12593i,TcpExtSyncookiesRecv=0i,TcpExtSyncookiesSent=0i,TcpExtTCPACKSkippedChallenge=0i,TcpExtTCPACKSkippedFinWait2=0i,TcpExtTCPACKSkippedPAWS=806i,TcpExtTCPACKSkippedSeq=519i,TcpExtTCPACKSkippedSynRecv=0i,TcpExtTCPACKSkippedTimeWait=0i,TcpExtTCPAbortFailed=0i,TcpExtTCPAbortOnClose=22i,TcpExtTCPAbortOnData=36593i,TcpExtTCPAbortOnLinger=0i,TcpExtTCPAbortOnMemory=0i,TcpExtTCPAbortOnTimeout=674i,TcpExtTCPAutoCorking=494253233i,TcpExtTCPBacklogDrop=0i,TcpExtTCPChallengeACK=281i,TcpExtTCPDSACKIgnoredNoUndo=93354i,TcpExtTCPDSACKIgnoredOld=336i,TcpExtTCPDSACKOfoRecv=0i,TcpExtTCPDSACKOfoSent=7i,TcpExtTCPDSACKOldSent=302073i,TcpExtTCPDSACKRecv=215884i,TcpExtTCPDSACKUndo=7633i,TcpExtTCPDeferAcceptDrop=0i,TcpExtTCPDirectCopyFromBacklog=0i,TcpExtTCPDirectCopyFromPrequeue=0i,TcpExtTCPFACKReorder=1320i,TcpExtTCPFastOpenActive=0i,TcpExtTCPFastOpenActiveFail=0i,TcpExtTCPFastOpenCookieReqd=0i,TcpExtTCPFastOpenListenOverflow=0i,TcpExtTCPFastOpenPassive=0i,TcpExtTCPFastOpenPassiveFail=0i,TcpExtTCPFastRetrans=350681i,TcpExtTCPForwardRetrans=142168i,TcpExtTCPFromZeroWindowAdv=4317i,TcpExtTCPFullUndo=29502i,TcpExtTCPHPAcks=10267073000i,TcpExtTCPHPHits=5629837098i,TcpExtTCPHPHitsToUser=0i,TcpExtTCPHystartDelayCwnd=285127i,TcpExtTCPHystartDelayDetect=12318i,TcpExtTCPHystartTrainCwnd=69160570i,TcpExtTCPHystartTrainDetect=3315799i,TcpExtTCPLossFailures=109i,TcpExtTCPLossProbeRecovery=110819i,TcpExtTCPLossProbes=233995i,TcpExtTCPLossUndo=5276i,TcpExtTCPLostRetransmit=397i,TcpExtTCPMD5NotFound=0i,TcpExtTCPMD5Unexpected=0i,TcpExtTCPMemoryPressures=0i,TcpExtTCPMinTTLDrop=0i,TcpExtTCPOFODrop=0i,TcpExtTCPOFOMerge=7i,TcpExtTCPOFOQueue=15196i,TcpExtTCPOrigDataSent=29055119435i,TcpExtTCPPartialUndo=21320i,TcpExtTCPPrequeueDropped=0i,TcpExtTCPPrequeued=0i,TcpExtTCPPureAcks=1236441827i,TcpExtTCPRcvCoalesce=225590473i,TcpExtTCPRcvCollapsed=0i,TcpExtTCPRenoFailures=0i,TcpExtTCPRenoRecovery=0i,TcpExtTCPRenoRecoveryFail=0i,TcpExtTCPRenoReorder=0i,TcpExtTCPReqQFullDoCookies=0i,TcpExtTCPReqQFullDrop=0i,TcpExtTCPRetransFail=41i,TcpExtTCPSACKDiscard=0i,TcpExtTCPSACKReneging=0i,TcpExtTCPSACKReorder=4307i,TcpExtTCPSYNChallenge=244i,TcpExtTCPSackFailures=1698i,TcpExtTCPSackMerged=184668i,TcpExtTCPSackRecovery=97369i,TcpExtTCPSackRecoveryFail=381i,TcpExtTCPSackShiftFallback=2697079i,TcpExtTCPSackShifted=760299i,TcpExtTCPSchedulerFailed=0i,TcpExtTCPSlowStartRetrans=9276i,TcpExtTCPSpuriousRTOs=959i,TcpExtTCPSpuriousRtxHostQueues=2973i,TcpExtTCPSynRetrans=200970i,TcpExtTCPTSReorder=15221i,TcpExtTCPTimeWaitOverflow=0i,TcpExtTCPTimeouts=70127i,TcpExtTCPToZeroWindowAdv=4317i,TcpExtTCPWantZeroWindowAdv=2133i,TcpExtTW=24809813i,TcpExtTWKilled=0i,TcpExtTWRecycled=0i 1496460785000000000
+nstat,bu=linux,cls=server,dc=cer,env=production,host=hostname,name=snmp,sr=database IcmpInAddrMaskReps=0i,IcmpInAddrMasks=90i,IcmpInCsumErrors=0i,IcmpInDestUnreachs=284401i,IcmpInEchoReps=9i,IcmpInEchos=1761912i,IcmpInErrors=407i,IcmpInMsgs=2047767i,IcmpInParmProbs=0i,IcmpInRedirects=0i,IcmpInSrcQuenchs=0i,IcmpInTimeExcds=46i,IcmpInTimestampReps=0i,IcmpInTimestamps=1309i,IcmpMsgInType0=9i,IcmpMsgInType11=46i,IcmpMsgInType13=1309i,IcmpMsgInType17=90i,IcmpMsgInType3=284401i,IcmpMsgInType8=1761912i,IcmpMsgOutType0=1761912i,IcmpMsgOutType14=1248i,IcmpMsgOutType3=108709i,IcmpMsgOutType8=9i,IcmpOutAddrMaskReps=0i,IcmpOutAddrMasks=0i,IcmpOutDestUnreachs=108709i,IcmpOutEchoReps=1761912i,IcmpOutEchos=9i,IcmpOutErrors=0i,IcmpOutMsgs=1871878i,IcmpOutParmProbs=0i,IcmpOutRedirects=0i,IcmpOutSrcQuenchs=0i,IcmpOutTimeExcds=0i,IcmpOutTimestampReps=1248i,IcmpOutTimestamps=0i,IpDefaultTTL=64i,IpForwDatagrams=0i,IpForwarding=2i,IpFragCreates=0i,IpFragFails=0i,IpFragOKs=0i,IpInAddrErrors=0i,IpInDelivers=17658795773i,IpInDiscards=0i,IpInHdrErrors=0i,IpInReceives=17659269339i,IpInUnknownProtos=0i,IpOutDiscards=236976i,IpOutNoRoutes=1009i,IpOutRequests=23466783734i,IpReasmFails=0i,IpReasmOKs=0i,IpReasmReqds=0i,IpReasmTimeout=0i,TcpActiveOpens=23308977i,TcpAttemptFails=3757543i,TcpCurrEstab=280i,TcpEstabResets=184792i,TcpInCsumErrors=0i,TcpInErrs=232i,TcpInSegs=17536573089i,TcpMaxConn=-1i,TcpOutRsts=4051451i,TcpOutSegs=29836254873i,TcpPassiveOpens=176546974i,TcpRetransSegs=878085i,TcpRtoAlgorithm=1i,TcpRtoMax=120000i,TcpRtoMin=200i,UdpInCsumErrors=0i,UdpInDatagrams=24441661i,UdpInErrors=0i,UdpLiteInCsumErrors=0i,UdpLiteInDatagrams=0i,UdpLiteInErrors=0i,UdpLiteNoPorts=0i,UdpLiteOutDatagrams=0i,UdpLiteRcvbufErrors=0i,UdpLiteSndbufErrors=0i,UdpNoPorts=17660i,UdpOutDatagrams=51807896i,UdpRcvbufErrors=0i,UdpSndbufErrors=236922i 1496460785000000000
+`
+	metrics, err := Parse([]byte(lp))
+	require.NoError(t, err)
+	r := NewReader(metrics)
+	buf := make([]byte, 128)
+	_, err = r.Read(buf)
+	require.NoError(t, err)
+	metrics, err = Parse(buf)
+	require.NoError(t, err)
+}
--- a/metric/uint_support.go
+++ b/metric/uint_support.go
@@ -1,7 +0,0 @@
-// +build uint64
-
-package metric
-
-func init() {
-	EnableUintSupport()
-}
--- a/plugins/aggregators/basicstats/README.md
+++ b/plugins/aggregators/basicstats/README.md
@@ -1,6 +1,6 @@
 # BasicStats Aggregator Plugin

-The BasicStats aggregator plugin give us count,max,min,mean,sum,s2(variance), stdev for a set of values,
+The BasicStats aggregator plugin give us count,max,min,mean,s2(variance), stdev for a set of values,
 emitting the aggregate every `period` seconds.

 ### Configuration:
@@ -8,26 +8,14 @@ emitting the aggregate every `period` seconds.
 ```toml
 # Keep the aggregate basicstats of each metric passing through.
 [[aggregators.basicstats]]
-
  ## General Aggregator Arguments:
-
  ## The period on which to flush & clear the aggregator.
  period = "30s"
-
  ## If true, the original metric will be dropped by the
  ## aggregator and will not get sent to the output plugins.
  drop_original = false
-
-  ## BasicStats Arguments:
-
-  ## Configures which basic stats to push as fields
-  stats = ["count","min","max","mean","stdev","s2","sum"]
 ```

- stats
-    - If not specified, then `count`, `min`, `max`, `mean`, `stdev`, and `s2` are aggregated and pushed as fields.  `sum` is not aggregated by default to maintain backwards compatibility.
-    - If empty array, no stats are aggregated
-
 ### Measurements & Fields:

 - measurement1
@@ -35,7 +23,6 @@ emitting the aggregate every `period` seconds.
    - field1_max
    - field1_min
    - field1_mean
-    - field1_sum
    - field1_s2 (variance)
    - field1_stdev (standard deviation)

@@ -49,8 +36,8 @@ No tags are applied by this aggregator.
 $ telegraf --config telegraf.conf --quiet
 system,host=tars load1=1 1475583980000000000
 system,host=tars load1=1 1475583990000000000
-system,host=tars load1_count=2,load1_max=1,load1_min=1,load1_mean=1,load1_sum=2,load1_s2=0,load1_stdev=0 1475584010000000000
+system,host=tars load1_count=2,load1_max=1,load1_min=1,load1_mean=1,load1_s2=0,load1_stdev=0 1475584010000000000
 system,host=tars load1=1 1475584020000000000
 system,host=tars load1=3 1475584030000000000
-system,host=tars load1_count=2,load1_max=3,load1_min=1,load1_mean=2,load1_sum=4,load1_s2=2,load1_stdev=1.414162 1475584010000000000
+system,host=tars load1_count=2,load1_max=3,load1_min=1,load1_mean=2,load1_s2=2,load1_stdev=1.414162 1475584010000000000
 ```
--- a/plugins/aggregators/basicstats/basicstats.go
+++ b/plugins/aggregators/basicstats/basicstats.go
@@ -1,7 +1,6 @@
 package basicstats

 import (
-	"log"
 	"math"

 	"github.com/influxdata/telegraf"
@@ -9,23 +8,10 @@ import (
 )

 type BasicStats struct {
-	Stats []string `toml:"stats"`
-
-	cache       map[uint64]aggregate
-	statsConfig *configuredStats
+	cache map[uint64]aggregate
 }

-type configuredStats struct {
-	count    bool
-	min      bool
-	max      bool
-	mean     bool
-	variance bool
-	stdev    bool
-	sum      bool
-}
-
-func NewBasicStats() *BasicStats {
+func NewBasicStats() telegraf.Aggregator {
 	mm := &BasicStats{}
 	mm.Reset()
 	return mm
@@ -41,7 +27,6 @@ type basicstats struct {
 	count float64
 	min   float64
 	max   float64
-	sum   float64
 	mean  float64
 	M2    float64 //intermedia value for variance/stdev
 }
@@ -79,7 +64,6 @@ func (m *BasicStats) Add(in telegraf.Metric) {
 					min:   fv,
 					max:   fv,
 					mean:  fv,
-					sum:   fv,
 					M2:    0.0,
 				}
 			}
@@ -95,7 +79,6 @@ func (m *BasicStats) Add(in telegraf.Metric) {
 						min:   fv,
 						max:   fv,
 						mean:  fv,
-						sum:   fv,
 						M2:    0.0,
 					}
 					continue
@@ -123,8 +106,6 @@ func (m *BasicStats) Add(in telegraf.Metric) {
 				} else if fv > tmp.max {
 					tmp.max = fv
 				}
-				//sum compute
-				tmp.sum += fv
 				//store final data
 				m.cache[id].fields[k] = tmp
 			}
@@ -133,109 +114,25 @@ func (m *BasicStats) Add(in telegraf.Metric) {
 }

 func (m *BasicStats) Push(acc telegraf.Accumulator) {
-
-	config := getConfiguredStats(m)
-
 	for _, aggregate := range m.cache {
 		fields := map[string]interface{}{}
 		for k, v := range aggregate.fields {
-
-			if config.count {
-				fields[k+"_count"] = v.count
-			}
-			if config.min {
-				fields[k+"_min"] = v.min
-			}
-			if config.max {
-				fields[k+"_max"] = v.max
-			}
-			if config.mean {
-				fields[k+"_mean"] = v.mean
-			}
-			if config.sum {
-				fields[k+"_sum"] = v.sum
-			}
-
+			fields[k+"_count"] = v.count
+			fields[k+"_min"] = v.min
+			fields[k+"_max"] = v.max
+			fields[k+"_mean"] = v.mean
 			//v.count always >=1
 			if v.count > 1 {
 				variance := v.M2 / (v.count - 1)
-
-				if config.variance {
-					fields[k+"_s2"] = variance
-				}
-				if config.stdev {
-					fields[k+"_stdev"] = math.Sqrt(variance)
-				}
+				fields[k+"_s2"] = variance
+				fields[k+"_stdev"] = math.Sqrt(variance)
 			}
 			//if count == 1 StdDev = infinite => so I won't send data
 		}
-
-		if len(fields) > 0 {
-			acc.AddFields(aggregate.name, fields, aggregate.tags)
-		}
+		acc.AddFields(aggregate.name, fields, aggregate.tags)
 	}
 }

-func parseStats(names []string) *configuredStats {
-
-	parsed := &configuredStats{}
-
-	for _, name := range names {
-
-		switch name {
-
-		case "count":
-			parsed.count = true
-		case "min":
-			parsed.min = true
-		case "max":
-			parsed.max = true
-		case "mean":
-			parsed.mean = true
-		case "s2":
-			parsed.variance = true
-		case "stdev":
-			parsed.stdev = true
-		case "sum":
-			parsed.sum = true
-
-		default:
-			log.Printf("W! Unrecognized basic stat '%s', ignoring", name)
-		}
-	}
-
-	return parsed
-}
-
-func defaultStats() *configuredStats {
-
-	defaults := &configuredStats{}
-
-	defaults.count = true
-	defaults.min = true
-	defaults.max = true
-	defaults.mean = true
-	defaults.variance = true
-	defaults.stdev = true
-	defaults.sum = false
-
-	return defaults
-}
-
-func getConfiguredStats(m *BasicStats) *configuredStats {
-
-	if m.statsConfig == nil {
-
-		if m.Stats == nil {
-			m.statsConfig = defaultStats()
-		} else {
-			m.statsConfig = parseStats(m.Stats)
-		}
-	}
-
-	return m.statsConfig
-}
-
 func (m *BasicStats) Reset() {
 	m.cache = make(map[uint64]aggregate)
 }
--- a/plugins/aggregators/basicstats/basicstats_test.go
+++ b/plugins/aggregators/basicstats/basicstats_test.go
@@ -7,7 +7,6 @@ import (

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

 var m1, _ = metric.New("m1",
@@ -150,362 +149,3 @@ func TestBasicStatsDifferentPeriods(t *testing.T) {
 	}
 	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
 }
-
-// Test only aggregating count
-func TestBasicStatsWithOnlyCount(t *testing.T) {
-
-	aggregator := NewBasicStats()
-	aggregator.Stats = []string{"count"}
-
-	aggregator.Add(m1)
-	aggregator.Add(m2)
-
-	acc := testutil.Accumulator{}
-	aggregator.Push(&acc)
-
-	expectedFields := map[string]interface{}{
-		"a_count": float64(2),
-		"b_count": float64(2),
-		"c_count": float64(2),
-		"d_count": float64(2),
-		"e_count": float64(1),
-	}
-	expectedTags := map[string]string{
-		"foo": "bar",
-	}
-	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
-}
-
-// Test only aggregating minimum
-func TestBasicStatsWithOnlyMin(t *testing.T) {
-
-	aggregator := NewBasicStats()
-	aggregator.Stats = []string{"min"}
-
-	aggregator.Add(m1)
-	aggregator.Add(m2)
-
-	acc := testutil.Accumulator{}
-	aggregator.Push(&acc)
-
-	expectedFields := map[string]interface{}{
-		"a_min": float64(1),
-		"b_min": float64(1),
-		"c_min": float64(2),
-		"d_min": float64(2),
-		"e_min": float64(200),
-	}
-	expectedTags := map[string]string{
-		"foo": "bar",
-	}
-	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
-}
-
-// Test only aggregating maximum
-func TestBasicStatsWithOnlyMax(t *testing.T) {
-
-	aggregator := NewBasicStats()
-	aggregator.Stats = []string{"max"}
-
-	aggregator.Add(m1)
-	aggregator.Add(m2)
-
-	acc := testutil.Accumulator{}
-	aggregator.Push(&acc)
-
-	expectedFields := map[string]interface{}{
-		"a_max": float64(1),
-		"b_max": float64(3),
-		"c_max": float64(4),
-		"d_max": float64(6),
-		"e_max": float64(200),
-	}
-	expectedTags := map[string]string{
-		"foo": "bar",
-	}
-	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
-}
-
-// Test only aggregating mean
-func TestBasicStatsWithOnlyMean(t *testing.T) {
-
-	aggregator := NewBasicStats()
-	aggregator.Stats = []string{"mean"}
-
-	aggregator.Add(m1)
-	aggregator.Add(m2)
-
-	acc := testutil.Accumulator{}
-	aggregator.Push(&acc)
-
-	expectedFields := map[string]interface{}{
-		"a_mean": float64(1),
-		"b_mean": float64(2),
-		"c_mean": float64(3),
-		"d_mean": float64(4),
-		"e_mean": float64(200),
-	}
-	expectedTags := map[string]string{
-		"foo": "bar",
-	}
-	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
-}
-
-// Test only aggregating sum
-func TestBasicStatsWithOnlySum(t *testing.T) {
-
-	aggregator := NewBasicStats()
-	aggregator.Stats = []string{"sum"}
-
-	aggregator.Add(m1)
-	aggregator.Add(m2)
-
-	acc := testutil.Accumulator{}
-	aggregator.Push(&acc)
-
-	expectedFields := map[string]interface{}{
-		"a_sum": float64(2),
-		"b_sum": float64(4),
-		"c_sum": float64(6),
-		"d_sum": float64(8),
-		"e_sum": float64(200),
-	}
-	expectedTags := map[string]string{
-		"foo": "bar",
-	}
-	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
-}
-
-// Verify that sum doesn't suffer from floating point errors.  Early
-// implementations of sum were calulated from mean and count, which
-// e.g. summed "1, 1, 5, 1" as "7.999999..." instead of 8.
-func TestBasicStatsWithOnlySumFloatingPointErrata(t *testing.T) {
-
-	var sum1, _ = metric.New("m1",
-		map[string]string{},
-		map[string]interface{}{
-			"a": int64(1),
-		},
-		time.Now(),
-	)
-	var sum2, _ = metric.New("m1",
-		map[string]string{},
-		map[string]interface{}{
-			"a": int64(1),
-		},
-		time.Now(),
-	)
-	var sum3, _ = metric.New("m1",
-		map[string]string{},
-		map[string]interface{}{
-			"a": int64(5),
-		},
-		time.Now(),
-	)
-	var sum4, _ = metric.New("m1",
-		map[string]string{},
-		map[string]interface{}{
-			"a": int64(1),
-		},
-		time.Now(),
-	)
-
-	aggregator := NewBasicStats()
-	aggregator.Stats = []string{"sum"}
-
-	aggregator.Add(sum1)
-	aggregator.Add(sum2)
-	aggregator.Add(sum3)
-	aggregator.Add(sum4)
-
-	acc := testutil.Accumulator{}
-	aggregator.Push(&acc)
-
-	expectedFields := map[string]interface{}{
-		"a_sum": float64(8),
-	}
-	expectedTags := map[string]string{}
-	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
-}
-
-// Test only aggregating variance
-func TestBasicStatsWithOnlyVariance(t *testing.T) {
-
-	aggregator := NewBasicStats()
-	aggregator.Stats = []string{"s2"}
-
-	aggregator.Add(m1)
-	aggregator.Add(m2)
-
-	acc := testutil.Accumulator{}
-	aggregator.Push(&acc)
-
-	expectedFields := map[string]interface{}{
-		"a_s2": float64(0),
-		"b_s2": float64(2),
-		"c_s2": float64(2),
-		"d_s2": float64(8),
-	}
-	expectedTags := map[string]string{
-		"foo": "bar",
-	}
-	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
-}
-
-// Test only aggregating standard deviation
-func TestBasicStatsWithOnlyStandardDeviation(t *testing.T) {
-
-	aggregator := NewBasicStats()
-	aggregator.Stats = []string{"stdev"}
-
-	aggregator.Add(m1)
-	aggregator.Add(m2)
-
-	acc := testutil.Accumulator{}
-	aggregator.Push(&acc)
-
-	expectedFields := map[string]interface{}{
-		"a_stdev": float64(0),
-		"b_stdev": math.Sqrt(2),
-		"c_stdev": math.Sqrt(2),
-		"d_stdev": math.Sqrt(8),
-	}
-	expectedTags := map[string]string{
-		"foo": "bar",
-	}
-	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
-}
-
-// Test only aggregating minimum and maximum
-func TestBasicStatsWithMinAndMax(t *testing.T) {
-
-	aggregator := NewBasicStats()
-	aggregator.Stats = []string{"min", "max"}
-
-	aggregator.Add(m1)
-	aggregator.Add(m2)
-
-	acc := testutil.Accumulator{}
-	aggregator.Push(&acc)
-
-	expectedFields := map[string]interface{}{
-		"a_max": float64(1), //a
-		"a_min": float64(1),
-		"b_max": float64(3), //b
-		"b_min": float64(1),
-		"c_max": float64(4), //c
-		"c_min": float64(2),
-		"d_max": float64(6), //d
-		"d_min": float64(2),
-		"e_max": float64(200), //e
-		"e_min": float64(200),
-	}
-	expectedTags := map[string]string{
-		"foo": "bar",
-	}
-	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
-}
-
-// Test aggregating with all stats
-func TestBasicStatsWithAllStats(t *testing.T) {
-	acc := testutil.Accumulator{}
-	minmax := NewBasicStats()
-	minmax.Stats = []string{"count", "min", "max", "mean", "stdev", "s2", "sum"}
-
-	minmax.Add(m1)
-	minmax.Add(m2)
-	minmax.Push(&acc)
-
-	expectedFields := map[string]interface{}{
-		"a_count": float64(2), //a
-		"a_max":   float64(1),
-		"a_min":   float64(1),
-		"a_mean":  float64(1),
-		"a_stdev": float64(0),
-		"a_s2":    float64(0),
-		"a_sum":   float64(2),
-		"b_count": float64(2), //b
-		"b_max":   float64(3),
-		"b_min":   float64(1),
-		"b_mean":  float64(2),
-		"b_s2":    float64(2),
-		"b_sum":   float64(4),
-		"b_stdev": math.Sqrt(2),
-		"c_count": float64(2), //c
-		"c_max":   float64(4),
-		"c_min":   float64(2),
-		"c_mean":  float64(3),
-		"c_s2":    float64(2),
-		"c_stdev": math.Sqrt(2),
-		"c_sum":   float64(6),
-		"d_count": float64(2), //d
-		"d_max":   float64(6),
-		"d_min":   float64(2),
-		"d_mean":  float64(4),
-		"d_s2":    float64(8),
-		"d_stdev": math.Sqrt(8),
-		"d_sum":   float64(8),
-		"e_count": float64(1), //e
-		"e_max":   float64(200),
-		"e_min":   float64(200),
-		"e_mean":  float64(200),
-		"e_sum":   float64(200),
-	}
-	expectedTags := map[string]string{
-		"foo": "bar",
-	}
-	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
-}
-
-// Test that if an empty array is passed, no points are pushed
-func TestBasicStatsWithNoStats(t *testing.T) {
-
-	aggregator := NewBasicStats()
-	aggregator.Stats = []string{}
-
-	aggregator.Add(m1)
-	aggregator.Add(m2)
-
-	acc := testutil.Accumulator{}
-	aggregator.Push(&acc)
-
-	acc.AssertDoesNotContainMeasurement(t, "m1")
-}
-
-// Test that if an unknown stat is configured, it doesn't explode
-func TestBasicStatsWithUnknownStat(t *testing.T) {
-
-	aggregator := NewBasicStats()
-	aggregator.Stats = []string{"crazy"}
-
-	aggregator.Add(m1)
-	aggregator.Add(m2)
-
-	acc := testutil.Accumulator{}
-	aggregator.Push(&acc)
-
-	acc.AssertDoesNotContainMeasurement(t, "m1")
-}
-
-// Test that if Stats isn't supplied, then we only do count, min, max, mean,
-// stdev, and s2.  We purposely exclude sum for backwards compatability,
-// otherwise user's working systems will suddenly (and surprisingly) start
-// capturing sum without their input.
-func TestBasicStatsWithDefaultStats(t *testing.T) {
-
-	aggregator := NewBasicStats()
-
-	aggregator.Add(m1)
-	aggregator.Add(m2)
-
-	acc := testutil.Accumulator{}
-	aggregator.Push(&acc)
-
-	assert.True(t, acc.HasField("m1", "a_count"))
-	assert.True(t, acc.HasField("m1", "a_min"))
-	assert.True(t, acc.HasField("m1", "a_max"))
-	assert.True(t, acc.HasField("m1", "a_mean"))
-	assert.True(t, acc.HasField("m1", "a_stdev"))
-	assert.True(t, acc.HasField("m1", "a_s2"))
-	assert.False(t, acc.HasField("m1", "a_sum"))
-}
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -29,7 +29,6 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/graylog"
 	_ "github.com/influxdata/telegraf/plugins/inputs/haproxy"
 	_ "github.com/influxdata/telegraf/plugins/inputs/hddtemp"
-	_ "github.com/influxdata/telegraf/plugins/inputs/http"
 	_ "github.com/influxdata/telegraf/plugins/inputs/http_listener"
 	_ "github.com/influxdata/telegraf/plugins/inputs/http_response"
 	_ "github.com/influxdata/telegraf/plugins/inputs/httpjson"
@@ -37,7 +36,6 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/internal"
 	_ "github.com/influxdata/telegraf/plugins/inputs/interrupts"
 	_ "github.com/influxdata/telegraf/plugins/inputs/ipmi_sensor"
-	_ "github.com/influxdata/telegraf/plugins/inputs/ipset"
 	_ "github.com/influxdata/telegraf/plugins/inputs/iptables"
 	_ "github.com/influxdata/telegraf/plugins/inputs/jolokia"
 	_ "github.com/influxdata/telegraf/plugins/inputs/jolokia2"
@@ -55,7 +53,6 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/mongodb"
 	_ "github.com/influxdata/telegraf/plugins/inputs/mqtt_consumer"
 	_ "github.com/influxdata/telegraf/plugins/inputs/mysql"
-	_ "github.com/influxdata/telegraf/plugins/inputs/nats"
 	_ "github.com/influxdata/telegraf/plugins/inputs/nats_consumer"
 	_ "github.com/influxdata/telegraf/plugins/inputs/net_response"
 	_ "github.com/influxdata/telegraf/plugins/inputs/nginx"
--- a/plugins/inputs/amqp_consumer/amqp_consumer.go
+++ b/plugins/inputs/amqp_consumer/amqp_consumer.go
@@ -145,25 +145,23 @@ func (a *AMQPConsumer) Start(acc telegraf.Accumulator) error {
 	go a.process(msgs, acc)

 	go func() {
+		err := <-a.conn.NotifyClose(make(chan *amqp.Error))
+		if err == nil {
+			return
+		}
+
+		log.Printf("I! AMQP consumer connection closed: %s; trying to reconnect", err)
 		for {
-			err := <-a.conn.NotifyClose(make(chan *amqp.Error))
-			if err == nil {
-				break
+			msgs, err := a.connect(amqpConf)
+			if err != nil {
+				log.Printf("E! AMQP connection failed: %s", err)
+				time.Sleep(10 * time.Second)
+				continue
 			}

-			log.Printf("I! AMQP consumer connection closed: %s; trying to reconnect", err)
-			for {
-				msgs, err := a.connect(amqpConf)
-				if err != nil {
-					log.Printf("E! AMQP connection failed: %s", err)
-					time.Sleep(10 * time.Second)
-					continue
-				}
-
-				a.wg.Add(1)
-				go a.process(msgs, acc)
-				break
-			}
+			a.wg.Add(1)
+			go a.process(msgs, acc)
+			break
 		}
 	}()

--- a/plugins/inputs/apache/README.md
+++ b/plugins/inputs/apache/README.md
@@ -2,7 +2,7 @@

 The Apache plugin collects server performance information using the [`mod_status`](https://httpd.apache.org/docs/2.4/mod/mod_status.html) module of the [Apache HTTP Server](https://httpd.apache.org/).

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

 ### Configuration:

--- a/plugins/inputs/bond/README.md
+++ b/plugins/inputs/bond/README.md
@@ -1,7 +1,7 @@
 # Bond Input Plugin

-The Bond input plugin collects network bond interface status for both the
-network bond interface as well as slave interfaces.
+The Bond Input plugin collects bond interface status, bond's slaves interfaces
+status and failures count of bond's slaves interfaces.
 The plugin collects these metrics from `/proc/net/bonding/*` files.

 ### Configuration:
--- a/plugins/inputs/consul/README.md
+++ b/plugins/inputs/consul/README.md
@@ -1,54 +1,43 @@
-# Consul Input Plugin
+# Telegraf Input Plugin: Consul

-This plugin will collect statistics about all health checks registered in the
-Consul. It uses [Consul API](https://www.consul.io/docs/agent/http/health.html#health_state)
-to query the data. It will not report the
-[telemetry](https://www.consul.io/docs/agent/telemetry.html) but Consul can
-report those stats already using StatsD protocol if needed.
+This plugin will collect statistics about all health checks registered in the Consul. It uses [Consul API](https://www.consul.io/docs/agent/http/health.html#health_state)
+to query the data. It will not report the [telemetry](https://www.consul.io/docs/agent/telemetry.html) but Consul can report those stats already using StatsD protocol if needed.

-### Configuration:
+## Configuration:

-```toml
+```
 # Gather health check statuses from services registered in Consul
 [[inputs.consul]]
-  ## Consul server address
-  # address = "localhost"
-
-  ## URI scheme for the Consul server, one of "http", "https"
-  # scheme = "http"
-
-  ## ACL token used in every request
+  ## Most of these values defaults to the one configured on a Consul's agent level.
+  ## Optional Consul server address (default: "")
+  # address = ""
+  ## Optional URI scheme for the Consul server (default: "")
+  # scheme = ""
+  ## Optional ACL token used in every request (default: "")
  # token = ""
-
-  ## HTTP Basic Authentication username and password.
+  ## Optional username used for request HTTP Basic Authentication (default: "")
  # username = ""
+  ## Optional password used for HTTP Basic Authentication (default: "")
  # password = ""
-
-  ## Data centre to query the health checks from
+  ## Optional data centre to query the health checks from (default: "")
  # datacentre = ""
-
-  ## SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## If false, skip chain & host verification
-  # insecure_skip_verify = true
 ```

-### Metrics:
+## Measurements:

- consul_health_checks
-  - tags:
-  	- node (node that check/service is registred on)
-  	- service_name
-  	- check_id
-  - fields:
-    - check_name
-    - service_id
-    - status
-    - passing (integer)
-    - critical (integer)
-    - warning (integer)
+### Consul:
+Tags:
+- node: on which node check/service is registered on
+- service_name: name of the service (this is the service name not the service ID)
+- check_id
+
+Fields:
+- check_name
+- service_id
+- status
+- passing
+- critical
+- warning

 `passing`, `critical`, and `warning` are integer representations of the health
 check state. A value of `1` represents that the status was the state of the
@@ -57,6 +46,8 @@ the health check at this sample.
 ## Example output

 ```
-consul_health_checks,host=wolfpit,node=consul-server-node,check_id="serfHealth" check_name="Serf Health Status",service_id="",status="passing",passing=1i,critical=0i,warning=0i 1464698464486439902
-consul_health_checks,host=wolfpit,node=consul-server-node,service_name=www.example.com,check_id="service:www-example-com.test01" check_name="Service 'www.example.com' check",service_id="www-example-com.test01",status="critical",passing=0i,critical=1i,warning=0i 1464698464486519036
+$ telegraf --config ./telegraf.conf --input-filter consul --test
+* Plugin: consul, Collection 1
+> consul_health_checks,host=wolfpit,node=consul-server-node,check_id="serfHealth" check_name="Serf Health Status",service_id="",status="passing",passing=1i,critical=0i,warning=0i 1464698464486439902
+> consul_health_checks,host=wolfpit,node=consul-server-node,service_name=www.example.com,check_id="service:www-example-com.test01" check_name="Service 'www.example.com' check",service_id="www-example-com.test01",status="critical",passing=0i,critical=1i,warning=0i 1464698464486519036
 ```
--- a/plugins/inputs/consul/consul.go
+++ b/plugins/inputs/consul/consul.go
@@ -31,28 +31,19 @@ type Consul struct {
 }

 var sampleConfig = `
-  ## Consul server address
+  ## Most of these values defaults to the one configured on a Consul's agent level.
+  ## Optional Consul server address (default: "localhost")
  # address = "localhost"
-
-  ## URI scheme for the Consul server, one of "http", "https"
+  ## Optional URI scheme for the Consul server (default: "http")
  # scheme = "http"
-
-  ## ACL token used in every request
+  ## Optional ACL token used in every request (default: "")
  # token = ""
-
-  ## HTTP Basic Authentication username and password.
+  ## Optional username used for request HTTP Basic Authentication (default: "")
  # username = ""
+  ## Optional password used for HTTP Basic Authentication (default: "")
  # password = ""
-
-  ## Data centre to query the health checks from
+  ## Optional data centre to query the health checks from (default: "")
  # datacentre = ""
-
-  ## SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## If false, skip chain & host verification
-  # insecure_skip_verify = true
 `

 func (c *Consul) Description() string {
--- a/plugins/inputs/dcos/README.md
+++ b/plugins/inputs/dcos/README.md
@@ -8,18 +8,11 @@ Depending on the work load of your DC/OS cluster, this plugin can quickly
 create a high number of series which, when unchecked, can cause high load on
 your database.

- Use the
-  [measurement filtering](https://docs.influxdata.com/telegraf/latest/administration/configuration/#measurement-filtering)
-  options to exclude unneeded tags.
- Write to a database with an appropriate
-  [retention policy](https://docs.influxdata.com/influxdb/latest/guides/downsampling_and_retention/).
- Limit series cardinality in your database using the
-  [`max-series-per-database`](https://docs.influxdata.com/influxdb/latest/administration/config/#max-series-per-database-1000000) and
-  [`max-values-per-tag`](https://docs.influxdata.com/influxdb/latest/administration/config/#max-values-per-tag-100000) settings.
- Consider using the
-  [Time Series Index](https://docs.influxdata.com/influxdb/latest/concepts/time-series-index/).
- Monitor your databases
-  [series cardinality](https://docs.influxdata.com/influxdb/latest/query_language/spec/#show-cardinality).
+- Use [measurement filtering](https://github.com/influxdata/telegraf/blob/master/docs/CONFIGURATION.md#measurement-filtering) liberally to exclude unneeded metrics as well as the node, container, and app inclue/exclude options.
+- Write to a database with an appropriate [retention policy](https://docs.influxdata.com/influxdb/v1.3/concepts/glossary/#retention-policy-rp).
+- Limit the number of series allowed in your database using the `max-series-per-database` and `max-values-per-tag` settings.
+- Consider enabling the [TSI](https://docs.influxdata.com/influxdb/v1.3/about_the_project/releasenotes-changelog/#release-notes-8) engine.
+- Monitor your [series cardinality](https://docs.influxdata.com/influxdb/v1.3/troubleshooting/frequently-asked-questions/#how-can-i-query-for-series-cardinality).

 ### Configuration:
 ```toml
@@ -113,7 +106,7 @@ the cluster.  For more information on this technique reference
 ### Metrics:

 Please consult the [Metrics Reference](https://docs.mesosphere.com/1.10/metrics/reference/)
-for details about field interpretation.
+for details on interprete field interpretation.

 - dcos_node
  - tags:
--- a/plugins/inputs/dcos/client.go
+++ b/plugins/inputs/dcos/client.go
@@ -31,7 +31,6 @@ type Client interface {
 }

 type APIError struct {
-	URL         string
 	StatusCode  int
 	Title       string
 	Description string
@@ -106,9 +105,9 @@ type claims struct {

 func (e APIError) Error() string {
 	if e.Description != "" {
-		return fmt.Sprintf("[%s] %s: %s", e.URL, e.Title, e.Description)
+		return fmt.Sprintf("%s: %s", e.Title, e.Description)
 	}
-	return fmt.Sprintf("[%s] %s", e.URL, e.Title)
+	return e.Title
 }

 func NewClusterClient(
@@ -157,8 +156,7 @@ func (c *ClusterClient) Login(ctx context.Context, sa *ServiceAccount) (*AuthTok
 		return nil, err
 	}

-	loc := c.url("/acs/api/v1/auth/login")
-	req, err := http.NewRequest("POST", loc, bytes.NewBuffer(octets))
+	req, err := http.NewRequest("POST", c.url("/acs/api/v1/auth/login"), bytes.NewBuffer(octets))
 	if err != nil {
 		return nil, err
 	}
@@ -191,7 +189,6 @@ func (c *ClusterClient) Login(ctx context.Context, sa *ServiceAccount) (*AuthTok
 	err = dec.Decode(loginError)
 	if err != nil {
 		err := &APIError{
-			URL:        loc,
 			StatusCode: resp.StatusCode,
 			Title:      resp.Status,
 		}
@@ -199,7 +196,6 @@ func (c *ClusterClient) Login(ctx context.Context, sa *ServiceAccount) (*AuthTok
 	}

 	err = &APIError{
-		URL:         loc,
 		StatusCode:  resp.StatusCode,
 		Title:       loginError.Title,
 		Description: loginError.Description,
@@ -305,7 +301,6 @@ func (c *ClusterClient) doGet(ctx context.Context, url string, v interface{}) er

 	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
 		return &APIError{
-			URL:        url,
 			StatusCode: resp.StatusCode,
 			Title:      resp.Status,
 		}
@@ -320,7 +315,7 @@ func (c *ClusterClient) doGet(ctx context.Context, url string, v interface{}) er
 }

 func (c *ClusterClient) url(path string) string {
-	url := *c.clusterURL
+	url := c.clusterURL
 	url.Path = path
 	return url.String()
 }
@@ -330,7 +325,7 @@ func (c *ClusterClient) createLoginToken(sa *ServiceAccount) (string, error) {
 		UID: sa.AccountID,
 		StandardClaims: jwt.StandardClaims{
 			// How long we have to login with this token
-			ExpiresAt: time.Now().Add(5 * time.Minute).Unix(),
+			ExpiresAt: int64(5 * time.Minute / time.Second),
 		},
 	})
 	return token.SignedString(sa.PrivateKey)
--- a/plugins/inputs/dcos/client_test.go
+++ b/plugins/inputs/dcos/client_test.go
@@ -31,9 +31,6 @@ P0a+YZUeHNRqT2pPN9lMTAZGGi3CtcF2XScbLNEBeXge
 )

 func TestLogin(t *testing.T) {
-	ts := httptest.NewServer(http.NotFoundHandler())
-	defer ts.Close()
-
 	var tests = []struct {
 		name          string
 		responseCode  int
@@ -43,21 +40,16 @@ func TestLogin(t *testing.T) {
 	}{
 		{
 			name:          "Login successful",
-			responseCode:  http.StatusOK,
+			responseCode:  200,
 			responseBody:  `{"token": "XXX.YYY.ZZZ"}`,
 			expectedError: nil,
 			expectedToken: "XXX.YYY.ZZZ",
 		},
 		{
-			name:         "Unauthorized Error",
-			responseCode: http.StatusUnauthorized,
-			responseBody: `{"title": "x", "description": "y"}`,
-			expectedError: &APIError{
-				URL:         ts.URL + "/acs/api/v1/auth/login",
-				StatusCode:  http.StatusUnauthorized,
-				Title:       "x",
-				Description: "y",
-			},
+			name:          "Unauthorized Error",
+			responseCode:  http.StatusUnauthorized,
+			responseBody:  `{"title": "x", "description": "y"}`,
+			expectedError: &APIError{http.StatusUnauthorized, "x", "y"},
 			expectedToken: "",
 		},
 	}
@@ -67,11 +59,11 @@ func TestLogin(t *testing.T) {

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			ts.Config.Handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 				w.WriteHeader(tt.responseCode)
 				fmt.Fprintln(w, tt.responseBody)
 			})
-
+			ts := httptest.NewServer(handler)
 			u, err := url.Parse(ts.URL)
 			require.NoError(t, err)

@@ -90,14 +82,13 @@ func TestLogin(t *testing.T) {
 			} else {
 				require.Nil(t, auth)
 			}
+
+			ts.Close()
 		})
 	}
 }

 func TestGetSummary(t *testing.T) {
-	ts := httptest.NewServer(http.NotFoundHandler())
-	defer ts.Close()
-
 	var tests = []struct {
 		name          string
 		responseCode  int
@@ -107,7 +98,7 @@ func TestGetSummary(t *testing.T) {
 	}{
 		{
 			name:          "No nodes",
-			responseCode:  http.StatusOK,
+			responseCode:  200,
 			responseBody:  `{"cluster": "a", "slaves": []}`,
 			expectedValue: &Summary{Cluster: "a", Slaves: []Slave{}},
 			expectedError: nil,
@@ -117,15 +108,11 @@ func TestGetSummary(t *testing.T) {
 			responseCode:  http.StatusUnauthorized,
 			responseBody:  `<html></html>`,
 			expectedValue: nil,
-			expectedError: &APIError{
-				URL:        ts.URL + "/mesos/master/state-summary",
-				StatusCode: http.StatusUnauthorized,
-				Title:      "401 Unauthorized",
-			},
+			expectedError: &APIError{StatusCode: http.StatusUnauthorized, Title: "401 Unauthorized"},
 		},
 		{
 			name:         "Has nodes",
-			responseCode: http.StatusOK,
+			responseCode: 200,
 			responseBody: `{"cluster": "a", "slaves": [{"id": "a"}, {"id": "b"}]}`,
 			expectedValue: &Summary{
 				Cluster: "a",
@@ -140,12 +127,12 @@ func TestGetSummary(t *testing.T) {

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			ts.Config.Handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 				// check the path
 				w.WriteHeader(tt.responseCode)
 				fmt.Fprintln(w, tt.responseBody)
 			})
-
+			ts := httptest.NewServer(handler)
 			u, err := url.Parse(ts.URL)
 			require.NoError(t, err)

@@ -155,15 +142,14 @@ func TestGetSummary(t *testing.T) {

 			require.Equal(t, tt.expectedError, err)
 			require.Equal(t, tt.expectedValue, summary)
+
+			ts.Close()
 		})
 	}

 }

 func TestGetNodeMetrics(t *testing.T) {
-	ts := httptest.NewServer(http.NotFoundHandler())
-	defer ts.Close()
-
 	var tests = []struct {
 		name          string
 		responseCode  int
@@ -173,7 +159,7 @@ func TestGetNodeMetrics(t *testing.T) {
 	}{
 		{
 			name:          "Empty Body",
-			responseCode:  http.StatusOK,
+			responseCode:  200,
 			responseBody:  `{}`,
 			expectedValue: &Metrics{},
 			expectedError: nil,
@@ -182,12 +168,12 @@ func TestGetNodeMetrics(t *testing.T) {

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			ts.Config.Handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 				// check the path
 				w.WriteHeader(tt.responseCode)
 				fmt.Fprintln(w, tt.responseBody)
 			})
-
+			ts := httptest.NewServer(handler)
 			u, err := url.Parse(ts.URL)
 			require.NoError(t, err)

@@ -197,15 +183,14 @@ func TestGetNodeMetrics(t *testing.T) {

 			require.Equal(t, tt.expectedError, err)
 			require.Equal(t, tt.expectedValue, m)
+
+			ts.Close()
 		})
 	}

 }

 func TestGetContainerMetrics(t *testing.T) {
-	ts := httptest.NewServer(http.NotFoundHandler())
-	defer ts.Close()
-
 	var tests = []struct {
 		name          string
 		responseCode  int
@@ -214,8 +199,8 @@ func TestGetContainerMetrics(t *testing.T) {
 		expectedError error
 	}{
 		{
-			name:          "204 No Content",
-			responseCode:  http.StatusNoContent,
+			name:          "204 No Contents",
+			responseCode:  204,
 			responseBody:  ``,
 			expectedValue: &Metrics{},
 			expectedError: nil,
@@ -224,12 +209,12 @@ func TestGetContainerMetrics(t *testing.T) {

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			ts.Config.Handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 				// check the path
 				w.WriteHeader(tt.responseCode)
 				fmt.Fprintln(w, tt.responseBody)
 			})
-
+			ts := httptest.NewServer(handler)
 			u, err := url.Parse(ts.URL)
 			require.NoError(t, err)

@@ -239,6 +224,8 @@ func TestGetContainerMetrics(t *testing.T) {

 			require.Equal(t, tt.expectedError, err)
 			require.Equal(t, tt.expectedValue, m)
+
+			ts.Close()
 		})
 	}

--- a/plugins/inputs/docker/README.md
+++ b/plugins/inputs/docker/README.md
@@ -31,11 +31,6 @@ to gather stats from the [Engine API](https://docs.docker.com/engine/api/v1.20/)
  container_name_include = []
  container_name_exclude = []

-  ## Container states to include and exclude. Globs accepted.
-  ## When empty only containers in the "running" state will be captured.
-  # container_state_include = []
-  # container_state_exclude = []
-
  ## Timeout for docker list, info, and stats commands
  timeout = "5s"

@@ -204,9 +199,6 @@ based on the availability of per-cpu stats on your system.
    - network
 - docker_container_blkio specific:
    - device
- docker_container_health specific:
-    - health_status
-    - failing_streak
 - docker_swarm specific:
    - service_id
    - service_name
@@ -265,4 +257,4 @@ io_serviced_recursive_total=6599i,io_serviced_recursive_write=107i 1453409536840
 >docker_swarm,
 service_id=xaup2o9krw36j2dy1mjx1arjw,service_mode=replicated,service_name=test,\
 tasks_desired=3,tasks_running=3 1508968160000000000
-```
+```
--- a/plugins/inputs/docker/docker.go
+++ b/plugins/inputs/docker/docker.go
@@ -15,7 +15,6 @@ import (
 	"time"

 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/swarm"
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/filter"
@@ -26,7 +25,7 @@ import (
 // Docker object
 type Docker struct {
 	Endpoint       string
-	ContainerNames []string // deprecated in 1.4; use container_name_include
+	ContainerNames []string

 	GatherServices bool `toml:"gather_services"`

@@ -40,9 +39,6 @@ type Docker struct {
 	ContainerInclude []string `toml:"container_name_include"`
 	ContainerExclude []string `toml:"container_name_exclude"`

-	ContainerStateInclude []string `toml:"container_state_include"`
-	ContainerStateExclude []string `toml:"container_state_exclude"`
-
 	SSLCA              string `toml:"ssl_ca"`
 	SSLCert            string `toml:"ssl_cert"`
 	SSLKey             string `toml:"ssl_key"`
@@ -57,7 +53,6 @@ type Docker struct {
 	filtersCreated  bool
 	labelFilter     filter.Filter
 	containerFilter filter.Filter
-	stateFilter     filter.Filter
 }

 // KB, MB, GB, TB, PB...human friendly
@@ -72,8 +67,7 @@ const (
 )

 var (
-	sizeRegex       = regexp.MustCompile(`^(\d+(\.\d+)*) ?([kKmMgGtTpP])?[bB]?$`)
-	containerStates = []string{"created", "restarting", "running", "removing", "paused", "exited", "dead"}
+	sizeRegex = regexp.MustCompile(`^(\d+(\.\d+)*) ?([kKmMgGtTpP])?[bB]?$`)
 )

 var sampleConfig = `
@@ -93,11 +87,6 @@ var sampleConfig = `
  container_name_include = []
  container_name_exclude = []

-  ## Container states to include and exclude. Globs accepted.
-  ## When empty only containers in the "running" state will be captured.
-  # container_state_include = []
-  # container_state_exclude = []
-
  ## Timeout for docker list, info, and stats commands
  timeout = "5s"

@@ -159,10 +148,6 @@ func (d *Docker) Gather(acc telegraf.Accumulator) error {
 		if err != nil {
 			return err
 		}
-		err = d.createContainerStateFilters()
-		if err != nil {
-			return err
-		}
 		d.filtersCreated = true
 	}

@@ -179,22 +164,8 @@ func (d *Docker) Gather(acc telegraf.Accumulator) error {
 		}
 	}

-	filterArgs := filters.NewArgs()
-	for _, state := range containerStates {
-		if d.stateFilter.Match(state) {
-			filterArgs.Add("status", state)
-		}
-	}
-
-	// All container states were excluded
-	if filterArgs.Len() == 0 {
-		return nil
-	}
-
 	// List containers
-	opts := types.ContainerListOptions{
-		Filters: filterArgs,
-	}
+	opts := types.ContainerListOptions{}
 	ctx, cancel := context.WithTimeout(context.Background(), d.Timeout.Duration)
 	defer cancel()
 	containers, err := d.client.ContainerList(ctx, opts)
@@ -420,13 +391,12 @@ func (d *Docker) gatherContainer(
 		}
 	}

-	info, err := d.client.ContainerInspect(ctx, container.ID)
-	if err != nil {
-		return fmt.Errorf("Error inspecting docker container: %s", err.Error())
-	}
-
 	// Add whitelisted environment variables to tags
 	if len(d.TagEnvironment) > 0 {
+		info, err := d.client.ContainerInspect(ctx, container.ID)
+		if err != nil {
+			return fmt.Errorf("Error inspecting docker container: %s", err.Error())
+		}
 		for _, envvar := range info.Config.Env {
 			for _, configvar := range d.TagEnvironment {
 				dock_env := strings.SplitN(envvar, "=", 2)
@@ -438,14 +408,6 @@ func (d *Docker) gatherContainer(
 		}
 	}

-	if info.State.Health != nil {
-		healthfields := map[string]interface{}{
-			"health_status":  info.State.Health.Status,
-			"failing_streak": info.ContainerJSONBase.State.Health.FailingStreak,
-		}
-		acc.AddFields("docker_container_health", healthfields, tags, time.Now())
-	}
-
 	gatherContainerStats(v, acc, tags, container.ID, d.PerDevice, d.Total, daemonOSType)

 	return nil
@@ -797,18 +759,6 @@ func (d *Docker) createLabelFilters() error {
 	return nil
 }

-func (d *Docker) createContainerStateFilters() error {
-	if len(d.ContainerStateInclude) == 0 && len(d.ContainerStateExclude) == 0 {
-		d.ContainerStateInclude = []string{"running"}
-	}
-	filter, err := filter.NewIncludeExcludeFilter(d.ContainerStateInclude, d.ContainerStateExclude)
-	if err != nil {
-		return err
-	}
-	d.stateFilter = filter
-	return nil
-}
-
 func init() {
 	inputs.Add("docker", func() telegraf.Input {
 		return &Docker{
--- a/plugins/inputs/docker/docker_test.go
+++ b/plugins/inputs/docker/docker_test.go
@@ -3,7 +3,6 @@ package docker
 import (
 	"context"
 	"crypto/tls"
-	"sort"
 	"testing"

 	"github.com/influxdata/telegraf/testutil"
@@ -712,85 +711,3 @@ func TestDockerGatherSwarmInfo(t *testing.T) {
 		},
 	)
 }
-
-func TestContainerStateFilter(t *testing.T) {
-	var tests = []struct {
-		name     string
-		include  []string
-		exclude  []string
-		expected map[string][]string
-	}{
-		{
-			name: "default",
-			expected: map[string][]string{
-				"status": []string{"running"},
-			},
-		},
-		{
-			name:    "include running",
-			include: []string{"running"},
-			expected: map[string][]string{
-				"status": []string{"running"},
-			},
-		},
-		{
-			name:    "include glob",
-			include: []string{"r*"},
-			expected: map[string][]string{
-				"status": []string{"restarting", "running", "removing"},
-			},
-		},
-		{
-			name:    "include all",
-			include: []string{"*"},
-			expected: map[string][]string{
-				"status": []string{"created", "restarting", "running", "removing", "paused", "exited", "dead"},
-			},
-		},
-		{
-			name:    "exclude all",
-			exclude: []string{"*"},
-			expected: map[string][]string{
-				"status": []string{},
-			},
-		},
-		{
-			name:    "exclude all",
-			include: []string{"*"},
-			exclude: []string{"exited"},
-			expected: map[string][]string{
-				"status": []string{"created", "restarting", "running", "removing", "paused", "dead"},
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var acc testutil.Accumulator
-
-			newClientFunc := func(host string, tlsConfig *tls.Config) (Client, error) {
-				client := baseClient
-				client.ContainerListF = func(ctx context.Context, options types.ContainerListOptions) ([]types.Container, error) {
-					for k, v := range tt.expected {
-						actual := options.Filters.Get(k)
-						sort.Strings(actual)
-						sort.Strings(v)
-						require.Equal(t, v, actual)
-					}
-
-					return nil, nil
-				}
-				return &client, nil
-			}
-
-			d := Docker{
-				newClient:             newClientFunc,
-				ContainerStateInclude: tt.include,
-				ContainerStateExclude: tt.exclude,
-			}
-
-			err := d.Gather(&acc)
-			require.NoError(t, err)
-		})
-	}
-}
--- a/plugins/inputs/docker/docker_testdata.go
+++ b/plugins/inputs/docker/docker_testdata.go
@@ -477,12 +477,4 @@ var containerInspect = types.ContainerJSON{
 			"PATH=/bin:/sbin",
 		},
 	},
-	ContainerJSONBase: &types.ContainerJSONBase{
-		State: &types.ContainerState{
-			Health: &types.Health{
-				FailingStreak: 1,
-				Status:        "Unhealthy",
-			},
-		},
-	},
 }
--- a/plugins/inputs/elasticsearch/README.md
+++ b/plugins/inputs/elasticsearch/README.md
@@ -35,7 +35,7 @@ or [cluster-stats](https://www.elastic.co/guide/en/elasticsearch/reference/curre

  ## node_stats is a list of sub-stats that you want to have gathered. Valid options
  ## are "indices", "os", "process", "jvm", "thread_pool", "fs", "transport", "http",
-  ## "breaker". Per default, all stats are gathered.
+  ## "breakers". Per default, all stats are gathered.
  # node_stats = ["jvm", "http"]

  ## Optional SSL Config
@@ -46,17 +46,6 @@ or [cluster-stats](https://www.elastic.co/guide/en/elasticsearch/reference/curre
  # insecure_skip_verify = false
 ```

-### Status mappings
-
-When reporting health (green/yellow/red), additional field `status_code`
-is reported. Field contains mapping from status:string to status_code:int
-with following rules:
-
-* `green` - 1
-* `yellow` - 2
-* `red` - 3
-* `unknown` - 0
-
 ### Measurements & Fields:

 field data circuit breaker measurement names:
--- a/plugins/inputs/elasticsearch/elasticsearch.go
+++ b/plugins/inputs/elasticsearch/elasticsearch.go
@@ -105,7 +105,7 @@ const sampleConfig = `

  ## node_stats is a list of sub-stats that you want to have gathered. Valid options
  ## are "indices", "os", "process", "jvm", "thread_pool", "fs", "transport", "http",
-  ## "breaker". Per default, all stats are gathered.
+  ## "breakers". Per default, all stats are gathered.
  # node_stats = ["jvm", "http"]

  ## Optional SSL Config
@@ -143,19 +143,6 @@ func NewElasticsearch() *Elasticsearch {
 	}
 }

-// perform status mapping
-func mapHealthStatusToCode(s string) int {
-	switch strings.ToLower(s) {
-	case "green":
-		return 1
-	case "yellow":
-		return 2
-	case "red":
-		return 3
-	}
-	return 0
-}
-
 // SampleConfig returns sample configuration for this plugin.
 func (e *Elasticsearch) SampleConfig() string {
 	return sampleConfig
@@ -324,7 +311,6 @@ func (e *Elasticsearch) gatherClusterHealth(url string, acc telegraf.Accumulator
 	measurementTime := time.Now()
 	clusterFields := map[string]interface{}{
 		"status":                healthStats.Status,
-		"status_code":           mapHealthStatusToCode(healthStats.Status),
 		"timed_out":             healthStats.TimedOut,
 		"number_of_nodes":       healthStats.NumberOfNodes,
 		"number_of_data_nodes":  healthStats.NumberOfDataNodes,
@@ -344,7 +330,6 @@ func (e *Elasticsearch) gatherClusterHealth(url string, acc telegraf.Accumulator
 	for name, health := range healthStats.Indices {
 		indexFields := map[string]interface{}{
 			"status":                health.Status,
-			"status_code":           mapHealthStatusToCode(health.Status),
 			"number_of_shards":      health.NumberOfShards,
 			"number_of_replicas":    health.NumberOfReplicas,
 			"active_primary_shards": health.ActivePrimaryShards,
--- a/plugins/inputs/elasticsearch/testdata_test.go
+++ b/plugins/inputs/elasticsearch/testdata_test.go
@@ -54,7 +54,6 @@ const clusterHealthResponseWithIndices = `

 var clusterHealthExpected = map[string]interface{}{
 	"status":                "green",
-	"status_code":           1,
 	"timed_out":             false,
 	"number_of_nodes":       3,
 	"number_of_data_nodes":  3,
@@ -67,7 +66,6 @@ var clusterHealthExpected = map[string]interface{}{

 var v1IndexExpected = map[string]interface{}{
 	"status":                "green",
-	"status_code":           1,
 	"number_of_shards":      10,
 	"number_of_replicas":    1,
 	"active_primary_shards": 10,
@@ -79,7 +77,6 @@ var v1IndexExpected = map[string]interface{}{

 var v2IndexExpected = map[string]interface{}{
 	"status":                "red",
-	"status_code":           3,
 	"number_of_shards":      10,
 	"number_of_replicas":    1,
 	"active_primary_shards": 0,
--- a/plugins/inputs/exec/README.md
+++ b/plugins/inputs/exec/README.md
@@ -1,57 +1,175 @@
 # Exec Input Plugin

-The `exec` plugin executes the `commands` on every interval and parses metrics from
-their output in any one of the accepted [Input Data Formats](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md).
+Please also see: [Telegraf Input Data Formats](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md)

-This plugin can be used to poll for custom metrics from any source.
+### Example 1 - JSON

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

 ```toml
+# Read flattened metrics from one or more commands that output JSON to stdout
 [[inputs.exec]]
-  ## Commands array
-  commands = [
-    "/tmp/test.sh",
-    "/usr/bin/mycollector --foo=bar",
-    "/tmp/collect_*.sh"
-  ]
+  # Shell/commands array
+  # Full command line to executable with parameters, or a glob pattern to run all matching files.
+  commands = ["/tmp/test.sh", "/tmp/test2.sh", "/tmp/collect_*.sh"]

  ## Timeout for each command to complete.
  timeout = "5s"

-  ## measurement name suffix (for separating different commands)
+  # Data format to consume.
+  # NOTE json only reads numerical measurements, strings and booleans are ignored.
+  data_format = "json"
+
+  # measurement name suffix (for separating different commands)
  name_suffix = "_mycollector"
-
-  ## Data format to consume.
-  ## Each data format has its own unique set of configuration options, read
-  ## more about them here:
-  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
-  data_format = "influx"
 ```

-Glob patterns in the `command` option are matched on every run, so adding new
-scripts that match the pattern will cause them to be picked up immediately.
+Other options for modifying the measurement names are:

-### Example:
-
-This script produces static values, since no timestamp is specified the values are at the current time.
-```sh
-#!/bin/sh
-echo 'example,tag1=a,tag2=b i=42i,j=43i,k=44i'
+```
+name_prefix = "prefix_"
 ```

-It can be paired with the following configuration and will be ran at the `interval` of the agent.
+Let's say that we have the above configuration, and mycollector outputs the
+following JSON:
+
+```json
+{
+    "a": 0.5,
+    "b": {
+        "c": 0.1,
+        "d": 5
+    }
+}
+```
+
+The collected metrics will be stored as fields under the measurement
+"exec_mycollector":
+
+```
+exec_mycollector a=0.5,b_c=0.1,b_d=5 1452815002357578567
+```
+If using JSON, only numeric values are parsed and turned into floats. Booleans
+and strings will be ignored.
+
+### Example 2 - Influx Line-Protocol
+
+In this example an application called ```/usr/bin/line_protocol_collector```
+and a script called ```/tmp/test2.sh``` are configured for ```[[inputs.exec]]```
+in influx line-protocol format.
+
+#### Configuration
+
 ```toml
 [[inputs.exec]]
-  commands = ["sh /tmp/test.sh"]
+  # Shell/commands array
+  # compatible with old version
+  # we can still use the old command configuration
+  # command = "/usr/bin/line_protocol_collector"
+  commands = ["/usr/bin/line_protocol_collector","/tmp/test2.sh"]
+
+  ## Timeout for each command to complete.
  timeout = "5s"
+
+  # Data format to consume.
+  # NOTE json only reads numerical measurements, strings and booleans are ignored.
  data_format = "influx"
 ```

-### Common Issues:
+The line_protocol_collector application outputs the following line protocol:

-#### Q: My script works when I run it by hand, but not when Telegraf is running as a service.
+```
+cpu,cpu=cpu0,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
+cpu,cpu=cpu1,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
+cpu,cpu=cpu2,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
+cpu,cpu=cpu3,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
+cpu,cpu=cpu4,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
+cpu,cpu=cpu5,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
+cpu,cpu=cpu6,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
+```

-This may be related to the Telegraf service running as a different user.  The
-official packages run Telegraf as the `telegraf` user and group on Linux
-systems.
+You will get data in InfluxDB exactly as it is defined above,
+tags are cpu=cpuN, host=foo, and datacenter=us-east with fields usage_idle
+and usage_busy. They will receive a timestamp at collection time.
+Each line must end in \n, just as the Influx line protocol does.
+
+
+### Example 3 - Graphite
+
+We can also change the data_format to "graphite" to use the metrics collecting scripts such as (compatible with graphite):
+
+* Nagios [Metrics Plugins](https://exchange.nagios.org/directory/Plugins)
+* Sensu [Metrics Plugins](https://github.com/sensu-plugins)
+
+In this example a script called /tmp/test.sh and a script called /tmp/test2.sh are configured for [[inputs.exec]] in graphite format.
+
+#### Configuration
+
+```toml
+# Read flattened metrics from one or more commands that output JSON to stdout
+[[inputs.exec]]
+  # Shell/commands array
+  commands = ["/tmp/test.sh","/tmp/test2.sh"]
+
+  ## Timeout for each command to complete.
+  timeout = "5s"
+
+  # Data format to consume.
+  # NOTE json only reads numerical measurements, strings and booleans are ignored.
+  data_format = "graphite"
+
+  # measurement name suffix (for separating different commands)
+  name_suffix = "_mycollector"
+
+  ## Below configuration will be used for data_format = "graphite", can be ignored for other data_format
+  ## If matching multiple measurement files, this string will be used to join the matched values.
+  separator = "."
+
+  ## Each template line requires a template pattern.  It can have an optional
+  ## filter before the template and separated by spaces.  It can also have optional extra
+  ## tags following the template.  Multiple tags should be separated by commas and no spaces
+  ## similar to the line protocol format.  The can be only one default template.
+  ## Templates support below format:
+  ## 1. filter + template
+  ## 2. filter + template + extra tag
+  ## 3. filter + template with field key
+  ## 4. default template
+  templates = [
+    "*.app env.service.resource.measurement",
+    "stats.* .host.measurement* region=us-west,agent=sensu",
+    "stats2.* .host.measurement.field",
+    "measurement*"
+  ]
+```
+Graphite messages are in this format:
+
+```
+metric_path value timestamp\n
+```
+
+__metric_path__ is the metric namespace that you want to populate.
+
+__value__ is the value that you want to assign to the metric at this time.
+
+__timestamp__ is the unix epoch time.
+
+And test.sh/test2.sh will output:
+
+```
+sensu.metric.net.server0.eth0.rx_packets 461295119435 1444234982
+sensu.metric.net.server0.eth0.tx_bytes 1093086493388480 1444234982
+sensu.metric.net.server0.eth0.rx_bytes 1015633926034834 1444234982
+sensu.metric.net.server0.eth0.tx_errors 0 1444234982
+sensu.metric.net.server0.eth0.rx_errors 0 1444234982
+sensu.metric.net.server0.eth0.tx_dropped 0 1444234982
+sensu.metric.net.server0.eth0.rx_dropped 0 1444234982
+```
+
+The templates configuration will be used to parse the graphite metrics to support influxdb/opentsdb tagging store engines.
+
+More detail information about templates, please refer to [The graphite Input](https://github.com/influxdata/influxdb/blob/master/services/graphite/README.md)
--- a/plugins/inputs/exec/exec.go
+++ b/plugins/inputs/exec/exec.go
@@ -41,8 +41,6 @@ const sampleConfig = `
  data_format = "influx"
 `

-const MaxStderrBytes = 512
-
 type Exec struct {
 	Commands []string
 	Command  string
@@ -98,41 +96,15 @@ func (c CommandRunner) Run(

 	cmd := exec.Command(split_cmd[0], split_cmd[1:]...)

-	var (
-		out    bytes.Buffer
-		stderr bytes.Buffer
-	)
+	var out bytes.Buffer
 	cmd.Stdout = &out
-	cmd.Stderr = &stderr

 	if err := internal.RunTimeout(cmd, e.Timeout.Duration); err != nil {
 		switch e.parser.(type) {
 		case *nagios.NagiosParser:
 			AddNagiosState(err, acc)
 		default:
-			var errMessage = ""
-			if stderr.Len() > 0 {
-				stderr = removeCarriageReturns(stderr)
-				// Limit the number of bytes.
-				didTruncate := false
-				if stderr.Len() > MaxStderrBytes {
-					stderr.Truncate(MaxStderrBytes)
-					didTruncate = true
-				}
-				if i := bytes.IndexByte(stderr.Bytes(), '\n'); i > 0 {
-					// Only show truncation if the newline wasn't the last character.
-					if i < stderr.Len()-1 {
-						didTruncate = true
-					}
-					stderr.Truncate(i)
-				}
-				if didTruncate {
-					stderr.WriteString("...")
-				}
-
-				errMessage = fmt.Sprintf(": %s", stderr.String())
-			}
-			return nil, fmt.Errorf("exec: %s for command '%s'%s", err, command, errMessage)
+			return nil, fmt.Errorf("exec: %s for command '%s'", err, command)
 		}
 	} else {
 		switch e.parser.(type) {
--- a/plugins/inputs/exec/exec_test.go
+++ b/plugins/inputs/exec/exec_test.go
@@ -144,6 +144,83 @@ func TestCommandError(t *testing.T) {
 	assert.Equal(t, acc.NFields(), 0, "No new points should have been added")
 }

+func TestLineProtocolParse(t *testing.T) {
+	parser, _ := parsers.NewInfluxParser()
+	e := &Exec{
+		runner:   newRunnerMock([]byte(lineProtocol), nil),
+		Commands: []string{"line-protocol"},
+		parser:   parser,
+	}
+
+	var acc testutil.Accumulator
+	require.NoError(t, acc.GatherError(e.Gather))
+
+	fields := map[string]interface{}{
+		"usage_idle": float64(99),
+		"usage_busy": float64(1),
+	}
+	tags := map[string]string{
+		"host":       "foo",
+		"datacenter": "us-east",
+	}
+	acc.AssertContainsTaggedFields(t, "cpu", fields, tags)
+}
+
+func TestLineProtocolEmptyParse(t *testing.T) {
+	parser, _ := parsers.NewInfluxParser()
+	e := &Exec{
+		runner:   newRunnerMock([]byte(lineProtocolEmpty), nil),
+		Commands: []string{"line-protocol"},
+		parser:   parser,
+	}
+
+	var acc testutil.Accumulator
+	err := e.Gather(&acc)
+	require.NoError(t, err)
+}
+
+func TestLineProtocolShortParse(t *testing.T) {
+	parser, _ := parsers.NewInfluxParser()
+	e := &Exec{
+		runner:   newRunnerMock([]byte(lineProtocolShort), nil),
+		Commands: []string{"line-protocol"},
+		parser:   parser,
+	}
+
+	var acc testutil.Accumulator
+	err := acc.GatherError(e.Gather)
+	require.Error(t, err)
+	assert.Contains(t, err.Error(), "buffer too short", "A buffer too short error was expected")
+}
+
+func TestLineProtocolParseMultiple(t *testing.T) {
+	parser, _ := parsers.NewInfluxParser()
+	e := &Exec{
+		runner:   newRunnerMock([]byte(lineProtocolMulti), nil),
+		Commands: []string{"line-protocol"},
+		parser:   parser,
+	}
+
+	var acc testutil.Accumulator
+	err := acc.GatherError(e.Gather)
+	require.NoError(t, err)
+
+	fields := map[string]interface{}{
+		"usage_idle": float64(99),
+		"usage_busy": float64(1),
+	}
+	tags := map[string]string{
+		"host":       "foo",
+		"datacenter": "us-east",
+	}
+	cpuTags := []string{"cpu0", "cpu1", "cpu2", "cpu3", "cpu4", "cpu5", "cpu6"}
+
+	for _, cpu := range cpuTags {
+		tags["cpu"] = cpu
+		acc.AssertContainsTaggedFields(t, "cpu", fields, tags)
+	}
+}
+
 func TestExecCommandWithGlob(t *testing.T) {
 	parser, _ := parsers.NewValueParser("metric", "string", nil)
 	e := NewExec()
--- a/plugins/inputs/haproxy/README.md
+++ b/plugins/inputs/haproxy/README.md
@@ -1,14 +1,11 @@
-# HAProxy Input Plugin
+# HAproxy Input Plugin

-The [HAProxy](http://www.haproxy.org/) input plugin gathers
-[statistics](https://cbonte.github.io/haproxy-dconv/1.9/intro.html#3.3.16)
-using the [stats socket](https://cbonte.github.io/haproxy-dconv/1.9/management.html#9.3)
-or [HTTP statistics page](https://cbonte.github.io/haproxy-dconv/1.9/management.html#9) of a HAProxy server.
+[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
-# Read metrics of HAProxy, via socket or HTTP stats page
+# SampleConfig
 [[inputs.haproxy]]
  ## An array of address to gather stats about. Specify an ip on hostname
  ## with optional port. ie localhost, 10.10.3.33:1936, etc.
@@ -26,7 +23,7 @@ or [HTTP statistics page](https://cbonte.github.io/haproxy-dconv/1.9/management.
  ## By default, some of the fields are renamed from what haproxy calls them.
  ## Setting this option to true results in the plugin keeping the original
  ## field names.
-  # keep_field_names = false
+  # keep_field_names = true

  ## Optional SSL Config
  # ssl_ca = "/etc/telegraf/ca.pem"
@@ -36,77 +33,34 @@ or [HTTP statistics page](https://cbonte.github.io/haproxy-dconv/1.9/management.
  # insecure_skip_verify = false
 ```

-#### HAProxy Configuration
+#### `servers`
+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.

-The following information may be useful when getting started, but please
-consult the HAProxy documentation for complete and up to date instructions.
+For basic authentication you need to add username and password in the URL: `http://user:password@1.2.3.4/haproxy?stats`.

-The [`stats enable`](https://cbonte.github.io/haproxy-dconv/1.8/configuration.html#4-stats%20enable)
-option can be used to add unauthenticated access over HTTP using the default
-settings.  To enable the unix socket begin by reading about the
-[`stats socket`](https://cbonte.github.io/haproxy-dconv/1.8/configuration.html#3.1-stats%20socket)
-option.
-
-
-#### servers
-
-Server addresses must explicitly start with 'http' if you wish to use HAProxy
-status page.  Otherwise, addresses will be assumed to be an UNIX socket and
-any protocol (if present) will be discarded.
-
-When using socket names, wildcard expansion is supported so plugin can gather
-stats from multiple sockets at once.
-
-To use HTTP Basic Auth add the username and password in the userinfo section
-of the URL: `http://user:password@1.2.3.4/haproxy?stats`.  The credentials are
-sent via the `Authorization` header and not using the request URL.
-
-
-#### keep_field_names
-
-By default, some of the fields are renamed from what haproxy calls them.
-Setting the `keep_field_names` parameter to `true` will result in the plugin
-keeping the original field names.
-
-The following renames are made:
- `pxname` -> `proxy`
- `svname` -> `sv`
- `act` -> `active_servers`
- `bck` -> `backup_servers`
- `cli_abrt` -> `cli_abort`
- `srv_abrt` -> `srv_abort`
- `hrsp_1xx` -> `http_response.1xx`
- `hrsp_2xx` -> `http_response.2xx`
- `hrsp_3xx` -> `http_response.3xx`
- `hrsp_4xx` -> `http_response.4xx`
- `hrsp_5xx` -> `http_response.5xx`
- `hrsp_other` -> `http_response.other`
-
-### Metrics:
-
-For more details about collected metrics reference the [HAProxy CSV format
-documentation](https://cbonte.github.io/haproxy-dconv/1.8/management.html#9.1).
-
- haproxy
-  - tags:
-    - `server` - address of the server data was gathered from
-    - `proxy` - proxy name
-    - `sv` - service name
-    - `type` - proxy session type
-  - fields:
-    - `status` (string)
-    - `check_status` (string)
-    - `last_chk` (string)
-    - `mode` (string)
-    - `tracked` (string)
-    - `agent_status` (string)
-    - `last_agt` (string)
-    - `addr` (string)
-    - `cookie` (string)
-    - `lastsess` (int)
-    - **all other stats** (int)
-
-### Example Output:
+Following examples will all resolve to the same socket:
 ```
-haproxy,server=/run/haproxy/admin.sock,proxy=public,sv=FRONTEND,type=frontend http_response.other=0i,req_rate_max=1i,comp_byp=0i,status="OPEN",rate_lim=0i,dses=0i,req_rate=0i,comp_rsp=0i,bout=9287i,comp_in=0i,mode="http",smax=1i,slim=2000i,http_response.1xx=0i,conn_rate=0i,dreq=0i,ereq=0i,iid=2i,rate_max=1i,http_response.2xx=1i,comp_out=0i,intercepted=1i,stot=2i,pid=1i,http_response.5xx=1i,http_response.3xx=0i,http_response.4xx=0i,conn_rate_max=1i,conn_tot=2i,dcon=0i,bin=294i,rate=0i,sid=0i,req_tot=2i,scur=0i,dresp=0i 1513293519000000000
+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.
+
+#### `keep_field_names`
+By default, some of the fields are renamed from what haproxy calls them. Setting the `keep_field_names` parameter to `true` will result in the plugin keeping the original field names.
+
+### Measurements & Fields:
+
+Plugin will gather measurements outlined in [HAproxy CSV format documentation](https://cbonte.github.io/haproxy-dconv/1.7/management.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
@@ -54,7 +54,7 @@ var sampleConfig = `
  ## By default, some of the fields are renamed from what haproxy calls them.
  ## Setting this option to true results in the plugin keeping the original
  ## field names.
-  # keep_field_names = false
+  # keep_field_names = true

  ## Optional SSL Config
  # ssl_ca = "/etc/telegraf/ca.pem"
--- a/plugins/inputs/http/README.md
+++ b/plugins/inputs/http/README.md
@@ -1,52 +0,0 @@
-# HTTP Input Plugin
-
-The HTTP input plugin collects metrics from one or more HTTP(S) endpoints.  The endpoint should have metrics formatted in one of the supported [input data formats](../../../docs/DATA_FORMATS_INPUT.md).  Each data format has its own unique set of configuration options which can be added to the input configuration.
-
-
-### Configuration:
-
-```toml
-# Read formatted metrics from one or more HTTP endpoints
-[[inputs.http]]
-  ## One or more URLs from which to read formatted metrics
-  urls = [
-    "http://localhost/metrics"
-  ]
-
-  ## HTTP method
-  # method = "GET"
-
-  ## Optional HTTP headers
-  # headers = {"X-Special-Header" = "Special-Value"}
-
-  ## Optional HTTP Basic Auth Credentials
-  # username = "username"
-  # password = "pa$$word"
-
-  ## 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
-
-  ## Amount of time allowed to complete the HTTP request
-  # timeout = "5s"
-
-  ## Data format to consume.
-  ## Each data format has its own unique set of configuration options, read
-  ## more about them here:
-  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
-  # data_format = "influx"
-
-```
-
-### Metrics:
-
-The metrics collected by this input plugin will depend on the configured `data_format` and the payload returned by the HTTP endpoint(s).
-
-The default values below are added if the input format does not specify a value:
-
- http
-  - tags:
-    - url
--- a/plugins/inputs/http/http.go
+++ b/plugins/inputs/http/http.go
@@ -1,204 +0,0 @@
-package http
-
-import (
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal"
-	"github.com/influxdata/telegraf/plugins/inputs"
-	"github.com/influxdata/telegraf/plugins/parsers"
-)
-
-type HTTP struct {
-	URLs   []string `toml:"urls"`
-	Method string
-
-	Headers map[string]string
-
-	// HTTP Basic Auth Credentials
-	Username string
-	Password string
-
-	// Path to CA file
-	SSLCA string `toml:"ssl_ca"`
-	// Path to host cert file
-	SSLCert string `toml:"ssl_cert"`
-	// Path to cert key file
-	SSLKey string `toml:"ssl_key"`
-	// Use SSL but skip chain & host verification
-	InsecureSkipVerify bool
-
-	Timeout internal.Duration
-
-	client *http.Client
-
-	// The parser will automatically be set by Telegraf core code because
-	// this plugin implements the ParserInput interface (i.e. the SetParser method)
-	parser parsers.Parser
-}
-
-var sampleConfig = `
-  ## One or more URLs from which to read formatted metrics
-  urls = [
-    "http://localhost/metrics"
-  ]
-
-  ## HTTP method
-  # method = "GET"
-
-  ## Optional HTTP headers
-  # headers = {"X-Special-Header" = "Special-Value"}
-
-  ## Optional HTTP Basic Auth Credentials
-  # username = "username"
-  # password = "pa$$word"
-
-  ## Tag all metrics with the url
-  # tag_url = true
-
-  ## 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
-
-  ## Amount of time allowed to complete the HTTP request
-  # timeout = "5s"
-
-  ## Data format to consume.
-  ## Each data format has its own unique set of configuration options, read
-  ## more about them here:
-  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
-  # data_format = "influx"
-`
-
-// SampleConfig returns the default configuration of the Input
-func (*HTTP) SampleConfig() string {
-	return sampleConfig
-}
-
-// Description returns a one-sentence description on the Input
-func (*HTTP) Description() string {
-	return "Read formatted metrics from one or more HTTP endpoints"
-}
-
-// Gather takes in an accumulator and adds the metrics that the Input
-// gathers. This is called every "interval"
-func (h *HTTP) Gather(acc telegraf.Accumulator) error {
-	if h.parser == nil {
-		return errors.New("Parser is not set")
-	}
-
-	if h.client == nil {
-		tlsCfg, err := internal.GetTLSConfig(
-			h.SSLCert, h.SSLKey, h.SSLCA, h.InsecureSkipVerify)
-		if err != nil {
-			return err
-		}
-		h.client = &http.Client{
-			Transport: &http.Transport{
-				TLSClientConfig: tlsCfg,
-				Proxy:           http.ProxyFromEnvironment,
-			},
-			Timeout: h.Timeout.Duration,
-		}
-	}
-
-	var wg sync.WaitGroup
-	for _, u := range h.URLs {
-		wg.Add(1)
-		go func(url string) {
-			defer wg.Done()
-			if err := h.gatherURL(acc, url); err != nil {
-				acc.AddError(fmt.Errorf("[url=%s]: %s", url, err))
-			}
-		}(u)
-	}
-
-	wg.Wait()
-
-	return nil
-}
-
-// SetParser takes the data_format from the config and finds the right parser for that format
-func (h *HTTP) SetParser(parser parsers.Parser) {
-	h.parser = parser
-}
-
-// Gathers data from a particular URL
-// Parameters:
-//     acc    : The telegraf Accumulator to use
-//     url    : endpoint to send request to
-//
-// Returns:
-//     error: Any error that may have occurred
-func (h *HTTP) gatherURL(
-	acc telegraf.Accumulator,
-	url string,
-) error {
-	request, err := http.NewRequest(h.Method, url, nil)
-	if err != nil {
-		return err
-	}
-
-	for k, v := range h.Headers {
-		if strings.ToLower(k) == "host" {
-			request.Host = v
-		} else {
-			request.Header.Add(k, v)
-		}
-	}
-
-	if h.Username != "" || h.Password != "" {
-		request.SetBasicAuth(h.Username, h.Password)
-	}
-
-	resp, err := h.client.Do(request)
-	if err != nil {
-		return err
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != http.StatusOK {
-		return fmt.Errorf("Received status code %d (%s), expected %d (%s)",
-			resp.StatusCode,
-			http.StatusText(resp.StatusCode),
-			http.StatusOK,
-			http.StatusText(http.StatusOK))
-	}
-
-	b, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return err
-	}
-
-	metrics, err := h.parser.Parse(b)
-	if err != nil {
-		return err
-	}
-
-	for _, metric := range metrics {
-		if !metric.HasTag("url") {
-			metric.AddTag("url", url)
-		}
-		acc.AddFields(metric.Name(), metric.Fields(), metric.Tags(), metric.Time())
-	}
-
-	return nil
-}
-
-func init() {
-	inputs.Add("http", func() telegraf.Input {
-		return &HTTP{
-			Timeout: internal.Duration{Duration: time.Second * 5},
-			Method:  "GET",
-		}
-	})
-}
--- a/plugins/inputs/http/http_test.go
+++ b/plugins/inputs/http/http_test.go
@@ -1,139 +0,0 @@
-package http_test
-
-import (
-	"net/http"
-	"net/http/httptest"
-	"testing"
-
-	plugin "github.com/influxdata/telegraf/plugins/inputs/http"
-	"github.com/influxdata/telegraf/plugins/parsers"
-	"github.com/influxdata/telegraf/testutil"
-	"github.com/stretchr/testify/require"
-)
-
-func TestHTTPwithJSONFormat(t *testing.T) {
-	fakeServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.URL.Path == "/endpoint" {
-			_, _ = w.Write([]byte(simpleJSON))
-		} else {
-			w.WriteHeader(http.StatusNotFound)
-		}
-	}))
-	defer fakeServer.Close()
-
-	url := fakeServer.URL + "/endpoint"
-	plugin := &plugin.HTTP{
-		URLs: []string{url},
-	}
-	metricName := "metricName"
-	p, _ := parsers.NewJSONParser(metricName, nil, nil)
-	plugin.SetParser(p)
-
-	var acc testutil.Accumulator
-	require.NoError(t, acc.GatherError(plugin.Gather))
-
-	require.Len(t, acc.Metrics, 1)
-
-	// basic check to see if we got the right field, value and tag
-	var metric = acc.Metrics[0]
-	require.Equal(t, metric.Measurement, metricName)
-	require.Len(t, acc.Metrics[0].Fields, 1)
-	require.Equal(t, acc.Metrics[0].Fields["a"], 1.2)
-	require.Equal(t, acc.Metrics[0].Tags["url"], url)
-}
-
-func TestHTTPHeaders(t *testing.T) {
-	header := "X-Special-Header"
-	headerValue := "Special-Value"
-	fakeServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.URL.Path == "/endpoint" {
-			if r.Header.Get(header) == headerValue {
-				_, _ = w.Write([]byte(simpleJSON))
-			} else {
-				w.WriteHeader(http.StatusForbidden)
-			}
-		} else {
-			w.WriteHeader(http.StatusNotFound)
-		}
-	}))
-	defer fakeServer.Close()
-
-	url := fakeServer.URL + "/endpoint"
-	plugin := &plugin.HTTP{
-		URLs:    []string{url},
-		Headers: map[string]string{header: headerValue},
-	}
-	metricName := "metricName"
-	p, _ := parsers.NewJSONParser(metricName, nil, nil)
-	plugin.SetParser(p)
-
-	var acc testutil.Accumulator
-	require.NoError(t, acc.GatherError(plugin.Gather))
-}
-
-func TestInvalidStatusCode(t *testing.T) {
-	fakeServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(http.StatusNotFound)
-	}))
-	defer fakeServer.Close()
-
-	url := fakeServer.URL + "/endpoint"
-	plugin := &plugin.HTTP{
-		URLs: []string{url},
-	}
-
-	metricName := "metricName"
-	p, _ := parsers.NewJSONParser(metricName, nil, nil)
-	plugin.SetParser(p)
-
-	var acc testutil.Accumulator
-	require.Error(t, acc.GatherError(plugin.Gather))
-}
-
-func TestMethod(t *testing.T) {
-	fakeServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.Method == "POST" {
-			w.WriteHeader(http.StatusOK)
-		} else {
-			w.WriteHeader(http.StatusNotFound)
-		}
-	}))
-	defer fakeServer.Close()
-
-	plugin := &plugin.HTTP{
-		URLs:   []string{fakeServer.URL},
-		Method: "POST",
-	}
-
-	metricName := "metricName"
-	p, _ := parsers.NewJSONParser(metricName, nil, nil)
-	plugin.SetParser(p)
-
-	var acc testutil.Accumulator
-	require.NoError(t, acc.GatherError(plugin.Gather))
-}
-
-func TestParserNotSet(t *testing.T) {
-	fakeServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.URL.Path == "/endpoint" {
-			_, _ = w.Write([]byte(simpleJSON))
-		} else {
-			w.WriteHeader(http.StatusNotFound)
-		}
-	}))
-	defer fakeServer.Close()
-
-	url := fakeServer.URL + "/endpoint"
-	plugin := &plugin.HTTP{
-		URLs: []string{url},
-	}
-
-	var acc testutil.Accumulator
-	require.Error(t, acc.GatherError(plugin.Gather))
-}
-
-const simpleJSON = `
-{
-    "a": 1.2
-}
-`
--- a/plugins/inputs/http_listener/README.md
+++ b/plugins/inputs/http_listener/README.md
@@ -12,8 +12,6 @@ Enable TLS by specifying the file names of a service TLS certificate and key.

 Enable mutually authenticated TLS and authorize client connections by signing certificate authority by including a list of allowed CA certificate file names in ````tls_allowed_cacerts````.

-Enable basic HTTP authentication of clients by specifying a username and password to check for. These credentials will be received from the client _as plain text_ if TLS is not configured.
-
 See: [Telegraf Input Data Formats](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#influx).

 **Example:**
@@ -41,8 +39,4 @@ This is a sample configuration for the plugin.

  ## MTLS
  tls_allowed_cacerts = ["/etc/telegraf/clientca.pem"]
-
-  ## Basic authentication
-  basic_username = "foobar"
-  basic_password = "barfoo"
 ```
--- a/plugins/inputs/http_listener/http_listener.go
+++ b/plugins/inputs/http_listener/http_listener.go
@@ -3,7 +3,6 @@ package http_listener
 import (
 	"bytes"
 	"compress/gzip"
-	"crypto/subtle"
 	"crypto/tls"
 	"crypto/x509"
 	"io"
@@ -33,8 +32,6 @@ const (
 	DEFAULT_MAX_LINE_SIZE = 64 * 1024
 )

-type TimeFunc func() time.Time
-
 type HTTPListener struct {
 	ServiceAddress string
 	ReadTimeout    internal.Duration
@@ -47,20 +44,14 @@ type HTTPListener struct {
 	TlsCert           string
 	TlsKey            string

-	BasicUsername string
-	BasicPassword string
-
-	TimeFunc
-
 	mu sync.Mutex
 	wg sync.WaitGroup

 	listener net.Listener

-	handler *influx.MetricHandler
-	parser  *influx.Parser
-	acc     telegraf.Accumulator
-	pool    *pool
+	parser influx.InfluxParser
+	acc    telegraf.Accumulator
+	pool   *pool

 	BytesRecv       selfstat.Stat
 	RequestsServed  selfstat.Stat
@@ -73,7 +64,6 @@ type HTTPListener struct {
 	PingsRecv       selfstat.Stat
 	NotFoundsServed selfstat.Stat
 	BuffersCreated  selfstat.Stat
-	AuthFailures    selfstat.Stat
 }

 const sampleConfig = `
@@ -100,11 +90,6 @@ const sampleConfig = `
  ## Add service certificate and key
  tls_cert = "/etc/telegraf/cert.pem"
  tls_key = "/etc/telegraf/key.pem"
-
-  ## Optional username and password to accept for HTTP basic authentication.
-  ## You probably want to make sure you have TLS configured above for this.
-  # basic_username = "foobar"
-  # basic_password = "barfoo"
 `

 func (h *HTTPListener) SampleConfig() string {
@@ -139,7 +124,6 @@ func (h *HTTPListener) Start(acc telegraf.Accumulator) error {
 	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)
-	h.AuthFailures = selfstat.Register("http_listener", "auth_failures", tags)

 	if h.MaxBodySize == 0 {
 		h.MaxBodySize = DEFAULT_MAX_BODY_SIZE
@@ -181,9 +165,6 @@ func (h *HTTPListener) Start(acc telegraf.Accumulator) error {
 	h.listener = listener
 	h.Port = listener.Addr().(*net.TCPAddr).Port

-	h.handler = influx.NewMetricHandler()
-	h.parser = influx.NewParser(h.handler)
-
 	h.wg.Add(1)
 	go func() {
 		defer h.wg.Done()
@@ -213,29 +194,25 @@ func (h *HTTPListener) ServeHTTP(res http.ResponseWriter, req *http.Request) {
 	case "/write":
 		h.WritesRecv.Incr(1)
 		defer h.WritesServed.Incr(1)
-		h.AuthenticateIfSet(h.serveWrite, res, req)
+		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
-		h.AuthenticateIfSet(func(res http.ResponseWriter, req *http.Request) {
-			res.Header().Set("Content-Type", "application/json")
-			res.Header().Set("X-Influxdb-Version", "1.0")
-			res.WriteHeader(http.StatusOK)
-			res.Write([]byte("{\"results\":[]}"))
-		}, res, req)
+		res.Header().Set("Content-Type", "application/json")
+		res.Header().Set("X-Influxdb-Version", "1.0")
+		res.WriteHeader(http.StatusOK)
+		res.Write([]byte("{\"results\":[]}"))
 	case "/ping":
 		h.PingsRecv.Incr(1)
 		defer h.PingsServed.Incr(1)
 		// respond to ping requests
-		h.AuthenticateIfSet(func(res http.ResponseWriter, req *http.Request) {
-			res.WriteHeader(http.StatusNoContent)
-		}, res, req)
+		res.WriteHeader(http.StatusNoContent)
 	default:
 		defer h.NotFoundsServed.Incr(1)
 		// Don't know how to respond to calls to other endpoints
-		h.AuthenticateIfSet(http.NotFound, res, req)
+		http.NotFound(res, req)
 	}
 }

@@ -245,7 +222,7 @@ func (h *HTTPListener) serveWrite(res http.ResponseWriter, req *http.Request) {
 		tooLarge(res)
 		return
 	}
-	now := h.TimeFunc()
+	now := time.Now()

 	precision := req.URL.Query().Get("precision")

@@ -344,12 +321,7 @@ func (h *HTTPListener) serveWrite(res http.ResponseWriter, req *http.Request) {
 }

 func (h *HTTPListener) parse(b []byte, t time.Time, precision string) error {
-	h.handler.SetTimePrecision(getPrecisionMultiplier(precision))
-	h.handler.SetTimeFunc(func() time.Time { return t })
-	metrics, err := h.parser.Parse(b)
-	if err != nil {
-		return err
-	}
+	metrics, err := h.parser.ParseWithDefaultTimePrecision(b, t, precision)

 	for _, m := range metrics {
 		h.acc.AddFields(m.Name(), m.Fields(), m.Tags(), m.Time())
@@ -404,45 +376,10 @@ func (h *HTTPListener) getTLSConfig() *tls.Config {
 	return tlsConf
 }

-func (h *HTTPListener) AuthenticateIfSet(handler http.HandlerFunc, res http.ResponseWriter, req *http.Request) {
-	if h.BasicUsername != "" && h.BasicPassword != "" {
-		reqUsername, reqPassword, ok := req.BasicAuth()
-		if !ok ||
-			subtle.ConstantTimeCompare([]byte(reqUsername), []byte(h.BasicUsername)) != 1 ||
-			subtle.ConstantTimeCompare([]byte(reqPassword), []byte(h.BasicPassword)) != 1 {
-
-			h.AuthFailures.Incr(1)
-			http.Error(res, "Unauthorized.", http.StatusUnauthorized)
-			return
-		}
-		handler(res, req)
-	} else {
-		handler(res, req)
-	}
-}
-
-func getPrecisionMultiplier(precision string) time.Duration {
-	d := time.Nanosecond
-	switch precision {
-	case "u":
-		d = time.Microsecond
-	case "ms":
-		d = time.Millisecond
-	case "s":
-		d = time.Second
-	case "m":
-		d = time.Minute
-	case "h":
-		d = time.Hour
-	}
-	return d
-}
-
 func init() {
 	inputs.Add("http_listener", func() telegraf.Input {
 		return &HTTPListener{
 			ServiceAddress: ":8186",
-			TimeFunc:       time.Now,
 		}
 	})
 }
--- a/plugins/inputs/http_listener/http_listener_test.go
+++ b/plugins/inputs/http_listener/http_listener_test.go
--- a/plugins/inputs/http_response/README.md
+++ b/plugins/inputs/http_response/README.md
@@ -1,6 +1,6 @@
-# HTTP Response Input Plugin
+# Example Input Plugin

-This input plugin checks HTTP/HTTPS connections.
+This input plugin will test HTTP/HTTPS connections.

 ### Configuration:

@@ -10,9 +10,6 @@ This input plugin checks HTTP/HTTPS connections.
  ## Server address (default http://localhost)
  # address = "http://localhost"

-  ## Set http_proxy (telegraf uses the system wide proxy settings if it's is not set)
-  # http_proxy = "http://localhost:8888"
-
  ## Set response_timeout (default 5 seconds)
  # response_timeout = "5s"

@@ -44,38 +41,21 @@ This input plugin checks HTTP/HTTPS connections.
  #   Host = "github.com"
 ```

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

 - http_response
-  - tags:
-    - server (target URL)
-    - method (request method)
-    - status_code (response status code)
-    - result ([see below](#result--result_code))
-  - fields:
    - response_time (float, seconds)
-    - http_response_code (int, response status code)
-	- result_type (string, deprecated in 1.6: use `result` tag and `result_code` field)
-    - result_code (int, [see below](#result--result_code))
+    - http_response_code (int) #The code received
+	- result_type (string) # success, timeout, response_string_mismatch, connection_failed

-#### `result` / `result_code`
-
-Upon finishing polling the target server, the plugin registers the result of the operation in the `result` tag, and adds a numeric field called `result_code` corresponding with that tag value.
-
-This tag is used to expose network and plugin errors. HTTP errors are considered a successful connection.
-
-|Tag value                |Corresponding field value|Description|
--------------------------|-------------------------|-----------|
-|success                  | 0                       |The HTTP request completed, even if the HTTP code represents an error|
-|response_string_mismatch | 1                       |The option `response_string_match` was used, and the body of the response didn't match the regex|
-|body_read_error          | 2                       |The option `response_string_match` was used, but the plugin wans't able to read the body of the response. Responses with empty bodies (like 3xx, HEAD, etc) will trigger this error|
-|connection_failed        | 3                       |Catch all for any network error not specifically handled by the plugin|
-|timeout                  | 4                       |The plugin timed out while awaiting the HTTP connection to complete|
-|dns_error                | 5                       |There was a DNS error while attempting to connect to the host|
+### Tags:

+- All measurements have the following tags:
+    - server
+    - method

 ### Example Output:

 ```
-http_response,method=GET,server=http://www.github.com,status_code=200,result=success http_response_code=200i,response_time=6.223266528,result_type="success",result_code=0i 1459419354977857955
+http_response,method=GET,server=http://www.github.com http_response_code=200i,response_time=6.223266528 1459419354977857955
 ```
--- a/plugins/inputs/http_response/http_response.go
+++ b/plugins/inputs/http_response/http_response.go
@@ -2,7 +2,6 @@ package http_response

 import (
 	"errors"
-	"fmt"
 	"io"
 	"io/ioutil"
 	"log"
@@ -10,7 +9,6 @@ import (
 	"net/http"
 	"net/url"
 	"regexp"
-	"strconv"
 	"strings"
 	"time"

@@ -22,7 +20,6 @@ import (
 // HTTPResponse struct
 type HTTPResponse struct {
 	Address             string
-	HTTPProxy           string `toml:"http_proxy"`
 	Body                string
 	Method              string
 	ResponseTimeout     internal.Duration
@@ -52,9 +49,6 @@ var sampleConfig = `
  ## Server address (default http://localhost)
  # address = "http://localhost"

-  ## Set http_proxy (telegraf uses the system wide proxy settings if it's is not set)
-  # http_proxy = "http://localhost:8888"
-
  ## Set response_timeout (default 5 seconds)
  # response_timeout = "5s"

@@ -94,22 +88,6 @@ func (h *HTTPResponse) SampleConfig() string {
 // ErrRedirectAttempted indicates that a redirect occurred
 var ErrRedirectAttempted = errors.New("redirect")

-// Set the proxy. A configured proxy overwrites the system wide proxy.
-func getProxyFunc(http_proxy string) func(*http.Request) (*url.URL, error) {
-	if http_proxy == "" {
-		return http.ProxyFromEnvironment
-	}
-	proxyURL, err := url.Parse(http_proxy)
-	if err != nil {
-		return func(_ *http.Request) (*url.URL, error) {
-			return nil, errors.New("bad proxy: " + err.Error())
-		}
-	}
-	return func(r *http.Request) (*url.URL, error) {
-		return proxyURL, nil
-	}
-}
-
 // CreateHttpClient creates an http client which will timeout at the specified
 // timeout period and can follow redirects if specified
 func (h *HTTPResponse) createHttpClient() (*http.Client, error) {
@@ -120,7 +98,7 @@ func (h *HTTPResponse) createHttpClient() (*http.Client, error) {
 	}
 	client := &http.Client{
 		Transport: &http.Transport{
-			Proxy:             getProxyFunc(h.HTTPProxy),
+			Proxy:             http.ProxyFromEnvironment,
 			DisableKeepAlives: true,
 			TLSClientConfig:   tlsCfg,
 		},
@@ -135,54 +113,10 @@ func (h *HTTPResponse) createHttpClient() (*http.Client, error) {
 	return client, nil
 }

-func setResult(result_string string, fields map[string]interface{}, tags map[string]string) {
-	result_codes := map[string]int{
-		"success":                  0,
-		"response_string_mismatch": 1,
-		"body_read_error":          2,
-		"connection_failed":        3,
-		"timeout":                  4,
-		"dns_error":                5,
-	}
-
-	tags["result"] = result_string
-	fields["result_type"] = result_string
-	fields["result_code"] = result_codes[result_string]
-}
-
-func setError(err error, fields map[string]interface{}, tags map[string]string) error {
-	if timeoutError, ok := err.(net.Error); ok && timeoutError.Timeout() {
-		setResult("timeout", fields, tags)
-		return timeoutError
-	}
-
-	urlErr, isUrlErr := err.(*url.Error)
-	if !isUrlErr {
-		return nil
-	}
-
-	opErr, isNetErr := (urlErr.Err).(*net.OpError)
-	if isNetErr {
-		switch e := (opErr.Err).(type) {
-		case (*net.DNSError):
-			setResult("dns_error", fields, tags)
-			return e
-		case (*net.ParseError):
-			// Parse error has to do with parsing of IP addresses, so we
-			// group it with address errors
-			setResult("address_error", fields, tags)
-			return e
-		}
-	}
-
-	return nil
-}
-
 // HTTPGather gathers all fields and returns any errors it encounters
-func (h *HTTPResponse) httpGather() (map[string]interface{}, map[string]string, error) {
-	// Prepare fields and tags
+func (h *HTTPResponse) httpGather() (map[string]interface{}, error) {
+	// Prepare fields
 	fields := make(map[string]interface{})
-	tags := map[string]string{"server": h.Address, "method": h.Method}

 	var body io.Reader
 	if h.Body != "" {
@@ -190,7 +124,7 @@ func (h *HTTPResponse) httpGather() (map[string]interface{}, map[string]string,
 	}
 	request, err := http.NewRequest(h.Method, h.Address, body)
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}

 	for key, val := range h.Headers {
@@ -203,87 +137,68 @@ func (h *HTTPResponse) httpGather() (map[string]interface{}, map[string]string,
 	// Start Timer
 	start := time.Now()
 	resp, err := h.client.Do(request)
-	response_time := time.Since(start).Seconds()

-	// If an error in returned, it means we are dealing with a network error, as
-	// HTTP error codes do not generate errors in the net/http library
 	if err != nil {
-		// Log error
-		log.Printf("D! Network error while polling %s: %s", h.Address, err.Error())
-
-		// Get error details
-		netErr := setError(err, fields, tags)
-
-		// If recognize the returnded error, get out
-		if netErr != nil {
-			return fields, tags, nil
+		if netErr, ok := err.(net.Error); ok && netErr.Timeout() {
+			fields["result_type"] = "timeout"
+			return fields, nil
 		}
-
-		// Any error not recognized by `set_error` is considered a "connection_failed"
-		setResult("connection_failed", fields, tags)
-
-		// If the error is a redirect we continue processing and log the HTTP code
-		urlError, isUrlError := err.(*url.Error)
-		if !h.FollowRedirects && isUrlError && urlError.Err == ErrRedirectAttempted {
+		fields["result_type"] = "connection_failed"
+		if h.FollowRedirects {
+			return fields, nil
+		}
+		if urlError, ok := err.(*url.Error); ok &&
+			urlError.Err == ErrRedirectAttempted {
 			err = nil
 		} else {
-			// If the error isn't a timeout or a redirect stop
-			// processing the request
-			return fields, tags, nil
+			return fields, nil
 		}
 	}
-
-	if _, ok := fields["response_time"]; !ok {
-		fields["response_time"] = response_time
-	}
-
-	// This function closes the response body, as
-	// required by the net/http library
 	defer func() {
 		io.Copy(ioutil.Discard, resp.Body)
 		resp.Body.Close()
 	}()

-	// Set log the HTTP response code
-	tags["status_code"] = strconv.Itoa(resp.StatusCode)
+	fields["response_time"] = time.Since(start).Seconds()
 	fields["http_response_code"] = resp.StatusCode

 	// Check the response for a regex match.
 	if h.ResponseStringMatch != "" {

+		// Compile once and reuse
+		if h.compiledStringMatch == nil {
+			h.compiledStringMatch = regexp.MustCompile(h.ResponseStringMatch)
+			if err != nil {
+				log.Printf("E! Failed to compile regular expression %s : %s", h.ResponseStringMatch, err)
+				fields["result_type"] = "response_string_mismatch"
+				return fields, nil
+			}
+		}
+
 		bodyBytes, err := ioutil.ReadAll(resp.Body)
 		if err != nil {
-			log.Printf("D! Failed to read body of HTTP Response : %s", err)
-			setResult("body_read_error", fields, tags)
+			log.Printf("E! Failed to read body of HTTP Response : %s", err)
+			fields["result_type"] = "response_string_mismatch"
 			fields["response_string_match"] = 0
-			return fields, tags, nil
+			return fields, nil
 		}

 		if h.compiledStringMatch.Match(bodyBytes) {
-			setResult("success", fields, tags)
+			fields["result_type"] = "success"
 			fields["response_string_match"] = 1
 		} else {
-			setResult("response_string_mismatch", fields, tags)
+			fields["result_type"] = "response_string_mismatch"
 			fields["response_string_match"] = 0
 		}
 	} else {
-		setResult("success", fields, tags)
+		fields["result_type"] = "success"
 	}

-	return fields, tags, nil
+	return fields, nil
 }

 // Gather gets all metric fields and tags and returns any errors it encounters
 func (h *HTTPResponse) Gather(acc telegraf.Accumulator) error {
-	// Compile the body regex if it exist
-	if h.compiledStringMatch == nil {
-		var err error
-		h.compiledStringMatch, err = regexp.Compile(h.ResponseStringMatch)
-		if err != nil {
-			return fmt.Errorf("Failed to compile regular expression %s : %s", h.ResponseStringMatch, err)
-		}
-	}
-
 	// Set default values
 	if h.ResponseTimeout.Duration < time.Second {
 		h.ResponseTimeout.Duration = time.Second * 5
@@ -302,10 +217,9 @@ func (h *HTTPResponse) Gather(acc telegraf.Accumulator) error {
 	if addr.Scheme != "http" && addr.Scheme != "https" {
 		return errors.New("Only http and https are supported")
 	}
-
 	// Prepare data
+	tags := map[string]string{"server": h.Address, "method": h.Method}
 	var fields map[string]interface{}
-	var tags map[string]string

 	if h.client == nil {
 		client, err := h.createHttpClient()
@@ -316,11 +230,10 @@ func (h *HTTPResponse) Gather(acc telegraf.Accumulator) error {
 	}

 	// Gather data
-	fields, tags, err = h.httpGather()
+	fields, err = h.httpGather()
 	if err != nil {
 		return err
 	}
-
 	// Add metrics
 	acc.AddFields("http_response", fields, tags)
 	return nil
--- a/plugins/inputs/http_response/http_response_test.go
+++ b/plugins/inputs/http_response/http_response_test.go
@@ -15,68 +15,6 @@ import (
 	"github.com/stretchr/testify/require"
 )

-// Receives a list with fields that are expected to be absent
-func checkAbsentFields(t *testing.T, fields []string, acc *testutil.Accumulator) {
-	for _, field := range fields {
-		ok := acc.HasField("http_response", field)
-		require.False(t, ok)
-	}
-}
-
-// Receives a list with tags that are expected to be absent
-func checkAbsentTags(t *testing.T, tags []string, acc *testutil.Accumulator) {
-	for _, tag := range tags {
-		ok := acc.HasTag("http_response", tag)
-		require.False(t, ok)
-	}
-}
-
-// Receives a dictionary and with expected fields and their values. If a value is nil, it will only check
-// that the field exists, but not its contents
-func checkFields(t *testing.T, fields map[string]interface{}, acc *testutil.Accumulator) {
-	for key, field := range fields {
-		switch v := field.(type) {
-		case int:
-			value, ok := acc.IntField("http_response", key)
-			require.True(t, ok)
-			require.Equal(t, field, value)
-		case float64:
-			value, ok := acc.FloatField("http_response", key)
-			require.True(t, ok)
-			require.Equal(t, field, value)
-		case string:
-			value, ok := acc.StringField("http_response", key)
-			require.True(t, ok)
-			require.Equal(t, field, value)
-		case nil:
-			ok := acc.HasField("http_response", key)
-			require.True(t, ok)
-		default:
-			t.Log("Unsupported type for field: ", v)
-			t.Fail()
-		}
-	}
-}
-
-// Receives a dictionary and with expected tags and their values. If a value is nil, it will only check
-// that the tag exists, but not its contents
-func checkTags(t *testing.T, tags map[string]interface{}, acc *testutil.Accumulator) {
-	for key, tag := range tags {
-		switch v := tag.(type) {
-		case string:
-			ok := acc.HasTag("http_response", key)
-			require.True(t, ok)
-			require.Equal(t, tag, acc.TagValue("http_response", key))
-		case nil:
-			ok := acc.HasTag("http_response", key)
-			require.True(t, ok)
-		default:
-			t.Log("Unsupported type for tag: ", v)
-			t.Fail()
-		}
-	}
-}
-
 func setUpTestMux() http.Handler {
 	mux := http.NewServeMux()
 	mux.HandleFunc("/redirect", func(w http.ResponseWriter, req *http.Request) {
@@ -118,24 +56,6 @@ func setUpTestMux() http.Handler {
 	return mux
 }

-func checkOutput(t *testing.T, acc *testutil.Accumulator, presentFields map[string]interface{}, presentTags map[string]interface{}, absentFields []string, absentTags []string) {
-	if presentFields != nil {
-		checkFields(t, presentFields, acc)
-	}
-
-	if presentTags != nil {
-		checkTags(t, presentTags, acc)
-	}
-
-	if absentFields != nil {
-		checkAbsentFields(t, absentFields, acc)
-	}
-
-	if absentTags != nil {
-		checkAbsentTags(t, absentTags, acc)
-	}
-}
-
 func TestHeaders(t *testing.T) {
 	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		cHeader := r.Header.Get("Content-Type")
@@ -158,20 +78,9 @@ func TestHeaders(t *testing.T) {
 	err := h.Gather(&acc)
 	require.NoError(t, err)

-	expectedFields := map[string]interface{}{
-		"http_response_code": http.StatusOK,
-		"result_type":        "success",
-		"result_code":        0,
-		"response_time":      nil,
-	}
-	expectedTags := map[string]interface{}{
-		"server":      nil,
-		"method":      "GET",
-		"status_code": "200",
-		"result":      "success",
-	}
-	absentFields := []string{"response_string_match"}
-	checkOutput(t, &acc, expectedFields, expectedTags, absentFields, nil)
+	value, ok := acc.IntField("http_response", "http_response_code")
+	require.True(t, ok)
+	require.Equal(t, http.StatusOK, value)
 }

 func TestFields(t *testing.T) {
@@ -194,20 +103,12 @@ func TestFields(t *testing.T) {
 	err := h.Gather(&acc)
 	require.NoError(t, err)

-	expectedFields := map[string]interface{}{
-		"http_response_code": http.StatusOK,
-		"result_type":        "success",
-		"result_code":        0,
-		"response_time":      nil,
-	}
-	expectedTags := map[string]interface{}{
-		"server":      nil,
-		"method":      "GET",
-		"status_code": "200",
-		"result":      "success",
-	}
-	absentFields := []string{"response_string_match"}
-	checkOutput(t, &acc, expectedFields, expectedTags, absentFields, nil)
+	value, ok := acc.IntField("http_response", "http_response_code")
+	require.True(t, ok)
+	require.Equal(t, http.StatusOK, value)
+	response_value, ok := acc.StringField("http_response", "result_type")
+	require.True(t, ok)
+	require.Equal(t, "success", response_value)
 }

 func TestRedirects(t *testing.T) {
@@ -229,20 +130,9 @@ func TestRedirects(t *testing.T) {
 	err := h.Gather(&acc)
 	require.NoError(t, err)

-	expectedFields := map[string]interface{}{
-		"http_response_code": http.StatusOK,
-		"result_type":        "success",
-		"result_code":        0,
-		"response_time":      nil,
-	}
-	expectedTags := map[string]interface{}{
-		"server":      nil,
-		"method":      "GET",
-		"status_code": "200",
-		"result":      "success",
-	}
-	absentFields := []string{"response_string_match"}
-	checkOutput(t, &acc, expectedFields, expectedTags, absentFields, nil)
+	value, ok := acc.IntField("http_response", "http_response_code")
+	require.True(t, ok)
+	require.Equal(t, http.StatusOK, value)

 	h = &HTTPResponse{
 		Address:         ts.URL + "/badredirect",
@@ -258,21 +148,11 @@ func TestRedirects(t *testing.T) {
 	err = h.Gather(&acc)
 	require.NoError(t, err)

-	expectedFields = map[string]interface{}{
-		"result_type": "connection_failed",
-		"result_code": 3,
-	}
-	expectedTags = map[string]interface{}{
-		"server": nil,
-		"method": "GET",
-		"result": "connection_failed",
-	}
-	absentFields = []string{"http_response_code", "response_time", "response_string_match"}
-	absentTags := []string{"status_code"}
-	checkOutput(t, &acc, expectedFields, expectedTags, nil, nil)
-
-	expectedFields = map[string]interface{}{"result_type": "connection_failed"}
-	checkOutput(t, &acc, expectedFields, expectedTags, absentFields, absentTags)
+	value, ok = acc.IntField("http_response", "http_response_code")
+	require.False(t, ok)
+	response_value, ok := acc.StringField("http_response", "result_type")
+	require.True(t, ok)
+	require.Equal(t, "connection_failed", response_value)
 }

 func TestMethod(t *testing.T) {
@@ -294,20 +174,9 @@ func TestMethod(t *testing.T) {
 	err := h.Gather(&acc)
 	require.NoError(t, err)

-	expectedFields := map[string]interface{}{
-		"http_response_code": http.StatusOK,
-		"result_type":        "success",
-		"result_code":        0,
-		"response_time":      nil,
-	}
-	expectedTags := map[string]interface{}{
-		"server":      nil,
-		"method":      "POST",
-		"status_code": "200",
-		"result":      "success",
-	}
-	absentFields := []string{"response_string_match"}
-	checkOutput(t, &acc, expectedFields, expectedTags, absentFields, nil)
+	value, ok := acc.IntField("http_response", "http_response_code")
+	require.True(t, ok)
+	require.Equal(t, http.StatusOK, value)

 	h = &HTTPResponse{
 		Address:         ts.URL + "/mustbepostmethod",
@@ -323,20 +192,9 @@ func TestMethod(t *testing.T) {
 	err = h.Gather(&acc)
 	require.NoError(t, err)

-	expectedFields = map[string]interface{}{
-		"http_response_code": http.StatusMethodNotAllowed,
-		"result_type":        "success",
-		"result_code":        0,
-		"response_time":      nil,
-	}
-	expectedTags = map[string]interface{}{
-		"server":      nil,
-		"method":      "GET",
-		"status_code": "405",
-		"result":      "success",
-	}
-	absentFields = []string{"response_string_match"}
-	checkOutput(t, &acc, expectedFields, expectedTags, absentFields, nil)
+	value, ok = acc.IntField("http_response", "http_response_code")
+	require.True(t, ok)
+	require.Equal(t, http.StatusMethodNotAllowed, value)

 	//check that lowercase methods work correctly
 	h = &HTTPResponse{
@@ -353,20 +211,9 @@ func TestMethod(t *testing.T) {
 	err = h.Gather(&acc)
 	require.NoError(t, err)

-	expectedFields = map[string]interface{}{
-		"http_response_code": http.StatusMethodNotAllowed,
-		"result_type":        "success",
-		"result_code":        0,
-		"response_time":      nil,
-	}
-	expectedTags = map[string]interface{}{
-		"server":      nil,
-		"method":      "head",
-		"status_code": "405",
-		"result":      "success",
-	}
-	absentFields = []string{"response_string_match"}
-	checkOutput(t, &acc, expectedFields, expectedTags, absentFields, nil)
+	value, ok = acc.IntField("http_response", "http_response_code")
+	require.True(t, ok)
+	require.Equal(t, http.StatusMethodNotAllowed, value)
 }

 func TestBody(t *testing.T) {
@@ -388,20 +235,9 @@ func TestBody(t *testing.T) {
 	err := h.Gather(&acc)
 	require.NoError(t, err)

-	expectedFields := map[string]interface{}{
-		"http_response_code": http.StatusOK,
-		"result_type":        "success",
-		"result_code":        0,
-		"response_time":      nil,
-	}
-	expectedTags := map[string]interface{}{
-		"server":      nil,
-		"method":      "GET",
-		"status_code": "200",
-		"result":      "success",
-	}
-	absentFields := []string{"response_string_match"}
-	checkOutput(t, &acc, expectedFields, expectedTags, absentFields, nil)
+	value, ok := acc.IntField("http_response", "http_response_code")
+	require.True(t, ok)
+	require.Equal(t, http.StatusOK, value)

 	h = &HTTPResponse{
 		Address:         ts.URL + "/musthaveabody",
@@ -416,19 +252,9 @@ func TestBody(t *testing.T) {
 	err = h.Gather(&acc)
 	require.NoError(t, err)

-	expectedFields = map[string]interface{}{
-		"http_response_code": http.StatusBadRequest,
-		"result_type":        "success",
-		"result_code":        0,
-	}
-	expectedTags = map[string]interface{}{
-		"server":      nil,
-		"method":      "GET",
-		"status_code": "400",
-		"result":      "success",
-	}
-	absentFields = []string{"response_string_match"}
-	checkOutput(t, &acc, expectedFields, expectedTags, absentFields, nil)
+	value, ok = acc.IntField("http_response", "http_response_code")
+	require.True(t, ok)
+	require.Equal(t, http.StatusBadRequest, value)
 }

 func TestStringMatch(t *testing.T) {
@@ -451,20 +277,17 @@ func TestStringMatch(t *testing.T) {
 	err := h.Gather(&acc)
 	require.NoError(t, err)

-	expectedFields := map[string]interface{}{
-		"http_response_code":    http.StatusOK,
-		"response_string_match": 1,
-		"result_type":           "success",
-		"result_code":           0,
-		"response_time":         nil,
-	}
-	expectedTags := map[string]interface{}{
-		"server":      nil,
-		"method":      "GET",
-		"status_code": "200",
-		"result":      "success",
-	}
-	checkOutput(t, &acc, expectedFields, expectedTags, nil, nil)
+	value, ok := acc.IntField("http_response", "http_response_code")
+	require.True(t, ok)
+	require.Equal(t, http.StatusOK, value)
+	value, ok = acc.IntField("http_response", "response_string_match")
+	require.True(t, ok)
+	require.Equal(t, 1, value)
+	response_value, ok := acc.StringField("http_response", "result_type")
+	require.True(t, ok)
+	require.Equal(t, "success", response_value)
+	_, ok = acc.FloatField("http_response", "response_time")
+	require.True(t, ok)
 }

 func TestStringMatchJson(t *testing.T) {
@@ -487,20 +310,17 @@ func TestStringMatchJson(t *testing.T) {
 	err := h.Gather(&acc)
 	require.NoError(t, err)

-	expectedFields := map[string]interface{}{
-		"http_response_code":    http.StatusOK,
-		"response_string_match": 1,
-		"result_type":           "success",
-		"result_code":           0,
-		"response_time":         nil,
-	}
-	expectedTags := map[string]interface{}{
-		"server":      nil,
-		"method":      "GET",
-		"status_code": "200",
-		"result":      "success",
-	}
-	checkOutput(t, &acc, expectedFields, expectedTags, nil, nil)
+	value, ok := acc.IntField("http_response", "http_response_code")
+	require.True(t, ok)
+	require.Equal(t, http.StatusOK, value)
+	value, ok = acc.IntField("http_response", "response_string_match")
+	require.True(t, ok)
+	require.Equal(t, 1, value)
+	response_value, ok := acc.StringField("http_response", "result_type")
+	require.True(t, ok)
+	require.Equal(t, "success", response_value)
+	_, ok = acc.FloatField("http_response", "response_time")
+	require.True(t, ok)
 }

 func TestStringMatchFail(t *testing.T) {
@@ -524,20 +344,17 @@ func TestStringMatchFail(t *testing.T) {
 	err := h.Gather(&acc)
 	require.NoError(t, err)

-	expectedFields := map[string]interface{}{
-		"http_response_code":    http.StatusOK,
-		"response_string_match": 0,
-		"result_type":           "response_string_mismatch",
-		"result_code":           1,
-		"response_time":         nil,
-	}
-	expectedTags := map[string]interface{}{
-		"server":      nil,
-		"method":      "GET",
-		"status_code": "200",
-		"result":      "response_string_mismatch",
-	}
-	checkOutput(t, &acc, expectedFields, expectedTags, nil, nil)
+	value, ok := acc.IntField("http_response", "http_response_code")
+	require.True(t, ok)
+	require.Equal(t, http.StatusOK, value)
+	value, ok = acc.IntField("http_response", "response_string_match")
+	require.True(t, ok)
+	require.Equal(t, 0, value)
+	response_value, ok := acc.StringField("http_response", "result_type")
+	require.True(t, ok)
+	require.Equal(t, "response_string_mismatch", response_value)
+	_, ok = acc.FloatField("http_response", "response_time")
+	require.True(t, ok)
 }

 func TestTimeout(t *testing.T) {
@@ -563,126 +380,11 @@ func TestTimeout(t *testing.T) {
 	err := h.Gather(&acc)
 	require.NoError(t, err)

-	expectedFields := map[string]interface{}{
-		"result_type": "timeout",
-		"result_code": 4,
-	}
-	expectedTags := map[string]interface{}{
-		"server": nil,
-		"method": "GET",
-		"result": "timeout",
-	}
-	absentFields := []string{"http_response_code", "response_time", "response_string_match"}
-	absentTags := []string{"status_code"}
-	checkOutput(t, &acc, expectedFields, expectedTags, absentFields, absentTags)
-}
-
-func TestPluginErrors(t *testing.T) {
-	mux := setUpTestMux()
-	ts := httptest.NewServer(mux)
-	defer ts.Close()
-
-	// Bad regex test. Should return an error and return nothing
-	h := &HTTPResponse{
-		Address:             ts.URL + "/good",
-		Body:                "{ 'test': 'data'}",
-		Method:              "GET",
-		ResponseStringMatch: "bad regex:[[",
-		ResponseTimeout:     internal.Duration{Duration: time.Second * 20},
-		Headers: map[string]string{
-			"Content-Type": "application/json",
-		},
-		FollowRedirects: true,
-	}
-
-	var acc testutil.Accumulator
-	err := h.Gather(&acc)
-	require.Error(t, err)
-
-	absentFields := []string{"http_response_code", "response_time", "response_string_match", "result_type", "result_code"}
-	absentTags := []string{"status_code", "result", "server", "method"}
-	checkOutput(t, &acc, nil, nil, absentFields, absentTags)
-
-	// Attempt to read empty body test
-	h = &HTTPResponse{
-		Address:             ts.URL + "/redirect",
-		Body:                "",
-		Method:              "GET",
-		ResponseStringMatch: ".*",
-		ResponseTimeout:     internal.Duration{Duration: time.Second * 20},
-		FollowRedirects:     false,
-	}
-
-	acc = testutil.Accumulator{}
-	err = h.Gather(&acc)
-	require.NoError(t, err)
-
-	expectedFields := map[string]interface{}{
-		"http_response_code":    http.StatusMovedPermanently,
-		"response_string_match": 0,
-		"result_type":           "body_read_error",
-		"result_code":           2,
-		"response_time":         nil,
-	}
-	expectedTags := map[string]interface{}{
-		"server":      nil,
-		"method":      "GET",
-		"status_code": "301",
-		"result":      "body_read_error",
-	}
-	checkOutput(t, &acc, expectedFields, expectedTags, nil, nil)
-}
-
-func TestNetworkErrors(t *testing.T) {
-	// DNS error
-	h := &HTTPResponse{
-		Address:         "https://nonexistent.nonexistent", // Any non-resolvable URL works here
-		Body:            "",
-		Method:          "GET",
-		ResponseTimeout: internal.Duration{Duration: time.Second * 20},
-		FollowRedirects: false,
-	}
-
-	var acc testutil.Accumulator
-	err := h.Gather(&acc)
-	require.NoError(t, err)
-
-	expectedFields := map[string]interface{}{
-		"result_type": "dns_error",
-		"result_code": 5,
-	}
-	expectedTags := map[string]interface{}{
-		"server": nil,
-		"method": "GET",
-		"result": "dns_error",
-	}
-	absentFields := []string{"http_response_code", "response_time", "response_string_match"}
-	absentTags := []string{"status_code"}
-	checkOutput(t, &acc, expectedFields, expectedTags, absentFields, absentTags)
-
-	// Connecton failed
-	h = &HTTPResponse{
-		Address:         "https://127.127.127.127", // Any non-routable IP works here
-		Body:            "",
-		Method:          "GET",
-		ResponseTimeout: internal.Duration{Duration: time.Second * 20},
-		FollowRedirects: false,
-	}
-
-	acc = testutil.Accumulator{}
-	err = h.Gather(&acc)
-	require.NoError(t, err)
-
-	expectedFields = map[string]interface{}{
-		"result_type": "connection_failed",
-		"result_code": 3,
-	}
-	expectedTags = map[string]interface{}{
-		"server": nil,
-		"method": "GET",
-		"result": "connection_failed",
-	}
-	absentFields = []string{"http_response_code", "response_time", "response_string_match"}
-	absentTags = []string{"status_code"}
-	checkOutput(t, &acc, expectedFields, expectedTags, absentFields, absentTags)
+	_, ok := acc.IntField("http_response", "http_response_code")
+	require.False(t, ok)
+	response_value, ok := acc.StringField("http_response", "result_type")
+	require.True(t, ok)
+	require.Equal(t, "timeout", response_value)
+	_, ok = acc.FloatField("http_response", "response_time")
+	require.False(t, ok)
 }
--- a/plugins/inputs/httpjson/README.md
+++ b/plugins/inputs/httpjson/README.md
@@ -2,8 +2,6 @@

 The httpjson plugin collects data from HTTP URLs which respond with JSON.  It flattens the JSON and finds all numeric values, treating them as floats.

-Deprecated (1.6): use the [http](../http) input.
-
 ### Configuration:

 ```toml
@@ -34,13 +32,6 @@ Deprecated (1.6): use the [http](../http) input.
  #   "my_tag_2"
  # ]

-  ## 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
-
  ## HTTP Request Parameters (all values must be strings).  For "GET" requests, data
  ## will be included in the query.  For "POST" requests, data will be included
  ## in the request body as "x-www-form-urlencoded".
@@ -52,6 +43,13 @@ Deprecated (1.6): use the [http](../http) input.
  # [inputs.httpjson.headers]
  #   X-Auth-Token = "my-xauth-token"
  #   apiVersion = "v1"
+
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
 ```

 ### Measurements & Fields:
--- a/plugins/inputs/httpjson/httpjson.go
+++ b/plugins/inputs/httpjson/httpjson.go
@@ -100,13 +100,6 @@ var sampleConfig = `
  #   "my_tag_2"
  # ]

-  ## 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
-
  ## HTTP parameters (all values must be strings).  For "GET" requests, data
  ## will be included in the query.  For "POST" requests, data will be included
  ## in the request body as "x-www-form-urlencoded".
@@ -118,6 +111,13 @@ var sampleConfig = `
  # [inputs.httpjson.headers]
  #   X-Auth-Token = "my-xauth-token"
  #   apiVersion = "v1"
+
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
 `

 func (h *HttpJson) SampleConfig() string {
--- a/plugins/inputs/ipmi_sensor/README.md
+++ b/plugins/inputs/ipmi_sensor/README.md
@@ -22,10 +22,7 @@ ipmitool -I lan -H SERVER -U USERID -P PASSW0RD sdr
 [[inputs.ipmi_sensor]]
  ## optionally specify the path to the ipmitool executable
  # path = "/usr/bin/ipmitool"
-  ##
-  ## optionally force session privilege level. Can be CALLBACK, USER, OPERATOR, ADMINISTRATOR
-  # privilege = "ADMINISTRATOR"
-  ##
+  #
  ## optionally specify one or more servers via a url matching
  ##  [username[:password]@][protocol[(address)]]
  ##  e.g.
--- a/plugins/inputs/ipmi_sensor/connection.go
+++ b/plugins/inputs/ipmi_sensor/connection.go
@@ -14,12 +14,10 @@ type Connection struct {
 	Password  string
 	Port      int
 	Interface string
-	Privilege string
 }

-func NewConnection(server string, privilege string) *Connection {
+func NewConnection(server string) *Connection {
 	conn := &Connection{}
-	conn.Privilege = privilege
 	inx1 := strings.LastIndex(server, "@")
 	inx2 := strings.Index(server, "(")
 	inx3 := strings.Index(server, ")")
@@ -61,9 +59,7 @@ func (t *Connection) options() []string {
 	if t.Port != 0 {
 		options = append(options, "-p", strconv.Itoa(t.Port))
 	}
-	if t.Privilege != "" {
-		options = append(options, "-L", t.Privilege)
-	}
+
 	return options
 }

--- a/plugins/inputs/ipmi_sensor/connection_test.go
+++ b/plugins/inputs/ipmi_sensor/connection_test.go
@@ -23,7 +23,6 @@ func TestNewConnection(t *testing.T) {
 				Username:  "USERID",
 				Password:  "PASSW0RD",
 				Interface: "lan",
-				Privilege: "USER",
 			},
 		},
 		{
@@ -33,12 +32,11 @@ func TestNewConnection(t *testing.T) {
 				Username:  "USERID",
 				Password:  "PASS:!@#$%^&*(234)_+W0RD",
 				Interface: "lan",
-				Privilege: "USER",
 			},
 		},
 	}

 	for _, v := range testData {
-		assert.Equal(t, v.con, NewConnection(v.addr, "USER"))
+		assert.Equal(t, v.con, NewConnection(v.addr))
 	}
 }
--- a/plugins/inputs/ipmi_sensor/ipmi.go
+++ b/plugins/inputs/ipmi_sensor/ipmi.go
@@ -17,19 +17,15 @@ var (
 )

 type Ipmi struct {
-	Path      string
-	Privilege string
-	Servers   []string
-	Timeout   internal.Duration
+	Path    string
+	Servers []string
+	Timeout internal.Duration
 }

 var sampleConfig = `
  ## optionally specify the path to the ipmitool executable
  # path = "/usr/bin/ipmitool"
-  ##
-  ## optionally force session privilege level. Can be CALLBACK, USER, OPERATOR, ADMINISTRATOR
-  # privilege = "ADMINISTRATOR"
-  ##
+  #
  ## optionally specify one or more servers via a url matching
  ##  [username[:password]@][protocol[(address)]]
  ##  e.g.
@@ -81,11 +77,13 @@ func (m *Ipmi) Gather(acc telegraf.Accumulator) error {
 func (m *Ipmi) parse(acc telegraf.Accumulator, server string) error {
 	opts := make([]string, 0)
 	hostname := ""
+
 	if server != "" {
-		conn := NewConnection(server, m.Privilege)
+		conn := NewConnection(server)
 		hostname = conn.Hostname
 		opts = conn.options()
 	}
+
 	opts = append(opts, "sdr")
 	cmd := execCommand(m.Path, opts...)
 	out, err := internal.CombinedOutputTimeout(cmd, m.Timeout.Duration)
--- a/plugins/inputs/ipmi_sensor/ipmi_test.go
+++ b/plugins/inputs/ipmi_sensor/ipmi_test.go
@@ -15,10 +15,9 @@ import (

 func TestGather(t *testing.T) {
 	i := &Ipmi{
-		Servers:   []string{"USERID:PASSW0RD@lan(192.168.1.1)"},
-		Path:      "ipmitool",
-		Privilege: "USER",
-		Timeout:   internal.Duration{Duration: time.Second * 5},
+		Servers: []string{"USERID:PASSW0RD@lan(192.168.1.1)"},
+		Path:    "ipmitool",
+		Timeout: internal.Duration{Duration: time.Second * 5},
 	}
 	// overwriting exec commands with mock commands
 	execCommand = fakeExecCommand
@@ -30,7 +29,7 @@ func TestGather(t *testing.T) {

 	assert.Equal(t, acc.NFields(), 266, "non-numeric measurements should be ignored")

-	conn := NewConnection(i.Servers[0], i.Privilege)
+	conn := NewConnection(i.Servers[0])
 	assert.Equal(t, "USERID", conn.Username)
 	assert.Equal(t, "lan", conn.Interface)

--- a/plugins/inputs/ipset/README.md
+++ b/plugins/inputs/ipset/README.md
@@ -1,62 +0,0 @@
-# Ipset Plugin
-
-The ipset plugin gathers packets and bytes counters from Linux ipset.
-It uses the output of the command "ipset save".
-Ipsets created without the "counters" option are ignored.
-
-Results are tagged with:
- ipset name
- ipset entry
-
-There are 3 ways to grant telegraf the right to run ipset:
-* Run as root (strongly discouraged)
-* Use sudo
-* Configure systemd to run telegraf with CAP_NET_ADMIN and CAP_NET_RAW capabilities.
-
-### Using systemd capabilities
-
-You may run `systemctl edit telegraf.service` and add the following:
-
-```
-[Service]
-CapabilityBoundingSet=CAP_NET_RAW CAP_NET_ADMIN
-AmbientCapabilities=CAP_NET_RAW CAP_NET_ADMIN
-```
-
-### Using sudo
-
-You may edit your sudo configuration with the following:
-
-```sudo
-telegraf ALL=(root) NOPASSWD: /sbin/ipset save
-```
-
-### Configuration
-
-```toml
-  [[inputs.ipset]]
-    ## By default, we only show sets which have already matched at least 1 packet.
-    ## set include_unmatched_sets = true to gather them all.
-    include_unmatched_sets = false
-    ## Adjust your sudo settings appropriately if using this option ("sudo ipset save")
-    ## You can avoid using sudo or root, by setting appropriate privileges for
-    ## the telegraf.service systemd service.
-    use_sudo = false
-    ## The default timeout of 1s for ipset execution can be overridden here:
-    # timeout = "1s"
-
-```
-
-### Example Output
-
-```
-$ sudo ipset save
-create myset hash:net family inet hashsize 1024 maxelem 65536 counters comment
-add myset 10.69.152.1 packets 8 bytes 672 comment "machine A"
-```
-
-```
-$ telegraf --config telegraf.conf --input-filter ipset --test --debug
-* Plugin: inputs.ipset, Collection 1
-> ipset,rule=10.69.152.1,host=trashme,set=myset bytes_total=8i,packets_total=672i 1507615028000000000
-```
--- a/plugins/inputs/ipset/ipset.go
+++ b/plugins/inputs/ipset/ipset.go
@@ -1,126 +0,0 @@
-package ipset
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"os/exec"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal"
-	"github.com/influxdata/telegraf/plugins/inputs"
-)
-
-// Ipsets is a telegraf plugin to gather packets and bytes counters from ipset
-type Ipset struct {
-	IncludeUnmatchedSets bool
-	UseSudo              bool
-	Timeout              internal.Duration
-	lister               setLister
-}
-
-type setLister func(Timeout internal.Duration, UseSudo bool) (*bytes.Buffer, error)
-
-const measurement = "ipset"
-
-var defaultTimeout = internal.Duration{Duration: time.Second}
-
-// Description returns a short description of the plugin
-func (ipset *Ipset) Description() string {
-	return "Gather packets and bytes counters from Linux ipsets"
-}
-
-// SampleConfig returns sample configuration options.
-func (ipset *Ipset) SampleConfig() string {
-	return `
-  ## By default, we only show sets which have already matched at least 1 packet.
-  ## set include_unmatched_sets = true to gather them all.
-  include_unmatched_sets = false
-  ## Adjust your sudo settings appropriately if using this option ("sudo ipset save")
-  use_sudo = false
-  ## The default timeout of 1s for ipset execution can be overridden here:
-  # timeout = "1s"
-`
-}
-
-func (ips *Ipset) Gather(acc telegraf.Accumulator) error {
-	out, e := ips.lister(ips.Timeout, ips.UseSudo)
-	if e != nil {
-		acc.AddError(e)
-	}
-
-	scanner := bufio.NewScanner(out)
-	for scanner.Scan() {
-		line := scanner.Text()
-		// Ignore sets created without the "counters" option
-		nocomment := strings.Split(line, "\"")[0]
-		if !(strings.Contains(nocomment, "packets") &&
-			strings.Contains(nocomment, "bytes")) {
-			continue
-		}
-
-		data := strings.Fields(line)
-		if len(data) < 7 {
-			acc.AddError(fmt.Errorf("Error parsing line (expected at least 7 fields): %s", line))
-			continue
-		}
-		if data[0] == "add" && (data[4] != "0" || ips.IncludeUnmatchedSets) {
-			tags := map[string]string{
-				"set":  data[1],
-				"rule": data[2],
-			}
-			packets_total, err := strconv.ParseUint(data[4], 10, 64)
-			if err != nil {
-				acc.AddError(err)
-			}
-			bytes_total, err := strconv.ParseUint(data[6], 10, 64)
-			if err != nil {
-				acc.AddError(err)
-			}
-			fields := map[string]interface{}{
-				"packets_total": packets_total,
-				"bytes_total":   bytes_total,
-			}
-			acc.AddCounter(measurement, fields, tags)
-		}
-	}
-	return nil
-}
-
-func setList(Timeout internal.Duration, UseSudo bool) (*bytes.Buffer, error) {
-	// Is ipset installed ?
-	ipsetPath, err := exec.LookPath("ipset")
-	if err != nil {
-		return nil, err
-	}
-	var args []string
-	cmdName := ipsetPath
-	if UseSudo {
-		cmdName = "sudo"
-		args = append(args, ipsetPath)
-	}
-	args = append(args, "save")
-
-	cmd := exec.Command(cmdName, args...)
-
-	var out bytes.Buffer
-	cmd.Stdout = &out
-	err = internal.RunTimeout(cmd, Timeout.Duration)
-	if err != nil {
-		return &out, fmt.Errorf("error running ipset save: %s", err)
-	}
-
-	return &out, nil
-}
-
-func init() {
-	inputs.Add("ipset", func() telegraf.Input {
-		return &Ipset{
-			lister:  setList,
-			Timeout: defaultTimeout,
-		}
-	})
-}
--- a/plugins/inputs/ipset/ipset_test.go
+++ b/plugins/inputs/ipset/ipset_test.go
@@ -1,135 +0,0 @@
-package ipset
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"reflect"
-	"testing"
-
-	"github.com/influxdata/telegraf/internal"
-	"github.com/influxdata/telegraf/testutil"
-)
-
-func TestIpset(t *testing.T) {
-	tests := []struct {
-		name   string
-		value  string
-		tags   []map[string]string
-		fields [][]map[string]interface{}
-		err    error
-	}{
-		{
-			name:  "0 sets, no results",
-			value: "",
-		},
-		{
-			name: "Empty sets, no values",
-			value: `create myset hash:net family inet hashsize 1024 maxelem 65536
-				create myset2 hash:net,port family inet hashsize 16384 maxelem 524288 counters comment
-				`,
-		},
-		{
-			name: "Non-empty sets, but no counters, no results",
-			value: `create myset hash:net family inet hashsize 1024 maxelem 65536
-				add myset 1.2.3.4
-				`,
-		},
-		{
-			name: "Line with data but not enough fields",
-			value: `create hash:net family inet hashsize 1024 maxelem 65536 counters
-				add myset 4.5.6.7 packets 123 bytes
-				`,
-			err: fmt.Errorf("Error parsing line (expected at least 7 fields): \t\t\t\tadd myset 4.5.6.7 packets 123 bytes"),
-		},
-		{
-			name: "Non-empty sets, counters, no comment",
-			value: `create myset hash:net family inet hashsize 1024 maxelem 65536 counters
-				add myset 1.2.3.4 packets 1328 bytes 79680
-				add myset 2.3.4.5 packets 0 bytes 0
-				add myset 3.4.5.6 packets 3 bytes 222
-				`,
-			tags: []map[string]string{
-				map[string]string{"set": "myset", "rule": "1.2.3.4"},
-				map[string]string{"set": "myset", "rule": "3.4.5.6"},
-			},
-			fields: [][]map[string]interface{}{
-				{map[string]interface{}{"packets_total": uint64(1328), "bytes_total": uint64(79680)}},
-				{map[string]interface{}{"packets_total": uint64(3), "bytes_total": uint64(222)}},
-			},
-		},
-		{
-			name: "Sets with counters and comment",
-			value: `create myset hash:net family inet hashsize 1024 maxelem 65536 counters comment
-				add myset 1.2.3.4 packets 1328 bytes 79680 comment "first IP"
-				add myset 2.3.4.5 packets 0 bytes 0 comment "2nd IP"
-				add myset 3.4.5.6 packets 3 bytes 222 "3rd IP"
-				`,
-			tags: []map[string]string{
-				map[string]string{"set": "myset", "rule": "1.2.3.4"},
-				map[string]string{"set": "myset", "rule": "3.4.5.6"},
-			},
-			fields: [][]map[string]interface{}{
-				{map[string]interface{}{"packets_total": uint64(1328), "bytes_total": uint64(79680)}},
-				{map[string]interface{}{"packets_total": uint64(3), "bytes_total": uint64(222)}},
-			},
-		},
-	}
-
-	for i, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			i++
-			ips := &Ipset{
-				lister: func(Timeout internal.Duration, UseSudo bool) (*bytes.Buffer, error) {
-					return bytes.NewBufferString(tt.value), nil
-				},
-			}
-			acc := new(testutil.Accumulator)
-			err := acc.GatherError(ips.Gather)
-			if !reflect.DeepEqual(tt.err, err) {
-				t.Errorf("%d: expected error '%#v' got '%#v'", i, tt.err, err)
-			}
-			if len(tt.tags) == 0 {
-				n := acc.NFields()
-				if n != 0 {
-					t.Errorf("%d: expected 0 values got %d", i, n)
-				}
-				return
-			}
-			n := 0
-			for j, tags := range tt.tags {
-				for k, fields := range tt.fields[j] {
-					if len(acc.Metrics) < n+1 {
-						t.Errorf("%d: expected at least %d values got %d", i, n+1, len(acc.Metrics))
-						break
-					}
-					m := acc.Metrics[n]
-					if !reflect.DeepEqual(m.Measurement, measurement) {
-						t.Errorf("%d %d %d: expected measurement '%#v' got '%#v'\n", i, j, k, measurement, m.Measurement)
-					}
-					if !reflect.DeepEqual(m.Tags, tags) {
-						t.Errorf("%d %d %d: expected tags\n%#v got\n%#v\n", i, j, k, tags, m.Tags)
-					}
-					if !reflect.DeepEqual(m.Fields, fields) {
-						t.Errorf("%d %d %d: expected fields\n%#v got\n%#v\n", i, j, k, fields, m.Fields)
-					}
-					n++
-				}
-			}
-		})
-	}
-}
-
-func TestIpset_Gather_listerError(t *testing.T) {
-	errFoo := errors.New("error foobar")
-	ips := &Ipset{
-		lister: func(Timeout internal.Duration, UseSudo bool) (*bytes.Buffer, error) {
-			return new(bytes.Buffer), errFoo
-		},
-	}
-	acc := new(testutil.Accumulator)
-	err := acc.GatherError(ips.Gather)
-	if !reflect.DeepEqual(err, errFoo) {
-		t.Errorf("Expected error %#v got\n%#v\n", errFoo, err)
-	}
-}
--- a/plugins/inputs/jolokia2/jolokia_agent.go
+++ b/plugins/inputs/jolokia2/jolokia_agent.go
@@ -46,7 +46,7 @@ func (ja *JolokiaAgent) SampleConfig() string {
  # insecure_skip_verify = false

  ## Add metrics to read
-  [[inputs.jolokia2_agent.metric]]
+  [[inputs.jolokia2.metric]]
    name  = "java_runtime"
    mbean = "java.lang:type=Runtime"
    paths = ["Uptime"]
--- a/plugins/inputs/kapacitor/README.md
+++ b/plugins/inputs/kapacitor/README.md
@@ -14,13 +14,6 @@ The Kapacitor plugin will collect metrics from the given Kapacitor instances.

  ## Time limit for http requests
  timeout = "5s"
-
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
-  # insecure_skip_verify = false
 ```

 ### Measurements & Fields
--- a/plugins/inputs/kapacitor/kapacitor.go
+++ b/plugins/inputs/kapacitor/kapacitor.go
@@ -21,15 +21,6 @@ type Kapacitor struct {

 	Timeout internal.Duration

-	// Path to CA file
-	SSLCA string `toml:"ssl_ca"`
-	// Path to host cert file
-	SSLCert string `toml:"ssl_cert"`
-	// Path to cert key file
-	SSLKey string `toml:"ssl_key"`
-	// Use SSL but skip chain & host verification
-	InsecureSkipVerify bool
-
 	client *http.Client
 }

@@ -47,23 +38,12 @@ func (*Kapacitor) SampleConfig() string {

  ## Time limit for http requests
  timeout = "5s"
-
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
-  # insecure_skip_verify = false
 `
 }

 func (k *Kapacitor) Gather(acc telegraf.Accumulator) error {
 	if k.client == nil {
-		client, err := k.createHttpClient()
-		if err != nil {
-			return err
-		}
-		k.client = client
+		k.client = &http.Client{Timeout: k.Timeout.Duration}
 	}

 	var wg sync.WaitGroup
@@ -81,23 +61,6 @@ func (k *Kapacitor) Gather(acc telegraf.Accumulator) error {
 	return nil
 }

-func (k *Kapacitor) createHttpClient() (*http.Client, error) {
-	tlsCfg, err := internal.GetTLSConfig(
-		k.SSLCert, k.SSLKey, k.SSLCA, k.InsecureSkipVerify)
-	if err != nil {
-		return nil, err
-	}
-
-	client := &http.Client{
-		Transport: &http.Transport{
-			TLSClientConfig: tlsCfg,
-		},
-		Timeout: k.Timeout.Duration,
-	}
-
-	return client, nil
-}
-
 type object struct {
 	Name   string                 `json:"name"`
 	Values map[string]interface{} `json:"values"`
--- a/plugins/inputs/logparser/grok/grok.go
+++ b/plugins/inputs/logparser/grok/grok.go
@@ -326,10 +326,6 @@ func (p *Parser) ParseLine(line string) (telegraf.Metric, error) {
 		}
 	}

-	if len(fields) == 0 {
-		return nil, fmt.Errorf("logparser_grok: must have one or more fields")
-	}
-
 	return metric.New(p.Measurement, tags, fields, p.tsModder.tsMod(timestamp))
 }

--- a/plugins/inputs/logparser/grok/grok_test.go
+++ b/plugins/inputs/logparser/grok/grok_test.go
@@ -799,7 +799,7 @@ func TestTimezoneEmptyCompileFileAndParse(t *testing.T) {
 		},
 		metricA.Fields())
 	assert.Equal(t, map[string]string{"response_code": "200"}, metricA.Tags())
-	assert.Equal(t, int64(1465040505000000000), metricA.Time().UnixNano())
+	assert.Equal(t, int64(1465040505000000000), metricA.UnixNano())

 	metricB, err := p.ParseLine(`[04/06/2016--12:41:45] 1.25 mystring dropme nomodifier`)
 	require.NotNil(t, metricB)
@@ -812,7 +812,7 @@ func TestTimezoneEmptyCompileFileAndParse(t *testing.T) {
 		},
 		metricB.Fields())
 	assert.Equal(t, map[string]string{}, metricB.Tags())
-	assert.Equal(t, int64(1465044105000000000), metricB.Time().UnixNano())
+	assert.Equal(t, int64(1465044105000000000), metricB.UnixNano())
 }

 func TestTimezoneMalformedCompileFileAndParse(t *testing.T) {
@@ -835,7 +835,7 @@ func TestTimezoneMalformedCompileFileAndParse(t *testing.T) {
 		},
 		metricA.Fields())
 	assert.Equal(t, map[string]string{"response_code": "200"}, metricA.Tags())
-	assert.Equal(t, int64(1465040505000000000), metricA.Time().UnixNano())
+	assert.Equal(t, int64(1465040505000000000), metricA.UnixNano())

 	metricB, err := p.ParseLine(`[04/06/2016--12:41:45] 1.25 mystring dropme nomodifier`)
 	require.NotNil(t, metricB)
@@ -848,7 +848,7 @@ func TestTimezoneMalformedCompileFileAndParse(t *testing.T) {
 		},
 		metricB.Fields())
 	assert.Equal(t, map[string]string{}, metricB.Tags())
-	assert.Equal(t, int64(1465044105000000000), metricB.Time().UnixNano())
+	assert.Equal(t, int64(1465044105000000000), metricB.UnixNano())
 }

 func TestTimezoneEuropeCompileFileAndParse(t *testing.T) {
@@ -871,7 +871,7 @@ func TestTimezoneEuropeCompileFileAndParse(t *testing.T) {
 		},
 		metricA.Fields())
 	assert.Equal(t, map[string]string{"response_code": "200"}, metricA.Tags())
-	assert.Equal(t, int64(1465040505000000000), metricA.Time().UnixNano())
+	assert.Equal(t, int64(1465040505000000000), metricA.UnixNano())

 	metricB, err := p.ParseLine(`[04/06/2016--12:41:45] 1.25 mystring dropme nomodifier`)
 	require.NotNil(t, metricB)
@@ -884,7 +884,7 @@ func TestTimezoneEuropeCompileFileAndParse(t *testing.T) {
 		},
 		metricB.Fields())
 	assert.Equal(t, map[string]string{}, metricB.Tags())
-	assert.Equal(t, int64(1465036905000000000), metricB.Time().UnixNano())
+	assert.Equal(t, int64(1465036905000000000), metricB.UnixNano())
 }

 func TestTimezoneAmericasCompileFileAndParse(t *testing.T) {
@@ -907,7 +907,7 @@ func TestTimezoneAmericasCompileFileAndParse(t *testing.T) {
 		},
 		metricA.Fields())
 	assert.Equal(t, map[string]string{"response_code": "200"}, metricA.Tags())
-	assert.Equal(t, int64(1465040505000000000), metricA.Time().UnixNano())
+	assert.Equal(t, int64(1465040505000000000), metricA.UnixNano())

 	metricB, err := p.ParseLine(`[04/06/2016--12:41:45] 1.25 mystring dropme nomodifier`)
 	require.NotNil(t, metricB)
@@ -920,7 +920,7 @@ func TestTimezoneAmericasCompileFileAndParse(t *testing.T) {
 		},
 		metricB.Fields())
 	assert.Equal(t, map[string]string{}, metricB.Tags())
-	assert.Equal(t, int64(1465058505000000000), metricB.Time().UnixNano())
+	assert.Equal(t, int64(1465058505000000000), metricB.UnixNano())
 }

 func TestTimezoneLocalCompileFileAndParse(t *testing.T) {
@@ -943,7 +943,7 @@ func TestTimezoneLocalCompileFileAndParse(t *testing.T) {
 		},
 		metricA.Fields())
 	assert.Equal(t, map[string]string{"response_code": "200"}, metricA.Tags())
-	assert.Equal(t, int64(1465040505000000000), metricA.Time().UnixNano())
+	assert.Equal(t, int64(1465040505000000000), metricA.UnixNano())

 	metricB, err := p.ParseLine(`[04/06/2016--12:41:45] 1.25 mystring dropme nomodifier`)
 	require.NotNil(t, metricB)
@@ -956,5 +956,5 @@ func TestTimezoneLocalCompileFileAndParse(t *testing.T) {
 		},
 		metricB.Fields())
 	assert.Equal(t, map[string]string{}, metricB.Tags())
-	assert.Equal(t, time.Date(2016, time.June, 4, 12, 41, 45, 0, time.Local).UnixNano(), metricB.Time().UnixNano())
+	assert.Equal(t, time.Date(2016, time.June, 4, 12, 41, 45, 0, time.Local).UnixNano(), metricB.UnixNano())
 }
--- a/plugins/inputs/mesos/README.md
+++ b/plugins/inputs/mesos/README.md
@@ -11,7 +11,7 @@ For more information, please check the [Mesos Observability Metrics](http://meso
  ## Timeout, in ms.
  timeout = 100
  ## A list of Mesos masters.
-  masters = ["http://localhost:5050"]
+  masters = ["localhost:5050"]
  ## Master metrics groups to be collected, by default, all enabled.
  master_collections = [
    "resources",
@@ -35,13 +35,6 @@ For more information, please check the [Mesos Observability Metrics](http://meso
  #   "tasks",
  #   "messages",
  # ]
-
-  ## 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
 ```

 By default this plugin is not configured to gather metrics from mesos. Since a mesos cluster can be deployed in numerous ways it does not provide any default
@@ -242,8 +235,7 @@ Mesos slave metric groups
 ### Tags:

 - All master/slave measurements have the following tags:
-    - server (network location of server: `host:port`)
-    - url (URL origin of server: `scheme://host:port`)
+    - server
    - role (master/slave)

 - All master measurements have the extra tags:
--- a/plugins/inputs/mesos/mesos.go
+++ b/plugins/inputs/mesos/mesos.go
@@ -7,14 +7,11 @@ import (
 	"log"
 	"net"
 	"net/http"
-	"net/url"
 	"strconv"
-	"strings"
 	"sync"
 	"time"

 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	jsonparser "github.com/influxdata/telegraf/plugins/parsers/json"
 )
@@ -33,20 +30,6 @@ type Mesos struct {
 	Slaves     []string
 	SlaveCols  []string `toml:"slave_collections"`
 	//SlaveTasks bool
-
-	// Path to CA file
-	SSLCA string `toml:"ssl_ca"`
-	// Path to host cert file
-	SSLCert string `toml:"ssl_cert"`
-	// Path to cert key file
-	SSLKey string `toml:"ssl_key"`
-	// Use SSL but skip chain & host verification
-	InsecureSkipVerify bool
-
-	initialized bool
-	client      *http.Client
-	masterURLs  []*url.URL
-	slaveURLs   []*url.URL
 }

 var allMetrics = map[Role][]string{
@@ -58,7 +41,7 @@ var sampleConfig = `
  ## Timeout, in ms.
  timeout = 100
  ## A list of Mesos masters.
-  masters = ["http://localhost:5050"]
+  masters = ["localhost:5050"]
  ## Master metrics groups to be collected, by default, all enabled.
  master_collections = [
    "resources",
@@ -82,13 +65,6 @@ var sampleConfig = `
  #   "tasks",
  #   "messages",
  # ]
-
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
-  # insecure_skip_verify = false
 `

 // SampleConfig returns a sample configuration block
@@ -101,28 +77,7 @@ func (m *Mesos) Description() string {
 	return "Telegraf plugin for gathering metrics from N Mesos masters"
 }

-func parseURL(s string, role Role) (*url.URL, error) {
-	if !strings.HasPrefix(s, "http://") && !strings.HasPrefix(s, "https://") {
-		host, port, err := net.SplitHostPort(s)
-		// no port specified
-		if err != nil {
-			host = s
-			switch role {
-			case MASTER:
-				port = "5050"
-			case SLAVE:
-				port = "5051"
-			}
-		}
-
-		s = "http://" + host + ":" + port
-		log.Printf("W! [inputs.mesos] Using %q as connection URL; please update your configuration to use an URL", s)
-	}
-
-	return url.Parse(s)
-}
-
-func (m *Mesos) initialize() error {
+func (m *Mesos) SetDefaults() {
 	if len(m.MasterCols) == 0 {
 		m.MasterCols = allMetrics[MASTER]
 	}
@@ -132,71 +87,33 @@ func (m *Mesos) initialize() error {
 	}

 	if m.Timeout == 0 {
-		log.Println("I! [inputs.mesos] Missing timeout value, setting default value (100ms)")
+		log.Println("I! [mesos] Missing timeout value, setting default value (100ms)")
 		m.Timeout = 100
 	}
-
-	rawQuery := "timeout=" + strconv.Itoa(m.Timeout) + "ms"
-
-	m.masterURLs = make([]*url.URL, 0, len(m.Masters))
-	for _, master := range m.Masters {
-		u, err := parseURL(master, MASTER)
-		if err != nil {
-			return err
-		}
-
-		u.RawQuery = rawQuery
-		m.masterURLs = append(m.masterURLs, u)
-	}
-
-	m.slaveURLs = make([]*url.URL, 0, len(m.Slaves))
-	for _, slave := range m.Slaves {
-		u, err := parseURL(slave, SLAVE)
-		if err != nil {
-			return err
-		}
-
-		u.RawQuery = rawQuery
-		m.slaveURLs = append(m.slaveURLs, u)
-	}
-
-	client, err := m.createHttpClient()
-	if err != nil {
-		return err
-	}
-	m.client = client
-
-	return nil
 }

 // Gather() metrics from given list of Mesos Masters
 func (m *Mesos) Gather(acc telegraf.Accumulator) error {
-	if !m.initialized {
-		err := m.initialize()
-		if err != nil {
-			return err
-		}
-		m.initialized = true
-	}
-
 	var wg sync.WaitGroup

-	for _, master := range m.masterURLs {
+	m.SetDefaults()
+
+	for _, v := range m.Masters {
 		wg.Add(1)
-		go func(master *url.URL) {
-			acc.AddError(m.gatherMainMetrics(master, MASTER, acc))
+		go func(c string) {
+			acc.AddError(m.gatherMainMetrics(c, ":5050", MASTER, acc))
 			wg.Done()
 			return
-		}(master)
+		}(v)
 	}

-	for _, slave := range m.slaveURLs {
+	for _, v := range m.Slaves {
 		wg.Add(1)
-		go func(slave *url.URL) {
-			acc.AddError(m.gatherMainMetrics(slave, SLAVE, acc))
+		go func(c string) {
+			acc.AddError(m.gatherMainMetrics(c, ":5051", SLAVE, acc))
 			wg.Done()
 			return
-		}(slave)
+		}(v)

 		// if !m.SlaveTasks {
 		// 	continue
@@ -204,7 +121,7 @@ func (m *Mesos) Gather(acc telegraf.Accumulator) error {

 		// wg.Add(1)
 		// go func(c string) {
-		// 	acc.AddError(m.gatherSlaveTaskMetrics(slave, acc))
+		// 	acc.AddError(m.gatherSlaveTaskMetrics(c, ":5051", acc))
 		// 	wg.Done()
 		// 	return
 		// }(v)
@@ -215,24 +132,6 @@ func (m *Mesos) Gather(acc telegraf.Accumulator) error {
 	return nil
 }

-func (m *Mesos) createHttpClient() (*http.Client, error) {
-	tlsCfg, err := internal.GetTLSConfig(
-		m.SSLCert, m.SSLKey, m.SSLCA, m.InsecureSkipVerify)
-	if err != nil {
-		return nil, err
-	}
-
-	client := &http.Client{
-		Transport: &http.Transport{
-			Proxy:           http.ProxyFromEnvironment,
-			TLSClientConfig: tlsCfg,
-		},
-		Timeout: 4 * time.Second,
-	}
-
-	return client, nil
-}
-
 // metricsDiff() returns set names for removal
 func metricsDiff(role Role, w []string) []string {
 	b := []string{}
@@ -494,6 +393,15 @@ func (m *Mesos) filterMetrics(role Role, metrics *map[string]interface{}) {
 	}
 }

+var tr = &http.Transport{
+	ResponseHeaderTimeout: time.Duration(3 * time.Second),
+}
+
+var client = &http.Client{
+	Transport: tr,
+	Timeout:   time.Duration(4 * time.Second),
+}
+
 // TaskStats struct for JSON API output /monitor/statistics
 type TaskStats struct {
 	ExecutorID  string                 `json:"executor_id"`
@@ -501,15 +409,22 @@ type TaskStats struct {
 	Statistics  map[string]interface{} `json:"statistics"`
 }

-func (m *Mesos) gatherSlaveTaskMetrics(u *url.URL, acc telegraf.Accumulator) error {
+func (m *Mesos) gatherSlaveTaskMetrics(address string, defaultPort string, acc telegraf.Accumulator) error {
 	var metrics []TaskStats

-	tags := map[string]string{
-		"server": u.Hostname(),
-		"url":    urlTag(u),
+	host, _, err := net.SplitHostPort(address)
+	if err != nil {
+		host = address
+		address = address + defaultPort
 	}

-	resp, err := m.client.Get(withPath(u, "/monitor/statistics").String())
+	tags := map[string]string{
+		"server": host,
+	}
+
+	ts := strconv.Itoa(m.Timeout) + "ms"
+
+	resp, err := client.Get("http://" + address + "/monitor/statistics?timeout=" + ts)

 	if err != nil {
 		return err
@@ -544,31 +459,24 @@ func (m *Mesos) gatherSlaveTaskMetrics(u *url.URL, acc telegraf.Accumulator) err
 	return nil
 }

-func withPath(u *url.URL, path string) *url.URL {
-	c := *u
-	c.Path = path
-	return &c
-}
-
-func urlTag(u *url.URL) string {
-	c := *u
-	c.Path = ""
-	c.User = nil
-	c.RawQuery = ""
-	return c.String()
-}
-
 // This should not belong to the object
-func (m *Mesos) gatherMainMetrics(u *url.URL, role Role, acc telegraf.Accumulator) error {
+func (m *Mesos) gatherMainMetrics(a string, defaultPort string, role Role, acc telegraf.Accumulator) error {
 	var jsonOut map[string]interface{}

+	host, _, err := net.SplitHostPort(a)
+	if err != nil {
+		host = a
+		a = a + defaultPort
+	}
+
 	tags := map[string]string{
-		"server": u.Hostname(),
-		"url":    urlTag(u),
+		"server": host,
 		"role":   string(role),
 	}

-	resp, err := m.client.Get(withPath(u, "/metrics/snapshot").String())
+	ts := strconv.Itoa(m.Timeout) + "ms"
+
+	resp, err := client.Get("http://" + a + "/metrics/snapshot?timeout=" + ts)

 	if err != nil {
 		return err
--- a/plugins/inputs/mesos/mesos_test.go
+++ b/plugins/inputs/mesos/mesos_test.go
@@ -6,12 +6,10 @@ import (
 	"math/rand"
 	"net/http"
 	"net/http/httptest"
-	"net/url"
 	"os"
 	"testing"

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

 var masterMetrics map[string]interface{}
@@ -380,19 +378,3 @@ func TestSlaveFilter(t *testing.T) {
 		}
 	}
 }
-
-func TestWithPathDoesNotModify(t *testing.T) {
-	u, err := url.Parse("http://localhost:5051")
-	require.NoError(t, err)
-	v := withPath(u, "/xyzzy")
-	require.Equal(t, u.String(), "http://localhost:5051")
-	require.Equal(t, v.String(), "http://localhost:5051/xyzzy")
-}
-
-func TestURLTagDoesNotModify(t *testing.T) {
-	u, err := url.Parse("http://a:b@localhost:5051?timeout=1ms")
-	require.NoError(t, err)
-	v := urlTag(u)
-	require.Equal(t, u.String(), "http://a:b@localhost:5051?timeout=1ms")
-	require.Equal(t, v, "http://localhost:5051")
-}
--- a/plugins/inputs/mongodb/README.md
+++ b/plugins/inputs/mongodb/README.md
@@ -49,10 +49,6 @@ and create a single measurement containing values e.g.
 * resident_megabytes
 * updates_per_sec
 * vsize_megabytes
- * total_in_use
- * total_available
- * total_created
- * total_refreshing
 * ttl_deletes_per_sec
 * ttl_passes_per_sec
 * repl_lag
--- a/plugins/inputs/mongodb/mongodb_data.go
+++ b/plugins/inputs/mongodb/mongodb_data.go
@@ -66,13 +66,6 @@ var DefaultClusterStats = map[string]string{
 	"jumbo_chunks": "JumboChunksCount",
 }

-var DefaultShardStats = map[string]string{
-	"total_in_use":     "TotalInUse",
-	"total_available":  "TotalAvailable",
-	"total_created":    "TotalCreated",
-	"total_refreshing": "TotalRefreshing",
-}
-
 var MmapStats = map[string]string{
 	"mapped_megabytes":     "Mapped",
 	"non-mapped_megabytes": "NonMapped",
@@ -134,8 +127,7 @@ func (d *MongodbData) AddDefaultStats() {
 		d.addStat(statLine, DefaultReplStats)
 	}
 	d.addStat(statLine, DefaultClusterStats)
-	d.addStat(statLine, DefaultShardStats)
-	if d.StatLine.StorageEngine == "mmapv1" || d.StatLine.StorageEngine == "rocksdb" {
+	if d.StatLine.StorageEngine == "mmapv1" {
 		d.addStat(statLine, MmapStats)
 	} else if d.StatLine.StorageEngine == "wiredTiger" {
 		for key, value := range WiredTigerStats {
--- a/plugins/inputs/mongodb/mongodb_data_test.go
+++ b/plugins/inputs/mongodb/mongodb_data_test.go
@@ -99,27 +99,6 @@ func TestAddWiredTigerStats(t *testing.T) {
 	}
 }

-func TestAddShardStats(t *testing.T) {
-	d := NewMongodbData(
-		&StatLine{
-			TotalInUse:      0,
-			TotalAvailable:  0,
-			TotalCreated:    0,
-			TotalRefreshing: 0,
-		},
-		tags,
-	)
-
-	var acc testutil.Accumulator
-
-	d.AddDefaultStats()
-	d.flush(&acc)
-
-	for key, _ := range DefaultShardStats {
-		assert.True(t, acc.HasInt64Field("mongodb", key))
-	}
-}
-
 func TestStateTag(t *testing.T) {
 	d := NewMongodbData(
 		&StatLine{
@@ -168,10 +147,6 @@ func TestStateTag(t *testing.T) {
 		"ttl_deletes_per_sec":   int64(0),
 		"ttl_passes_per_sec":    int64(0),
 		"jumbo_chunks":          int64(0),
-		"total_in_use":          int64(0),
-		"total_available":       int64(0),
-		"total_created":         int64(0),
-		"total_refreshing":      int64(0),
 	}
 	acc.AssertContainsTaggedFields(t, "mongodb", fields, stateTags)
 }
--- a/plugins/inputs/mongodb/mongodb_server.go
+++ b/plugins/inputs/mongodb/mongodb_server.go
@@ -55,18 +55,8 @@ func (s *Server) gatherData(acc telegraf.Accumulator, gatherDbStats bool) error
 		JumboChunksCount: int64(jumbo_chunks),
 	}

-	resultShards := &ShardStats{}
-	err = s.Session.DB("admin").Run(bson.D{
-		{
-			Name:  "shardConnPoolStats",
-			Value: 1,
-		},
-	}, &resultShards)
-	if err != nil {
-		log.Println("E! Error getting database shard stats (" + err.Error() + ")")
-	}
-
 	result_db_stats := &DbStats{}
+
 	if gatherDbStats == true {
 		names := []string{}
 		names, err = s.Session.DatabaseNames()
@@ -98,7 +88,6 @@ func (s *Server) gatherData(acc telegraf.Accumulator, gatherDbStats bool) error
 		ReplSetStatus: result_repl,
 		ClusterStatus: result_cluster,
 		DbStats:       result_db_stats,
-		ShardStats:    resultShards,
 	}

 	defer func() {
--- a/plugins/inputs/mongodb/mongostat.go
+++ b/plugins/inputs/mongodb/mongostat.go
@@ -34,7 +34,6 @@ type MongoStatus struct {
 	ReplSetStatus *ReplSetStatus
 	ClusterStatus *ClusterStatus
 	DbStats       *DbStats
-	ShardStats    *ShardStats
 }

 type ServerStatus struct {
@@ -117,14 +116,6 @@ type WiredTiger struct {
 	Cache       CacheStats             `bson:"cache"`
 }

-// ShardStats stores information from shardConnPoolStats.
-type ShardStats struct {
-	TotalInUse      int64 `bson:"totalInUse"`
-	TotalAvailable  int64 `bson:"totalAvailable"`
-	TotalCreated    int64 `bson:"totalCreated"`
-	TotalRefreshing int64 `bson:"totalRefreshing"`
-}
-
 type ConcurrentTransactions struct {
 	Write ConcurrentTransStats `bson:"write"`
 	Read  ConcurrentTransStats `bson:"read"`
@@ -459,9 +450,6 @@ type StatLine struct {

 	// DB stats field
 	DbStatsLines []DbStatLine
-
-	// Shard stats
-	TotalInUse, TotalAvailable, TotalCreated, TotalRefreshing int64
 }

 type DbStatLine struct {
@@ -795,12 +783,5 @@ func NewStatLine(oldMongo, newMongo MongoStatus, key string, all bool, sampleSec
 		returnVal.DbStatsLines = append(returnVal.DbStatsLines, *dbStatLine)
 	}

-	// Set shard stats
-	newShardStats := *newMongo.ShardStats
-	returnVal.TotalInUse = newShardStats.TotalInUse
-	returnVal.TotalAvailable = newShardStats.TotalAvailable
-	returnVal.TotalCreated = newShardStats.TotalCreated
-	returnVal.TotalRefreshing = newShardStats.TotalRefreshing
-
 	return returnVal
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Daniel Nelson	a1668bbf9a	Set release date for 1.5.0	2017-12-14 10:59:13 -08:00
Daniel Nelson	fe91c779e9	Remove AWS credential check from cloudwatch output (#3583 ) This method is reported to not work with IAM Instance Profiles, and we do not want to make any calls that would require additional permissions. (cherry picked from commit `5b40173bcb`)	2017-12-13 17:52:45 -08:00
Daniel Nelson	425b6f7d63	Update changelog (cherry picked from commit `15266bb7eb`)	2017-12-13 11:18:34 -08:00
Ildar Svetlov	c322ddb4b0	Don't add system input uptime_format as a counter (#3578 ) (cherry picked from commit `d935dfa9ed`)	2017-12-13 11:17:55 -08:00
Daniel Nelson	648d3bde33	Update changelog (cherry picked from commit `ff634c5056`)	2017-12-13 10:58:16 -08:00
Daniel Nelson	d8da77cb42	Add idle state to processes test (cherry picked from commit `14b31a2354`)	2017-12-13 10:57:28 -08:00
Ted Zlatanov	fdb04702eb	Support I (idle) process state on procfs+Linux (#3530 ) (cherry picked from commit `663a5b1f50`)	2017-12-13 10:56:47 -08:00
Steve Banik	ecf43f4986	Fixed typo in README.md (#3574 ) (cherry picked from commit `d7d224d511`)	2017-12-12 11:22:33 -08:00
Daniel Nelson	e307e92e86	Update changelog (cherry picked from commit `abcad439eb`)	2017-12-11 18:02:35 -08:00
Daniel Nelson	8d4a09c3ea	Fix separation of multiple prometheus_client outputs (#3570 ) (cherry picked from commit `8484de6c12`)	2017-12-11 18:02:30 -08:00
Daniel Nelson	fd964bd4eb	Use auto type detection for scanned devices in smart input (#3561 ) (cherry picked from commit `93d16a4603`)	2017-12-08 18:03:39 -08:00
Daniel Nelson	994e75f1f0	Update changelog (cherry picked from commit `88746b01c3`)	2017-12-08 18:02:17 -08:00
Daniel Nelson	2e2efafbfc	Update sarama-cluster to latest release (#3560 ) (cherry picked from commit `37095ef47d`)	2017-12-08 18:02:17 -08:00
Daniel Nelson	39537ed86e	Use device name instead of abs path for devices tag in smart input (#3550 ) (cherry picked from commit `574034c301`)	2017-12-08 13:26:15 -08:00
Daniel Nelson	558ce25c94	Log connect error only in wavefront output (#3549 ) (cherry picked from commit `177e7e2c73`)	2017-12-06 14:56:28 -08:00
Daniel Nelson	0438f412a9	Fix formatting in changelog	2017-12-04 13:17:23 -08:00