From cfcfdc0e116e74f62264a62353ed1d5a27b26527 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Thu, 12 Oct 2023 10:50:47 -0300 Subject: [PATCH 1/6] add path parameter add remove paths for commands --- manifests/filebeat_oss.pp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/manifests/filebeat_oss.pp b/manifests/filebeat_oss.pp index 63b317eb..c9b24c25 100644 --- a/manifests/filebeat_oss.pp +++ b/manifests/filebeat_oss.pp @@ -46,10 +46,12 @@ # Needed since GitHub can only ETAG and result in changes of the mtime everytime. # TODO: Include file into the wazuh/wazuh-puppet project or use file { checksum => '..' } for this instead of the exec construct. exec { 'cleanup /etc/filebeat/wazuh-template.json': - command => '/bin/rm -f /etc/filebeat/wazuh-template.json', - onlyif => '/bin/test -f /etc/filebeat/wazuh-template.json', - unless => "/bin/curl -s 'https://raw.githubusercontent.com/wazuh/wazuh/${wazuh_extensions_version}/extensions/elasticsearch/7.x/wazuh-template.json' | /bin/cmp -s '/etc/filebeat/wazuh-template.json'", + path => ['/usr/bin', '/bin', '/usr/sbin', '/sbin'], + command => 'rm -f /etc/filebeat/wazuh-template.json', + onlyif => 'test -f /etc/filebeat/wazuh-template.json', + unless => "curl -s 'https://raw.githubusercontent.com/wazuh/wazuh/${wazuh_extensions_version}/extensions/elasticsearch/7.x/wazuh-template.json' | cmp -s '/etc/filebeat/wazuh-template.json'", } + -> file { '/etc/filebeat/wazuh-template.json': owner => 'root', group => 'root', From 80c106e88f65f945d952bf7ca9597107764b7368 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Thu, 12 Oct 2023 11:23:26 -0300 Subject: [PATCH 2/6] add path parameter add remove paths for commands --- manifests/agent.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manifests/agent.pp b/manifests/agent.pp index fb302de4..403c2712 100644 --- a/manifests/agent.pp +++ b/manifests/agent.pp @@ -575,8 +575,9 @@ ${agent_auth_option_manager} ${agent_auth_option_agent} ${agent_auth_option_password} ${agent_auth_option_address}" exec { 'agent-auth-linux': + path => ['/usr/bin', '/bin', '/usr/sbin', '/sbin'], command => $agent_auth_command, - unless => "/bin/egrep -q '.' ${::wazuh::params_agent::keys_file}", + unless => "egrep -q '.' ${::wazuh::params_agent::keys_file}", require => Concat['agent_ossec.conf'], before => Service[$agent_service_name], notify => Service[$agent_service_name], From 6e66917ffefa1d9ea4137e1bdf195057e225725c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Fri, 13 Oct 2023 10:25:38 +0200 Subject: [PATCH 3/6] Bump revision to 40701 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 5910e225..ad980b90 100644 --- a/VERSION +++ b/VERSION @@ -1,3 +1,3 @@ WAZUH-PUPPET_VERSION="v4.7.0" -REVISION="40700" +REVISION="40701" VERSION=4.7.0 From ad2a90886e1ea9ab72ec4e0221f3e6089400aa28 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 17 Oct 2023 06:50:32 -0300 Subject: [PATCH 4/6] bump 4.5.4 version --- CHANGELOG.md | 6 ++++++ VERSION | 6 +++--- kitchen/test/integration/agent/agent_spec.rb | 2 +- kitchen/test/integration/mngr/manager_spec.rb | 2 +- manifests/dashboard.pp | 2 +- manifests/filebeat_oss.pp | 2 +- manifests/indexer.pp | 2 +- manifests/params_agent.pp | 2 +- manifests/params_manager.pp | 4 ++-- metadata.json | 2 +- 10 files changed, 18 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1444fce..08fbc750 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.5.4 + +### Added + +- Support to 4.5.4 Wazuh release. + ## Wazuh Puppet v4.5.3 ### Added diff --git a/VERSION b/VERSION index b0fb98e2..9f63385b 100644 --- a/VERSION +++ b/VERSION @@ -1,3 +1,3 @@ -WAZUH-PUPPET_VERSION="v4.5.3" -REVISION="40508" -VERSION=4.5.3 +WAZUH-PUPPET_VERSION="v4.5.4" +REVISION="40509" +VERSION=4.5.4 diff --git a/kitchen/test/integration/agent/agent_spec.rb b/kitchen/test/integration/agent/agent_spec.rb index c6f765b9..988b385d 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.5.3-1' } + its('version') { is_expected.to eq '4.5.4-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 cfe0dfe5..bdb3cc6a 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.5.3-1' } + its('version') { is_expected.to eq '4.5.4-1' } end # Verifying service diff --git a/manifests/dashboard.pp b/manifests/dashboard.pp index 9f62e55c..8344e00e 100644 --- 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.3', + $dashboard_version = '4.5.4', $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 index cb0f409a..328b659e 100644 --- a/manifests/filebeat_oss.pp +++ b/manifests/filebeat_oss.pp @@ -11,7 +11,7 @@ $filebeat_oss_elastic_user = 'admin', $filebeat_oss_elastic_password = 'admin', $filebeat_oss_version = '7.10.2', - $wazuh_app_version = '4.5.3_7.10.2', + $wazuh_app_version = '4.5.4_7.10.2', $wazuh_extensions_version = '4.5', $wazuh_filebeat_module = 'wazuh-filebeat-0.2.tar.gz', diff --git a/manifests/indexer.pp b/manifests/indexer.pp index 27ec0f9b..7eaeebd9 100644 --- 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.3-1', + $indexer_version = '4.5.4-1', $indexer_fileuser = 'wazuh-indexer', $indexer_filegroup = 'wazuh-indexer', diff --git a/manifests/params_agent.pp b/manifests/params_agent.pp index 4be57938..0a3159e1 100644 --- 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.3' + $agent_package_version = '4.5.4' $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 index 50948347..47d7dfc2 100644 --- a/manifests/params_manager.pp +++ b/manifests/params_manager.pp @@ -5,7 +5,7 @@ 'Linux': { # Installation - $server_package_version = '4.5.3-1' + $server_package_version = '4.5.4-1' $manage_repos = true $manage_firewall = false @@ -577,7 +577,7 @@ $keys_group = 'Administrators' $agent_service = 'WazuhSvc' - $agent_package = 'Wazuh Agent 4.5.3' + $agent_package = 'Wazuh Agent 4.5.4' $server_service = '' $server_package = '' $api_service = '' diff --git a/metadata.json b/metadata.json index 651ceb7a..20d1165f 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "wazuh-wazuh", - "version": "4.5.3", + "version": "4.5.4", "author": "WAZUH", "summary": "Install and configure Wazuh-HIDS client and server", "license": "Apache-2.0", From bf6e75fc7172e36c4ec2ccd48e32b50692dc5a36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Thu, 19 Oct 2023 11:46:24 +0200 Subject: [PATCH 5/6] Bump revision to 40510 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 9f63385b..77b88038 100644 --- a/VERSION +++ b/VERSION @@ -1,3 +1,3 @@ WAZUH-PUPPET_VERSION="v4.5.4" -REVISION="40509" +REVISION="40510" VERSION=4.5.4 From 97db5755b3d5b2ef3e3ba6e869a07e0d74d11dc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Mon, 23 Oct 2023 09:52:46 +0200 Subject: [PATCH 6/6] Added v4.5.4 to CHANGELOG.md --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9ab11c4..6180c700 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ All notable changes to this project will be documented in this file. - Support to 4.6.0 Wazuh release. +## Wazuh Puppet v4.5.4 + +### Added + +- Support to 4.5.4 Wazuh release. + ## Wazuh Puppet v4.5.3 ### Added