Merge pull request #617 from wazuh/revert-609-merge-4.4

Revert `Merge 4.3 into 4.4`

Author: alberpilot

CHANGELOG.md

@@ -1,12 +1,6 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## Wazuh Puppet v4.4.0
-
-### Added
-
-- Support to 4.4.0 Wazuh release.
-
 ## Wazuh Puppet v4.3.10
 
 ### Added

VERSION

@@ -1,2 +1,2 @@
-WAZUH-PUPPET_VERSION="v4.4.0"
-REVISION="40400"
+WAZUH-PUPPET_VERSION="v4.3.10"
+REVISION="40323"

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.0-1' }
+    its('version') { is_expected.to eq '4.3.10-1' }
   end
 
   describe service('wazuh-agent') do

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.0-1' }
+    its('version') { is_expected.to eq '4.3.10-1' }
   end
 
   # Verifying service

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.3',
 ) {
   file { 'Configure Wazuh Certificates config.yml':
     owner   => 'root',

manifests/dashboard.pp

@@ -3,7 +3,7 @@
 class wazuh::dashboard (
   $dashboard_package = 'wazuh-dashboard',
   $dashboard_service = 'wazuh-dashboard',
-  $dashboard_version = '4.4.0',
+  $dashboard_version = '4.3.10',
   $indexer_server_ip = 'localhost',
   $indexer_server_port = '9200',
   $dashboard_path_certs = '/etc/wazuh-dashboard/certs',
@@ -32,7 +32,6 @@
 
   $manage_repos = false, # Change to true when manager is not present.
 ) {
-
   if $manage_repos {
     include wazuh::repo
 
@@ -127,23 +126,4 @@
     hasrestart => true,
     name       => $dashboard_service,
   }
-
-  file { ['/usr/share/wazuh-dashboard/data/wazuh/',
-  '/usr/share/wazuh-dashboard/data/wazuh/config/']:
-    ensure => 'directory',
-    owner   => 'wazuh-dashboard',
-    group   => 'wazuh-dashboard',
-    mode    => '0600',
-    require => Package['wazuh-dashboard'],
-    notify  => Service['wazuh-dashboard'],
-  }
-
-  file { '/usr/share/wazuh-dashboard/data/wazuh/config/wazuh.yml':
-    owner   => 'wazuh-dashboard',
-    group   => 'wazuh-dashboard',
-    mode    => '0600',
-    content => template('wazuh/wazuh_yml.erb'),
-    require => Package['wazuh-dashboard'],
-    notify  => Service['wazuh-dashboard'],
-  }
 }

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.0_7.10.0',
-  $wazuh_extensions_version = 'v4.4.0',
+  $wazuh_app_version = '4.3.10_7.10.2',
+  $wazuh_extensions_version = 'v4.3.10',
   $wazuh_filebeat_module = 'wazuh-filebeat-0.2.tar.gz',
 
   $filebeat_fileuser = 'root',
@@ -114,4 +114,4 @@
     name    => $filebeat_oss_service,
     require => Package['filebeat'],
   }
-}
+}

manifests/indexer.pp

@@ -2,13 +2,12 @@
 # Setup for Wazuh Indexer
 class wazuh::indexer (
   # opensearch.yml configuration
-  $indexer_network_host = '0.0.0.0',
   $indexer_cluster_name = 'wazuh-cluster',
   $indexer_node_name = 'node-1',
   $indexer_node_max_local_storage_nodes = '1',
   $indexer_service = 'wazuh-indexer',
   $indexer_package = 'wazuh-indexer',
-  $indexer_version = '4.4.0-1',
+  $indexer_version = '4.3.10-1',
   $indexer_fileuser = 'wazuh-indexer',
   $indexer_filegroup = 'wazuh-indexer',
 

manifests/manager.pp

@@ -300,7 +300,6 @@
       $wazuh_api_https_use_ca                   = $wazuh::params_manager::wazuh_api_https_use_ca,
       $wazuh_api_https_ca                       = $wazuh::params_manager::wazuh_api_https_ca,
       $wazuh_api_logs_level                     = $wazuh::params_manager::wazuh_api_logs_level,
-      $wazuh_api_logs_format                    = $wazuh::params_manager::wazuh_api_logs_format,
       $wazuh_api_ssl_ciphers                    = $wazuh::params_manager::wazuh_api_ssl_ciphers,
       $wazuh_api_ssl_protocol                   = $wazuh::params_manager::wazuh_api_ssl_protocol,
 
@@ -324,7 +323,6 @@
       $remote_commands_localfile_exceptions     = $::wazuh::params_manager::remote_commands_localfile_exceptions,
       $remote_commands_wodle                    = $::wazuh::params_manager::remote_commands_wodle,
       $remote_commands_wodle_exceptions         = $::wazuh::params_manager::remote_commands_wodle_exceptions,
-      $limits_eps                               = $::wazuh::params_manager::limits_eps,
 
       $wazuh_api_template                       = $::wazuh::params_manager::wazuh_api_template,
 

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.0'
+  $agent_package_version = '4.3.10'
   $agent_package_revision = '1'
   $agent_service_ensure = 'running'
   $agent_msi_download_location = 'https://packages.wazuh.com/4.x/windows'