From aa06a825eb3c8e8dafa97ecb6276b327376003df Mon Sep 17 00:00:00 2001 From: Mark Davidson Date: Mon, 8 May 2017 16:13:05 +0100 Subject: [PATCH] Update to 5.4 (#120) Includes required change for logstash config and disables the new machine learning functionality in x-pack by default. --- docker-compose.yml | 1 + elasticsearch/Dockerfile | 2 +- kibana/Dockerfile | 2 +- kibana/config/kibana.yml | 1 + logstash/Dockerfile | 2 +- logstash/config/logstash.yml | 3 ++- 6 files changed, 7 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index a194316..5a1f04e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,6 +14,7 @@ services: # https://www.elastic.co/guide/en/x-pack/current/installing-xpack.html#xpack-enabling xpack.security.enabled: "false" xpack.monitoring.enabled: "false" + xpack.ml.enabled: "false" xpack.graph.enabled: "false" xpack.watcher.enabled: "false" networks: diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index 6e1438e..6dd1625 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -1,5 +1,5 @@ # https://github.com/elastic/elasticsearch-docker -FROM docker.elastic.co/elasticsearch/elasticsearch:5.3.0 +FROM docker.elastic.co/elasticsearch/elasticsearch:5.4.0 # Add your elasticsearch plugins setup here # Example: RUN elasticsearch-plugin install analysis-icu diff --git a/kibana/Dockerfile b/kibana/Dockerfile index de756b1..f032449 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -1,5 +1,5 @@ # https://github.com/elastic/kibana-docker -FROM docker.elastic.co/kibana/kibana:5.3.0 +FROM docker.elastic.co/kibana/kibana:5.4.0 # Add your kibana plugins setup here # Example: RUN kibana-plugin install diff --git a/kibana/config/kibana.yml b/kibana/config/kibana.yml index 166f255..962a454 100644 --- a/kibana/config/kibana.yml +++ b/kibana/config/kibana.yml @@ -12,5 +12,6 @@ elasticsearch.url: http://elasticsearch:9200 # xpack.security.enabled: false xpack.monitoring.enabled: false +xpack.ml.enabled: false xpack.graph.enabled: false xpack.reporting.enabled: false diff --git a/logstash/Dockerfile b/logstash/Dockerfile index d6e733a..705cee9 100644 --- a/logstash/Dockerfile +++ b/logstash/Dockerfile @@ -1,5 +1,5 @@ # https://github.com/elastic/logstash-docker -FROM docker.elastic.co/logstash/logstash:5.3.0 +FROM docker.elastic.co/logstash/logstash:5.4.0 # Add your logstash plugins setup here # Example: RUN logstash-plugin install logstash-filter-json diff --git a/logstash/config/logstash.yml b/logstash/config/logstash.yml index 65400fb..09a7fe1 100644 --- a/logstash/config/logstash.yml +++ b/logstash/config/logstash.yml @@ -3,9 +3,10 @@ ## from https://github.com/elastic/logstash-docker/blob/master/build/logstash/config/logstash.yml # http.host: "0.0.0.0" +path.config: /usr/share/logstash/pipeline ## Disable X-Pack ## see https://www.elastic.co/guide/en/x-pack/current/xpack-settings.html ## https://www.elastic.co/guide/en/x-pack/current/installing-xpack.html#xpack-enabling # -xpack.monitoring.enabled: false +xpack.monitoring.enabled: false \ No newline at end of file