From 34d25df8adf323c722ae64ca3a6792f203bab47c Mon Sep 17 00:00:00 2001 From: vcerenu Date: Fri, 17 Jan 2025 15:29:56 -0300 Subject: [PATCH 1/7] bump 4.10.2 version --- .env | 6 +++--- .github/.goss.yaml | 2 +- .../workflows/Procedure_push_docker_images.yml | 8 ++++---- CHANGELOG.md | 18 ++++++++++++++++++ README.md | 1 + VERSION | 4 ++-- build-docker-images/README.md | 4 ++-- build-docker-images/build-images.sh | 4 ++-- multi-node/docker-compose.yml | 12 ++++++------ single-node/docker-compose.yml | 6 +++--- 10 files changed, 42 insertions(+), 23 deletions(-) diff --git a/.env b/.env index 87fd140c..a552278a 100755 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ -WAZUH_VERSION=4.10.1 -WAZUH_IMAGE_VERSION=4.10.1 +WAZUH_VERSION=4.10.2 +WAZUH_IMAGE_VERSION=4.10.2 WAZUH_TAG_REVISION=1 -FILEBEAT_TEMPLATE_BRANCH=4.10.1 +FILEBEAT_TEMPLATE_BRANCH=4.10.2 WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.4.tar.gz WAZUH_UI_REVISION=1 diff --git a/.github/.goss.yaml b/.github/.goss.yaml index 81b4347f..1761d2c3 100644 --- a/.github/.goss.yaml +++ b/.github/.goss.yaml @@ -56,7 +56,7 @@ package: wazuh-manager: installed: true versions: - - 4.10.1-1 + - 4.10.2-1 port: tcp:1514: listening: true diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index e3568ee1..43619b7b 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -6,11 +6,11 @@ on: inputs: image_tag: description: 'Docker image tag' - default: '4.10.1' + default: '4.10.2' required: true docker_reference: description: 'wazuh-docker reference' - default: 'v4.10.1' + default: 'v4.10.2' required: false products: description: 'Comma-separated list of the image names to build and push' @@ -42,12 +42,12 @@ on: inputs: image_tag: description: 'Docker image tag' - default: '4.10.1' + default: '4.10.2' required: true type: string docker_reference: description: 'wazuh-docker reference' - default: 'v4.10.1' + default: 'v4.10.2' required: false type: string products: diff --git a/CHANGELOG.md b/CHANGELOG.md index db1743ba..81dd3ec5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,24 @@ # Change Log All notable changes to this project will be documented in this file. +## [4.10.2] + +### Added + +- None + +### Changed + +- None + +### Fixed + +- None + +### Deleted + +- None + ## [4.10.1] ### Added diff --git a/README.md b/README.md index 185c10b8..515d8c3c 100644 --- a/README.md +++ b/README.md @@ -178,6 +178,7 @@ WAZUH_MONITORING_REPLICAS=0 ## | Wazuh version | ODFE | XPACK | |---------------|---------|--------| +| v4.10.2 | | | | v4.10.1 | | | | v4.10.0 | | | | v4.9.2 | | | diff --git a/VERSION b/VERSION index 7daf8c32..42eb9ba1 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="4.10.1" -REVISION="41011" +WAZUH-DOCKER_VERSION="4.10.2" +REVISION="41020" diff --git a/build-docker-images/README.md b/build-docker-images/README.md index e77766f1..e65cda78 100644 --- a/build-docker-images/README.md +++ b/build-docker-images/README.md @@ -13,7 +13,7 @@ This script initializes the environment variables needed to build each of the im The script allows you to build images from other versions of Wazuh, to do this you must use the -v or --version argument: ``` -$ build-docker-images/build-images.sh -v 4.10.1 +$ build-docker-images/build-images.sh -v 4.10.2 ``` To get all the available script options use the -h or --help option: @@ -26,7 +26,7 @@ Usage: build-docker-images/build-images.sh [OPTIONS] -d, --dev [Optional] Set the development stage you want to build, example rc1 or beta1, not used by default. -f, --filebeat-module [Optional] Set Filebeat module version. By default 0.4. -r, --revision [Optional] Package revision. By default 1 - -v, --version [Optional] Set the Wazuh version should be builded. By default, 4.10.1. + -v, --version [Optional] Set the Wazuh version should be builded. By default, 4.10.2. -h, --help Show this help. ``` \ No newline at end of file diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index 26c2cd58..9d64121f 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -1,4 +1,4 @@ -WAZUH_IMAGE_VERSION=4.10.1 +WAZUH_IMAGE_VERSION=4.10.2 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') @@ -12,7 +12,7 @@ IMAGE_VERSION=${WAZUH_IMAGE_VERSION} # License (version 2) as published by the FSF - Free Software # Foundation. -WAZUH_IMAGE_VERSION="4.10.1" +WAZUH_IMAGE_VERSION="4.10.2" WAZUH_TAG_REVISION="1" WAZUH_DEV_STAGE="" FILEBEAT_MODULE_VERSION="0.4" diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index 2971d963..10187cfd 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.10.1 + image: wazuh/wazuh-manager:4.10.2 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.10.1 + image: wazuh/wazuh-manager:4.10.2 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.10.1 + image: wazuh/wazuh-indexer:4.10.2 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.10.1 + image: wazuh/wazuh-indexer:4.10.2 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.10.1 + image: wazuh/wazuh-indexer:4.10.2 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.10.1 + image: wazuh/wazuh-dashboard:4.10.2 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 068171d6..94cb7025 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.10.1 + image: wazuh/wazuh-manager:4.10.2 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.10.1 + image: wazuh/wazuh-indexer:4.10.2 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.10.1 + image: wazuh/wazuh-dashboard:4.10.2 hostname: wazuh.dashboard restart: always ports: From 052bce7ae162ce3de02fc1a8c43cf9435e788f56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Fri, 24 Jan 2025 09:20:23 -0300 Subject: [PATCH 2/7] Revision bump --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 3e225b16..2ef68c0e 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="4.11.0" -REVISION="41100" +REVISION="41101" From 2b30318a088790f9f389824ae6a35cc032c80f4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Fri, 24 Jan 2025 09:25:01 -0300 Subject: [PATCH 3/7] Image tags changed for alpha1 --- 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 f1a671d5..5df487a3 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.11.0 + image: wazuh/wazuh-manager:4.11.0-alpha1 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.11.0 + image: wazuh/wazuh-manager:4.11.0-alpha1 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.11.0 + image: wazuh/wazuh-indexer:4.11.0-alpha1 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.11.0 + image: wazuh/wazuh-indexer:4.11.0-alpha1 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.11.0 + image: wazuh/wazuh-indexer:4.11.0-alpha1 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.11.0 + image: wazuh/wazuh-dashboard:4.11.0-alpha1 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 90df4be8..efb37f2c 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.11.0 + image: wazuh/wazuh-manager:4.11.0-alpha1 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.11.0 + image: wazuh/wazuh-indexer:4.11.0-alpha1 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.11.0 + image: wazuh/wazuh-dashboard:4.11.0-alpha1 hostname: wazuh.dashboard restart: always ports: From 2bed6e2d954d3d34513e0db96a252dfbdf5e5526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Fri, 24 Jan 2025 09:38:55 -0300 Subject: [PATCH 4/7] Revert image tags for alpha1 --- 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 5df487a3..f1a671d5 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.11.0-alpha1 + image: wazuh/wazuh-manager:4.11.0 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.11.0-alpha1 + image: wazuh/wazuh-manager:4.11.0 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.11.0-alpha1 + image: wazuh/wazuh-indexer:4.11.0 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.11.0-alpha1 + image: wazuh/wazuh-indexer:4.11.0 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.11.0-alpha1 + image: wazuh/wazuh-indexer:4.11.0 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.11.0-alpha1 + image: wazuh/wazuh-dashboard:4.11.0 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index efb37f2c..90df4be8 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.11.0-alpha1 + image: wazuh/wazuh-manager:4.11.0 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.11.0-alpha1 + image: wazuh/wazuh-indexer:4.11.0 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.11.0-alpha1 + image: wazuh/wazuh-dashboard:4.11.0 hostname: wazuh.dashboard restart: always ports: From bc6ab7777325e6a387b651cbebed8d0fa679f869 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 4 Feb 2025 08:57:45 -0300 Subject: [PATCH 5/7] Resolving merge conflicts --- .github/.goss.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/.goss.yaml b/.github/.goss.yaml index c7b1ac8e..262726ea 100644 --- a/.github/.goss.yaml +++ b/.github/.goss.yaml @@ -56,7 +56,7 @@ package: wazuh-manager: installed: true versions: - - 4.11.0-1 + - 4.11.0 port: tcp:1514: listening: true From 6e0311a330172c35dc33ad9142d7e8c18bd9cfa5 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 4 Feb 2025 09:14:33 -0300 Subject: [PATCH 6/7] Resolving merge conflicts --- CHANGELOG.md | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 514e76d8..1c9969f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,24 +19,6 @@ All notable changes to this project will be documented in this file. - None -## [4.10.2] - -### Added - -- None - -### Changed - -- None - -### Fixed - -- None - -### Deleted - -- None - ## [4.10.1] ### Added From a7bb241f8ae999a6874b24b68795f9b65a6cb4f3 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 4 Feb 2025 09:15:11 -0300 Subject: [PATCH 7/7] Resolving merge conflicts --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 953522ae..53bee0f5 100644 --- a/README.md +++ b/README.md @@ -179,7 +179,6 @@ WAZUH_MONITORING_REPLICAS=0 ## | Wazuh version | ODFE | XPACK | |---------------|---------|--------| | v4.11.0 | | | -| v4.10.2 | | | | v4.10.1 | | | | v4.10.0 | | | | v4.9.2 | | |