From 5db6329147f826ff54c6e7ef7a7400deab26032c Mon Sep 17 00:00:00 2001
From: Adam Argo <adamargo@gmail.com>
Date: Thu, 24 Mar 2016 15:14:30 -0700
Subject: [PATCH] PR feedback changes

closes #927
---
 CHANGELOG.md                    | 1 +
 plugins/inputs/statsd/README.md | 4 +++-
 plugins/inputs/statsd/statsd.go | 5 +++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a5e6aba19..94d327fbd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## v0.11.2 [unreleased]
 
 ### Features
+- [#927](https://github.com/influxdata/telegraf/pull/927): Adds parsing of tags to the statsd input when using DataDog's dogstatsd extension
 - [#863](https://github.com/influxdata/telegraf/pull/863): AMQP output: allow external auth. Thanks @ekini!
 - [#707](https://github.com/influxdata/telegraf/pull/707): Improved prometheus plugin. Thanks @titilambert!
 - [#878](https://github.com/influxdata/telegraf/pull/878): Added json serializer. Thanks @ch3lo!
diff --git a/plugins/inputs/statsd/README.md b/plugins/inputs/statsd/README.md
index 5156f90df..78e5a5b9a 100644
--- a/plugins/inputs/statsd/README.md
+++ b/plugins/inputs/statsd/README.md
@@ -21,7 +21,8 @@
   ## convert measurement names, "." to "_" and "-" to "__"
   convert_names = true
 
-  ## parses tags in the datadog statsd format
+  ## Parses tags in DataDog's dogstatsd format
+  ## http://docs.datadoghq.com/guides/dogstatsd/
   parse_data_dog_tags = false
 
   ## Statsd data translation templates, more info can be read here:
@@ -158,6 +159,7 @@ per-measurement in the calculation of percentiles. Raising this limit increases
 the accuracy of percentiles but also increases the memory usage and cpu time.
 - **templates** []string: Templates for transforming statsd buckets into influx
 measurements and tags.
+- **parse_data_dog_tags** boolean: Enable parsing of tags in DataDog's dogstatsd format (http://docs.datadoghq.com/guides/dogstatsd/)
 
 ### Statsd bucket -> InfluxDB line-protocol Templates
 
diff --git a/plugins/inputs/statsd/statsd.go b/plugins/inputs/statsd/statsd.go
index b113faa6d..0e7a911e1 100644
--- a/plugins/inputs/statsd/statsd.go
+++ b/plugins/inputs/statsd/statsd.go
@@ -152,7 +152,8 @@ const sampleConfig = `
   ## convert measurement names, "." to "_" and "-" to "__"
   convert_names = true
 
-  ## parses tags in the datadog statsd format
+  ## Parses tags in the datadog statsd format
+  ## http://docs.datadoghq.com/guides/dogstatsd/
   parse_data_dog_tags = false
 
   ## Statsd data translation templates, more info can be read here:
@@ -336,7 +337,7 @@ func (s *Statsd) parseStatsdLine(line string) error {
 		pipesplit := strings.Split(line, "|")
 		for _, segment := range pipesplit {
 			if len(segment) > 0 && segment[0] == '#' {
-				// we have ourselves a tag; they are comma serated
+				// we have ourselves a tag; they are comma separated
 				tagstr := segment[1:]
 				tags := strings.Split(tagstr, ",")
 				for _, tag := range tags {