From 3525003ef7596614a0e9eb310c1694f88247ca5d Mon Sep 17 00:00:00 2001 From: Alberto R Date: Wed, 24 Nov 2021 17:01:09 +0100 Subject: [PATCH] Bumped to 4.4.0 --- .github/.goss.yaml | 2 +- CHANGELOG.md | 7 ++++++- README.md | 3 ++- VERSION | 4 ++-- build-docker-images/wazuh-manager/Dockerfile | 2 +- docker-compose.yml | 4 ++-- kibana-odfe/Dockerfile | 2 +- kibana/Dockerfile | 2 +- multi-node/config/wazuh_cluster/wazuh_manager.conf | 3 +++ multi-node/config/wazuh_cluster/wazuh_worker.conf | 4 ++-- production-cluster.yml | 6 +++--- xpack-compose.yml | 4 ++-- xpack-from-sources.yml | 4 ++-- 13 files changed, 28 insertions(+), 19 deletions(-) diff --git a/.github/.goss.yaml b/.github/.goss.yaml index c0b59bda..6a6ed8eb 100644 --- a/.github/.goss.yaml +++ b/.github/.goss.yaml @@ -56,7 +56,7 @@ package: wazuh-manager: installed: true versions: - - 4.2.6 + - 4.4.0 port: tcp:1514: listening: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 60295204..73bdc6e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,12 @@ # Change Log All notable changes to this project will be documented in this file. -## Wazuh Docker v4.2.6 +## 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 - Update Wazuh to version [4.2.6](https://github.com/wazuh/wazuh/blob/v4.2.6/CHANGELOG.md#v426) diff --git a/README.md b/README.md index 8a4a9a80..18351bd7 100644 --- a/README.md +++ b/README.md @@ -195,7 +195,8 @@ WAZUH_MONITORING_REPLICAS=0 ## | Wazuh version | ODFE | XPACK | |---------------|---------|--------| -| v4.2.6 | 1.13.2 | 7.11.2 | +| 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 | | v4.2.3 | 1.13.2 | 7.11.2 | diff --git a/VERSION b/VERSION index b7c09d4c..1b8da5ba 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="4.2.6" -REVISION="40221" +WAZUH-DOCKER_VERSION="4.4.0" +REVISION="40400" diff --git a/build-docker-images/wazuh-manager/Dockerfile b/build-docker-images/wazuh-manager/Dockerfile index d65ec583..cee005e8 100644 --- a/build-docker-images/wazuh-manager/Dockerfile +++ b/build-docker-images/wazuh-manager/Dockerfile @@ -8,7 +8,7 @@ ARG WAZUH_TAG_REVISION ARG TEMPLATE_VERSION=4.3 ARG FILEBEAT_CHANNEL=filebeat-oss ARG FILEBEAT_VERSION=7.10.2 -ARG WAZUH_VERSION=4.2.6 +ARG WAZUH_VERSION=4.4.0-1 ARG TEMPLATE_VERSION="master" ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.1.tar.gz" diff --git a/docker-compose.yml b/docker-compose.yml index 561d8352..e7ed2f7d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: wazuh: - image: wazuh/wazuh-odfe:4.2.6 + 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.2.6 + image: wazuh/wazuh-kibana-odfe:4.4.0 hostname: kibana restart: always ports: diff --git a/kibana-odfe/Dockerfile b/kibana-odfe/Dockerfile index 2071005f..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.2.6 +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 1f4adede..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.2.6 +ARG WAZUH_VERSION=4.4.0 ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}" WORKDIR /usr/share/kibana diff --git a/multi-node/config/wazuh_cluster/wazuh_manager.conf b/multi-node/config/wazuh_cluster/wazuh_manager.conf index aec223a1..3b3703f5 100644 --- a/multi-node/config/wazuh_cluster/wazuh_manager.conf +++ b/multi-node/config/wazuh_cluster/wazuh_manager.conf @@ -222,6 +222,9 @@ 127.0.0.1 ^localhost.localdomain$ + 4.4.0.1 + 4.4.0.2 + 208.67.220.220 diff --git a/multi-node/config/wazuh_cluster/wazuh_worker.conf b/multi-node/config/wazuh_cluster/wazuh_worker.conf index 97d05a0f..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.2.6.1 - 4.2.6.2 + 4.4.0.1 + 4.4.0.2 208.67.220.220 diff --git a/production-cluster.yml b/production-cluster.yml index 42b6d227..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.2.6 + 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.2.6 + 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.2.6 + image: wazuh/wazuh-kibana-odfe:4.4.0 hostname: kibana restart: always ports: diff --git a/xpack-compose.yml b/xpack-compose.yml index bcdaaf8a..8fdb12e7 100644 --- a/xpack-compose.yml +++ b/xpack-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: wazuh: - image: wazuh/wazuh:4.2.6 + image: wazuh/wazuh:4.4.0 hostname: wazuh-manager restart: always ports: @@ -146,7 +146,7 @@ services: kibana: - image: wazuh/wazuh-kibana:4.2.6 + 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 9232b302..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.2.6 + 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.2.6 + image: wazuh/wazuh-kibana:4.4.0 hostname: kibana restart: always ports: