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 a811469d..71c86949 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="4.5.1" -REVISION="40503" +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..be814f84 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -1,14 +1,8 @@ -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') - -## 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 +IMAGE_VERSION=${WAZUH_IMAGE_VERSION} echo WAZUH_VERSION=$WAZUH_IMAGE_VERSION > .env echo WAZUH_IMAGE_VERSION=$IMAGE_VERSION >> .env diff --git a/multi-node/config/wazuh_cluster/wazuh_manager.conf b/multi-node/config/wazuh_cluster/wazuh_manager.conf index de889f89..75571705 100644 --- a/multi-node/config/wazuh_cluster/wazuh_manager.conf +++ b/multi-node/config/wazuh_cluster/wazuh_manager.conf @@ -108,13 +108,13 @@ xenial bionic focal + jammy 1h no - stretch buster bullseye 1h @@ -127,6 +127,7 @@ 6 7 8 + 9 1h @@ -138,6 +139,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 16cd29bb..fc67f55d 100644 --- a/multi-node/config/wazuh_cluster/wazuh_worker.conf +++ b/multi-node/config/wazuh_cluster/wazuh_worker.conf @@ -108,13 +108,13 @@ xenial bionic focal + jammy 1h no - stretch buster bullseye 1h @@ -127,6 +127,7 @@ 6 7 8 + 9 1h @@ -138,6 +139,18 @@ 1h + + + no + 11-server + 11-desktop + 12-server + 12-desktop + 15-server + 15-desktop + 1h + + no diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index bad1c879..8e53016f 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 ulimits: @@ -45,7 +45,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 ulimits: @@ -81,7 +81,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: @@ -107,7 +107,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: @@ -129,7 +129,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: @@ -151,7 +151,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/config/wazuh_cluster/wazuh_manager.conf b/single-node/config/wazuh_cluster/wazuh_manager.conf index d71a44ab..bbb35cbb 100644 --- a/single-node/config/wazuh_cluster/wazuh_manager.conf +++ b/single-node/config/wazuh_cluster/wazuh_manager.conf @@ -108,13 +108,13 @@ xenial bionic focal + jammy 1h no - stretch buster bullseye 1h @@ -127,6 +127,7 @@ 6 7 8 + 9 1h @@ -138,6 +139,18 @@ 1h + + + no + 11-server + 11-desktop + 12-server + 12-desktop + 15-server + 15-desktop + 1h + + no diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 50ad4b13..eeeccce9 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 ulimits: @@ -46,7 +46,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: @@ -71,7 +71,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: