From 30cc00d11b9d873d95ae568cf43b9a5a8e8d307d Mon Sep 17 00:00:00 2001 From: Cameron Sparr Date: Thu, 23 Jun 2016 10:28:38 +0100 Subject: [PATCH] Update changelog, etc/telegraf.conf --- CHANGELOG.md | 1 + etc/telegraf.conf | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee96aaa62..bed972e5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ should now look like: - [#1289](https://github.com/influxdata/telegraf/pull/1289): webhooks input plugin. Thanks @francois2metz and @cduez! - [#1247](https://github.com/influxdata/telegraf/pull/1247): rollbar webhook plugin. - [#1402](https://github.com/influxdata/telegraf/pull/1402): docker-machine/boot2docker no longer required for unit tests. +- [#1350](https://github.com/influxdata/telegraf/pull/1350): cgroup input plugin. ### Bugfixes diff --git a/etc/telegraf.conf b/etc/telegraf.conf index 054bcf62b..98138eef4 100644 --- a/etc/telegraf.conf +++ b/etc/telegraf.conf @@ -679,6 +679,13 @@ # # ## set cluster_health to true when you want to also obtain cluster level stats # cluster_health = false +# +# ## Optional SSL Config +# # ssl_ca = "/etc/telegraf/ca.pem" +# # ssl_cert = "/etc/telegraf/cert.pem" +# # ssl_key = "/etc/telegraf/key.pem" +# ## Use SSL but skip chain & host verification +# # insecure_skip_verify = false # # Read metrics from one or more commands that can output to stdout @@ -1259,10 +1266,15 @@ # ## An array of urls to scrape metrics from. # urls = ["http://localhost:9100/metrics"] # -# ## Use SSL but skip chain & host verification -# # insecure_skip_verify = false # ## Use bearer token for authorization # # bearer_token = /path/to/bearer/token +# +# ## Optional SSL Config +# # ssl_ca = /path/to/cafile +# # ssl_cert = /path/to/certfile +# # ssl_key = /path/to/keyfile +# ## Use SSL but skip chain & host verification +# # insecure_skip_verify = false # # Reads last_run_summary.yaml file and converts to measurments