Merge pull request #1043 from wazuh/merge-4.7.1-into-master

Merge 4.7.1 into master
wazuh · Sep 22, 2023 · a9e12d7 · a9e12d7
2 parents 889e99e + 237a5de
commit a9e12d7
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ All notable changes to this project will be documented in this file.
 
 - Update to [Wazuh v4.8.0](https://github.com/wazuh/wazuh/blob/v4.8.0/CHANGELOG.md#v480)
 
+## [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

diff --git a/README.md b/README.md
@@ -17,6 +17,7 @@ These playbooks install and configure Wazuh agent, manager and indexer and dashb
 | Wazuh version | Elastic | ODFE   |
 |---------------|---------|--------|
 | v4.8.0        |         |        |
+| v4.7.1        |         |        |
 | v4.7.0        |         |        |
 | v4.6.0        |         |        |
 | v4.5.3        |         |        |

diff --git a/roles/wazuh/ansible-filebeat-oss/defaults/main.yml b/roles/wazuh/ansible-filebeat-oss/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 filebeat_version: 7.10.2
 
-wazuh_template_branch: 4.8
+wazuh_template_branch: v4.8.0
 
 filebeat_node_name: node-1
 

diff --git a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml
@@ -211,6 +211,7 @@ wazuh_manager_vulnerability_detector:
       os:
         - 'amazon-linux'
         - 'amazon-linux-2'
+        - 'amazon-linux-2023'
       update_interval: '1h'
       name: '"alas"'
     - enabled: 'no'

diff --git a/roles/wazuh/wazuh-indexer/tasks/local_actions.yml b/roles/wazuh/wazuh-indexer/tasks/local_actions.yml
@@ -30,8 +30,8 @@
 
   - name: Local action | Prepare the certificates generation template file
     template:
-      src: "templates/wazuh-config.yml.j2"
-      dest: "{{ local_certs_path }}/wazuh-config.yml"
+      src: "templates/config.yml.j2"
+      dest: "{{ local_certs_path }}/config.yml"
       mode: 0644
     register: tlsconfig_template