From 523fbd1ac3d31dbed8ed78fb84eef8c3866d1bf2 Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Thu, 26 Mar 2026 02:40:36 +0700 Subject: [PATCH 1/5] modify env to vars variable type --- .github/workflows/5_pr_check.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/5_pr_check.yml b/.github/workflows/5_pr_check.yml index 37a41a82..045434b3 100644 --- a/.github/workflows/5_pr_check.yml +++ b/.github/workflows/5_pr_check.yml @@ -124,7 +124,7 @@ jobs: - name: Add environment variables into GITHUB_ENV run: | # Export variables to the environment - awk -F':' '!/^#/ && NF>1 {name=$1; val=substr($0,length(name)+3); gsub(/[-.]/,"_",name); print name "=" val}' ${{ env.ARTIFACT_URL_FILE_NAME }} >> "$GITHUB_ENV" + awk -F':' '!/^#/ && NF>1 {name=$1; val=substr($0,length(name)+3); gsub(/[-.]/,"_",name); print name "=" val}' ${{ vars.ARTIFACT_URL_FILE_NAME }} >> "$GITHUB_ENV" working-directory: ./single-node/ - name: Create single node certficates @@ -397,7 +397,7 @@ jobs: - name: Add environment variables into GITHUB_ENV run: | # Export variables to the environment - awk -F':' '!/^#/ && NF>1 {name=$1; val=substr($0,length(name)+3); gsub(/[-.]/,"_",name); print name "=" val}' ${{ env.ARTIFACT_URL_FILE_NAME }} >> "$GITHUB_ENV" + awk -F':' '!/^#/ && NF>1 {name=$1; val=substr($0,length(name)+3); gsub(/[-.]/,"_",name); print name "=" val}' ${{ vars.ARTIFACT_URL_FILE_NAME }} >> "$GITHUB_ENV" working-directory: ./multi-node/ - name: Create multi node certficates From a8e5e463528fbfa0b6ab0e24478883d4deb22a1d Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Thu, 26 Mar 2026 19:47:38 +0700 Subject: [PATCH 2/5] Fix Wazuh manager healthcheck --- multi-node/docker-compose.yml | 2 +- single-node/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index 33773b07..f7bba2ea 100644 --- a/multi-node/docker-compose.yml +++ b/multi-node/docker-compose.yml @@ -9,7 +9,7 @@ services: wazuh1.indexer: condition: service_healthy healthcheck: - test: [ "CMD-SHELL", "curl -s -k -f -I -u $$API_USERNAME:$$API_PASSWORD https://localhost:55000/security/user/authenticate > /dev/null || exit 1" ] + test: [ "CMD-SHELL", "curl -u $$API_USERNAME:$$API_PASSWORD -k -s -X POST https://localhost:55000/security/user/authenticate?raw=true >> /dev/null || exit 1" ] interval: 15s timeout: 5s retries: 5 diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 02dbbb7e..71ac6157 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -9,7 +9,7 @@ services: wazuh.indexer: condition: service_healthy healthcheck: - test: [ "CMD-SHELL", "curl -s -k -f -I -u $$API_USERNAME:$$API_PASSWORD https://localhost:55000/security/user/authenticate > /dev/null || exit 1" ] + test: [ "CMD-SHELL", "curl -u $$API_USERNAME:$$API_PASSWORD -k -s -X POST https://localhost:55000/security/user/authenticate?raw=true >> /dev/null|| exit 1" ] interval: 15s timeout: 5s retries: 5 From 39fa6cabbdf4b9d7f58a2dae8b997f3a21095190 Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Thu, 26 Mar 2026 19:54:59 +0700 Subject: [PATCH 3/5] Add changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 92cb0a22..4ae02ff4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,6 +42,7 @@ All notable changes to this project will be documented in this file. ### Fixed +- Change Wazuh manager Healthcheck. ([#2272](https://github.com/wazuh/wazuh-docker/pull/2272)) - Delete WAZUH_AGENT_GROUP variable. ([#2263](https://github.com/wazuh/wazuh-docker/pull/2263)) - Delete etc/lists references ([#2129](https://github.com/wazuh/wazuh-docker/pull/2129)) From 1a6d97c01b2c08751e09827f9d06765d406d7164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= <33964202+teddytpc1@users.noreply.github.com> Date: Thu, 26 Mar 2026 10:23:59 -0300 Subject: [PATCH 4/5] Apply suggestions from code review Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- multi-node/docker-compose.yml | 2 +- single-node/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index f7bba2ea..65dec154 100644 --- a/multi-node/docker-compose.yml +++ b/multi-node/docker-compose.yml @@ -9,7 +9,7 @@ services: wazuh1.indexer: condition: service_healthy healthcheck: - test: [ "CMD-SHELL", "curl -u $$API_USERNAME:$$API_PASSWORD -k -s -X POST https://localhost:55000/security/user/authenticate?raw=true >> /dev/null || exit 1" ] + test: [ "CMD-SHELL", "curl -u $$API_USERNAME:$$API_PASSWORD -k -s -f -X POST https://localhost:55000/security/user/authenticate?raw=true -o /dev/null || exit 1" ] interval: 15s timeout: 5s retries: 5 diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 71ac6157..b05ab245 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -9,7 +9,7 @@ services: wazuh.indexer: condition: service_healthy healthcheck: - test: [ "CMD-SHELL", "curl -u $$API_USERNAME:$$API_PASSWORD -k -s -X POST https://localhost:55000/security/user/authenticate?raw=true >> /dev/null|| exit 1" ] + test: [ "CMD-SHELL", "curl -f -u $$API_USERNAME:$$API_PASSWORD -k -s -X POST https://localhost:55000/security/user/authenticate?raw=true -o /dev/null || exit 1" ] interval: 15s timeout: 5s retries: 5 From 178c7f0639d98f7e3a68df332abef50179fa8cc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Thu, 26 Mar 2026 10:41:01 -0300 Subject: [PATCH 5/5] Update healthcheck curl options order --- single-node/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index b05ab245..52e400f8 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -9,7 +9,7 @@ services: wazuh.indexer: condition: service_healthy healthcheck: - test: [ "CMD-SHELL", "curl -f -u $$API_USERNAME:$$API_PASSWORD -k -s -X POST https://localhost:55000/security/user/authenticate?raw=true -o /dev/null || exit 1" ] + test: [ "CMD-SHELL", "curl -u $$API_USERNAME:$$API_PASSWORD -k -s -f -X POST https://localhost:55000/security/user/authenticate?raw=true -o /dev/null || exit 1" ] interval: 15s timeout: 5s retries: 5