From aee83a1a2dd51336e5cdbc14d90d240ce7252158 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Fri, 13 Oct 2023 10:25:38 +0200 Subject: [PATCH 1/5] Bump revision to 40701 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index aa9abeed..f8af68ee 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="4.7.0" -REVISION="40700" +REVISION="40701" From 523a28b20dd6b526a2b6303181484be4d68b333d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Mon, 16 Oct 2023 16:09:05 +0200 Subject: [PATCH 2/5] Fixed Filebeat template bug in image generation --- build-docker-images/wazuh-manager/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-docker-images/wazuh-manager/Dockerfile b/build-docker-images/wazuh-manager/Dockerfile index d72ba8ad..791dec6c 100644 --- a/build-docker-images/wazuh-manager/Dockerfile +++ b/build-docker-images/wazuh-manager/Dockerfile @@ -5,7 +5,7 @@ RUN rm /bin/sh && ln -s /bin/bash /bin/sh ARG WAZUH_VERSION ARG WAZUH_TAG_REVISION -ARG TEMPLATE_VERSION=v4.7.0 +ARG FILEBEAT_TEMPLATE_BRANCH=v4.7.0 ARG FILEBEAT_CHANNEL=filebeat-oss ARG FILEBEAT_VERSION=7.10.2 ARG WAZUH_FILEBEAT_MODULE From 5106715b0cba5f623fffade9f01a8591ad7342a9 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 17 Oct 2023 05:55:15 -0300 Subject: [PATCH 3/5] bump 4.5.4 version --- .env | 4 ++-- 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 +++--- 7 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.env b/.env index c7ee1434..188fd0bf 100755 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ -WAZUH_VERSION=4.5.3 -WAZUH_IMAGE_VERSION=4.5.3 +WAZUH_VERSION=4.5.4 +WAZUH_IMAGE_VERSION=4.5.4 WAZUH_TAG_REVISION=1 diff --git a/CHANGELOG.md b/CHANGELOG.md index caed2993..25a5c842 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.4 +### Added + +- Update Wazuh to version [4.5.4](https://github.com/wazuh/wazuh/blob/v4.5.4/CHANGELOG.md#v454) + ## Wazuh Docker v4.5.3 ### Added diff --git a/README.md b/README.md index 012f2b84..1dbe1998 100644 --- a/README.md +++ b/README.md @@ -195,6 +195,7 @@ WAZUH_MONITORING_REPLICAS=0 ## | Wazuh version | ODFE | XPACK | |---------------|---------|--------| +| v4.5.4 | | | | v4.5.3 | | | | v4.5.2 | | | | v4.5.1 | | | diff --git a/VERSION b/VERSION index e0b03686..43be6b29 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="4.5.3" -REVISION="40508" +WAZUH-DOCKER_VERSION="4.5.4" +REVISION="40509" diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index f2fbb86f..3a821a4a 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -1,4 +1,4 @@ -WAZUH_IMAGE_VERSION=4.5.3 +WAZUH_IMAGE_VERSION=4.5.4 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 a83f36f8..8198d7ad 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.3 + image: wazuh/wazuh-manager:4.5.4 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.3 + image: wazuh/wazuh-manager:4.5.4 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.3 + image: wazuh/wazuh-indexer:4.5.4 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.3 + image: wazuh/wazuh-indexer:4.5.4 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.3 + image: wazuh/wazuh-indexer:4.5.4 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.3 + image: wazuh/wazuh-dashboard:4.5.4 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 92077eb3..2e120b58 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.3 + image: wazuh/wazuh-manager:4.5.4 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.3 + image: wazuh/wazuh-indexer:4.5.4 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.3 + image: wazuh/wazuh-dashboard:4.5.4 hostname: wazuh.dashboard restart: always ports: From 0cd98767c83dd69f0d3ee28c6023d3157b7fe258 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Tue, 17 Oct 2023 15:23:37 +0200 Subject: [PATCH 4/5] Removed value of Filebeat template variable --- build-docker-images/wazuh-manager/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-docker-images/wazuh-manager/Dockerfile b/build-docker-images/wazuh-manager/Dockerfile index 791dec6c..878a07a2 100644 --- a/build-docker-images/wazuh-manager/Dockerfile +++ b/build-docker-images/wazuh-manager/Dockerfile @@ -5,7 +5,7 @@ RUN rm /bin/sh && ln -s /bin/bash /bin/sh ARG WAZUH_VERSION ARG WAZUH_TAG_REVISION -ARG FILEBEAT_TEMPLATE_BRANCH=v4.7.0 +ARG FILEBEAT_TEMPLATE_BRANCH ARG FILEBEAT_CHANNEL=filebeat-oss ARG FILEBEAT_VERSION=7.10.2 ARG WAZUH_FILEBEAT_MODULE From d45e2d984e6ef583ea6d43cd266545ed65bd4adb Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 23 Oct 2023 05:27:21 -0300 Subject: [PATCH 5/5] resolving conflicts --- build-docker-images/wazuh-manager/Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build-docker-images/wazuh-manager/Dockerfile b/build-docker-images/wazuh-manager/Dockerfile index e3c6b426..878a07a2 100644 --- a/build-docker-images/wazuh-manager/Dockerfile +++ b/build-docker-images/wazuh-manager/Dockerfile @@ -5,11 +5,7 @@ RUN rm /bin/sh && ln -s /bin/bash /bin/sh ARG WAZUH_VERSION ARG WAZUH_TAG_REVISION -<<<<<<< HEAD ARG FILEBEAT_TEMPLATE_BRANCH -======= -ARG TEMPLATE_VERSION=v4.7.1 ->>>>>>> aa88dad36ac99f8a1b1470a8c1b4749a80157d7e ARG FILEBEAT_CHANNEL=filebeat-oss ARG FILEBEAT_VERSION=7.10.2 ARG WAZUH_FILEBEAT_MODULE