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

Also added reasonable default for influxdb input plugin to simplifying configuration for most users

This commit is contained in:
Martin Seener 2016-05-30 14:45:21 +02:00
parent 3af65e7abb
commit ca75636da3
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -26,7 +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 - [#1278](https://github.com/influxdata/telegraf/pull/1278) & [#1288](https://github.com/influxdata/telegraf/pull/1288) & [#1295](https://github.com/influxdata/telegraf/pull/1295): RabbitMQ/Apache/InfluxDB inputs: made url(s) parameter optional by using reasonable input defaults if not specified
### Bugfixes ### Bugfixes

1
etc/telegraf.conf
View File

@ -746,6 +746,7 @@
# ## See the influxdb plugin's README for more details. # ## See the influxdb plugin's README for more details.
# #
# ## Multiple URLs from which to read InfluxDB-formatted JSON # ## Multiple URLs from which to read InfluxDB-formatted JSON
# ## Default is "http://localhost:8086/debug/vars".
# urls = [ # urls = [
# "http://localhost:8086/debug/vars" # "http://localhost:8086/debug/vars"
# ] # ]

1
plugins/inputs/influxdb/README.md
View File

@ -15,6 +15,7 @@ InfluxDB-formatted endpoints. See below for more information.
## See the influxdb plugin's README for more details. ## See the influxdb plugin's README for more details.
## Multiple URLs from which to read InfluxDB-formatted JSON ## Multiple URLs from which to read InfluxDB-formatted JSON
## Default is "http://localhost:8086/debug/vars".
urls = [ urls = [
"http://localhost:8086/debug/vars" "http://localhost:8086/debug/vars"
] ]

4
plugins/inputs/influxdb/influxdb.go
View File

@ -28,6 +28,7 @@ func (*InfluxDB) SampleConfig() string {
## See the influxdb plugin's README for more details. ## See the influxdb plugin's README for more details.
## Multiple URLs from which to read InfluxDB-formatted JSON ## Multiple URLs from which to read InfluxDB-formatted JSON
## Default is "http://localhost:8086/debug/vars".
urls = [ urls = [
"http://localhost:8086/debug/vars" "http://localhost:8086/debug/vars"
] ]
@ -35,6 +36,9 @@ func (*InfluxDB) SampleConfig() string {
} }
func (i *InfluxDB) Gather(acc telegraf.Accumulator) error { func (i *InfluxDB) Gather(acc telegraf.Accumulator) error {
if len(i.URLs) == 0 {
i.URLs = []string{"http://localhost:8086/debug/vars"}
}
errorChannel := make(chan error, len(i.URLs)) errorChannel := make(chan error, len(i.URLs))
var wg sync.WaitGroup var wg sync.WaitGroup