From 44e9bebed0d1aefcf9fd5ddf65ec94a6d84e6f5b Mon Sep 17 00:00:00 2001 From: Mateo Cervilla Date: Fri, 25 Aug 2023 12:24:01 -0300 Subject: [PATCH 1/5] Add Debian Bookworm VDT support --- multi-node/config/wazuh_cluster/wazuh_manager.conf | 1 + multi-node/config/wazuh_cluster/wazuh_worker.conf | 1 + single-node/config/wazuh_cluster/wazuh_manager.conf | 1 + 3 files changed, 3 insertions(+) diff --git a/multi-node/config/wazuh_cluster/wazuh_manager.conf b/multi-node/config/wazuh_cluster/wazuh_manager.conf index 2af34bc4..7286218c 100644 --- a/multi-node/config/wazuh_cluster/wazuh_manager.conf +++ b/multi-node/config/wazuh_cluster/wazuh_manager.conf @@ -117,6 +117,7 @@ no buster bullseye + bookworm 1h diff --git a/multi-node/config/wazuh_cluster/wazuh_worker.conf b/multi-node/config/wazuh_cluster/wazuh_worker.conf index 2fdbb305..8f462263 100644 --- a/multi-node/config/wazuh_cluster/wazuh_worker.conf +++ b/multi-node/config/wazuh_cluster/wazuh_worker.conf @@ -117,6 +117,7 @@ no buster bullseye + bookworm 1h diff --git a/single-node/config/wazuh_cluster/wazuh_manager.conf b/single-node/config/wazuh_cluster/wazuh_manager.conf index 63202e48..96dbb367 100644 --- a/single-node/config/wazuh_cluster/wazuh_manager.conf +++ b/single-node/config/wazuh_cluster/wazuh_manager.conf @@ -117,6 +117,7 @@ no buster bullseye + bookworm 1h From 902b0d8e52cb79058a46ec631c30b0a02441d688 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Mon, 28 Aug 2023 13:11:25 +0200 Subject: [PATCH 2/5] Fixed Wazuh dashboard modules persistency --- multi-node/docker-compose.yml | 2 ++ single-node/docker-compose.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index d50271e4..7ad9d653 100644 --- a/multi-node/docker-compose.yml +++ b/multi-node/docker-compose.yml @@ -168,6 +168,7 @@ services: - ./config/wazuh_indexer_ssl_certs/wazuh.dashboard-key.pem:/usr/share/wazuh-dashboard/certs/wazuh-dashboard-key.pem - ./config/wazuh_indexer_ssl_certs/root-ca.pem:/usr/share/wazuh-dashboard/certs/root-ca.pem - ./config/wazuh_dashboard/opensearch_dashboards.yml:/usr/share/wazuh-dashboard/config/opensearch_dashboards.yml + - wazuh-dashboard-config:/usr/share/wazuh-dashboard/data/wazuh/config - ./config/wazuh_dashboard/wazuh.yml:/usr/share/wazuh-dashboard/data/wazuh/config/wazuh.yml depends_on: - wazuh1.indexer @@ -218,3 +219,4 @@ volumes: wazuh-indexer-data-1: wazuh-indexer-data-2: wazuh-indexer-data-3: + wazuh-dashboard-config: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 3f066fdd..3964c04a 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -89,6 +89,7 @@ services: - ./config/wazuh_indexer_ssl_certs/wazuh.dashboard-key.pem:/usr/share/wazuh-dashboard/certs/wazuh-dashboard-key.pem - ./config/wazuh_indexer_ssl_certs/root-ca.pem:/usr/share/wazuh-dashboard/certs/root-ca.pem - ./config/wazuh_dashboard/opensearch_dashboards.yml:/usr/share/wazuh-dashboard/config/opensearch_dashboards.yml + - wazuh-dashboard-config:/usr/share/wazuh-dashboard/data/wazuh/config - ./config/wazuh_dashboard/wazuh.yml:/usr/share/wazuh-dashboard/data/wazuh/config/wazuh.yml depends_on: - wazuh.indexer @@ -109,3 +110,4 @@ volumes: filebeat_etc: filebeat_var: wazuh-indexer-data: + wazuh-dashboard-config: From e5abd5d24e636f086ffb160317d3bc49758b5ae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Tue, 29 Aug 2023 11:29:26 +0200 Subject: [PATCH 3/5] Bump to 4.5.3 --- .env | 4 ++-- .github/.goss.yaml | 2 +- CHANGELOG.md | 5 +++++ README.md | 1 + VERSION | 4 ++-- build-docker-images/build-images.sh | 2 +- multi-node/docker-compose.yml | 12 ++++++------ single-node/docker-compose.yml | 6 +++--- 8 files changed, 21 insertions(+), 15 deletions(-) diff --git a/.env b/.env index f81f5635..c7ee1434 100755 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ -WAZUH_VERSION=4.5.2 -WAZUH_IMAGE_VERSION=4.5.2 +WAZUH_VERSION=4.5.3 +WAZUH_IMAGE_VERSION=4.5.3 WAZUH_TAG_REVISION=1 diff --git a/.github/.goss.yaml b/.github/.goss.yaml index ee81b870..21dc7bdd 100644 --- a/.github/.goss.yaml +++ b/.github/.goss.yaml @@ -56,7 +56,7 @@ package: wazuh-manager: installed: true versions: - - 4.5.2-1 + - 4.5.3-1 port: tcp:1514: listening: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 9221a94b..caed2993 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Change Log All notable changes to this project will be documented in this file. +## Wazuh Docker v4.5.3 +### Added + +- Update Wazuh to version [4.5.3](https://github.com/wazuh/wazuh/blob/v4.5.3/CHANGELOG.md#v453) + ## Wazuh Docker v4.5.2 ### Added diff --git a/README.md b/README.md index 315fd073..012f2b84 100644 --- a/README.md +++ b/README.md @@ -195,6 +195,7 @@ WAZUH_MONITORING_REPLICAS=0 ## | Wazuh version | ODFE | XPACK | |---------------|---------|--------| +| v4.5.3 | | | | v4.5.2 | | | | v4.5.1 | | | | v4.5.0 | | | diff --git a/VERSION b/VERSION index c3565ca8..36832e86 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="4.5.2" -REVISION="40504" +WAZUH-DOCKER_VERSION="4.5.3" +REVISION="40505" diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index be814f84..f2fbb86f 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -1,4 +1,4 @@ -WAZUH_IMAGE_VERSION=4.5.2 +WAZUH_IMAGE_VERSION=4.5.3 WAZUH_VERSION=$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g') WAZUH_TAG_REVISION=1 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') diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index 8e53016f..68d0fd92 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.5.2 + image: wazuh/wazuh-manager:4.5.3 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.5.2 + image: wazuh/wazuh-manager:4.5.3 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.5.2 + image: wazuh/wazuh-indexer:4.5.3 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.5.2 + image: wazuh/wazuh-indexer:4.5.3 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.5.2 + image: wazuh/wazuh-indexer:4.5.3 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.5.2 + image: wazuh/wazuh-dashboard:4.5.3 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index eeeccce9..d436742e 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.5.2 + image: wazuh/wazuh-manager:4.5.3 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.5.2 + image: wazuh/wazuh-indexer:4.5.3 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.5.2 + image: wazuh/wazuh-dashboard:4.5.3 hostname: wazuh.dashboard restart: always ports: From c0fb4172f34efbd1b17d7cbec31e91f7a60398dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Mon, 4 Sep 2023 11:11:37 +0200 Subject: [PATCH 4/5] Bump revision to 40505 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index c3565ca8..495d779e 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="4.5.2" -REVISION="40504" +REVISION="40505" From b18c06865039492e3e8c4e5ab1c3c8f0d87b404d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Thu, 7 Sep 2023 13:58:32 +0200 Subject: [PATCH 5/5] Added empty line to changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f6396232..362629b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file. ### Added - Update Wazuh to version [4.6.0](https://github.com/wazuh/wazuh/blob/v4.6.0/CHANGELOG.md#v460) + ## Wazuh Docker v4.5.3 ### Added