From 1ef5599361991cbf8d87c2c239aeb3aa6720bbbe Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Tue, 24 May 2016 15:34:56 +0100
Subject: [PATCH] update changelog & etc/telegraf.conf

---
 CHANGELOG.md      | 3 ++-
 etc/telegraf.conf | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64d205fb0..9053c4285 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 ### Features
 
+- [#1247](https://github.com/influxdata/telegraf/pull/1247): rollbar input plugin. Thanks @francois2metz and @cduez!
+
 ### Bugfixes
 
 - [#1252](https://github.com/influxdata/telegraf/pull/1252): Fix systemd service. Thanks @zbindenren!
@@ -24,7 +26,6 @@ to "stdout".
 
 - [#1173](https://github.com/influxdata/telegraf/pull/1173): varnish input plugin. Thanks @sfox-xmatters!
 - [#1138](https://github.com/influxdata/telegraf/pull/1138): nstat input plugin. Thanks @Maksadbek!
-- [#1247](https://github.com/influxdata/telegraf/pull/1247): rollbar input plugin. Thanks @francois2metz and @cduez!
 - [#1139](https://github.com/influxdata/telegraf/pull/1139): instrumental output plugin. Thanks @jasonroelofs!
 - [#1172](https://github.com/influxdata/telegraf/pull/1172): Ceph storage stats. Thanks @robinpercy!
 - [#1233](https://github.com/influxdata/telegraf/pull/1233): Updated golint gopsutil dependency.
diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index e8188e4d9..c5d631f51 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -1474,6 +1474,12 @@
 #   data_format = "influx"
 
 
+# # A Rollbar Webhook Event collector
+# [[inputs.rollbar_webhooks]]
+#   ## Address and port to host Webhook listener on
+#   service_address = ":1619"
+
+
 # # Statsd Server
 # [[inputs.statsd]]
 #   ## Address and port to host UDP listener on