From efb64a049ff42cf86eed5bf367ca623710594511 Mon Sep 17 00:00:00 2001 From: Christian Eichelmann Date: Wed, 23 Nov 2016 10:51:14 +0100 Subject: [PATCH] add a hint to possible basic authentication settings --- CHANGELOG.md | 1 + etc/telegraf.conf | 2 ++ plugins/inputs/elasticsearch/elasticsearch.go | 2 ++ 3 files changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 42847fd2b..638f35777 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - [#1348](https://github.com/influxdata/telegraf/issues/1348): Telegraf "internal" plugin for collecting stats on itself. - [#2127](https://github.com/influxdata/telegraf/pull/2127): Update Go version to 1.7.4. - [#2126](https://github.com/influxdata/telegraf/pull/2126): Support a metric.Split function. +- [#2026](https://github.com/influxdata/telegraf/pull/2065): elasticsearch "shield" (basic auth) support doc. ### Bugfixes diff --git a/etc/telegraf.conf b/etc/telegraf.conf index 8ebf0a7a7..a7b903388 100644 --- a/etc/telegraf.conf +++ b/etc/telegraf.conf @@ -777,6 +777,8 @@ # # Read stats from one or more Elasticsearch servers or clusters # [[inputs.elasticsearch]] # ## specify a list of one or more Elasticsearch servers +# # you can add username and password to your url to use basic authentication: +# # servers = ["http://user:pass@localhost:9200"] # servers = ["http://localhost:9200"] # # ## Timeout for HTTP requests to the elastic search server(s) diff --git a/plugins/inputs/elasticsearch/elasticsearch.go b/plugins/inputs/elasticsearch/elasticsearch.go index 896e03f2e..cce3d94ff 100644 --- a/plugins/inputs/elasticsearch/elasticsearch.go +++ b/plugins/inputs/elasticsearch/elasticsearch.go @@ -60,6 +60,8 @@ type indexHealth struct { const sampleConfig = ` ## specify a list of one or more Elasticsearch servers + # you can add username and password to your url to use basic authentication: + # servers = ["http://user:pass@localhost:9200"] servers = ["http://localhost:9200"] ## Timeout for HTTP requests to the elastic search server(s)