From 7acff612f93885d53489e8b69c1efa5d5455b9f8 Mon Sep 17 00:00:00 2001
From: Shaunak Kashyap <ycombinator@gmail.com>
Date: Fri, 1 Feb 2019 18:03:44 -0800
Subject: [PATCH] Update docker image with kibana settings removals

---
 .tedi/template/kibana-docker | 23 ++---------------------
 .tedi/template/kibana.yml.j2 |  2 +-
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/.tedi/template/kibana-docker b/.tedi/template/kibana-docker
index b5c187d..893aa74 100755
--- a/.tedi/template/kibana-docker
+++ b/.tedi/template/kibana-docker
@@ -27,31 +27,12 @@ kibana_vars=(
     elasticsearch.sniffInterval
     elasticsearch.sniffOnConnectionFault
     elasticsearch.sniffOnStart
-    elasticsearch.ssl.ca
-    elasticsearch.ssl.cert
     elasticsearch.ssl.certificate
     elasticsearch.ssl.certificateAuthorities
     elasticsearch.ssl.key
     elasticsearch.ssl.keyPassphrase
     elasticsearch.ssl.verificationMode
-    elasticsearch.ssl.verify
     elasticsearch.startupTimeout
-    elasticsearch.tribe.customHeaders
-    elasticsearch.tribe.password
-    elasticsearch.tribe.pingTimeout
-    elasticsearch.tribe.requestHeadersWhitelist
-    elasticsearch.tribe.requestTimeout
-    elasticsearch.tribe.ssl.ca
-    elasticsearch.tribe.ssl.cert
-    elasticsearch.tribe.ssl.certificate
-    elasticsearch.tribe.ssl.certificateAuthorities
-    elasticsearch.tribe.ssl.key
-    elasticsearch.tribe.ssl.keyPassphrase
-    elasticsearch.tribe.ssl.verificationMode
-    elasticsearch.tribe.ssl.verify
-    elasticsearch.tribe.url
-    elasticsearch.tribe.username
-    elasticsearch.url
     elasticsearch.username
     i18n.locale
     kibana.defaultAppId
@@ -114,7 +95,7 @@ kibana_vars=(
     xpack.ml.enabled
     xpack.monitoring.elasticsearch.password
     xpack.monitoring.elasticsearch.pingTimeout
-    xpack.monitoring.elasticsearch.url
+    xpack.monitoring.elasticsearch.hosts
     xpack.monitoring.elasticsearch.username
     xpack.monitoring.elasticsearch.ssl.certificateAuthorities
     xpack.monitoring.elasticsearch.ssl.verificationMode
@@ -162,7 +143,7 @@ kibana_vars=(
 
 longopts=''
 for kibana_var in ${kibana_vars[*]}; do
-    # 'elasticsearch.url' -> 'ELASTICSEARCH_URL'
+    # 'elasticsearch.hosts' -> 'ELASTICSEARCH_HOSTS'
     env_var=$(echo ${kibana_var^^} | tr . _)
 
     # Indirectly lookup env var values via the name of the var.
diff --git a/.tedi/template/kibana.yml.j2 b/.tedi/template/kibana.yml.j2
index ef8e5ac..d327674 100644
--- a/.tedi/template/kibana.yml.j2
+++ b/.tedi/template/kibana.yml.j2
@@ -3,7 +3,7 @@
 
 server.name: kibana
 server.host: "0"
-elasticsearch.url: http://elasticsearch:9200
+elasticsearch.hosts: [ "http://elasticsearch:9200" ]
 {% if image_flavor != 'oss' -%}
 xpack.monitoring.ui.container.elasticsearch.enabled: true
 {% endif -%}