From 384ed0758431a5d671142f728052ead1c2ec20ef Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 31 May 2022 10:44:06 -0300 Subject: [PATCH 1/4] bump 4.3.3 version --- .github/.goss.yaml | 2 +- .github/workflows/push.yml | 2 +- CHANGELOG.md | 5 +++++ README.md | 1 + VERSION | 4 ++-- build-docker-images/docker-compose.yml | 6 +++--- build-docker-images/wazuh-dashboard/Dockerfile | 2 +- build-docker-images/wazuh-indexer/config/config.sh | 2 +- build-docker-images/wazuh-manager/Dockerfile | 2 +- multi-node/docker-compose.yml | 12 ++++++------ single-node/docker-compose.yml | 7 +++---- 11 files changed, 25 insertions(+), 20 deletions(-) diff --git a/.github/.goss.yaml b/.github/.goss.yaml index 967bba54..759b0c11 100644 --- a/.github/.goss.yaml +++ b/.github/.goss.yaml @@ -56,7 +56,7 @@ package: wazuh-manager: installed: true versions: - - 4.3.2 + - 4.3.3 port: tcp:1514: listening: true diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index cbc397e0..389ba791 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -25,7 +25,7 @@ jobs: version: v0.3.16 - name: Execute Goss tests (wazuh-odfe) - run: dgoss run wazuh/wazuh-manager:4.3.2 + run: dgoss run wazuh/wazuh-manager:4.3.3 env: GOSS_SLEEP: 30 GOSS_FILE: .github/.goss.yaml \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index dddc4d9f..25b6f14c 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.3.3 +### Added + +- Update Wazuh to version [4.3.3](https://github.com/wazuh/wazuh/blob/v4.3.3/CHANGELOG.md#v433) + ## Wazuh Docker v4.3.2 ### Added diff --git a/README.md b/README.md index 862e6b0c..90647e15 100644 --- a/README.md +++ b/README.md @@ -193,6 +193,7 @@ WAZUH_MONITORING_REPLICAS=0 # | Wazuh version | ODFE | XPACK | |---------------|---------|--------| +| v4.3.3 | | | | v4.3.2 | | | | v4.3.1 | | | | v4.3.0 | | | diff --git a/VERSION b/VERSION index 7f9b8a69..ea37ccb5 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="4.3.2" -REVISION="40312" +WAZUH-DOCKER_VERSION="4.3.3" +REVISION="40313" diff --git a/build-docker-images/docker-compose.yml b/build-docker-images/docker-compose.yml index 7c0a1124..e1e0f74f 100644 --- a/build-docker-images/docker-compose.yml +++ b/build-docker-images/docker-compose.yml @@ -4,7 +4,7 @@ version: '3.7' services: wazuh.manager: build: wazuh-manager/ - image: wazuh/wazuh-manager:4.3.2 + image: wazuh/wazuh-manager:4.3.3 hostname: wazuh.manager restart: always ports: @@ -32,7 +32,7 @@ services: wazuh.indexer: build: wazuh-indexer/ - image: wazuh/wazuh-indexer:4.3.2 + image: wazuh/wazuh-indexer:4.3.3 hostname: wazuh.indexer restart: always ports: @@ -49,7 +49,7 @@ services: wazuh.dashboard: build: wazuh-dashboard/ - image: wazuh/wazuh-dashboard:4.3.2 + image: wazuh/wazuh-dashboard:4.3.3 hostname: wazuh.dashboard restart: always ports: diff --git a/build-docker-images/wazuh-dashboard/Dockerfile b/build-docker-images/wazuh-dashboard/Dockerfile index f2c11d0c..245cee87 100644 --- a/build-docker-images/wazuh-dashboard/Dockerfile +++ b/build-docker-images/wazuh-dashboard/Dockerfile @@ -1,7 +1,7 @@ # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2) FROM ubuntu:focal AS builder -ARG WAZUH_VERSION=4.3.2 +ARG WAZUH_VERSION=4.3.3 ARG INSTALL_DIR=/usr/share/wazuh-dashboard # Update and install dependencies diff --git a/build-docker-images/wazuh-indexer/config/config.sh b/build-docker-images/wazuh-indexer/config/config.sh index b878cfbd..7bffca90 100644 --- a/build-docker-images/wazuh-indexer/config/config.sh +++ b/build-docker-images/wazuh-indexer/config/config.sh @@ -8,7 +8,7 @@ export TARGET_DIR=${CURDIR}/debian/${NAME} # Package build options export USER=${NAME} export GROUP=${NAME} -export VERSION=4.3.2 +export VERSION=4.3.3 export LOG_DIR=/var/log/${NAME} export LIB_DIR=/var/lib/${NAME} export PID_DIR=/run/${NAME} diff --git a/build-docker-images/wazuh-manager/Dockerfile b/build-docker-images/wazuh-manager/Dockerfile index f5cbb4cb..ed72ba9c 100644 --- a/build-docker-images/wazuh-manager/Dockerfile +++ b/build-docker-images/wazuh-manager/Dockerfile @@ -1,7 +1,7 @@ # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2) FROM ubuntu:focal -ARG WAZUH_VERSION=4.3.2 +ARG WAZUH_VERSION=4.3.3 ARG TEMPLATE_VERSION=4.3 ARG FILEBEAT_CHANNEL=filebeat-oss ARG FILEBEAT_VERSION=7.10.2 diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index e141b760..762fc883 100644 --- a/multi-node/docker-compose.yml +++ b/multi-node/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: wazuh.master: - image: wazuh/wazuh-manager:4.3.2 + image: wazuh/wazuh-manager:4.3.3 hostname: wazuh.master restart: always ports: @@ -38,7 +38,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.worker: - image: wazuh/wazuh-manager:4.3.2 + image: wazuh/wazuh-manager:4.3.3 hostname: wazuh.worker restart: always environment: @@ -67,7 +67,7 @@ services: - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf wazuh1.indexer: - image: wazuh/wazuh-indexer:4.3.2 + image: wazuh/wazuh-indexer:4.3.3 hostname: wazuh1.indexer restart: always ports: @@ -93,7 +93,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml wazuh2.indexer: - image: wazuh/wazuh-indexer:4.3.2 + image: wazuh/wazuh-indexer:4.3.3 hostname: wazuh2.indexer restart: always environment: @@ -115,7 +115,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml wazuh3.indexer: - image: wazuh/wazuh-indexer:4.3.2 + image: wazuh/wazuh-indexer:4.3.3 hostname: wazuh3.indexer restart: always environment: @@ -137,7 +137,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.3.2 + image: wazuh/wazuh-dashboard:4.3.3 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 07b5c108..30767826 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: wazuh.manager: - image: wazuh/wazuh-manager:4.3.2 + image: wazuh/wazuh-manager:4.3.3 hostname: wazuh.manager restart: always ports: @@ -39,7 +39,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.indexer: - image: wazuh/wazuh-indexer:4.3.2 + image: wazuh/wazuh-indexer:4.3.3 hostname: wazuh.indexer restart: always ports: @@ -64,8 +64,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.3.2 - hostname: wazuh.dashboard + image: wazuh/wazuh-dashboard:4.3.23 restart: always ports: - 443:5601 From af8627b9927a15491a903081604fda28ab700b47 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 31 May 2022 10:55:09 -0300 Subject: [PATCH 2/4] bump 4.3.3 version --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index ea37ccb5..b5d8eeef 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="4.3.3" -REVISION="40313" +REVISION="40314" From 480f0b7bef8e5a15f0c61188d718985aa9eb4c2f Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 31 May 2022 15:46:04 -0300 Subject: [PATCH 3/4] bump 4.3.3 version --- single-node/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 30767826..d8c9daba 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -64,7 +64,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.3.23 + image: wazuh/wazuh-dashboard:4.3.3 restart: always ports: - 443:5601 From f220927849570813683f4bc4043721652801a817 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 31 May 2022 15:57:14 -0300 Subject: [PATCH 4/4] bump 4.3.3 version --- single-node/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index d8c9daba..e506deb7 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -65,6 +65,7 @@ services: wazuh.dashboard: image: wazuh/wazuh-dashboard:4.3.3 + hostname: wazuh.dashboard restart: always ports: - 443:5601