Upgrade Elastic Stack and Wazuh-APP version to 3.2.2_6.2.4, thanks @jlruizmlg

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
 

docker-compose.yml

@@ -19,16 +19,14 @@ 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
     ports:
       - "5000:5000"
@@ -38,9 +36,8 @@ services:
       - 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
+      - "ES_JAVA_OPTS=-Xms4g -Xmx4g"
-      - xpack.monitoring.enabled=false
-      - xpack.ml.enabled=false
-      - xpack.watcher.enabled=false
-      - xpack.graph.enabled=false
-      - "ES_JAVA_OPTS=-Xms1g -Xmx1g"
     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:
+#    environment:
-      - "NODE_OPTIONS=--max-old-space-size=3072"
+#      - ELASTICSEARCH_URL=http://elasticsearch:9200
     networks:
       - docker_elk
     depends_on:
       - elasticsearch
     links:
       - elasticsearch:elasticsearch
-      - wazuh
+      - wazuh:wazuh
-    entrypoint: /wait-for-it.sh elasticsearch
   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:

kibana/Dockerfile

@@ -1,5 +1,5 @@
-FROM docker.elastic.co/kibana/kibana-oss:6.2.3
+FROM docker.elastic.co/kibana/kibana-oss:6.2.4
-ARG WAZUH_APP_VERSION=3.2.1_6.2.3
+ARG WAZUH_APP_VERSION=3.2.2_6.2.4
 USER root
 
 ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp

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
 

wazuh/Dockerfile

@@ -1,6 +1,6 @@
 FROM phusion/baseimage:latest
-ARG FILEBEAT_VERSION=6.2.3
+ARG FILEBEAT_VERSION=6.2.4
-ARG WAZUH_VERSION=3.2.1-1
+ARG WAZUH_VERSION=3.2.2-1
 
 # Updating image
 RUN apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold"