Merge branch '3.7.2_6.5.4'

wazuh/Dockerfile

@@ -1,6 +1,6 @@
 # Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2)
 FROM phusion/baseimage:latest
-ARG FILEBEAT_VERSION=6.5.3
+ARG FILEBEAT_VERSION=6.5.4
 ARG WAZUH_VERSION=3.7.2-1
 
 
@@ -77,6 +77,8 @@ RUN mkdir /etc/service/filebeat
 COPY config/filebeat.runit.service /etc/service/filebeat/run
 RUN chmod +x /etc/service/filebeat/run
 
+# Temporary fix for Wazuh cluster master node in Kubernetes
+RUN sed -i '87d;88d' /var/ossec/framework/wazuh/cluster/cluster.py
 
 # Run all services
 ENTRYPOINT ["/entrypoint.sh"]

wazuh/config/filebeat.yml

@@ -1,11 +1,10 @@
 # Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2)
 filebeat:
- inputs:
+ prospectors:
   - type: log
     paths:
-     - "/var/ossec/data/logs/alerts/alerts.json"
-    fields:
-      document_type: wazuh-alerts
+     - "/var/ossec/logs/alerts/alerts.json"
+    document_type: json
     json.message_key: log
     json.keys_under_root: true
     json.overwrite_keys: true