Merge pull request #390 from wazuh/388-update-4.2.1

Update 4.2 branch to 4.2.1
wazuh · Sep 9, 2021 · 595d078 · 595d078
2 parents 3091ed5 + 2e08efa
commit 595d078
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,11 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## Wazuh Puppet v4.2.1
 
+### Added
+
+- Support to 4.2.1 Wazuh release.
 
 ## Wazuh Puppet v4.2.0
 

diff --git a/VERSION b/VERSION
@@ -1,2 +1,2 @@
-WAZUH-PUPPET_VERSION="v4.2.0"
-REVISION="40200"
+WAZUH-PUPPET_VERSION="v4.2.1"
+REVISION="40201"
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.2.0-1' }
+    its('version') { is_expected.to eq '4.2.1-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.2.0-1' }
+    its('version') { is_expected.to eq '4.2.1-1' }
   end
 
   # Verifying service

diff --git a/manifests/filebeat.pp b/manifests/filebeat.pp
@@ -8,8 +8,8 @@
   $filebeat_package = 'filebeat',
   $filebeat_service = 'filebeat',
   $filebeat_version = '7.10.2',
-  $wazuh_app_version = '4.2.0_7.10.2',
-  $wazuh_extensions_version = 'v4.2.0',
+  $wazuh_app_version = '4.2.1_7.10.2',
+  $wazuh_extensions_version = 'v4.2.1',
   $wazuh_filebeat_module = 'wazuh-filebeat-0.1.tar.gz',
 ){
 

diff --git a/manifests/filebeat_oss.pp b/manifests/filebeat_oss.pp
@@ -10,8 +10,8 @@
   $filebeat_oss_elastic_user = 'admin',
   $filebeat_oss_elastic_password = 'admin',
   $filebeat_oss_version = '7.10.2',
-  $wazuh_app_version = '4.2.0_7.10.2',
-  $wazuh_extensions_version = 'v4.2.0',
+  $wazuh_app_version = '4.2.1_7.10.2',
+  $wazuh_extensions_version = 'v4.2.1',
   $wazuh_filebeat_module = 'wazuh-filebeat-0.1.tar.gz',
 ){
 

diff --git a/manifests/kibana.pp b/manifests/kibana.pp
@@ -20,7 +20,7 @@
 
   $kibana_server_port = '5601',
   $kibana_server_host = '0.0.0.0',
-  $kibana_wazuh_version = '4.2.0',
+  $kibana_wazuh_version = '4.2.1',
 
   # app variables
   $kibana_app_version = "${kibana_wazuh_version}_${$kibana_version}",

diff --git a/manifests/kibana_od.pp b/manifests/kibana_od.pp
@@ -6,7 +6,7 @@
   $kibana_od_version = '1.13.2',
   $kibana_od_elastic_user = 'admin',
   $kibana_od_elastic_password = 'admin',
-  $kibana_od_app_version = '4.2.0_7.10.2',
+  $kibana_od_app_version = '4.2.1_7.10.2',
   $kibana_od_elasticsearch_ip = 'localhost',
   $kibana_od_elasticsearch_port = '9200',
 

diff --git a/manifests/params_agent.pp b/manifests/params_agent.pp
@@ -1,7 +1,7 @@
 # Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2)
 # Wazuh-Agent configuration parameters
 class wazuh::params_agent {
-  $agent_package_version = '4.2.0-1'
+  $agent_package_version = '4.2.1-1'
   $agent_service_ensure = 'running'
   $agent_msi_download_location = 'http://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.2.0-1'
+      $server_package_version                          = '4.2.1-1'
 
       $manage_repos                                    = true
       $manage_firewall                                 = false
@@ -537,7 +537,7 @@
       $keys_group = 'Administrators'
 
       $agent_service  = 'OssecSvc'
-      $agent_package  = 'Wazuh Agent 4.2.0'
+      $agent_package  = 'Wazuh Agent 4.2.1'
       $server_service = ''
       $server_package = ''
       $api_service = ''

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