From 09aeb68b14be4de82d77165268097232b30ebfec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Tue, 19 Dec 2023 10:45:21 -0300 Subject: [PATCH 1/5] New VD config update --- .../config/etc/cont-init.d/2-manager | 9 ++ .../config/wazuh_cluster/wazuh_manager.conf | 106 ++++-------------- .../config/wazuh_cluster/wazuh_worker.conf | 106 ++++-------------- .../config/wazuh_cluster/wazuh_manager.conf | 104 ++++------------- 4 files changed, 73 insertions(+), 252 deletions(-) diff --git a/build-docker-images/wazuh-manager/config/etc/cont-init.d/2-manager b/build-docker-images/wazuh-manager/config/etc/cont-init.d/2-manager index 9e70ace9..8ddce84e 100644 --- a/build-docker-images/wazuh-manager/config/etc/cont-init.d/2-manager +++ b/build-docker-images/wazuh-manager/config/etc/cont-init.d/2-manager @@ -112,6 +112,12 @@ function_entrypoint_scripts() { fi } +function_configure_vulnerability_detection() { +if [ "$INDEXER_PASSWORD" != "" ]; then + >&2 echo "Configuring password." + sed -i "s|VDPass|'$INDEXER_PASSWORD'|g" /var/ossec/etc/ossec.conf +fi +} # Migrate data from /wazuh-migration volume function_wazuh_migration @@ -119,6 +125,9 @@ function_wazuh_migration # create API custom user function_create_custom_user +# configure Vulnerabilty detection +function_configure_vulnerability_detection + # run entrypoint scripts function_entrypoint_scripts diff --git a/multi-node/config/wazuh_cluster/wazuh_manager.conf b/multi-node/config/wazuh_cluster/wazuh_manager.conf index 6c5d9ae7..1ec10630 100644 --- a/multi-node/config/wazuh_cluster/wazuh_manager.conf +++ b/multi-node/config/wazuh_cluster/wazuh_manager.conf @@ -95,91 +95,29 @@ yes - - no - 5m - 6h - yes + + yes + yes + 60m + - - - no - trusty - xenial - bionic - focal - jammy - 1h - - - - - no - buster - bullseye - bookworm - 1h - - - - - no - 5 - 6 - 7 - 8 - 9 - 1h - - - - - no - amazon-linux - amazon-linux-2 - amazon-linux-2023 - 1h - - - - - no - 11-server - 11-desktop - 12-server - 12-desktop - 15-server - 15-desktop - 1h - - - - - no - 1h - - - - - yes - 1h - - - - - no - 8 - 9 - 1h - - - - - yes - 1h - - - + + yes + + https://wazuh1.indexer:9200 + https://wazuh2.indexer:9200 + https://wazuh3.indexer:9200 + + admin + VDPass + + + /etc/ssl/root-ca.pem + + /etc/ssl/filebeat.pem + /etc/ssl/filebeat.key + + diff --git a/multi-node/config/wazuh_cluster/wazuh_worker.conf b/multi-node/config/wazuh_cluster/wazuh_worker.conf index 341e6301..9d277622 100644 --- a/multi-node/config/wazuh_cluster/wazuh_worker.conf +++ b/multi-node/config/wazuh_cluster/wazuh_worker.conf @@ -95,91 +95,29 @@ yes - - no - 5m - 6h - yes + + yes + yes + 60m + - - - no - trusty - xenial - bionic - focal - jammy - 1h - - - - - no - buster - bullseye - bookworm - 1h - - - - - no - 5 - 6 - 7 - 8 - 9 - 1h - - - - - no - amazon-linux - amazon-linux-2 - amazon-linux-2023 - 1h - - - - - no - 11-server - 11-desktop - 12-server - 12-desktop - 15-server - 15-desktop - 1h - - - - - no - 1h - - - - - no - 8 - 9 - 1h - - - - - yes - 1h - - - - - yes - 1h - - - + + yes + + https://wazuh1.indexer:9200 + https://wazuh2.indexer:9200 + https://wazuh3.indexer:9200 + + admin + VDPass + + + /etc/ssl/root-ca.pem + + /etc/ssl/filebeat.pem + /etc/ssl/filebeat.key + + diff --git a/single-node/config/wazuh_cluster/wazuh_manager.conf b/single-node/config/wazuh_cluster/wazuh_manager.conf index 0cf738f3..9dd0990c 100644 --- a/single-node/config/wazuh_cluster/wazuh_manager.conf +++ b/single-node/config/wazuh_cluster/wazuh_manager.conf @@ -95,91 +95,27 @@ yes - - no - 5m - 6h - yes + + yes + yes + 60m + - - - no - trusty - xenial - bionic - focal - jammy - 1h - - - - - no - buster - bullseye - bookworm - 1h - - - - - no - 5 - 6 - 7 - 8 - 9 - 1h - - - - - no - amazon-linux - amazon-linux-2 - amazon-linux-2023 - 1h - - - - - no - 11-server - 11-desktop - 12-server - 12-desktop - 15-server - 15-desktop - 1h - - - - - no - 1h - - - - - no - 8 - 9 - 1h - - - - - yes - 1h - - - - - yes - 1h - - - + + yes + + https://wazuh.indexer:9200 + + admin + VDPass + + + /etc/ssl/root-ca.pem + + /etc/ssl/filebeat.pem + /etc/ssl/filebeat.key + + From 2258605ec21e5b6fb4426ce7042b8a24cc373529 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Wed, 20 Dec 2023 04:28:33 -0300 Subject: [PATCH 2/5] delete single quotes for configurate vuln detection --- .env | 2 +- .../wazuh-manager/config/etc/cont-init.d/2-manager | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env b/.env index 6b66d4a0..e4e7c63c 100755 --- a/.env +++ b/.env @@ -2,5 +2,5 @@ WAZUH_VERSION=4.8.0 WAZUH_IMAGE_VERSION=4.8.0 WAZUH_TAG_REVISION=1 FILEBEAT_TEMPLATE_BRANCH=4.8.0 -WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.2.tar.gz +WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.3.tar.gz WAZUH_UI_REVISION=1 diff --git a/build-docker-images/wazuh-manager/config/etc/cont-init.d/2-manager b/build-docker-images/wazuh-manager/config/etc/cont-init.d/2-manager index 8ddce84e..f0cf6ec3 100644 --- a/build-docker-images/wazuh-manager/config/etc/cont-init.d/2-manager +++ b/build-docker-images/wazuh-manager/config/etc/cont-init.d/2-manager @@ -115,7 +115,7 @@ function_entrypoint_scripts() { function_configure_vulnerability_detection() { if [ "$INDEXER_PASSWORD" != "" ]; then >&2 echo "Configuring password." - sed -i "s|VDPass|'$INDEXER_PASSWORD'|g" /var/ossec/etc/ossec.conf + sed -i "s|VDPass|$INDEXER_PASSWORD|g" /var/ossec/etc/ossec.conf fi } From 9b1ba35383b085d81e6d8ea7754859ce27cd30a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Wed, 20 Dec 2023 16:29:00 +0100 Subject: [PATCH 3/5] Changed Filebeat module version to 0.4 --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index e4e7c63c..d8abf73e 100755 --- a/.env +++ b/.env @@ -2,5 +2,5 @@ WAZUH_VERSION=4.8.0 WAZUH_IMAGE_VERSION=4.8.0 WAZUH_TAG_REVISION=1 FILEBEAT_TEMPLATE_BRANCH=4.8.0 -WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.3.tar.gz +WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.4.tar.gz WAZUH_UI_REVISION=1 From 69d61278cf1f905a6ed09f283e9b094c2cf92fc9 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Fri, 22 Dec 2023 05:46:46 -0300 Subject: [PATCH 4/5] bump revision --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 3aee056f..db992f13 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="4.7.2" -REVISION="40708" +REVISION="40710" From 64ab19be1a3192c504c95cfd1757a28c2d7bce25 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Thu, 4 Jan 2024 10:01:05 -0300 Subject: [PATCH 5/5] bump 4.8.2 version --- .env | 6 +++--- .github/.goss.yaml | 2 +- CHANGELOG.md | 4 ++++ README.md | 1 + VERSION | 4 ++-- build-docker-images/README.md | 4 ++-- build-docker-images/build-images.sh | 4 ++-- multi-node/docker-compose.yml | 12 ++++++------ single-node/docker-compose.yml | 6 +++--- 9 files changed, 24 insertions(+), 19 deletions(-) diff --git a/.env b/.env index df92e2d3..14ae5459 100755 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ -WAZUH_VERSION=4.8.1 -WAZUH_IMAGE_VERSION=4.8.1 +WAZUH_VERSION=4.8.2 +WAZUH_IMAGE_VERSION=4.8.2 WAZUH_TAG_REVISION=1 -FILEBEAT_TEMPLATE_BRANCH=4.8.1 +FILEBEAT_TEMPLATE_BRANCH=4.8.2 WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.4.tar.gz WAZUH_UI_REVISION=1 diff --git a/.github/.goss.yaml b/.github/.goss.yaml index 50b54fc2..89233fb2 100644 --- a/.github/.goss.yaml +++ b/.github/.goss.yaml @@ -56,7 +56,7 @@ package: wazuh-manager: installed: true versions: - - 4.8.1-1 + - 4.8.2-1 port: tcp:1514: listening: true diff --git a/CHANGELOG.md b/CHANGELOG.md index e89a873a..3f54fb58 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Change Log All notable changes to this project will be documented in this file. +## Wazuh Docker v4.8.2 + +- Update Wazuh to version [4.8.2](https://github.com/wazuh/wazuh/blob/v4.8.2/CHANGELOG.md#v482) + ## Wazuh Docker v4.8.1 ### Added diff --git a/README.md b/README.md index 16ffd8ba..c6fcbf11 100644 --- a/README.md +++ b/README.md @@ -196,6 +196,7 @@ WAZUH_MONITORING_REPLICAS=0 ## | Wazuh version | ODFE | XPACK | |---------------|---------|--------| +| v4.8.2 | | | | v4.8.1 | | | | v4.8.0 | | | | v4.7.2 | | | diff --git a/VERSION b/VERSION index 26a1c102..9b7fe9e7 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="4.8.1" -REVISION="40810" +WAZUH-DOCKER_VERSION="4.8.2" +REVISION="40820" diff --git a/build-docker-images/README.md b/build-docker-images/README.md index 2d527418..21858f55 100644 --- a/build-docker-images/README.md +++ b/build-docker-images/README.md @@ -13,7 +13,7 @@ This script initializes the environment variables needed to build each of the im The script allows you to build images from other versions of Wazuh, to do this you must use the -v or --version argument: ``` -$ build-docker-images/build-images.sh -v 4.8.1 +$ build-docker-images/build-images.sh -v 4.8.2 ``` To get all the available script options use the -h or --help option: @@ -26,7 +26,7 @@ Usage: build-docker-images/build-images.sh [OPTIONS] -d, --dev [Optional] Set the development stage you want to build, example rc1 or beta1, not used by default. -f, --filebeat-module [Optional] Set Filebeat module version. By default 0.4. -r, --revision [Optional] Package revision. By default 1 - -v, --version [Optional] Set the Wazuh version should be builded. By default, 4.8.1. + -v, --version [Optional] Set the Wazuh version should be builded. By default, 4.8.2. -h, --help Show this help. ``` \ No newline at end of file diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index 6a561f08..edb38b3f 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -1,4 +1,4 @@ -WAZUH_IMAGE_VERSION=4.8.1 +WAZUH_IMAGE_VERSION=4.8.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') @@ -12,7 +12,7 @@ IMAGE_VERSION=${WAZUH_IMAGE_VERSION} # License (version 2) as published by the FSF - Free Software # Foundation. -WAZUH_IMAGE_VERSION="4.8.1" +WAZUH_IMAGE_VERSION="4.8.2" WAZUH_TAG_REVISION="1" WAZUH_DEV_STAGE="" FILEBEAT_MODULE_VERSION="0.4" diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index fadd20e9..10cfa317 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.8.1 + image: wazuh/wazuh-manager:4.8.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.8.1 + image: wazuh/wazuh-manager:4.8.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.8.1 + image: wazuh/wazuh-indexer:4.8.2 hostname: wazuh1.indexer restart: always ports: @@ -108,7 +108,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh2.indexer: - image: wazuh/wazuh-indexer:4.8.1 + image: wazuh/wazuh-indexer:4.8.2 hostname: wazuh2.indexer restart: always environment: @@ -130,7 +130,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh3.indexer: - image: wazuh/wazuh-indexer:4.8.1 + image: wazuh/wazuh-indexer:4.8.2 hostname: wazuh3.indexer restart: always environment: @@ -152,7 +152,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.8.1 + image: wazuh/wazuh-dashboard:4.8.2 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index da7efcd8..1b18780d 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.8.1 + image: wazuh/wazuh-manager:4.8.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.8.1 + image: wazuh/wazuh-indexer:4.8.2 hostname: wazuh.indexer restart: always ports: @@ -72,7 +72,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.8.1 + image: wazuh/wazuh-dashboard:4.8.2 hostname: wazuh.dashboard restart: always ports: