diff --git a/CHANGELOG.md b/CHANGELOG.md index 7753558e..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)) @@ -67,6 +68,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 @@ -79,6 +98,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 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