resolving merge conflicts

wazuh · Jul 21, 2023 · 93f631a · 93f631a
2 parents afd0796 + b307f60
commit 93f631a
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## Wazuh Puppet v4.6.0
+
+### Added
+
+- Support to 4.6.0 Wazuh release.
+
 ## Wazuh Puppet v4.5.2
 
 ### Added

diff --git a/VERSION b/VERSION
@@ -1,3 +1,3 @@
-WAZUH-PUPPET_VERSION="v4.5.2"
-REVISION="40502"
-VERSION=4.5.2
+WAZUH-PUPPET_VERSION="v4.6.0"
+REVISION="40600"
+VERSION=4.6.0
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.5.2-1' }
+    its('version') { is_expected.to eq '4.6.0-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.5.2-1' }
+    its('version') { is_expected.to eq '4.6.0-1' }
   end
 
   # Verifying service

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.5.2',
+  $dashboard_version = '4.6.0',
   $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.5.2_7.10.2',
-  $wazuh_extensions_version = '4.5',
+  $wazuh_app_version = '4.6.0_7.10.2',
+  $wazuh_extensions_version = '4.6',
   $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.5.2-1',
+  $indexer_version = '4.6.0-1',
   $indexer_fileuser = 'wazuh-indexer',
   $indexer_filegroup = 'wazuh-indexer',
 

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.5.2'
+  $agent_package_version = '4.6.0'
   $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.5.2-1'
+      $server_package_version                          = '4.6.0-1'
 
       $manage_repos                                    = true
       $manage_firewall                                 = false
@@ -566,7 +566,7 @@
       $keys_group = 'Administrators'
 
       $agent_service  = 'WazuhSvc'
-      $agent_package  = 'Wazuh Agent 4.5.2'
+      $agent_package  = 'Wazuh Agent 4.6.0'
       $server_service = ''
       $server_package = ''
       $api_service = ''

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "wazuh-wazuh",
-  "version": "4.5.2",
+  "version": "4.6.0",
   "author": "WAZUH",
   "summary": "Install and configure Wazuh-HIDS client and server",
   "license": "Apache-2.0",