From 84fe19e86823564acca1144c927cf58752fb9309 Mon Sep 17 00:00:00 2001 From: Alberto R Date: Wed, 24 Nov 2021 17:01:09 +0100 Subject: [PATCH 01/13] Bumped to 4.4.0 --- .goss.yaml | 2 +- CHANGELOG.md | 5 +++++ README.md | 1 + VERSION | 4 ++-- docker-compose.yml | 4 ++-- kibana-odfe/Dockerfile | 2 +- kibana/Dockerfile | 2 +- production-cluster.yml | 6 +++--- production_cluster/wazuh_cluster/wazuh_manager.conf | 4 ++-- production_cluster/wazuh_cluster/wazuh_worker.conf | 4 ++-- wazuh-odfe/Dockerfile | 2 +- xpack-compose.yml | 4 ++-- xpack-from-sources.yml | 4 ++-- 13 files changed, 25 insertions(+), 19 deletions(-) diff --git a/.goss.yaml b/.goss.yaml index 292c1a66..769fbcbb 100644 --- a/.goss.yaml +++ b/.goss.yaml @@ -56,7 +56,7 @@ package: wazuh-manager: installed: true versions: - - 4.3.0 + - 4.4.0 port: tcp:1514: listening: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e6992ca..d72fdf60 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.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.0 ### Added diff --git a/README.md b/README.md index a411ec5b..ba73ed84 100644 --- a/README.md +++ b/README.md @@ -153,6 +153,7 @@ ADMIN_PRIVILEGES=true # App privileges | Wazuh version | ODFE | XPACK | |---------------|---------|--------| +| v4.4.0 | 1.13.2 | 7.11.2 | | v4.3.0 | 1.13.2 | 7.11.2 | | v4.2.5 | 1.13.2 | 7.11.2 | | v4.2.4 | 1.13.2 | 7.11.2 | diff --git a/VERSION b/VERSION index 5fedc35e..1b8da5ba 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="4.3.0" -REVISION="43100" +WAZUH-DOCKER_VERSION="4.4.0" +REVISION="40400" diff --git a/docker-compose.yml b/docker-compose.yml index 2b12af30..e7ed2f7d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: wazuh: - image: wazuh/wazuh-odfe:4.3.0 + image: wazuh/wazuh-odfe:4.4.0 hostname: wazuh-manager restart: always ports: @@ -50,7 +50,7 @@ services: hard: 65536 kibana: - image: wazuh/wazuh-kibana-odfe:4.3.0 + image: wazuh/wazuh-kibana-odfe:4.4.0 hostname: kibana restart: always ports: diff --git a/kibana-odfe/Dockerfile b/kibana-odfe/Dockerfile index 1d304341..d133d140 100644 --- a/kibana-odfe/Dockerfile +++ b/kibana-odfe/Dockerfile @@ -2,7 +2,7 @@ FROM amazon/opendistro-for-elasticsearch-kibana:1.13.2 USER kibana ARG ELASTIC_VERSION=7.10.2 -ARG WAZUH_VERSION=4.3.0 +ARG WAZUH_VERSION=4.4.0 ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}" WORKDIR /usr/share/kibana diff --git a/kibana/Dockerfile b/kibana/Dockerfile index d98443ae..d0a17f71 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -2,7 +2,7 @@ FROM docker.elastic.co/kibana/kibana:7.10.2 USER kibana ARG ELASTIC_VERSION=7.10.2 -ARG WAZUH_VERSION=4.3.0 +ARG WAZUH_VERSION=4.4.0 ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}" WORKDIR /usr/share/kibana diff --git a/production-cluster.yml b/production-cluster.yml index df0d2250..64502411 100644 --- a/production-cluster.yml +++ b/production-cluster.yml @@ -3,7 +3,7 @@ version: '3.7' services: wazuh-master: - image: wazuh/wazuh-odfe:4.3.0 + image: wazuh/wazuh-odfe:4.4.0 hostname: wazuh-master restart: always ports: @@ -38,7 +38,7 @@ services: - ./production_cluster/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh-worker: - image: wazuh/wazuh-odfe:4.3.0 + image: wazuh/wazuh-odfe:4.4.0 hostname: wazuh-worker restart: always environment: @@ -134,7 +134,7 @@ services: - ./production_cluster/elastic_opendistro/internal_users.yml:/usr/share/elasticsearch/plugins/opendistro_security/securityconfig/internal_users.yml kibana: - image: wazuh/wazuh-kibana-odfe:4.3.0 + image: wazuh/wazuh-kibana-odfe:4.4.0 hostname: kibana restart: always ports: diff --git a/production_cluster/wazuh_cluster/wazuh_manager.conf b/production_cluster/wazuh_cluster/wazuh_manager.conf index 38a180d6..e24dd77f 100644 --- a/production_cluster/wazuh_cluster/wazuh_manager.conf +++ b/production_cluster/wazuh_cluster/wazuh_manager.conf @@ -200,8 +200,8 @@ 127.0.0.1 ^localhost.localdomain$ - 4.3.0.1 - 4.3.0.2 + 4.4.0.1 + 4.4.0.2 208.67.220.220 diff --git a/production_cluster/wazuh_cluster/wazuh_worker.conf b/production_cluster/wazuh_cluster/wazuh_worker.conf index bc0bbb8d..1c17cac7 100644 --- a/production_cluster/wazuh_cluster/wazuh_worker.conf +++ b/production_cluster/wazuh_cluster/wazuh_worker.conf @@ -200,8 +200,8 @@ 127.0.0.1 ^localhost.localdomain$ - 4.3.0.1 - 4.3.0.2 + 4.4.0.1 + 4.4.0.2 208.67.220.220 diff --git a/wazuh-odfe/Dockerfile b/wazuh-odfe/Dockerfile index 73cb6034..051c520c 100644 --- a/wazuh-odfe/Dockerfile +++ b/wazuh-odfe/Dockerfile @@ -3,7 +3,7 @@ FROM centos:7 ARG FILEBEAT_CHANNEL=filebeat-oss ARG FILEBEAT_VERSION=7.10.2 -ARG WAZUH_VERSION=4.3.0-1 +ARG WAZUH_VERSION=4.4.0-1 ARG TEMPLATE_VERSION="master" ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.1.tar.gz" diff --git a/xpack-compose.yml b/xpack-compose.yml index f741a7ce..8fdb12e7 100644 --- a/xpack-compose.yml +++ b/xpack-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: wazuh: - image: wazuh/wazuh:4.3.0 + image: wazuh/wazuh:4.4.0 hostname: wazuh-manager restart: always ports: @@ -146,7 +146,7 @@ services: kibana: - image: wazuh/wazuh-kibana:4.3.0 + image: wazuh/wazuh-kibana:4.4.0 hostname: kibana restart: always ports: diff --git a/xpack-from-sources.yml b/xpack-from-sources.yml index 922eee93..ff5fb355 100644 --- a/xpack-from-sources.yml +++ b/xpack-from-sources.yml @@ -8,7 +8,7 @@ services: args: - FILEBEAT_CHANNEL=filebeat - FILEBEAT_VERSION=7.11.2 - image: wazuh/wazuh:4.3.0 + image: wazuh/wazuh:4.4.0 hostname: wazuh-manager restart: always ports: @@ -152,7 +152,7 @@ services: kibana: build: kibana/ - image: wazuh/wazuh-kibana:4.3.0 + image: wazuh/wazuh-kibana:4.4.0 hostname: kibana restart: always ports: From 85e62cfd0e5564d0c79708b73cd6dade941c05e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Fri, 25 Mar 2022 10:28:14 -0300 Subject: [PATCH 02/13] Bump to 4.2.6 --- .goss.yaml | 2 +- CHANGELOG.md | 5 +++++ README.md | 1 + VERSION | 4 ++-- docker-compose.yml | 4 ++-- kibana-odfe/Dockerfile | 2 +- kibana/Dockerfile | 2 +- production-cluster.yml | 6 +++--- production_cluster/wazuh_cluster/wazuh_manager.conf | 4 ++-- production_cluster/wazuh_cluster/wazuh_worker.conf | 4 ++-- wazuh-odfe/Dockerfile | 2 +- xpack-compose.yml | 4 ++-- xpack-from-sources.yml | 4 ++-- 13 files changed, 25 insertions(+), 19 deletions(-) diff --git a/.goss.yaml b/.goss.yaml index ef4bbe8d..55a5e80c 100644 --- a/.goss.yaml +++ b/.goss.yaml @@ -56,7 +56,7 @@ package: wazuh-manager: installed: true versions: - - 4.2.5 + - 4.2.6 port: tcp:1514: listening: true diff --git a/CHANGELOG.md b/CHANGELOG.md index ea4fbf60..3f71e097 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.2.6 +### Added + +- Update Wazuh to version [4.2.6](https://github.com/wazuh/wazuh/blob/v4.2.6/CHANGELOG.md#v426) + ## Wazuh Docker v4.2.5 ### Added diff --git a/README.md b/README.md index e49e3a28..9a36cd0d 100644 --- a/README.md +++ b/README.md @@ -154,6 +154,7 @@ ADMIN_PRIVILEGES=true # App privileges | Wazuh version | ODFE | XPACK | |---------------|---------|--------| +| v4.2.6 | 1.13.2 | 7.11.2 | | v4.2.5 | 1.13.2 | 7.11.2 | | v4.2.4 | 1.13.2 | 7.11.2 | | v4.2.3 | 1.13.2 | 7.11.2 | diff --git a/VERSION b/VERSION index e911e8a7..b7c09d4c 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="4.2.5" -REVISION="40220" +WAZUH-DOCKER_VERSION="4.2.6" +REVISION="40221" diff --git a/docker-compose.yml b/docker-compose.yml index a17edcac..561d8352 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: wazuh: - image: wazuh/wazuh-odfe:4.2.5 + image: wazuh/wazuh-odfe:4.2.6 hostname: wazuh-manager restart: always ports: @@ -50,7 +50,7 @@ services: hard: 65536 kibana: - image: wazuh/wazuh-kibana-odfe:4.2.5 + image: wazuh/wazuh-kibana-odfe:4.2.6 hostname: kibana restart: always ports: diff --git a/kibana-odfe/Dockerfile b/kibana-odfe/Dockerfile index 3cad99ba..2071005f 100644 --- a/kibana-odfe/Dockerfile +++ b/kibana-odfe/Dockerfile @@ -2,7 +2,7 @@ FROM amazon/opendistro-for-elasticsearch-kibana:1.13.2 USER kibana ARG ELASTIC_VERSION=7.10.2 -ARG WAZUH_VERSION=4.2.5 +ARG WAZUH_VERSION=4.2.6 ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}" WORKDIR /usr/share/kibana diff --git a/kibana/Dockerfile b/kibana/Dockerfile index 370e6f9b..1f4adede 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -2,7 +2,7 @@ FROM docker.elastic.co/kibana/kibana:7.10.2 USER kibana ARG ELASTIC_VERSION=7.10.2 -ARG WAZUH_VERSION=4.2.5 +ARG WAZUH_VERSION=4.2.6 ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}" WORKDIR /usr/share/kibana diff --git a/production-cluster.yml b/production-cluster.yml index d10ad3c6..42b6d227 100644 --- a/production-cluster.yml +++ b/production-cluster.yml @@ -3,7 +3,7 @@ version: '3.7' services: wazuh-master: - image: wazuh/wazuh-odfe:4.2.5 + image: wazuh/wazuh-odfe:4.2.6 hostname: wazuh-master restart: always ports: @@ -38,7 +38,7 @@ services: - ./production_cluster/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh-worker: - image: wazuh/wazuh-odfe:4.2.5 + image: wazuh/wazuh-odfe:4.2.6 hostname: wazuh-worker restart: always environment: @@ -134,7 +134,7 @@ services: - ./production_cluster/elastic_opendistro/internal_users.yml:/usr/share/elasticsearch/plugins/opendistro_security/securityconfig/internal_users.yml kibana: - image: wazuh/wazuh-kibana-odfe:4.2.5 + image: wazuh/wazuh-kibana-odfe:4.2.6 hostname: kibana restart: always ports: diff --git a/production_cluster/wazuh_cluster/wazuh_manager.conf b/production_cluster/wazuh_cluster/wazuh_manager.conf index 822bca19..7238da02 100644 --- a/production_cluster/wazuh_cluster/wazuh_manager.conf +++ b/production_cluster/wazuh_cluster/wazuh_manager.conf @@ -200,8 +200,8 @@ 127.0.0.1 ^localhost.localdomain$ - 4.2.5.1 - 4.2.5.2 + 4.2.6.1 + 4.2.6.2 208.67.220.220 diff --git a/production_cluster/wazuh_cluster/wazuh_worker.conf b/production_cluster/wazuh_cluster/wazuh_worker.conf index d409dab5..631313cb 100644 --- a/production_cluster/wazuh_cluster/wazuh_worker.conf +++ b/production_cluster/wazuh_cluster/wazuh_worker.conf @@ -200,8 +200,8 @@ 127.0.0.1 ^localhost.localdomain$ - 4.2.5.1 - 4.2.5.2 + 4.2.6.1 + 4.2.6.2 208.67.220.220 diff --git a/wazuh-odfe/Dockerfile b/wazuh-odfe/Dockerfile index ec356ccb..dfd7d3a7 100644 --- a/wazuh-odfe/Dockerfile +++ b/wazuh-odfe/Dockerfile @@ -3,7 +3,7 @@ FROM centos:7 ARG FILEBEAT_CHANNEL=filebeat-oss ARG FILEBEAT_VERSION=7.10.2 -ARG WAZUH_VERSION=4.2.5 +ARG WAZUH_VERSION=4.2.6 ARG TEMPLATE_VERSION="master" ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.1.tar.gz" diff --git a/xpack-compose.yml b/xpack-compose.yml index bc13e81e..bcdaaf8a 100644 --- a/xpack-compose.yml +++ b/xpack-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: wazuh: - image: wazuh/wazuh:4.2.5 + image: wazuh/wazuh:4.2.6 hostname: wazuh-manager restart: always ports: @@ -146,7 +146,7 @@ services: kibana: - image: wazuh/wazuh-kibana:4.2.5 + image: wazuh/wazuh-kibana:4.2.6 hostname: kibana restart: always ports: diff --git a/xpack-from-sources.yml b/xpack-from-sources.yml index 1691707e..9232b302 100644 --- a/xpack-from-sources.yml +++ b/xpack-from-sources.yml @@ -8,7 +8,7 @@ services: args: - FILEBEAT_CHANNEL=filebeat - FILEBEAT_VERSION=7.11.2 - image: wazuh/wazuh:4.2.5 + image: wazuh/wazuh:4.2.6 hostname: wazuh-manager restart: always ports: @@ -152,7 +152,7 @@ services: kibana: build: kibana/ - image: wazuh/wazuh-kibana:4.2.5 + image: wazuh/wazuh-kibana:4.2.6 hostname: kibana restart: always ports: From 01d2e4a50e43e4c875580913a53f424e5da38635 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 23 May 2022 09:57:31 -0300 Subject: [PATCH 03/13] bump release 4.5.0 --- .github/.goss.yaml | 2 +- .github/workflows/push.yml | 2 +- CHANGELOG.md | 5 +++++ README.md | 1 + VERSION | 4 ++-- build-docker-images/docker-compose.yml | 6 +++--- build-docker-images/wazuh-dashboard/Dockerfile | 2 +- build-docker-images/wazuh-dashboard/config/config.sh | 4 ++-- build-docker-images/wazuh-indexer/config/config.sh | 6 +++--- build-docker-images/wazuh-manager/Dockerfile | 4 ++-- indexer-certs-creator/config/entrypoint.sh | 4 ++-- multi-node/config/wazuh_cluster/wazuh_worker.conf | 4 ++-- multi-node/docker-compose.yml | 12 ++++++------ single-node/config/wazuh_cluster/wazuh_manager.conf | 4 ++-- single-node/docker-compose.yml | 6 +++--- 15 files changed, 36 insertions(+), 30 deletions(-) diff --git a/.github/.goss.yaml b/.github/.goss.yaml index 769fbcbb..acd348f6 100644 --- a/.github/.goss.yaml +++ b/.github/.goss.yaml @@ -56,7 +56,7 @@ package: wazuh-manager: installed: true versions: - - 4.4.0 + - 4.5.0 port: tcp:1514: listening: true diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 8919b1a0..abf56dd6 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -25,7 +25,7 @@ jobs: version: v0.3.16 - name: Execute Goss tests (wazuh-odfe) - run: dgoss run wazuh/wazuh-manager:4.4.0 + run: dgoss run wazuh/wazuh-manager:4.5.0 env: GOSS_SLEEP: 30 GOSS_FILE: .github/.goss.yaml \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 71625af9..f1ecdb00 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.5.0 +### Added + +- 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 95827661..96e408b0 100644 --- a/README.md +++ b/README.md @@ -193,6 +193,7 @@ WAZUH_MONITORING_REPLICAS=0 # | Wazuh version | ODFE | XPACK | |---------------|---------|--------| +| v4.5.0 | | | | v4.4.0 | | | | v4.3.1 | | | | v4.3.0 | | | diff --git a/VERSION b/VERSION index 1b8da5ba..5a1911b6 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="4.4.0" -REVISION="40400" +WAZUH-DOCKER_VERSION="4.5.0" +REVISION="40500" diff --git a/build-docker-images/docker-compose.yml b/build-docker-images/docker-compose.yml index 1e4f0c84..896a9b2c 100644 --- a/build-docker-images/docker-compose.yml +++ b/build-docker-images/docker-compose.yml @@ -4,7 +4,7 @@ version: '3.7' services: wazuh.manager: build: wazuh-manager/ - image: wazuh/wazuh-manager:4.4.0 + image: wazuh/wazuh-manager:4.5.0 hostname: wazuh.manager restart: always ports: @@ -32,7 +32,7 @@ services: wazuh.indexer: build: wazuh-indexer/ - image: wazuh/wazuh-indexer:4.4.0 + image: wazuh/wazuh-indexer:4.5.0 hostname: wazuh.indexer restart: always ports: @@ -49,7 +49,7 @@ services: wazuh.dashboard: build: wazuh-dashboard/ - image: wazuh/wazuh-dashboard:4.4.0 + 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 19bd110d..fb0f6773 100644 --- a/build-docker-images/wazuh-dashboard/Dockerfile +++ b/build-docker-images/wazuh-dashboard/Dockerfile @@ -1,7 +1,7 @@ # Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2) FROM ubuntu:focal AS builder -ARG WAZUH_VERSION=4.4.0 +ARG WAZUH_VERSION=4.5.0 ARG INSTALL_DIR=/usr/share/wazuh-dashboard # Update and install dependencies diff --git a/build-docker-images/wazuh-dashboard/config/config.sh b/build-docker-images/wazuh-dashboard/config/config.sh index ef068df4..36a2058e 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 a4a7cac5..2af8b40a 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.4.0 +export VERSION=4.5.0 export LOG_DIR=/var/log/${NAME} export LIB_DIR=/var/lib/${NAME} export PID_DIR=/run/${NAME} @@ -30,8 +30,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 65b05578..d8b4803c 100644 --- a/build-docker-images/wazuh-manager/Dockerfile +++ b/build-docker-images/wazuh-manager/Dockerfile @@ -1,8 +1,8 @@ # Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2) FROM ubuntu:focal -ARG WAZUH_VERSION=4.4.0 -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.1.tar.gz" diff --git a/indexer-certs-creator/config/entrypoint.sh b/indexer-certs-creator/config/entrypoint.sh index 66c71a5c..6396dbc0 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 42110124..0932b819 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.4.0.1 - 4.4.0.2 + 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 82e67e43..9e88a9d3 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.0 + 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.0 + 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.0 + 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/plugins/opensearch-security/securityconfig/internal_users.yml wazuh2.indexer: - image: wazuh/wazuh-indexer:4.4.0 + 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/plugins/opensearch-security/securityconfig/internal_users.yml wazuh3.indexer: - image: wazuh/wazuh-indexer:4.4.0 + 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/plugins/opensearch-security/securityconfig/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.4.0 + 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 f3268e7d..00b16f03 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.4.0.1 - 4.4.0.2 + 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 c8e3d0cc..b3ab4308 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.0 + 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.0 + 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/plugins/opensearch-security/securityconfig/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.4.0 + image: wazuh/wazuh-dashboard:4.5.0 hostname: wazuh.dashboard restart: always ports: From 41aba4a74275299859fbea22d3c9593e1d51cf32 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 23 May 2022 10:02:54 -0300 Subject: [PATCH 04/13] 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 0932b819..42110124 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 00b16f03..f3268e7d 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 1077ea7fdad7bed84fa9195edb5fc543e871905c Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 23 May 2022 10:45:23 -0300 Subject: [PATCH 05/13] bump release 4.5.0 --- multi-node/config/wazuh_cluster/wazuh_manager.conf | 1 - multi-node/config/wazuh_cluster/wazuh_worker.conf | 3 --- single-node/config/wazuh_cluster/wazuh_manager.conf | 3 --- 3 files changed, 7 deletions(-) diff --git a/multi-node/config/wazuh_cluster/wazuh_manager.conf b/multi-node/config/wazuh_cluster/wazuh_manager.conf index 70bb61fc..8747f02e 100644 --- a/multi-node/config/wazuh_cluster/wazuh_manager.conf +++ b/multi-node/config/wazuh_cluster/wazuh_manager.conf @@ -222,7 +222,6 @@ 127.0.0.1 ^localhost.localdomain$ - 127.0.0.53 diff --git a/multi-node/config/wazuh_cluster/wazuh_worker.conf b/multi-node/config/wazuh_cluster/wazuh_worker.conf index 42110124..dc4475d2 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 f3268e7d..cd432c19 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 b1c05d8f1d55afffa93d6be52b5b719ac6a4c1e2 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Wed, 1 Jun 2022 13:46:21 -0300 Subject: [PATCH 06/13] Merge 4.3.3 into master --- .github/workflows/push.yml | 4 ---- multi-node/docker-compose.yml | 20 -------------------- single-node/docker-compose.yml | 8 -------- 3 files changed, 32 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index d3146b4a..abf56dd6 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -25,11 +25,7 @@ jobs: version: v0.3.16 - name: Execute Goss tests (wazuh-odfe) -<<<<<<< HEAD - run: dgoss run wazuh/wazuh-manager:4.3.3 -======= run: dgoss run wazuh/wazuh-manager:4.5.0 ->>>>>>> 90996712980f0190041f52e80a41952ca527d896 env: GOSS_SLEEP: 30 GOSS_FILE: .github/.goss.yaml \ No newline at end of file diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index 29511a73..ce3414a0 100644 --- a/multi-node/docker-compose.yml +++ b/multi-node/docker-compose.yml @@ -38,11 +38,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.worker: -<<<<<<< HEAD - image: wazuh/wazuh-manager:4.3.3 -======= image: wazuh/wazuh-manager:4.5.0 ->>>>>>> 90996712980f0190041f52e80a41952ca527d896 hostname: wazuh.worker restart: always environment: @@ -71,11 +67,7 @@ services: - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf wazuh1.indexer: -<<<<<<< HEAD - image: wazuh/wazuh-indexer:4.3.3 -======= image: wazuh/wazuh-indexer:4.5.0 ->>>>>>> 90996712980f0190041f52e80a41952ca527d896 hostname: wazuh1.indexer restart: always ports: @@ -101,11 +93,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml wazuh2.indexer: -<<<<<<< HEAD - image: wazuh/wazuh-indexer:4.3.3 -======= image: wazuh/wazuh-indexer:4.5.0 ->>>>>>> 90996712980f0190041f52e80a41952ca527d896 hostname: wazuh2.indexer restart: always environment: @@ -127,11 +115,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml wazuh3.indexer: -<<<<<<< HEAD - image: wazuh/wazuh-indexer:4.3.3 -======= image: wazuh/wazuh-indexer:4.5.0 ->>>>>>> 90996712980f0190041f52e80a41952ca527d896 hostname: wazuh3.indexer restart: always environment: @@ -153,11 +137,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml wazuh.dashboard: -<<<<<<< HEAD - image: wazuh/wazuh-dashboard:4.3.3 -======= image: wazuh/wazuh-dashboard:4.5.0 ->>>>>>> 90996712980f0190041f52e80a41952ca527d896 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 7bd42cd5..109ead44 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -39,11 +39,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.indexer: -<<<<<<< HEAD - image: wazuh/wazuh-indexer:4.3.3 -======= image: wazuh/wazuh-indexer:4.5.0 ->>>>>>> 90996712980f0190041f52e80a41952ca527d896 hostname: wazuh.indexer restart: always ports: @@ -68,11 +64,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml wazuh.dashboard: -<<<<<<< HEAD - image: wazuh/wazuh-dashboard:4.3.3 -======= image: wazuh/wazuh-dashboard:4.5.0 ->>>>>>> 90996712980f0190041f52e80a41952ca527d896 hostname: wazuh.dashboard restart: always ports: From d5bd9754bae8ea6749a7944143e7e6512b2b2eb8 Mon Sep 17 00:00:00 2001 From: "Volm, David" Date: Thu, 10 Feb 2022 07:51:29 -0600 Subject: [PATCH 07/13] Allow other Exceptions to bubble up a stack trace instead of silently failing in create_user.py --- build-docker-images/wazuh-manager/config/create_user.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-docker-images/wazuh-manager/config/create_user.py b/build-docker-images/wazuh-manager/config/create_user.py index cc492398..e2a89325 100644 --- a/build-docker-images/wazuh-manager/config/create_user.py +++ b/build-docker-images/wazuh-manager/config/create_user.py @@ -21,7 +21,7 @@ set_user_role, update_user, ) -except Exception as e: +except ModuleNotFoundError as e: logging.error("No module 'wazuh' found.") sys.exit(1) From 5c06d22f8b2e148993710f9d88f92624dc4dc2ef Mon Sep 17 00:00:00 2001 From: fcaffieri Date: Fri, 1 Jul 2022 17:43:53 -0300 Subject: [PATCH 08/13] disable filebeat metrics --- build-docker-images/wazuh-manager/config/filebeat.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-docker-images/wazuh-manager/config/filebeat.yml b/build-docker-images/wazuh-manager/config/filebeat.yml index e9874fb4..a47e6507 100644 --- a/build-docker-images/wazuh-manager/config/filebeat.yml +++ b/build-docker-images/wazuh-manager/config/filebeat.yml @@ -20,3 +20,5 @@ output.elasticsearch: #ssl.certificate_authorities: #ssl.certificate: #ssl.key: + +logging.metrics.enabled: false \ No newline at end of file From 907f75225ac91bdb6bec676de55a1d4153609652 Mon Sep 17 00:00:00 2001 From: fcaffieri Date: Mon, 4 Jul 2022 09:17:35 -0300 Subject: [PATCH 09/13] disable filebeat metrics --- build-docker-images/wazuh-manager/config/filebeat.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-docker-images/wazuh-manager/config/filebeat.yml b/build-docker-images/wazuh-manager/config/filebeat.yml index a47e6507..8beed808 100644 --- a/build-docker-images/wazuh-manager/config/filebeat.yml +++ b/build-docker-images/wazuh-manager/config/filebeat.yml @@ -21,4 +21,4 @@ output.elasticsearch: #ssl.certificate: #ssl.key: -logging.metrics.enabled: false \ No newline at end of file +logging.metrics.enabled: false From 16aec1366286c9204dd1d35ddbd40f2a0c688872 Mon Sep 17 00:00:00 2001 From: fcaffieri Date: Wed, 6 Jul 2022 17:35:35 -0300 Subject: [PATCH 10/13] 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 6e5d7461bcb4fd34ab87a4daa4c6b9c0afb537b5 Mon Sep 17 00:00:00 2001 From: fcaffieri Date: Wed, 6 Jul 2022 18:02:28 -0300 Subject: [PATCH 11/13] 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 9d6567842068278a982276d7da9081c8d96397df Mon Sep 17 00:00:00 2001 From: vcerenu Date: Fri, 22 Jul 2022 13:55:36 -0300 Subject: [PATCH 12/13] bump 4.3 into master --- build-docker-images/build-images.sh | 2 +- build-docker-images/build-images.yml | 10 ---------- single-node/docker-compose.yml | 4 ---- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index 17d04c8a..23b96a15 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -1,4 +1,4 @@ -WAZUH_IMAGE_VERSION=4.3.6 +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 7b7c1e0d..52984bf9 100644 --- a/build-docker-images/build-images.yml +++ b/build-docker-images/build-images.yml @@ -35,17 +35,12 @@ services: - filebeat_var:/var/lib/filebeat wazuh.indexer: -<<<<<<< HEAD:build-docker-images/build-images.yml 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 ->>>>>>> 69d34905aebbf49485fc35ad31c6914da1ae8785:build-docker-images/docker-compose.yml hostname: wazuh.indexer restart: always ports: @@ -61,17 +56,12 @@ services: hard: 65536 wazuh.dashboard: -<<<<<<< HEAD:build-docker-images/build-images.yml 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 ->>>>>>> 69d34905aebbf49485fc35ad31c6914da1ae8785:build-docker-images/docker-compose.yml hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index fc0d8e6a..109ead44 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -3,11 +3,7 @@ version: '3.7' services: wazuh.manager: -<<<<<<< HEAD - image: wazuh/wazuh-manager:4.3.6 -======= image: wazuh/wazuh-manager:4.5.0 ->>>>>>> 69d34905aebbf49485fc35ad31c6914da1ae8785 hostname: wazuh.manager restart: always ports: From c77ff03955d128bc29343d294138af701e9f9c25 Mon Sep 17 00:00:00 2001 From: morph027 Date: Mon, 8 Aug 2022 10:18:23 +0200 Subject: [PATCH 13/13] add JAVA_HOME to indexer for securityadmin.sh commands Signed-off-by: morph027 --- multi-node/docker-compose.yml | 3 +++ single-node/docker-compose.yml | 1 + 2 files changed, 4 insertions(+) diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index ce3414a0..d7b5c9d0 100644 --- a/multi-node/docker-compose.yml +++ b/multi-node/docker-compose.yml @@ -75,6 +75,7 @@ services: environment: - "OPENSEARCH_JAVA_OPTS=-Xms1g -Xmx1g" - "bootstrap.memory_lock=true" + - "JAVA_HOME=/usr/share/wazuh-indexer/jdk" ulimits: memlock: soft: -1 @@ -99,6 +100,7 @@ services: environment: - "OPENSEARCH_JAVA_OPTS=-Xms1g -Xmx1g" - "bootstrap.memory_lock=true" + - "JAVA_HOME=/usr/share/wazuh-indexer/jdk" ulimits: memlock: soft: -1 @@ -121,6 +123,7 @@ services: environment: - "OPENSEARCH_JAVA_OPTS=-Xms1g -Xmx1g" - "bootstrap.memory_lock=true" + - "JAVA_HOME=/usr/share/wazuh-indexer/jdk" ulimits: memlock: soft: -1 diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 109ead44..442e9388 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -46,6 +46,7 @@ services: - "9200:9200" environment: - "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m" + - "JAVA_HOME=/usr/share/wazuh-indexer/jdk" ulimits: memlock: soft: -1