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 diff --git a/README.md b/README.md index 6de2d94f8..0c97264df 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: @@ -51,6 +51,8 @@ Telegraf currently has support for collecting metrics from: * PostgreSQL * Redis * Elasticsearch (indices stats) +* 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. 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 +```