From 2e83afa1a8e0f91eb43e6006062e6df0d409f648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fern=C3=A1ndez?= Date: Fri, 7 May 2021 15:55:36 +0200 Subject: [PATCH] Bump to v4.1.5 version --- CHANGELOG.md | 6 ++++++ VERSION | 4 ++-- kitchen/test/integration/agent/agent_spec.rb | 2 +- kitchen/test/integration/mngr/manager_spec.rb | 2 +- manifests/filebeat.pp | 6 +++--- manifests/filebeat_oss.pp | 6 +++--- manifests/kibana.pp | 2 +- manifests/kibana_od.pp | 4 ++-- manifests/params_agent.pp | 2 +- manifests/params_manager.pp | 4 ++-- metadata.json | 2 +- 11 files changed, 23 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 256cfe38..07290c17 100644 --- 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.1.5 + +### Added + +- Support to 4.1.5 Wazuh release. + ## Wazuh Puppet v4.0.4 ### Added diff --git a/VERSION b/VERSION index 937735d0..9fda7029 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-PUPPET_VERSION="v4.0.4" -REVISION="40004" +WAZUH-PUPPET_VERSION="v4.1.5" +REVISION="40105" diff --git a/kitchen/test/integration/agent/agent_spec.rb b/kitchen/test/integration/agent/agent_spec.rb index 0071b397..b477309b 100644 --- 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.0.4-1' } + its('version') { is_expected.to eq '4.1.5-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 index a4a66f6f..e12d13dd 100644 --- 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.0.4-1' } + its('version') { is_expected.to eq '4.1.5-1' } end # Verifying service diff --git a/manifests/filebeat.pp b/manifests/filebeat.pp index 6100c882..276368f8 100644 --- a/manifests/filebeat.pp +++ b/manifests/filebeat.pp @@ -7,9 +7,9 @@ $filebeat_package = 'filebeat', $filebeat_service = 'filebeat', - $filebeat_version = '7.9.3', - $wazuh_app_version = '4.0.4_7.9.3', - $wazuh_extensions_version = 'v4.0.4', + $filebeat_version = '7.10.0', + $wazuh_app_version = '4.1.5_7.10.0', + $wazuh_extensions_version = 'v4.1.5', $wazuh_filebeat_module = 'wazuh-filebeat-0.1.tar.gz', ){ diff --git a/manifests/filebeat_oss.pp b/manifests/filebeat_oss.pp index b8129ac0..818dc50d 100644 --- a/manifests/filebeat_oss.pp +++ b/manifests/filebeat_oss.pp @@ -9,9 +9,9 @@ $filebeat_oss_service = 'filebeat', $filebeat_oss_elastic_user = 'admin', $filebeat_oss_elastic_password = 'admin', - $filebeat_oss_version = '7.9.1', - $wazuh_app_version = '4.0.4_7.9.1', - $wazuh_extensions_version = 'v4.0.4', + $filebeat_oss_version = '7.10.0', + $wazuh_app_version = '4.1.5_7.10.0', + $wazuh_extensions_version = 'v4.1.5', $wazuh_filebeat_module = 'wazuh-filebeat-0.1.tar.gz', ){ diff --git a/manifests/kibana.pp b/manifests/kibana.pp index 84802f2e..bb5d3daf 100644 --- 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.0.4', + $kibana_wazuh_version = '4.1.5', # app variables $kibana_app_version = "${kibana_wazuh_version}_${$kibana_version}", diff --git a/manifests/kibana_od.pp b/manifests/kibana_od.pp index bcdf6170..dfc51491 100644 --- a/manifests/kibana_od.pp +++ b/manifests/kibana_od.pp @@ -3,10 +3,10 @@ class wazuh::kibana_od ( $kibana_od_package = 'opendistroforelasticsearch-kibana', $kibana_od_service = 'kibana', - $kibana_od_version = '1.11.0', + $kibana_od_version = '1.12.0', $kibana_od_elastic_user = 'admin', $kibana_od_elastic_password = 'admin', - $kibana_od_app_version = '4.0.4_7.9.1', + $kibana_od_app_version = '4.1.5_7.10.0', $kibana_od_elasticsearch_ip = 'localhost', $kibana_od_elasticsearch_port = '9200', diff --git a/manifests/params_agent.pp b/manifests/params_agent.pp index 4be151a2..5d43665b 100644 --- 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.0.4-1' + $agent_package_version = '4.1.5-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 index 0605eaf0..af2165e5 100644 --- a/manifests/params_manager.pp +++ b/manifests/params_manager.pp @@ -5,7 +5,7 @@ 'Linux': { # Installation - $server_package_version = '4.0.4-1' + $server_package_version = '4.1.5-1' $manage_repos = true $manage_firewall = false @@ -540,7 +540,7 @@ $keys_group = 'Administrators' $agent_service = 'OssecSvc' - $agent_package = 'Wazuh Agent 4.0.4' + $agent_package = 'Wazuh Agent 4.1.5' $server_service = '' $server_package = '' $api_service = '' diff --git a/metadata.json b/metadata.json index 163f4b04..80550269 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "wazuh-wazuh", - "version": "4.0.4", + "version": "4.1.5", "author": "WAZUH", "summary": "Install and configure Wazuh-HIDS client and server", "license": "Apache-2.0",