From 7fe0c468e822d0c5889064e777b45b7d1057e7e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Anguita=20L=C3=B3pez?= Date: Tue, 19 May 2026 17:10:09 +0200 Subject: [PATCH 01/10] delete certs tests from goss.yaml --- .github/.goss.yaml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.github/.goss.yaml b/.github/.goss.yaml index 449f74a2..88b77ec7 100644 --- a/.github/.goss.yaml +++ b/.github/.goss.yaml @@ -34,20 +34,6 @@ file: group: wazuh filetype: file contains: [] - /var/ossec/etc/sslmanager.cert: - exists: true - mode: "0640" - owner: root - group: root - filetype: file - contains: [] - /var/ossec/etc/sslmanager.key: - exists: true - mode: "0640" - owner: root - group: root - filetype: file - contains: [] package: filebeat: installed: true From b07223d1d32740ea41c8d112f9335a83502af148 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Anguita=20L=C3=B3pez?= Date: Tue, 19 May 2026 17:10:56 +0200 Subject: [PATCH 02/10] change update_user used function from wazuh.security to wazuh.rbac.orm --- .../wazuh-manager/config/create_user.py | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/build-docker-images/wazuh-manager/config/create_user.py b/build-docker-images/wazuh-manager/config/create_user.py index 3bb6bb6c..45047c60 100644 --- a/build-docker-images/wazuh-manager/config/create_user.py +++ b/build-docker-images/wazuh-manager/config/create_user.py @@ -13,13 +13,12 @@ SPECIAL_CHARS = "@$!%*?&-_" try: - from wazuh.rbac.orm import check_database_integrity + from wazuh.rbac.orm import check_database_integrity, AuthenticationManager from wazuh.security import ( create_user, get_users, get_roles, set_user_role, - update_user, ) except ModuleNotFoundError as e: logging.error("No module 'wazuh' found.") @@ -54,12 +53,11 @@ def disable_user(uid): # assure there must be at least one character from each group random_pass = random_pass + ''.join([random.choice(chars) for chars in [string.ascii_lowercase, string.digits, string.ascii_uppercase, SPECIAL_CHARS]]) random_pass = ''.join(random.sample(random_pass,len(random_pass))) - update_user( - user_id=[ - str(uid), - ], - password=random_pass, - ) + with AuthenticationManager() as auth: + auth.update_user( + user_id=uid, + password=random_pass, + ) if __name__ == "__main__": @@ -90,12 +88,11 @@ if __name__ == "__main__": else: # modify an existing user ("wazuh" or "wazuh-wui") uid = initial_users[username] - update_user( - user_id=[ - str(uid), - ], - password=password, - ) + with AuthenticationManager() as auth: + auth.update_user( + user_id=uid, + password=password, + ) # disable unused default users for def_user in ['wazuh', 'wazuh-wui']: if def_user != username: From 61050a7dd2186f19dbb79f6eca508ea19cad97f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Anguita=20L=C3=B3pez?= Date: Tue, 19 May 2026 17:15:23 +0200 Subject: [PATCH 03/10] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0328f9ba..0bbfccf7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ All notable changes to this project will be documented in this file. ### Fixed +- Changed update_user function from wazuh.security to wazuh.rbac.orm module ([#2406](https://github.com/wazuh/wazuh-docker/pull/2406)) - GH issue notification fix ([#2312](https://github.com/wazuh/wazuh-docker/pull/2312)) ### Deleted From 9c9f1bccbcc2be659d4ef2400cf43c4be0744fff Mon Sep 17 00:00:00 2001 From: fcaffieri Date: Wed, 20 May 2026 17:32:06 -0300 Subject: [PATCH 04/10] Create WF into main branch --- .../workflows/check_integration_tools.yaml | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/workflows/check_integration_tools.yaml diff --git a/.github/workflows/check_integration_tools.yaml b/.github/workflows/check_integration_tools.yaml new file mode 100644 index 00000000..7db8ad7c --- /dev/null +++ b/.github/workflows/check_integration_tools.yaml @@ -0,0 +1,32 @@ +name: PR Check - Docker Integration Tests + +on: + workflow_dispatch: + inputs: + pr_head_ref: + description: 'Branch of wazuh-docker to test' + required: true + type: string + automation_reference: + description: 'Branch of wazuh-automation to use' + required: false + default: 'main' + type: string + deployment_type: + description: 'Deployment type to test' + required: true + type: choice + options: + - single-node + - multi-node + - both + +permissions: + id-token: write + contents: read + +jobs: + placeholder: + runs-on: ubuntu-latest + steps: + - run: echo "Workflow registered. Use workflow_dispatch selecting the feature branch." From 88ef9edf1970fff5c71ab83e25e8e74129d0b495 Mon Sep 17 00:00:00 2001 From: wazuhci <22834044+wazuhci@users.noreply.github.com> Date: Thu, 21 May 2026 10:08:36 +0000 Subject: [PATCH 05/10] feat: bump main --- .github/workflows/5_pr_check.yml | 2 +- .../workflows/Procedure_push_docker_images.yml | 8 ++++---- VERSION.json | 2 +- build-docker-images/build-images.sh | 8 ++++---- build-docker-images/docker-bake.hcl | 2 +- docs/dev/build-image.md | 2 +- docs/ref/upgrade.md | 18 +++++++++--------- multi-node/docker-compose.yml | 12 ++++++------ single-node/docker-compose.yml | 6 +++--- wazuh-agent/docker-compose.yml | 2 +- 10 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.github/workflows/5_pr_check.yml b/.github/workflows/5_pr_check.yml index b47934c3..1a13bda5 100644 --- a/.github/workflows/5_pr_check.yml +++ b/.github/workflows/5_pr_check.yml @@ -46,7 +46,7 @@ jobs: with: image_tag: ${{ needs.prepare-variables.outputs.WAZUH_IMAGE_VERSION }} docker_reference: ${{ github.head_ref || inputs.docker_reference }} - wazuh_automation_reference: 'main' + wazuh_automation_reference: 'v5.0.0-beta2' commit_list: '["latest", "latest", "latest", "latest"]' assistant_revision: 'latest' id: ${{ github.run_id }} diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index 9402ec82..314d6112 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -6,7 +6,7 @@ on: inputs: image_tag: description: 'Docker image tag' - default: '5.0.0' + default: 'v5.0.0-beta2' required: true docker_reference: description: 'wazuh-docker reference' @@ -14,7 +14,7 @@ on: wazuh_automation_reference: description: 'Branch or tag of the wazuh-automation repository' required: false - default: 'main' + default: 'v5.0.0-beta2' products: description: 'Comma-separated list of the image names to build and push' default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer,wazuh-agent' @@ -42,7 +42,7 @@ on: inputs: image_tag: description: 'Docker image tag' - default: '5.0.0' + default: 'v5.0.0-beta2' required: true type: string docker_reference: @@ -52,7 +52,7 @@ on: wazuh_automation_reference: description: 'Branch or tag of the wazuh-automation repository' required: false - default: 'main' + default: 'v5.0.0-beta2' type: string products: description: 'Comma-separated list of the image names to build and push' diff --git a/VERSION.json b/VERSION.json index 5dc2c235..58649f71 100644 --- a/VERSION.json +++ b/VERSION.json @@ -1,4 +1,4 @@ { "version": "5.0.0", - "stage": "beta1" + "stage": "beta2" } \ No newline at end of file diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index 965ca20a..629140cb 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -42,7 +42,7 @@ build() { WAZUH_MINOR_VERSION="${WAZUH_IMAGE_VERSION%.*}" # WAZUH_MAJOR_VERSION: Extracts major version only (e.g., 5.0.0 -> 5) WAZUH_MAJOR_VERSION="${WAZUH_IMAGE_VERSION%%.*}" - # WAZUH_STAGE: Extract the 'stage' (e.g., alpha0, beta1, rc2) from the local JSON metadata file. + # WAZUH_STAGE: Extract the 'stage' (e.g., alpha0, beta2, rc2) from the local JSON metadata file. # Note: This is primarily used for pre-release package naming. WAZUH_STAGE=$(jq -r '.stage' ../VERSION.json) # ARTIFACT_URLS_FILE: The name of the artifact URLs file. @@ -193,9 +193,9 @@ build() { # Generate per-component image tags. # The commit suffix is only appended when --dev is passed. This ensures: # dev=false, tag=5.0.0 → 5.0.0 - # dev=false, tag=5.0.0-beta1 → 5.0.0-beta1 + # dev=false, tag=5.0.0-beta2 → 5.0.0-beta2 # dev=true, tag=5.0.0 → 5.0.0-latest - # dev=true, tag=5.0.0-beta1 → 5.0.0-beta1-latest + # dev=true, tag=5.0.0-beta2 → 5.0.0-beta2-latest make_tag() { local commit=$1 if [ -n "${IS_DEV_BUILD}" ]; then @@ -248,7 +248,7 @@ help() { echo echo "Usage: $0 [OPTIONS]" echo - echo " -d, --dev-stage [Optional] Set the pre-release stage suffix (e.g. beta1, rc2). Not used by default." + echo " -d, --dev-stage [Optional] Set the pre-release stage suffix (e.g. beta2, rc2). Not used by default." echo " --dev [Optional] Mark as a development build: appends the commit ref to the image tag. Controlled by inputs.dev in the workflow." echo " -refs, --references [Optional] [Only with --dev] JSON array of commit refs for components (indexer, manager, dashboard, agent) in order. Defaults to 'latest'." echo " -rg, --registry [Optional] Set the Docker registry to push the images." diff --git a/build-docker-images/docker-bake.hcl b/build-docker-images/docker-bake.hcl index 73c041c7..7d417294 100644 --- a/build-docker-images/docker-bake.hcl +++ b/build-docker-images/docker-bake.hcl @@ -23,7 +23,7 @@ variable "MULTIARCH" { default = "" } # Per-component tags — all default to IMAGE_TAG. # In dev builds the shell script sets each one independently to append the -# per-component commit ref (e.g. MANAGER_TAG=5.0.0-beta1-abc1234). +# per-component commit ref (e.g. MANAGER_TAG=5.0.0-beta2-abc1234). variable "INDEXER_TAG" { default = IMAGE_TAG } variable "MANAGER_TAG" { default = IMAGE_TAG } variable "DASHBOARD_TAG" { default = IMAGE_TAG } diff --git a/docs/dev/build-image.md b/docs/dev/build-image.md index 2bc86b43..7d593bfc 100644 --- a/docs/dev/build-image.md +++ b/docs/dev/build-image.md @@ -29,7 +29,7 @@ To get all the available script options use the `-h` or `--help` option: Usage: build-images.sh [OPTIONS] - -d, --dev [Optional] Set the development stage you want to build, example rc2 or beta1, not used by default. + -d, --dev [Optional] Set the development stage you want to build, example rc2 or beta2, not used by default. -refs, --references [Optional] Set each Wazuh component reference to be build (indexer, manager, dasboard and agent). By default, using the latest release: ['latest', 'latest', 'latest', 'latest'] -rg, --registry [Optional] Set the Docker registry to push the images. -v, --version [Optional] Set the Wazuh version should be builded. By default, 5.0.0. diff --git a/docs/ref/upgrade.md b/docs/ref/upgrade.md index 7e15c983..06ad2fdb 100644 --- a/docs/ref/upgrade.md +++ b/docs/ref/upgrade.md @@ -24,15 +24,15 @@ Below is a step-by-step example of how to perform this update: ```yaml services: wazuh.manager: - image: wazuh/wazuh-manager:5.0.0 + image: wazuh/wazuh-manager:5.0.0-beta2 ... wazuh.indexer: - image: wazuh/wazuh-indexer:5.0.0 + image: wazuh/wazuh-indexer:5.0.0-beta2 ... wazuh.dashboard: - image: wazuh/wazuh-dashboard:5.0.0 + image: wazuh/wazuh-dashboard:5.0.0-beta2 ... ``` @@ -48,27 +48,27 @@ Below is a step-by-step example of how to perform this update: ```yaml services: wazuh.master: - image: wazuh/wazuh-manager:5.0.0 + image: wazuh/wazuh-manager:5.0.0-beta2 ... wazuh.worker: - image: wazuh/wazuh-manager:5.0.0 + image: wazuh/wazuh-manager:5.0.0-beta2 ... wazuh1.indexer: - image: wazuh/wazuh-indexer:5.0.0 + image: wazuh/wazuh-indexer:5.0.0-beta2 ... wazuh2.indexer: - image: wazuh/wazuh-indexer:5.0.0 + image: wazuh/wazuh-indexer:5.0.0-beta2 ... wazuh3.indexer: - image: wazuh/wazuh-indexer:5.0.0 + image: wazuh/wazuh-indexer:5.0.0-beta2 ... wazuh.dashboard: - image: wazuh/wazuh-dashboard:5.0.0 + image: wazuh/wazuh-dashboard:5.0.0-beta2 ... ``` diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index ddbca606..115bfbb6 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:5.0.0 + image: wazuh/wazuh-manager:5.0.0-beta2 hostname: wazuh.master container_name: multi-node-wazuh.master restart: always @@ -43,7 +43,7 @@ services: - ./config/wazuh_master/certs/wazuh.master-key.pem:/var/wazuh-manager/etc/certs/manager-key.pem wazuh.worker: - image: wazuh/wazuh-manager:5.0.0 + image: wazuh/wazuh-manager:5.0.0-beta2 hostname: wazuh.worker container_name: multi-node-wazuh.worker restart: always @@ -82,7 +82,7 @@ services: - ./config/wazuh_worker/certs/wazuh.worker-key.pem:/var/wazuh-manager/etc/certs/manager-key.pem wazuh1.indexer: - image: wazuh/wazuh-indexer:5.0.0 + image: wazuh/wazuh-indexer:5.0.0-beta2 hostname: wazuh1.indexer container_name: multi-node-wazuh1.indexer restart: always @@ -120,7 +120,7 @@ services: - ./config/wazuh1_indexer/certs/admin-key.pem:/usr/share/wazuh-indexer/config/certs/admin-key.pem wazuh2.indexer: - image: wazuh/wazuh-indexer:5.0.0 + image: wazuh/wazuh-indexer:5.0.0-beta2 hostname: wazuh2.indexer container_name: multi-node-wazuh2.indexer restart: always @@ -158,7 +158,7 @@ services: - ./config/wazuh2_indexer/certs/wazuh2.indexer.pem:/usr/share/wazuh-indexer/config/certs/indexer.pem wazuh3.indexer: - image: wazuh/wazuh-indexer:5.0.0 + image: wazuh/wazuh-indexer:5.0.0-beta2 hostname: wazuh3.indexer container_name: multi-node-wazuh3.indexer restart: always @@ -196,7 +196,7 @@ services: - ./config/wazuh3_indexer/certs/wazuh3.indexer.pem:/usr/share/wazuh-indexer/config/certs/indexer.pem wazuh.dashboard: - image: wazuh/wazuh-dashboard:5.0.0 + image: wazuh/wazuh-dashboard:5.0.0-beta2 hostname: wazuh.dashboard container_name: multi-node-wazuh.dashboard restart: always diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index b650d905..2d3c196a 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:5.0.0 + image: wazuh/wazuh-manager:5.0.0-beta2 hostname: wazuh.manager container_name: single-node-wazuh.manager restart: always @@ -43,7 +43,7 @@ services: - ./config/wazuh_manager/certs/wazuh.manager-key.pem:/var/wazuh-manager/etc/certs/manager-key.pem wazuh.indexer: - image: wazuh/wazuh-indexer:5.0.0 + image: wazuh/wazuh-indexer:5.0.0-beta2 hostname: wazuh.indexer container_name: single-node-wazuh.indexer restart: always @@ -80,7 +80,7 @@ services: - ./config/wazuh_indexer/certs/admin-key.pem:/usr/share/wazuh-indexer/config/certs/admin-key.pem wazuh.dashboard: - image: wazuh/wazuh-dashboard:5.0.0 + image: wazuh/wazuh-dashboard:5.0.0-beta2 hostname: wazuh.dashboard container_name: single-node-wazuh.dashboard restart: always diff --git a/wazuh-agent/docker-compose.yml b/wazuh-agent/docker-compose.yml index 842677e1..0e7d14b4 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:5.0.0 + image: wazuh/wazuh-agent:5.0.0-beta2 restart: always environment: - WAZUH_MANAGER_SERVER= From c2a385083b16caaa37b24e533466337c05c8a0da Mon Sep 17 00:00:00 2001 From: wazuhci <22834044+wazuhci@users.noreply.github.com> Date: Thu, 21 May 2026 14:26:35 +0000 Subject: [PATCH 06/10] feat: revert main references --- .github/workflows/5_pr_check.yml | 2 +- .../workflows/Procedure_push_docker_images.yml | 8 ++++---- build-docker-images/build-images.sh | 8 ++++---- build-docker-images/docker-bake.hcl | 2 +- docs/dev/build-image.md | 2 +- docs/ref/upgrade.md | 18 +++++++++--------- multi-node/docker-compose.yml | 12 ++++++------ single-node/docker-compose.yml | 6 +++--- wazuh-agent/docker-compose.yml | 2 +- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.github/workflows/5_pr_check.yml b/.github/workflows/5_pr_check.yml index 1a13bda5..b47934c3 100644 --- a/.github/workflows/5_pr_check.yml +++ b/.github/workflows/5_pr_check.yml @@ -46,7 +46,7 @@ jobs: with: image_tag: ${{ needs.prepare-variables.outputs.WAZUH_IMAGE_VERSION }} docker_reference: ${{ github.head_ref || inputs.docker_reference }} - wazuh_automation_reference: 'v5.0.0-beta2' + wazuh_automation_reference: 'main' commit_list: '["latest", "latest", "latest", "latest"]' assistant_revision: 'latest' id: ${{ github.run_id }} diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index 314d6112..9402ec82 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -6,7 +6,7 @@ on: inputs: image_tag: description: 'Docker image tag' - default: 'v5.0.0-beta2' + default: '5.0.0' required: true docker_reference: description: 'wazuh-docker reference' @@ -14,7 +14,7 @@ on: wazuh_automation_reference: description: 'Branch or tag of the wazuh-automation repository' required: false - default: 'v5.0.0-beta2' + default: 'main' products: description: 'Comma-separated list of the image names to build and push' default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer,wazuh-agent' @@ -42,7 +42,7 @@ on: inputs: image_tag: description: 'Docker image tag' - default: 'v5.0.0-beta2' + default: '5.0.0' required: true type: string docker_reference: @@ -52,7 +52,7 @@ on: wazuh_automation_reference: description: 'Branch or tag of the wazuh-automation repository' required: false - default: 'v5.0.0-beta2' + default: 'main' type: string products: description: 'Comma-separated list of the image names to build and push' diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index 629140cb..965ca20a 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -42,7 +42,7 @@ build() { WAZUH_MINOR_VERSION="${WAZUH_IMAGE_VERSION%.*}" # WAZUH_MAJOR_VERSION: Extracts major version only (e.g., 5.0.0 -> 5) WAZUH_MAJOR_VERSION="${WAZUH_IMAGE_VERSION%%.*}" - # WAZUH_STAGE: Extract the 'stage' (e.g., alpha0, beta2, rc2) from the local JSON metadata file. + # WAZUH_STAGE: Extract the 'stage' (e.g., alpha0, beta1, rc2) from the local JSON metadata file. # Note: This is primarily used for pre-release package naming. WAZUH_STAGE=$(jq -r '.stage' ../VERSION.json) # ARTIFACT_URLS_FILE: The name of the artifact URLs file. @@ -193,9 +193,9 @@ build() { # Generate per-component image tags. # The commit suffix is only appended when --dev is passed. This ensures: # dev=false, tag=5.0.0 → 5.0.0 - # dev=false, tag=5.0.0-beta2 → 5.0.0-beta2 + # dev=false, tag=5.0.0-beta1 → 5.0.0-beta1 # dev=true, tag=5.0.0 → 5.0.0-latest - # dev=true, tag=5.0.0-beta2 → 5.0.0-beta2-latest + # dev=true, tag=5.0.0-beta1 → 5.0.0-beta1-latest make_tag() { local commit=$1 if [ -n "${IS_DEV_BUILD}" ]; then @@ -248,7 +248,7 @@ help() { echo echo "Usage: $0 [OPTIONS]" echo - echo " -d, --dev-stage [Optional] Set the pre-release stage suffix (e.g. beta2, rc2). Not used by default." + echo " -d, --dev-stage [Optional] Set the pre-release stage suffix (e.g. beta1, rc2). Not used by default." echo " --dev [Optional] Mark as a development build: appends the commit ref to the image tag. Controlled by inputs.dev in the workflow." echo " -refs, --references [Optional] [Only with --dev] JSON array of commit refs for components (indexer, manager, dashboard, agent) in order. Defaults to 'latest'." echo " -rg, --registry [Optional] Set the Docker registry to push the images." diff --git a/build-docker-images/docker-bake.hcl b/build-docker-images/docker-bake.hcl index 7d417294..73c041c7 100644 --- a/build-docker-images/docker-bake.hcl +++ b/build-docker-images/docker-bake.hcl @@ -23,7 +23,7 @@ variable "MULTIARCH" { default = "" } # Per-component tags — all default to IMAGE_TAG. # In dev builds the shell script sets each one independently to append the -# per-component commit ref (e.g. MANAGER_TAG=5.0.0-beta2-abc1234). +# per-component commit ref (e.g. MANAGER_TAG=5.0.0-beta1-abc1234). variable "INDEXER_TAG" { default = IMAGE_TAG } variable "MANAGER_TAG" { default = IMAGE_TAG } variable "DASHBOARD_TAG" { default = IMAGE_TAG } diff --git a/docs/dev/build-image.md b/docs/dev/build-image.md index 7d593bfc..2bc86b43 100644 --- a/docs/dev/build-image.md +++ b/docs/dev/build-image.md @@ -29,7 +29,7 @@ To get all the available script options use the `-h` or `--help` option: Usage: build-images.sh [OPTIONS] - -d, --dev [Optional] Set the development stage you want to build, example rc2 or beta2, not used by default. + -d, --dev [Optional] Set the development stage you want to build, example rc2 or beta1, not used by default. -refs, --references [Optional] Set each Wazuh component reference to be build (indexer, manager, dasboard and agent). By default, using the latest release: ['latest', 'latest', 'latest', 'latest'] -rg, --registry [Optional] Set the Docker registry to push the images. -v, --version [Optional] Set the Wazuh version should be builded. By default, 5.0.0. diff --git a/docs/ref/upgrade.md b/docs/ref/upgrade.md index 06ad2fdb..7e15c983 100644 --- a/docs/ref/upgrade.md +++ b/docs/ref/upgrade.md @@ -24,15 +24,15 @@ Below is a step-by-step example of how to perform this update: ```yaml services: wazuh.manager: - image: wazuh/wazuh-manager:5.0.0-beta2 + image: wazuh/wazuh-manager:5.0.0 ... wazuh.indexer: - image: wazuh/wazuh-indexer:5.0.0-beta2 + image: wazuh/wazuh-indexer:5.0.0 ... wazuh.dashboard: - image: wazuh/wazuh-dashboard:5.0.0-beta2 + image: wazuh/wazuh-dashboard:5.0.0 ... ``` @@ -48,27 +48,27 @@ Below is a step-by-step example of how to perform this update: ```yaml services: wazuh.master: - image: wazuh/wazuh-manager:5.0.0-beta2 + image: wazuh/wazuh-manager:5.0.0 ... wazuh.worker: - image: wazuh/wazuh-manager:5.0.0-beta2 + image: wazuh/wazuh-manager:5.0.0 ... wazuh1.indexer: - image: wazuh/wazuh-indexer:5.0.0-beta2 + image: wazuh/wazuh-indexer:5.0.0 ... wazuh2.indexer: - image: wazuh/wazuh-indexer:5.0.0-beta2 + image: wazuh/wazuh-indexer:5.0.0 ... wazuh3.indexer: - image: wazuh/wazuh-indexer:5.0.0-beta2 + image: wazuh/wazuh-indexer:5.0.0 ... wazuh.dashboard: - image: wazuh/wazuh-dashboard:5.0.0-beta2 + image: wazuh/wazuh-dashboard:5.0.0 ... ``` diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index 115bfbb6..ddbca606 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:5.0.0-beta2 + image: wazuh/wazuh-manager:5.0.0 hostname: wazuh.master container_name: multi-node-wazuh.master restart: always @@ -43,7 +43,7 @@ services: - ./config/wazuh_master/certs/wazuh.master-key.pem:/var/wazuh-manager/etc/certs/manager-key.pem wazuh.worker: - image: wazuh/wazuh-manager:5.0.0-beta2 + image: wazuh/wazuh-manager:5.0.0 hostname: wazuh.worker container_name: multi-node-wazuh.worker restart: always @@ -82,7 +82,7 @@ services: - ./config/wazuh_worker/certs/wazuh.worker-key.pem:/var/wazuh-manager/etc/certs/manager-key.pem wazuh1.indexer: - image: wazuh/wazuh-indexer:5.0.0-beta2 + image: wazuh/wazuh-indexer:5.0.0 hostname: wazuh1.indexer container_name: multi-node-wazuh1.indexer restart: always @@ -120,7 +120,7 @@ services: - ./config/wazuh1_indexer/certs/admin-key.pem:/usr/share/wazuh-indexer/config/certs/admin-key.pem wazuh2.indexer: - image: wazuh/wazuh-indexer:5.0.0-beta2 + image: wazuh/wazuh-indexer:5.0.0 hostname: wazuh2.indexer container_name: multi-node-wazuh2.indexer restart: always @@ -158,7 +158,7 @@ services: - ./config/wazuh2_indexer/certs/wazuh2.indexer.pem:/usr/share/wazuh-indexer/config/certs/indexer.pem wazuh3.indexer: - image: wazuh/wazuh-indexer:5.0.0-beta2 + image: wazuh/wazuh-indexer:5.0.0 hostname: wazuh3.indexer container_name: multi-node-wazuh3.indexer restart: always @@ -196,7 +196,7 @@ services: - ./config/wazuh3_indexer/certs/wazuh3.indexer.pem:/usr/share/wazuh-indexer/config/certs/indexer.pem wazuh.dashboard: - image: wazuh/wazuh-dashboard:5.0.0-beta2 + image: wazuh/wazuh-dashboard:5.0.0 hostname: wazuh.dashboard container_name: multi-node-wazuh.dashboard restart: always diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 2d3c196a..b650d905 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:5.0.0-beta2 + image: wazuh/wazuh-manager:5.0.0 hostname: wazuh.manager container_name: single-node-wazuh.manager restart: always @@ -43,7 +43,7 @@ services: - ./config/wazuh_manager/certs/wazuh.manager-key.pem:/var/wazuh-manager/etc/certs/manager-key.pem wazuh.indexer: - image: wazuh/wazuh-indexer:5.0.0-beta2 + image: wazuh/wazuh-indexer:5.0.0 hostname: wazuh.indexer container_name: single-node-wazuh.indexer restart: always @@ -80,7 +80,7 @@ services: - ./config/wazuh_indexer/certs/admin-key.pem:/usr/share/wazuh-indexer/config/certs/admin-key.pem wazuh.dashboard: - image: wazuh/wazuh-dashboard:5.0.0-beta2 + image: wazuh/wazuh-dashboard:5.0.0 hostname: wazuh.dashboard container_name: single-node-wazuh.dashboard restart: always diff --git a/wazuh-agent/docker-compose.yml b/wazuh-agent/docker-compose.yml index 0e7d14b4..842677e1 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:5.0.0-beta2 + image: wazuh/wazuh-agent:5.0.0 restart: always environment: - WAZUH_MANAGER_SERVER= From d60510a2acb7145da04a3a0dfccdf745a226f3f0 Mon Sep 17 00:00:00 2001 From: wazuhci <22834044+wazuhci@users.noreply.github.com> Date: Thu, 21 May 2026 17:14:13 +0000 Subject: [PATCH 07/10] feat: bump 4.14.7 --- .env | 6 +++--- .github/.goss.yaml | 2 +- .../workflows/Procedure_push_docker_images.yml | 4 ++-- CHANGELOG.md | 18 ++++++++++++++++++ README.md | 2 +- VERSION.json | 2 +- build-docker-images/README.md | 4 ++-- build-docker-images/build-images.sh | 4 ++-- docs/dev/build-image.md | 4 ++-- docs/dev/introduction.md | 2 +- docs/dev/setup.md | 6 +++--- docs/ref/Introduction/description.md | 6 +++--- docs/ref/Introduction/introduction.md | 4 ++-- docs/ref/configuration/configuration-files.md | 2 +- docs/ref/configuration/configuration.md | 2 +- .../getting-started/deployment/deployment.md | 6 +++--- docs/ref/getting-started/getting-started.md | 6 +++--- docs/ref/getting-started/requirements.md | 2 +- docs/ref/glossary.md | 6 +++--- multi-node/docker-compose.yml | 12 ++++++------ single-node/docker-compose.yml | 6 +++--- wazuh-agent/docker-compose.yml | 2 +- 22 files changed, 63 insertions(+), 45 deletions(-) diff --git a/.env b/.env index 1dc5ced8..680106f1 100755 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ -WAZUH_VERSION=4.14.6 -WAZUH_IMAGE_VERSION=4.14.6 +WAZUH_VERSION=4.14.7 +WAZUH_IMAGE_VERSION=4.14.7 WAZUH_TAG_REVISION=1 -FILEBEAT_TEMPLATE_BRANCH=4.14.6 +FILEBEAT_TEMPLATE_BRANCH=4.14.7 WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.5.tar.gz WAZUH_UI_REVISION=1 diff --git a/.github/.goss.yaml b/.github/.goss.yaml index 88b77ec7..a00299f4 100644 --- a/.github/.goss.yaml +++ b/.github/.goss.yaml @@ -42,7 +42,7 @@ package: wazuh-manager: installed: true versions: - - 4.14.6 + - 4.14.7 port: tcp:1514: listening: true diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index e5b1409e..3dc541f2 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -6,7 +6,7 @@ on: inputs: image_tag: description: 'Docker image tag' - default: '4.14.6' + default: '4.14.7' required: true docker_reference: description: 'wazuh-docker reference' @@ -38,7 +38,7 @@ on: inputs: image_tag: description: 'Docker image tag' - default: '4.14.6' + default: '4.14.7' required: true type: string docker_reference: diff --git a/CHANGELOG.md b/CHANGELOG.md index 0bbfccf7..34ca0779 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.14.7] + +### Added + +- None + +### Changed + +- None + +### Fixed + +- None + +### Deleted + +- None + ## [4.14.6] ### Added diff --git a/README.md b/README.md index 59721123..a4c2fdaa 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ The `wazuh/wazuh-docker` repository provides resources to deploy the Wazuh cyber ## Branch Convention - `main`: Developing and testing of new features. -- `X.Y.Z`: Version-specific branches (e.g., `4.14.6`, `4.13.0`, etc.). +- `X.Y.Z`: Version-specific branches (e.g., `4.14.7`, `4.13.0`, etc.). ## Documentation diff --git a/VERSION.json b/VERSION.json index 5d98cea4..3b820185 100644 --- a/VERSION.json +++ b/VERSION.json @@ -1,4 +1,4 @@ { - "version": "4.14.6", + "version": "4.14.7", "stage": "alpha0" } diff --git a/build-docker-images/README.md b/build-docker-images/README.md index 19d7ad49..51659a0a 100644 --- a/build-docker-images/README.md +++ b/build-docker-images/README.md @@ -19,7 +19,7 @@ Then execute: The script also allows to build images from other versions of Wazuh by using the `-v` or `--version` argument: ```bash -./build-images.sh -v 4.14.6 +./build-images.sh -v 4.14.7 ``` To get all the available script options use the -h or --help option: @@ -33,7 +33,7 @@ Usage: ./build-images.sh [OPTIONS] -f, --filebeat-module [Optional] Set Filebeat module version. By default 0.5. -r, --revision [Optional] Package revision. By default 1 -rg, --registry [Optional] Set the Docker registry to push the images. - -v, --version [Optional] Set the Wazuh version should be builded. By default, 4.14.6. + -v, --version [Optional] Set the Wazuh version should be builded. By default, 4.14.7. -m, --multiarch [Optional] Enable multi-architecture builds. -h, --help Show this help. diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index d555ce59..e6fca7da 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -8,11 +8,11 @@ # License (version 2) as published by the FSF - Free Software # Foundation. -IMAGE_TAG=4.14.6 +IMAGE_TAG=4.14.7 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') WAZUH_REGISTRY=docker.io -WAZUH_IMAGE_VERSION="4.14.6" +WAZUH_IMAGE_VERSION="4.14.7" WAZUH_TAG_REVISION="1" WAZUH_DEV_STAGE="" FILEBEAT_MODULE_VERSION="0.5" diff --git a/docs/dev/build-image.md b/docs/dev/build-image.md index aadb05c6..2a6998ac 100644 --- a/docs/dev/build-image.md +++ b/docs/dev/build-image.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.14.6 +$ build-docker-images/build-images.sh -v 4.14.7 ``` 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 rc4 or beta1, not used by default. -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.6. + -v, --version [Optional] Set the Wazuh version should be builded. By default, 4.14.7. -h, --help Show this help. ``` \ No newline at end of file diff --git a/docs/dev/introduction.md b/docs/dev/introduction.md index 6435a52a..03bf7bb0 100644 --- a/docs/dev/introduction.md +++ b/docs/dev/introduction.md @@ -1,6 +1,6 @@ # Development Guide - Introduction -Welcome to the Development Guide for Wazuh-docker version 4.14.6. This guide is intended for developers, contributors, and advanced users who wish to understand the development aspects of the Wazuh-Docker project, build custom Docker images, or contribute to its development. +Welcome to the Development Guide for Wazuh-docker version 4.14.7. This guide is intended for developers, contributors, and advanced users who wish to understand the development aspects of the Wazuh-Docker project, build custom Docker images, or contribute to its development. ## Purpose of This Guide diff --git a/docs/dev/setup.md b/docs/dev/setup.md index 30aeda7c..1875ac52 100644 --- a/docs/dev/setup.md +++ b/docs/dev/setup.md @@ -1,6 +1,6 @@ # Development Guide - Setup Environment -This section outlines the steps required to set up your local development environment for working with the Wazuh-Docker project (version 4.14.6). A proper setup is crucial for building images, running tests, and contributing effectively. +This section outlines the steps required to set up your local development environment for working with the Wazuh-Docker project (version 4.14.7). A proper setup is crucial for building images, running tests, and contributing effectively. ## Prerequisites @@ -26,12 +26,12 @@ Before you begin, ensure your system meets the following requirements: Follow these steps to prepare your development environment: 1. **Clone the Repository**: - Clone the `wazuh-docker` repository from GitHub. It's important to check out the specific branch you intend to work with, in this case, `4.14.6`. + Clone the `wazuh-docker` repository from GitHub. It's important to check out the specific branch you intend to work with, in this case, `4.14.7`. ```bash git clone [https://github.com/wazuh/wazuh-docker.git](https://github.com/wazuh/wazuh-docker.git) cd wazuh-docker - git checkout v4.14.6 + git checkout v4.14.7 ``` 2. **Verify Docker Installation**: diff --git a/docs/ref/Introduction/description.md b/docs/ref/Introduction/description.md index 4cd1e291..ee14fa1c 100644 --- a/docs/ref/Introduction/description.md +++ b/docs/ref/Introduction/description.md @@ -1,6 +1,6 @@ # Reference Manual - Description -This section provides a detailed description of Wazuh-docker (version 4.14.6), its components, and its architecture when deployed using Docker containers. Understanding these aspects is key to effectively deploying and managing your Wazuh environment. +This section provides a detailed description of Wazuh-docker (version 4.14.7), its components, and its architecture when deployed using Docker containers. Understanding these aspects is key to effectively deploying and managing your Wazuh environment. ## What is Wazuh? @@ -18,7 +18,7 @@ Wazuh-docker is a project that provides Docker images and `docker compose` confi ## Core Components in Wazuh-Docker -The Wazuh-Docker project typically provides images for the following core Wazuh components, adapted for version 4.14.6: +The Wazuh-Docker project typically provides images for the following core Wazuh components, adapted for version 4.14.7: 1. **Wazuh Manager**: - The central component that collects and analyzes data from deployed Wazuh agents. @@ -28,7 +28,7 @@ The Wazuh-Docker project typically provides images for the following core Wazuh 2. **Wazuh Indexer**: - A highly scalable, full-text search and analytics engine. - Based on OpenSearch (or historically Elasticsearch), it stores and indexes alerts and monitoring data generated by the Wazuh manager. - - The Wazuh indexer container provides the data persistence layer for Wazuh alerts and events. For version 4.14.6, this is typically an OpenSearch-based component. + - The Wazuh indexer container provides the data persistence layer for Wazuh alerts and events. For version 4.14.7, this is typically an OpenSearch-based component. 3. **Wazuh Dashboard**: - A flexible visualization tool based on OpenSearch Dashboards (or historically Kibana). diff --git a/docs/ref/Introduction/introduction.md b/docs/ref/Introduction/introduction.md index 39316a7f..65f09a77 100644 --- a/docs/ref/Introduction/introduction.md +++ b/docs/ref/Introduction/introduction.md @@ -1,6 +1,6 @@ # Reference Manual - Introduction -Welcome to the Reference Manual for Wazuh-Docker, version 4.14.6. This manual provides comprehensive information about deploying, configuring, and managing your Wazuh environment using Docker. +Welcome to the Reference Manual for Wazuh-Docker, version 4.14.7. This manual provides comprehensive information about deploying, configuring, and managing your Wazuh environment using Docker. ## Purpose of This Manual @@ -44,4 +44,4 @@ This manual is structured to help you find information efficiently: - If you need to customize your deployment, refer to the [Configuration](configuration/configuration.md) section. - For specific terms or concepts, consult the [Glossary](glossary.md). -This manual refers to version 4.14.6 of Wazuh-Docker. Ensure you are using the documentation that corresponds to your deployed version. +This manual refers to version 4.14.7 of Wazuh-Docker. Ensure you are using the documentation that corresponds to your deployed version. diff --git a/docs/ref/configuration/configuration-files.md b/docs/ref/configuration/configuration-files.md index d12aa726..11b8464c 100644 --- a/docs/ref/configuration/configuration-files.md +++ b/docs/ref/configuration/configuration-files.md @@ -29,4 +29,4 @@ ``` -Consult the official Wazuh documentation for version 4.14.6 for detailed information on all possible configuration parameters for each component. +Consult the official Wazuh documentation for version 4.14.7 for detailed information on all possible configuration parameters for each component. diff --git a/docs/ref/configuration/configuration.md b/docs/ref/configuration/configuration.md index 7d8b3df3..126fe672 100644 --- a/docs/ref/configuration/configuration.md +++ b/docs/ref/configuration/configuration.md @@ -1,6 +1,6 @@ # Reference Manual - Configuration -This section details how to configure your Wazuh-Docker deployment (version 4.14.6). Proper configuration is key to tailoring the Wazuh stack to your specific needs, managing data persistence, and integrating with your environment. +This section details how to configure your Wazuh-Docker deployment (version 4.14.7). Proper configuration is key to tailoring the Wazuh stack to your specific needs, managing data persistence, and integrating with your environment. ## Overview of Configuration Methods diff --git a/docs/ref/getting-started/deployment/deployment.md b/docs/ref/getting-started/deployment/deployment.md index 74524b0a..744c07ce 100644 --- a/docs/ref/getting-started/deployment/deployment.md +++ b/docs/ref/getting-started/deployment/deployment.md @@ -1,6 +1,6 @@ # Reference Manual - Deployment -This section provides detailed instructions for deploying Wazuh-Docker (version 4.14.6) in various configurations. Choose the deployment model that best suits your needs, from simple single-node setups for testing to more robust multi-node configurations for production environments. +This section provides detailed instructions for deploying Wazuh-Docker (version 4.14.7) in various configurations. Choose the deployment model that best suits your needs, from simple single-node setups for testing to more robust multi-node configurations for production environments. ## Overview of Deployment Options @@ -24,11 +24,11 @@ Ensure you have: - Met all the [System Requirements](ref/getting-started/requirements.md). - Installed Docker and Docker Compose on your host(s). -- Cloned the `wazuh-docker` repository (version `4.14.6`) or downloaded the necessary deployment files. +- Cloned the `wazuh-docker` repository (version `4.14.7`) or downloaded the necessary deployment files. ```bash git clone [https://github.com/wazuh/wazuh-docker.git](https://github.com/wazuh/wazuh-docker.git) cd wazuh-docker - git checkout v4.14.6 + git checkout v4.14.7 ``` - Made a backup of any existing Wazuh data if you are migrating or upgrading. diff --git a/docs/ref/getting-started/getting-started.md b/docs/ref/getting-started/getting-started.md index 542d413d..a1b41a89 100644 --- a/docs/ref/getting-started/getting-started.md +++ b/docs/ref/getting-started/getting-started.md @@ -1,6 +1,6 @@ # Reference Manual - Getting Started -This section guides you through the initial steps to get your Wazuh-docker (version 4.14.6) environment up and running. We will cover the prerequisites and point you to the deployment instructions. +This section guides you through the initial steps to get your Wazuh-docker (version 4.14.7) environment up and running. We will cover the prerequisites and point you to the deployment instructions. ## Overview @@ -27,11 +27,11 @@ Before diving into the deployment, please ensure you have reviewed: Verify that your host system has sufficient RAM, CPU, and disk space. Ensure Docker and Docker Compose are installed and functioning correctly. 2. **Obtain Wazuh-docker Configuration**: - You'll need the Docker Compose files and any associated configuration files from the `wazuh-docker` repository for version 4.14.6. + You'll need the Docker Compose files and any associated configuration files from the `wazuh-docker` repository for version 4.14.7. ```bash git clone [https://github.com/wazuh/wazuh-docker.git](https://github.com/wazuh/wazuh-docker.git) cd wazuh-docker - git checkout v4.14.6 + git checkout v4.14.7 # Navigate to the specific docker-compose directory, e.g., single-node or multi-node # cd docker-compose/single-node/ (example path) ``` diff --git a/docs/ref/getting-started/requirements.md b/docs/ref/getting-started/requirements.md index eb3c40ad..8bc1f463 100644 --- a/docs/ref/getting-started/requirements.md +++ b/docs/ref/getting-started/requirements.md @@ -1,6 +1,6 @@ # Reference Manual - Requirements -Before deploying Wazuh-Docker (version 4.14.6), it's essential to ensure your environment meets the necessary hardware and software requirements. Meeting these prerequisites will help ensure a stable and performant Wazuh deployment. +Before deploying Wazuh-Docker (version 4.14.7), it's essential to ensure your environment meets the necessary hardware and software requirements. Meeting these prerequisites will help ensure a stable and performant Wazuh deployment. ## Host System Requirements diff --git a/docs/ref/glossary.md b/docs/ref/glossary.md index d44d33ba..877894da 100644 --- a/docs/ref/glossary.md +++ b/docs/ref/glossary.md @@ -1,6 +1,6 @@ # Reference Manual - Glossary -This glossary defines key terms and concepts related to Wazuh, Docker, and their use together in the Wazuh-Docker project (version 4.14.6). +This glossary defines key terms and concepts related to Wazuh, Docker, and their use together in the Wazuh-Docker project (version 4.14.7). --- @@ -22,7 +22,7 @@ This glossary defines key terms and concepts related to Wazuh, Docker, and their **D** -- **Dashboard (Wazuh Dashboard / OpenSearch Dashboards / Kibana)**: A web-based visualization tool used to explore, analyze, and visualize data stored in the Wazuh Indexer. It provides dashboards, visualizations, and a query interface for security events and alerts. For Wazuh 4.14.6, this is typically OpenSearch Dashboards. +- **Dashboard (Wazuh Dashboard / OpenSearch Dashboards / Kibana)**: A web-based visualization tool used to explore, analyze, and visualize data stored in the Wazuh Indexer. It provides dashboards, visualizations, and a query interface for security events and alerts. For Wazuh 4.14.7, this is typically OpenSearch Dashboards. - **Decoder**: A component in the Wazuh Manager that parses and extracts relevant information (fields) from raw log messages or event data. - **Docker**: An open platform for developing, shipping, and running applications inside containers. - **Docker Compose**: A tool for defining and running multi-container Docker applications. It uses a YAML file (`docker-compose.yml`) to configure the application's services, networks, and volumes. @@ -42,7 +42,7 @@ This glossary defines key terms and concepts related to Wazuh, Docker, and their **I** -- **Indexer (Wazuh Indexer / OpenSearch / Elasticsearch)**: The component responsible for storing, indexing, and making searchable the alerts and event data generated by the Wazuh Manager. For Wazuh 4.14.6, this is typically OpenSearch. +- **Indexer (Wazuh Indexer / OpenSearch / Elasticsearch)**: The component responsible for storing, indexing, and making searchable the alerts and event data generated by the Wazuh Manager. For Wazuh 4.14.7, this is typically OpenSearch. **L** diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index d291b6aa..ace50751 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.6 + image: wazuh/wazuh-manager:4.14.7 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.6 + image: wazuh/wazuh-manager:4.14.7 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.6 + image: wazuh/wazuh-indexer:4.14.7 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.6 + image: wazuh/wazuh-indexer:4.14.7 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.6 + image: wazuh/wazuh-indexer:4.14.7 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.6 + image: wazuh/wazuh-dashboard:4.14.7 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 185a5634..5f1a7b07 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.6 + image: wazuh/wazuh-manager:4.14.7 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.6 + image: wazuh/wazuh-indexer:4.14.7 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.6 + image: wazuh/wazuh-dashboard:4.14.7 hostname: wazuh.dashboard restart: always ports: diff --git a/wazuh-agent/docker-compose.yml b/wazuh-agent/docker-compose.yml index 5035072d..e5785236 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.6 + image: wazuh/wazuh-agent:4.14.7 restart: always environment: - WAZUH_MANAGER_SERVER= From 3b3ad413149b553aefe327bbbda9fcb8faad5a38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Fri, 22 May 2026 09:58:57 -0300 Subject: [PATCH 08/10] Changelog fix --- CHANGELOG.md | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4e1e12c..c63337c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -67,6 +67,24 @@ All notable changes to this project will be documented in this file. - None +## [4.14.7] + +### Added + +- None + +### Changed + +- None + +### Fixed + +- None + +### Deleted + +- None + ## [4.14.6] ### Added @@ -332,24 +350,6 @@ All notable changes to this project will be documented in this file. - None -## [4.14.7] - -### Added - -- None - -### Changed - -- None - -### Fixed - -- None - -### Deleted - -- None - ## [4.10.1] ### Added From 3f16c3b9b974f008027f21b0a526a731e34b0a7f Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Wed, 27 May 2026 01:41:44 +0700 Subject: [PATCH 09/10] Change Wazuh manager healthcheck --- multi-node/docker-compose.yml | 11 ++++++----- single-node/docker-compose.yml | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index ddbca606..4fa8d8bf 100644 --- a/multi-node/docker-compose.yml +++ b/multi-node/docker-compose.yml @@ -9,10 +9,11 @@ services: wazuh1.indexer: condition: service_healthy healthcheck: - test: [ "CMD-SHELL", "curl -k -s -o /dev/null https://localhost:55000 || exit 1" ] + test: [ "CMD-SHELL", "/var/wazuh-manager/bin/wazuh-manager-control status 2>/dev/null | grep -q 'not running' && exit 1 || exit 0" ] interval: 15s timeout: 5s retries: 5 + start_period: 60s ulimits: memlock: soft: -1 @@ -48,11 +49,11 @@ services: container_name: multi-node-wazuh.worker restart: always healthcheck: - test: [ "CMD-SHELL", "timeout 2 bash -c '/dev/null | grep -v apid | grep -q 'not running' && exit 1 || exit 0" ] + interval: 15s timeout: 5s - retries: 10 - start_period: 30s + retries: 5 + start_period: 60s ulimits: memlock: soft: -1 diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index b650d905..042162cb 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -9,10 +9,11 @@ services: wazuh.indexer: condition: service_healthy healthcheck: - test: [ "CMD-SHELL", "curl -k -s -o /dev/null https://localhost:55000 || exit 1" ] + test: [ "CMD-SHELL", "/var/wazuh-manager/bin/wazuh-manager-control status 2>/dev/null | grep -q 'not running' && exit 1 || exit 0" ] interval: 15s timeout: 5s retries: 5 + start_period: 60s ulimits: memlock: soft: -1 From b34ab60fdb55666fda6f711d0fa381e948756db1 Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Wed, 27 May 2026 22:43:06 +0700 Subject: [PATCH 10/10] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c63337c4..53b7f97c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -55,6 +55,7 @@ All notable changes to this project will be documented in this file. ### Fixed +- Adapt Wazuh manager healthcheck with local binaries ([#2422](https://github.com/wazuh/wazuh-docker/pull/2422)) - Delete setcap command on deprecated file ([#2345](https://github.com/wazuh/wazuh-docker/pull/2345)) - Modify the choice of a correct tag ([#2313](https://github.com/wazuh/wazuh-docker/pull/2313)) - Artifact URL download fix ([#2306](https://github.com/wazuh/wazuh-docker/pull/2306))