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

Make nginx_test check port in nginx module tags 

Closes #223
This commit is contained in:
Ruslan Islamgaliev 2015-09-23 21:43:44 +03:00 committed by Cameron Sparr
parent 6e76759225
commit c4bbc18cb6
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -7,6 +7,7 @@
- [#205](https://github.com/influxdb/telegraf/issues/205): Include per-db redis keyspace info - [#205](https://github.com/influxdb/telegraf/issues/205): Include per-db redis keyspace info
- [#226](https://github.com/influxdb/telegraf/pull/226): Add timestamps to points in Kafka/AMQP outputs. Thanks @ekini - [#226](https://github.com/influxdb/telegraf/pull/226): Add timestamps to points in Kafka/AMQP outputs. Thanks @ekini
- [#90](https://github.com/influxdb/telegraf/issues/90): Add Docker labels to tags in docker plugin - [#90](https://github.com/influxdb/telegraf/issues/90): Add Docker labels to tags in docker plugin
- [#223](https://github.com/influxdb/telegraf/pull/223): Add port tag to nginx plugin. Thanks @neezgee!
### Bugfixes ### Bugfixes

16
plugins/nginx/nginx_test.go
View File

@ -70,8 +70,20 @@ func TestNginxGeneratesMetrics(t *testing.T) {
if err != nil { if err != nil {
panic(err) panic(err)
} }
host, _, _ := net.SplitHostPort(addr.Host)
tags := map[string]string{"server": host} host, port, err := net.SplitHostPort(addr.Host)
if err != nil {
host = addr.Host
if addr.Scheme == "http" {
port = "80"
} else if addr.Scheme == "https" {
port = "443"
} else {
port = ""
}
}
tags := map[string]string{"server": host, "port": port}
for _, m := range metrics { for _, m := range metrics {
assert.NoError(t, acc.ValidateTaggedValue(m.name, m.value, tags)) assert.NoError(t, acc.ValidateTaggedValue(m.name, m.value, tags))