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

fix(config): Made sample config consistent. 

closes #682
This commit is contained in:
Sergio Jimenez 2016-02-18 09:01:50 +01:00 committed by Cameron Sparr
parent 1f77b75e14
commit 963c51f473
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -28,6 +28,7 @@ and is in the `[agent]` config section.
- [#695](https://github.com/influxdata/telegraf/pull/695): raindrops input plugin. Thanks @burdandrei! - [#695](https://github.com/influxdata/telegraf/pull/695): raindrops input plugin. Thanks @burdandrei!
- [#650](https://github.com/influxdata/telegraf/pull/650): net_response input plugin. Thanks @titilambert! - [#650](https://github.com/influxdata/telegraf/pull/650): net_response input plugin. Thanks @titilambert!
- [#699](https://github.com/influxdata/telegraf/pull/699): Flush based on buffer size rather than time. - [#699](https://github.com/influxdata/telegraf/pull/699): Flush based on buffer size rather than time.
- [#682](https://github.com/influxdata/telegraf/pull/682): Mesos input plugin. Thanks @tripledes!
### Bugfixes ### Bugfixes
- [#443](https://github.com/influxdata/telegraf/issues/443): Fix Ping command timeout parameter on Linux. - [#443](https://github.com/influxdata/telegraf/issues/443): Fix Ping command timeout parameter on Linux.

7
internal/config/testdata/telegraf-agent.toml vendored
View File

@ -188,12 +188,9 @@
[[inputs.mesos]] [[inputs.mesos]]
# Timeout, in ms. # Timeout, in ms.
timeout = 100 timeout = 100
# A list of Mesos masters. e.g. master1:5050, master2:5080, etc. # A list of Mesos masters, default value is localhost:5050.
# The port can be skipped if using the default (5050)
# Default value is localhost:5050.
masters = ["localhost:5050"] masters = ["localhost:5050"]
# Metrics groups to be collected. # Metrics groups to be collected, by default, all enabled.
# Default, all enabled.
master_collections = ["resources","master","system","slaves","frameworks","messages","evqueue","registrar"] master_collections = ["resources","master","system","slaves","frameworks","messages","evqueue","registrar"]
# Read metrics from one or many MongoDB servers # Read metrics from one or many MongoDB servers

7
plugins/inputs/mesos/README.md
View File

@ -10,12 +10,9 @@ For more information, please check the [Mesos Observability Metrics](http://meso
[[inputs.mesos]] [[inputs.mesos]]
# Timeout, in ms. # Timeout, in ms.
timeout = 100 timeout = 100
# A list of Mesos masters. e.g. master1:5050, master2:5080, etc. # A list of Mesos masters, default value is localhost:5050.
# The port can be skipped if using the default (5050)
# Default value is localhost:5050.
masters = ["localhost:5050"] masters = ["localhost:5050"]
# Metrics groups to be collected. # Metrics groups to be collected, by default, all enabled.
# Default, all enabled.
master_collections = ["resources","master","system","slaves","frameworks","messages","evqueue","registrar"] master_collections = ["resources","master","system","slaves","frameworks","messages","evqueue","registrar"]
``` ```