merge 4.8.0 into 4.9.0

2024-05-31 10:55:57 -03:00 · 2024-05-31 10:55:57 -03:00 · 2e5bbf41ae
commit 2e5bbf41ae
parent 033cd08d44 fe2c530a15
15 changed files with 46 additions and 19 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,6 +1,24 @@
 # Change Log
 All notable changes to this project will be documented in this file.

+## [v4.9.0]
+
+### Added
+
+- Update to [Wazuh v4.9.0](https://github.com/wazuh/wazuh/blob/v4.9.0/CHANGELOG.md#v490)
+
+## [v4.8.2]
+
+### Added
+
+- Update to [Wazuh v4.8.2](https://github.com/wazuh/wazuh/blob/v4.8.2/CHANGELOG.md#v482)
+
+## [v4.8.1]
+
+### Added
+
+- Update to [Wazuh v4.8.1](https://github.com/wazuh/wazuh/blob/v4.8.1/CHANGELOG.md#v481)
+
 ## [v4.8.0]

 ### Added
--- a/README.md
+++ b/README.md
@ -16,6 +16,9 @@ These playbooks install and configure Wazuh agent, manager and indexer and dashb

 | Wazuh version | Elastic | ODFE   |
 |---------------|---------|--------|
+| v4.9.0        |         |        |
+| v4.8.2        |         |        |
+| v4.8.1        |         |        |
 | v4.8.0        |         |        |
 | v4.7.5        |         |        |
 | v4.7.4        |         |        |
--- a/4
+++ b/4
@ -1,2 +1,2 @@
-WAZUH-ANSIBLE_VERSION="v4.8.0"
-REVISION="40811"
+WAZUH-ANSIBLE_VERSION="v4.9.0"
+REVISION="40900"
--- 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: v4.8.0
+wazuh_template_branch: v4.9.0

 filebeat_node_name: node-1

--- a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml
+++ b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml
@ -1,5 +1,5 @@
 ---
-wazuh_agent_version: 4.8.0
+wazuh_agent_version: 4.9.0

 # Custom packages installation

--- a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml
+++ b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml
@ -1,5 +1,5 @@
 ---
-wazuh_manager_version: 4.8.0
+wazuh_manager_version: 4.9.0

 wazuh_manager_fqdn: "wazuh-server"
 wazuh_manager_package_state: present
--- a/roles/wazuh/ansible-wazuh-manager/tasks/main.yml
+++ b/roles/wazuh/ansible-wazuh-manager/tasks/main.yml
@ -116,7 +116,7 @@
            dest="{{ wazuh_dir }}/etc/rules/local_rules.xml"
            owner=wazuh
            group=wazuh
-            mode=0640
+            mode=0660
  notify: restart wazuh-manager
  tags:
    - init
@ -128,7 +128,7 @@
        dest="{{ wazuh_dir }}/etc/rules/"
        owner=wazuh
        group=wazuh
-        mode=0640
+        mode=0660
  notify: restart wazuh-manager
  tags:
    - init
@ -140,7 +140,7 @@
            dest="{{ wazuh_dir }}/etc/decoders/local_decoder.xml"
            owner=wazuh
            group=wazuh
-            mode=0640
+            mode=0660
  notify: restart wazuh-manager
  tags:
    - init
@ -152,7 +152,7 @@
        dest="{{ wazuh_dir }}/etc/decoders/"
        owner=wazuh
        group=wazuh
-        mode=0640
+        mode=0660
  notify: restart wazuh-manager
  tags:
    - init
@ -165,7 +165,7 @@
    dest: "{{ wazuh_dir }}/etc/shared/default/agent.conf"
    owner: wazuh
    group: wazuh
-    mode: 0640
+    mode: 0660
    validate: "{{ wazuh_dir }}/bin/verify-agent-conf -f %s"
  notify: restart wazuh-manager
  tags:
@ -310,6 +310,11 @@
      with_items:
        - "{{ wazuh_api_users }}"

+    - name: Delete create_user script
+      file:
+        path: "{{ wazuh_dir }}/framework/scripts/create_user.py"
+        state: absent
+
  tags:
    - config_api_users
  when:
--- a/roles/wazuh/check-packages/defaults/main.yml
+++ b/roles/wazuh/check-packages/defaults/main.yml
@ -1,2 +1,2 @@
 ---
-wazuh_version: 4.8.0
+wazuh_version: 4.9.0
--- a/roles/wazuh/vars/repo.yml
+++ b/roles/wazuh/vars/repo.yml
@ -14,7 +14,7 @@ wazuh_macos_arm_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.arm64.pkg
 wazuh_macos_intel_package_url: "https://packages.wazuh.com/4.x/macos/{{ wazuh_macos_intel_package_name }}"
 wazuh_macos_arm_package_url: "https://packages.wazuh.com/4.x/macos/{{ wazuh_macos_arm_package_name }}"

-certs_gen_tool_version: 4.8
+certs_gen_tool_version: 4.9

 # Url of certificates generator tool
 certs_gen_tool_url: "https://packages.wazuh.com/{{ certs_gen_tool_version }}/wazuh-certs-tool.sh"
--- a/roles/wazuh/vars/repo_pre-release.yml
+++ b/roles/wazuh/vars/repo_pre-release.yml
@ -14,7 +14,7 @@ wazuh_macos_arm_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.arm64.pkg
 wazuh_macos_intel_package_url: "https://packages-dev.wazuh.com/pre-release/{{ wazuh_macos_intel_package_name }}"
 wazuh_macos_arm_package_url: "https://packages-dev.wazuh.com/pre-release/macos/{{ wazuh_macos_arm_package_name }}"

-certs_gen_tool_version: 4.8
+certs_gen_tool_version: 4.9

 # Url of certificates generator tool
 certs_gen_tool_url: "https://packages-dev.wazuh.com/{{ certs_gen_tool_version }}/wazuh-certs-tool.sh"
--- a/roles/wazuh/vars/repo_staging.yml
+++ b/roles/wazuh/vars/repo_staging.yml
@ -15,7 +15,7 @@ wazuh_macos_arm_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.arm64.pkg
 wazuh_macos_intel_package_url: "https://packages-dev.wazuh.com/staging/macos/{{ wazuh_macos_intel_package_name }}"
 wazuh_macos_arm_package_url: "https://packages-dev.wazuh.com/staging/macos/{{ wazuh_macos_arm_package_name }}"

-certs_gen_tool_version: 4.8
+certs_gen_tool_version: 4.9

 # Url of certificates generator tool
 certs_gen_tool_url: "https://packages-dev.wazuh.com/{{ certs_gen_tool_version }}/wazuh-certs-tool.sh"
--- a/roles/wazuh/wazuh-dashboard/defaults/main.yml
+++ b/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.8.0
+wazuh_version: 4.9.0
 indexer_cluster_nodes:
  - 127.0.0.1

 # The Wazuh dashboard package repository
-dashboard_version: "4.8.0"
+dashboard_version: "4.9.0"

 # API credentials
 wazuh_api_credentials:
--- a/roles/wazuh/wazuh-dashboard/vars/debian.yml
+++ b/roles/wazuh/wazuh-dashboard/vars/debian.yml
@ -1,2 +1,2 @@
 ---
-dashboard_version: 4.8.0
+dashboard_version: 4.9.0
--- a/roles/wazuh/wazuh-indexer/defaults/main.yml
+++ b/roles/wazuh/wazuh-indexer/defaults/main.yml
@ -1,6 +1,6 @@
 ---
 # Cluster Settings
-indexer_version: 4.8.0
+indexer_version: 4.9.0

 single_node: false
 indexer_node_name: node-1
--- a/roles/wazuh/wazuh-indexer/tasks/security_actions.yml
+++ b/roles/wazuh/wazuh-indexer/tasks/security_actions.yml
@ -94,7 +94,7 @@
    register: result
    until: result.rc == 0

-  run_once: true
+  when: inventory_hostname == ansible_play_hosts[0]

 - name: Create custom user
  uri:
@ -114,5 +114,6 @@
    timeout: 4
  when:
    - indexer_custom_user is defined and indexer_custom_user
+    - inventory_hostname == ansible_play_hosts[0]