From c0da16c7fe2d319ef006694fd4bde6da212c3716 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Wed, 6 Aug 2025 11:44:55 -0300 Subject: [PATCH 1/7] Bump 4.10.4 version --- .env | 6 +++--- .github/.goss.yaml | 2 +- .../workflows/Procedure_push_docker_images.yml | 8 ++++---- CHANGELOG.md | 18 ++++++++++++++++++ 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, 41 insertions(+), 23 deletions(-) diff --git a/.env b/.env index 3faa3c11..cb0f1e5b 100755 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ -WAZUH_VERSION=4.10.3 -WAZUH_IMAGE_VERSION=4.10.3 +WAZUH_VERSION=4.10.4 +WAZUH_IMAGE_VERSION=4.10.4 WAZUH_TAG_REVISION=1 -FILEBEAT_TEMPLATE_BRANCH=4.10.3 +FILEBEAT_TEMPLATE_BRANCH=4.10.4 WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.4.tar.gz WAZUH_UI_REVISION=1 diff --git a/.github/.goss.yaml b/.github/.goss.yaml index 702dcc26..a4d76c52 100644 --- a/.github/.goss.yaml +++ b/.github/.goss.yaml @@ -56,7 +56,7 @@ package: wazuh-manager: installed: true versions: - - 4.10.3 + - 4.10.4 port: tcp:1514: listening: true diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index 679e7d44..7baf6161 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -6,11 +6,11 @@ on: inputs: image_tag: description: 'Docker image tag' - default: '4.10.3' + default: '4.10.4' required: true docker_reference: description: 'wazuh-docker reference' - default: 'v4.10.3' + default: 'v4.10.4' required: false products: description: 'Comma-separated list of the image names to build and push' @@ -42,12 +42,12 @@ on: inputs: image_tag: description: 'Docker image tag' - default: '4.10.3' + default: '4.10.4' required: true type: string docker_reference: description: 'wazuh-docker reference' - default: 'v4.10.3' + default: 'v4.10.4' required: false type: string products: diff --git a/CHANGELOG.md b/CHANGELOG.md index 90dd366f..2d474ddb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,24 @@ # Change Log All notable changes to this project will be documented in this file. +## [4.10.4] + +### Added + +- None + +### Changed + +- None + +### Fixed + +- None + +### Deleted + +- None + ## [4.10.3] ### Added diff --git a/VERSION b/VERSION index 33c4aa26..213fd211 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="4.10.3" -REVISION="41030" +WAZUH-DOCKER_VERSION="4.10.4" +REVISION="41040" diff --git a/build-docker-images/README.md b/build-docker-images/README.md index a1034ca9..06a07cf4 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.10.3 +$ build-docker-images/build-images.sh -v 4.10.4 ``` 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.10.3. + -v, --version [Optional] Set the Wazuh version should be builded. By default, 4.10.4. -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 38c41a32..20a009f1 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -1,4 +1,4 @@ -WAZUH_IMAGE_VERSION=4.10.3 +WAZUH_IMAGE_VERSION=4.10.4 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.10.3" +WAZUH_IMAGE_VERSION="4.10.4" 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 fa037575..7ba63e3f 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.10.3 + image: wazuh/wazuh-manager:4.10.4 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.10.3 + image: wazuh/wazuh-manager:4.10.4 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.10.3 + image: wazuh/wazuh-indexer:4.10.4 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.10.3 + image: wazuh/wazuh-indexer:4.10.4 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.10.3 + image: wazuh/wazuh-indexer:4.10.4 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.10.3 + image: wazuh/wazuh-dashboard:4.10.4 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 97e58909..9f004421 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.10.3 + image: wazuh/wazuh-manager:4.10.4 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.10.3 + image: wazuh/wazuh-indexer:4.10.4 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.10.3 + image: wazuh/wazuh-dashboard:4.10.4 hostname: wazuh.dashboard restart: always ports: From 7b93ab0cad63324bca9eecfb185ca18f59cd7337 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Wed, 13 Aug 2025 08:45:12 -0300 Subject: [PATCH 2/7] Add wazuh-template.json into permanent data exception --- build-docker-images/wazuh-manager/config/permanent_data.env | 1 + 1 file changed, 1 insertion(+) diff --git a/build-docker-images/wazuh-manager/config/permanent_data.env b/build-docker-images/wazuh-manager/config/permanent_data.env index 555a3145..b079882a 100644 --- a/build-docker-images/wazuh-manager/config/permanent_data.env +++ b/build-docker-images/wazuh-manager/config/permanent_data.env @@ -97,6 +97,7 @@ PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/exceptions.py" PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/buckets/bucket.py" PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/buckets/access_logs.py" PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/pubsub/subscriber.py" +PERMANENT_DATA_EXCP[((i++))]="/etc/filebeat/wazuh-template.json" export PERMANENT_DATA_EXCP # Files mounted in a volume that should be deleted From ffd8149c61a96a7333d346ebd41c010e93342260 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Wed, 13 Aug 2025 08:48:20 -0300 Subject: [PATCH 3/7] Add changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d474ddb..65e6c5f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ All notable changes to this project will be documented in this file. ### Fixed -- None +- Add wazuh-template.json into permanent data exception ([#1967](https://github.com/wazuh/wazuh-docker/pull/1967)) ### Deleted From ae63208579f7bcff14537ffb2da360c30aceab4b Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 11 Mar 2025 15:07:14 -0300 Subject: [PATCH 4/7] Modify wazuh-keystore use --- .../wazuh-manager/config/etc/cont-init.d/2-manager | 4 ++-- 1 file changed, 2 insertions(+), 2 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 0bd90fd6..218b34f0 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,8 +115,8 @@ function_entrypoint_scripts() { function_configure_vulnerability_detection() { if [ "$INDEXER_PASSWORD" != "" ]; then >&2 echo "Configuring password." - /var/ossec/bin/wazuh-keystore -f indexer -k username -v $INDEXER_USERNAME - /var/ossec/bin/wazuh-keystore -f indexer -k password -v $INDEXER_PASSWORD + echo '$INDEXER_USERNAME' | /var/ossec/bin/wazuh-keystore -f indexer -k username + echo '$INDEXER_PASSWORD' | /var/ossec/bin/wazuh-keystore -f indexer -k password fi } From d9206376d1a7709e6375d35952a8a4137fcf2fa8 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 11 Mar 2025 15:08:41 -0300 Subject: [PATCH 5/7] Add changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65e6c5f1..07762859 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,7 +27,8 @@ All notable changes to this project will be documented in this file. ### Changed -- None +- Modify wazuh-keystore use ([#1750](https://github.com/wazuh/wazuh-docker/pull/1750)) \- (wazuh-keystore) + ### Fixed From cd89f266d294231667d6d7230ef5c701ac28d919 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 11 Mar 2025 15:31:31 -0300 Subject: [PATCH 6/7] Modify wazuh-keystore use --- .../wazuh-manager/config/etc/cont-init.d/2-manager | 4 ++-- 1 file changed, 2 insertions(+), 2 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 218b34f0..ff3e1fdd 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,8 +115,8 @@ function_entrypoint_scripts() { function_configure_vulnerability_detection() { if [ "$INDEXER_PASSWORD" != "" ]; then >&2 echo "Configuring password." - echo '$INDEXER_USERNAME' | /var/ossec/bin/wazuh-keystore -f indexer -k username - echo '$INDEXER_PASSWORD' | /var/ossec/bin/wazuh-keystore -f indexer -k password + echo "$INDEXER_USERNAME" | /var/ossec/bin/wazuh-keystore -f indexer -k username + echo "$INDEXER_PASSWORD" | /var/ossec/bin/wazuh-keystore -f indexer -k password fi } From f5edb2d54b38f7638cc294a9688f6669921633a1 Mon Sep 17 00:00:00 2001 From: Jesus Garcia Date: Tue, 14 Oct 2025 11:01:30 -0500 Subject: [PATCH 7/7] Update CHANGELOG --- CHANGELOG.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 07762859..0d8708fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ All notable changes to this project will be documented in this file. ### Changed -- None +- Backport 4.13.0 changes: Modify wazuh-keystore use ([#2036](https://github.com/wazuh/wazuh-docker/pull/2036)) \- (wazuh-keystore) ### Fixed @@ -27,8 +27,7 @@ All notable changes to this project will be documented in this file. ### Changed -- Modify wazuh-keystore use ([#1750](https://github.com/wazuh/wazuh-docker/pull/1750)) \- (wazuh-keystore) - +- None ### Fixed