Merge pull request #1632 from wazuh/merge-4.12.1-into-4.12.2

CHANGELOG.md

@@ -46,12 +46,13 @@ All notable changes to this project will be documented in this file.
 ### Changed
 
 - Standardize version file format ([#1553](https://github.com/wazuh/wazuh-ansible/pull/1553))
-- Use fixed version of Ubuntu-22.04 in GHA runners instead of latest version ([#1479](https://github.com/wazuh/wazuh-ansible/pull/1479)) \- (PR Checks Workflows)
 - Implement minor changes for Wazuh ansible arm64 support ([#1518](https://github.com/wazuh/wazuh-ansible/pull/1518))
+- Use fixed version of Ubuntu-22.04 in GHA runners instead of latest version ([#1479](https://github.com/wazuh/wazuh-ansible/pull/1479)) \- (PR Checks Workflows)
 
 ### Fixed
 
-- None
+- Add gnupg dependency to indexer, filebeat-oss, and dashboard roles ([#1623](https://github.com/wazuh/wazuh-ansible/pull/1623))
+- Update the Filebeat installation for arm64 to include revision ([#1616](https://github.com/wazuh/wazuh-ansible/pull/1616))
 
 ### Deleted
 

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

@@ -20,10 +20,3 @@ filebeat_ssl_dir: /etc/pki/filebeat
 
 # Local path to store the generated certificates (Opensearch security plugin)
 local_certs_path: "{{ playbook_dir }}/indexer/certificates"
-
-filebeatrepo:
-  keyring_path: '/usr/share/keyrings/wazuh.gpg'
-  apt: "deb [signed-by=/usr/share/keyrings/wazuh.gpg] https://packages.wazuh.com/4.x/apt/ stable main"
-  yum: 'https://packages.wazuh.com/4.x/yum/'
-  gpg: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH'
-  path: '/tmp/WAZUH-GPG-KEY'

roles/wazuh/ansible-filebeat-oss/tasks/Debian.yml

@@ -1,32 +1,33 @@
 ---
-- name: Debian/Ubuntu | Install apt-transport-https, ca-certificates and acl
+- name: Debian/Ubuntu | Install apt-transport-https, ca-certificate, acl and gnupg
   apt:
     name:
       - apt-transport-https
       - ca-certificates
       - acl
+      - gnupg
     state: present
   register: filebeat_ca_packages_install
   until: filebeat_ca_packages_install is succeeded
 
 - name: Debian/Ubuntu | Download Filebeat apt key.
   get_url:
-    url: "{{ filebeatrepo.gpg }}"
+    url: "{{ wazuh_repo.gpg }}"
-    dest: "{{ filebeatrepo.path }}"
+    dest: "{{ wazuh_repo.path }}"
 
 - name: Import Filebeat GPG key
-  command: "gpg --no-default-keyring --keyring gnupg-ring:{{ filebeatrepo.keyring_path }} --import {{ filebeatrepo.path }}"
+  command: "gpg --no-default-keyring --keyring gnupg-ring:{{ wazuh_repo.keyring_path }} --import {{ wazuh_repo.path }}"
   args:
-    creates: "{{ filebeatrepo.keyring_path }}"
+    creates: "{{ wazuh_repo.keyring_path }}"
 
 - name: Set permissions for Filebeat GPG key
   file:
-    path: "{{ filebeatrepo.keyring_path }}"
+    path: "{{ wazuh_repo.keyring_path }}"
     mode: '0644'
 
 - name: Debian/Ubuntu | Add Filebeat-oss repository.
   apt_repository:
-    repo: "{{ filebeatrepo.apt }}"
+    repo: "{{ wazuh_repo.apt }}"
     state: present
     update_cache: true
   changed_when: false

roles/wazuh/ansible-filebeat-oss/tasks/RMDebian.yml

@@ -1,6 +1,6 @@
 ---
 - name: Debian/Ubuntu | Remove Filebeat repository (and clean up left-over metadata)
   apt_repository:
-    repo: "{{ filebeatrepo.apt }}"
+    repo: "{{ wazuh_repo.apt }}"
     state: absent
   changed_when: false

roles/wazuh/ansible-filebeat-oss/tasks/RedHat.yml

@@ -3,7 +3,7 @@
   yum_repository:
     name: wazuh_repo
     description: Wazuh Repo
-    baseurl: "{{ filebeatrepo.yum }}"
+    baseurl: "{{ wazuh_repo.yum }}"
-    gpgkey: "{{ filebeatrepo.gpg }}"
+    gpgkey: "{{ wazuh_repo.gpg }}"
     gpgcheck: true
   changed_when: false

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

@@ -7,6 +7,9 @@
 - include_vars: ../../vars/repo_pre-release.yml
   when: packages_repository == 'pre-release'
 
+- include_vars: ../../vars/repo_staging.yml
+  when: packages_repository == 'staging'
+
 - include_tasks: RedHat.yml
   when: ansible_os_family == 'RedHat'
 
@@ -26,7 +29,7 @@
 
 - name: Install Filebeat | Debian
   apt:
-    name: "filebeat={{ filebeat_version }}"
+    name: "filebeat={{ filebeat_version }}-*"
     state: present
   register: install
   tags:

roles/wazuh/wazuh-dashboard/tasks/Debian.yml

@@ -7,6 +7,12 @@
       url: "{{ wazuh_repo.gpg }}"
       dest: "{{ wazuh_repo.path }}"
 
+  - name: Debian/Ubuntu | Install gnupg
+    apt:
+      name:
+        - gnupg
+      state: present
+
   - name: Import Wazuh repository GPG key
     command: "gpg --no-default-keyring --keyring gnupg-ring:{{ wazuh_repo.keyring_path }} --import {{ wazuh_repo.path }}"
     args:

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

@@ -5,16 +5,16 @@
   apt:
     update_cache: yes
 
-- name: Debian 9 (Stretch)
+- name: Install Wazuh indexer dependencies
-  when: (ansible_facts['distribution'] == "Debian" and ansible_facts['distribution_major_version'] == "9")
+  apt:
-  block:
+    name:
-
+      - unzip
-    - name: Install Wazuh indexer dependencies
+      - wget
-      apt:
+      - curl
-        name: [
+      - apt-transport-https
-          'unzip', 'wget', 'curl', 'apt-transport-https', software-properties-common
+      - software-properties-common
-        ]
+      - gnupg
-        state: present
+    state: present
 
 - name: Add Wazuh indexer repository
   block: