From b927c9858517d864f46dc78a5fe6b20ae2a795f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Ruiz=20Ruiz?= <jose@wazuh.com>
Date: Wed, 25 Jul 2018 17:20:43 -0400
Subject: [PATCH] Fixed logstash template and docker-compose.yml versions

---
 docker-compose.yml            | 4 ++--
 kibana/Dockerfile             | 2 +-
 kibana/config/kibana.yml      | 7 -------
 logstash/config/01-wazuh.conf | 2 +-
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 55c0d6e0..24159a15 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
     depends_on:
       - logstash
   logstash:
-    image: wazuh/wazuh-logstash:3.3.1_6.3.1
+    image: wazuh/wazuh-logstash:3.4.0_6.3.1
     hostname: logstash
     restart: always
 #    volumes:
@@ -75,7 +75,7 @@ services:
       - elasticsearch:elasticsearch
       - wazuh:wazuh
   nginx:
-    image: wazuh/wazuh-nginx:3.3.1_6.3.1
+    image: wazuh/wazuh-nginx:3.4.0_6.3.1
     hostname: nginx
     restart: always
     environment:
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index 8162a38f..0b10f000 100644
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -5,7 +5,7 @@ USER root
 
 ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp
 
-ADD https://raw.githubusercontent.com/wazuh/wazuh/3.3/extensions/elasticsearch/wazuh-elastic6-template-alerts.json /usr/share/kibana/config
+ADD https://raw.githubusercontent.com/wazuh/wazuh/3.4/extensions/elasticsearch/wazuh-elastic6-template-alerts.json /usr/share/kibana/config
 
 RUN NODE_OPTIONS="--max-old-space-size=3072" /usr/share/kibana/bin/kibana-plugin install file:///tmp/wazuhapp-${WAZUH_APP_VERSION}.zip &&\
     chown -R kibana.kibana /usr/share/kibana &&\
diff --git a/kibana/config/kibana.yml b/kibana/config/kibana.yml
index 68fc3188..993ad7da 100644
--- a/kibana/config/kibana.yml
+++ b/kibana/config/kibana.yml
@@ -90,10 +90,3 @@ logging.quiet: true
 # Set the interval in milliseconds to sample system and process performance
 # metrics. Minimum is 100ms. Defaults to 10000.
 # ops.interval: 10000
-
-xpack.security.enabled: false
-xpack.grokdebugger.enabled: false
-xpack.graph.enabled: false
-xpack.ml.enabled: false
-xpack.monitoring.enabled: false
-xpack.reporting.enabled: false
diff --git a/logstash/config/01-wazuh.conf b/logstash/config/01-wazuh.conf
index 524b9005..a8dddca4 100644
--- a/logstash/config/01-wazuh.conf
+++ b/logstash/config/01-wazuh.conf
@@ -33,7 +33,7 @@ filter {
         target => "@timestamp"
     }
     mutate {
-        remove_field => ["timestamp", "beat", "input_type", "tags", "count", "@version", "log", "offset", "type", "@src_ip", "host"]
+        remove_field => [ "timestamp", "beat", "input_type", "tags", "count", "@version", "log", "offset", "type", "@src_ip", "host"]
     }
 }
 output {