From 84fe19e86823564acca1144c927cf58752fb9309 Mon Sep 17 00:00:00 2001 From: Alberto R Date: Wed, 24 Nov 2021 17:01:09 +0100 Subject: [PATCH 1/8] 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 2/8] 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 95565df2f56c5140f208a9a4b2270211ce1122bf Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 23 May 2022 10:58:04 -0300 Subject: [PATCH 3/8] fix whitelist --- 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 8d9ad6152a3aa8fb7dc1aba464a2bef04a24b416 Mon Sep 17 00:00:00 2001 From: fcaffieri Date: Fri, 1 Jul 2022 17:45:23 -0300 Subject: [PATCH 4/8] 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 a82cc9ec39e10b4d703490a3e43ff60b74f65e8d Mon Sep 17 00:00:00 2001 From: fcaffieri Date: Mon, 4 Jul 2022 09:18:11 -0300 Subject: [PATCH 5/8] 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 f97a719304cff1bb3474e0764108dba4a529981f Mon Sep 17 00:00:00 2001 From: fcaffieri Date: Wed, 6 Jul 2022 17:35:20 -0300 Subject: [PATCH 6/8] 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 4c710e6c203cb2305bebe0bd70d01d1b7c8e678f Mon Sep 17 00:00:00 2001 From: fcaffieri Date: Wed, 6 Jul 2022 18:01:53 -0300 Subject: [PATCH 7/8] 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 b6959c8b1546263353032fbc1a4c029197252f41 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Fri, 9 Sep 2022 15:29:07 -0300 Subject: [PATCH 8/8] doble quote for password --- multi-node/config/wazuh_dashboard/wazuh.yml | 2 +- single-node/config/wazuh_dashboard/wazuh.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/multi-node/config/wazuh_dashboard/wazuh.yml b/multi-node/config/wazuh_dashboard/wazuh.yml index 425686a3..59a44de1 100644 --- a/multi-node/config/wazuh_dashboard/wazuh.yml +++ b/multi-node/config/wazuh_dashboard/wazuh.yml @@ -3,5 +3,5 @@ hosts: url: "https://wazuh.master" port: 55000 username: wazuh-wui - password: MyS3cr37P450r.*- + password: "MyS3cr37P450r.*-" run_as: false diff --git a/single-node/config/wazuh_dashboard/wazuh.yml b/single-node/config/wazuh_dashboard/wazuh.yml index ea5e82b4..ef429153 100644 --- a/single-node/config/wazuh_dashboard/wazuh.yml +++ b/single-node/config/wazuh_dashboard/wazuh.yml @@ -3,5 +3,5 @@ hosts: url: "https://wazuh.manager" port: 55000 username: wazuh-wui - password: MyS3cr37P450r.*- + password: "MyS3cr37P450r.*-" run_as: false