Update to 5.4 (deviantony#120)

Includes required change for logstash config and disables the new machine learning functionality in x-pack by default.
elvis-cai · May 8, 2017 · aa06a82 · aa06a82
1 parent a9e7c3d
commit aa06a82
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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 <name|url>
diff --git 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
@@ -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
@@ -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