Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add mutual TLS support to prometheus_client output plugin #5473

Merged
merged 4 commits into from
Feb 27, 2019
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
update sample config for prometheus output client
Signed-off-by: Robert Sullivan <[email protected]>
  • Loading branch information
Max Eshleman authored and robertjsullivan committed Feb 26, 2019

Verified

This commit was signed with the committer’s verified signature.
bukka Jakub Zelenka
commit b34ad9efc4caae6d902112b91ccebfc5c312e083
8 changes: 3 additions & 5 deletions plugins/outputs/prometheus_client/README.md
Original file line number Diff line number Diff line change
@@ -36,11 +36,9 @@ This plugin starts a [Prometheus](https://prometheus.io/) Client, it exposes all
# tls_cert = "/etc/ssl/telegraf.crt"
# tls_key = "/etc/ssl/telegraf.key"

## If set, enable TLS client authentication with the given CA.
# tls_ca = "/etc/ssl/telegraf_ca.crt"

## Boolean value indicating whether or not to skip SSL verification
# insecure_skip_verify = false
## Set one or more allowed client CA certificate file names to
## enable mutually authenticated TLS connections
# tls_allowed_cacerts = ["/etc/telegraf/clientca.pem"]

## Export metric collection time.
# export_timestamp = false
8 changes: 3 additions & 5 deletions plugins/outputs/prometheus_client/prometheus_client.go
Original file line number Diff line number Diff line change
@@ -107,11 +107,9 @@ var sampleConfig = `
# tls_cert = "/etc/ssl/telegraf.crt"
# tls_key = "/etc/ssl/telegraf.key"

## If set, enable TLS client authentication with the given CA.
# tls_ca = "/etc/ssl/telegraf_ca.crt"

## Boolean value indicating whether or not to skip SSL verification
# insecure_skip_verify = false
## Set one or more allowed client CA certificate file names to
## enable mutually authenticated TLS connections
# tls_allowed_cacerts = ["/etc/telegraf/clientca.pem"]

## Export metric collection time.
# export_timestamp = false