Merge pull request #986 from wazuh/merge-4.6.0-into-4.7.0

Merge `4.6.0` into `4.7.0`

.github/playbooks/aio-wazuh.yml

@@ -3,6 +3,12 @@
   become: true
   become_user: root
   roles:
+    # 1. Check packages
+    - role: ../../roles/wazuh/check-packages
+      become: no
+      delegate_to: localhost
+      run_once: true
+    # 2. Generate certificates
     - role: ../../roles/wazuh/wazuh-indexer
       vars:
         generate_certs: true
@@ -30,24 +36,19 @@
   become: true
   become_user: root
   roles:
-    # 1. Check packages
+    # 1. Wazuh indexer
-    - role: ../../roles/wazuh/check-packages
-      become: no
-      delegate_to: localhost
-      run_once: true
-    # 2. Wazuh indexer
     - role: ../../roles/wazuh/wazuh-indexer
       vars:
         indexer_node_name: "wazuh-es01"
         single_node: true
-    # 3. Managers
+    # 2. Managers
     - role: ../../roles/wazuh/ansible-wazuh-manager
     - role: ../../roles/wazuh/ansible-filebeat-oss
       vars:
         filebeat_node_name: "wazuh-mgr01"
         filebeat_output_indexer_hosts:
         - "localhost:9200"
-    # 4. Wazuh dashboard
+    # 3. Wazuh dashboard
     - role: ../../roles/wazuh/wazuh-dashboard
       vars:
         dashboard_node_name: "wazuh-dash01"

.github/playbooks/single-wazuh.yml

@@ -2,6 +2,10 @@
 - name: ConvergeCerts
   hosts: localhost
   roles:
+    - role: ../../roles/wazuh/check-packages
+      become: no
+      delegate_to: localhost
+      run_once: true
     - role: ../../roles/wazuh/wazuh-indexer
       perform_installation: false
   vars:
@@ -15,12 +19,7 @@
 - name: ConvergeInstall
   hosts: localhost
   roles:
-    # 1. Check packages
+    # Managers
-    - role: ../../roles/wazuh/check-packages
-      become: no
-      delegate_to: localhost
-      run_once: true
-    # 2. Managers
     - role: ../../roles/wazuh/ansible-wazuh-manager
       vars:
     - role: ../../roles/wazuh/ansible-filebeat-oss

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

@@ -23,6 +23,9 @@
   tags:
   - install
   - init
+  until: "install is not failed"  
+  retries: 10
+  delay: 10
   when: ansible_os_family == 'Debian'
 
 - name: Checking if Filebeat Module folder file exists

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

@@ -173,6 +173,7 @@ wazuh_manager_sca:
 wazuh_manager_vulnerability_detector:
   enabled: 'no'
   interval: '5m'
+  min_full_scan_interval: '6h'
   run_on_start: 'yes'
   providers:
     - enabled: 'no'
@@ -180,22 +181,54 @@ wazuh_manager_vulnerability_detector:
         - 'trusty'
         - 'xenial'
         - 'bionic'
+        - 'focal'
+        - 'jammy'
       update_interval: '1h'
       name: '"canonical"'
     - enabled: 'no'
       os:
-        - 'wheezy'
-        - 'stretch'
-        - 'jessie'
         - 'buster'
+        - 'bullseye'
       update_interval: '1h'
       name: '"debian"'
     - enabled: 'no'
-      update_from_year: '2010'
+      os:
+        - '5'
+        - '6'
+        - '7'
+        - '8'
+        - '9'
       update_interval: '1h'
       name: '"redhat"'
     - enabled: 'no'
-      update_from_year: '2010'
+      os:
+        - '8'
+        - '9'
+      update_interval: '1h'
+      name: '"almalinux"'
+    - enabled: 'no'
+      os:
+        - 'amazon-linux'
+        - 'amazon-linux-2'
+      update_interval: '1h'
+      name: '"alas"'
+    - enabled: 'no'
+      os:
+        - '11-server'
+        - '11-desktop'
+        - '12-server'
+        - '12-desktop'
+        - '15-server'
+        - '15-desktop'
+      update_interval: '1h'
+      name: '"suse"'
+    - enabled: 'no'
+      update_interval: '1h'
+      name: '"arch"'
+    - enabled: 'no'
+      update_interval: '1h'
+      name: '"msu"'
+    - enabled: 'no'
       update_interval: '1h'
       name: '"nvd"'
 

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

@@ -8,6 +8,10 @@
       - tar
       - curl
     state: present
+  register: package_status
+  until: "package_status is not failed"  
+  retries: 10
+  delay: 10
 
 - include_vars: ../../vars/repo_vars.yml
 

roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-ossec-server.conf.j2

@@ -265,6 +265,9 @@
   {% if wazuh_manager_config.vulnerability_detector.interval is defined %}
     <interval>{{ wazuh_manager_config.vulnerability_detector.interval }}</interval>
   {% endif %}
+  {% if wazuh_manager_config.vulnerability_detector.min_full_scan_interval is defined %}
+    <min_full_scan_interval>{{ wazuh_manager_config.vulnerability_detector.min_full_scan_interval }}</min_full_scan_interval>
+  {% endif %}
   {% if wazuh_manager_config.vulnerability_detector.run_on_start is defined %}
     <run_on_start>{{ wazuh_manager_config.vulnerability_detector.run_on_start }}</run_on_start>
   {% endif %}
@@ -279,9 +282,6 @@
       <os>{{ os_ }}</os>
       {% endfor %}
       {% endif %}
-      {% if provider_.update_from_year is defined %}
-      <update_from_year>{{ provider_.update_from_year }}</update_from_year>
-      {% endif %}
       {% if provider_.update_interval is defined %}
       <update_interval>{{ provider_.update_interval }}</update_interval>
       {% endif %}