From 63817dfd55772c178e5a51facbcbed705e342b08 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Thu, 7 Sep 2023 12:15:25 -0300 Subject: [PATCH 1/6] 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 2/6] 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 3/6] 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 @@ 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 @@ def disable_user(uid): 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 8cc5c8b0bbc395135f053d475895ca40953f99b0 Mon Sep 17 00:00:00 2001 From: Leonardo Quiceno Date: Fri, 1 Sep 2023 19:33:52 -0500 Subject: [PATCH 4/6] Add Amazon Linux 2023 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..9ebabc0a 100644 --- a/multi-node/config/wazuh_cluster/wazuh_manager.conf +++ b/multi-node/config/wazuh_cluster/wazuh_manager.conf @@ -136,6 +136,7 @@ no amazon-linux amazon-linux-2 + amazon-linux-2023 1h diff --git a/multi-node/config/wazuh_cluster/wazuh_worker.conf b/multi-node/config/wazuh_cluster/wazuh_worker.conf index 2fdbb305..91e23d79 100644 --- a/multi-node/config/wazuh_cluster/wazuh_worker.conf +++ b/multi-node/config/wazuh_cluster/wazuh_worker.conf @@ -136,6 +136,7 @@ no amazon-linux amazon-linux-2 + amazon-linux-2023 1h diff --git a/single-node/config/wazuh_cluster/wazuh_manager.conf b/single-node/config/wazuh_cluster/wazuh_manager.conf index 63202e48..cda16352 100644 --- a/single-node/config/wazuh_cluster/wazuh_manager.conf +++ b/single-node/config/wazuh_cluster/wazuh_manager.conf @@ -136,6 +136,7 @@ no amazon-linux amazon-linux-2 + amazon-linux-2023 1h From d449ae7f76e464a132ee71b8944803581fc851bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Wed, 20 Sep 2023 11:01:19 +0200 Subject: [PATCH 5/6] Bump version to 4.7.1 --- .env | 4 ++-- .github/.goss.yaml | 2 +- CHANGELOG.md | 5 +++++ README.md | 1 + VERSION | 4 ++-- build-docker-images/build-images.sh | 2 +- multi-node/docker-compose.yml | 12 ++++++------ single-node/docker-compose.yml | 6 +++--- 8 files changed, 21 insertions(+), 15 deletions(-) diff --git a/.env b/.env index a4909eb4..9c749eb7 100755 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ -WAZUH_VERSION=4.7.0 -WAZUH_IMAGE_VERSION=4.7.0 +WAZUH_VERSION=4.7.1 +WAZUH_IMAGE_VERSION=4.7.1 WAZUH_TAG_REVISION=1 diff --git a/.github/.goss.yaml b/.github/.goss.yaml index 95764f97..52c446ce 100644 --- a/.github/.goss.yaml +++ b/.github/.goss.yaml @@ -56,7 +56,7 @@ package: wazuh-manager: installed: true versions: - - 4.7.0-1 + - 4.7.1-1 port: tcp:1514: listening: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 66b3528c..e35f1473 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.7.1 +### Added + +- Update Wazuh to version [4.7.1](https://github.com/wazuh/wazuh/blob/v4.7.1/CHANGELOG.md#v471) + ## Wazuh Docker v4.7.0 ### Added diff --git a/README.md b/README.md index 0e953ee9..5786e6b1 100644 --- a/README.md +++ b/README.md @@ -195,6 +195,7 @@ WAZUH_MONITORING_REPLICAS=0 ## | Wazuh version | ODFE | XPACK | |---------------|---------|--------| +| v4.7.1 | | | | v4.7.0 | | | | v4.6.0 | | | | v4.5.3 | | | diff --git a/VERSION b/VERSION index aa9abeed..9030d4f6 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="4.7.0" -REVISION="40700" +WAZUH-DOCKER_VERSION="4.7.1" +REVISION="40705" diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index b31e3cf1..725c797a 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -1,4 +1,4 @@ -WAZUH_IMAGE_VERSION=4.7.0 +WAZUH_IMAGE_VERSION=4.7.1 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 14bcd9b8..dba9197f 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.7.0 + image: wazuh/wazuh-manager:4.7.1 hostname: wazuh.master restart: always ulimits: @@ -45,7 +45,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.worker: - image: wazuh/wazuh-manager:4.7.0 + image: wazuh/wazuh-manager:4.7.1 hostname: wazuh.worker restart: always ulimits: @@ -81,7 +81,7 @@ services: - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf wazuh1.indexer: - image: wazuh/wazuh-indexer:4.7.0 + image: wazuh/wazuh-indexer:4.7.1 hostname: wazuh1.indexer restart: always ports: @@ -107,7 +107,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh2.indexer: - image: wazuh/wazuh-indexer:4.7.0 + image: wazuh/wazuh-indexer:4.7.1 hostname: wazuh2.indexer restart: always environment: @@ -129,7 +129,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh3.indexer: - image: wazuh/wazuh-indexer:4.7.0 + image: wazuh/wazuh-indexer:4.7.1 hostname: wazuh3.indexer restart: always environment: @@ -151,7 +151,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.7.0 + image: wazuh/wazuh-dashboard:4.7.1 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 4cecdea7..20c3cf06 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.7.0 + image: wazuh/wazuh-manager:4.7.1 hostname: wazuh.manager restart: always ulimits: @@ -46,7 +46,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.indexer: - image: wazuh/wazuh-indexer:4.7.0 + image: wazuh/wazuh-indexer:4.7.1 hostname: wazuh.indexer restart: always ports: @@ -71,7 +71,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.7.0 + image: wazuh/wazuh-dashboard:4.7.1 hostname: wazuh.dashboard restart: always ports: From b3441a6b07e194c696cfe1140dc733b13de94da6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Fri, 22 Sep 2023 12:23:37 +0200 Subject: [PATCH 6/6] Updated TEMPLATE_VERSION variable --- build-docker-images/wazuh-manager/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-docker-images/wazuh-manager/Dockerfile b/build-docker-images/wazuh-manager/Dockerfile index bb6988bb..795b6b4f 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=v4.7.0 +ARG TEMPLATE_VERSION=v4.7.1 ARG FILEBEAT_CHANNEL=filebeat-oss ARG FILEBEAT_VERSION=7.10.2 ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.2.tar.gz"