dom
/
telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PR feedback changes 

closes #927
This commit is contained in:
Adam Argo 2016-03-24 15:14:30 -07:00 committed by Cameron Sparr
parent 59085f072a
commit e07c79259b
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -1,6 +1,7 @@
## v0.11.2 [unreleased] ## v0.11.2 [unreleased]
### Features ### 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! - [#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! - [#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! - [#878](https://github.com/influxdata/telegraf/pull/878): Added json serializer. Thanks @ch3lo!

4
plugins/inputs/statsd/README.md
View File

@ -21,7 +21,8 @@
## convert measurement names, "." to "_" and "-" to "__" ## convert measurement names, "." to "_" and "-" to "__"
convert_names = true 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 parse_data_dog_tags = false
## Statsd data translation templates, more info can be read here: ## 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. the accuracy of percentiles but also increases the memory usage and cpu time.
- **templates** []string: Templates for transforming statsd buckets into influx - **templates** []string: Templates for transforming statsd buckets into influx
measurements and tags. 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 ### Statsd bucket -> InfluxDB line-protocol Templates

5
plugins/inputs/statsd/statsd.go
View File

@ -152,7 +152,8 @@ const sampleConfig = `
## convert measurement names, "." to "_" and "-" to "__" ## convert measurement names, "." to "_" and "-" to "__"
convert_names = true 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 parse_data_dog_tags = false
## Statsd data translation templates, more info can be read here: ## 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, "|") pipesplit := strings.Split(line, "|")
for _, segment := range pipesplit { for _, segment := range pipesplit {
if len(segment) > 0 && segment[0] == '#' { 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:] tagstr := segment[1:]
tags := strings.Split(tagstr, ",") tags := strings.Split(tagstr, ",")
for _, tag := range tags { for _, tag := range tags {