Merge branch '4.6.0' into merge-4.5.2-into-4.6.0

CHANGELOG.md

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

README.md

@@ -16,6 +16,7 @@ These playbooks install and configure Wazuh agent, manager and indexer and dashb
 
 | Wazuh version | Elastic | ODFE   |
 |---------------|---------|--------|
+| v4.6.0        |         |        |
 | v4.5.2        |         |        |
 | v4.5.1        |         |        |
 | v4.5.0        |         |        |
@@ -27,6 +28,7 @@ These playbooks install and configure Wazuh agent, manager and indexer and dashb
 | v4.4.0        |         |        |
 | v4.3.11       |         |        |
 | v4.3.10       |         |        |
+| v4.4.0        |         |        |
 | v4.3.9        |         |        |
 | v4.3.8        |         |        |
 | v4.3.7        |         |        |

VERSION

@@ -1,2 +1,2 @@
-WAZUH-ANSIBLE_VERSION="v4.5.2"
+WAZUH-ANSIBLE_VERSION="v4.6.0"
-REVISION="40504"
+REVISION="40600"

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

@@ -1,7 +1,7 @@
 ---
 filebeat_version: 7.10.2
 
-wazuh_template_branch: 4.5
+wazuh_template_branch: 4.6
 
 filebeat_node_name: node-1
 

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

@@ -1,6 +1,5 @@
 ---
-
+wazuh_agent_version: 4.6.0
-wazuh_agent_version: 4.5.2
 
 # Custom packages installation
 
@@ -12,7 +11,7 @@ wazuh_custom_packages_installation_agent_rpm_url: ""
 
 wazuh_agent_sources_installation:
   enabled: false
-  branch: "v4.5.2"
+  branch: "v4.6.0"
   user_language: "y"
   user_no_stop: "y"
   user_install_type: "agent"

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

@@ -1,6 +1,5 @@
 ---
-
+wazuh_manager_version: 4.6.0
-wazuh_manager_version: 4.5.2
 
 wazuh_manager_fqdn: "wazuh-server"
 wazuh_manager_package_state: present
@@ -13,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.5.2"
+  branch: "v4.6.0"
   user_language: "en"
   user_no_stop: "y"
   user_install_type: "server"
@@ -201,6 +200,12 @@ wazuh_manager_vulnerability_detector:
         - '9'
       update_interval: '1h'
       name: '"redhat"'
+    - enabled: 'no'
+      os:
+        - '8'
+        - '9'
+      update_interval: '1h'
+      name: '"almalinux"'
     - enabled: 'no'
       os:
         - 'amazon-linux'

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

@@ -1,2 +1,2 @@
 ---
-wazuh_version: 4.5.2
+wazuh_version: 4.6.0

roles/wazuh/vars/repo.yml

@@ -6,7 +6,7 @@ wazuh_repo:
 wazuh_winagent_config_url: "https://packages.wazuh.com/4.x/windows/wazuh-agent-{{ wazuh_agent_version }}-1.msi"
 wazuh_winagent_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.msi"
 
-certs_gen_tool_version: 4.5
+certs_gen_tool_version: 4.6
 
 # Url of certificates generator tool
 certs_gen_tool_url: "https://packages.wazuh.com/{{ certs_gen_tool_version }}/wazuh-certs-tool.sh"

roles/wazuh/vars/repo_pre-release.yml

@@ -6,7 +6,7 @@ wazuh_repo:
 wazuh_winagent_config_url: "https://packages-dev.wazuh.com/pre-release/windows/wazuh-agent-{{ wazuh_agent_version }}-1.msi"
 wazuh_winagent_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.msi"
 
-certs_gen_tool_version: 4.5
+certs_gen_tool_version: 4.6
 
 # Url of certificates generator tool
 certs_gen_tool_url: "https://packages-dev.wazuh.com/{{ certs_gen_tool_version }}/wazuh-certs-tool.sh"

roles/wazuh/vars/repo_staging.yml

@@ -6,7 +6,7 @@ wazuh_repo:
 wazuh_winagent_config_url: "https://packages-dev.wazuh.com/staging/windows/wazuh-agent-{{ wazuh_agent_version }}-1.msi"
 wazuh_winagent_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.msi"
 
-certs_gen_tool_version: 4.5
+certs_gen_tool_version: 4.6
 
 # Url of certificates generator tool
 certs_gen_tool_url: "https://packages-dev.wazuh.com/{{ certs_gen_tool_version }}/wazuh-certs-tool.sh"

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.5.2
+wazuh_version: 4.6.0
 indexer_cluster_nodes:
   - 127.0.0.1
 
 # The Wazuh dashboard package repository
-dashboard_version: "4.5.2"
+dashboard_version: "4.6.0"
 
 # API credentials
 wazuh_api_credentials:

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

@@ -1,2 +1,2 @@
 ---
-dashboard_version: 4.5.2
+dashboard_version: 4.6.0

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

@@ -1,6 +1,6 @@
 ---
 # Cluster Settings
-indexer_version: 4.5.2
+indexer_version: 4.6.0
 
 single_node: false
 indexer_node_name: node-1

roles/wazuh/wazuh-indexer/tasks/local_actions.yml

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