From 84005d81459d5f8655efb9fcb2334296d815e5be Mon Sep 17 00:00:00 2001 From: david Date: Wed, 2 Aug 2017 23:26:38 +0200 Subject: [PATCH] Upgrade to ELK 5.5.1 --- README.md | 2 +- docker-compose.yml | 2 +- kibana/Dockerfile | 2 +- kibana/config/wait-for-it.sh | 2 +- logstash/Dockerfile | 2 +- wazuh/Dockerfile | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 96c3944b..2273f799 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ In addition, a docker-compose file is provided to launch the containers mentione ## Current release -Containers are currently tested on Wazuh version 2.0 and Elastic Stack version 5.5.0. 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 2.0 and Elastic Stack version 5.5.1. 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 71e5a1cb..30e010ab 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,7 +36,7 @@ services: environment: - LS_HEAP_SIZE=2048m elasticsearch: - image: elasticsearch:5.5.0 + image: elasticsearch:5.5.1 hostname: elasticsearch restart: always command: elasticsearch -E node.name="node-1" -E cluster.name="wazuh" -E network.host=0.0.0.0 diff --git a/kibana/Dockerfile b/kibana/Dockerfile index fecc966e..c2b80946 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -1,4 +1,4 @@ -FROM kibana:5.5.0 +FROM kibana:5.5.1 RUN apt-get update && apt-get install -y curl diff --git a/kibana/config/wait-for-it.sh b/kibana/config/wait-for-it.sh index c5b1da24..0ec74bfc 100644 --- a/kibana/config/wait-for-it.sh +++ b/kibana/config/wait-for-it.sh @@ -5,7 +5,7 @@ set -e host="$1" shift cmd="kibana" -WAZUH_KIBANA_PLUGIN_URL=${WAZUH_KIBANA_PLUGIN_URL:-https://packages.wazuh.com/wazuhapp/wazuhapp-2.0.1_5.5.0.zip} +WAZUH_KIBANA_PLUGIN_URL=${WAZUH_KIBANA_PLUGIN_URL:-https://packages.wazuh.com/wazuhapp/wazuhapp-2.0.1_5.5.1.zip} until curl -XGET $host:9200; do >&2 echo "Elastic is unavailable - sleeping" diff --git a/logstash/Dockerfile b/logstash/Dockerfile index bf38a194..2014cca8 100644 --- a/logstash/Dockerfile +++ b/logstash/Dockerfile @@ -1,4 +1,4 @@ -FROM logstash:5.5.0 +FROM logstash:5.5.1 RUN apt-get update diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index 7de2203a..fdafbc82 100644 --- a/wazuh/Dockerfile +++ b/wazuh/Dockerfile @@ -1,5 +1,5 @@ FROM centos:latest - +ARG FILEBEAT_VERSION=5.5.1 COPY config/*.repo /etc/yum.repos.d/ RUN yum -y update; yum clean all; @@ -18,8 +18,8 @@ RUN chmod 755 /init.bash &&\ sync && rm /init.bash -RUN curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-5.5.0-x86_64.rpm &&\ - rpm -vi filebeat-5.5.0-x86_64.rpm && rm filebeat-5.5.0-x86_64.rpm +RUN curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-${FILEBEAT_VERSION}-x86_64.rpm &&\ + rpm -vi filebeat-${FILEBEAT_VERSION}-x86_64.rpm && rm filebeat-${FILEBEAT_VERSION}-x86_64.rpm COPY config/filebeat.yml /etc/filebeat/