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

Fix #828 

closes #828
closes #829
This commit is contained in:
Thibault Cohen 2016-03-10 14:41:03 -05:00 committed by Cameron Sparr
parent 0752879fc8
commit ecbbb8426f
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -27,6 +27,7 @@
- [#708](https://github.com/influxdata/telegraf/issues/708): packaging: build ARM package - [#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 - [#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. - [#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 ## v0.10.4.1

6
plugins/inputs/net_response/README.md
View File

@ -52,7 +52,7 @@ It can also check response text.
### Tags: ### Tags:
- All measurements have the following tags: - All measurements have the following tags:
- host - server
- port - port
- protocol - protocol
@ -60,7 +60,7 @@ It can also check response text.
``` ```
$ ./telegraf -config telegraf.conf -input-filter net_response -test $ ./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,server=192.168.2.2,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=2222,protocol=tcp response_time=1.090124776,string_found=false 1454784433658942325
``` ```

2
plugins/inputs/net_response/net_response.go
View File

@ -169,7 +169,7 @@ func (c *NetResponse) Gather(acc telegraf.Accumulator) error {
return errors.New("Bad port") return errors.New("Bad port")
} }
// Prepare data // Prepare data
tags := map[string]string{"host": host, "port": port} tags := map[string]string{"server": host, "port": port}
var fields map[string]interface{} var fields map[string]interface{}
// Gather data // Gather data
if c.Protocol == "tcp" { if c.Protocol == "tcp" {

6
plugins/inputs/net_response/net_response_test.go
View File

@ -69,7 +69,7 @@ func TestTCPOK1(t *testing.T) {
"string_found": true, "string_found": true,
"response_time": 1.0, "response_time": 1.0,
}, },
map[string]string{"host": "127.0.0.1", map[string]string{"server": "127.0.0.1",
"port": "2004", "port": "2004",
"protocol": "tcp", "protocol": "tcp",
}, },
@ -109,7 +109,7 @@ func TestTCPOK2(t *testing.T) {
"string_found": false, "string_found": false,
"response_time": 1.0, "response_time": 1.0,
}, },
map[string]string{"host": "127.0.0.1", map[string]string{"server": "127.0.0.1",
"port": "2004", "port": "2004",
"protocol": "tcp", "protocol": "tcp",
}, },
@ -164,7 +164,7 @@ func TestUDPOK1(t *testing.T) {
"string_found": true, "string_found": true,
"response_time": 1.0, "response_time": 1.0,
}, },
map[string]string{"host": "127.0.0.1", map[string]string{"server": "127.0.0.1",
"port": "2004", "port": "2004",
"protocol": "udp", "protocol": "udp",
}, },