Compare commits

...
12 Commits
Author SHA1 Message Date
Carlos Anguita ce53f0f05e Merge pull request #1747 from wazuh/enhancement/1745-revert-image-tag
Revert docker image for 4.11.1-rc2
2025-03-10 10:27:01 +01:00
Enrique Araque aa69278c44 Revert docker image for 4.11.1-rc2 2025-03-10 10:25:12 +01:00
Carlos Anguita 546f3cef9b Merge pull request #1746 from wazuh/enhancement/1745-bump-revision-and-change-docker-image-for-4.11.1-rc2
Bump revision and change docker image for 4.11.1-rc2
2025-03-10 10:22:23 +01:00
Enrique Araque 754c4b331e Bum revision and change docker image for 4.11.1-rc2 2025-03-10 10:16:10 +01:00
Carlos Bordon fe0f76bd7b Merge pull request #1738 from wazuh/enhancement/1736-revert-bump-4.11.1-rc1
Revert image tag
2025-02-26 16:53:24 -03:00
Jesus Garcia e4fec103ca Revert image tag 2025-02-26 14:50:55 -05:00
Carlos Bordon 28acd68e6e Merge pull request #1737 from wazuh/enhancement/1736-bump-4.11.1-rc1
Bump 4.11.1-rc1 revision
2025-02-26 16:43:40 -03:00
Jesus Garcia fc8a8d6869 Bump 4.11.1-rc1 revision 2025-02-26 14:40:25 -05:00
Carlos Anguita ff7c511f3b Merge pull request #1733 from wazuh/enhancement/1731-merge-4.11.0-into-4.11.1 2025-02-21 12:25:55 +01:00
Enrique Araque 5f689b8802 merge 4.11.0 into 4.11.1 2025-02-21 12:22:00 +01:00
Carlos Bordon dafe93039f Merge pull request #1715 from wazuh/enhancement/1714-support-new-version-4.11.1
Support new Wazuh version 4.11.1
2025-02-06 09:16:02 -03:00
Carlos Anguita López 0adf702f70 support new wazuh version 4.11.1 2025-02-06 13:08:58 +01:00
13 changed files with 48 additions and 29 deletions
+3 -3
View File
@@ -1,6 +1,6 @@
WAZUH_VERSION=4.11.0
WAZUH_IMAGE_VERSION=4.11.0
WAZUH_VERSION=4.11.1
WAZUH_IMAGE_VERSION=4.11.1
WAZUH_TAG_REVISION=1
FILEBEAT_TEMPLATE_BRANCH=4.11.0
FILEBEAT_TEMPLATE_BRANCH=4.11.1
WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.4.tar.gz
WAZUH_UI_REVISION=1
+1 -1
View File
@@ -56,7 +56,7 @@ package:
wazuh-manager:
installed: true
versions:
- 4.11.0
- 4.11.1
port:
tcp:1514:
listening: true
@@ -6,11 +6,11 @@ on:
inputs:
image_tag:
description: 'Docker image tag'
default: '4.11.0'
default: '4.11.1'
required: true
docker_reference:
description: 'wazuh-docker reference'
default: 'v4.11.0'
default: 'v4.11.1'
required: true
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.11.0'
default: '4.11.1'
required: true
type: string
docker_reference:
description: 'wazuh-docker reference'
default: 'v4.11.0'
default: 'v4.11.1'
required: false
type: string
products:
+18
View File
@@ -1,6 +1,24 @@
# Change Log
All notable changes to this project will be documented in this file.
## [4.11.1]
### Added
- None
### Changed
- None
### Fixed
- None
### Deleted
- None
## [4.11.0]
### Added
+1
View File
@@ -178,6 +178,7 @@ WAZUH_MONITORING_REPLICAS=0 ##
| Wazuh version | ODFE | XPACK |
|---------------|---------|--------|
| v4.11.1 | | |
| v4.11.0 | | |
| v4.10.1 | | |
| v4.10.0 | | |
+2 -2
View File
@@ -1,2 +1,2 @@
WAZUH-DOCKER_VERSION="4.11.0"
REVISION="41103"
WAZUH-DOCKER_VERSION="4.11.1"
REVISION="41112"
+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:
```
$ build-docker-images/build-images.sh -v 4.11.0
$ build-docker-images/build-images.sh -v 4.11.1
```
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.
-f, --filebeat-module <ref> [Optional] Set Filebeat module version. By default 0.4.
-r, --revision <rev> [Optional] Package revision. By default 1
-v, --version <ver> [Optional] Set the Wazuh version should be builded. By default, 4.11.0.
-v, --version <ver> [Optional] Set the Wazuh version should be builded. By default, 4.11.1.
-h, --help Show this help.
```
+2 -2
View File
@@ -1,4 +1,4 @@
WAZUH_IMAGE_VERSION=4.11.0
WAZUH_IMAGE_VERSION=4.11.1
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.11.0"
WAZUH_IMAGE_VERSION="4.11.1"
WAZUH_TAG_REVISION="1"
WAZUH_DEV_STAGE=""
FILEBEAT_MODULE_VERSION="0.4"
@@ -9,8 +9,8 @@ export CONFIG_DIR=${INSTALLATION_DIR}/config
## Variables
CERT_TOOL=wazuh-certs-tool.sh
PACKAGES_URL=https://packages.wazuh.com/4.10/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.10/
PACKAGES_URL=https://packages.wazuh.com/4.11/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.11/
## Check if the cert tool exists in S3 buckets
CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}')
@@ -22,8 +22,8 @@ export REPO_DIR=/unattended_installer
## Variables
CERT_TOOL=wazuh-certs-tool.sh
PASSWORD_TOOL=wazuh-passwords-tool.sh
PACKAGES_URL=https://packages.wazuh.com/4.10/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.10/
PACKAGES_URL=https://packages.wazuh.com/4.11/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.11/
## Check if the cert tool exists in S3 buckets
CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}')
+2 -2
View File
@@ -8,8 +8,8 @@
## Variables
CERT_TOOL=wazuh-certs-tool.sh
PASSWORD_TOOL=wazuh-passwords-tool.sh
PACKAGES_URL=https://packages.wazuh.com/4.10/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.10/
PACKAGES_URL=https://packages.wazuh.com/4.11/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.11/
## Check if the cert tool exists in S3 buckets
CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}')
+6 -6
View File
@@ -3,7 +3,7 @@ version: '3.7'
services:
wazuh.master:
image: wazuh/wazuh-manager:4.11.0
image: wazuh/wazuh-manager:4.11.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.11.0
image: wazuh/wazuh-manager:4.11.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.11.0
image: wazuh/wazuh-indexer:4.11.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.11.0
image: wazuh/wazuh-indexer:4.11.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.11.0
image: wazuh/wazuh-indexer:4.11.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.11.0
image: wazuh/wazuh-dashboard:4.11.1
hostname: wazuh.dashboard
restart: always
ports:
+3 -3
View File
@@ -3,7 +3,7 @@ version: '3.7'
services:
wazuh.manager:
image: wazuh/wazuh-manager:4.11.0
image: wazuh/wazuh-manager:4.11.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.11.0
image: wazuh/wazuh-indexer:4.11.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.11.0
image: wazuh/wazuh-dashboard:4.11.1
hostname: wazuh.dashboard
restart: always
ports: