diff --git a/CHANGELOG.md b/CHANGELOG.md index 04eaf507..ac70978f 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 [5.0.0](https://github.com/wazuh/wazuh/blob/v5.0.0/CHANGELOG.md#v500) +## Wazuh Docker v4.10.0 +### Added + +- Update Wazuh to version [4.10.0](https://github.com/wazuh/wazuh/blob/v4.10.0/CHANGELOG.md#v4100) + ## Wazuh Docker v4.9.0 ### Added diff --git a/README.md b/README.md index 34290fc2..f0024a91 100644 --- a/README.md +++ b/README.md @@ -58,20 +58,6 @@ CHECKS_TEMPLATE=true # step once the Wazuh app starts. Values must be CHECKS_API=true CHECKS_SETUP=true -EXTENSIONS_PCI=true # Enable PCI Extension -EXTENSIONS_GDPR=true # Enable GDPR Extension -EXTENSIONS_HIPAA=true # Enable HIPAA Extension -EXTENSIONS_NIST=true # Enable NIST Extension -EXTENSIONS_TSC=true # Enable TSC Extension -EXTENSIONS_AUDIT=true # Enable Audit Extension -EXTENSIONS_OSCAP=false # Enable OpenSCAP Extension -EXTENSIONS_CISCAT=false # Enable CISCAT Extension -EXTENSIONS_AWS=false # Enable AWS Extension -EXTENSIONS_GCP=false # Enable GCP Extension -EXTENSIONS_VIRUSTOTAL=false # Enable Virustotal Extension -EXTENSIONS_OSQUERY=false # Enable OSQuery Extension -EXTENSIONS_DOCKER=false # Enable Docker Extension - APP_TIMEOUT=20000 # Defines maximum timeout to be used on the Wazuh app requests API_SELECTOR=true Defines if the user is allowed to change the selected API directly from the Wazuh app top menu @@ -89,19 +75,23 @@ WAZUH_MONITORING_REPLICAS=0 ## ## Directory structure ├── build-docker-images - │   ├── docker-compose.yml + │   ├── build-images.sh + │   ├── build-images.yml + │   ├── README.md │   ├── wazuh-dashboard │   │   ├── config │   │   │   ├── config.sh │   │   │   ├── config.yml + │   │   │   ├── dl_base.sh │   │   │   ├── entrypoint.sh + │   │   │   ├── install_wazuh_app.sh │   │   │   ├── opensearch_dashboards.yml │   │   │   ├── wazuh_app_config.sh │   │   │   └── wazuh.yml │   │   └── Dockerfile │   ├── wazuh-indexer │   │   ├── config - │ │ │ ├── action_groups.yml + │   │   │   ├── action_groups.yml │   │   │   ├── config.sh │   │   │   ├── config.yml │   │   │   ├── entrypoint.sh @@ -113,6 +103,7 @@ WAZUH_MONITORING_REPLICAS=0 ## │   │   └── Dockerfile │   └── wazuh-manager │   ├── config + │   │   ├── check_repository.sh │   │   ├── create_user.py │   │   ├── etc │   │   │   ├── cont-init.d @@ -125,19 +116,21 @@ WAZUH_MONITORING_REPLICAS=0 ## │   │   │   │   └── run │   │   │   └── ossec-logs │   │   │   └── run + │   │   ├── filebeat_module.sh │   │   ├── filebeat.yml │   │   ├── permanent_data.env - │   │   ├── permanent_data.sh - │   │   └── wazuh.repo + │   │   └── permanent_data.sh │   └── Dockerfile ├── CHANGELOG.md ├── indexer-certs-creator │   ├── config │   │   └── entrypoint.sh - │   └── Dockerfile + │   ├── Dockerfile + │   └── README.md ├── LICENSE ├── multi-node │   ├── config + │   │   ├── certs.yml │   │   ├── nginx │   │   │   └── nginx.conf │   │   ├── wazuh_cluster @@ -146,47 +139,35 @@ WAZUH_MONITORING_REPLICAS=0 ## │   │   ├── wazuh_dashboard │   │   │   ├── opensearch_dashboards.yml │   │   │   └── wazuh.yml - │   │   ├── wazuh_indexer - │   │   │   ├── internal_users.yml - │   │   │   ├── wazuh1.indexer.yml - │   │   │   ├── wazuh2.indexer.yml - │   │   │   └── wazuh3.indexer.yml - │   │   └── wazuh_indexer_ssl_certs - │   │   └── certs.yml + │   │   └── wazuh_indexer + │   │   ├── internal_users.yml + │   │   ├── wazuh1.indexer.yml + │   │   ├── wazuh2.indexer.yml + │   │   └── wazuh3.indexer.yml │   ├── docker-compose.yml - │   ├── generate-certs.yml - │   ├── Migration-to-Wazuh-4.3.md + │   ├── generate-indexer-certs.yml + │   ├── Migration-to-Wazuh-4.4.md + │   ├── README.md │   └── volume-migrator.sh ├── README.md + ├── SECURITY.md ├── single-node │   ├── config + │   │   ├── certs.yml │   │   ├── wazuh_cluster │   │   │   └── wazuh_manager.conf │   │   ├── wazuh_dashboard │   │   │   ├── opensearch_dashboards.yml │   │   │   └── wazuh.yml - │   │   ├── wazuh_indexer - │   │   │   ├── internal_users.yml - │   │   │   └── wazuh.indexer.yml - │   │   └── wazuh_indexer_ssl_certs - │   │   ├── admin-key.pem - │   │   ├── admin.pem - │   │   ├── certs.yml - │   │   ├── root-ca.key - │   │   ├── root-ca.pem - │   │   ├── wazuh.dashboard-key.pem - │   │   ├── wazuh.dashboard.pem - │   │   ├── wazuh.indexer-key.pem - │   │   ├── wazuh.indexer.pem - │   │   ├── wazuh.manager-key.pem - │   │   └── wazuh.manager.pem + │   │   └── wazuh_indexer + │   │   ├── internal_users.yml + │   │   └── wazuh.indexer.yml │   ├── docker-compose.yml - │   ├── generate-certs.yml + │   ├── generate-indexer-certs.yml │   └── README.md └── VERSION - ## Branches * `master` branch contains the latest code, be aware of possible bugs on this branch. @@ -197,6 +178,7 @@ WAZUH_MONITORING_REPLICAS=0 ## | Wazuh version | ODFE | XPACK | |---------------|---------|--------| | v5.0.0 | | | +| v4.10.0 | | | | v4.9.0 | | | | v4.8.2 | | | | v4.8.1 | | | diff --git a/build-docker-images/wazuh-dashboard/Dockerfile b/build-docker-images/wazuh-dashboard/Dockerfile index 172c9861..2555585f 100644 --- a/build-docker-images/wazuh-dashboard/Dockerfile +++ b/build-docker-images/wazuh-dashboard/Dockerfile @@ -57,21 +57,6 @@ ENV PATTERN="" \ CHECKS_TEMPLATE="" \ CHECKS_API="" \ CHECKS_SETUP="" \ - EXTENSIONS_PCI="" \ - EXTENSIONS_GDPR="" \ - EXTENSIONS_HIPAA="" \ - EXTENSIONS_NIST="" \ - EXTENSIONS_TSC="" \ - EXTENSIONS_AUDIT="" \ - EXTENSIONS_OSCAP="" \ - EXTENSIONS_CISCAT="" \ - EXTENSIONS_AWS="" \ - EXTENSIONS_GCP="" \ - EXTENSIONS_GITHUB=""\ - EXTENSIONS_OFFICE=""\ - EXTENSIONS_VIRUSTOTAL="" \ - EXTENSIONS_OSQUERY="" \ - EXTENSIONS_DOCKER="" \ APP_TIMEOUT="" \ API_SELECTOR="" \ IP_SELECTOR="" \ 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 4773d45d..76ecdc7f 100644 --- a/build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh +++ b/build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh @@ -15,21 +15,6 @@ declare -A CONFIG_MAP=( [checks.template]=$CHECKS_TEMPLATE [checks.api]=$CHECKS_API [checks.setup]=$CHECKS_SETUP - [extensions.pci]=$EXTENSIONS_PCI - [extensions.gdpr]=$EXTENSIONS_GDPR - [extensions.hipaa]=$EXTENSIONS_HIPAA - [extensions.nist]=$EXTENSIONS_NIST - [extensions.tsc]=$EXTENSIONS_TSC - [extensions.audit]=$EXTENSIONS_AUDIT - [extensions.oscap]=$EXTENSIONS_OSCAP - [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 [timeout]=$APP_TIMEOUT [api.selector]=$API_SELECTOR [ip.selector]=$IP_SELECTOR