From a201b69e9e20aa9c377ef36fb49550a4b7065374 Mon Sep 17 00:00:00 2001 From: Sergio Jimenez Date: Thu, 18 Feb 2016 09:01:50 +0100 Subject: [PATCH] fix(config): Made sample config consistent. closes #682 --- CHANGELOG.md | 1 + internal/config/testdata/telegraf-agent.toml | 7 ++----- plugins/inputs/mesos/README.md | 7 ++----- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2cdc09bac..d39cdf9c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ and is in the `[agent]` config section. - [#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! - [#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 - [#443](https://github.com/influxdata/telegraf/issues/443): Fix Ping command timeout parameter on Linux. diff --git a/internal/config/testdata/telegraf-agent.toml b/internal/config/testdata/telegraf-agent.toml index e1430b954..1e6a6a276 100644 --- a/internal/config/testdata/telegraf-agent.toml +++ b/internal/config/testdata/telegraf-agent.toml @@ -188,12 +188,9 @@ [[inputs.mesos]] # Timeout, in ms. timeout = 100 - # A list of Mesos masters. e.g. master1:5050, master2:5080, etc. - # The port can be skipped if using the default (5050) - # Default value is localhost:5050. + # A list of Mesos masters, default value is localhost:5050. masters = ["localhost:5050"] - # Metrics groups to be collected. - # Default, all enabled. + # Metrics groups to be collected, by default, all enabled. master_collections = ["resources","master","system","slaves","frameworks","messages","evqueue","registrar"] # Read metrics from one or many MongoDB servers diff --git a/plugins/inputs/mesos/README.md b/plugins/inputs/mesos/README.md index 603d3c7f5..20a6dd244 100644 --- a/plugins/inputs/mesos/README.md +++ b/plugins/inputs/mesos/README.md @@ -10,12 +10,9 @@ For more information, please check the [Mesos Observability Metrics](http://meso [[inputs.mesos]] # Timeout, in ms. timeout = 100 - # A list of Mesos masters. e.g. master1:5050, master2:5080, etc. - # The port can be skipped if using the default (5050) - # Default value is localhost:5050. + # A list of Mesos masters, default value is localhost:5050. masters = ["localhost:5050"] - # Metrics groups to be collected. - # Default, all enabled. + # Metrics groups to be collected, by default, all enabled. master_collections = ["resources","master","system","slaves","frameworks","messages","evqueue","registrar"] ```