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

Use the DefaultURL parameter if no url is explicitly set by the user 

closes #1278
closes #1277
This commit is contained in:
Martin Seener 2016-05-26 11:25:21 +02:00 committed by Cameron Sparr
parent 6828fc48e1
commit 42d7fc5e16
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -26,6 +26,7 @@ time before a new metric is included by the plugin.
- [#1265](https://github.com/influxdata/telegraf/pull/1265): Make dns lookups for chrony configurable. Thanks @zbindenren! - [#1265](https://github.com/influxdata/telegraf/pull/1265): Make dns lookups for chrony configurable. Thanks @zbindenren!
- [#1275](https://github.com/influxdata/telegraf/pull/1275): Allow wildcard filtering of varnish stats. - [#1275](https://github.com/influxdata/telegraf/pull/1275): Allow wildcard filtering of varnish stats.
- [#1142](https://github.com/influxdata/telegraf/pull/1142): Support for glob patterns in exec plugin commands configuration. - [#1142](https://github.com/influxdata/telegraf/pull/1142): Support for glob patterns in exec plugin commands configuration.
- [#1278](https://github.com/influxdata/telegraf/pull/1278): RabbitMQ input: made url parameter optional by using DefaultURL (http://localhost:15672) if not specified
### Bugfixes ### Bugfixes

2
etc/telegraf.conf
View File

@ -1176,7 +1176,7 @@
# # Read metrics from one or many RabbitMQ servers via the management API # # Read metrics from one or many RabbitMQ servers via the management API
# [[inputs.rabbitmq]] # [[inputs.rabbitmq]]
# url = "http://localhost:15672" # required # # url = "http://localhost:15672"
# # name = "rmq-server-1" # optional tag # # name = "rmq-server-1" # optional tag
# # username = "guest" # # username = "guest"
# # password = "guest" # # password = "guest"

5
plugins/inputs/rabbitmq/rabbitmq.go
View File

@ -102,7 +102,7 @@ type gatherFunc func(r *RabbitMQ, acc telegraf.Accumulator, errChan chan error)
var gatherFunctions = []gatherFunc{gatherOverview, gatherNodes, gatherQueues} var gatherFunctions = []gatherFunc{gatherOverview, gatherNodes, gatherQueues}
var sampleConfig = ` var sampleConfig = `
url = "http://localhost:15672" # required # url = "http://localhost:15672"
# name = "rmq-server-1" # optional tag # name = "rmq-server-1" # optional tag
# username = "guest" # username = "guest"
# password = "guest" # password = "guest"
@ -146,6 +146,9 @@ func (r *RabbitMQ) Gather(acc telegraf.Accumulator) error {
} }
func (r *RabbitMQ) requestJSON(u string, target interface{}) error { func (r *RabbitMQ) requestJSON(u string, target interface{}) error {
if r.URL == "" {
r.URL = DefaultURL
}
u = fmt.Sprintf("%s%s", r.URL, u) u = fmt.Sprintf("%s%s", r.URL, u)
req, err := http.NewRequest("GET", u, nil) req, err := http.NewRequest("GET", u, nil)