From 6dacfbcc407e9a59586a6c81d70533f4f6f62494 Mon Sep 17 00:00:00 2001
From: Miguelangel Freitas <miguelangel.freitas@gmail.com>
Date: Mon, 11 Jun 2018 22:30:57 +0000
Subject: [PATCH] Upgrade Wazuh to 3.3.0

---
 kibana/Dockerfile           | 2 +-
 kibana/config/entrypoint.sh | 3 ++-
 wazuh/Dockerfile            | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index 3fe7309c..bac729a0 100644
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -1,6 +1,6 @@
 # Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2)
 FROM docker.elastic.co/kibana/kibana-oss:6.2.4
-ARG WAZUH_APP_VERSION=3.2.4_6.2.4
+ARG WAZUH_APP_VERSION=3.3.0_6.2.4
 USER root
 
 ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp
diff --git a/kibana/config/entrypoint.sh b/kibana/config/entrypoint.sh
index a597af8f..841edb19 100644
--- a/kibana/config/entrypoint.sh
+++ b/kibana/config/entrypoint.sh
@@ -41,7 +41,8 @@ if [ "x$CONFIG_CODE" = "x404" ]; then
         "audit": true,
         "pci": true,
         "aws": true,
-        "virustotal": true
+        "virustotal": true,
+        "gdpr": true
       }
     }
     ' > /dev/null
diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile
index a97842bf..6c04b313 100644
--- a/wazuh/Dockerfile
+++ b/wazuh/Dockerfile
@@ -1,7 +1,7 @@
 # Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2)
 FROM phusion/baseimage:latest
 ARG FILEBEAT_VERSION=6.2.4
-ARG WAZUH_VERSION=3.2.4-1
+ARG WAZUH_VERSION=3.3.0-1
 
 # Updating image
 RUN apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold"