From 9a841fdbd344e8600c7ae2b6e3494554030a54b9 Mon Sep 17 00:00:00 2001
From: manuasir <manu.asi2@gmail.com>
Date: Mon, 11 Feb 2019 15:28:43 +0100
Subject: [PATCH 01/16] Added support for secure HTTPS xPac requests

---
 elasticsearch/config/load_settings.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/elasticsearch/config/load_settings.sh b/elasticsearch/config/load_settings.sh
index bac61378..d41b5cf9 100644
--- a/elasticsearch/config/load_settings.sh
+++ b/elasticsearch/config/load_settings.sh
@@ -15,6 +15,11 @@ else
   wazuh_url="${WAZUH_API_URL}"
 fi
 
+if [ "x${ELASTICSEARCH_USERNAME}" = "x"]; then
+  auth=""
+else
+  auth="--user ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}"
+fi
 
 until curl -XGET $el_url; do
   >&2 echo "Elastic is unavailable - sleeping"
@@ -27,7 +32,7 @@ done
 
 sed -i 's|    "index.refresh_interval": "5s"|    "index.refresh_interval": "5s",    "number_of_shards" :   '"${ALERTS_SHARDS}"',    "number_of_replicas" : '"${ALERTS_REPLICAS}"'|' /usr/share/elasticsearch/config/wazuh-elastic6-template-alerts.json
 
-cat /usr/share/elasticsearch/config/wazuh-elastic6-template-alerts.json | curl -XPUT "$el_url/_template/wazuh" -H 'Content-Type: application/json' -d @-
+cat /usr/share/elasticsearch/config/wazuh-elastic6-template-alerts.json | curl -XPUT "$el_url/_template/wazuh" ${auth} -H 'Content-Type: application/json' -d @-
 sleep 5
 
 
@@ -38,7 +43,7 @@ API_PASSWORD=`echo -n $API_PASS_Q | base64`
 echo "Setting API credentials into Wazuh APP"
 CONFIG_CODE=$(curl -s -o /dev/null -w "%{http_code}" -XGET $el_url/.wazuh/wazuh-configuration/1513629884013)
 if [ "x$CONFIG_CODE" = "x404" ]; then
