From 8cbdf0f9078767e207be267e702ec5904f1b3db3 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Sat, 16 Jan 2016 17:29:02 -0700
Subject: [PATCH] Tweak config messages for graphite. Update changelog and
 readme

closes #494
---
 CHANGELOG.md                         |  1 +
 README.md                            |  2 ++
 plugins/outputs/graphite/graphite.go | 12 ++++++------
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0be1ec417..f985f210d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - [#519](https://github.com/influxdata/telegraf/pull/519): Added a sensors input based on lm-sensors. Thanks @md14454!
 - [#467](https://github.com/influxdata/telegraf/issues/467): Add option to disable statsd measurement name conversion.
 - [#534](https://github.com/influxdata/telegraf/pull/534): NSQ input plugin. Thanks @allingeek!
+- [#494](https://github.com/influxdata/telegraf/pull/494): Graphite output plugin. Thanks @titilambert!
 
 ### Bugfixes
 - [#506](https://github.com/influxdb/telegraf/pull/506): Ping input doesn't return response time metric when timeout. Thanks @titilambert!
diff --git a/README.md b/README.md
index 6b723787e..539895899 100644
--- a/README.md
+++ b/README.md
@@ -152,6 +152,7 @@ Currently implemented sources:
 * mongodb
 * mysql
 * nginx
+* nsq
 * phpfpm
 * ping
 * postgresql
@@ -188,6 +189,7 @@ want to add support for another service or third-party API.
 * amon
 * amqp
 * datadog
+* graphite
 * kafka
 * amazon kinesis
 * librato
diff --git a/plugins/outputs/graphite/graphite.go b/plugins/outputs/graphite/graphite.go
index 405b1fe7a..dd2af8eb1 100644
--- a/plugins/outputs/graphite/graphite.go
+++ b/plugins/outputs/graphite/graphite.go
@@ -21,12 +21,12 @@ type Graphite struct {
 }
 
 var sampleConfig = `
-  # TCP raw endpoint for your graphite instance.
-  servers = ["mygraphiteserver:2003"] # default "localhost:2003"
+  # TCP endpoint for your graphite instance.
+  servers = ["localhost:2003"]
   # Prefix metrics name
-  prefix = "" # default ""
-  # Connection timeout in second (for the connection with Carbon(Graphite))
-  timeout = 2 # default 2s
+  prefix = ""
+  # timeout in seconds for the write connection to graphite
+  timeout = 2
 `
 
 func (g *Graphite) Connect() error {
@@ -62,7 +62,7 @@ func (g *Graphite) SampleConfig() string {
 }
 
 func (g *Graphite) Description() string {
-	return "Configuration for Graphite server to send metrics to using TCP raw protocol"
+	return "Configuration for Graphite server to send metrics to"
 }
 
 // Choose a random server in the cluster to write to until a successful write