diff --git a/CHANGELOG.md b/CHANGELOG.md index 0132bf07..ed4872c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,11 @@ All notable changes to this project will be documented in this file. - Update Wazuh to version [4.8.0](https://github.com/wazuh/wazuh/blob/v4.8.0/CHANGELOG.md#v480) +## 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 8c6528db..6f9355b2 100644 --- a/README.md +++ b/README.md @@ -196,6 +196,7 @@ WAZUH_MONITORING_REPLICAS=0 ## | Wazuh version | ODFE | XPACK | |---------------|---------|--------| | v4.8.0 | | | +| v4.7.1 | | | | v4.7.0 | | | | v4.6.0 | | | | v4.5.3 | | | diff --git a/build-docker-images/wazuh-dashboard/Dockerfile b/build-docker-images/wazuh-dashboard/Dockerfile index e6c8c71b..e8263e6e 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 diff --git a/build-docker-images/wazuh-manager/Dockerfile b/build-docker-images/wazuh-manager/Dockerfile index 20ceac4e..d9cb9ab8 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.8 +ARG TEMPLATE_VERSION=v4.8.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" ] 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: diff --git a/multi-node/config/wazuh_cluster/wazuh_manager.conf b/multi-node/config/wazuh_cluster/wazuh_manager.conf index 7286218c..6c5d9ae7 100644 --- a/multi-node/config/wazuh_cluster/wazuh_manager.conf +++ b/multi-node/config/wazuh_cluster/wazuh_manager.conf @@ -137,6 +137,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 8f462263..341e6301 100644 --- a/multi-node/config/wazuh_cluster/wazuh_worker.conf +++ b/multi-node/config/wazuh_cluster/wazuh_worker.conf @@ -137,6 +137,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 96dbb367..0cf738f3 100644 --- a/single-node/config/wazuh_cluster/wazuh_manager.conf +++ b/single-node/config/wazuh_cluster/wazuh_manager.conf @@ -137,6 +137,7 @@ no amazon-linux amazon-linux-2 + amazon-linux-2023 1h