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/4] 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 - - - - 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 + yes + 60m + - + + 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 - - - - 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 + yes + 60m + - + + 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 - - - - 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 + yes + 60m + - + + 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/4] 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/4] 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/4] 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"