From 08c9b954555c0ffd2b21ed5ddc3979b918ab7558 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 10 Apr 2023 11:20:22 -0300 Subject: [PATCH 01/42] 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/42] 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/42] 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/42] 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/42] 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/42] 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/42] 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/42] 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/42] 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/42] 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/42] 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/42] 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/42] 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/42] 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/42] 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/42] 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: From 757e5dbf0580df1c691e564a922c41317a738151 Mon Sep 17 00:00:00 2001 From: pereyra-m Date: Mon, 7 Aug 2023 17:32:03 -0300 Subject: [PATCH 17/42] Updating ossec.conf file with the AlmaLinux support in the vulnerability detector section --- multi-node/config/wazuh_cluster/wazuh_manager.conf | 10 +++++++++- multi-node/config/wazuh_cluster/wazuh_worker.conf | 10 +++++++++- single-node/config/wazuh_cluster/wazuh_manager.conf | 8 ++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/multi-node/config/wazuh_cluster/wazuh_manager.conf b/multi-node/config/wazuh_cluster/wazuh_manager.conf index aec223a1..57762c16 100644 --- a/multi-node/config/wazuh_cluster/wazuh_manager.conf +++ b/multi-node/config/wazuh_cluster/wazuh_manager.conf @@ -150,6 +150,14 @@ 1h + + + no + 8 + 9 + 1h + + yes @@ -354,4 +362,4 @@ /var/log/dpkg.log - \ No newline at end of file + diff --git a/multi-node/config/wazuh_cluster/wazuh_worker.conf b/multi-node/config/wazuh_cluster/wazuh_worker.conf index 46fceb1e..28d0e536 100644 --- a/multi-node/config/wazuh_cluster/wazuh_worker.conf +++ b/multi-node/config/wazuh_cluster/wazuh_worker.conf @@ -144,6 +144,14 @@ 1h + + + no + 8 + 9 + 1h + + yes @@ -354,4 +362,4 @@ /var/log/dpkg.log - \ No newline at end of file + diff --git a/single-node/config/wazuh_cluster/wazuh_manager.conf b/single-node/config/wazuh_cluster/wazuh_manager.conf index 4db508d6..87403cde 100644 --- a/single-node/config/wazuh_cluster/wazuh_manager.conf +++ b/single-node/config/wazuh_cluster/wazuh_manager.conf @@ -144,6 +144,14 @@ 1h + + + no + 8 + 9 + 1h + + yes From 44e9bebed0d1aefcf9fd5ddf65ec94a6d84e6f5b Mon Sep 17 00:00:00 2001 From: Mateo Cervilla Date: Fri, 25 Aug 2023 12:24:01 -0300 Subject: [PATCH 18/42] Add Debian Bookworm VDT support --- multi-node/config/wazuh_cluster/wazuh_manager.conf | 1 + multi-node/config/wazuh_cluster/wazuh_worker.conf | 1 + single-node/config/wazuh_cluster/wazuh_manager.conf | 1 + 3 files changed, 3 insertions(+) diff --git a/multi-node/config/wazuh_cluster/wazuh_manager.conf b/multi-node/config/wazuh_cluster/wazuh_manager.conf index 2af34bc4..7286218c 100644 --- a/multi-node/config/wazuh_cluster/wazuh_manager.conf +++ b/multi-node/config/wazuh_cluster/wazuh_manager.conf @@ -117,6 +117,7 @@ no buster bullseye + bookworm 1h diff --git a/multi-node/config/wazuh_cluster/wazuh_worker.conf b/multi-node/config/wazuh_cluster/wazuh_worker.conf index 2fdbb305..8f462263 100644 --- a/multi-node/config/wazuh_cluster/wazuh_worker.conf +++ b/multi-node/config/wazuh_cluster/wazuh_worker.conf @@ -117,6 +117,7 @@ no buster bullseye + bookworm 1h diff --git a/single-node/config/wazuh_cluster/wazuh_manager.conf b/single-node/config/wazuh_cluster/wazuh_manager.conf index 63202e48..96dbb367 100644 --- a/single-node/config/wazuh_cluster/wazuh_manager.conf +++ b/single-node/config/wazuh_cluster/wazuh_manager.conf @@ -117,6 +117,7 @@ no buster bullseye + bookworm 1h From b18c06865039492e3e8c4e5ab1c3c8f0d87b404d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Thu, 7 Sep 2023 13:58:32 +0200 Subject: [PATCH 19/42] Added empty line to changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f6396232..362629b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file. ### Added - Update Wazuh to version [4.6.0](https://github.com/wazuh/wazuh/blob/v4.6.0/CHANGELOG.md#v460) + ## Wazuh Docker v4.5.3 ### Added From 63817dfd55772c178e5a51facbcbed705e342b08 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Thu, 7 Sep 2023 12:15:25 -0300 Subject: [PATCH 20/42] add extensions for wazuh.yml --- build-docker-images/wazuh-dashboard/Dockerfile | 2 ++ build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/build-docker-images/wazuh-dashboard/Dockerfile b/build-docker-images/wazuh-dashboard/Dockerfile index 1b95ca88..5c3689e9 100644 --- a/build-docker-images/wazuh-dashboard/Dockerfile +++ b/build-docker-images/wazuh-dashboard/Dockerfile @@ -66,6 +66,8 @@ ENV PATTERN="" \ EXTENSIONS_CISCAT="" \ EXTENSIONS_AWS="" \ EXTENSIONS_GCP="" \ + EXTENSIONS_GITHUB=""\ + EXTENSIONS_OFFICE=""\ EXTENSIONS_VIRUSTOTAL="" \ EXTENSIONS_OSQUERY="" \ EXTENSIONS_DOCKER="" \ diff --git a/build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh b/build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh index 2457315a..4773d45d 100644 --- a/build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh +++ b/build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh @@ -25,6 +25,8 @@ declare -A CONFIG_MAP=( [extensions.ciscat]=$EXTENSIONS_CISCAT [extensions.aws]=$EXTENSIONS_AWS [extensions.gcp]=$EXTENSIONS_GCP + [extensions.github]=$EXTENSIONS_GITHUB + [extensions.office]=$EXTENSIONS_OFFICE [extensions.virustotal]=$EXTENSIONS_VIRUSTOTAL [extensions.osquery]=$EXTENSIONS_OSQUERY [extensions.docker]=$EXTENSIONS_DOCKER From de7754364d49ef6b8922989be19c9bff143faed4 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 12 Sep 2023 15:49:31 -0300 Subject: [PATCH 21/42] change wazuh template origin --- build-docker-images/wazuh-manager/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-docker-images/wazuh-manager/Dockerfile b/build-docker-images/wazuh-manager/Dockerfile index da310bd6..ad3d5aa6 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.6 +ARG TEMPLATE_VERSION=v4.6.0 ARG FILEBEAT_CHANNEL=filebeat-oss ARG FILEBEAT_VERSION=7.10.2 ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.2.tar.gz" @@ -54,4 +54,4 @@ RUN chmod 755 /permanent_data.sh && \ # Services ports EXPOSE 55000/tcp 1514/tcp 1515/tcp 514/udp 1516/tcp -ENTRYPOINT [ "/init" ] \ No newline at end of file +ENTRYPOINT [ "/init" ] From 5769159cf9e886e48c02162aa323dbef95a42a41 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 18 Sep 2023 12:05:29 -0300 Subject: [PATCH 22/42] change RBAC database procedure --- build-docker-images/wazuh-manager/config/create_user.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-docker-images/wazuh-manager/config/create_user.py b/build-docker-images/wazuh-manager/config/create_user.py index e2a89325..3bb6bb6c 100644 --- a/build-docker-images/wazuh-manager/config/create_user.py +++ b/build-docker-images/wazuh-manager/config/create_user.py @@ -13,7 +13,7 @@ SPECIAL_CHARS = "@$!%*?&-_" try: - from wazuh.rbac.orm import create_rbac_db + from wazuh.rbac.orm import check_database_integrity from wazuh.security import ( create_user, get_users, @@ -69,7 +69,7 @@ if __name__ == "__main__": username, password = read_user_file() # create RBAC database - create_rbac_db() + check_database_integrity() initial_users = db_users() if username not in initial_users: From 7d5b1c4f85098c5d428a2b90a8f3dda0f564cc98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Fri, 22 Sep 2023 14:37:02 -0300 Subject: [PATCH 23/42] Revision Bump --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index bcd17c34..336afe81 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="4.6.0" -REVISION="40600" +REVISION="40601" From d5dc67e9c37897c923b660596cbd1a510ed9d24a Mon Sep 17 00:00:00 2001 From: c-bordon Date: Thu, 28 Sep 2023 10:37:08 -0300 Subject: [PATCH 24/42] Fixing Wazuh indexer files permissions --- build-docker-images/wazuh-indexer/config/config.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/build-docker-images/wazuh-indexer/config/config.sh b/build-docker-images/wazuh-indexer/config/config.sh index adfae164..97fbac85 100644 --- a/build-docker-images/wazuh-indexer/config/config.sh +++ b/build-docker-images/wazuh-indexer/config/config.sh @@ -135,4 +135,10 @@ sed '/-Xms/d' -i ${TARGET_DIR}${CONFIG_DIR}/jvm.options sed '/-Xmx/d' -i ${TARGET_DIR}${CONFIG_DIR}/jvm.options chmod -R 500 ${TARGET_DIR}${CONFIG_DIR}/certs -chmod -R 400 ${TARGET_DIR}${CONFIG_DIR}/certs/* \ No newline at end of file +chmod -R 400 ${TARGET_DIR}${CONFIG_DIR}/certs/* + +find ${TARGET_DIR} -type d -exec chmod 750 {} \; +find ${TARGET_DIR} -type f -perm 644 -exec chmod 640 {} \; +find ${TARGET_DIR} -type f -perm 664 -exec chmod 660 {} \; +find ${TARGET_DIR} -type f -perm 755 -exec chmod 750 {} \; +find ${TARGET_DIR} -type f -perm 744 -exec chmod 740 {} \; \ No newline at end of file From d9b053caf46bdc538c7ab6360a897ed97c146c19 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Thu, 28 Sep 2023 12:48:38 -0300 Subject: [PATCH 25/42] Testing with another dir for opensearch security policy --- build-docker-images/wazuh-indexer/config/config.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-docker-images/wazuh-indexer/config/config.sh b/build-docker-images/wazuh-indexer/config/config.sh index 97fbac85..24149002 100644 --- a/build-docker-images/wazuh-indexer/config/config.sh +++ b/build-docker-images/wazuh-indexer/config/config.sh @@ -133,6 +133,8 @@ cp -pr /wazuh-certificates/admin-key.pem ${TARGET_DIR}${CONFIG_DIR}/certs/admin- # Delete xms and xmx parameters in jvm.options sed '/-Xms/d' -i ${TARGET_DIR}${CONFIG_DIR}/jvm.options sed '/-Xmx/d' -i ${TARGET_DIR}${CONFIG_DIR}/jvm.options +sed -i '|-Djava.security.policy=file:\/\/\/etc\/wazuh-indexer\/opensearch-performance-analyzer\/opensearch_security.policy|-Djava.security.policy=file:\/\/\/usr\/share\/wazuh-indexer\/opensearch-performance-analyzer\/opensearch_security.policy|' ${TARGET_DIR}${CONFIG_DIR}/jvm.options + chmod -R 500 ${TARGET_DIR}${CONFIG_DIR}/certs chmod -R 400 ${TARGET_DIR}${CONFIG_DIR}/certs/* From 8fa20abbbd8c717d4ceadeda6fc089ac3160b090 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Thu, 28 Sep 2023 14:29:53 -0300 Subject: [PATCH 26/42] Fixed sed command --- build-docker-images/wazuh-indexer/config/config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-docker-images/wazuh-indexer/config/config.sh b/build-docker-images/wazuh-indexer/config/config.sh index 24149002..00540eef 100644 --- a/build-docker-images/wazuh-indexer/config/config.sh +++ b/build-docker-images/wazuh-indexer/config/config.sh @@ -133,7 +133,7 @@ cp -pr /wazuh-certificates/admin-key.pem ${TARGET_DIR}${CONFIG_DIR}/certs/admin- # Delete xms and xmx parameters in jvm.options sed '/-Xms/d' -i ${TARGET_DIR}${CONFIG_DIR}/jvm.options sed '/-Xmx/d' -i ${TARGET_DIR}${CONFIG_DIR}/jvm.options -sed -i '|-Djava.security.policy=file:\/\/\/etc\/wazuh-indexer\/opensearch-performance-analyzer\/opensearch_security.policy|-Djava.security.policy=file:\/\/\/usr\/share\/wazuh-indexer\/opensearch-performance-analyzer\/opensearch_security.policy|' ${TARGET_DIR}${CONFIG_DIR}/jvm.options +sed -i 's/-Djava.security.policy=file:\/\/\/etc\/wazuh-indexer\/opensearch-performance-analyzer\/opensearch_security.policy/-Djava.security.policy=file:\/\/\/usr\/share\/wazuh-indexer\/opensearch-performance-analyzer\/opensearch_security.policy/g' ${TARGET_DIR}${CONFIG_DIR}/jvm.options chmod -R 500 ${TARGET_DIR}${CONFIG_DIR}/certs From 23d34f6a8988099887a02f76c881133bf290feb4 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Mon, 2 Oct 2023 08:27:49 -0300 Subject: [PATCH 27/42] Fixed OpenSearch security plugin warnings --- build-docker-images/wazuh-indexer/config/config.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/build-docker-images/wazuh-indexer/config/config.sh b/build-docker-images/wazuh-indexer/config/config.sh index 00540eef..7d9dc129 100644 --- a/build-docker-images/wazuh-indexer/config/config.sh +++ b/build-docker-images/wazuh-indexer/config/config.sh @@ -143,4 +143,14 @@ find ${TARGET_DIR} -type d -exec chmod 750 {} \; find ${TARGET_DIR} -type f -perm 644 -exec chmod 640 {} \; find ${TARGET_DIR} -type f -perm 664 -exec chmod 660 {} \; find ${TARGET_DIR} -type f -perm 755 -exec chmod 750 {} \; -find ${TARGET_DIR} -type f -perm 744 -exec chmod 740 {} \; \ No newline at end of file +find ${TARGET_DIR} -type f -perm 744 -exec chmod 740 {} \; + +chmod -R 0700 ${TARGET_DIR}/.cache +chmod 0700 ${TARGET_DIR}/extensions +chmod 0700 ${TARGET_DIR}/logs +chmod 0600 ${TARGET_DIR}/opensearch.yml +find ${TARGET_DIR}/bin -type f -exec chmod 0600 {} \; +find ${TARGET_DIR}/jdk/bin -type f -exec chmod 0600 {} \; +chmod 0600 ${TARGET_DIR}/opensearch-security/internal_users.yml +find ${TARGET_DIR}/performance-analyzer-rca/bin -type f -exec chmod 0600 {} \; +chmod 0600 ${TARGET_DIR}/plugins/opensearch-security/tools/wazuh-certs-tool.sh From 905b4de859b01ee7ef557e0143d7f4b53a3524cc Mon Sep 17 00:00:00 2001 From: c-bordon Date: Mon, 2 Oct 2023 08:49:17 -0300 Subject: [PATCH 28/42] Testing change permissions in entrypoint --- build-docker-images/wazuh-indexer/config/config.sh | 10 ---------- .../wazuh-indexer/config/entrypoint.sh | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/build-docker-images/wazuh-indexer/config/config.sh b/build-docker-images/wazuh-indexer/config/config.sh index 7d9dc129..30f5d1f2 100644 --- a/build-docker-images/wazuh-indexer/config/config.sh +++ b/build-docker-images/wazuh-indexer/config/config.sh @@ -144,13 +144,3 @@ find ${TARGET_DIR} -type f -perm 644 -exec chmod 640 {} \; find ${TARGET_DIR} -type f -perm 664 -exec chmod 660 {} \; find ${TARGET_DIR} -type f -perm 755 -exec chmod 750 {} \; find ${TARGET_DIR} -type f -perm 744 -exec chmod 740 {} \; - -chmod -R 0700 ${TARGET_DIR}/.cache -chmod 0700 ${TARGET_DIR}/extensions -chmod 0700 ${TARGET_DIR}/logs -chmod 0600 ${TARGET_DIR}/opensearch.yml -find ${TARGET_DIR}/bin -type f -exec chmod 0600 {} \; -find ${TARGET_DIR}/jdk/bin -type f -exec chmod 0600 {} \; -chmod 0600 ${TARGET_DIR}/opensearch-security/internal_users.yml -find ${TARGET_DIR}/performance-analyzer-rca/bin -type f -exec chmod 0600 {} \; -chmod 0600 ${TARGET_DIR}/plugins/opensearch-security/tools/wazuh-certs-tool.sh diff --git a/build-docker-images/wazuh-indexer/config/entrypoint.sh b/build-docker-images/wazuh-indexer/config/entrypoint.sh index 2acb4aa0..e4ff811e 100644 --- a/build-docker-images/wazuh-indexer/config/entrypoint.sh +++ b/build-docker-images/wazuh-indexer/config/entrypoint.sh @@ -13,6 +13,20 @@ export CACERT=$(grep -oP "(?<=plugins.security.ssl.transport.pemtrustedcas_filep export CERT="${OPENSEARCH_PATH_CONF}/certs/admin.pem" export KEY="${OPENSEARCH_PATH_CONF}/certs/admin-key.pem" + +# Fix OpenSearch security plugin permissions + +chmod -R 0700 ${TARGET_DIR}/.cache +chmod 0700 ${TARGET_DIR}/extensions +chmod 0700 ${TARGET_DIR}/logs +chmod 0600 ${TARGET_DIR}/opensearch.yml +find ${TARGET_DIR}/bin -type f -exec chmod 0600 {} \; +find ${TARGET_DIR}/jdk/bin -type f -exec chmod 0600 {} \; +chmod 0600 ${TARGET_DIR}/opensearch-security/internal_users.yml +find ${TARGET_DIR}/performance-analyzer-rca/bin -type f -exec chmod 0600 {} \; +chmod 0600 ${TARGET_DIR}/plugins/opensearch-security/tools/wazuh-certs-tool.sh + + run_as_other_user_if_needed() { if [[ "$(id -u)" == "0" ]]; then # If running as root, drop to specified UID and run command From c3c8ea3d0235996b5b3c05bf5a0c77d0fadd02e4 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Tue, 3 Oct 2023 12:20:17 -0300 Subject: [PATCH 29/42] Changing files permissions --- build-docker-images/wazuh-indexer/config/config.sh | 7 +++++++ .../wazuh-indexer/config/entrypoint.sh | 14 -------------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/build-docker-images/wazuh-indexer/config/config.sh b/build-docker-images/wazuh-indexer/config/config.sh index 30f5d1f2..4d51efc3 100644 --- a/build-docker-images/wazuh-indexer/config/config.sh +++ b/build-docker-images/wazuh-indexer/config/config.sh @@ -144,3 +144,10 @@ find ${TARGET_DIR} -type f -perm 644 -exec chmod 640 {} \; find ${TARGET_DIR} -type f -perm 664 -exec chmod 660 {} \; find ${TARGET_DIR} -type f -perm 755 -exec chmod 750 {} \; find ${TARGET_DIR} -type f -perm 744 -exec chmod 740 {} \; + + +# Fix OpenSearch security plugin permissions +chown ${USER}:${GROUP} ${TARGET_DIR}${INSTALLATION_DIR}/opensearch-security/internal_users.yml +chown ${USER}:${GROUP} ${TARGET_DIR}${CONFIG_DIR}/opensearch.yml +chmod 0600 ${TARGET_DIR}${CONFIG_DIR}/opensearch.yml +chmod 0600 ${TARGET_DIR}${INSTALLATION_DIR}/opensearch-security/internal_users.yml \ No newline at end of file diff --git a/build-docker-images/wazuh-indexer/config/entrypoint.sh b/build-docker-images/wazuh-indexer/config/entrypoint.sh index e4ff811e..2acb4aa0 100644 --- a/build-docker-images/wazuh-indexer/config/entrypoint.sh +++ b/build-docker-images/wazuh-indexer/config/entrypoint.sh @@ -13,20 +13,6 @@ export CACERT=$(grep -oP "(?<=plugins.security.ssl.transport.pemtrustedcas_filep export CERT="${OPENSEARCH_PATH_CONF}/certs/admin.pem" export KEY="${OPENSEARCH_PATH_CONF}/certs/admin-key.pem" - -# Fix OpenSearch security plugin permissions - -chmod -R 0700 ${TARGET_DIR}/.cache -chmod 0700 ${TARGET_DIR}/extensions -chmod 0700 ${TARGET_DIR}/logs -chmod 0600 ${TARGET_DIR}/opensearch.yml -find ${TARGET_DIR}/bin -type f -exec chmod 0600 {} \; -find ${TARGET_DIR}/jdk/bin -type f -exec chmod 0600 {} \; -chmod 0600 ${TARGET_DIR}/opensearch-security/internal_users.yml -find ${TARGET_DIR}/performance-analyzer-rca/bin -type f -exec chmod 0600 {} \; -chmod 0600 ${TARGET_DIR}/plugins/opensearch-security/tools/wazuh-certs-tool.sh - - run_as_other_user_if_needed() { if [[ "$(id -u)" == "0" ]]; then # If running as root, drop to specified UID and run command From b22fa235c7f88bf55a0bff3e1e0cd3cc33b8eb99 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Tue, 3 Oct 2023 15:52:25 -0300 Subject: [PATCH 30/42] Updated build image script --- .env | 3 + build-docker-images/build-images.sh | 127 ++++++++++++++++-- .../wazuh-dashboard/Dockerfile | 2 +- build-docker-images/wazuh-manager/Dockerfile | 6 +- 4 files changed, 125 insertions(+), 13 deletions(-) diff --git a/.env b/.env index d51cc0c4..058409f9 100755 --- a/.env +++ b/.env @@ -1,3 +1,6 @@ WAZUH_VERSION=4.6.0 WAZUH_IMAGE_VERSION=4.6.0 WAZUH_TAG_REVISION=1 +FILEBEAT_TEMPLATE_BRANCH=v4.6.0 +WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.2.tar.gz +WAZUH_UI_REVISION=1 diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index a7b3ca46..79e56bc7 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -1,11 +1,120 @@ -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') -IMAGE_VERSION=${WAZUH_IMAGE_VERSION} +#!/bin/bash -echo WAZUH_VERSION=$WAZUH_IMAGE_VERSION > .env -echo WAZUH_IMAGE_VERSION=$IMAGE_VERSION >> .env -echo WAZUH_TAG_REVISION=$WAZUH_TAG_REVISION >> .env +# Wazuh package generator +# Copyright (C) 2023, Wazuh Inc. +# +# This program is a free software; you can redistribute it +# and/or modify it under the terms of the GNU General Public +# License (version 2) as published by the FSF - Free Software +# Foundation. -docker-compose -f build-docker-images/build-images.yml --env-file .env build --no-cache \ No newline at end of file +WAZUH_IMAGE_VERSION="4.6.0" +WAZUH_VERSION="$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g')" +WAZUH_TAG_REVISION="1" +WAZUH_DEV_STAGE="" +FILEBEAT_TEMPLATE_BRANCH="v${WAZUH_IMAGE_VERSION}" +FILEBEAT_MODULE_VERSION="0.2" +WAZUH_FILEBEAT_MODULE="wazuh-filebeat-${FILEBEAT_MODULE_VERSION}.tar.gz" +WAZUH_UI_REVISION="${WAZUH_TAG_REVISION}" + +# ----------------------------------------------------------------------------- + +trap ctrl_c INT + +clean() { + exit_code=$1 + + exit ${exit_code} +} + +ctrl_c() { + clean 1 +} + +# ----------------------------------------------------------------------------- + + +build() { + + if [ "${WAZUH_DEV_STAGE}" ];then + FILEBEAT_TEMPLATE_BRANCH="${FILEBEAT_TEMPLATE_BRANCH}-${WAZUH_DEV_STAGE,,}" + fi + echo WAZUH_VERSION=$WAZUH_IMAGE_VERSION > .env + echo WAZUH_IMAGE_VERSION=$WAZUH_IMAGE_VERSION >> .env + echo WAZUH_TAG_REVISION=$WAZUH_TAG_REVISION >> .env + echo FILEBEAT_TEMPLATE_BRANCH=$FILEBEAT_TEMPLATE_BRANCH >> .env + echo WAZUH_FILEBEAT_MODULE=$WAZUH_FILEBEAT_MODULE >> .env + echo WAZUH_UI_REVISION=$WAZUH_UI_REVISION >> .env + + docker-compose -f build-docker-images/build-images.yml --env-file .env build --no-cache + + return 0 +} + +# ----------------------------------------------------------------------------- + +help() { + echo + echo "Usage: $0 [OPTIONS]" + echo + echo " -d, --dev [Optional] Set the development stage you want to build, example rc1 or beta1, not used by default." + echo " -f, --filebeat-module [Optional] Set Filebeat module version. By default ${FILEBEAT_MODULE_VERSION}." + echo " -r, --revision [Optional] Package revision. By default ${WAZUH_TAG_REVISION}" + echo " -v, --version [Optional] Set the Wazuh version should be builded. By default, ${WAZUH_IMAGE_VERSION}." + echo " -h, --help Show this help." + echo + exit $1 +} + +# ----------------------------------------------------------------------------- + +main() { + while [ -n "${1}" ] + do + case "${1}" in + "-h"|"--help") + help 0 + ;; + "-d"|"--dev") + if [ -n "${2}" ]; then + WAZUH_DEV_STAGE="${2}" + shift 2 + else + help 1 + fi + ;; + "-f"|"--filebeat-module") + if [ -n "${2}" ]; then + FILEBEAT_MODULE_VERSION="${2}" + shift 2 + else + help 1 + fi + ;; + "-r"|"--revision") + if [ -n "${2}" ]; then + WAZUH_TAG_REVISION="${2}" + shift 2 + else + help 1 + fi + ;; + "-v"|"--version") + if [ -n "$2" ]; then + WAZUH_IMAGE_VERSION="$2" + shift 2 + else + help 1 + fi + ;; + *) + help 1 + esac + done + + build || clean 1 + + clean 0 +} + +main "$@" \ No newline at end of file diff --git a/build-docker-images/wazuh-dashboard/Dockerfile b/build-docker-images/wazuh-dashboard/Dockerfile index ef571d5c..44430b10 100644 --- a/build-docker-images/wazuh-dashboard/Dockerfile +++ b/build-docker-images/wazuh-dashboard/Dockerfile @@ -4,7 +4,7 @@ FROM ubuntu:focal AS builder ARG WAZUH_VERSION ARG WAZUH_TAG_REVISION ARG INSTALL_DIR=/usr/share/wazuh-dashboard -ARG WAZUH_UI_REVISION=1 +ARG WAZUH_UI_REVISION # Update and install dependencies RUN apt-get update && apt install curl libcap2-bin xz-utils -y diff --git a/build-docker-images/wazuh-manager/Dockerfile b/build-docker-images/wazuh-manager/Dockerfile index 28a6e7b2..878a07a2 100644 --- a/build-docker-images/wazuh-manager/Dockerfile +++ b/build-docker-images/wazuh-manager/Dockerfile @@ -5,10 +5,10 @@ RUN rm /bin/sh && ln -s /bin/bash /bin/sh ARG WAZUH_VERSION ARG WAZUH_TAG_REVISION -ARG TEMPLATE_VERSION=v4.6.0 +ARG FILEBEAT_TEMPLATE_BRANCH ARG FILEBEAT_CHANNEL=filebeat-oss ARG FILEBEAT_VERSION=7.10.2 -ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.2.tar.gz" +ARG WAZUH_FILEBEAT_MODULE RUN apt-get update && apt install curl apt-transport-https lsb-release gnupg -y @@ -38,7 +38,7 @@ COPY config/filebeat.yml /etc/filebeat/ RUN chmod go-w /etc/filebeat/filebeat.yml -ADD https://raw.githubusercontent.com/wazuh/wazuh/$TEMPLATE_VERSION/extensions/elasticsearch/7.x/wazuh-template.json /etc/filebeat +ADD https://raw.githubusercontent.com/wazuh/wazuh/$FILEBEAT_TEMPLATE_BRANCH/extensions/elasticsearch/7.x/wazuh-template.json /etc/filebeat RUN chmod go-w /etc/filebeat/wazuh-template.json # Prepare permanent data From 3fd3f423896b0e1cd2b16155955c509522dd6c39 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Tue, 3 Oct 2023 16:43:30 -0300 Subject: [PATCH 31/42] Added check for wazuh/wazuh branch --- build-docker-images/build-images.sh | 13 +++++++++++-- build-docker-images/build-images.yml | 3 +++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index 79e56bc7..6fd36d36 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -12,7 +12,7 @@ WAZUH_IMAGE_VERSION="4.6.0" WAZUH_VERSION="$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g')" WAZUH_TAG_REVISION="1" WAZUH_DEV_STAGE="" -FILEBEAT_TEMPLATE_BRANCH="v${WAZUH_IMAGE_VERSION}" +FILEBEAT_TEMPLATE_BRANCH="${WAZUH_IMAGE_VERSION}" FILEBEAT_MODULE_VERSION="0.2" WAZUH_FILEBEAT_MODULE="wazuh-filebeat-${FILEBEAT_MODULE_VERSION}.tar.gz" WAZUH_UI_REVISION="${WAZUH_TAG_REVISION}" @@ -37,8 +37,17 @@ ctrl_c() { build() { if [ "${WAZUH_DEV_STAGE}" ];then - FILEBEAT_TEMPLATE_BRANCH="${FILEBEAT_TEMPLATE_BRANCH}-${WAZUH_DEV_STAGE,,}" + FILEBEAT_TEMPLATE_BRANCH="v${FILEBEAT_TEMPLATE_BRANCH}-${WAZUH_DEV_STAGE,,}" + else + if curl --output /dev/null --silent --head --fail "https://github.com/wazuh/wazuh/tree/${FILEBEAT_TEMPLATE_BRANCH}"; then + FILEBEAT_TEMPLATE_BRANCH="${FILEBEAT_TEMPLATE_BRANCH}" + elif curl --output /dev/null --silent --head --fail "https://github.com/wazuh/wazuh/tree/v${FILEBEAT_TEMPLATE_BRANCH}"; then + FILEBEAT_TEMPLATE_BRANCH="v${FILEBEAT_TEMPLATE_BRANCH}" + else + echo "The indicated branch does not exist in the wazuh/wazuh repository: ${FILEBEAT_TEMPLATE_BRANCH}" + fi fi + echo WAZUH_VERSION=$WAZUH_IMAGE_VERSION > .env echo WAZUH_IMAGE_VERSION=$WAZUH_IMAGE_VERSION >> .env echo WAZUH_TAG_REVISION=$WAZUH_TAG_REVISION >> .env diff --git a/build-docker-images/build-images.yml b/build-docker-images/build-images.yml index 52984bf9..90fbb897 100644 --- a/build-docker-images/build-images.yml +++ b/build-docker-images/build-images.yml @@ -8,6 +8,8 @@ services: args: WAZUH_VERSION: ${WAZUH_VERSION} WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION} + FILEBEAT_TEMPLATE_BRANCH: ${FILEBEAT_TEMPLATE_BRANCH} + WAZUH_FILEBEAT_MODULE: ${WAZUH_FILEBEAT_MODULE} image: wazuh/wazuh-manager:${WAZUH_IMAGE_VERSION} hostname: wazuh.manager restart: always @@ -61,6 +63,7 @@ services: args: WAZUH_VERSION: ${WAZUH_VERSION} WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION} + WAZUH_UI_REVISION: ${WAZUH_UI_REVISION} image: wazuh/wazuh-dashboard:${WAZUH_IMAGE_VERSION} hostname: wazuh.dashboard restart: always From 36c06dc4c8743dc4fb79792f5946df211947e295 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Tue, 3 Oct 2023 16:54:43 -0300 Subject: [PATCH 32/42] Added validation for dev branch --- build-docker-images/build-images.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index 6fd36d36..9ddc0c6c 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -38,6 +38,10 @@ build() { if [ "${WAZUH_DEV_STAGE}" ];then FILEBEAT_TEMPLATE_BRANCH="v${FILEBEAT_TEMPLATE_BRANCH}-${WAZUH_DEV_STAGE,,}" + if curl --output /dev/null --silent --head --fail "https://github.com/wazuh/wazuh/tree/${FILEBEAT_TEMPLATE_BRANCH}"; then + echo "The indicated branch does not exist in the wazuh/wazuh repository: ${FILEBEAT_TEMPLATE_BRANCH}" + clean 1 + fi else if curl --output /dev/null --silent --head --fail "https://github.com/wazuh/wazuh/tree/${FILEBEAT_TEMPLATE_BRANCH}"; then FILEBEAT_TEMPLATE_BRANCH="${FILEBEAT_TEMPLATE_BRANCH}" @@ -45,6 +49,7 @@ build() { FILEBEAT_TEMPLATE_BRANCH="v${FILEBEAT_TEMPLATE_BRANCH}" else echo "The indicated branch does not exist in the wazuh/wazuh repository: ${FILEBEAT_TEMPLATE_BRANCH}" + clean 1 fi fi From 545ef6851b3a80742d44d54ce5faa71de9763a25 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Tue, 3 Oct 2023 16:59:08 -0300 Subject: [PATCH 33/42] Fixed validation --- build-docker-images/build-images.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index 9ddc0c6c..d521bd05 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -38,7 +38,7 @@ build() { if [ "${WAZUH_DEV_STAGE}" ];then FILEBEAT_TEMPLATE_BRANCH="v${FILEBEAT_TEMPLATE_BRANCH}-${WAZUH_DEV_STAGE,,}" - if curl --output /dev/null --silent --head --fail "https://github.com/wazuh/wazuh/tree/${FILEBEAT_TEMPLATE_BRANCH}"; then + if ! curl --output /dev/null --silent --head --fail "https://github.com/wazuh/wazuh/tree/${FILEBEAT_TEMPLATE_BRANCH}"; then echo "The indicated branch does not exist in the wazuh/wazuh repository: ${FILEBEAT_TEMPLATE_BRANCH}" clean 1 fi From e205c87d3763eb27cc356a89fe41fd311966d439 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Wed, 4 Oct 2023 08:35:45 -0300 Subject: [PATCH 34/42] .env file updated --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 058409f9..15a61adb 100755 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ WAZUH_VERSION=4.6.0 WAZUH_IMAGE_VERSION=4.6.0 WAZUH_TAG_REVISION=1 -FILEBEAT_TEMPLATE_BRANCH=v4.6.0 +FILEBEAT_TEMPLATE_BRANCH=4.6.0 WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.2.tar.gz WAZUH_UI_REVISION=1 From a2ee29bfd33824826c455007c5cd16187da5c89c Mon Sep 17 00:00:00 2001 From: c-bordon Date: Wed, 4 Oct 2023 09:36:08 -0300 Subject: [PATCH 35/42] Updated file permissions to have the same permissions as in package installation in Wazuh indexer --- build-docker-images/wazuh-indexer/config/config.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/build-docker-images/wazuh-indexer/config/config.sh b/build-docker-images/wazuh-indexer/config/config.sh index 4d51efc3..30f5d1f2 100644 --- a/build-docker-images/wazuh-indexer/config/config.sh +++ b/build-docker-images/wazuh-indexer/config/config.sh @@ -144,10 +144,3 @@ find ${TARGET_DIR} -type f -perm 644 -exec chmod 640 {} \; find ${TARGET_DIR} -type f -perm 664 -exec chmod 660 {} \; find ${TARGET_DIR} -type f -perm 755 -exec chmod 750 {} \; find ${TARGET_DIR} -type f -perm 744 -exec chmod 740 {} \; - - -# Fix OpenSearch security plugin permissions -chown ${USER}:${GROUP} ${TARGET_DIR}${INSTALLATION_DIR}/opensearch-security/internal_users.yml -chown ${USER}:${GROUP} ${TARGET_DIR}${CONFIG_DIR}/opensearch.yml -chmod 0600 ${TARGET_DIR}${CONFIG_DIR}/opensearch.yml -chmod 0600 ${TARGET_DIR}${INSTALLATION_DIR}/opensearch-security/internal_users.yml \ No newline at end of file From 7172c818c7b47c6f5530a4db36e89a6137ab1f17 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Wed, 4 Oct 2023 11:16:04 -0300 Subject: [PATCH 36/42] Update order of variables --- .env | 6 +++--- build-docker-images/build-images.sh | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.env b/.env index 15a61adb..89f10a31 100755 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ -WAZUH_VERSION=4.6.0 -WAZUH_IMAGE_VERSION=4.6.0 +WAZUH_VERSION=4.5.3 +WAZUH_IMAGE_VERSION=4.5.3 WAZUH_TAG_REVISION=1 -FILEBEAT_TEMPLATE_BRANCH=4.6.0 +FILEBEAT_TEMPLATE_BRANCH=v4.5.3-rc2 WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.2.tar.gz WAZUH_UI_REVISION=1 diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index d521bd05..6e14ed71 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -9,13 +9,9 @@ # Foundation. WAZUH_IMAGE_VERSION="4.6.0" -WAZUH_VERSION="$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g')" WAZUH_TAG_REVISION="1" WAZUH_DEV_STAGE="" -FILEBEAT_TEMPLATE_BRANCH="${WAZUH_IMAGE_VERSION}" FILEBEAT_MODULE_VERSION="0.2" -WAZUH_FILEBEAT_MODULE="wazuh-filebeat-${FILEBEAT_MODULE_VERSION}.tar.gz" -WAZUH_UI_REVISION="${WAZUH_TAG_REVISION}" # ----------------------------------------------------------------------------- @@ -36,6 +32,11 @@ ctrl_c() { build() { + WAZUH_VERSION="$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g')" + FILEBEAT_TEMPLATE_BRANCH="${WAZUH_IMAGE_VERSION}" + WAZUH_FILEBEAT_MODULE="wazuh-filebeat-${FILEBEAT_MODULE_VERSION}.tar.gz" + WAZUH_UI_REVISION="${WAZUH_TAG_REVISION}" + if [ "${WAZUH_DEV_STAGE}" ];then FILEBEAT_TEMPLATE_BRANCH="v${FILEBEAT_TEMPLATE_BRANCH}-${WAZUH_DEV_STAGE,,}" if ! curl --output /dev/null --silent --head --fail "https://github.com/wazuh/wazuh/tree/${FILEBEAT_TEMPLATE_BRANCH}"; then From 893796c4a236552f929a5cb910adae761b9c8e22 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Wed, 4 Oct 2023 11:41:22 -0300 Subject: [PATCH 37/42] Restore .env file --- .env | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.env b/.env index 89f10a31..d51cc0c4 100755 --- a/.env +++ b/.env @@ -1,6 +1,3 @@ -WAZUH_VERSION=4.5.3 -WAZUH_IMAGE_VERSION=4.5.3 +WAZUH_VERSION=4.6.0 +WAZUH_IMAGE_VERSION=4.6.0 WAZUH_TAG_REVISION=1 -FILEBEAT_TEMPLATE_BRANCH=v4.5.3-rc2 -WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.2.tar.gz -WAZUH_UI_REVISION=1 From 8ac3ea1e8a2526d1e67dfa353c7270a772eea40a Mon Sep 17 00:00:00 2001 From: c-bordon Date: Wed, 4 Oct 2023 11:44:00 -0300 Subject: [PATCH 38/42] Added final space --- build-docker-images/build-images.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index 6e14ed71..e6044bf8 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -132,4 +132,4 @@ main() { clean 0 } -main "$@" \ No newline at end of file +main "$@" From 1b41068618265ccd8b951cbc7cb92a0b4971895a Mon Sep 17 00:00:00 2001 From: c-bordon Date: Wed, 4 Oct 2023 11:55:39 -0300 Subject: [PATCH 39/42] Updated README file --- build-docker-images/README.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/build-docker-images/README.md b/build-docker-images/README.md index 13f1c9bf..a62978ac 100644 --- a/build-docker-images/README.md +++ b/build-docker-images/README.md @@ -9,3 +9,24 @@ $ build-docker-images/build-images.sh ``` This script initializes the environment variables needed to build each of the images. + +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.5.2 +``` + +To get all the available script options use the -h or --help option: + +``` +$ build-docker-images/build-images.sh -h + +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.2. + -r, --revision [Optional] Package revision. By default 1 + -v, --version [Optional] Set the Wazuh version should be builded. By default, 4.6.0. + -h, --help Show this help. + +``` \ No newline at end of file From c550c1a852af262aca6131b7f78ed40c3b4dcefc Mon Sep 17 00:00:00 2001 From: c-bordon Date: Wed, 4 Oct 2023 12:29:15 -0300 Subject: [PATCH 40/42] Added validation for version in master branch --- build-docker-images/build-images.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index e6044bf8..d441cd9e 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -49,8 +49,13 @@ build() { elif curl --output /dev/null --silent --head --fail "https://github.com/wazuh/wazuh/tree/v${FILEBEAT_TEMPLATE_BRANCH}"; then FILEBEAT_TEMPLATE_BRANCH="v${FILEBEAT_TEMPLATE_BRANCH}" else - echo "The indicated branch does not exist in the wazuh/wazuh repository: ${FILEBEAT_TEMPLATE_BRANCH}" - clean 1 + WAZUH_MASTER_VERSION="$(curl -s https://raw.githubusercontent.com/wazuh/wazuh/master/src/VERSION | sed -e 's/v//g')" + if [ "${FILEBEAT_TEMPLATE_BRANCH}" == "${WAZUH_MASTER_VERSION}" ]; then + FILEBEAT_TEMPLATE_BRANCH="master" + else + echo "The indicated branch does not exist in the wazuh/wazuh repository: ${FILEBEAT_TEMPLATE_BRANCH}" + clean 1 + fi fi fi From 61bfe584912ffe4a4094d6d168363a542d802495 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Wed, 4 Oct 2023 15:38:39 -0300 Subject: [PATCH 41/42] Changed validation order for wazuh branch --- build-docker-images/build-images.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index d441cd9e..f147497a 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -44,10 +44,10 @@ build() { clean 1 fi else - if curl --output /dev/null --silent --head --fail "https://github.com/wazuh/wazuh/tree/${FILEBEAT_TEMPLATE_BRANCH}"; then - FILEBEAT_TEMPLATE_BRANCH="${FILEBEAT_TEMPLATE_BRANCH}" - elif curl --output /dev/null --silent --head --fail "https://github.com/wazuh/wazuh/tree/v${FILEBEAT_TEMPLATE_BRANCH}"; then + if curl --output /dev/null --silent --head --fail "https://github.com/wazuh/wazuh/tree/v${FILEBEAT_TEMPLATE_BRANCH}"; then FILEBEAT_TEMPLATE_BRANCH="v${FILEBEAT_TEMPLATE_BRANCH}" + elif curl --output /dev/null --silent --head --fail "https://github.com/wazuh/wazuh/tree/${FILEBEAT_TEMPLATE_BRANCH}"; then + FILEBEAT_TEMPLATE_BRANCH="${FILEBEAT_TEMPLATE_BRANCH}" else WAZUH_MASTER_VERSION="$(curl -s https://raw.githubusercontent.com/wazuh/wazuh/master/src/VERSION | sed -e 's/v//g')" if [ "${FILEBEAT_TEMPLATE_BRANCH}" == "${WAZUH_MASTER_VERSION}" ]; then From 64f083631d39dfa3a5d4fda89927ab717f37be4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Fri, 6 Oct 2023 14:11:05 +0200 Subject: [PATCH 42/42] Bump revision to 40602 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 336afe81..d6b11e18 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="4.6.0" -REVISION="40601" +REVISION="40602"