From b26615e524e018754baa02261ac8be4235fab2e3 Mon Sep 17 00:00:00 2001 From: wazuhci <22834044+wazuhci@users.noreply.github.com> Date: Thu, 4 Dec 2025 09:29:58 +0000 Subject: [PATCH 01/11] feat: bump 4.14.2 --- VERSION.json | 2 +- build-docker-images/build-images.sh | 2 +- docs/dev/build-image.md | 2 +- multi-node/docker-compose.yml | 12 ++++++------ single-node/docker-compose.yml | 6 +++--- wazuh-agent/docker-compose.yml | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/VERSION.json b/VERSION.json index 107ffb01..c0140fe7 100644 --- a/VERSION.json +++ b/VERSION.json @@ -1,4 +1,4 @@ { "version": "4.14.2", - "stage": "alpha0" + "stage": "rc1" } diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index 929be6e8..b1c15613 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -76,7 +76,7 @@ help() { echo echo "Usage: $0 [OPTIONS]" echo - echo " -d, --dev [Optional] Set the development stage you want to build, example alpha0 or beta1, not used by default." + echo " -d, --dev [Optional] Set the development stage you want to build, example rc1 or beta1, not used by default." echo " -f, --filebeat-module [Optional] Set Filebeat module version. By default ${FILEBEAT_MODULE_VERSION}." echo " -r, --revision [Optional] Package revision. By default ${WAZUH_TAG_REVISION}" echo " -v, --version [Optional] Set the Wazuh version should be builded. By default, ${WAZUH_IMAGE_VERSION}." diff --git a/docs/dev/build-image.md b/docs/dev/build-image.md index d776ca51..58bf6668 100644 --- a/docs/dev/build-image.md +++ b/docs/dev/build-image.md @@ -23,7 +23,7 @@ $ build-docker-images/build-images.sh -h Usage: build-docker-images/build-images.sh [OPTIONS] - -d, --dev [Optional] Set the development stage you want to build, example alpha0 or beta1, not used by default. + -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.14.2. diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index d0091d51..c89b2be8 100644 --- a/multi-node/docker-compose.yml +++ b/multi-node/docker-compose.yml @@ -1,7 +1,7 @@ # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2) services: wazuh.master: - image: wazuh/wazuh-manager:4.14.2 + image: wazuh/wazuh-manager:4.14.2-rc1 hostname: wazuh.master restart: always ulimits: @@ -43,7 +43,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.worker: - image: wazuh/wazuh-manager:4.14.2 + image: wazuh/wazuh-manager:4.14.2-rc1 hostname: wazuh.worker restart: always ulimits: @@ -79,7 +79,7 @@ services: - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf wazuh1.indexer: - image: wazuh/wazuh-indexer:4.14.2 + image: wazuh/wazuh-indexer:4.14.2-rc1 hostname: wazuh1.indexer restart: always ports: @@ -105,7 +105,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/config/opensearch-security/internal_users.yml wazuh2.indexer: - image: wazuh/wazuh-indexer:4.14.2 + image: wazuh/wazuh-indexer:4.14.2-rc1 hostname: wazuh2.indexer restart: always environment: @@ -127,7 +127,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/config/opensearch-security/internal_users.yml wazuh3.indexer: - image: wazuh/wazuh-indexer:4.14.2 + image: wazuh/wazuh-indexer:4.14.2-rc1 hostname: wazuh3.indexer restart: always environment: @@ -149,7 +149,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/config/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.14.2 + image: wazuh/wazuh-dashboard:4.14.2-rc1 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 9dd70a6b..285175bb 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -1,7 +1,7 @@ # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2) services: wazuh.manager: - image: wazuh/wazuh-manager:4.14.2 + image: wazuh/wazuh-manager:4.14.2-rc1 hostname: wazuh.manager restart: always ulimits: @@ -44,7 +44,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.indexer: - image: wazuh/wazuh-indexer:4.14.2 + image: wazuh/wazuh-indexer:4.14.2-rc1 hostname: wazuh.indexer restart: always ports: @@ -69,7 +69,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/config/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.14.2 + image: wazuh/wazuh-dashboard:4.14.2-rc1 hostname: wazuh.dashboard restart: always ports: diff --git a/wazuh-agent/docker-compose.yml b/wazuh-agent/docker-compose.yml index 0a1f5660..7850b829 100644 --- a/wazuh-agent/docker-compose.yml +++ b/wazuh-agent/docker-compose.yml @@ -1,7 +1,7 @@ # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2) services: wazuh.agent: - image: wazuh/wazuh-agent:4.14.2 + image: wazuh/wazuh-agent:4.14.2-rc1 restart: always environment: - WAZUH_MANAGER_SERVER= From cb9ecd779e640f57986c87abab29548a1bc204fe Mon Sep 17 00:00:00 2001 From: fcaffieri Date: Thu, 4 Dec 2025 07:33:18 -0300 Subject: [PATCH 02/11] Remove docker image tag for 4.14.2-rc1 --- multi-node/docker-compose.yml | 12 ++++++------ single-node/docker-compose.yml | 6 +++--- wazuh-agent/docker-compose.yml | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index c89b2be8..d0091d51 100644 --- a/multi-node/docker-compose.yml +++ b/multi-node/docker-compose.yml @@ -1,7 +1,7 @@ # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2) services: wazuh.master: - image: wazuh/wazuh-manager:4.14.2-rc1 + image: wazuh/wazuh-manager:4.14.2 hostname: wazuh.master restart: always ulimits: @@ -43,7 +43,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.worker: - image: wazuh/wazuh-manager:4.14.2-rc1 + image: wazuh/wazuh-manager:4.14.2 hostname: wazuh.worker restart: always ulimits: @@ -79,7 +79,7 @@ services: - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf wazuh1.indexer: - image: wazuh/wazuh-indexer:4.14.2-rc1 + image: wazuh/wazuh-indexer:4.14.2 hostname: wazuh1.indexer restart: always ports: @@ -105,7 +105,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/config/opensearch-security/internal_users.yml wazuh2.indexer: - image: wazuh/wazuh-indexer:4.14.2-rc1 + image: wazuh/wazuh-indexer:4.14.2 hostname: wazuh2.indexer restart: always environment: @@ -127,7 +127,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/config/opensearch-security/internal_users.yml wazuh3.indexer: - image: wazuh/wazuh-indexer:4.14.2-rc1 + image: wazuh/wazuh-indexer:4.14.2 hostname: wazuh3.indexer restart: always environment: @@ -149,7 +149,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/config/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.14.2-rc1 + image: wazuh/wazuh-dashboard:4.14.2 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 285175bb..9dd70a6b 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -1,7 +1,7 @@ # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2) services: wazuh.manager: - image: wazuh/wazuh-manager:4.14.2-rc1 + image: wazuh/wazuh-manager:4.14.2 hostname: wazuh.manager restart: always ulimits: @@ -44,7 +44,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.indexer: - image: wazuh/wazuh-indexer:4.14.2-rc1 + image: wazuh/wazuh-indexer:4.14.2 hostname: wazuh.indexer restart: always ports: @@ -69,7 +69,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/config/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.14.2-rc1 + image: wazuh/wazuh-dashboard:4.14.2 hostname: wazuh.dashboard restart: always ports: diff --git a/wazuh-agent/docker-compose.yml b/wazuh-agent/docker-compose.yml index 7850b829..0a1f5660 100644 --- a/wazuh-agent/docker-compose.yml +++ b/wazuh-agent/docker-compose.yml @@ -1,7 +1,7 @@ # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2) services: wazuh.agent: - image: wazuh/wazuh-agent:4.14.2-rc1 + image: wazuh/wazuh-agent:4.14.2 restart: always environment: - WAZUH_MANAGER_SERVER= From d5d0229f18d2f8929686e542ca8f8ca52fae7db8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Thu, 4 Dec 2025 11:18:59 -0300 Subject: [PATCH 03/11] Filebeat module version update --- .env | 2 +- .github/workflows/Procedure_push_docker_images.yml | 4 ++-- build-docker-images/README.md | 2 +- build-docker-images/build-images.sh | 2 +- docs/dev/build-image.md | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.env b/.env index cf6a7d27..e238b027 100755 --- a/.env +++ b/.env @@ -2,5 +2,5 @@ WAZUH_VERSION=4.14.2 WAZUH_IMAGE_VERSION=4.14.2 WAZUH_TAG_REVISION=1 FILEBEAT_TEMPLATE_BRANCH=4.14.2 -WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.4.tar.gz +WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.5.tar.gz WAZUH_UI_REVISION=1 diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index 8831fec3..349d7929 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -17,7 +17,7 @@ on: required: true filebeat_module_version: description: 'Filebeat module version' - default: '0.4' + default: '0.5' required: true revision: description: 'Package revision' @@ -55,7 +55,7 @@ on: type: string filebeat_module_version: description: 'Filebeat module version' - default: '0.4' + default: '0.5' required: true type: string revision: diff --git a/build-docker-images/README.md b/build-docker-images/README.md index 58bf6668..041ad1a5 100644 --- a/build-docker-images/README.md +++ b/build-docker-images/README.md @@ -24,7 +24,7 @@ $ build-docker-images/build-images.sh -h 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. + -f, --filebeat-module [Optional] Set Filebeat module version. By default 0.5. -r, --revision [Optional] Package revision. By default 1 -v, --version [Optional] Set the Wazuh version should be builded. By default, 4.14.2. -h, --help Show this help. diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index b1c15613..f4086e42 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -15,7 +15,7 @@ IMAGE_VERSION=${WAZUH_IMAGE_VERSION} WAZUH_IMAGE_VERSION="4.14.2" WAZUH_TAG_REVISION="1" WAZUH_DEV_STAGE="" -FILEBEAT_MODULE_VERSION="0.4" +FILEBEAT_MODULE_VERSION="0.5" # ----------------------------------------------------------------------------- diff --git a/docs/dev/build-image.md b/docs/dev/build-image.md index 58bf6668..041ad1a5 100644 --- a/docs/dev/build-image.md +++ b/docs/dev/build-image.md @@ -24,7 +24,7 @@ $ build-docker-images/build-images.sh -h 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. + -f, --filebeat-module [Optional] Set Filebeat module version. By default 0.5. -r, --revision [Optional] Package revision. By default 1 -v, --version [Optional] Set the Wazuh version should be builded. By default, 4.14.2. -h, --help Show this help. From cdf10f8e697c50713ecf717428c9808466752f94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Thu, 4 Dec 2025 11:20:31 -0300 Subject: [PATCH 04/11] Changelog update --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc4cbfeb..30ec54f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file. ### Changed +- Filebeat module version update ([#2115](https://github.com/wazuh/wazuh-docker/pull/2115)) - The location of the remove command for the wazuh-authd certificates has been changed. ([#2094](https://github.com/wazuh/wazuh-docker/pull/2094)) - Removed sslmanager key from the docker manager image to 4.14.2. ([#2093](https://github.com/wazuh/wazuh-docker/pull/2093)) From c0da5ff7f508917d21f78d1aa50ec3eb06a06aec Mon Sep 17 00:00:00 2001 From: Carlos Bordon Date: Thu, 4 Dec 2025 12:05:41 -0300 Subject: [PATCH 05/11] Updated docker-compose files with v4.14.2-rc1 tag --- multi-node/docker-compose.yml | 12 ++++++------ single-node/docker-compose.yml | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index d0091d51..8520d93f 100644 --- a/multi-node/docker-compose.yml +++ b/multi-node/docker-compose.yml @@ -1,7 +1,7 @@ # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2) services: wazuh.master: - image: wazuh/wazuh-manager:4.14.2 + image: wazuh/wazuh-manager:v4.14.2-rc1 hostname: wazuh.master restart: always ulimits: @@ -43,7 +43,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.worker: - image: wazuh/wazuh-manager:4.14.2 + image: wazuh/wazuh-manager:v4.14.2-rc1 hostname: wazuh.worker restart: always ulimits: @@ -79,7 +79,7 @@ services: - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf wazuh1.indexer: - image: wazuh/wazuh-indexer:4.14.2 + image: wazuh/wazuh-indexer:v4.14.2-rc1 hostname: wazuh1.indexer restart: always ports: @@ -105,7 +105,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/config/opensearch-security/internal_users.yml wazuh2.indexer: - image: wazuh/wazuh-indexer:4.14.2 + image: wazuh/wazuh-indexer:v4.14.2-rc1 hostname: wazuh2.indexer restart: always environment: @@ -127,7 +127,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/config/opensearch-security/internal_users.yml wazuh3.indexer: - image: wazuh/wazuh-indexer:4.14.2 + image: wazuh/wazuh-indexer:v4.14.2-rc1 hostname: wazuh3.indexer restart: always environment: @@ -149,7 +149,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/config/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.14.2 + image: wazuh/wazuh-dashboard:v4.14.2-rc1 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 9dd70a6b..ec8172ce 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -1,7 +1,7 @@ # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2) services: wazuh.manager: - image: wazuh/wazuh-manager:4.14.2 + image: wazuh/wazuh-manager:v4.14.2-rc1 hostname: wazuh.manager restart: always ulimits: @@ -44,7 +44,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.indexer: - image: wazuh/wazuh-indexer:4.14.2 + image: wazuh/wazuh-indexer:v4.14.2-rc1 hostname: wazuh.indexer restart: always ports: @@ -69,7 +69,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/config/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.14.2 + image: wazuh/wazuh-dashboard:v4.14.2-rc1 hostname: wazuh.dashboard restart: always ports: From 5a931149620e20ef69ebcaf59841f70ba163d73a Mon Sep 17 00:00:00 2001 From: Carlos Bordon Date: Thu, 4 Dec 2025 12:20:33 -0300 Subject: [PATCH 06/11] Reverted docker-compose files with v4.14.2-rc1 tag --- multi-node/docker-compose.yml | 12 ++++++------ single-node/docker-compose.yml | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index 8520d93f..d0091d51 100644 --- a/multi-node/docker-compose.yml +++ b/multi-node/docker-compose.yml @@ -1,7 +1,7 @@ # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2) services: wazuh.master: - image: wazuh/wazuh-manager:v4.14.2-rc1 + image: wazuh/wazuh-manager:4.14.2 hostname: wazuh.master restart: always ulimits: @@ -43,7 +43,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.worker: - image: wazuh/wazuh-manager:v4.14.2-rc1 + image: wazuh/wazuh-manager:4.14.2 hostname: wazuh.worker restart: always ulimits: @@ -79,7 +79,7 @@ services: - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf wazuh1.indexer: - image: wazuh/wazuh-indexer:v4.14.2-rc1 + image: wazuh/wazuh-indexer:4.14.2 hostname: wazuh1.indexer restart: always ports: @@ -105,7 +105,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/config/opensearch-security/internal_users.yml wazuh2.indexer: - image: wazuh/wazuh-indexer:v4.14.2-rc1 + image: wazuh/wazuh-indexer:4.14.2 hostname: wazuh2.indexer restart: always environment: @@ -127,7 +127,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/config/opensearch-security/internal_users.yml wazuh3.indexer: - image: wazuh/wazuh-indexer:v4.14.2-rc1 + image: wazuh/wazuh-indexer:4.14.2 hostname: wazuh3.indexer restart: always environment: @@ -149,7 +149,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/config/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:v4.14.2-rc1 + image: wazuh/wazuh-dashboard:4.14.2 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index ec8172ce..9dd70a6b 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -1,7 +1,7 @@ # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2) services: wazuh.manager: - image: wazuh/wazuh-manager:v4.14.2-rc1 + image: wazuh/wazuh-manager:4.14.2 hostname: wazuh.manager restart: always ulimits: @@ -44,7 +44,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.indexer: - image: wazuh/wazuh-indexer:v4.14.2-rc1 + image: wazuh/wazuh-indexer:4.14.2 hostname: wazuh.indexer restart: always ports: @@ -69,7 +69,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/config/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:v4.14.2-rc1 + image: wazuh/wazuh-dashboard:4.14.2 hostname: wazuh.dashboard restart: always ports: From 493ac6bd3a67c3bea22c77cc908fff653319e3a1 Mon Sep 17 00:00:00 2001 From: Carlos Bordon Date: Thu, 4 Dec 2025 12:34:37 -0300 Subject: [PATCH 07/11] Update docker-compose files with RC2 tag --- multi-node/docker-compose.yml | 12 ++++++------ single-node/docker-compose.yml | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index 8520d93f..c89b2be8 100644 --- a/multi-node/docker-compose.yml +++ b/multi-node/docker-compose.yml @@ -1,7 +1,7 @@ # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2) services: wazuh.master: - image: wazuh/wazuh-manager:v4.14.2-rc1 + image: wazuh/wazuh-manager:4.14.2-rc1 hostname: wazuh.master restart: always ulimits: @@ -43,7 +43,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.worker: - image: wazuh/wazuh-manager:v4.14.2-rc1 + image: wazuh/wazuh-manager:4.14.2-rc1 hostname: wazuh.worker restart: always ulimits: @@ -79,7 +79,7 @@ services: - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf wazuh1.indexer: - image: wazuh/wazuh-indexer:v4.14.2-rc1 + image: wazuh/wazuh-indexer:4.14.2-rc1 hostname: wazuh1.indexer restart: always ports: @@ -105,7 +105,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/config/opensearch-security/internal_users.yml wazuh2.indexer: - image: wazuh/wazuh-indexer:v4.14.2-rc1 + image: wazuh/wazuh-indexer:4.14.2-rc1 hostname: wazuh2.indexer restart: always environment: @@ -127,7 +127,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/config/opensearch-security/internal_users.yml wazuh3.indexer: - image: wazuh/wazuh-indexer:v4.14.2-rc1 + image: wazuh/wazuh-indexer:4.14.2-rc1 hostname: wazuh3.indexer restart: always environment: @@ -149,7 +149,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/config/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:v4.14.2-rc1 + image: wazuh/wazuh-dashboard:4.14.2-rc1 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index ec8172ce..285175bb 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -1,7 +1,7 @@ # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2) services: wazuh.manager: - image: wazuh/wazuh-manager:v4.14.2-rc1 + image: wazuh/wazuh-manager:4.14.2-rc1 hostname: wazuh.manager restart: always ulimits: @@ -44,7 +44,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.indexer: - image: wazuh/wazuh-indexer:v4.14.2-rc1 + image: wazuh/wazuh-indexer:4.14.2-rc1 hostname: wazuh.indexer restart: always ports: @@ -69,7 +69,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/config/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:v4.14.2-rc1 + image: wazuh/wazuh-dashboard:4.14.2-rc1 hostname: wazuh.dashboard restart: always ports: From 1815ead65f4b5b7765bf8d50e4b08508e9dccbfe Mon Sep 17 00:00:00 2001 From: Carlos Bordon Date: Thu, 4 Dec 2025 12:42:16 -0300 Subject: [PATCH 08/11] Updated wazuh agent image --- wazuh-agent/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wazuh-agent/docker-compose.yml b/wazuh-agent/docker-compose.yml index 0a1f5660..5fc80f2d 100644 --- a/wazuh-agent/docker-compose.yml +++ b/wazuh-agent/docker-compose.yml @@ -1,9 +1,9 @@ # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2) services: wazuh.agent: - image: wazuh/wazuh-agent:4.14.2 + image: wazuh/wazuh-agent:4.14.2-rc1 restart: always environment: - WAZUH_MANAGER_SERVER= volumes: - - ./config/wazuh-agent-conf:/wazuh-config-mount/etc/ossec.conf \ No newline at end of file + - ./config/wazuh-agent-conf:/wazuh-config-mount/etc/ossec.conf From 48893cb485f67f5b2b47c3e410579bbbb5592e3c Mon Sep 17 00:00:00 2001 From: Carlos Bordon Date: Thu, 4 Dec 2025 12:48:56 -0300 Subject: [PATCH 09/11] Reverted docker-compose files with v4.14.2-rc1 tag --- multi-node/docker-compose.yml | 12 ++++++------ single-node/docker-compose.yml | 6 +++--- wazuh-agent/docker-compose.yml | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index c89b2be8..d0091d51 100644 --- a/multi-node/docker-compose.yml +++ b/multi-node/docker-compose.yml @@ -1,7 +1,7 @@ # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2) services: wazuh.master: - image: wazuh/wazuh-manager:4.14.2-rc1 + image: wazuh/wazuh-manager:4.14.2 hostname: wazuh.master restart: always ulimits: @@ -43,7 +43,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.worker: - image: wazuh/wazuh-manager:4.14.2-rc1 + image: wazuh/wazuh-manager:4.14.2 hostname: wazuh.worker restart: always ulimits: @@ -79,7 +79,7 @@ services: - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf wazuh1.indexer: - image: wazuh/wazuh-indexer:4.14.2-rc1 + image: wazuh/wazuh-indexer:4.14.2 hostname: wazuh1.indexer restart: always ports: @@ -105,7 +105,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/config/opensearch-security/internal_users.yml wazuh2.indexer: - image: wazuh/wazuh-indexer:4.14.2-rc1 + image: wazuh/wazuh-indexer:4.14.2 hostname: wazuh2.indexer restart: always environment: @@ -127,7 +127,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/config/opensearch-security/internal_users.yml wazuh3.indexer: - image: wazuh/wazuh-indexer:4.14.2-rc1 + image: wazuh/wazuh-indexer:4.14.2 hostname: wazuh3.indexer restart: always environment: @@ -149,7 +149,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/config/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.14.2-rc1 + image: wazuh/wazuh-dashboard:4.14.2 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 285175bb..9dd70a6b 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -1,7 +1,7 @@ # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2) services: wazuh.manager: - image: wazuh/wazuh-manager:4.14.2-rc1 + image: wazuh/wazuh-manager:4.14.2 hostname: wazuh.manager restart: always ulimits: @@ -44,7 +44,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.indexer: - image: wazuh/wazuh-indexer:4.14.2-rc1 + image: wazuh/wazuh-indexer:4.14.2 hostname: wazuh.indexer restart: always ports: @@ -69,7 +69,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/config/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.14.2-rc1 + image: wazuh/wazuh-dashboard:4.14.2 hostname: wazuh.dashboard restart: always ports: diff --git a/wazuh-agent/docker-compose.yml b/wazuh-agent/docker-compose.yml index 5fc80f2d..67142ad1 100644 --- a/wazuh-agent/docker-compose.yml +++ b/wazuh-agent/docker-compose.yml @@ -1,7 +1,7 @@ # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2) services: wazuh.agent: - image: wazuh/wazuh-agent:4.14.2-rc1 + image: wazuh/wazuh-agent:4.14.2 restart: always environment: - WAZUH_MANAGER_SERVER= From b3fde321bfcdacd88b0227566eada01cc3e19ccf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Tue, 16 Dec 2025 15:45:25 -0300 Subject: [PATCH 10/11] Agent group parameter added --- build-docker-images/wazuh-agent/Dockerfile | 3 ++- .../config/etc/cont-init.d/0-wazuh-init | 4 +++- docs/ref/configuration/environment-variables.md | 14 +++++++++----- wazuh-agent/config/wazuh-agent-conf | 3 ++- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/build-docker-images/wazuh-agent/Dockerfile b/build-docker-images/wazuh-agent/Dockerfile index 8a237787..242ca8a3 100644 --- a/build-docker-images/wazuh-agent/Dockerfile +++ b/build-docker-images/wazuh-agent/Dockerfile @@ -10,7 +10,8 @@ ARG WAZUH_MANAGER='CHANGE_MANAGER_IP' ARG WAZUH_MANAGER_PORT='CHANGE_MANAGER_PORT' ARG WAZUH_REGISTRATION_SERVER='CHANGE_ENROLL_IP' ARG WAZUH_REGISTRATION_PORT='CHANGE_ENROLL_PORT' -ARG WAZUH_AGENT_NAME='CHANGEE_AGENT_NAME' +ARG WAZUH_AGENT_NAME='CHANGE_AGENT_NAME' +ARG WAZUH_AGENT_GROUPS='CHANGE_AGENT_GROUPS' COPY config/check_repository.sh / diff --git a/build-docker-images/wazuh-agent/config/etc/cont-init.d/0-wazuh-init b/build-docker-images/wazuh-agent/config/etc/cont-init.d/0-wazuh-init index 2fcf4a88..a50b4662 100644 --- a/build-docker-images/wazuh-agent/config/etc/cont-init.d/0-wazuh-init +++ b/build-docker-images/wazuh-agent/config/etc/cont-init.d/0-wazuh-init @@ -9,6 +9,7 @@ WAZUH_REGISTRATION_SERVER=${WAZUH_REGISTRATION_SERVER:-$WAZUH_MANAGER_SERVER} WAZUH_REGISTRATION_PORT=${WAZUH_REGISTRATION_PORT:-"1515"} WAZUH_REGISTRATION_PASSWORD=$WAZUH_REGISTRATION_PASSWORD WAZUH_AGENT_NAME=${WAZUH_AGENT_NAME:-"wazuh-agent-$HOSTNAME"} +WAZUH_AGENT_GROUPS=${WAZUH_AGENT_GROUPS:-"default"} ############################################################################## # Aux functions @@ -66,7 +67,8 @@ set_manager_conn() { sed -i "s#CHANGE_MANAGER_PORT#$WAZUH_MANAGER_PORT#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf sed -i "s#CHANGE_ENROLL_IP#$WAZUH_REGISTRATION_SERVER#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf sed -i "s#CHANGE_ENROLL_PORT#$WAZUH_REGISTRATION_PORT#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf - sed -i "s#CHANGEE_AGENT_NAME#$WAZUH_AGENT_NAME#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf + sed -i "s#CHANGE_AGENT_NAME#$WAZUH_AGENT_NAME#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf + sed -i "s#CHANGE_AGENT_GROUPS#$WAZUH_AGENT_GROUPS#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf [ -n "$WAZUH_REGISTRATION_PASSWORD" ] && \ echo "$WAZUH_REGISTRATION_PASSWORD" > ${WAZUH_INSTALL_PATH}/etc/authd.pass && \ chown root:wazuh ${WAZUH_INSTALL_PATH}/etc/authd.pass && \ diff --git a/docs/ref/configuration/environment-variables.md b/docs/ref/configuration/environment-variables.md index 003ad165..eac90d9e 100644 --- a/docs/ref/configuration/environment-variables.md +++ b/docs/ref/configuration/environment-variables.md @@ -4,11 +4,14 @@ This document outlines the environment variables applicable to the Wazuh Docker ## Table of Contents -- [Wazuh Manager](#wazuh-manager) -- [Wazuh Indexer](#wazuh-indexer) -- [Wazuh Dashboard](#wazuh-dashboard) -- [Wazuh Agent](#wazuh-agent) -- [Overriding Configuration Files with Environment Variables](#overriding-configuration-files-with-environment-variables) +- [Environment Variables in Wazuh Docker Deployment](#environment-variables-in-wazuh-docker-deployment) + - [Table of Contents](#table-of-contents) + - [Wazuh Manager](#wazuh-manager) + - [Wazuh Indexer](#wazuh-indexer) + - [Wazuh Dashboard](#wazuh-dashboard) + - [Wazuh Agent](#wazuh-agent) + - [Overriding Configuration Files with Environment Variables](#overriding-configuration-files-with-environment-variables) + - [Examples:](#examples) --- @@ -88,6 +91,7 @@ environment: - WAZUH_REGISTRATION_SERVER=wazuh.manager - WAZUH_REGISTRATION_PORT=1515 - WAZUH_AGENT_NAME=my-agent + - WAZUH_AGENT_GROUPS=default - WAZUH_REGISTRATION_PASSWORD=StrongPassword ``` diff --git a/wazuh-agent/config/wazuh-agent-conf b/wazuh-agent/config/wazuh-agent-conf index 51fd9b0f..ad0d8ece 100644 --- a/wazuh-agent/config/wazuh-agent-conf +++ b/wazuh-agent/config/wazuh-agent-conf @@ -20,8 +20,9 @@ yes CHANGE_ENROLL_IP CHANGE_ENROLL_PORT - CHANGEE_AGENT_NAME + CHANGE_AGENT_NAME etc/authd.pass + CHANGE_AGENT_GROUPS From f7927bf2381ce156c7ad0898a333ea37e419bd43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Wed, 17 Dec 2025 16:13:13 -0300 Subject: [PATCH 11/11] Changelog update --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d3ab948..d002c91d 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 +- Agent group parameter added ([#2127](https://github.com/wazuh/wazuh-docker/pull/2127)) ### Fixed