From 97b018b86a7a44da176f3da7c945ee2f9ad94723 Mon Sep 17 00:00:00 2001 From: manuasir Date: Wed, 3 Apr 2019 14:42:38 +0200 Subject: [PATCH 1/4] 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 eab0541d0a17510eb768550859247a982bd59600 Mon Sep 17 00:00:00 2001 From: "Manuel J. Bernal" Date: Tue, 7 May 2019 20:02:44 +0200 Subject: [PATCH 2/4] Bump version --- CHANGELOG.md | 6 ++++++ README.md | 2 +- VERSION | 2 +- docker-compose.yml | 10 +++++----- elasticsearch/Dockerfile | 4 ++-- kibana/Dockerfile | 4 ++-- 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d28d1ab..253a4be4 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.9.0_6.7.2 + +### Changed + +- Update Elastic Stack version to 6.7.2. ([@manuasir](https://github.com/manuasir)) ([#162](https://github.com/wazuh/wazuh-docker/pull/162)) + ## Wazuh Docker v3.9.0_6.7.1 ### Added diff --git a/README.md b/README.md index d40faa98..1fec5721 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.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. +* `Wazuh.Version_ElasticStack.Version` (for example 3.9.0_6.7.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 eaee0e1b..649829d1 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="3.9.0_6.7.1" +WAZUH-DOCKER_VERSION="3.9.0_6.7.2" REVISION="3900" \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index b5e4573f..f45d2b1e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '2' services: wazuh: - image: wazuh/wazuh:3.9.0_6.7.1 + image: wazuh/wazuh:3.9.0_6.7.2 hostname: wazuh-manager restart: always ports: @@ -14,7 +14,7 @@ services: depends_on: - logstash logstash: - image: wazuh/wazuh-logstash:3.9.0_6.7.1 + image: wazuh/wazuh-logstash:3.9.0_6.7.2 hostname: logstash restart: always links: @@ -26,7 +26,7 @@ services: environment: - LS_HEAP_SIZE=2048m elasticsearch: - image: wazuh/wazuh-elasticsearch:3.9.0_6.7.1 + image: wazuh/wazuh-elasticsearch:3.9.0_6.7.2 hostname: elasticsearch restart: always ports: @@ -43,7 +43,7 @@ services: hard: -1 mem_limit: 2g kibana: - image: wazuh/wazuh-kibana:3.9.0_6.7.1 + image: wazuh/wazuh-kibana:3.9.0_6.7.2 hostname: kibana restart: always depends_on: @@ -52,7 +52,7 @@ services: - elasticsearch:elasticsearch - wazuh:wazuh nginx: - image: wazuh/wazuh-nginx:3.9.0_6.7.1 + image: wazuh/wazuh-nginx:3.9.0_6.7.2 hostname: nginx restart: always environment: diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index f0de83fd..25e6e30b 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.1 +FROM docker.elastic.co/elasticsearch/elasticsearch:6.7.2 ENV ELASTICSEARCH_URL="http://elasticsearch:9200" @@ -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.1.zip +RUN bin/elasticsearch-plugin install --batch https://artifacts.elastic.co/downloads/elasticsearch-plugins/repository-s3/repository-s3-6.7.2.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 2c358f1b..e6eda42f 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.1 -ARG WAZUH_APP_VERSION=3.9.0_6.7.1 +FROM docker.elastic.co/kibana/kibana:6.7.2 +ARG WAZUH_APP_VERSION=3.9.0_6.7.2 USER root ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp From 72725daa755382cd170bcfec146e3ec8da5f1707 Mon Sep 17 00:00:00 2001 From: manuasir Date: Thu, 9 May 2019 16:43:49 +0200 Subject: [PATCH 3/4] Bump version. --- CHANGELOG.md | 2 +- logstash/Dockerfile | 2 +- wazuh/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 253a4be4..b1351026 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.2. ([@manuasir](https://github.com/manuasir)) ([#162](https://github.com/wazuh/wazuh-docker/pull/162)) +- Update Elastic Stack version to 6.7.2. ## Wazuh Docker v3.9.0_6.7.1 diff --git a/logstash/Dockerfile b/logstash/Dockerfile index 2ad4fb93..1aa79f50 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.7.0 +FROM docker.elastic.co/logstash/logstash:6.7.2 COPY --chown=logstash:logstash config/entrypoint.sh /entrypoint.sh diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index c7b396b0..454f8ea9 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.7.0 +ARG FILEBEAT_VERSION=6.7.2 ARG WAZUH_VERSION=3.9.0-1 ENV API_USER="foo" \ From 0cef2a59748a618fbbdfc4d5105fa1120c222ebc Mon Sep 17 00:00:00 2001 From: "Manuel J. Bernal" Date: Fri, 10 May 2019 22:24:41 +0200 Subject: [PATCH 4/4] Include protocol and port in LOGSTASH_OUTPUT environment variable (#164) * Including protocol and port in the LOGSTASH_OUTPUT env var. --- logstash/config/entrypoint.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/logstash/config/entrypoint.sh b/logstash/config/entrypoint.sh index 88c3d169..4aaff056 100644 --- a/logstash/config/entrypoint.sh +++ b/logstash/config/entrypoint.sh @@ -17,6 +17,16 @@ else el_url="${ELASTICSEARCH_URL}" fi +############################################################################## +# Customize logstash output ip +############################################################################## + +if [ "$LOGSTASH_OUTPUT" != "" ]; then + >&2 echo "Customize Logstash ouput ip." + sed -i 's|elasticsearch:9200|'$LOGSTASH_OUTPUT'|g' /usr/share/logstash/pipeline/01-wazuh.conf + sed -i 's|http://elasticsearch:9200|'$LOGSTASH_OUTPUT'|g' /usr/share/logstash/config/logstash.yml +fi + until curl -XGET $el_url; do >&2 echo "Elastic is unavailable - sleeping." sleep 5 @@ -44,16 +54,6 @@ sleep 2 >&2 echo "Wazuh alerts template is loaded." -############################################################################## -# Customize logstash output ip -############################################################################## - -if [ "$LOGSTASH_OUTPUT" != "" ]; then - >&2 echo "Customize Logstash ouput ip." - sed -i "s/elasticsearch:9200/$LOGSTASH_OUTPUT:9200/" /usr/share/logstash/pipeline/01-wazuh.conf - sed -i "s/elasticsearch:9200/$LOGSTASH_OUTPUT:9200/" /usr/share/logstash/config/logstash.yml -fi - ############################################################################## # Map environment variables to entries in logstash.yml. # Note that this will mutate logstash.yml in place if any such settings are found.