Merge branch '4.5.2' into rocky44

wazuh · Jul 31, 2023 · dd45ea4 · dd45ea4
2 parents f490163 + afd0796
commit dd45ea4
Show file tree

Hide file tree

Showing 14 changed files with 35 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,24 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## Wazuh Puppet v4.5.2
+
+### Added
+
+- Support to 4.5.2 Wazuh release.
+
+## Wazuh Puppet v4.5.1
+
+### Added
+
+- Support to 4.5.1 Wazuh release.
+
+## Wazuh Puppet v4.5.0
+
+### Added
+
+- Support to 4.5.0 Wazuh release.
+
 ## Wazuh Puppet v4.4.5
 
 ### Added

diff --git a/VERSION b/VERSION
@@ -1,3 +1,3 @@
-WAZUH-PUPPET_VERSION="v4.4.5"
-REVISION="40413"
-VERSION=4.4.5
+WAZUH-PUPPET_VERSION="v4.5.2"
+REVISION="40502"
+VERSION=4.5.2
diff --git a/kitchen/test/integration/agent/agent_spec.rb b/kitchen/test/integration/agent/agent_spec.rb
@@ -4,7 +4,7 @@
 
   describe package('wazuh-agent') do
     it { is_expected.to be_installed }
-    its('version') { is_expected.to eq '4.4.5-1' }
+    its('version') { is_expected.to eq '4.5.2-1' }
   end
 
   describe service('wazuh-agent') do

diff --git a/kitchen/test/integration/mngr/manager_spec.rb b/kitchen/test/integration/mngr/manager_spec.rb
@@ -4,7 +4,7 @@
 
   describe package('wazuh-manager') do
     it { is_expected.to be_installed }
-    its('version') { is_expected.to eq '4.4.5-1' }
+    its('version') { is_expected.to eq '4.5.2-1' }
   end
 
   # Verifying service

