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

Dont overwrite 'host' tag in redis plugin 

fixes #331
This commit is contained in:
Cameron Sparr 2015-11-02 11:29:28 -07:00
parent 5592738603
commit 0398dc1226
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -5,12 +5,14 @@
changed to just run docker commands in the Makefile. See `make docker-run` and changed to just run docker commands in the Makefile. See `make docker-run` and
`make docker-kill`. `make test` will still run all unit tests with docker. `make docker-kill`. `make test` will still run all unit tests with docker.
- Long unit tests are now run in CircleCI, with docker & race detector - Long unit tests are now run in CircleCI, with docker & race detector
- Redis plugin tag has changed from `host` to `server`
### Features ### Features
- [#325](https://github.com/influxdb/telegraf/pull/325): NSQ output. Thanks @jrxFive! - [#325](https://github.com/influxdb/telegraf/pull/325): NSQ output. Thanks @jrxFive!
- [#318](https://github.com/influxdb/telegraf/pull/318): Prometheus output. Thanks @oldmantaiter! - [#318](https://github.com/influxdb/telegraf/pull/318): Prometheus output. Thanks @oldmantaiter!
### Bugfixes ### Bugfixes
- [#331](https://github.com/influxdb/telegraf/pull/331): Dont overwrite host tag in redis plugin.
## v0.2.0 [2015-10-27] ## v0.2.0 [2015-10-27]

2
plugins/redis/redis.go
View File

@ -148,7 +148,7 @@ func (r *Redis) gatherServer(addr *url.URL, acc plugins.Accumulator) error {
host, port := "unknown", "unknown" host, port := "unknown", "unknown"
// If there's an error, ignore and use 'unknown' tags // If there's an error, ignore and use 'unknown' tags
host, port, _ = net.SplitHostPort(addr.Host) host, port, _ = net.SplitHostPort(addr.Host)
tags := map[string]string{"host": host, "port": port} tags := map[string]string{"server": host, "port": port}
return gatherInfoOutput(rdr, acc, tags) return gatherInfoOutput(rdr, acc, tags)
} }