From ecbbb8426f0617efdbb70c174ca71e9b309a4e4e Mon Sep 17 00:00:00 2001
From: Thibault Cohen <thibault.cohen@nuance.com>
Date: Thu, 10 Mar 2016 14:41:03 -0500
Subject: [PATCH] Fix #828
closes #828
closes #829
---
CHANGELOG.md | 1 +
plugins/inputs/net_response/README.md | 6 +++---
plugins/inputs/net_response/net_response.go | 2 +-
plugins/inputs/net_response/net_response_test.go | 6 +++---
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28ce825c..8392d62b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@
- [#708](https://github.com/influxdata/telegraf/issues/708): packaging: build ARM package
- [#713](https://github.com/influxdata/telegraf/issues/713): packaging: insecure permissions error on log directory
- [#816](https://github.com/influxdata/telegraf/issues/816): Fix phpfpm panic if fcgi endpoint unreachable.
+- [#828](https://github.com/influxdata/telegraf/issues/828): fix net_response plugin overwriting host tag.
## v0.10.4.1
diff --git a/plugins/inputs/net_response/README.md b/plugins/inputs/net_response/README.md
index 69e72a37..d6a0e127 100644
--- a/plugins/inputs/net_response/README.md
+++ b/plugins/inputs/net_response/README.md
@@ -52,7 +52,7 @@ It can also check response text.
### Tags:
- All measurements have the following tags:
- - host
+ - server
- port
- protocol
@@ -60,7 +60,7 @@ It can also check response text.
```
$ ./telegraf -config telegraf.conf -input-filter net_response -test
-net_response,host=127.0.0.1,port=22,protocol=tcp response_time=0.18070360500000002,string_found=true 1454785464182527094
-net_response,host=127.0.0.1,port=2222,protocol=tcp response_time=1.090124776,string_found=false 1454784433658942325
+net_response,server=192.168.2.2,port=22,protocol=tcp response_time=0.18070360500000002,string_found=true 1454785464182527094
+net_response,server=192.168.2.2,port=2222,protocol=tcp response_time=1.090124776,string_found=false 1454784433658942325
```
diff --git a/plugins/inputs/net_response/net_response.go b/plugins/inputs/net_response/net_response.go
index 66bf2ae7..7b5cfa78 100644
--- a/plugins/inputs/net_response/net_response.go
+++ b/plugins/inputs/net_response/net_response.go
@@ -169,7 +169,7 @@ func (c *NetResponse) Gather(acc telegraf.Accumulator) error {
return errors.New("Bad port")
}
// Prepare data
- tags := map[string]string{"host": host, "port": port}
+ tags := map[string]string{"server": host, "port": port}
var fields map[string]interface{}
// Gather data
if c.Protocol == "tcp" {
diff --git a/plugins/inputs/net_response/net_response_test.go b/plugins/inputs/net_response/net_response_test.go
index 538d059c..a6dfbcc9 100644
--- a/plugins/inputs/net_response/net_response_test.go
+++ b/plugins/inputs/net_response/net_response_test.go
@@ -69,7 +69,7 @@ func TestTCPOK1(t *testing.T) {
"string_found": true,
"response_time": 1.0,
},
- map[string]string{"host": "127.0.0.1",
+ map[string]string{"server": "127.0.0.1",
"port": "2004",
"protocol": "tcp",
},
@@ -109,7 +109,7 @@ func TestTCPOK2(t *testing.T) {
"string_found": false,
"response_time": 1.0,
},
- map[string]string{"host": "127.0.0.1",
+ map[string]string{"server": "127.0.0.1",
"port": "2004",
"protocol": "tcp",
},
@@ -164,7 +164,7 @@ func TestUDPOK1(t *testing.T) {
"string_found": true,
"response_time": 1.0,
},
- map[string]string{"host": "127.0.0.1",
+ map[string]string{"server": "127.0.0.1",
"port": "2004",
"protocol": "udp",
},
--
GitLab