From 619fba8d2f8b871f84b337932697defcb44f98c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Ruiz=20Ruiz?= Date: Fri, 4 May 2018 10:29:22 -0400 Subject: [PATCH] Upgrade Elasti Stack and Wazuh-APP version to 3.2.1_6.2.4 --- README.md | 2 +- docker-compose.yml | 2 +- kibana/Dockerfile | 8 ++------ kibana/config/wait-for-it.sh | 8 -------- logstash/Dockerfile | 2 +- wazuh/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index c97d3532..0955e4c8 100644 --- a/README.md +++ b/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.1 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 diff --git a/docker-compose.yml b/docker-compose.yml index 8c745a3b..ecb13ee8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -41,7 +41,7 @@ services: - LS_HEAP_SIZE=2048m - XPACK_MONITORING_ENABLED=false elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:6.2.3 + image: docker.elastic.co/elasticsearch/elasticsearch:6.2.4 hostname: elasticsearch restart: always ports: diff --git a/kibana/Dockerfile b/kibana/Dockerfile index 2942037e..4f8dae4c 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:6.2.3 -ARG WAZUH_APP_VERSION=3.2.1_6.2.3 +FROM docker.elastic.co/kibana/kibana:6.2.4 +ARG WAZUH_APP_VERSION=3.2.1_6.2.4 USER root COPY ./config/kibana.yml /usr/share/kibana/config/kibana.yml @@ -11,10 +11,6 @@ ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp ADD https://raw.githubusercontent.com/wazuh/wazuh/3.2/extensions/elasticsearch/wazuh-elastic6-template-alerts.json /usr/share/kibana/config -ADD https://raw.githubusercontent.com/wazuh/wazuh/3.2/extensions/elasticsearch/wazuh-elastic6-template-monitoring.json /usr/share/kibana/config - -ADD https://raw.githubusercontent.com/wazuh/wazuh/3.2/extensions/elasticsearch/alert_sample.json /usr/share/kibana/config - RUN /usr/share/kibana/bin/kibana-plugin install file:///tmp/wazuhapp-${WAZUH_APP_VERSION}.zip RUN chown -R kibana.kibana /usr/share/kibana diff --git a/kibana/config/wait-for-it.sh b/kibana/config/wait-for-it.sh index 2e29f98a..b84db762 100644 --- a/kibana/config/wait-for-it.sh +++ b/kibana/config/wait-for-it.sh @@ -18,14 +18,6 @@ sleep 5 #Insert default templates cat /usr/share/kibana/config/wazuh-elastic6-template-alerts.json | curl -XPUT "http://$host:9200/_template/wazuh" -H 'Content-Type: application/json' -d @- -sleep 5 -#Insert default templates -cat /usr/share/kibana/config/wazuh-elastic6-template-monitoring.json | curl -XPUT "http://$host:9200/_template/wazuh-agent" -H 'Content-Type: application/json' -d @- - -#Insert sample alert: -sleep 5 -cat /usr/share/kibana/config/alert_sample.json | curl -XPUT "http://$host:9200/wazuh-alerts-3.x-"`date +%Y.%m.%d`"/wazuh/sample" -H 'Content-Type: application/json' -d @- - sleep 5 echo "Setting API credentials into Wazuh APP" CONFIG_CODE=$(curl -s -o /dev/null -w "%{http_code}" -XGET http://$host:9200/.wazuh/wazuh-configuration/1513629884013) diff --git a/logstash/Dockerfile b/logstash/Dockerfile index 45b9d5f9..609256f5 100644 --- a/logstash/Dockerfile +++ b/logstash/Dockerfile @@ -1,4 +1,4 @@ # Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) -FROM docker.elastic.co/logstash/logstash:6.2.3 +FROM docker.elastic.co/logstash/logstash:6.2.4 COPY config/logstash.conf /etc/logstash/conf.d/logstash.conf diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index a144ff18..dabe2a31 100644 --- a/wazuh/Dockerfile +++ b/wazuh/Dockerfile @@ -1,6 +1,6 @@ # Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) FROM phusion/baseimage:latest -ARG FILEBEAT_VERSION=6.2.3 +ARG FILEBEAT_VERSION=6.2.4 ARG WAZUH_VERSION=3.2.1-1 RUN apt-get update; apt-get -y dist-upgrade