Merge pull request #720 from wazuh/4.2-merge-master

Merge 4.2 into master

CHANGELOG.md

@@ -6,12 +6,19 @@ All notable changes to this project will be documented in this file.
 ### Added
 
 - Update to [Wazuh v4.4.0](https://github.com/wazuh/wazuh/blob/v4.4.0/CHANGELOG.md#v440)
+- 
 ## [v4.3.0]
 
 ### Added
 
 - Update to [Wazuh v4.3.0](https://github.com/wazuh/wazuh/blob/v4.3.0/CHANGELOG.md#v430)
 
+## [v4.2.6]
+
+### Added
+
+- Update to [Wazuh v4.2.6](https://github.com/wazuh/wazuh/blob/v4.2.6/CHANGELOG.md#v426)
+
 ## [v4.2.5]
 
 ### Added

README.md

@@ -15,8 +15,9 @@ These playbooks install and configure Wazuh agent, manager and Elastic Stack.
 
 | Wazuh version | Elastic | ODFE   |
 |---------------|---------|--------|
-| v4.4.0        | 7.10.2  | 1.13.2 |
-| v4.3.0        | 7.10.2  | 1.13.2 |
+| v4.4.0        |         |        |
+| v4.3.0        |         |        |
+| v4.2.6        | 7.10.2  | 1.13.2 |
 | v4.2.5        | 7.10.2  | 1.13.2 |
 | v4.2.4        | 7.10.2  | 1.13.2 |
 | v4.2.3        | 7.10.2  | 1.13.2 |

roles/wazuh/ansible-filebeat/defaults/main.yml

@@ -3,7 +3,6 @@ filebeat_version: 7.10.2
 
 wazuh_template_branch: v4.4.0
 
-
 filebeat_create_config: true
 
 filebeat_node_name: node-1

roles/wazuh/ansible-wazuh-agent/defaults/main.yml

@@ -1,5 +1,4 @@
 ---
-
 wazuh_agent_version: 4.4.0-1
 
 # Custom packages installation

roles/wazuh/ansible-wazuh-manager/defaults/main.yml

@@ -1,5 +1,4 @@
 ---
-
 wazuh_manager_version: 4.4.0-1
 
 wazuh_manager_fqdn: "wazuh-server"