-  curl -s -XPOST $el_url/.wazuh/wazuh-configuration/1513629884013 -H 'Content-Type: application/json' -d'
+  curl -s -XPOST ${auth} $el_url/.wazuh/wazuh-configuration/1513629884013 -H 'Content-Type: application/json' -d'
   {
     "api_user": "'"$API_USER_Q"'",
     "api_password": "'"$API_PASSWORD"'",

From 89e6af0d9ad1b336398f148e89a393454c37d405 Mon Sep 17 00:00:00 2001
From: manuasir <manu.asi2@gmail.com>
Date: Tue, 12 Feb 2019 17:10:46 +0100
Subject: [PATCH 02/16] Added authorization to every Elastic request

---
 elasticsearch/config/load_settings.sh | 8 ++++----
 kibana/config/entrypoint.sh           | 8 +++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/elasticsearch/config/load_settings.sh b/elasticsearch/config/load_settings.sh
index d41b5cf9..d78d0f17 100644
--- a/elasticsearch/config/load_settings.sh
+++ b/elasticsearch/config/load_settings.sh
@@ -21,7 +21,7 @@ else
   auth="--user ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}"
 fi
 
-until curl -XGET $el_url; do
+until curl ${auth} -XGET $el_url; do
   >&2 echo "Elastic is unavailable - sleeping"
   sleep 5
 done
@@ -41,9 +41,9 @@ API_USER_Q=`echo "$API_USER" | tr -d '"'`
 API_PASSWORD=`echo -n $API_PASS_Q | base64`
 
 echo "Setting API credentials into Wazuh APP"
-CONFIG_CODE=$(curl -s -o /dev/null -w "%{http_code}" -XGET $el_url/.wazuh/wazuh-configuration/1513629884013)
+CONFIG_CODE=$(curl -s -o /dev/null -w "%{http_code}" -XGET $el_url/.wazuh/wazuh-configuration/1513629884013 ${auth})
 if [ "x$CONFIG_CODE" = "x404" ]; then
-  curl -s -XPOST ${auth} $el_url/.wazuh/wazuh-configuration/1513629884013 -H 'Content-Type: application/json' -d'
+  curl -s -XPOST $el_url/.wazuh/wazuh-configuration/1513629884013 ${auth} -H 'Content-Type: application/json' -d'
   {
     "api_user": "'"$API_USER_Q"'",
     "api_password": "'"$API_PASSWORD"'",
@@ -72,7 +72,7 @@ else
 fi
 sleep 5
 
-curl -XPUT "$el_url/_cluster/settings" -H 'Content-Type: application/json' -d'
+curl -XPUT "$el_url/_cluster/settings" ${auth} -H 'Content-Type: application/json' -d'
 {
   "persistent": {
     "xpack.monitoring.collection.enabled": true
diff --git a/kibana/config/entrypoint.sh b/kibana/config/entrypoint.sh
index e34029b7..e612bbb3 100644
--- a/kibana/config/entrypoint.sh
+++ b/kibana/config/entrypoint.sh
@@ -9,7 +9,13 @@ else
   el_url="${ELASTICSEARCH_URL}"
 fi
 
-until curl -XGET $el_url; do
+if [ "x${ELASTICSEARCH_USERNAME}" = "x"]; then
+  auth=""
+else
+  auth="--user ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}"
+fi
+
+until curl -XGET $el_url ${auth}; do
   >&2 echo "Elastic is unavailable - sleeping"
   sleep 5
 done

From 90738fb148bfa0681ecd279f215813c9798895c0 Mon Sep 17 00:00:00 2001
From: l <luisgguijarro9@gmail.com>
Date: Tue, 12 Mar 2019 12:38:11 +0100
Subject: [PATCH 03/16] Fixing docker run loop at the elasticsearch container

---
 elasticsearch/config/load_settings.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/elasticsearch/config/load_settings.sh b/elasticsearch/config/load_settings.sh
index bac61378..5ed1ac1a 100644
--- a/elasticsearch/config/load_settings.sh
+++ b/elasticsearch/config/load_settings.sh
@@ -4,7 +4,7 @@
 set -e
 
 if [ "x${ELASTICSEARCH_URL}" = "x" ]; then
-  el_url="http://elasticsearch:9200"
+  el_url="http://localhost:9200"
 else
   el_url="${ELASTICSEARCH_URL}"
 fi

From b06e4c4a5e07cd205c52ee945e88505767723bc1 Mon Sep 17 00:00:00 2001
From: l <luisgguijarro9@gmail.com>
Date: Tue, 19 Mar 2019 10:48:07 +0100
Subject: [PATCH 04/16] Upgrade Elastic stack version to 6.6.1

---
 elasticsearch/Dockerfile | 2 +-
 kibana/Dockerfile        | 4 ++--
 logstash/Dockerfile      | 2 +-
 wazuh/Dockerfile         | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile
index 1a41604b..19a605fd 100644
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@@ -1,5 +1,5 @@
 # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
-FROM docker.elastic.co/elasticsearch/elasticsearch:6.5.4
+FROM docker.elastic.co/elasticsearch/elasticsearch:6.6.1
 
 ENV ALERTS_SHARDS="1" \
     ALERTS_REPLICAS="0"
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index 8bb08523..80919392 100644
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -1,6 +1,6 @@
 # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
-FROM docker.elastic.co/kibana/kibana:6.5.4
-ARG WAZUH_APP_VERSION=3.8.2_6.5.4
+FROM docker.elastic.co/kibana/kibana:6.6.1
+ARG WAZUH_APP_VERSION=3.8.2_6.6.1
 USER root
 
 ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp
diff --git a/logstash/Dockerfile b/logstash/Dockerfile
index 00322375..146050de 100644
--- a/logstash/Dockerfile
+++ b/logstash/Dockerfile
@@ -1,5 +1,5 @@
 # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
-FROM docker.elastic.co/logstash/logstash:6.5.4
+FROM docker.elastic.co/logstash/logstash:6.6.1
 
 RUN rm -f /usr/share/logstash/pipeline/logstash.conf
 
diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile
index 1031c1d0..268d2a3d 100644
--- a/wazuh/Dockerfile
+++ b/wazuh/Dockerfile
@@ -1,6 +1,6 @@
 # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
 FROM phusion/baseimage:latest
-ARG FILEBEAT_VERSION=6.5.4
+ARG FILEBEAT_VERSION=6.6.1
 ARG WAZUH_VERSION=3.8.2-1
 
 ENV API_USER="foo" \

From ee7a16eb1a2cb48042b5e95c3eeecf594781efd4 Mon Sep 17 00:00:00 2001
From: l <luisgguijarro9@gmail.com>
Date: Thu, 21 Mar 2019 16:43:40 +0100
Subject: [PATCH 05/16] Fixing if whitespace error

---
 elasticsearch/config/load_settings.sh | 2 +-
 kibana/config/entrypoint.sh           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/elasticsearch/config/load_settings.sh b/elasticsearch/config/load_settings.sh
index d78d0f17..79650157 100644
--- a/elasticsearch/config/load_settings.sh
+++ b/elasticsearch/config/load_settings.sh
@@ -15,7 +15,7 @@ else
   wazuh_url="${WAZUH_API_URL}"
 fi
 
-if [ "x${ELASTICSEARCH_USERNAME}" = "x"]; then
+if [ "x${ELASTICSEARCH_USERNAME}" = "x" ]; then
   auth=""
 else
   auth="--user ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}"
diff --git a/kibana/config/entrypoint.sh b/kibana/config/entrypoint.sh
index e612bbb3..067566c5 100644
--- a/kibana/config/entrypoint.sh
+++ b/kibana/config/entrypoint.sh
@@ -9,7 +9,7 @@ else
   el_url="${ELASTICSEARCH_URL}"
 fi
 
-if [ "x${ELASTICSEARCH_USERNAME}" = "x"]; then
+if [ "x${ELASTICSEARCH_USERNAME}" = "x" ]; then
   auth=""
 else
   auth="--user ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}"

From 8e5ad87619fb93a95f9f7bfc42a020876d91ea6d Mon Sep 17 00:00:00 2001
From: manuasir <manu.asi2@gmail.com>
Date: Fri, 29 Mar 2019 18:27:17 +0100
Subject: [PATCH 06/16] Added vm.max_map_count to README

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 3760f61e..8e0d446a 100644
--- a/README.md
+++ b/README.md
@@ -11,8 +11,9 @@ In this repository you will find the containers to run:
 * wazuh-logstash: It is used to receive alerts generated by the manager and feed Elasticsearch using an alerts template
 * wazuh-kibana: Provides a web user interface to browse through alerts data. It includes Wazuh plugin for Kibana, that allows you to visualize agents configuration and status.
 * wazuh-nginx: Proxies the Kibana container, adding HTTPS (via self-signed SSL certificate) and [Basic authentication](https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication#Basic_authentication_scheme).
+* wazuh-elasticsearch: An Elasticsearch container (working as a single-node cluster) using Elastic Stack Docker images. **Be aware to increase the `vm.max_map_count` setting, as it's detailed in the [Wazuh documentation](https://documentation.wazuh.com/current/docker/wazuh-container.html#increase-max-map-count-on-your-host-linux).** 
 
-In addition, a docker-compose file is provided to launch the containers mentioned above. It also launches an Elasticsearch container (working as a single-node cluster) using Elastic Stack Docker images.
+In addition, a docker-compose file is provided to launch the containers mentioned above. 
 
 ## Documentation
 
@@ -58,7 +59,7 @@ In addition, a docker-compose file is provided to launch the containers mentione
 
 ## Branches
 
-* `stable` branch on correspond to the last Wazuh-Docker stable version.
+* `stable` branch on correspond to the latest Wazuh-Docker stable version.
 * `master` branch contains the latest code, be aware of possible bugs on this branch.
 * `Wazuh.Version_ElasticStack.Version` (for example 3.7.0_6.4.3) branch. This branch contains the current release referenced in Docker Hub. The container images are installed under the current version of this branch.
 

From 86bc43a4940f450ecf22449d4511d7cc3152bfb3 Mon Sep 17 00:00:00 2001
From: manuasir <manu.asi2@gmail.com>
Date: Fri, 29 Mar 2019 18:44:36 +0100
Subject: [PATCH 07/16] Bump version

---
 CHANGELOG.md       |  6 ++++++
 README.md          |  2 +-
 VERSION            |  2 +-
 docker-compose.yml | 10 +++++-----
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61093b6a..83f6cd42 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## Wazuh Docker v3.8.2_6.6.1
+
+### Changed
+
+- Update Elastic Stack version to 6.6.1. ([#143](https://github.com/wazuh/wazuh-docker/pull/143))
+
 ## Wazuh Docker v3.8.2_6.5.4
 
 ### Added
diff --git a/README.md b/README.md
index 8e0d446a..7272cb19 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ In addition, a docker-compose file is provided to launch the containers mentione
 
 * `stable` branch on correspond to the latest Wazuh-Docker stable version.
 * `master` branch contains the latest code, be aware of possible bugs on this branch.
-* `Wazuh.Version_ElasticStack.Version` (for example 3.7.0_6.4.3) branch. This branch contains the current release referenced in Docker Hub. The container images are installed under the current version of this branch.
+* `Wazuh.Version_ElasticStack.Version` (for example 3.8.2_6.6.1) branch. This branch contains the current release referenced in Docker Hub. The container images are installed under the current version of this branch.
 
 ## Credits and Thank you
 
diff --git a/VERSION b/VERSION
index bb5f485c..cc705574 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-WAZUH-DOCKER_VERSION="3.8.2_6.5.4"
+WAZUH-DOCKER_VERSION="3.8.2_6.6.1"
 REVISION="3802"
diff --git a/docker-compose.yml b/docker-compose.yml
index 91a0d9fc..3bd76826 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '2'
 
 services:
   wazuh:
-    image: wazuh/wazuh:3.8.2_6.5.4
+    image: wazuh/wazuh:3.8.2_6.6.1
     hostname: wazuh-manager
     restart: always
     ports:
@@ -14,7 +14,7 @@ services:
     depends_on:
       - logstash
   logstash:
-    image: wazuh/wazuh-logstash:3.8.2_6.5.4
+    image: wazuh/wazuh-logstash:3.8.2_6.6.1
     hostname: logstash
     restart: always
     links:
@@ -26,7 +26,7 @@ services:
     environment:
       - LS_HEAP_SIZE=2048m
   elasticsearch:
-    image: wazuh/wazuh-elasticsearch:3.8.2_6.5.4
+    image: wazuh/wazuh-elasticsearch:3.8.2_6.6.1
     hostname: elasticsearch
     restart: always
     ports:
@@ -43,7 +43,7 @@ services:
         hard: -1
     mem_limit: 2g
   kibana:
-    image: wazuh/wazuh-kibana:3.8.2_6.5.4
+    image: wazuh/wazuh-kibana:3.8.2_6.6.1
     hostname: kibana
     restart: always
     depends_on:
@@ -52,7 +52,7 @@ services:
       - elasticsearch:elasticsearch
       - wazuh:wazuh
   nginx:
-    image: wazuh/wazuh-nginx:3.8.2_6.5.4
+    image: wazuh/wazuh-nginx:3.8.2_6.6.1
     hostname: nginx
     restart: always
     environment:

From 38644d380cb50021ae6e7e03ad60e4a81a173372 Mon Sep 17 00:00:00 2001
From: "Manuel J. Bernal" <manu.asi2@gmail.com>
Date: Fri, 29 Mar 2019 18:51:52 +0100
Subject: [PATCH 08/16] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83f6cd42..39844ca5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
-- Update Elastic Stack version to 6.6.1. ([#143](https://github.com/wazuh/wazuh-docker/pull/143))
+- Update Elastic Stack version to 6.6.1. ([#129](https://github.com/wazuh/wazuh-docker/pull/129))
 
 ## Wazuh Docker v3.8.2_6.5.4
 

From b99d54eb259fa08bc8aa325d01b472412d401603 Mon Sep 17 00:00:00 2001
From: manuasir <manu.asi2@gmail.com>
Date: Fri, 29 Mar 2019 19:03:28 +0100
Subject: [PATCH 09/16] Bump version

---
 CHANGELOG.md             | 10 ++++++++--
 README.md                |  2 +-
 VERSION                  |  2 +-
 docker-compose.yml       | 10 +++++-----
 elasticsearch/Dockerfile |  2 +-
 kibana/Dockerfile        |  4 ++--
 logstash/Dockerfile      |  2 +-
 wazuh/Dockerfile         |  2 +-
 8 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39844ca5..48c4e138 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,17 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## Wazuh Docker v3.8.2_6.6.1
+## Wazuh Docker v3.8.2_6.6.2
 
 ### Changed
 
-- Update Elastic Stack version to 6.6.1. ([#129](https://github.com/wazuh/wazuh-docker/pull/129))
+- Update Elastic Stack version to 6.6.2. ([#130](https://github.com/wazuh/wazuh-docker/pull/130))
+
+## Wazuh Docker v3.8.2_6.6.2
+
+### Changed
+
+- Update Elastic Stack version to 6.6.2. ([#129](https://github.com/wazuh/wazuh-docker/pull/129))
 
 ## Wazuh Docker v3.8.2_6.5.4
 
diff --git a/README.md b/README.md
index 7272cb19..28cdc27f 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ In addition, a docker-compose file is provided to launch the containers mentione
 
 * `stable` branch on correspond to the latest Wazuh-Docker stable version.
 * `master` branch contains the latest code, be aware of possible bugs on this branch.
-* `Wazuh.Version_ElasticStack.Version` (for example 3.8.2_6.6.1) branch. This branch contains the current release referenced in Docker Hub. The container images are installed under the current version of this branch.
+* `Wazuh.Version_ElasticStack.Version` (for example 3.8.2_6.6.2) branch. This branch contains the current release referenced in Docker Hub. The container images are installed under the current version of this branch.
 
 ## Credits and Thank you
 
diff --git a/VERSION b/VERSION
index cc705574..4b4e1a3b 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-WAZUH-DOCKER_VERSION="3.8.2_6.6.1"
+WAZUH-DOCKER_VERSION="3.8.2_6.6.2"
 REVISION="3802"
diff --git a/docker-compose.yml b/docker-compose.yml
index 3bd76826..a752310d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '2'
 
 services:
   wazuh:
-    image: wazuh/wazuh:3.8.2_6.6.1
+    image: wazuh/wazuh:3.8.2_6.6.2
     hostname: wazuh-manager
     restart: always
     ports:
@@ -14,7 +14,7 @@ services:
     depends_on:
       - logstash
   logstash:
-    image: wazuh/wazuh-logstash:3.8.2_6.6.1
+    image: wazuh/wazuh-logstash:3.8.2_6.6.2
     hostname: logstash
     restart: always
     links:
@@ -26,7 +26,7 @@ services:
     environment:
       - LS_HEAP_SIZE=2048m
   elasticsearch:
-    image: wazuh/wazuh-elasticsearch:3.8.2_6.6.1
+    image: wazuh/wazuh-elasticsearch:3.8.2_6.6.2
     hostname: elasticsearch
     restart: always
     ports:
@@ -43,7 +43,7 @@ services:
         hard: -1
     mem_limit: 2g
   kibana:
-    image: wazuh/wazuh-kibana:3.8.2_6.6.1
+    image: wazuh/wazuh-kibana:3.8.2_6.6.2
     hostname: kibana
     restart: always
     depends_on:
@@ -52,7 +52,7 @@ services:
       - elasticsearch:elasticsearch
       - wazuh:wazuh
   nginx:
-    image: wazuh/wazuh-nginx:3.8.2_6.6.1
+    image: wazuh/wazuh-nginx:3.8.2_6.6.2
     hostname: nginx
     restart: always
     environment:
diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile
index f5a8b6d8..c95c9e96 100644
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@@ -1,5 +1,5 @@
 # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
-FROM docker.elastic.co/elasticsearch/elasticsearch:6.6.1
+FROM docker.elastic.co/elasticsearch/elasticsearch:6.6.2
 
 ENV ALERTS_SHARDS="1" \
     ALERTS_REPLICAS="0"
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index abe4825b..3ecfcec2 100644
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -1,6 +1,6 @@
 # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
-FROM docker.elastic.co/kibana/kibana:6.6.1
-ARG WAZUH_APP_VERSION=3.8.2_6.6.1
+FROM docker.elastic.co/kibana/kibana:6.6.2
+ARG WAZUH_APP_VERSION=3.8.2_6.6.2
 USER root
 
 ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp
diff --git a/logstash/Dockerfile b/logstash/Dockerfile
index a89feed8..75c71a6a 100644
--- a/logstash/Dockerfile
+++ b/logstash/Dockerfile
@@ -1,5 +1,5 @@
 # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
-FROM docker.elastic.co/logstash/logstash:6.6.1
+FROM docker.elastic.co/logstash/logstash:6.6.2
 
 COPY --chown=logstash:logstash config/entrypoint.sh /entrypoint.sh
 
diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile
index b412a8e8..585a0227 100644
--- a/wazuh/Dockerfile
+++ b/wazuh/Dockerfile
@@ -1,6 +1,6 @@
 # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
 FROM phusion/baseimage:latest
-ARG FILEBEAT_VERSION=6.6.1
+ARG FILEBEAT_VERSION=6.6.2
 ARG WAZUH_VERSION=3.8.2-1
 
 ENV API_USER="foo" \

From 274d6248d337abd95ecbd23bd68b60d50ced2879 Mon Sep 17 00:00:00 2001
From: manuasir <manu.asi2@gmail.com>
Date: Tue, 2 Apr 2019 18:21:04 +0200
Subject: [PATCH 10/16] Bump version.

---
 CHANGELOG.md             | 10 ++++++++--
 README.md                |  2 +-
 VERSION                  |  4 ++--
 docker-compose.yml       | 10 +++++-----
 elasticsearch/Dockerfile |  4 ++--
 kibana/Dockerfile        |  4 ++--
 logstash/Dockerfile      |  2 +-
 wazuh/Dockerfile         |  2 +-
 8 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48c4e138..0a4035c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,17 +1,23 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## Wazuh Docker v3.8.2_6.7.0
+
+### Changed
+
+- Update Elastic Stack version to 6.7.0. ([#131](https://github.com/wazuh/wazuh-docker/pull/131))
+
 ## Wazuh Docker v3.8.2_6.6.2
 
 ### Changed
 
 - Update Elastic Stack version to 6.6.2. ([#130](https://github.com/wazuh/wazuh-docker/pull/130))
 
-## Wazuh Docker v3.8.2_6.6.2
+## Wazuh Docker v3.8.2_6.6.1
 
 ### Changed
 
-- Update Elastic Stack version to 6.6.2. ([#129](https://github.com/wazuh/wazuh-docker/pull/129))
+- Update Elastic Stack version to 6.6.1. ([#129](https://github.com/wazuh/wazuh-docker/pull/129))
 
 ## Wazuh Docker v3.8.2_6.5.4
 
diff --git a/README.md b/README.md
index 28cdc27f..f3e82a5d 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ In addition, a docker-compose file is provided to launch the containers mentione
 
 * `stable` branch on correspond to the latest Wazuh-Docker stable version.
 * `master` branch contains the latest code, be aware of possible bugs on this branch.
-* `Wazuh.Version_ElasticStack.Version` (for example 3.8.2_6.6.2) branch. This branch contains the current release referenced in Docker Hub. The container images are installed under the current version of this branch.
+* `Wazuh.Version_ElasticStack.Version` (for example 3.8.2_6.7.0) branch. This branch contains the current release referenced in Docker Hub. The container images are installed under the current version of this branch.
 
 ## Credits and Thank you
 
diff --git a/VERSION b/VERSION
index 4b4e1a3b..2c9de155 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-WAZUH-DOCKER_VERSION="3.8.2_6.6.2"
-REVISION="3802"
+WAZUH-DOCKER_VERSION="3.8.2_6.7.0"
+REVISION="3803"
diff --git a/docker-compose.yml b/docker-compose.yml
index a752310d..03af6a96 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '2'
 
 services:
   wazuh:
-    image: wazuh/wazuh:3.8.2_6.6.2
+    image: wazuh/wazuh:3.8.2_6.7.0
     hostname: wazuh-manager
     restart: always
     ports:
@@ -14,7 +14,7 @@ services:
     depends_on:
       - logstash
   logstash:
-    image: wazuh/wazuh-logstash:3.8.2_6.6.2
+    image: wazuh/wazuh-logstash:3.8.2_6.7.0
     hostname: logstash
     restart: always
     links:
@@ -26,7 +26,7 @@ services:
     environment:
       - LS_HEAP_SIZE=2048m
   elasticsearch:
-    image: wazuh/wazuh-elasticsearch:3.8.2_6.6.2
+    image: wazuh/wazuh-elasticsearch:3.8.2_6.7.0
     hostname: elasticsearch
     restart: always
     ports:
@@ -43,7 +43,7 @@ services:
         hard: -1
     mem_limit: 2g
   kibana:
-    image: wazuh/wazuh-kibana:3.8.2_6.6.2
+    image: wazuh/wazuh-kibana:3.8.2_6.7.0
     hostname: kibana
     restart: always
     depends_on:
@@ -52,7 +52,7 @@ services:
       - elasticsearch:elasticsearch
       - wazuh:wazuh
   nginx:
-    image: wazuh/wazuh-nginx:3.8.2_6.6.2
+    image: wazuh/wazuh-nginx:3.8.2_6.7.0
     hostname: nginx
     restart: always
     environment:
diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile
index c95c9e96..2a5ff67c 100644
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@@ -1,5 +1,5 @@
 # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
-FROM docker.elastic.co/elasticsearch/elasticsearch:6.6.2
+FROM docker.elastic.co/elasticsearch/elasticsearch:6.7.0
 
 ENV ALERTS_SHARDS="1" \
     ALERTS_REPLICAS="0"
@@ -23,7 +23,7 @@ COPY --chown=elasticsearch:elasticsearch ./config/load_settings.sh ./
 
 RUN chmod +x ./load_settings.sh
 
-RUN elasticsearch-plugin install --batch repository-s3
+RUN bin/elasticsearch-plugin install --batch https://artifacts.elastic.co/downloads/elasticsearch-plugins/repository-s3/repository-s3-6.7.0.zip
 
 COPY config/configure_s3.sh ./config/configure_s3.sh
 RUN chmod 755 ./config/configure_s3.sh
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index 3ecfcec2..767c33d2 100644
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -1,6 +1,6 @@
 # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
-FROM docker.elastic.co/kibana/kibana:6.6.2
-ARG WAZUH_APP_VERSION=3.8.2_6.6.2
+FROM docker.elastic.co/kibana/kibana:6.7.0
+ARG WAZUH_APP_VERSION=3.8.2_6.7.0
 USER root
 
 ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp
diff --git a/logstash/Dockerfile b/logstash/Dockerfile
index 75c71a6a..2ad4fb93 100644
--- a/logstash/Dockerfile
+++ b/logstash/Dockerfile
@@ -1,5 +1,5 @@
 # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
-FROM docker.elastic.co/logstash/logstash:6.6.2
+FROM docker.elastic.co/logstash/logstash:6.7.0
 
 COPY --chown=logstash:logstash config/entrypoint.sh /entrypoint.sh
 
diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile
index 585a0227..e25f7936 100644
--- a/wazuh/Dockerfile
+++ b/wazuh/Dockerfile
@@ -1,6 +1,6 @@
 # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
 FROM phusion/baseimage:latest
-ARG FILEBEAT_VERSION=6.6.2
+ARG FILEBEAT_VERSION=6.7.0
 ARG WAZUH_VERSION=3.8.2-1
 
 ENV API_USER="foo" \

From 61d3f460be33e26213e666afafda0e5b5fd1e4f3 Mon Sep 17 00:00:00 2001
From: manuasir <manu.asi2@gmail.com>
Date: Wed, 3 Apr 2019 14:42:38 +0200
Subject: [PATCH 11/16] Updated CHANGELOG.

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0a4035c1..508393b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
-- Update Elastic Stack version to 6.7.0. ([#131](https://github.com/wazuh/wazuh-docker/pull/131))
+- Update Elastic Stack version to 6.7.0. ([#144](https://github.com/wazuh/wazuh-docker/pull/144))
 
 ## Wazuh Docker v3.8.2_6.6.2
 

From 99008b5e697236ce1f9fafb4dd917796e106557a Mon Sep 17 00:00:00 2001
From: manuasir <manuel.jimenez@wazuh.com>
Date: Mon, 29 Apr 2019 17:04:38 +0200
Subject: [PATCH 12/16] Added a conditional flag for enabling XPACK auth
 requests.

---
 elasticsearch/config/load_settings.sh | 2 +-
 kibana/config/entrypoint.sh           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/elasticsearch/config/load_settings.sh b/elasticsearch/config/load_settings.sh
index b601476f..2a69b36f 100644
--- a/elasticsearch/config/load_settings.sh
+++ b/elasticsearch/config/load_settings.sh
@@ -11,7 +11,7 @@ else
   wazuh_url="${WAZUH_API_URL}"
 fi
 
-if [ "x${ELASTICSEARCH_USERNAME}" = "x" ]; then
+if [ ${ENABLED_XPACK} != "true" || "x${ELASTICSEARCH_USERNAME}" = "x" || "x${ELASTICSEARCH_PASSWORD}" = "x" ]; then
   auth=""
 else
   auth="--user ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}"
diff --git a/kibana/config/entrypoint.sh b/kibana/config/entrypoint.sh
index e449ae2c..f171374f 100644
--- a/kibana/config/entrypoint.sh
+++ b/kibana/config/entrypoint.sh
@@ -13,7 +13,7 @@ else
   el_url="${ELASTICSEARCH_URL}"
 fi
 
-if [ "x${ELASTICSEARCH_USERNAME}" = "x" ]; then
+if [ ${ENABLED_XPACK} != "true" || "x${ELASTICSEARCH_USERNAME}" = "x" || "x${ELASTICSEARCH_PASSWORD}" = "x" ]; then
   auth=""
 else
   auth="--user ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}"

From 9db7bbd1603191661a733acaa9747d3915caf4f0 Mon Sep 17 00:00:00 2001
From: Mayte Ariza <mayte.ariza@wazuh.com>
Date: Fri, 26 Apr 2019 08:08:49 +0200
Subject: [PATCH 13/16] Removing logs from Wazuh image (#153)

---
 wazuh/Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile
index 7fb4b95d..539cf0ac 100644
--- a/wazuh/Dockerfile
+++ b/wazuh/Dockerfile
@@ -18,7 +18,9 @@ RUN add-apt-repository universe && apt-get update && apt-get upgrade -y -o Dpkg:
    apt-get --no-install-recommends --no-install-suggests -y install openssl postfix bsd-mailx python-boto python-pip  \
    apt-transport-https vim expect nodejs python-cryptography mailutils libsasl2-modules wazuh-manager=${WAZUH_VERSION} \
    wazuh-api=${WAZUH_VERSION} && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -f \
-   /var/ossec/logs/alerts/*/*/*.log && rm -f /var/ossec/logs/alerts/*/*/*.json
+   /var/ossec/logs/alerts/*/*/*.log && rm -f /var/ossec/logs/alerts/*/*/*.json && rm -f \
+   /var/ossec/logs/archives/*/*/*.log && rm -f /var/ossec/logs/archives/*/*/*.json && rm -f \
+   /var/ossec/logs/firewall/*/*/*.log && rm -f /var/ossec/logs/firewall/*/*/*.json
 
 # Adding first run script and entrypoint
 COPY config/data_dirs.env /data_dirs.env

From efab5fe0bd8ef4b6621d90f411e7bc8cd080f3a6 Mon Sep 17 00:00:00 2001
From: manuasir <manuel.jimenez@wazuh.com>
Date: Mon, 29 Apr 2019 18:34:50 +0200
Subject: [PATCH 14/16] Updated CHANGELOG.

---
 CHANGELOG.md | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f8613574..1d28d1ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,25 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## Wazuh Docker v3.9.0_6.7.1
+
+### Added
+
+- Support for xPACK authorized requests ([@manuasir](https://github.com/manuasir)) ([#119](https://github.com/wazuh/wazuh-docker/pull/119))
+- Add Elasticsearch cluster configuration ([@SitoRBJ](https://github.com/SitoRBJ)). ([#146](https://github.com/wazuh/wazuh-docker/pull/146))
+- Add Elasticsearch cluster configuration ([@Phandora](https://github.com/Phandora)) ([#140](https://github.com/wazuh/wazuh-docker/pull/140))
+- Setting Nginx to support several user/passwords in Kibana ([@toniMR](https://github.com/toniMR)) ([#136](https://github.com/wazuh/wazuh-docker/pull/136))
+
+
+### Changed
+
+- Use LS_JAVA_OPTS instead of old LS_HEAP_SIZE ([@ruffy91](https://github.com/ruffy91)) ([#139](https://github.com/wazuh/wazuh-docker/pull/139))
+- Changing the original Wazuh docker image to allow adding code in the entrypoint ([@Phandora](https://github.com/phandora)) ([#151](https://github.com/wazuh/wazuh-docker/pull/151))
+
+### Removed
+
+- Removing files from Wazuh image ([@Phandora](https://github.com/phandora)) ([#153](https://github.com/wazuh/wazuh-docker/pull/153))
+
 ## Wazuh Docker v3.8.2_6.7.0
 
 ### Changed
@@ -30,7 +49,6 @@ All notable changes to this project will be documented in this file.
 - Adding env variables for alerts data flow. ([#118](https://github.com/wazuh/wazuh-docker/pull/118))
 - New Logstash entrypoint added. ([#135](https://github.com/wazuh/wazuh-docker/pull/135/files))
 - Welcome screen management. ([#133](https://github.com/wazuh/wazuh-docker/pull/133))
-- Add Elasticsearch cluster configuration. ([#146](https://github.com/wazuh/wazuh-docker/pull/146))
 
 ### Changed
 

From dc70fb864d5c962763623301976e01a3778a3f77 Mon Sep 17 00:00:00 2001
From: manuasir <manuel.jimenez@wazuh.com>
Date: Tue, 30 Apr 2019 17:01:02 +0200
Subject: [PATCH 15/16] Bump version.

---
 README.md                |  2 +-
 VERSION                  |  4 ++--
 docker-compose.yml       | 10 +++++-----
 elasticsearch/Dockerfile |  6 +++---
 kibana/Dockerfile        |  4 ++--
 wazuh/Dockerfile         |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 60902617..d40faa98 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@ In addition, a docker-compose file is provided to launch the containers mentione
 
 * `stable` branch on correspond to the latest Wazuh-Docker stable version.
 * `master` branch contains the latest code, be aware of possible bugs on this branch.
-* `Wazuh.Version_ElasticStack.Version` (for example 3.8.2_6.7.0) branch. This branch contains the current release referenced in Docker Hub. The container images are installed under the current version of this branch.
+* `Wazuh.Version_ElasticStack.Version` (for example 3.9.0_6.7.1) branch. This branch contains the current release referenced in Docker Hub. The container images are installed under the current version of this branch.
 
 ## Credits and Thank you
 
diff --git a/VERSION b/VERSION
index 2c9de155..eaee0e1b 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-WAZUH-DOCKER_VERSION="3.8.2_6.7.0"
-REVISION="3803"
+WAZUH-DOCKER_VERSION="3.9.0_6.7.1"
+REVISION="3900"
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 03af6a96..b5e4573f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '2'
 
 services:
   wazuh:
-    image: wazuh/wazuh:3.8.2_6.7.0
+    image: wazuh/wazuh:3.9.0_6.7.1
     hostname: wazuh-manager
     restart: always
     ports:
@@ -14,7 +14,7 @@ services:
     depends_on:
       - logstash
   logstash:
-    image: wazuh/wazuh-logstash:3.8.2_6.7.0
+    image: wazuh/wazuh-logstash:3.9.0_6.7.1
     hostname: logstash
     restart: always
     links:
@@ -26,7 +26,7 @@ services:
     environment:
       - LS_HEAP_SIZE=2048m
   elasticsearch:
-    image: wazuh/wazuh-elasticsearch:3.8.2_6.7.0
+    image: wazuh/wazuh-elasticsearch:3.9.0_6.7.1
     hostname: elasticsearch
     restart: always
     ports:
@@ -43,7 +43,7 @@ services:
         hard: -1
     mem_limit: 2g
   kibana:
-    image: wazuh/wazuh-kibana:3.8.2_6.7.0
+    image: wazuh/wazuh-kibana:3.9.0_6.7.1
     hostname: kibana
     restart: always
     depends_on:
@@ -52,7 +52,7 @@ services:
       - elasticsearch:elasticsearch
       - wazuh:wazuh
   nginx:
-    image: wazuh/wazuh-nginx:3.8.2_6.7.0
+    image: wazuh/wazuh-nginx:3.9.0_6.7.1
     hostname: nginx
     restart: always
     environment:
diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile
index ee03b378..f0de83fd 100644
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@@ -1,5 +1,5 @@
 # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
-FROM docker.elastic.co/elasticsearch/elasticsearch:6.7.0
+FROM docker.elastic.co/elasticsearch/elasticsearch:6.7.1
 
 ENV ELASTICSEARCH_URL="http://elasticsearch:9200"
 
@@ -13,7 +13,7 @@ ENV XPACK_ML="true"
 
 ENV ENABLE_CONFIGURE_S3="false"
 
-ENV TEMPLATE_VERSION=v3.8.2
+ENV TEMPLATE_VERSION=v3.9.0
 
 # Elasticearch cluster configuration environment variables
 # If ELASTIC_CLUSTER is set to "true" the following variables will be added to the Elasticsearch configuration
@@ -39,7 +39,7 @@ COPY --chown=elasticsearch:elasticsearch ./config/load_settings.sh ./
 
 RUN chmod +x ./load_settings.sh
 
-RUN bin/elasticsearch-plugin install --batch https://artifacts.elastic.co/downloads/elasticsearch-plugins/repository-s3/repository-s3-6.7.0.zip
+RUN bin/elasticsearch-plugin install --batch https://artifacts.elastic.co/downloads/elasticsearch-plugins/repository-s3/repository-s3-6.7.1.zip
 
 COPY config/configure_s3.sh ./config/configure_s3.sh
 RUN chmod 755 ./config/configure_s3.sh
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index 767c33d2..2c358f1b 100644
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -1,6 +1,6 @@
 # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
-FROM docker.elastic.co/kibana/kibana:6.7.0
-ARG WAZUH_APP_VERSION=3.8.2_6.7.0
+FROM docker.elastic.co/kibana/kibana:6.7.1
+ARG WAZUH_APP_VERSION=3.9.0_6.7.1
 USER root
 
 ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp
diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile
index 539cf0ac..5b1d02e0 100644
--- a/wazuh/Dockerfile
+++ b/wazuh/Dockerfile
@@ -1,7 +1,7 @@
 # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
 FROM phusion/baseimage:latest
 ARG FILEBEAT_VERSION=6.7.0
-ARG WAZUH_VERSION=3.8.2-1
+ARG WAZUH_VERSION=3.9.0
 
 ENV API_USER="foo" \
     API_PASS="bar"

From 7bf7f532e0e5f17cb6a8c45a7b2ca6523c0564c0 Mon Sep 17 00:00:00 2001
From: "Manuel J. Bernal" <manu.asi2@gmail.com>
Date: Fri, 3 May 2019 17:48:22 +0200
Subject: [PATCH 16/16] Bump version

---
 wazuh/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile
index 5b1d02e0..c7b396b0 100644
--- a/wazuh/Dockerfile
+++ b/wazuh/Dockerfile
@@ -1,7 +1,7 @@
 # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
 FROM phusion/baseimage:latest
 ARG FILEBEAT_VERSION=6.7.0
-ARG WAZUH_VERSION=3.9.0
+ARG WAZUH_VERSION=3.9.0-1
 
 ENV API_USER="foo" \
     API_PASS="bar"