diff --git a/manifests/certificates.pp b/manifests/certificates.pp
@@ -2,7 +2,7 @@
 # Wazuh repository installation
 class wazuh::certificates (
   $wazuh_repository = 'packages.wazuh.com',
-  $wazuh_version = '4.4',
+  $wazuh_version = '4.5',
 ) {
   file { 'Configure Wazuh Certificates config.yml':
     owner   => 'root',

diff --git a/manifests/dashboard.pp b/manifests/dashboard.pp
@@ -3,7 +3,7 @@
 class wazuh::dashboard (
   $dashboard_package = 'wazuh-dashboard',
   $dashboard_service = 'wazuh-dashboard',
-  $dashboard_version = '4.4.5',
+  $dashboard_version = '4.5.2',
   $indexer_server_ip = 'localhost',
   $indexer_server_port = '9200',
   $dashboard_path_certs = '/etc/wazuh-dashboard/certs',

diff --git a/manifests/filebeat_oss.pp b/manifests/filebeat_oss.pp
@@ -11,8 +11,8 @@
   $filebeat_oss_elastic_user = 'admin',
   $filebeat_oss_elastic_password = 'admin',
   $filebeat_oss_version = '7.10.2',
-  $wazuh_app_version = '4.4.5_7.10.2',
-  $wazuh_extensions_version = '4.4',
+  $wazuh_app_version = '4.5.2_7.10.2',
+  $wazuh_extensions_version = '4.5',
   $wazuh_filebeat_module = 'wazuh-filebeat-0.2.tar.gz',
 
   $filebeat_fileuser = 'root',

diff --git a/manifests/indexer.pp b/manifests/indexer.pp
@@ -8,7 +8,7 @@
   $indexer_node_max_local_storage_nodes = '1',
   $indexer_service = 'wazuh-indexer',
   $indexer_package = 'wazuh-indexer',
-  $indexer_version = '4.4.5-1',
+  $indexer_version = '4.5.2-1',
   $indexer_fileuser = 'wazuh-indexer',
   $indexer_filegroup = 'wazuh-indexer',
 

diff --git a/manifests/manager.pp b/manifests/manager.pp
@@ -177,13 +177,11 @@
       $vulnerability_detector_provider_redhat                    = $wazuh::params_manager::vulnerability_detector_provider_redhat,
       $vulnerability_detector_provider_redhat_enabled            = $wazuh::params_manager::vulnerability_detector_provider_redhat_enabled,
       $vulnerability_detector_provider_redhat_os                 = $wazuh::params_manager::vulnerability_detector_provider_redhat_os,
-      $vulnerability_detector_provider_redhat_update_from_year   = $wazuh::params_manager::vulnerability_detector_provider_redhat_update_from_year,
       $vulnerability_detector_provider_redhat_update_interval    = $wazuh::params_manager::vulnerability_detector_provider_redhat_update_interval,
 
       $vulnerability_detector_provider_nvd                       = $wazuh::params_manager::vulnerability_detector_provider_nvd,
       $vulnerability_detector_provider_nvd_enabled               = $wazuh::params_manager::vulnerability_detector_provider_nvd_enabled,
       $vulnerability_detector_provider_nvd_os                    = $wazuh::params_manager::vulnerability_detector_provider_nvd_os,
-      $vulnerability_detector_provider_nvd_update_from_year      = $wazuh::params_manager::vulnerability_detector_provider_nvd_update_from_year,
       $vulnerability_detector_provider_nvd_update_interval       = $wazuh::params_manager::vulnerability_detector_provider_nvd_update_interval,
       #lint:endignore
 

diff --git a/manifests/params_agent.pp b/manifests/params_agent.pp
@@ -1,7 +1,7 @@
 # Copyright (C) 2015, Wazuh Inc.
 # Wazuh-Agent configuration parameters
 class wazuh::params_agent {
-  $agent_package_version = '4.4.5'
+  $agent_package_version = '4.5.2'
   $agent_package_revision = '1'
   $agent_service_ensure = 'running'
   $agent_msi_download_location = 'https://packages.wazuh.com/4.x/windows'

diff --git a/manifests/params_manager.pp b/manifests/params_manager.pp
@@ -5,7 +5,7 @@
     'Linux': {
 
     # Installation
-      $server_package_version                          = '4.4.5-1'
+      $server_package_version                          = '4.5.2-1'
 
       $manage_repos                                    = true
       $manage_firewall                                 = false
@@ -186,14 +186,12 @@
       $vulnerability_detector_provider_redhat                    = 'yes'
       $vulnerability_detector_provider_redhat_enabled            = 'no'
       $vulnerability_detector_provider_redhat_os                 = ['5','6','7','8']
-      $vulnerability_detector_provider_redhat_update_from_year   = '2010'
       $vulnerability_detector_provider_redhat_update_interval    = '1h'      # syslog
 
 
       $vulnerability_detector_provider_nvd                    = 'yes'
       $vulnerability_detector_provider_nvd_enabled            = 'no'
       $vulnerability_detector_provider_nvd_os                 = []
-      $vulnerability_detector_provider_nvd_update_from_year   = '2010'
       $vulnerability_detector_provider_nvd_update_interval    = '1h'
 
       $vulnerability_detector_provider_arch                   = 'yes'
@@ -568,7 +566,7 @@
       $keys_group = 'Administrators'
 
       $agent_service  = 'WazuhSvc'
-      $agent_package  = 'Wazuh Agent 4.4.5'
+      $agent_package  = 'Wazuh Agent 4.5.2'
       $server_service = ''
       $server_package = ''
       $api_service = ''

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "wazuh-wazuh",
-  "version": "4.4.5",
+  "version": "4.5.2",
   "author": "WAZUH",
   "summary": "Install and configure Wazuh-HIDS client and server",
   "license": "Apache-2.0",
@@ -111,7 +111,7 @@
   "tags": [
     "ossec",
     "hids",
-    "4.4",
+    "4.5",
     "wazuh"
   ],
   "pdk-version": "1.14.1",

diff --git a/templates/fragments/_vulnerability_detector.erb b/templates/fragments/_vulnerability_detector.erb
@@ -29,7 +29,6 @@
 <% if @vulnerability_detector_provider_redhat %>
   <provider name="redhat">
     <% if @vulnerability_detector_provider_redhat_enabled %><enabled><%= @vulnerability_detector_provider_redhat_enabled %></enabled><% end %>
-    <% if @vulnerability_detector_provider_redhat_update_from_year %><update_from_year><%= @vulnerability_detector_provider_redhat_update_from_year %></update_from_year><% end %>
     <% if @vulnerability_detector_provider_redhat_update_interval %><update_interval><%= @vulnerability_detector_provider_redhat_update_interval %></update_interval><% end %>
     <% if !@vulnerability_detector_provider_redhat_os.empty? %>
     <% @vulnerability_detector_provider_redhat_os.each do |os| %>
@@ -41,9 +40,8 @@
 <% if @vulnerability_detector_provider_nvd %>
   <provider name="nvd">
     <% if @vulnerability_detector_provider_nvd_enabled %><enabled><%= @vulnerability_detector_provider_nvd_enabled %></enabled><% end %>
-    <% if @vulnerability_detector_provider_nvd_update_from_year %><update_from_year><%= @vulnerability_detector_provider_nvd_update_from_year %></update_from_year><% end %>
     <% if @vulnerability_detector_provider_nvd_update_interval %><update_interval><%= @vulnerability_detector_provider_nvd_update_interval %></update_interval><% end %>
-  </provider>   
+  </provider>
 <% end %>
 <% if @vulnerability_detector_provider_arch %>
   <provider name="arch">
@@ -69,4 +67,3 @@
   </provider>
 <% end %>
 </vulnerability-detector>
-
diff --git a/templates/wazuh_yml.erb b/templates/wazuh_yml.erb
@@ -12,7 +12,7 @@
 # ======================== Wazuh dashboard configuration file ========================
 #
 # Please check the documentation for more information about configuration options:
-# https://documentation.wazuh.com/4.4/user-manual/wazuh-dashboard/config-file.html
+# https://documentation.wazuh.com/4.5/user-manual/wazuh-dashboard/config-file.html
 #
 # Also, you can check our repository:
 # https://github.com/wazuh/wazuh-kibana-app