update to newest elasticsearch, kibana, logstash and searchguard

uselagoon · Jan 23, 2019 · d5da69a · d5da69a
1 parent 9baa9e6
commit d5da69a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/images/elasticsearch/Dockerfile b/images/elasticsearch/Dockerfile
@@ -1,6 +1,6 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons as commons
-FROM docker.elastic.co/elasticsearch/elasticsearch:6.4.2
+FROM docker.elastic.co/elasticsearch/elasticsearch:6.5.4
 
 LABEL maintainer="amazee.io"
 ENV LAGOON=elasticsearch

diff --git a/images/kibana/Dockerfile b/images/kibana/Dockerfile
@@ -1,6 +1,6 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons as commons
-FROM docker.elastic.co/kibana/kibana:6.4.2
+FROM docker.elastic.co/kibana/kibana:6.5.4
 
 LABEL maintainer="amazee.io"
 ENV LAGOON=kibana

diff --git a/images/logstash/Dockerfile b/images/logstash/Dockerfile
@@ -1,6 +1,6 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons as commons
-FROM docker.elastic.co/logstash/logstash:6.4.2
+FROM docker.elastic.co/logstash/logstash:6.5.4
 
 LABEL maintainer="amazee.io"
 ENV LAGOON=logstash

diff --git a/services/logs-db-ui/Dockerfile b/services/logs-db-ui/Dockerfile
@@ -46,9 +46,12 @@ searchguard.openid.base_redirect_url: "${LOGSDB_UI_URL:-http://0.0.0.0:5601}"\n\
 searchguard.openid.scope: "profile email"\n\
 \n\
 searchguard.cookie.password: "${SEARCHGUARD_COOKIE_PASSWORD:-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa}"\n\
+\n\
+# disable kibana spaces, as they don\'t work with searchguard multitenancy\n\
+xpack.spaces.enabled: false\n\
 ' >> config/kibana.yml
 
-RUN bin/kibana-plugin install https://search.maven.org/remotecontent?filepath=com/floragunn/search-guard-kibana-plugin/6.4.2-15/search-guard-kibana-plugin-6.4.2-15.zip
+RUN bin/kibana-plugin install https://search.maven.org/remotecontent?filepath=com/floragunn/search-guard-kibana-plugin/6.5.4-17/search-guard-kibana-plugin-6.5.4-17.zip
 
 COPY entrypoints/80-keycloak-url.bash /lagoon/entrypoints/
 COPY entrypoints/81-logs-db-ui-url.bash /lagoon/entrypoints/

diff --git a/services/logs-db/Dockerfile b/services/logs-db/Dockerfile
@@ -1,7 +1,7 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/elasticsearch
 
-RUN bin/elasticsearch-plugin install -b com.floragunn:search-guard-6:6.4.2-23.1 \
+RUN bin/elasticsearch-plugin install -b com.floragunn:search-guard-6:6.5.4-24.0 \
     && chmod a+x plugins/search-guard-6/tools/install_demo_configuration.sh \
     && plugins/search-guard-6/tools/install_demo_configuration.sh -y \
     && sed -i 's/searchguard.ssl.http.*//' config/elasticsearch.yml \