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

Merge 4.6.0 into 4.7.0
wazuh · Aug 24, 2023 · 882e9f4 · 882e9f4
2 parents 2fd1947 + 4992747
commit 882e9f4
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 7 deletions.
diff --git a/manifests/manager.pp b/manifests/manager.pp
@@ -191,9 +191,14 @@
 
       $vulnerability_detector_provider_alas                   = $wazuh::params_manager::vulnerability_detector_provider_alas,
       $vulnerability_detector_provider_alas_enabled           = $wazuh::params_manager::vulnerability_detector_provider_alas_enabled,
-      $vulnerability_detector_provider_alas_os              = $wazuh::params_manager::vulnerability_detector_provider_alas_os,
+      $vulnerability_detector_provider_alas_os                = $wazuh::params_manager::vulnerability_detector_provider_alas_os,
       $vulnerability_detector_provider_alas_update_interval   = $wazuh::params_manager::vulnerability_detector_provider_alas_update_interval,
 
+      $vulnerability_detector_provider_suse                   = $wazuh::params_manager::vulnerability_detector_provider_suse,
+      $vulnerability_detector_provider_suse_enabled           = $wazuh::params_manager::vulnerability_detector_provider_suse_enabled,
+      $vulnerability_detector_provider_suse_os                = $wazuh::params_manager::vulnerability_detector_provider_suse_os,
+      $vulnerability_detector_provider_suse_update_interval   = $wazuh::params_manager::vulnerability_detector_provider_suse_update_interval,
+
       $vulnerability_detector_provider_msu                   = $wazuh::params_manager::vulnerability_detector_provider_msu,
       $vulnerability_detector_provider_msu_enabled           = $wazuh::params_manager::vulnerability_detector_provider_msu_enabled,
       $vulnerability_detector_provider_msu_update_interval   = $wazuh::params_manager::vulnerability_detector_provider_msu_update_interval,

diff --git a/manifests/params_manager.pp b/manifests/params_manager.pp
@@ -170,22 +170,22 @@
       $vulnerability_detector_provider_canonical_enabled         = 'no'
       $vulnerability_detector_provider_canonical_os              = ['trusty',
         'xenial',
-        'bionic'
+        'bionic',
+        'focal',
+        'jammy'
       ]
       $vulnerability_detector_provider_canonical_update_interval = '1h'
 
 
       $vulnerability_detector_provider_debian                 = 'yes'
       $vulnerability_detector_provider_debian_enabled         = 'no'
-      $vulnerability_detector_provider_debian_os              = ['wheezy',
-        'stretch',
-        'jessie',
-        'buster'
+      $vulnerability_detector_provider_debian_os              = ['buster',
+        'bullseye'
       ]
       $vulnerability_detector_provider_debian_update_interval = '1h'
       $vulnerability_detector_provider_redhat                    = 'yes'
       $vulnerability_detector_provider_redhat_enabled            = 'no'
-      $vulnerability_detector_provider_redhat_os                 = ['5','6','7','8']
+      $vulnerability_detector_provider_redhat_os                 = ['5','6','7','8','9']
       $vulnerability_detector_provider_redhat_update_interval    = '1h'      # syslog
 
 
@@ -205,6 +205,17 @@
       ]
       $vulnerability_detector_provider_alas_update_interval   = '1h'
 
+      $vulnerability_detector_provider_suse                   = 'yes'
+      $vulnerability_detector_provider_suse_enabled           = 'no'
+      $vulnerability_detector_provider_suse_os              = ['11-server',
+        '11-desktop',
+        '12-server',
+        '12-desktop',
+        '15-server',
+        '15-desktop
+      ]
+      $vulnerability_detector_provider_suse_update_interval   = '1h'
+
       $vulnerability_detector_provider_msu                   = 'yes'
       $vulnerability_detector_provider_msu_enabled           = 'no'
       $vulnerability_detector_provider_msu_update_interval   = '1h'

diff --git a/templates/fragments/_vulnerability_detector.erb b/templates/fragments/_vulnerability_detector.erb
@@ -60,6 +60,17 @@
     <% end %>
     </provider>
 <% end %>
+<% if @vulnerability_detector_provider_suse %>
+  <provider name="suse">
+    <% if @vulnerability_detector_provider_suse_enabled %><enabled><%= @vulnerability_detector_provider_suse_enabled %></enabled><% end %>
+    <% if @vulnerability_detector_provider_suse_update_interval %><update_interval><%= @vulnerability_detector_provider_suse_update_interval %></update_interval><% end %>
+    <% if !@vulnerability_detector_provider_suse_os.empty? %>
+    <% @vulnerability_detector_provider_suse_os.each do |os| %>
+    <os><%= os %></os>
+    <% end %>
+    <% end %>
+    </provider>
+<% end %>
 <% if @vulnerability_detector_provider_msu %>
   <provider name="msu">
     <% if @vulnerability_detector_provider_msu_enabled %><enabled><%= @vulnerability_detector_provider_msu_enabled %></enabled><% end %>