From 1aa149933be732c6cb8e459738b75dab68dc9c61 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Thu, 10 Oct 2024 11:09:09 -0300 Subject: [PATCH 1/5] Fix typos --- .../wazuh-manager/config/etc/cont-init.d/0-wazuh-init | 2 +- .../wazuh-manager/config/etc/cont-init.d/1-config-filebeat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init b/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init index 326c46de..9edb1b00 100644 --- a/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init +++ b/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init @@ -51,7 +51,7 @@ mount_permanent_data() { print "Installing ${permanent_dir}" exec_cmd "cp -a ${data_tmp}. ${permanent_dir}" else - print "The path ${permanent_dir} is empty, skiped" + print "The path ${permanent_dir} is empty, skipped" fi fi done diff --git a/build-docker-images/wazuh-manager/config/etc/cont-init.d/1-config-filebeat b/build-docker-images/wazuh-manager/config/etc/cont-init.d/1-config-filebeat index c4a5c7f4..0a3ed8ff 100644 --- a/build-docker-images/wazuh-manager/config/etc/cont-init.d/1-config-filebeat +++ b/build-docker-images/wazuh-manager/config/etc/cont-init.d/1-config-filebeat @@ -4,7 +4,7 @@ set -e if [ "$INDEXER_URL" != "" ]; then - >&2 echo "Customize Elasticsearch ouput IP" + >&2 echo "Customize Elasticsearch output IP" sed -i "s|hosts:.*|hosts: ['$INDEXER_URL']|g" /etc/filebeat/filebeat.yml fi From f61af29c6bc6b6f3979c054f1f2f05090ec66b0e Mon Sep 17 00:00:00 2001 From: vcerenu Date: Thu, 10 Oct 2024 12:07:39 -0300 Subject: [PATCH 2/5] Add changelog --- CHANGELOG.md | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 648c293a..60e2ebec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,25 @@ # Change Log All notable changes to this project will be documented in this file. -## Wazuh Docker v4.9.1 +## [4.9.1] + ### Added -- Update Wazuh to version [4.9.1](https://github.com/wazuh/wazuh/blob/v4.9.1/CHANGELOG.md#v491) +- None + +### Changed + +- None + + +### Fixed + +- Fix typos into Wazuh manager entrypoint ([#1569](https://github.com/wazuh/wazuh-docker/pull/1569)) + +### Deleted + +- None + ## Wazuh Docker v4.9.0 ### Added From 276c8a2e6c8c925e40e0e749c913b3427e910263 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 15 Oct 2024 12:05:27 -0300 Subject: [PATCH 3/5] Bump revision --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 71e09963..12be3220 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="4.9.1" -REVISION="40913" +REVISION="40914" From 564e2b3ec42f09b251f9edabb34bcc2fa0c493ab Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 15 Oct 2024 12:41:31 -0300 Subject: [PATCH 4/5] change image taf for rc4 --- 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 d78454b4..fc4d8587 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.9.1 + image: wazuh/wazuh-manager:4.9.1-rc4 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.9.1 + image: wazuh/wazuh-manager:4.9.1-rc4 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.9.1 + image: wazuh/wazuh-indexer:4.9.1-rc4 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.9.1 + image: wazuh/wazuh-indexer:4.9.1-rc4 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.9.1 + image: wazuh/wazuh-indexer:4.9.1-rc4 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.9.1 + image: wazuh/wazuh-dashboard:4.9.1-rc4 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index a36491c7..a83eb6a2 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.9.1 + image: wazuh/wazuh-manager:4.9.1-rc4 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.9.1 + image: wazuh/wazuh-indexer:4.9.1-rc4 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.9.1 + image: wazuh/wazuh-dashboard:4.9.1-rc4 hostname: wazuh.dashboard restart: always ports: From 5bbacebe89078eed02dd823fce118a2a8592bf1b Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 15 Oct 2024 12:59:17 -0300 Subject: [PATCH 5/5] Revert image tag for rc4 --- 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 fc4d8587..d78454b4 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.9.1-rc4 + image: wazuh/wazuh-manager:4.9.1 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.9.1-rc4 + image: wazuh/wazuh-manager:4.9.1 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.9.1-rc4 + image: wazuh/wazuh-indexer:4.9.1 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.9.1-rc4 + image: wazuh/wazuh-indexer:4.9.1 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.9.1-rc4 + image: wazuh/wazuh-indexer:4.9.1 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.9.1-rc4 + image: wazuh/wazuh-dashboard:4.9.1 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index a83eb6a2..a36491c7 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.9.1-rc4 + image: wazuh/wazuh-manager:4.9.1 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.9.1-rc4 + image: wazuh/wazuh-indexer:4.9.1 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.9.1-rc4 + image: wazuh/wazuh-dashboard:4.9.1 hostname: wazuh.dashboard restart: always ports: