diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ed2d412..62afc1a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,9 @@ ### Bugfixes -- [#1330](https://github.com/influxdata/telegraf/issues/1330): Fix exec plugin panic when using single binary -- [#1336](https://github.com/influxdata/telegraf/issues/1336): Fixed incorrect prometheus metrics source selection +- [#1330](https://github.com/influxdata/telegraf/issues/1330): Fix exec plugin panic when using single binary. +- [#1336](https://github.com/influxdata/telegraf/issues/1336): Fixed incorrect prometheus metrics source selection. +- [#1112](https://github.com/influxdata/telegraf/issues/1112): Set default Zookeeper chroot to empty string. ## v1.0 beta 1 [2016-06-07] diff --git a/etc/telegraf.conf b/etc/telegraf.conf index 176b32f0..2325582f 100644 --- a/etc/telegraf.conf +++ b/etc/telegraf.conf @@ -1501,7 +1501,7 @@ # ## an array of Zookeeper connection strings # zookeeper_peers = ["localhost:2181"] # ## Zookeeper Chroot -# zookeeper_chroot = "/" +# zookeeper_chroot = "" # ## the name of the consumer group # consumer_group = "telegraf_metrics_consumers" # ## Offset (must be either "oldest" or "newest") diff --git a/plugins/inputs/kafka_consumer/kafka_consumer.go b/plugins/inputs/kafka_consumer/kafka_consumer.go index a2cda43d..5600d82a 100644 --- a/plugins/inputs/kafka_consumer/kafka_consumer.go +++ b/plugins/inputs/kafka_consumer/kafka_consumer.go @@ -50,7 +50,7 @@ var sampleConfig = ` ## an array of Zookeeper connection strings zookeeper_peers = ["localhost:2181"] ## Zookeeper Chroot - zookeeper_chroot = "/" + zookeeper_chroot = "" ## the name of the consumer group consumer_group = "telegraf_metrics_consumers" ## Offset (must be either "oldest" or "newest")