From b3c13b7aefa8b529e8a836dc209a411d677ee3e8 Mon Sep 17 00:00:00 2001
From: Emil Stolarsky <emil.stolarsky@gmail.com>
Date: Wed, 8 Jul 2015 15:39:23 -0400
Subject: [PATCH 1/4] Adds README for Kafka consumer plugin

---
 plugins/kafka_consumer/README.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 plugins/kafka_consumer/README.md

diff --git a/plugins/kafka_consumer/README.md b/plugins/kafka_consumer/README.md
new file mode 100644
index 000000000..15e404215
--- /dev/null
+++ b/plugins/kafka_consumer/README.md
@@ -0,0 +1,24 @@
+# Kafka Consumer
+
+The [Kafka](http://kafka.apache.org/) consumer plugin polls a specified Kafka
+topic and adds messages to InfluxDB. The plugin assumes messages follow the
+line protocol. [Consumer Group](http://godoc.org/github.com/wvanbergen/kafka/consumergroup)
+is used to talk to the Kafka cluster so multiple instances of telegraf can read
+from the same topic in parallel.
+
+## Testing
+
+Running integration tests requires running Zookeeper & Kafka. The following
+commands assume you're on OS X & using [boot2docker](http://boot2docker.io/).
+
+To start Kafka & Zookeeper:
+
+```
+docker run -d -p 2181:2181 -p 9092:9092 --env ADVERTISED_HOST=`boot2docker ip` --env ADVERTISED_PORT=9092 spotify/kafka
+```
+
+To run tests:
+
+```
+ZOOKEEPER_PEERS=$(boot2docker ip):2181 KAFKA_PEERS=$(boot2docker ip):9092 go test
+```

From 56d49f2f4f914cf6d032b2fd9ffd2609a4c9915f Mon Sep 17 00:00:00 2001
From: Todd Persen <toddboom@gmail.com>
Date: Thu, 9 Jul 2015 12:19:49 -0600
Subject: [PATCH 2/4] Update CHANGELOG.md

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36e652480..f7fcae123 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## v0.1.4 [2015-07-09]
+
+### Features
+- [#56](https://github.com/influxdb/telegraf/pull/56): Update README for Kafka plugin. Thanks @EmilS!
+
+### Bugfixes
+- [#50](https://github.com/influxdb/telegraf/pull/50): Fix init.sh script to use telegraf directory. Thanks @jseriff!
+- [#52](https://github.com/influxdb/telegraf/pull/52): Update CHANGELOG to reference updated directory. Thanks @benfb!
+
 ## v0.1.3 [2015-07-05]
 
 ### Features

From 1d23681efebd5147dc9d0226db7a2bf4f4273440 Mon Sep 17 00:00:00 2001
From: Todd Persen <toddboom@gmail.com>
Date: Thu, 9 Jul 2015 12:20:23 -0600
Subject: [PATCH 3/4] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 52435e8a7..c0e68e05a 100644
--- a/README.md
+++ b/README.md
@@ -13,8 +13,8 @@ We'll eagerly accept pull requests for new plugins and will manage the set of pl
 ### Linux packages for Debian/Ubuntu and RHEL/CentOS:
 
 ```
-http://get.influxdb.org/telegraf/telegraf_0.1.3_amd64.deb
-http://get.influxdb.org/telegraf/telegraf-0.1.3-1.x86_64.rpm
+http://get.influxdb.org/telegraf/telegraf_0.1.4_amd64.deb
+http://get.influxdb.org/telegraf/telegraf-0.1.4-1.x86_64.rpm
 ```
 
 ### OSX via Homebrew:

From c4e5e743c43909ded0ca263a2c496c1996ed773b Mon Sep 17 00:00:00 2001
From: Todd Persen <toddboom@gmail.com>
Date: Thu, 9 Jul 2015 12:22:10 -0600
Subject: [PATCH 4/4] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index c0e68e05a..347466706 100644
--- a/README.md
+++ b/README.md
@@ -50,6 +50,8 @@ Telegraf currently has support for collecting metrics from:
 * Prometheus (client libraries and exporters)
 * PostgreSQL
 * Redis
+* RethinkDB
+* Kafka
 
 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.