From 54975ab09993ebe4eccf8fef4d09d766938b669e Mon Sep 17 00:00:00 2001 From: vcerenu Date: Wed, 19 Jul 2023 08:43:17 -0300 Subject: [PATCH 1/6] Bump to 4.5.2 --- .env | 4 ++-- .github/.goss.yaml | 2 +- CHANGELOG.md | 5 +++++ README.md | 1 + VERSION | 4 ++-- build-docker-images/build-images.sh | 2 +- multi-node/docker-compose.yml | 12 ++++++------ single-node/docker-compose.yml | 6 +++--- 8 files changed, 21 insertions(+), 15 deletions(-) diff --git a/.env b/.env index f1a3dd9f..f81f5635 100755 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ -WAZUH_VERSION=4.5.1 -WAZUH_IMAGE_VERSION=4.5.1 +WAZUH_VERSION=4.5.2 +WAZUH_IMAGE_VERSION=4.5.2 WAZUH_TAG_REVISION=1 diff --git a/.github/.goss.yaml b/.github/.goss.yaml index 17de1c85..ee81b870 100644 --- a/.github/.goss.yaml +++ b/.github/.goss.yaml @@ -56,7 +56,7 @@ package: wazuh-manager: installed: true versions: - - 4.5.1-1 + - 4.5.2-1 port: tcp:1514: listening: true diff --git a/CHANGELOG.md b/CHANGELOG.md index b20ade9d..9221a94b 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.5.2 +### Added + +- Update Wazuh to version [4.5.2](https://github.com/wazuh/wazuh/blob/v4.5.2/CHANGELOG.md#v452) + ## Wazuh Docker v4.5.1 ### Added diff --git a/README.md b/README.md index 1be5cdc9..315fd073 100644 --- a/README.md +++ b/README.md @@ -195,6 +195,7 @@ WAZUH_MONITORING_REPLICAS=0 ## | Wazuh version | ODFE | XPACK | |---------------|---------|--------| +| v4.5.2 | | | | v4.5.1 | | | | v4.5.0 | | | | v4.4.5 | | | diff --git a/VERSION b/VERSION index 13a85b3f..71c86949 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="4.5.1" -REVISION="40501" +WAZUH-DOCKER_VERSION="4.5.2" +REVISION="40502" diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index 273091ae..5e5e5fec 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -1,4 +1,4 @@ -WAZUH_IMAGE_VERSION=4.5.1 +WAZUH_IMAGE_VERSION=4.5.2 WAZUH_VERSION=$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g') WAZUH_TAG_REVISION=1 WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '\"tag_name\":' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2- | sed -e 's/\.//g') diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index 954c89fe..c13dae57 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.5.1 + image: wazuh/wazuh-manager:4.5.2 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.5.1 + image: wazuh/wazuh-manager:4.5.2 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.5.1 + image: wazuh/wazuh-indexer:4.5.2 hostname: wazuh1.indexer restart: always ports: @@ -93,7 +93,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh2.indexer: - image: wazuh/wazuh-indexer:4.5.1 + image: wazuh/wazuh-indexer:4.5.2 hostname: wazuh2.indexer restart: always environment: @@ -115,7 +115,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh3.indexer: - image: wazuh/wazuh-indexer:4.5.1 + image: wazuh/wazuh-indexer:4.5.2 hostname: wazuh3.indexer restart: always environment: @@ -137,7 +137,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.5.1 + image: wazuh/wazuh-dashboard:4.5.2 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 1002162d..3c4a2d8b 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.5.1 + image: wazuh/wazuh-manager:4.5.2 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.5.1 + image: wazuh/wazuh-indexer:4.5.2 hostname: wazuh.indexer restart: always ports: @@ -64,7 +64,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.5.1 + image: wazuh/wazuh-dashboard:4.5.2 hostname: wazuh.dashboard restart: always ports: From d20bbe247c959020de34156819f69838425aa38f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Thu, 3 Aug 2023 11:45:56 +0200 Subject: [PATCH 2/6] Fixed conditional block in images building --- build-docker-images/build-images.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index 5e5e5fec..f6dec2b1 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -3,13 +3,6 @@ WAZUH_VERSION=$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g') WAZUH_TAG_REVISION=1 WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '\"tag_name\":' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2- | sed -e 's/\.//g') -## If wazuh manager exists in apt dev repository, change variables, if not, exit 1 -if [ "$WAZUH_VERSION" -le "$WAZUH_CURRENT_VERSION" ]; then - IMAGE_VERSION=${WAZUH_IMAGE_VERSION} -else - IMAGE_VERSION=${WAZUH_IMAGE_VERSION} -fi - echo WAZUH_VERSION=$WAZUH_IMAGE_VERSION > .env echo WAZUH_IMAGE_VERSION=$IMAGE_VERSION >> .env echo WAZUH_TAG_REVISION=$WAZUH_TAG_REVISION >> .env From 94be842afcadd865a8a2443fe1c7ffa20e455581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Thu, 3 Aug 2023 11:51:01 +0200 Subject: [PATCH 3/6] Restored `IMAGE_VERSION` variable --- build-docker-images/build-images.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index f6dec2b1..be814f84 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -2,6 +2,7 @@ WAZUH_IMAGE_VERSION=4.5.2 WAZUH_VERSION=$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g') WAZUH_TAG_REVISION=1 WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '\"tag_name\":' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2- | sed -e 's/\.//g') +IMAGE_VERSION=${WAZUH_IMAGE_VERSION} echo WAZUH_VERSION=$WAZUH_IMAGE_VERSION > .env echo WAZUH_IMAGE_VERSION=$IMAGE_VERSION >> .env From fbe073612c278aa73ca0fa25a1ea2fa3cfb4545d Mon Sep 17 00:00:00 2001 From: vcerenu Date: Thu, 10 Aug 2023 09:19:59 -0300 Subject: [PATCH 4/6] add suse vd options --- multi-node/config/wazuh_cluster/wazuh_manager.conf | 12 ++++++++++++ multi-node/config/wazuh_cluster/wazuh_worker.conf | 12 ++++++++++++ single-node/config/wazuh_cluster/wazuh_manager.conf | 12 ++++++++++++ 3 files changed, 36 insertions(+) diff --git a/multi-node/config/wazuh_cluster/wazuh_manager.conf b/multi-node/config/wazuh_cluster/wazuh_manager.conf index aec223a1..4931ceb2 100644 --- a/multi-node/config/wazuh_cluster/wazuh_manager.conf +++ b/multi-node/config/wazuh_cluster/wazuh_manager.conf @@ -138,6 +138,18 @@ 1h + + + no + 11-server + 11-desktop + 12-server + 12-desktop + 15-server + 15-desktop + 1h + + no diff --git a/multi-node/config/wazuh_cluster/wazuh_worker.conf b/multi-node/config/wazuh_cluster/wazuh_worker.conf index 46fceb1e..281fb2a5 100644 --- a/multi-node/config/wazuh_cluster/wazuh_worker.conf +++ b/multi-node/config/wazuh_cluster/wazuh_worker.conf @@ -138,6 +138,18 @@ 1h + + + no + 11-server + 11-desktop + 12-server + 12-desktop + 15-server + 15-desktop + 1h + + no diff --git a/single-node/config/wazuh_cluster/wazuh_manager.conf b/single-node/config/wazuh_cluster/wazuh_manager.conf index 4db508d6..00f45467 100644 --- a/single-node/config/wazuh_cluster/wazuh_manager.conf +++ b/single-node/config/wazuh_cluster/wazuh_manager.conf @@ -138,6 +138,18 @@ 1h + + + no + 11-server + 11-desktop + 12-server + 12-desktop + 15-server + 15-desktop + 1h + + no From 57c7eaa5af5393f99cab4b7d137976de44ad5372 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Thu, 10 Aug 2023 16:46:21 -0300 Subject: [PATCH 5/6] remove stretch and add rhel 9 into VD --- multi-node/config/wazuh_cluster/wazuh_manager.conf | 2 +- multi-node/config/wazuh_cluster/wazuh_worker.conf | 2 +- single-node/config/wazuh_cluster/wazuh_manager.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/multi-node/config/wazuh_cluster/wazuh_manager.conf b/multi-node/config/wazuh_cluster/wazuh_manager.conf index 4931ceb2..43043089 100644 --- a/multi-node/config/wazuh_cluster/wazuh_manager.conf +++ b/multi-node/config/wazuh_cluster/wazuh_manager.conf @@ -114,7 +114,6 @@ no - stretch buster bullseye 1h @@ -127,6 +126,7 @@ 6 7 8 + 9 1h diff --git a/multi-node/config/wazuh_cluster/wazuh_worker.conf b/multi-node/config/wazuh_cluster/wazuh_worker.conf index 281fb2a5..8c0f5537 100644 --- a/multi-node/config/wazuh_cluster/wazuh_worker.conf +++ b/multi-node/config/wazuh_cluster/wazuh_worker.conf @@ -114,7 +114,6 @@ no - stretch buster bullseye 1h @@ -127,6 +126,7 @@ 6 7 8 + 9 1h diff --git a/single-node/config/wazuh_cluster/wazuh_manager.conf b/single-node/config/wazuh_cluster/wazuh_manager.conf index 00f45467..166b120e 100644 --- a/single-node/config/wazuh_cluster/wazuh_manager.conf +++ b/single-node/config/wazuh_cluster/wazuh_manager.conf @@ -114,7 +114,6 @@ no - stretch buster bullseye 1h @@ -127,6 +126,7 @@ 6 7 8 + 9 1h From f1001c2f25057043c3fcd5a0fcef1806215270fc Mon Sep 17 00:00:00 2001 From: vcerenu Date: Fri, 11 Aug 2023 15:45:26 -0300 Subject: [PATCH 6/6] add jammy version into VD --- multi-node/config/wazuh_cluster/wazuh_manager.conf | 1 + multi-node/config/wazuh_cluster/wazuh_worker.conf | 1 + single-node/config/wazuh_cluster/wazuh_manager.conf | 1 + 3 files changed, 3 insertions(+) diff --git a/multi-node/config/wazuh_cluster/wazuh_manager.conf b/multi-node/config/wazuh_cluster/wazuh_manager.conf index 43043089..7f593444 100644 --- a/multi-node/config/wazuh_cluster/wazuh_manager.conf +++ b/multi-node/config/wazuh_cluster/wazuh_manager.conf @@ -108,6 +108,7 @@ xenial bionic focal + jammy 1h diff --git a/multi-node/config/wazuh_cluster/wazuh_worker.conf b/multi-node/config/wazuh_cluster/wazuh_worker.conf index 8c0f5537..c3c6c3cb 100644 --- a/multi-node/config/wazuh_cluster/wazuh_worker.conf +++ b/multi-node/config/wazuh_cluster/wazuh_worker.conf @@ -108,6 +108,7 @@ xenial bionic focal + jammy 1h diff --git a/single-node/config/wazuh_cluster/wazuh_manager.conf b/single-node/config/wazuh_cluster/wazuh_manager.conf index 166b120e..380e01fe 100644 --- a/single-node/config/wazuh_cluster/wazuh_manager.conf +++ b/single-node/config/wazuh_cluster/wazuh_manager.conf @@ -108,6 +108,7 @@ xenial bionic focal + jammy 1h