diff --git a/CHANGELOG.md b/CHANGELOG.md index f6b599029..25a2b584c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ - [#4838](https://github.com/influxdata/telegraf/pull/4838): Add telegraf version to User-Agent header. - [#4864](https://github.com/influxdata/telegraf/pull/4864): Use DescribeStreamSummary in place of ListStreams in kinesis output. - [#4852](https://github.com/influxdata/telegraf/pull/4852): Add ability to specify bytes options as strings with units. +- [#3903](https://github.com/influxdata/telegraf/pull/3903): Add support for TLS configuration in NSQ input. ## v1.8.3 [unreleased] diff --git a/plugins/inputs/nsq/README.md b/plugins/inputs/nsq/README.md new file mode 100644 index 000000000..00c1089af --- /dev/null +++ b/plugins/inputs/nsq/README.md @@ -0,0 +1,17 @@ +# NSQ Input Plugin + +### Configuration: + +```toml +# Description +[[inputs.nsq]] + ## An array of NSQD HTTP API endpoints + endpoints = ["http://localhost:4151"] + + ## Optional TLS Config + # tls_ca = "/etc/telegraf/ca.pem" + # tls_cert = "/etc/telegraf/cert.pem" + # tls_key = "/etc/telegraf/key.pem" + ## Use TLS but skip chain & host verification + # insecure_skip_verify = false +``` diff --git a/plugins/inputs/nsq/nsq.go b/plugins/inputs/nsq/nsq.go index b5aa43d1f..5eab48ea5 100644 --- a/plugins/inputs/nsq/nsq.go +++ b/plugins/inputs/nsq/nsq.go @@ -48,12 +48,12 @@ var sampleConfig = ` ## An array of NSQD HTTP API endpoints endpoints = ["http://localhost:4151"] - ## Or using HTTPS endpoint - endpoints = ["https://localhost:4152"] - tls_cert = "/path/to/client-cert.pem" - tls_key = "/path/to/client-key.pem" - tls_ca = "/path/to/ca.pem" - insecure_skip_verify = false + ## Optional TLS Config + # tls_ca = "/etc/telegraf/ca.pem" + # tls_cert = "/etc/telegraf/cert.pem" + # tls_key = "/etc/telegraf/key.pem" + ## Use TLS but skip chain & host verification + # insecure_skip_verify = false ` const (