From 45339283298608f5a27adc6cf987a2aa36a9529b Mon Sep 17 00:00:00 2001 From: Toshiaki Maki Date: Fri, 20 Jul 2018 00:24:40 +0900 Subject: [PATCH] Support basic authentication on Elasticsearch --- jobs/kibana/spec | 4 ++++ jobs/kibana/templates/config/kibana.yml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/jobs/kibana/spec b/jobs/kibana/spec index b48b74b..ac7bb80 100644 --- a/jobs/kibana/spec +++ b/jobs/kibana/spec @@ -28,6 +28,10 @@ properties: kibana.elasticsearch.port: description: "Port of elasticsearch master to send elasticsearch requests to" default: "9200" + kibana.elasticsearch.username: + description: "The username of basic authentication on Elasticsearch" + kibana.elasticsearch.password: + description: "The password of basic authentication on Elasticsearch" kibana.port: description: "Kibana is served by a back end server. This controls which port to use." default: 5601 diff --git a/jobs/kibana/templates/config/kibana.yml b/jobs/kibana/templates/config/kibana.yml index 2ba58b6..355ebb7 100644 --- a/jobs/kibana/templates/config/kibana.yml +++ b/jobs/kibana/templates/config/kibana.yml @@ -114,5 +114,9 @@ kibana.defaultAppId: <%= p('kibana.default_app_id') %> end %> elasticsearch.url: <%= p("kibana.elasticsearch.protocol") + '://' + elasticsearch_host + ':' + p("kibana.elasticsearch.port") %> +<% if_p("kibana.elasticsearch.username") do |username| %> +elasticsearch.username: <%= username %> +elasticsearch.password: <%= p("kibana.elasticsearch.password") %> +<% end %> elasticsearch.requestTimeout: <%= p('kibana.request_timeout') %> elasticsearch.shardTimeout: <%= p('kibana.shard_timeout') %> \ No newline at end of file