From 290ea29c1dc31e703d15b3389996146c790ea204 Mon Sep 17 00:00:00 2001
From: Miguelangel Freitas <miguelangel@wazuh.com>
Date: Tue, 15 May 2018 01:02:27 +0000
Subject: [PATCH] Upgrade Elastic Stack and Wazuh-APP version to 3.2.2_6.2.4,
 thanks @jlruizmlg

---
 README.md           |  2 +-
 docker-compose.yml  | 30 ++++++++++--------------------
 kibana/Dockerfile   |  4 ++--
 logstash/Dockerfile |  2 +-
 wazuh/Dockerfile    |  4 ++--
 5 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index b1405deb..88b1b9ea 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ In addition, a docker-compose file is provided to launch the containers mentione
 
 ## Current release
 
-Containers are currently tested on Wazuh version 3.2.1 and Elastic Stack version 6.2.2. We will do our best to keep this repository updated to latest versions of both Wazuh and Elastic Stack.
+Containers are currently tested on Wazuh version 3.2.2 and Elastic Stack version 6.2.4. We will do our best to keep this repository updated to latest versions of both Wazuh and Elastic Stack.
 
 ## Installation notes
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 5069d769..24dfe8c3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,28 +19,25 @@ services:
 #      - my-path:/etc/filebeat
 #      - my-custom-config-path/ossec.conf:/wazuh-config-mount/etc/ossec.conf
     depends_on:
-      - elasticsearch
+      - logstash
   logstash:
     image: wazuh/wazuh-logstash
     hostname: logstash
     restart: always
-    command: -f /etc/logstash/conf.d/
 #    volumes:
 #      - my-path:/etc/logstash/conf.d:Z
     links:
-     - kibana
-     - elasticsearch:elasticsearch
+      - elasticsearch:elasticsearch
     ports:
       - "5000:5000"
     networks:
-        - docker_elk
+      - docker_elk
     depends_on:
       - elasticsearch
     environment:
       - LS_HEAP_SIZE=2048m
-      - XPACK_MONITORING_ENABLED=false
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:6.2.3
+    image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.2.4
     hostname: elasticsearch
     restart: always
     ports:
@@ -51,17 +48,12 @@ services:
       - cluster.name=wazuh
       - network.host=0.0.0.0
       - bootstrap.memory_lock=true
-      - xpack.security.enabled=false
-      - xpack.monitoring.enabled=false
-      - xpack.ml.enabled=false
-      - xpack.watcher.enabled=false
-      - xpack.graph.enabled=false
-      - "ES_JAVA_OPTS=-Xms1g -Xmx1g"
+      - "ES_JAVA_OPTS=-Xms4g -Xmx4g"
     ulimits:
       memlock:
         soft: -1
         hard: -1
-    mem_limit: 2g
+    mem_limit: 8g
 #    volumes:
 #      - my-path:/usr/share/elasticsearch/data:Z
     networks:
@@ -72,21 +64,19 @@ services:
     restart: always
 #    ports:
 #      - "5601:5601"
-    environment:
-      - "NODE_OPTIONS=--max-old-space-size=3072"
+#    environment:
+#      - ELASTICSEARCH_URL=http://elasticsearch:9200
     networks:
       - docker_elk
     depends_on:
       - elasticsearch
     links:
       - elasticsearch:elasticsearch
-      - wazuh
-    entrypoint: /wait-for-it.sh elasticsearch
+      - wazuh:wazuh
   nginx:
     image: wazuh/wazuh-nginx
     hostname: nginx
     restart: always
-    entrypoint: /run.sh
     environment:
       - NGINX_PORT=443
     ports:
@@ -99,7 +89,7 @@ services:
     depends_on:
       - kibana
     links:
-      - kibana
+      - kibana:kibana
 
 networks:
   docker_elk:
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index 48bc150c..be9ab9db 100644
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -1,5 +1,5 @@
-FROM docker.elastic.co/kibana/kibana-oss:6.2.3
-ARG WAZUH_APP_VERSION=3.2.1_6.2.3
+FROM docker.elastic.co/kibana/kibana-oss:6.2.4
+ARG WAZUH_APP_VERSION=3.2.2_6.2.4
 USER root
 
 ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp
diff --git a/logstash/Dockerfile b/logstash/Dockerfile
index 3a7e0ef2..3cfa1d9f 100644
--- a/logstash/Dockerfile
+++ b/logstash/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.elastic.co/logstash/logstash:6.2.3
+FROM docker.elastic.co/logstash/logstash-oss:6.2.4
 
 RUN rm -f /usr/share/logstash/pipeline/logstash.conf
 
diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile
index a5822f74..47534db9 100644
--- a/wazuh/Dockerfile
+++ b/wazuh/Dockerfile
@@ -1,6 +1,6 @@
 FROM phusion/baseimage:latest
-ARG FILEBEAT_VERSION=6.2.3
-ARG WAZUH_VERSION=3.2.1-1
+ARG FILEBEAT_VERSION=6.2.4
+ARG WAZUH_VERSION=3.2.2-1
 
 # Updating image
 RUN apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold"