From 827367963420326a90e14dd3ffc14dcc0e4e94d5 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Thu, 20 Aug 2015 14:40:23 -0600
Subject: [PATCH] 0.1.6, update changelog, readme, plugins list

---
 CHANGELOG.md           |  2 +-
 README.md              | 35 ++++++++++++++++++++---------------
 plugins/exec/README.md | 15 +++++++++++++++
 3 files changed, 36 insertions(+), 16 deletions(-)
 create mode 100644 plugins/exec/README.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7e4d3d5d..3a44c416f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## v0.1.6 [unreleased]
+## v0.1.6 [2015-08-20]
 
 ### Features
 - [#112](https://github.com/influxdb/telegraf/pull/112): Datadog output. Thanks @jipperinbham!
diff --git a/README.md b/README.md
index cc05e6ed9..deeb49de3 100644
--- a/README.md
+++ b/README.md
@@ -30,8 +30,8 @@ are some InfluxDB compatibility requirements:
 * InfluxDB 0.9.2 and prior requires Telegraf 0.1.4
 
 Telegraf 0.1.5
-* http://get.influxdb.org/telegraf/telegraf_0.1.5_amd64.deb
-* http://get.influxdb.org/telegraf/telegraf-0.1.5-1.x86_64.rpm
+* http://get.influxdb.org/telegraf/telegraf_0.1.6_amd64.deb
+* http://get.influxdb.org/telegraf/telegraf-0.1.6-1.x86_64.rpm
 
 Telegraf 0.1.4
 * http://get.influxdb.org/telegraf/telegraf_0.1.4_amd64.deb
@@ -135,19 +135,24 @@ path = [ "/opt", "/home" ]
 
 Telegraf currently has support for collecting metrics from:
 
-* System (memory, CPU, network, etc.)
-* Docker
-* MySQL
-* Prometheus (client libraries and exporters)
-* PostgreSQL
-* Redis
-* Elasticsearch
-* RethinkDB
-* Kafka
-* MongoDB
-* Disque
-* Lustre2
-* Memcached
+* disque
+* elasticsearch
+* exec (generic executable JSON-gathering plugin)
+* haproxy
+* httpjson (generic JSON-emitting http service plugin)
+* kafka_consumer
+* leofs
+* lustre2
+* memcached
+* mongodb
+* mysql
+* nginx
+* postgresql
+* prometheus
+* rabbitmq
+* redis
+* rethinkdb
+* system (mem, CPU, load, etc.)
 
 We'll be adding support for many more over the coming months. Read on if you
 want to add support for another service or third-party API.
diff --git a/plugins/exec/README.md b/plugins/exec/README.md
new file mode 100644
index 000000000..abe99da32
--- /dev/null
+++ b/plugins/exec/README.md
@@ -0,0 +1,15 @@
+# Exec Plugin
+
+The exec plugin can execute arbitrary commands which return flattened
+JSON.
+
+For example, if you have a json-returning command called mycollector, you could
+setup the exec plugin with:
+
+```
+[[exec.commands]]
+command = "/usr/bin/mycollector --output=json"
+name = "mycollector"
+```
+
+The name is used as a prefix for the measurements.