resolving conflicts

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [v4.7.1]
+
+### Added
+
+- Update to [Wazuh v4.7.1](https://github.com/wazuh/wazuh/blob/v4.7.1/CHANGELOG.md#v471)
+
 ## [v4.7.0]
 
 ### Added

README.md

@@ -16,6 +16,7 @@ These playbooks install and configure Wazuh agent, manager and indexer and dashb
 
 | Wazuh version | Elastic | ODFE   |
 |---------------|---------|--------|
+| v4.7.1        |         |        |
 | v4.7.0        |         |        |
 | v4.6.0        |         |        |
 | v4.5.4        |         |        |

VERSION

@@ -1,2 +1,7 @@
+<<<<<<< HEAD
 WAZUH-ANSIBLE_VERSION="v4.7.0"
 REVISION="40703"
+=======
+WAZUH-ANSIBLE_VERSION="v4.7.1"
+REVISION="40705"
+>>>>>>> 018da92c8c21f9d194729532c6b042bc1be4dee7

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

@@ -1,7 +1,7 @@
 ---
 filebeat_version: 7.10.2
 
-wazuh_template_branch: v4.7.0
+wazuh_template_branch: v4.7.1
 
 filebeat_node_name: node-1
 

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

@@ -1,5 +1,5 @@
 ---
-wazuh_agent_version: 4.7.0
+wazuh_agent_version: 4.7.1
 
 # Custom packages installation
 
@@ -11,7 +11,7 @@ wazuh_custom_packages_installation_agent_rpm_url: ""
 
 wazuh_agent_sources_installation:
   enabled: false
-  branch: "v4.7.0"
+  branch: "v4.7.1"
   user_language: "y"
   user_no_stop: "y"
   user_install_type: "agent"

roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml

@@ -1,4 +1,10 @@
 ---
+- name: Update apt-get repo and cache
+  apt: 
+    update_cache: yes
+    force_apt_get: yes
+    cache_valid_time: 3600
+  
 - name: Debian/Ubuntu | Install ca-certificates and gnupg
   apt:
     name:

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

@@ -1,5 +1,5 @@
 ---
-wazuh_manager_version: 4.7.0
+wazuh_manager_version: 4.7.1
 
 wazuh_manager_fqdn: "wazuh-server"
 wazuh_manager_package_state: present
@@ -12,7 +12,7 @@ wazuh_custom_packages_installation_manager_rpm_url: "https://s3-us-west-1.amazon
 # Sources installation
 wazuh_manager_sources_installation:
   enabled: false
-  branch: "v4.7.0"
+  branch: "v4.7.1"
   user_language: "en"
   user_no_stop: "y"
   user_install_type: "server"

roles/wazuh/check-packages/defaults/main.yml

@@ -1,2 +1,2 @@
 ---
-wazuh_version: 4.7.0
+wazuh_version: 4.7.1

roles/wazuh/wazuh-dashboard/defaults/main.yml

@@ -8,12 +8,12 @@ dashboard_node_name: node-1
 dashboard_server_host: "0.0.0.0"
 dashboard_server_port: "443"
 dashboard_server_name: "dashboard"
-wazuh_version: 4.7.0
+wazuh_version: 4.7.1
 indexer_cluster_nodes:
   - 127.0.0.1
 
 # The Wazuh dashboard package repository
-dashboard_version: "4.7.0"
+dashboard_version: "4.7.1"
 
 # API credentials
 wazuh_api_credentials:

roles/wazuh/wazuh-dashboard/templates/wazuh.yml.j2

@@ -16,7 +16,7 @@
 # https://documentation.wazuh.com/current/installation-guide/index.html
 #
 # Also, you can check our repository:
-# https://github.com/wazuh/wazuh-dashboard
+# https://github.com/wazuh/wazuh-dashboard-plugins
 #
 # ------------------------------- Index patterns -------------------------------
 #

roles/wazuh/wazuh-dashboard/vars/debian.yml

@@ -1,2 +1,2 @@
 ---
-dashboard_version: 4.7.0
+dashboard_version: 4.7.1

roles/wazuh/wazuh-indexer/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 # Cluster Settings
-indexer_version: 4.7.0
+indexer_version: 4.7.1
 
 single_node: false
 indexer_node_name: node-1