remove xpack.monitoring. no more intermittent fails in tests (ruflin#…

…1306)
mhernik · Jul 24, 2017 · 61f7e9c · 61f7e9c
1 parent 1323e51
commit 61f7e9c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -18,6 +18,7 @@ services:
       - bootstrap.memory_lock=true
       - network.host=172.18.0.4
       - xpack.security.enabled=false
+      - xpack.monitoring.enabled=false
       - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
     ulimits:
       memlock:
@@ -44,6 +45,7 @@ services:
       - bootstrap.memory_lock=true
       - network.host=172.18.0.3
       - xpack.security.enabled=false
+      - xpack.monitoring.enabled=false
       - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
     ulimits:
       memlock:

diff --git a/env/elasticsearch/elasticsearch.yml b/env/elasticsearch/elasticsearch.yml
@@ -21,7 +21,12 @@ network.host: 0.0.0.0
 discovery.zen.minimum_master_nodes: 2
 discovery.zen.ping.unicast.hosts: ["elasticsearch"]
 
+# at the moment it's not possible to remove the x-pack plugin from the official ES docker image
+# https://github.com/elastic/elasticsearch-docker/issues/36
+# they've solved on 5.4, I will wait that version to remove the plugin correctly
+# and remove the following two lines
 xpack.security.enabled: false
+xpack.monitoring.enabled: false
 
 # Added for snapshot tests
 path.repo: ["/usr/share/elasticsearch/data"]