From 08c9b954555c0ffd2b21ed5ddc3979b918ab7558 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 10 Apr 2023 11:20:22 -0300 Subject: [PATCH 01/16] change revision --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index de800016..6df24e26 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="4.4.1" -REVISION="40405" +REVISION="40406" From 195b34c259a2c113ccbece2b64534e2eda429cb9 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Wed, 19 Apr 2023 16:59:53 -0300 Subject: [PATCH 02/16] bump 4.3.11 version --- .env | 4 ++-- .github/.goss.yaml | 2 +- CHANGELOG.md | 9 ++------- README.md | 3 +-- VERSION | 4 ++-- build-docker-images/build-images.sh | 2 +- multi-node/docker-compose.yml | 12 ++++++------ single-node/docker-compose.yml | 6 +++--- 8 files changed, 18 insertions(+), 24 deletions(-) diff --git a/.env b/.env index 58ef3c4f..d70f87f2 100755 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ -WAZUH_VERSION=4.4.1 -WAZUH_IMAGE_VERSION=4.4.1 +WAZUH_VERSION=4.3.11 +WAZUH_IMAGE_VERSION=4.3.11 WAZUH_TAG_REVISION=1 diff --git a/.github/.goss.yaml b/.github/.goss.yaml index a867bac9..5055f226 100644 --- a/.github/.goss.yaml +++ b/.github/.goss.yaml @@ -56,7 +56,7 @@ package: wazuh-manager: installed: true versions: - - 4.4.1-1 + - 4.3.11-1 port: tcp:1514: listening: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a641df4..fda50ea0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,10 @@ # Change Log All notable changes to this project will be documented in this file. -## Wazuh Docker v4.4.1 +## Wazuh Docker v4.3.11 ### Added -- Update Wazuh to version [4.4.1](https://github.com/wazuh/wazuh/blob/v4.4.1/CHANGELOG.md#v441) - -## Wazuh Docker v4.4.0 -### Added - -- Update Wazuh to version [4.4.0](https://github.com/wazuh/wazuh/blob/v4.4.0/CHANGELOG.md#v440) +- Update Wazuh to version [4.3.11](https://github.com/wazuh/wazuh/blob/v4.3.11/CHANGELOG.md#v4310) ## Wazuh Docker v4.3.10 ### Added diff --git a/README.md b/README.md index c2c19801..995a5575 100644 --- a/README.md +++ b/README.md @@ -195,8 +195,7 @@ WAZUH_MONITORING_REPLICAS=0 ## | Wazuh version | ODFE | XPACK | |---------------|---------|--------| -| v4.4.1 | | | -| v4.4.0 | | | +| v4.3.11 | | | | v4.3.10 | | | | v4.3.9 | | | | v4.3.8 | | | diff --git a/VERSION b/VERSION index 6df24e26..16e452b0 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="4.4.1" -REVISION="40406" +WAZUH-DOCKER_VERSION="4.3.11" +REVISION="40323" diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index b6c23532..57bd8497 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -1,4 +1,4 @@ -WAZUH_IMAGE_VERSION=4.4.1 +WAZUH_IMAGE_VERSION=4.3.11 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 c9667ede..6e7e2198 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.4.1 + image: wazuh/wazuh-manager:4.3.11 hostname: wazuh.master restart: always ports: @@ -38,7 +38,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.worker: - image: wazuh/wazuh-manager:4.4.1 + image: wazuh/wazuh-manager:4.3.11 hostname: wazuh.worker restart: always environment: @@ -67,7 +67,7 @@ services: - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf wazuh1.indexer: - image: wazuh/wazuh-indexer:4.4.1 + image: wazuh/wazuh-indexer:4.3.11 hostname: wazuh1.indexer restart: always ports: @@ -93,7 +93,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh2.indexer: - image: wazuh/wazuh-indexer:4.4.1 + image: wazuh/wazuh-indexer:4.3.11 hostname: wazuh2.indexer restart: always environment: @@ -115,7 +115,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh3.indexer: - image: wazuh/wazuh-indexer:4.4.1 + image: wazuh/wazuh-indexer:4.3.11 hostname: wazuh3.indexer restart: always environment: @@ -137,7 +137,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.4.1 + image: wazuh/wazuh-dashboard:4.3.11 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index f5e8e3f8..b3f9fdad 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.4.1 + image: wazuh/wazuh-manager:4.3.11 hostname: wazuh.manager restart: always ports: @@ -39,7 +39,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.indexer: - image: wazuh/wazuh-indexer:4.4.1 + image: wazuh/wazuh-indexer:4.3.11 hostname: wazuh.indexer restart: always ports: @@ -64,7 +64,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.4.1 + image: wazuh/wazuh-dashboard:4.3.11 hostname: wazuh.dashboard restart: always ports: From 8b1ed497abbab9a5f7a82e3ef4b8a8d824981648 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 24 Apr 2023 09:17:02 -0300 Subject: [PATCH 03/16] change revision number --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 16e452b0..90a8562e 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="4.3.11" -REVISION="40323" +REVISION="40324" From fe75f8fb4ed34228a8e5892cd5ac2e70d8df5304 Mon Sep 17 00:00:00 2001 From: Jesse Roland Date: Tue, 18 Apr 2023 09:11:08 -0500 Subject: [PATCH 04/16] Add DASHBOARD_USERNAME and DASHBOARD_PASSWORD environment variables to the dashboard container. Resolves https://github.com/wazuh/wazuh-docker/issues/823 --- 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 6e7e2198..05265252 100644 --- a/multi-node/docker-compose.yml +++ b/multi-node/docker-compose.yml @@ -147,6 +147,8 @@ services: - WAZUH_API_URL="https://wazuh.master" - API_USERNAME=wazuh-wui - API_PASSWORD=MyS3cr37P450r.*- + - DASHBOARD_USERNAME=kibanaserver + - DASHBOARD_PASSWORD=kibanaserver volumes: - ./config/wazuh_indexer_ssl_certs/wazuh.dashboard.pem:/usr/share/wazuh-dashboard/certs/wazuh-dashboard.pem - ./config/wazuh_indexer_ssl_certs/wazuh.dashboard-key.pem:/usr/share/wazuh-dashboard/certs/wazuh-dashboard-key.pem diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index b3f9fdad..0a2d5802 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -73,6 +73,8 @@ services: - INDEXER_USERNAME=admin - INDEXER_PASSWORD=SecretPassword - WAZUH_API_URL=https://wazuh.manager + - DASHBOARD_USERNAME=kibanaserver + - DASHBOARD_PASSWORD=kibanaserver - API_USERNAME=wazuh-wui - API_PASSWORD=MyS3cr37P450r.*- volumes: From 42ea26b3bdada298f3aad24d4eabd5a118295325 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Fri, 28 Apr 2023 16:24:38 -0300 Subject: [PATCH 05/16] bump 4.4.2 version --- .env | 4 ++-- .github/.goss.yaml | 2 +- CHANGELOG.md | 15 +++++++++++++++ README.md | 3 +++ VERSION | 4 ++-- build-docker-images/build-images.sh | 2 +- multi-node/docker-compose.yml | 12 ++++++------ single-node/docker-compose.yml | 6 +++--- 8 files changed, 33 insertions(+), 15 deletions(-) diff --git a/.env b/.env index d70f87f2..d4169289 100755 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ -WAZUH_VERSION=4.3.11 -WAZUH_IMAGE_VERSION=4.3.11 +WAZUH_VERSION=4.4.2 +WAZUH_IMAGE_VERSION=4.4.2 WAZUH_TAG_REVISION=1 diff --git a/.github/.goss.yaml b/.github/.goss.yaml index 5055f226..e87d8647 100644 --- a/.github/.goss.yaml +++ b/.github/.goss.yaml @@ -56,7 +56,7 @@ package: wazuh-manager: installed: true versions: - - 4.3.11-1 + - 4.4.2-1 port: tcp:1514: listening: true diff --git a/CHANGELOG.md b/CHANGELOG.md index fda50ea0..5dab05b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,21 @@ # Change Log All notable changes to this project will be documented in this file. +## Wazuh Docker v4.4.2 +### Added + +- Update Wazuh to version [4.4.2](https://github.com/wazuh/wazuh/blob/v4.4.2/CHANGELOG.md#v442) + +## Wazuh Docker v4.4.1 +### Added + +- Update Wazuh to version [4.4.1](https://github.com/wazuh/wazuh/blob/v4.4.1/CHANGELOG.md#v441) + +## Wazuh Docker v4.4.0 +### Added + +- Update Wazuh to version [4.4.0](https://github.com/wazuh/wazuh/blob/v4.4.0/CHANGELOG.md#v440) + ## Wazuh Docker v4.3.11 ### Added diff --git a/README.md b/README.md index 995a5575..8619f3b7 100644 --- a/README.md +++ b/README.md @@ -195,6 +195,9 @@ WAZUH_MONITORING_REPLICAS=0 ## | Wazuh version | ODFE | XPACK | |---------------|---------|--------| +| v4.4.2 | | | +| v4.4.1 | | | +| v4.4.0 | | | | v4.3.11 | | | | v4.3.10 | | | | v4.3.9 | | | diff --git a/VERSION b/VERSION index 90a8562e..c56b258e 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="4.3.11" -REVISION="40324" +WAZUH-DOCKER_VERSION="4.4.2" +REVISION="40406" diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index 57bd8497..11886cc2 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -1,4 +1,4 @@ -WAZUH_IMAGE_VERSION=4.3.11 +WAZUH_IMAGE_VERSION=4.4.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') diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index 05265252..8d6d3149 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.3.11 + image: wazuh/wazuh-manager:4.4.2 hostname: wazuh.master restart: always ports: @@ -38,7 +38,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.worker: - image: wazuh/wazuh-manager:4.3.11 + image: wazuh/wazuh-manager:4.4.2 hostname: wazuh.worker restart: always environment: @@ -67,7 +67,7 @@ services: - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf wazuh1.indexer: - image: wazuh/wazuh-indexer:4.3.11 + image: wazuh/wazuh-indexer:4.4.2 hostname: wazuh1.indexer restart: always ports: @@ -93,7 +93,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh2.indexer: - image: wazuh/wazuh-indexer:4.3.11 + image: wazuh/wazuh-indexer:4.4.2 hostname: wazuh2.indexer restart: always environment: @@ -115,7 +115,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh3.indexer: - image: wazuh/wazuh-indexer:4.3.11 + image: wazuh/wazuh-indexer:4.4.2 hostname: wazuh3.indexer restart: always environment: @@ -137,7 +137,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.3.11 + image: wazuh/wazuh-dashboard:4.4.2 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 0a2d5802..ddaacc13 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.3.11 + image: wazuh/wazuh-manager:4.4.2 hostname: wazuh.manager restart: always ports: @@ -39,7 +39,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.indexer: - image: wazuh/wazuh-indexer:4.3.11 + image: wazuh/wazuh-indexer:4.4.2 hostname: wazuh.indexer restart: always ports: @@ -64,7 +64,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.3.11 + image: wazuh/wazuh-dashboard:4.4.2 hostname: wazuh.dashboard restart: always ports: From d00fc0ccf6d2ae0c1d1c5e2372cb721d5dc683dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Wed, 17 May 2023 14:23:26 -0300 Subject: [PATCH 06/16] Revision update --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index c56b258e..ae0f3cc1 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="4.4.2" -REVISION="40406" +REVISION="40408" From 312466704d96793bb0baf9aa11981aef5cdee192 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 23 May 2022 09:57:31 -0300 Subject: [PATCH 07/16] bump release 4.5.0 --- .github/.goss.yaml | 2 +- .github/workflows/push.yml | 4 ++-- CHANGELOG.md | 9 ++----- README.md | 3 +-- VERSION | 4 ++-- build-docker-images/build-images.yml | 24 +++++-------------- .../wazuh-dashboard/Dockerfile | 3 +-- .../wazuh-dashboard/config/config.sh | 4 ++-- .../wazuh-indexer/config/config.sh | 6 ++--- build-docker-images/wazuh-manager/Dockerfile | 7 ++---- indexer-certs-creator/config/entrypoint.sh | 4 ++-- .../config/wazuh_cluster/wazuh_worker.conf | 3 +++ multi-node/docker-compose.yml | 12 +++++----- .../config/wazuh_cluster/wazuh_manager.conf | 3 +++ single-node/docker-compose.yml | 6 ++--- 15 files changed, 39 insertions(+), 55 deletions(-) diff --git a/.github/.goss.yaml b/.github/.goss.yaml index e87d8647..76e84db8 100644 --- a/.github/.goss.yaml +++ b/.github/.goss.yaml @@ -56,7 +56,7 @@ package: wazuh-manager: installed: true versions: - - 4.4.2-1 + - 4.5.0 port: tcp:1514: listening: true diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 51077968..3c84f3f9 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -49,8 +49,8 @@ jobs: with: version: v0.3.16 - - name: Execute Goss tests (wazuh-manager) - run: dgoss run wazuh/wazuh-manager:${{env.WAZUH_IMAGE_VERSION}} + - name: Execute Goss tests (wazuh-odfe) + run: dgoss run wazuh/wazuh-manager:4.5.0 env: GOSS_SLEEP: 30 GOSS_FILE: .github/.goss.yaml diff --git a/CHANGELOG.md b/CHANGELOG.md index 5dab05b4..8b2686dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,10 @@ # Change Log All notable changes to this project will be documented in this file. -## Wazuh Docker v4.4.2 +## Wazuh Docker v4.5.0 ### Added -- Update Wazuh to version [4.4.2](https://github.com/wazuh/wazuh/blob/v4.4.2/CHANGELOG.md#v442) - -## Wazuh Docker v4.4.1 -### Added - -- Update Wazuh to version [4.4.1](https://github.com/wazuh/wazuh/blob/v4.4.1/CHANGELOG.md#v441) +- Update Wazuh to version [4.5.0](https://github.com/wazuh/wazuh/blob/v4.5.0/CHANGELOG.md#v450) ## Wazuh Docker v4.4.0 ### Added diff --git a/README.md b/README.md index 8619f3b7..76fd976f 100644 --- a/README.md +++ b/README.md @@ -195,8 +195,7 @@ WAZUH_MONITORING_REPLICAS=0 ## | Wazuh version | ODFE | XPACK | |---------------|---------|--------| -| v4.4.2 | | | -| v4.4.1 | | | +| v4.5.0 | | | | v4.4.0 | | | | v4.3.11 | | | | v4.3.10 | | | diff --git a/VERSION b/VERSION index ae0f3cc1..5a1911b6 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="4.4.2" -REVISION="40408" +WAZUH-DOCKER_VERSION="4.5.0" +REVISION="40500" diff --git a/build-docker-images/build-images.yml b/build-docker-images/build-images.yml index 52984bf9..92be9b38 100644 --- a/build-docker-images/build-images.yml +++ b/build-docker-images/build-images.yml @@ -3,12 +3,8 @@ version: '3.7' services: wazuh.manager: - build: - context: wazuh-manager/ - args: - WAZUH_VERSION: ${WAZUH_VERSION} - WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION} - image: wazuh/wazuh-manager:${WAZUH_IMAGE_VERSION} + build: wazuh-manager/ + image: wazuh/wazuh-manager:4.5.0 hostname: wazuh.manager restart: always ports: @@ -35,12 +31,8 @@ services: - filebeat_var:/var/lib/filebeat wazuh.indexer: - build: - context: wazuh-indexer/ - args: - WAZUH_VERSION: ${WAZUH_VERSION} - WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION} - image: wazuh/wazuh-indexer:${WAZUH_IMAGE_VERSION} + build: wazuh-indexer/ + image: wazuh/wazuh-indexer:4.5.0 hostname: wazuh.indexer restart: always ports: @@ -56,12 +48,8 @@ services: hard: 65536 wazuh.dashboard: - build: - context: wazuh-dashboard/ - args: - WAZUH_VERSION: ${WAZUH_VERSION} - WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION} - image: wazuh/wazuh-dashboard:${WAZUH_IMAGE_VERSION} + build: wazuh-dashboard/ + image: wazuh/wazuh-dashboard:4.5.0 hostname: wazuh.dashboard restart: always ports: diff --git a/build-docker-images/wazuh-dashboard/Dockerfile b/build-docker-images/wazuh-dashboard/Dockerfile index 1b95ca88..003d7d21 100644 --- a/build-docker-images/wazuh-dashboard/Dockerfile +++ b/build-docker-images/wazuh-dashboard/Dockerfile @@ -1,8 +1,7 @@ # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2) FROM ubuntu:focal AS builder -ARG WAZUH_VERSION -ARG WAZUH_TAG_REVISION +ARG WAZUH_VERSION=4.5.0 ARG INSTALL_DIR=/usr/share/wazuh-dashboard ARG WAZUH_UI_REVISION=1 diff --git a/build-docker-images/wazuh-dashboard/config/config.sh b/build-docker-images/wazuh-dashboard/config/config.sh index fb58ca0c..40e6ac67 100644 --- a/build-docker-images/wazuh-dashboard/config/config.sh +++ b/build-docker-images/wazuh-dashboard/config/config.sh @@ -9,8 +9,8 @@ export CONFIG_DIR=${INSTALLATION_DIR}/config ## Variables CERT_TOOL=wazuh-certs-tool.sh -PACKAGES_URL=https://packages.wazuh.com/4.4/ -PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.4/ +PACKAGES_URL=https://packages.wazuh.com/4.5/ +PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.5/ ## 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}') diff --git a/build-docker-images/wazuh-indexer/config/config.sh b/build-docker-images/wazuh-indexer/config/config.sh index c7f9522f..ea4ec95c 100644 --- a/build-docker-images/wazuh-indexer/config/config.sh +++ b/build-docker-images/wazuh-indexer/config/config.sh @@ -8,7 +8,7 @@ export TARGET_DIR=${CURDIR}/debian/${NAME} # Package build options export USER=${NAME} export GROUP=${NAME} -export VERSION=${WAZUH_VERSION}-${WAZUH_TAG_REVISION} +export VERSION=4.5.0 export LOG_DIR=/var/log/${NAME} export LIB_DIR=/var/lib/${NAME} export PID_DIR=/run/${NAME} @@ -53,8 +53,8 @@ tar -xf ${INDEXER_FILE} ## Variables CERT_TOOL=wazuh-certs-tool.sh PASSWORD_TOOL=wazuh-passwords-tool.sh -PACKAGES_URL=https://packages.wazuh.com/4.4/ -PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.4/ +PACKAGES_URL=https://packages.wazuh.com/4.5/ +PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.5/ ## 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}') diff --git a/build-docker-images/wazuh-manager/Dockerfile b/build-docker-images/wazuh-manager/Dockerfile index 6ac46be8..4d5f9d6c 100644 --- a/build-docker-images/wazuh-manager/Dockerfile +++ b/build-docker-images/wazuh-manager/Dockerfile @@ -1,11 +1,8 @@ # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2) FROM ubuntu:focal -RUN rm /bin/sh && ln -s /bin/bash /bin/sh - -ARG WAZUH_VERSION -ARG WAZUH_TAG_REVISION -ARG TEMPLATE_VERSION=4.4 +ARG WAZUH_VERSION=4.5.0 +ARG TEMPLATE_VERSION=4.5 ARG FILEBEAT_CHANNEL=filebeat-oss ARG FILEBEAT_VERSION=7.10.2 ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.2.tar.gz" diff --git a/indexer-certs-creator/config/entrypoint.sh b/indexer-certs-creator/config/entrypoint.sh index 1909e63e..3ee16ba9 100644 --- a/indexer-certs-creator/config/entrypoint.sh +++ b/indexer-certs-creator/config/entrypoint.sh @@ -8,8 +8,8 @@ ## Variables CERT_TOOL=wazuh-certs-tool.sh PASSWORD_TOOL=wazuh-passwords-tool.sh -PACKAGES_URL=https://packages.wazuh.com/4.4/ -PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.4/ +PACKAGES_URL=https://packages.wazuh.com/4.5/ +PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.5/ ## 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}') diff --git a/multi-node/config/wazuh_cluster/wazuh_worker.conf b/multi-node/config/wazuh_cluster/wazuh_worker.conf index 46fceb1e..6d5ffd93 100644 --- a/multi-node/config/wazuh_cluster/wazuh_worker.conf +++ b/multi-node/config/wazuh_cluster/wazuh_worker.conf @@ -222,6 +222,9 @@ 127.0.0.1 ^localhost.localdomain$ + 4.5.0.1 + 4.5.0.2 + 208.67.220.220 diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index 8d6d3149..a8403851 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.4.2 + image: wazuh/wazuh-manager:4.5.0 hostname: wazuh.master restart: always ports: @@ -38,7 +38,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.worker: - image: wazuh/wazuh-manager:4.4.2 + image: wazuh/wazuh-manager:4.5.0 hostname: wazuh.worker restart: always environment: @@ -67,7 +67,7 @@ services: - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf wazuh1.indexer: - image: wazuh/wazuh-indexer:4.4.2 + image: wazuh/wazuh-indexer:4.5.0 hostname: wazuh1.indexer restart: always ports: @@ -93,7 +93,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh2.indexer: - image: wazuh/wazuh-indexer:4.4.2 + image: wazuh/wazuh-indexer:4.5.0 hostname: wazuh2.indexer restart: always environment: @@ -115,7 +115,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh3.indexer: - image: wazuh/wazuh-indexer:4.4.2 + image: wazuh/wazuh-indexer:4.5.0 hostname: wazuh3.indexer restart: always environment: @@ -137,7 +137,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.4.2 + image: wazuh/wazuh-dashboard:4.5.0 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/config/wazuh_cluster/wazuh_manager.conf b/single-node/config/wazuh_cluster/wazuh_manager.conf index 4db508d6..25dec785 100644 --- a/single-node/config/wazuh_cluster/wazuh_manager.conf +++ b/single-node/config/wazuh_cluster/wazuh_manager.conf @@ -222,6 +222,9 @@ 127.0.0.1 ^localhost.localdomain$ + 4.5.0.1 + 4.5.0.2 + 208.67.220.220 diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index ddaacc13..358dece9 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.4.2 + image: wazuh/wazuh-manager:4.5.0 hostname: wazuh.manager restart: always ports: @@ -39,7 +39,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.indexer: - image: wazuh/wazuh-indexer:4.4.2 + image: wazuh/wazuh-indexer:4.5.0 hostname: wazuh.indexer restart: always ports: @@ -64,7 +64,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.4.2 + image: wazuh/wazuh-dashboard:4.5.0 hostname: wazuh.dashboard restart: always ports: From c6f1f31d57a25368027b78e803ac63f519422561 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 23 May 2022 10:02:54 -0300 Subject: [PATCH 08/16] bump release 4.5.0 --- multi-node/config/wazuh_cluster/wazuh_worker.conf | 4 ++-- single-node/config/wazuh_cluster/wazuh_manager.conf | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/multi-node/config/wazuh_cluster/wazuh_worker.conf b/multi-node/config/wazuh_cluster/wazuh_worker.conf index 6d5ffd93..933a3277 100644 --- a/multi-node/config/wazuh_cluster/wazuh_worker.conf +++ b/multi-node/config/wazuh_cluster/wazuh_worker.conf @@ -222,8 +222,8 @@ 127.0.0.1 ^localhost.localdomain$ - 4.5.0.1 - 4.5.0.2 + 4.4.0.1 + 4.4.0.2 208.67.220.220 diff --git a/single-node/config/wazuh_cluster/wazuh_manager.conf b/single-node/config/wazuh_cluster/wazuh_manager.conf index 25dec785..6a622d98 100644 --- a/single-node/config/wazuh_cluster/wazuh_manager.conf +++ b/single-node/config/wazuh_cluster/wazuh_manager.conf @@ -222,8 +222,8 @@ 127.0.0.1 ^localhost.localdomain$ - 4.5.0.1 - 4.5.0.2 + 4.4.0.1 + 4.4.0.2 208.67.220.220 From 08314f9e2eaa44070cea89273012f69fe4c92ebf Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 23 May 2022 10:45:23 -0300 Subject: [PATCH 09/16] bump release 4.5.0 --- multi-node/config/wazuh_cluster/wazuh_worker.conf | 3 --- single-node/config/wazuh_cluster/wazuh_manager.conf | 3 --- 2 files changed, 6 deletions(-) diff --git a/multi-node/config/wazuh_cluster/wazuh_worker.conf b/multi-node/config/wazuh_cluster/wazuh_worker.conf index 933a3277..46fceb1e 100644 --- a/multi-node/config/wazuh_cluster/wazuh_worker.conf +++ b/multi-node/config/wazuh_cluster/wazuh_worker.conf @@ -222,9 +222,6 @@ 127.0.0.1 ^localhost.localdomain$ - 4.4.0.1 - 4.4.0.2 - 208.67.220.220 diff --git a/single-node/config/wazuh_cluster/wazuh_manager.conf b/single-node/config/wazuh_cluster/wazuh_manager.conf index 6a622d98..4db508d6 100644 --- a/single-node/config/wazuh_cluster/wazuh_manager.conf +++ b/single-node/config/wazuh_cluster/wazuh_manager.conf @@ -222,9 +222,6 @@ 127.0.0.1 ^localhost.localdomain$ - 4.4.0.1 - 4.4.0.2 - 208.67.220.220 From ae20f302c01759148920dcd361f10fe9783aaa3e Mon Sep 17 00:00:00 2001 From: fcaffieri Date: Fri, 1 Jul 2022 17:43:53 -0300 Subject: [PATCH 10/16] disable filebeat metrics --- build-docker-images/wazuh-manager/config/filebeat.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/build-docker-images/wazuh-manager/config/filebeat.yml b/build-docker-images/wazuh-manager/config/filebeat.yml index 8d1823af..8beed808 100644 --- a/build-docker-images/wazuh-manager/config/filebeat.yml +++ b/build-docker-images/wazuh-manager/config/filebeat.yml @@ -22,10 +22,3 @@ output.elasticsearch: #ssl.key: logging.metrics.enabled: false - -seccomp: - default_action: allow - syscalls: - - action: allow - names: - - rseq From 887293d4741ff90098110a077218b09abc625fe5 Mon Sep 17 00:00:00 2001 From: fcaffieri Date: Wed, 6 Jul 2022 17:35:35 -0300 Subject: [PATCH 11/16] Add fix to avoid GLIBC crash --- build-docker-images/wazuh-manager/config/filebeat.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build-docker-images/wazuh-manager/config/filebeat.yml b/build-docker-images/wazuh-manager/config/filebeat.yml index 8beed808..fcf80c3e 100644 --- a/build-docker-images/wazuh-manager/config/filebeat.yml +++ b/build-docker-images/wazuh-manager/config/filebeat.yml @@ -22,3 +22,10 @@ output.elasticsearch: #ssl.key: logging.metrics.enabled: false + +seccomp: +default_action: allow +syscalls: +- action: allow + names: + - rseq From e95455a12b2502263a4ad9a4c5b514a761a5d5d2 Mon Sep 17 00:00:00 2001 From: fcaffieri Date: Wed, 6 Jul 2022 18:02:28 -0300 Subject: [PATCH 12/16] Add fix to avoid GLIBC crash, fix identation --- build-docker-images/wazuh-manager/config/filebeat.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build-docker-images/wazuh-manager/config/filebeat.yml b/build-docker-images/wazuh-manager/config/filebeat.yml index fcf80c3e..8d1823af 100644 --- a/build-docker-images/wazuh-manager/config/filebeat.yml +++ b/build-docker-images/wazuh-manager/config/filebeat.yml @@ -24,8 +24,8 @@ output.elasticsearch: logging.metrics.enabled: false seccomp: -default_action: allow -syscalls: -- action: allow - names: - - rseq + default_action: allow + syscalls: + - action: allow + names: + - rseq From 0d76a85ded731f49865af042d1e70ddbe9a8dd0c Mon Sep 17 00:00:00 2001 From: vcerenu Date: Fri, 22 Jul 2022 13:55:36 -0300 Subject: [PATCH 13/16] bump 4.3 into master --- build-docker-images/build-images.sh | 2 +- build-docker-images/build-images.yml | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index 11886cc2..23b96a15 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -1,4 +1,4 @@ -WAZUH_IMAGE_VERSION=4.4.2 +WAZUH_IMAGE_VERSION=4.5.0 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/build-docker-images/build-images.yml b/build-docker-images/build-images.yml index 92be9b38..f65c26be 100644 --- a/build-docker-images/build-images.yml +++ b/build-docker-images/build-images.yml @@ -31,8 +31,12 @@ services: - filebeat_var:/var/lib/filebeat wazuh.indexer: - build: wazuh-indexer/ - image: wazuh/wazuh-indexer:4.5.0 + build: + context: wazuh-indexer/ + args: + WAZUH_VERSION: ${WAZUH_VERSION} + WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION} + image: wazuh/wazuh-indexer:${WAZUH_IMAGE_VERSION} hostname: wazuh.indexer restart: always ports: @@ -48,8 +52,12 @@ services: hard: 65536 wazuh.dashboard: - build: wazuh-dashboard/ - image: wazuh/wazuh-dashboard:4.5.0 + build: + context: wazuh-dashboard/ + args: + WAZUH_VERSION: ${WAZUH_VERSION} + WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION} + image: wazuh/wazuh-dashboard:${WAZUH_IMAGE_VERSION} hostname: wazuh.dashboard restart: always ports: From 137989ddd1e1befef28a22ed2374821335519e2e Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 17 Oct 2022 10:23:59 -0300 Subject: [PATCH 14/16] bump 4.3 into master --- .env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env b/.env index d4169289..096b9644 100755 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ -WAZUH_VERSION=4.4.2 -WAZUH_IMAGE_VERSION=4.4.2 +WAZUH_VERSION=4.5.0 +WAZUH_IMAGE_VERSION=4.5.0 WAZUH_TAG_REVISION=1 From e826236a28270255c78209021aafdd984cd9eeda Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Thu, 18 May 2023 21:30:38 +0200 Subject: [PATCH 15/16] Added missing config --- .github/.goss.yaml | 2 +- .github/workflows/push.yml | 4 ++-- CHANGELOG.md | 12 +++++++++++- README.md | 2 ++ build-docker-images/build-images.yml | 8 ++++++-- build-docker-images/wazuh-dashboard/Dockerfile | 3 ++- build-docker-images/wazuh-indexer/config/config.sh | 2 +- build-docker-images/wazuh-manager/Dockerfile | 5 ++++- 8 files changed, 29 insertions(+), 9 deletions(-) diff --git a/.github/.goss.yaml b/.github/.goss.yaml index 76e84db8..1b5128fd 100644 --- a/.github/.goss.yaml +++ b/.github/.goss.yaml @@ -56,7 +56,7 @@ package: wazuh-manager: installed: true versions: - - 4.5.0 + - 4.5.0-1 port: tcp:1514: listening: true diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 3c84f3f9..51077968 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -49,8 +49,8 @@ jobs: with: version: v0.3.16 - - name: Execute Goss tests (wazuh-odfe) - run: dgoss run wazuh/wazuh-manager:4.5.0 + - name: Execute Goss tests (wazuh-manager) + run: dgoss run wazuh/wazuh-manager:${{env.WAZUH_IMAGE_VERSION}} env: GOSS_SLEEP: 30 GOSS_FILE: .github/.goss.yaml diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b2686dc..846e139c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,16 @@ All notable changes to this project will be documented in this file. - Update Wazuh to version [4.5.0](https://github.com/wazuh/wazuh/blob/v4.5.0/CHANGELOG.md#v450) +## Wazuh Docker v4.4.2 +### Added + +- Update Wazuh to version [4.4.2](https://github.com/wazuh/wazuh/blob/v4.4.2/CHANGELOG.md#v442) + +## Wazuh Docker v4.4.1 +### Added + +- Update Wazuh to version [4.4.1](https://github.com/wazuh/wazuh/blob/v4.4.1/CHANGELOG.md#v441) + ## Wazuh Docker v4.4.0 ### Added @@ -14,7 +24,7 @@ All notable changes to this project will be documented in this file. ## Wazuh Docker v4.3.11 ### Added -- Update Wazuh to version [4.3.11](https://github.com/wazuh/wazuh/blob/v4.3.11/CHANGELOG.md#v4310) +- Update Wazuh to version [4.3.11](https://github.com/wazuh/wazuh/blob/v4.3.11/CHANGELOG.md#v4311) ## Wazuh Docker v4.3.10 ### Added diff --git a/README.md b/README.md index 76fd976f..e5feee46 100644 --- a/README.md +++ b/README.md @@ -196,6 +196,8 @@ WAZUH_MONITORING_REPLICAS=0 ## | Wazuh version | ODFE | XPACK | |---------------|---------|--------| | v4.5.0 | | | +| v4.4.2 | | | +| v4.4.1 | | | | v4.4.0 | | | | v4.3.11 | | | | v4.3.10 | | | diff --git a/build-docker-images/build-images.yml b/build-docker-images/build-images.yml index f65c26be..52984bf9 100644 --- a/build-docker-images/build-images.yml +++ b/build-docker-images/build-images.yml @@ -3,8 +3,12 @@ version: '3.7' services: wazuh.manager: - build: wazuh-manager/ - image: wazuh/wazuh-manager:4.5.0 + build: + context: wazuh-manager/ + args: + WAZUH_VERSION: ${WAZUH_VERSION} + WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION} + image: wazuh/wazuh-manager:${WAZUH_IMAGE_VERSION} hostname: wazuh.manager restart: always ports: diff --git a/build-docker-images/wazuh-dashboard/Dockerfile b/build-docker-images/wazuh-dashboard/Dockerfile index 003d7d21..1b95ca88 100644 --- a/build-docker-images/wazuh-dashboard/Dockerfile +++ b/build-docker-images/wazuh-dashboard/Dockerfile @@ -1,7 +1,8 @@ # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2) FROM ubuntu:focal AS builder -ARG WAZUH_VERSION=4.5.0 +ARG WAZUH_VERSION +ARG WAZUH_TAG_REVISION ARG INSTALL_DIR=/usr/share/wazuh-dashboard ARG WAZUH_UI_REVISION=1 diff --git a/build-docker-images/wazuh-indexer/config/config.sh b/build-docker-images/wazuh-indexer/config/config.sh index ea4ec95c..82a7c50d 100644 --- a/build-docker-images/wazuh-indexer/config/config.sh +++ b/build-docker-images/wazuh-indexer/config/config.sh @@ -8,7 +8,7 @@ export TARGET_DIR=${CURDIR}/debian/${NAME} # Package build options export USER=${NAME} export GROUP=${NAME} -export VERSION=4.5.0 +export VERSION=${WAZUH_VERSION}-${WAZUH_TAG_REVISION} export LOG_DIR=/var/log/${NAME} export LIB_DIR=/var/lib/${NAME} export PID_DIR=/run/${NAME} diff --git a/build-docker-images/wazuh-manager/Dockerfile b/build-docker-images/wazuh-manager/Dockerfile index 4d5f9d6c..c1894489 100644 --- a/build-docker-images/wazuh-manager/Dockerfile +++ b/build-docker-images/wazuh-manager/Dockerfile @@ -1,7 +1,10 @@ # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2) FROM ubuntu:focal -ARG WAZUH_VERSION=4.5.0 +RUN rm /bin/sh && ln -s /bin/bash /bin/sh + +ARG WAZUH_VERSION +ARG WAZUH_TAG_REVISION ARG TEMPLATE_VERSION=4.5 ARG FILEBEAT_CHANNEL=filebeat-oss ARG FILEBEAT_VERSION=7.10.2 From 8e3b8aada862a62835a1c6e432b319e1021884d7 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Fri, 23 Jun 2023 10:33:35 -0300 Subject: [PATCH 16/16] bump 4.6 version --- .env | 4 ++-- .github/.goss.yaml | 2 +- CHANGELOG.md | 5 +++++ README.md | 1 + VERSION | 4 ++-- build-docker-images/build-images.sh | 2 +- build-docker-images/wazuh-dashboard/config/config.sh | 4 ++-- build-docker-images/wazuh-indexer/config/config.sh | 4 ++-- build-docker-images/wazuh-manager/Dockerfile | 2 +- indexer-certs-creator/config/entrypoint.sh | 4 ++-- multi-node/docker-compose.yml | 12 ++++++------ single-node/docker-compose.yml | 6 +++--- 12 files changed, 28 insertions(+), 22 deletions(-) diff --git a/.env b/.env index 096b9644..d51cc0c4 100755 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ -WAZUH_VERSION=4.5.0 -WAZUH_IMAGE_VERSION=4.5.0 +WAZUH_VERSION=4.6.0 +WAZUH_IMAGE_VERSION=4.6.0 WAZUH_TAG_REVISION=1 diff --git a/.github/.goss.yaml b/.github/.goss.yaml index 1b5128fd..c4244c3e 100644 --- a/.github/.goss.yaml +++ b/.github/.goss.yaml @@ -56,7 +56,7 @@ package: wazuh-manager: installed: true versions: - - 4.5.0-1 + - 4.6.0-1 port: tcp:1514: listening: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 4624d8e6..136dd505 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.6.0 +### Added + +- Update Wazuh to version [4.6.0](https://github.com/wazuh/wazuh/blob/v4.6.0/CHANGELOG.md#v460) + ## Wazuh Docker v4.5.0 ### Added diff --git a/README.md b/README.md index f99781c0..8a9df5c9 100644 --- a/README.md +++ b/README.md @@ -195,6 +195,7 @@ WAZUH_MONITORING_REPLICAS=0 ## | Wazuh version | ODFE | XPACK | |---------------|---------|--------| +| v4.6.0 | | | | v4.5.0 | | | | v4.4.5 | | | | v4.4.4 | | | diff --git a/VERSION b/VERSION index 5a1911b6..bcd17c34 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="4.5.0" -REVISION="40500" +WAZUH-DOCKER_VERSION="4.6.0" +REVISION="40600" diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index 23b96a15..09644c70 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -1,4 +1,4 @@ -WAZUH_IMAGE_VERSION=4.5.0 +WAZUH_IMAGE_VERSION=4.6.0 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/build-docker-images/wazuh-dashboard/config/config.sh b/build-docker-images/wazuh-dashboard/config/config.sh index 40e6ac67..94719b93 100644 --- a/build-docker-images/wazuh-dashboard/config/config.sh +++ b/build-docker-images/wazuh-dashboard/config/config.sh @@ -9,8 +9,8 @@ export CONFIG_DIR=${INSTALLATION_DIR}/config ## Variables CERT_TOOL=wazuh-certs-tool.sh -PACKAGES_URL=https://packages.wazuh.com/4.5/ -PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.5/ +PACKAGES_URL=https://packages.wazuh.com/4.6/ +PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.6/ ## 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}') diff --git a/build-docker-images/wazuh-indexer/config/config.sh b/build-docker-images/wazuh-indexer/config/config.sh index 82a7c50d..adfae164 100644 --- a/build-docker-images/wazuh-indexer/config/config.sh +++ b/build-docker-images/wazuh-indexer/config/config.sh @@ -53,8 +53,8 @@ tar -xf ${INDEXER_FILE} ## Variables CERT_TOOL=wazuh-certs-tool.sh PASSWORD_TOOL=wazuh-passwords-tool.sh -PACKAGES_URL=https://packages.wazuh.com/4.5/ -PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.5/ +PACKAGES_URL=https://packages.wazuh.com/4.6/ +PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.6/ ## 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}') diff --git a/build-docker-images/wazuh-manager/Dockerfile b/build-docker-images/wazuh-manager/Dockerfile index c1894489..da310bd6 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=4.5 +ARG TEMPLATE_VERSION=4.6 ARG FILEBEAT_CHANNEL=filebeat-oss ARG FILEBEAT_VERSION=7.10.2 ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.2.tar.gz" diff --git a/indexer-certs-creator/config/entrypoint.sh b/indexer-certs-creator/config/entrypoint.sh index 3ee16ba9..7568812a 100644 --- a/indexer-certs-creator/config/entrypoint.sh +++ b/indexer-certs-creator/config/entrypoint.sh @@ -8,8 +8,8 @@ ## Variables CERT_TOOL=wazuh-certs-tool.sh PASSWORD_TOOL=wazuh-passwords-tool.sh -PACKAGES_URL=https://packages.wazuh.com/4.5/ -PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.5/ +PACKAGES_URL=https://packages.wazuh.com/4.6/ +PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.6/ ## 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}') diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index a8403851..cc04171c 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.0 + image: wazuh/wazuh-manager:4.6.0 hostname: wazuh.master restart: always ports: @@ -38,7 +38,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.worker: - image: wazuh/wazuh-manager:4.5.0 + image: wazuh/wazuh-manager:4.6.0 hostname: wazuh.worker restart: always environment: @@ -67,7 +67,7 @@ services: - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf wazuh1.indexer: - image: wazuh/wazuh-indexer:4.5.0 + image: wazuh/wazuh-indexer:4.6.0 hostname: wazuh1.indexer restart: always ports: @@ -93,7 +93,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.0 + image: wazuh/wazuh-indexer:4.6.0 hostname: wazuh2.indexer restart: always environment: @@ -115,7 +115,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.0 + image: wazuh/wazuh-indexer:4.6.0 hostname: wazuh3.indexer restart: always environment: @@ -137,7 +137,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.0 + image: wazuh/wazuh-dashboard:4.6.0 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 358dece9..94db30d6 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.0 + image: wazuh/wazuh-manager:4.6.0 hostname: wazuh.manager restart: always ports: @@ -39,7 +39,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.indexer: - image: wazuh/wazuh-indexer:4.5.0 + image: wazuh/wazuh-indexer:4.6.0 hostname: wazuh.indexer restart: always ports: @@ -64,7 +64,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.0 + image: wazuh/wazuh-dashboard:4.6.0 hostname: wazuh.dashboard restart: always ports: