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

Change HAProxy plugin tag from host to server 

fixes #342
This commit is contained in:
Cameron Sparr 2015-11-03 11:04:52 -07:00
parent 6794fd06eb
commit e2854232d0
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -6,6 +6,7 @@ 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` - Redis plugin tag has changed from `host` to `server`
- HAProxy 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!

6
plugins/haproxy/haproxy.go
View File

@ -165,9 +165,9 @@ func importCsvResult(r io.Reader, acc plugins.Accumulator, host string) ([][]str
for field, v := range row { for field, v := range row {
tags := map[string]string{ tags := map[string]string{
"host": host, "server": host,
"proxy": row[HF_PXNAME], "proxy": row[HF_PXNAME],
"sv": row[HF_SVNAME], "sv": row[HF_SVNAME],
} }
switch field { switch field {
case HF_QCUR: case HF_QCUR:

12
plugins/haproxy/haproxy_test.go
View File

@ -42,9 +42,9 @@ func TestHaproxyGeneratesMetricsWithAuthentication(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
tags := map[string]string{ tags := map[string]string{
"host": ts.Listener.Addr().String(), "server": ts.Listener.Addr().String(),
"proxy": "be_app", "proxy": "be_app",
"sv": "host0", "sv": "host0",
} }
assert.NoError(t, acc.ValidateTaggedValue("stot", uint64(171014), tags)) assert.NoError(t, acc.ValidateTaggedValue("stot", uint64(171014), tags))
@ -109,9 +109,9 @@ func TestHaproxyGeneratesMetricsWithoutAuthentication(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
tags := map[string]string{ tags := map[string]string{
"proxy": "be_app", "proxy": "be_app",
"host": ts.Listener.Addr().String(), "server": ts.Listener.Addr().String(),
"sv": "host0", "sv": "host0",
} }
assert.NoError(t, acc.ValidateTaggedValue("stot", uint64(171014), tags)) assert.NoError(t, acc.ValidateTaggedValue("stot", uint64(171014), tags))