From f37f8ac815d4511dbcf7d11415fa2f712abe49df Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Fri, 8 Jan 2016 15:07:44 -0700
Subject: [PATCH] Update changelog and readme for package updates

---
 CHANGELOG.md |  8 ++++++++
 README.md    | 28 ++++++++++++----------------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dbb364bac..078e600f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 ## v0.3.0 [unreleased]
 
 ### Release Notes
+- Linux packages have been taken out of `opt`, the binary is now in `/usr/bin`
+and configuration files are in `/etc/telegraf`
 - **breaking change** `plugins` have been renamed to `inputs`. This was done because
 `plugins` is too generic, as there are now also "output plugins", and will likely
 be "aggregator plugins" and "filter plugins" in the future. Additionally,
@@ -19,6 +21,12 @@ instead of only `cpu_`
 - The prometheus plugin schema has not been changed (measurements have not been
 aggregated).
 
+### Packaging change note:
+
+RHEL/CentOS users upgrading from 0.2 to 0.3 will probably have their
+configurations overwritten by the upgrade. There is a backup stored at
+/etc/telegraf/telegraf.conf.$(date +%s).backup.
+
 ### Features
 - Plugin measurements aggregated into a single measurement.
 - Added ability to specify per-plugin tags
diff --git a/README.md b/README.md
index e8a7cc6a3..e86750f18 100644
--- a/README.md
+++ b/README.md
@@ -35,8 +35,8 @@ Latest:
 
 ##### Package instructions:
 
-* Telegraf binary is installed in `/opt/telegraf/telegraf`
-* Telegraf daemon configuration file is in `/etc/opt/telegraf/telegraf.conf`
+* Telegraf binary is installed in `/usr/bin/telegraf`
+* Telegraf daemon configuration file is in `/etc/telegraf/telegraf.conf`
 * On sysv systems, the telegraf daemon can be controlled via
 `service telegraf [action]`
 * On systemd systems (such as Ubuntu 15+), the telegraf daemon can be
@@ -126,9 +126,6 @@ configuration options.
 
 ## Supported Input Plugins
 
-**You can view usage instructions for each plugin by running**
-`telegraf -usage <pluginname>`.
-
 Telegraf currently has support for collecting metrics from:
 
 * aerospike
@@ -169,9 +166,7 @@ Telegraf currently has support for collecting metrics from:
     * diskio
     * swap
 
-## Supported Input Service Plugins
-
-Telegraf can collect metrics via the following services:
+Telegraf can also collect metrics via the following service plugins:
 
 * statsd
 * kafka_consumer
@@ -182,15 +177,16 @@ want to add support for another service or third-party API.
 ## Supported Output Plugins
 
 * influxdb
-* nsq
-* kafka
-* datadog
-* opentsdb
-* amqp (rabbitmq)
-* mqtt
-* librato
-* prometheus
 * amon
+* amqp
+* datadog
+* kafka
+* amazon kinesis
+* librato
+* mqtt
+* nsq
+* opentsdb
+* prometheus
 * riemann
 
 ## Contributing