Merge pull request #479 from wazuh/476-update-4.2

Bump ODFE 3.13.2 on Wazuh 4.2.0

.goss.yaml

@@ -52,7 +52,7 @@ package:
   filebeat:
     installed: true
     versions:
-    - 7.10.0
+    - 7.10.2
   wazuh-manager:
     installed: true
     versions:

CHANGELOG.md

@@ -6,6 +6,12 @@ All notable changes to this project will be documented in this file.
 
 - Update Wazuh to version [4.2.0](https://github.com/wazuh/wazuh/blob/v4.2.0/CHANGELOG.md#v420)
 
+## Wazuh Docker v4.1.5
+### Added
+
+- Update Wazuh to version [4.1.5](https://github.com/wazuh/wazuh/blob/v4.1.5/CHANGELOG.md#v415)
+- Update ODFE compatibility to version 1.13.2
+
 ## Wazuh Docker v4.1.4
 ### Added
 

README.md

@@ -154,26 +154,17 @@ ADMIN_PRIVILEGES=true               # App privileges
 
 | Wazuh version | ODFE    | XPACK  |
 |---------------|---------|--------|
-| v4.2.0        | 1.12.0  | 7.10.2 |
-|---------------|---------|--------|
+| v4.2.0        | 1.13.2  | 7.10.2 |
+| v4.1.5        | 1.13.2  | 7.10.2 |
 | v4.1.4        | 1.12.0  | 7.10.2 |
-|---------------|---------|--------|
 | v4.1.3        | 1.12.0  | 7.10.2 |
-|---------------|---------|--------|
 | v4.1.2        | 1.12.0  | 7.10.2 |
-|---------------|---------|--------|
 | v4.1.1        | 1.12.0  | 7.10.2 |
-|---------------|---------|--------|
 | v4.1.0        | 1.12.0  | 7.10.2 |
-|---------------|---------|--------|
 | v4.0.4        | 1.11.0  |        |
-|---------------|---------|--------|
 | v4.0.3        | 1.11.0  |        |
-|---------------|---------|--------|
 | v4.0.2        | 1.11.0  |        |
-|---------------|---------|--------|
 | v4.0.1        | 1.11.0  |        |
-|---------------|---------|--------|
 | v4.0.0        | 1.10.1  |        |
 
 ## Credits and Thank you

build-from-sources.yml

@@ -31,7 +31,7 @@ services:
       - filebeat_var:/var/lib/filebeat
 
   elasticsearch:
-    image: amazon/opendistro-for-elasticsearch:1.12.0
+    image: amazon/opendistro-for-elasticsearch:1.13.3
     hostname: elasticsearch
     restart: always
     ports:

docker-compose.yml

@@ -30,7 +30,7 @@ services:
       - filebeat_var:/var/lib/filebeat
 
   elasticsearch:
-    image: amazon/opendistro-for-elasticsearch:1.12.0
+    image: amazon/opendistro-for-elasticsearch:1.13.2
     hostname: elasticsearch
     restart: always
     ports:

kibana-odfe/Dockerfile

@@ -1,7 +1,7 @@
 # Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
-FROM amazon/opendistro-for-elasticsearch-kibana:1.12.0
+FROM amazon/opendistro-for-elasticsearch-kibana:1.13.2
 USER kibana
-ARG ELASTIC_VERSION=7.10.0
+ARG ELASTIC_VERSION=7.10.2
 ARG WAZUH_VERSION=4.2.0
 ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}"
 

kibana-odfe/config/kibana_settings.sh

@@ -18,8 +18,6 @@ WAZUH_MAJOR=4
 # Customize elasticsearch ip
 ##############################################################################
 sed -i "s|elasticsearch.hosts:.*|elasticsearch.hosts: $el_url|g" /usr/share/kibana/config/kibana.yml
-# disable multitenancy
-sed -i "s|opendistro_security.multitenancy.enabled:.*|opendistro_security.multitenancy.enabled: false|g" /usr/share/kibana/config/kibana.yml
 
 # If KIBANA_INDEX was set, then change the default index in kibana.yml configuration file. If there was an index, then delete it and recreate.
 if [ "$KIBANA_INDEX" != "" ]; then

kibana-odfe/config/welcome_wazuh.sh

@@ -4,7 +4,7 @@
 if [[ $CHANGE_WELCOME == "true" ]]
 then
     echo "Set Wazuh app as the default landing page"
-    echo "server.defaultRoute: /app/wazuh" >> /usr/share/kibana/config/kibana.yml
+    echo "server.defaultRoute: /app/wazuh?security_tenant=global" >> /usr/share/kibana/config/kibana.yml
 
     echo "Set custom welcome styles"
     cp -f /tmp/custom_welcome/template.js.hbs /usr/share/kibana/src/legacy/ui/ui_render/bootstrap/template.js.hbs

production-cluster.yml

@@ -67,7 +67,7 @@ services:
       - ./production_cluster/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf
 
   elasticsearch:
-    image: amazon/opendistro-for-elasticsearch:1.12.0
+    image: amazon/opendistro-for-elasticsearch:1.13.2
     hostname: elasticsearch
     restart: always
     ports:
@@ -90,7 +90,7 @@ services:
       - ./production_cluster/elastic_opendistro/internal_users.yml:/usr/share/elasticsearch/plugins/opendistro_security/securityconfig/internal_users.yml
 
   elasticsearch-2:
-    image: amazon/opendistro-for-elasticsearch:1.12.0
+    image: amazon/opendistro-for-elasticsearch:1.13.2
     hostname: elasticsearch-2
     restart: always
     environment:
@@ -111,7 +111,7 @@ services:
       - ./production_cluster/elastic_opendistro/internal_users.yml:/usr/share/elasticsearch/plugins/opendistro_security/securityconfig/internal_users.yml
 
   elasticsearch-3:
-    image: amazon/opendistro-for-elasticsearch:1.12.0
+    image: amazon/opendistro-for-elasticsearch:1.13.2
     hostname: elasticsearch-3
     restart: always
     environment:

wazuh-odfe/Dockerfile

@@ -2,7 +2,7 @@
 FROM centos:7
 
 ARG FILEBEAT_CHANNEL=filebeat-oss
-ARG FILEBEAT_VERSION=7.10.0
+ARG FILEBEAT_VERSION=7.10.2
 ARG WAZUH_VERSION=4.2.0-1
 ARG TEMPLATE_VERSION="master"
 ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.1.tar.gz"