From 391b5d237c88a5a5e0ad495ed8b36fb836bc3226 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 5 Oct 2021 12:57:25 -0300 Subject: [PATCH 1/2] bump release 4.2.3 --- .goss.yaml | 2 +- CHANGELOG.md | 5 +++++ README.md | 1 + VERSION | 2 +- docker-compose.yml | 4 ++-- kibana-odfe/Dockerfile | 2 +- kibana/Dockerfile | 2 +- production-cluster.yml | 6 +++--- production_cluster/wazuh_cluster/wazuh_manager.conf | 4 ++-- production_cluster/wazuh_cluster/wazuh_worker.conf | 4 ++-- wazuh-odfe/Dockerfile | 2 +- xpack-compose.yml | 4 ++-- xpack-from-sources.yml | 4 ++-- 13 files changed, 24 insertions(+), 18 deletions(-) diff --git a/.goss.yaml b/.goss.yaml index d82e3219..7d32530e 100644 --- a/.goss.yaml +++ b/.goss.yaml @@ -56,7 +56,7 @@ package: wazuh-manager: installed: true versions: - - 4.2.2 + - 4.2.3 port: tcp:1514: listening: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 362db30f..058500d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Change Log All notable changes to this project will be documented in this file. +## Wazuh Docker v4.2.3 +### Added + +- Update Wazuh to version [4.2.3](https://github.com/wazuh/wazuh/blob/v4.2.3/CHANGELOG.md#v423) + ## Wazuh Docker v4.2.2 ### Added diff --git a/README.md b/README.md index a4dd3720..a91a06b8 100644 --- a/README.md +++ b/README.md @@ -154,6 +154,7 @@ ADMIN_PRIVILEGES=true # App privileges | Wazuh version | ODFE | XPACK | |---------------|---------|--------| +| v4.2.3 | 1.13.2 | 7.11.2 | | v4.2.2 | 1.13.2 | 7.11.2 | | v4.2.1 | 1.13.2 | 7.11.2 | | v4.2.0 | 1.13.2 | 7.10.2 | diff --git a/VERSION b/VERSION index 2c257c43..dc36a8b0 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="4.2.2" +WAZUH-DOCKER_VERSION="3" REVISION="40215" diff --git a/docker-compose.yml b/docker-compose.yml index e283651b..89ac3313 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: wazuh: - image: wazuh/wazuh-odfe:4.2.2 + image: wazuh/wazuh-odfe:4.2.3 hostname: wazuh-manager restart: always ports: @@ -50,7 +50,7 @@ services: hard: 65536 kibana: - image: wazuh/wazuh-kibana-odfe:4.2.2 + image: wazuh/wazuh-kibana-odfe:4.2.3 hostname: kibana restart: always ports: diff --git a/kibana-odfe/Dockerfile b/kibana-odfe/Dockerfile index d5c462f4..de1a2212 100644 --- a/kibana-odfe/Dockerfile +++ b/kibana-odfe/Dockerfile @@ -2,7 +2,7 @@ FROM amazon/opendistro-for-elasticsearch-kibana:1.13.2 USER kibana ARG ELASTIC_VERSION=7.10.2 -ARG WAZUH_VERSION=4.2.2 +ARG WAZUH_VERSION=4.2.3 ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}" WORKDIR /usr/share/kibana diff --git a/kibana/Dockerfile b/kibana/Dockerfile index b05920ac..6f26594b 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -2,7 +2,7 @@ FROM docker.elastic.co/kibana/kibana:7.10.2 USER kibana ARG ELASTIC_VERSION=7.10.2 -ARG WAZUH_VERSION=4.2.2 +ARG WAZUH_VERSION=4.2.3 ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}" WORKDIR /usr/share/kibana diff --git a/production-cluster.yml b/production-cluster.yml index ce32b17d..666140c0 100644 --- a/production-cluster.yml +++ b/production-cluster.yml @@ -3,7 +3,7 @@ version: '3.7' services: wazuh-master: - image: wazuh/wazuh-odfe:4.2.2 + image: wazuh/wazuh-odfe:4.2.3 hostname: wazuh-master restart: always ports: @@ -38,7 +38,7 @@ services: - ./production_cluster/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh-worker: - image: wazuh/wazuh-odfe:4.2.2 + image: wazuh/wazuh-odfe:4.2.3 hostname: wazuh-worker restart: always environment: @@ -134,7 +134,7 @@ services: - ./production_cluster/elastic_opendistro/internal_users.yml:/usr/share/elasticsearch/plugins/opendistro_security/securityconfig/internal_users.yml kibana: - image: wazuh/wazuh-kibana-odfe:4.2.2 + image: wazuh/wazuh-kibana-odfe:4.2.3 hostname: kibana restart: always ports: diff --git a/production_cluster/wazuh_cluster/wazuh_manager.conf b/production_cluster/wazuh_cluster/wazuh_manager.conf index d6e4f5ec..9619da45 100644 --- a/production_cluster/wazuh_cluster/wazuh_manager.conf +++ b/production_cluster/wazuh_cluster/wazuh_manager.conf @@ -200,8 +200,8 @@ 127.0.0.1 ^localhost.localdomain$ - 4.2.2.1 - 4.2.2.2 + 4.2.3.1 + 4.2.3.2 208.67.220.220 diff --git a/production_cluster/wazuh_cluster/wazuh_worker.conf b/production_cluster/wazuh_cluster/wazuh_worker.conf index e202e849..1494c37a 100644 --- a/production_cluster/wazuh_cluster/wazuh_worker.conf +++ b/production_cluster/wazuh_cluster/wazuh_worker.conf @@ -200,8 +200,8 @@ 127.0.0.1 ^localhost.localdomain$ - 4.2.2.1 - 4.2.2.2 + 4.2.3.1 + 4.2.3.2 208.67.220.220 diff --git a/wazuh-odfe/Dockerfile b/wazuh-odfe/Dockerfile index 78707f9a..371cf6b8 100644 --- a/wazuh-odfe/Dockerfile +++ b/wazuh-odfe/Dockerfile @@ -3,7 +3,7 @@ FROM centos:7 ARG FILEBEAT_CHANNEL=filebeat-oss ARG FILEBEAT_VERSION=7.10.2 -ARG WAZUH_VERSION=4.2.2 +ARG WAZUH_VERSION=4.2.3 ARG TEMPLATE_VERSION="master" ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.1.tar.gz" diff --git a/xpack-compose.yml b/xpack-compose.yml index d8a5ea82..45d90f77 100644 --- a/xpack-compose.yml +++ b/xpack-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: wazuh: - image: wazuh/wazuh:4.2.2 + image: wazuh/wazuh:4.2.3 hostname: wazuh-manager restart: always ports: @@ -146,7 +146,7 @@ services: kibana: - image: wazuh/wazuh-kibana:4.2.2 + image: wazuh/wazuh-kibana:4.2.3 hostname: kibana restart: always ports: diff --git a/xpack-from-sources.yml b/xpack-from-sources.yml index ee12e251..631e3337 100644 --- a/xpack-from-sources.yml +++ b/xpack-from-sources.yml @@ -8,7 +8,7 @@ services: args: - FILEBEAT_CHANNEL=filebeat - FILEBEAT_VERSION=7.11.2 - image: wazuh/wazuh:4.2.2 + image: wazuh/wazuh:4.2.3 hostname: wazuh-manager restart: always ports: @@ -152,7 +152,7 @@ services: kibana: build: kibana/ - image: wazuh/wazuh-kibana:4.2.2 + image: wazuh/wazuh-kibana:4.2.3 hostname: kibana restart: always ports: From 4d0b06b91ea93cf2cd6b63d3f44304b410518a25 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Wed, 6 Oct 2021 08:38:25 -0300 Subject: [PATCH 2/2] bump release 4.2.3 --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index dc36a8b0..319f9594 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="3" -REVISION="40215" +WAZUH-DOCKER_VERSION="4.2.3" +REVISION="40217"