Compare commits

...
11 Commits
Author SHA1 Message Date
Gonzalo Acuña d306f942f7 Merge pull request #1764 from wazuh/1762-revert-image-tag
Revert image tag
2025-03-26 14:16:04 -03:00
Jesus Garcia abde776e1b Revert image tag 2025-03-26 12:11:45 -05:00
Gonzalo Acuña b6f628f3c1 Merge pull request #1763 from wazuh/bump-to-4.11.2-rc2-version
Update images to version 4.11.2-rc2 in multi-node and single-node
2025-03-26 13:57:56 -03:00
Jesus Garcia 06a5ba5297 Bump to 4.11.2-rc2 2025-03-26 10:59:51 -05:00
Carlos Anguita 85992aea95 Merge pull request #1760 from wazuh/enhancement/1758-revert-tag
Revert image tag
2025-03-20 09:28:02 +01:00
vcerenu 5057d0f083 Revert image tag 2025-03-20 05:24:28 -03:00
Carlos Anguita 562eb60e0f Merge pull request #1759 from wazuh/enhancement/1758-bump-revision
Bump revision
2025-03-20 09:12:55 +01:00
vcerenu 58d6ec2953 Change image tag 2025-03-20 05:10:18 -03:00
vcerenu 300c1bbcdd Bump revision 2025-03-20 05:05:02 -03:00
Gonzalo Acuña 1fe7647b47 Merge pull request #1756 from wazuh/enhancement/1755-bump-4.11.2-version
Bump 4.11.2 version
2025-03-17 13:51:59 -03:00
vcerenu bd5e95a2b8 Bump 4.11.2 version 2025-03-17 13:12:33 -03:00
10 changed files with 42 additions and 23 deletions
+3 -3
View File
@@ -1,6 +1,6 @@
WAZUH_VERSION=4.11.1 WAZUH_VERSION=4.11.2
WAZUH_IMAGE_VERSION=4.11.1 WAZUH_IMAGE_VERSION=4.11.2
WAZUH_TAG_REVISION=1 WAZUH_TAG_REVISION=1
FILEBEAT_TEMPLATE_BRANCH=4.11.1 FILEBEAT_TEMPLATE_BRANCH=4.11.2
WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.4.tar.gz WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.4.tar.gz
WAZUH_UI_REVISION=1 WAZUH_UI_REVISION=1
+1 -1
View File
@@ -56,7 +56,7 @@ package:
wazuh-manager: wazuh-manager:
installed: true installed: true
versions: versions:
- 4.11.1 - 4.11.2
port: port:
tcp:1514: tcp:1514:
listening: true listening: true
@@ -6,11 +6,11 @@ on:
inputs: inputs:
image_tag: image_tag:
description: 'Docker image tag' description: 'Docker image tag'
default: '4.11.1' default: '4.11.2'
required: true required: true
docker_reference: docker_reference:
description: 'wazuh-docker reference' description: 'wazuh-docker reference'
default: 'v4.11.1' default: 'v4.11.2'
required: true required: true
products: products:
description: 'Comma-separated list of the image names to build and push' description: 'Comma-separated list of the image names to build and push'
@@ -42,12 +42,12 @@ on:
inputs: inputs:
image_tag: image_tag:
description: 'Docker image tag' description: 'Docker image tag'
default: '4.11.1' default: '4.11.2'
required: true required: true
type: string type: string
docker_reference: docker_reference:
description: 'wazuh-docker reference' description: 'wazuh-docker reference'
default: 'v4.11.1' default: 'v4.11.2'
required: false required: false
type: string type: string
products: products:
+18
View File
@@ -1,6 +1,24 @@
# Change Log # Change Log
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
## [4.11.2]
### Added
- None
### Changed
- None
### Fixed
- None
### Deleted
- None
## [4.11.1] ## [4.11.1]
### Added ### Added
+1
View File
@@ -178,6 +178,7 @@ WAZUH_MONITORING_REPLICAS=0 ##
| Wazuh version | ODFE | XPACK | | Wazuh version | ODFE | XPACK |
|---------------|---------|--------| |---------------|---------|--------|
| v4.11.2 | | |
| v4.11.1 | | | | v4.11.1 | | |
| v4.11.0 | | | | v4.11.0 | | |
| v4.10.1 | | | | v4.10.1 | | |
+2 -2
View File
@@ -1,2 +1,2 @@
WAZUH-DOCKER_VERSION="4.11.1" WAZUH-DOCKER_VERSION="4.11.2"
REVISION="41112" REVISION="41122"
+2 -2
View File
@@ -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: 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.11.1 $ build-docker-images/build-images.sh -v 4.11.2
``` ```
To get all the available script options use the -h or --help option: 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 <ref> [Optional] Set the development stage you want to build, example rc1 or beta1, not used by default. -d, --dev <ref> [Optional] Set the development stage you want to build, example rc1 or beta1, not used by default.
-f, --filebeat-module <ref> [Optional] Set Filebeat module version. By default 0.4. -f, --filebeat-module <ref> [Optional] Set Filebeat module version. By default 0.4.
-r, --revision <rev> [Optional] Package revision. By default 1 -r, --revision <rev> [Optional] Package revision. By default 1
-v, --version <ver> [Optional] Set the Wazuh version should be builded. By default, 4.11.1. -v, --version <ver> [Optional] Set the Wazuh version should be builded. By default, 4.11.2.
-h, --help Show this help. -h, --help Show this help.
``` ```
+2 -2
View File
@@ -1,4 +1,4 @@
WAZUH_IMAGE_VERSION=4.11.1 WAZUH_IMAGE_VERSION=4.11.2
WAZUH_VERSION=$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g') WAZUH_VERSION=$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g')
WAZUH_TAG_REVISION=1 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') 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 # License (version 2) as published by the FSF - Free Software
# Foundation. # Foundation.
WAZUH_IMAGE_VERSION="4.11.1" WAZUH_IMAGE_VERSION="4.11.2"
WAZUH_TAG_REVISION="1" WAZUH_TAG_REVISION="1"
WAZUH_DEV_STAGE="" WAZUH_DEV_STAGE=""
FILEBEAT_MODULE_VERSION="0.4" FILEBEAT_MODULE_VERSION="0.4"
+6 -6
View File
@@ -3,7 +3,7 @@ version: '3.7'
services: services:
wazuh.master: wazuh.master:
image: wazuh/wazuh-manager:4.11.1 image: wazuh/wazuh-manager:4.11.2
hostname: wazuh.master hostname: wazuh.master
restart: always restart: always
ulimits: ulimits:
@@ -45,7 +45,7 @@ services:
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
wazuh.worker: wazuh.worker:
image: wazuh/wazuh-manager:4.11.1 image: wazuh/wazuh-manager:4.11.2
hostname: wazuh.worker hostname: wazuh.worker
restart: always restart: always
ulimits: ulimits:
@@ -81,7 +81,7 @@ services:
- ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf
wazuh1.indexer: wazuh1.indexer:
image: wazuh/wazuh-indexer:4.11.1 image: wazuh/wazuh-indexer:4.11.2
hostname: wazuh1.indexer hostname: wazuh1.indexer
restart: always restart: always
ports: ports:
@@ -107,7 +107,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh2.indexer: wazuh2.indexer:
image: wazuh/wazuh-indexer:4.11.1 image: wazuh/wazuh-indexer:4.11.2
hostname: wazuh2.indexer hostname: wazuh2.indexer
restart: always restart: always
environment: environment:
@@ -129,7 +129,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh3.indexer: wazuh3.indexer:
image: wazuh/wazuh-indexer:4.11.1 image: wazuh/wazuh-indexer:4.11.2
hostname: wazuh3.indexer hostname: wazuh3.indexer
restart: always restart: always
environment: environment:
@@ -151,7 +151,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh.dashboard: wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.11.1 image: wazuh/wazuh-dashboard:4.11.2
hostname: wazuh.dashboard hostname: wazuh.dashboard
restart: always restart: always
ports: ports:
+3 -3
View File
@@ -3,7 +3,7 @@ version: '3.7'
services: services:
wazuh.manager: wazuh.manager:
image: wazuh/wazuh-manager:4.11.1 image: wazuh/wazuh-manager:4.11.2
hostname: wazuh.manager hostname: wazuh.manager
restart: always restart: always
ulimits: ulimits:
@@ -46,7 +46,7 @@ services:
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
wazuh.indexer: wazuh.indexer:
image: wazuh/wazuh-indexer:4.11.1 image: wazuh/wazuh-indexer:4.11.2
hostname: wazuh.indexer hostname: wazuh.indexer
restart: always restart: always
ports: ports:
@@ -71,7 +71,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh.dashboard: wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.11.1 image: wazuh/wazuh-dashboard:4.11.2
hostname: wazuh.dashboard hostname: wazuh.dashboard
restart: always restart: always
ports: ports: