From 6a82b98fcf74d8207fb2fb49bd7312c3a22270fd Mon Sep 17 00:00:00 2001
From: Jose M <jm.garcia@wazuh.com>
Date: Fri, 24 May 2019 16:39:24 +0200
Subject: [PATCH] Bump version.

---
 elasticsearch/Dockerfile              | 10 ++++++----
 elasticsearch/config/load_settings.sh |  2 +-
 kibana/Dockerfile                     |  8 ++++----
 wazuh/Dockerfile                      |  9 +++++----
 wazuh/config/filebeat.yml             |  2 +-
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile
index 111ddf21..0833ad93 100644
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@@ -1,5 +1,5 @@
 # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2)
-FROM docker.elastic.co/elasticsearch/elasticsearch:7.0.0
+FROM docker.elastic.co/elasticsearch/elasticsearch:7.1.0
 
 ENV ELASTICSEARCH_URL="http://elasticsearch:9200"
 
@@ -15,6 +15,7 @@ ENV ENABLE_CONFIGURE_S3="false"
 
 # Elasticearch cluster configuration environment variables
 # If ELASTIC_CLUSTER is set to "true" the following variables will be added to the Elasticsearch configuration
+# CLUSTER_INITIAL_MASTER_NODES set to own node by default.
 ENV ELASTIC_CLUSTER="false" \
     CLUSTER_NAME="wazuh" \
     CLUSTER_NODE_MASTER="true" \
@@ -25,9 +26,10 @@ ENV ELASTIC_CLUSTER="false" \
     CLUSTER_DISCOVERY_SERVICE="wazuh-elasticsearch" \
     CLUSTER_NUMBER_OF_MASTERS="2" \
     CLUSTER_MAX_NODES="1" \
-    CLUSTER_DELAYED_TIMEOUT="1m"
+    CLUSTER_DELAYED_TIMEOUT="1m" \
+    CLUSTER_INITIAL_MASTER_NODES="wazuh-elasticsearch"
 
-COPY config/entrypoint.sh /entrypoint.sh
+COPY config/entrypoint.sh /entrypoint.sh 
 
 RUN chmod 755 /entrypoint.sh
 
@@ -35,7 +37,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-7.0.0.zip
+RUN bin/elasticsearch-plugin install --batch https://artifacts.elastic.co/downloads/elasticsearch-plugins/repository-s3/repository-s3-7.1.0.zip
 
 COPY config/configure_s3.sh ./config/configure_s3.sh
 RUN chmod 755 ./config/configure_s3.sh
diff --git a/elasticsearch/config/load_settings.sh b/elasticsearch/config/load_settings.sh
index b7b3b08c..65f90a76 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 [ ${ENABLED_XPACK} != "true" || "x${ELASTICSEARCH_USERNAME}" = "x" || "x${ELASTICSEARCH_PASSWORD}" = "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/Dockerfile b/kibana/Dockerfile
index 17795004..08a4e455 100644
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -1,16 +1,16 @@
 # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2)
-FROM docker.elastic.co/kibana/kibana:7.0.0
-ARG WAZUH_APP_VERSION=3.9.0_7.0.0-rc5
+FROM docker.elastic.co/kibana/kibana:7.1.0
+ARG WAZUH_APP_VERSION=3.9.1_7.1.0
 USER root
 
-ADD https://packages-dev.wazuh.com/staging/app/kibana/wazuhapp-3.9.0_7.0.0-rc5.zip /tmp
+ADD  https://packages.wazuh.com/wazuhapp/wazuhapp-3.9.1_7.1.0.zip /tmp
 
 RUN /usr/share/kibana/bin/kibana-plugin install file:///tmp/wazuhapp-${WAZUH_APP_VERSION}.zip 
 RUN rm -rf /tmp/wazuhapp-${WAZUH_APP_VERSION}.zip
 
 COPY config/entrypoint.sh /entrypoint.sh
 
-RUN chmod 755 /entrypoint.sh
+RUN chmod 755 /entrypoint.sh        
 
 USER kibana
 
diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile
index 8f89729d..8e3830e5 100644
--- a/wazuh/Dockerfile
+++ b/wazuh/Dockerfile
@@ -1,7 +1,7 @@
 # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2)
 FROM phusion/baseimage:latest
-ARG FILEBEAT_VERSION=7.0.0
-ARG WAZUH_VERSION=3.9.0-1
+ARG FILEBEAT_VERSION=7.1.0
+ARG WAZUH_VERSION=3.9.1-1
 
 ENV API_USER="foo" \
    API_PASS="bar"
@@ -68,8 +68,9 @@ RUN chmod +x /etc/service/wazuh-api/run && \
    chmod +x /etc/service/postfix/run && \
    chmod +x /etc/service/filebeat/run 
 
-ADD https://raw.githubusercontent.com/wazuh/wazuh/$TEMPLATE_VERSION/extensions/elasticsearch/wazuh-elastic7-template-alerts.json /etc/filebeat
-RUN chmod go-w /etc/filebeat/wazuh-elastic7-template-alerts.json 
+
+ADD https://raw.githubusercontent.com/wazuh/wazuh/v3.9.1/extensions/elasticsearch/7.x/wazuh-template.json /etc/filebeat
+RUN chmod go-w /etc/filebeat/wazuh-template.json 
 
 # Run all services
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/wazuh/config/filebeat.yml b/wazuh/config/filebeat.yml
index ba9a304f..628e4479 100644
--- a/wazuh/config/filebeat.yml
+++ b/wazuh/config/filebeat.yml
@@ -5,7 +5,7 @@ filebeat.inputs:
       - '/var/ossec/logs/alerts/alerts.json'
 
 setup.template.json.enabled: true
-setup.template.json.path: "/etc/filebeat/wazuh-elastic7-template-alerts.json"
+setup.template.json.path: "/etc/filebeat/wazuh-template.json"
 setup.template.json.name: "wazuh"
 setup.template.overwrite: true