From 65a815beac2e3cba25c49ae3ecb5869fd51fe9fd Mon Sep 17 00:00:00 2001 From: oletos7j Date: Mon, 23 Nov 2020 16:59:33 +0300 Subject: [PATCH 1/5] Update _syscheck.erb Missing extra blank line before 'report_changes' causes a critical 'error reading XML' file. --- templates/fragments/_syscheck.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/fragments/_syscheck.erb b/templates/fragments/_syscheck.erb index a4e0006a..b6ed4348 100644 --- a/templates/fragments/_syscheck.erb +++ b/templates/fragments/_syscheck.erb @@ -119,10 +119,10 @@ <%- else -%> <%- if @ossec_syscheck_directories_1 -%> - whodata="<%=@ossec_syscheck_whodata_directories_1%>"<%- end -%> <%- if @ossec_syscheck_realtime_directories_1 == 'yes' -%> realtime="<%=@ossec_syscheck_realtime_directories_1%>"<%- end -%> <%- if @ossec_syscheck_report_changes_directories_1 == 'yes' -%>report_changes="<%=@ossec_syscheck_report_changes_directories_1%>"<%- end -%>><%=@ossec_syscheck_directories_1%> + whodata="<%=@ossec_syscheck_whodata_directories_1%>"<%- end -%> <%- if @ossec_syscheck_realtime_directories_1 == 'yes' -%> realtime="<%=@ossec_syscheck_realtime_directories_1%>"<%- end -%> <%- if @ossec_syscheck_report_changes_directories_1 == 'yes' -%> report_changes="<%=@ossec_syscheck_report_changes_directories_1%>"<%- end -%>><%=@ossec_syscheck_directories_1%> <%- end -%> <%- if @ossec_syscheck_directories_2 -%> - whodata="<%=@ossec_syscheck_whodata_directories_2%>"<%- end -%> <%- if @ossec_syscheck_realtime_directories_2 == 'yes' -%> realtime="<%=@ossec_syscheck_realtime_directories_2%>"<%- end -%> <%- if @ossec_syscheck_report_changes_directories_2 == 'yes' -%>report_changes="<%=@ossec_syscheck_report_changes_directories_2%>"<%- end -%>><%=@ossec_syscheck_directories_2%> + whodata="<%=@ossec_syscheck_whodata_directories_2%>"<%- end -%> <%- if @ossec_syscheck_realtime_directories_2 == 'yes' -%> realtime="<%=@ossec_syscheck_realtime_directories_2%>"<%- end -%> <%- if @ossec_syscheck_report_changes_directories_2 == 'yes' -%> report_changes="<%=@ossec_syscheck_report_changes_directories_2%>"<%- end -%>><%=@ossec_syscheck_directories_2%> <%- end -%> <%- if @ossec_syscheck_ignore_list -%> <%- @ossec_syscheck_ignore_list.each do |ignore_element| -%> From 7c8234f8c01f05b8ee0224bcfc198b3fd8f4af92 Mon Sep 17 00:00:00 2001 From: oletos7j Date: Mon, 23 Nov 2020 17:00:57 +0300 Subject: [PATCH 2/5] Update _syscheck.erb Missing extra blank line before 'report_changes' causes a critical 'error reading XML' file. --- templates/fragments/_syscheck.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/fragments/_syscheck.erb b/templates/fragments/_syscheck.erb index a4e0006a..b6ed4348 100644 --- a/templates/fragments/_syscheck.erb +++ b/templates/fragments/_syscheck.erb @@ -119,10 +119,10 @@ <%- else -%> <%- if @ossec_syscheck_directories_1 -%> - whodata="<%=@ossec_syscheck_whodata_directories_1%>"<%- end -%> <%- if @ossec_syscheck_realtime_directories_1 == 'yes' -%> realtime="<%=@ossec_syscheck_realtime_directories_1%>"<%- end -%> <%- if @ossec_syscheck_report_changes_directories_1 == 'yes' -%>report_changes="<%=@ossec_syscheck_report_changes_directories_1%>"<%- end -%>><%=@ossec_syscheck_directories_1%> + whodata="<%=@ossec_syscheck_whodata_directories_1%>"<%- end -%> <%- if @ossec_syscheck_realtime_directories_1 == 'yes' -%> realtime="<%=@ossec_syscheck_realtime_directories_1%>"<%- end -%> <%- if @ossec_syscheck_report_changes_directories_1 == 'yes' -%> report_changes="<%=@ossec_syscheck_report_changes_directories_1%>"<%- end -%>><%=@ossec_syscheck_directories_1%> <%- end -%> <%- if @ossec_syscheck_directories_2 -%> - whodata="<%=@ossec_syscheck_whodata_directories_2%>"<%- end -%> <%- if @ossec_syscheck_realtime_directories_2 == 'yes' -%> realtime="<%=@ossec_syscheck_realtime_directories_2%>"<%- end -%> <%- if @ossec_syscheck_report_changes_directories_2 == 'yes' -%>report_changes="<%=@ossec_syscheck_report_changes_directories_2%>"<%- end -%>><%=@ossec_syscheck_directories_2%> + whodata="<%=@ossec_syscheck_whodata_directories_2%>"<%- end -%> <%- if @ossec_syscheck_realtime_directories_2 == 'yes' -%> realtime="<%=@ossec_syscheck_realtime_directories_2%>"<%- end -%> <%- if @ossec_syscheck_report_changes_directories_2 == 'yes' -%> report_changes="<%=@ossec_syscheck_report_changes_directories_2%>"<%- end -%>><%=@ossec_syscheck_directories_2%> <%- end -%> <%- if @ossec_syscheck_ignore_list -%> <%- @ossec_syscheck_ignore_list.each do |ignore_element| -%> From 34ee4614e2b837ddcf42c1fb4af95c215eee7ed0 Mon Sep 17 00:00:00 2001 From: zenidd Date: Fri, 20 Nov 2020 17:00:58 +0100 Subject: [PATCH 3/5] wazuh-puppet: bump versions to 4.0.2 --- CHANGELOG.md | 7 +++++++ VERSION | 4 ++-- kitchen/test/integration/agent/agent_spec.rb | 2 +- kitchen/test/integration/mngr/manager_spec.rb | 2 +- manifests/filebeat.pp | 4 ++-- manifests/filebeat_oss.pp | 4 ++-- manifests/kibana.pp | 2 +- manifests/kibana_od.pp | 2 +- manifests/params_agent.pp | 2 +- manifests/params_manager.pp | 4 ++-- metadata.json | 2 +- 11 files changed, 21 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03938306..0837de65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ # Change Log All notable changes to this project will be documented in this file. +## Wazuh Puppet v4.0.2 + +### Added + +- Update to Wazuh version 4.0.2 + + ## Wazuh Puppet v4.0.1 ### Added diff --git a/VERSION b/VERSION index 98659845..c81b4471 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-PUPPET_VERSION="v4.0.1" -REVISION="40001" +WAZUH-PUPPET_VERSION="v4.0.2" +REVISION="40002" diff --git a/kitchen/test/integration/agent/agent_spec.rb b/kitchen/test/integration/agent/agent_spec.rb index 0f044313..9b04a0a5 100644 --- a/kitchen/test/integration/agent/agent_spec.rb +++ b/kitchen/test/integration/agent/agent_spec.rb @@ -1,6 +1,6 @@ describe package('wazuh-agent') do it { is_expected.to be_installed } - its('version') { is_expected.to eq '4.0.1-1' } + its('version') { is_expected.to eq '4.0.2-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 29692c0b..92504863 100644 --- a/kitchen/test/integration/mngr/manager_spec.rb +++ b/kitchen/test/integration/mngr/manager_spec.rb @@ -1,6 +1,6 @@ describe package('wazuh-manager') do it { is_expected.to be_installed } - its('version') { is_expected.to eq '4.0.1-1' } + its('version') { is_expected.to eq '4.0.2-1' } end describe service('wazuh-manager') do diff --git a/manifests/filebeat.pp b/manifests/filebeat.pp index 206e225f..51779ed3 100644 --- a/manifests/filebeat.pp +++ b/manifests/filebeat.pp @@ -8,8 +8,8 @@ $filebeat_package = 'filebeat', $filebeat_service = 'filebeat', $filebeat_version = '7.9.3', - $wazuh_app_version = '4.0.1_7.9.3', - $wazuh_extensions_version = 'v4.0.1', + $wazuh_app_version = '4.0.2_7.9.3', + $wazuh_extensions_version = 'v4.0.2', $wazuh_filebeat_module = 'wazuh-filebeat-0.1.tar.gz', ){ diff --git a/manifests/filebeat_oss.pp b/manifests/filebeat_oss.pp index 2c382ed2..6536d122 100644 --- 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.9.1', - $wazuh_app_version = '4.0.1_7.9.1', - $wazuh_extensions_version = 'v4.0.1', + $wazuh_app_version = '4.0.2_7.9.1', + $wazuh_extensions_version = 'v4.0.2', $wazuh_filebeat_module = 'wazuh-filebeat-0.1.tar.gz', ){ diff --git a/manifests/kibana.pp b/manifests/kibana.pp index 435c360e..e8e38843 100644 --- a/manifests/kibana.pp +++ b/manifests/kibana.pp @@ -4,7 +4,7 @@ $kibana_package = 'kibana', $kibana_service = 'kibana', $kibana_version = '7.9.3', - $kibana_app_version = '4.0.1_7.9.3', + $kibana_app_version = '4.0.2_7.9.3', $kibana_elasticsearch_ip = 'localhost', $kibana_elasticsearch_port = '9200', diff --git a/manifests/kibana_od.pp b/manifests/kibana_od.pp index e456bb51..3d964112 100644 --- a/manifests/kibana_od.pp +++ b/manifests/kibana_od.pp @@ -6,7 +6,7 @@ $kibana_od_version = '1.11.0', $kibana_od_elastic_user = 'admin', $kibana_od_elastic_password = 'admin', - $kibana_od_app_version = '4.0.1_7.9.1', + $kibana_od_app_version = '4.0.2_7.9.1', $kibana_od_elasticsearch_ip = 'localhost', $kibana_od_elasticsearch_port = '9200', diff --git a/manifests/params_agent.pp b/manifests/params_agent.pp index cb8b2b97..733aadb4 100644 --- a/manifests/params_agent.pp +++ b/manifests/params_agent.pp @@ -1,7 +1,7 @@ # Wazuh App Copyright (C) 2020 Wazuh Inc. (License GPLv2) # Wazuh-Agent configuration parameters class wazuh::params_agent { - $agent_package_version = '4.0.1-1' + $agent_package_version = '4.0.2-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 4c349994..94fc87c5 100644 --- a/manifests/params_manager.pp +++ b/manifests/params_manager.pp @@ -5,7 +5,7 @@ 'Linux': { # Installation - $server_package_version = '4.0.1-1' + $server_package_version = '4.0.2-1' $manage_repos = true $manage_firewall = false @@ -534,7 +534,7 @@ $keys_group = 'Administrators' $agent_service = 'OssecSvc' - $agent_package = 'Wazuh Agent 4.0.1' + $agent_package = 'Wazuh Agent 4.0.2' $server_service = '' $server_package = '' $api_service = '' diff --git a/metadata.json b/metadata.json index c5a5a3ca..463aae46 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "wazuh-wazuh", - "version": "4.0.1", + "version": "4.0.2", "author": "WAZUH", "summary": "Install and configure Wazuh-HIDS client and server", "license": "Apache-2.0", From 3ce6c31ae1fd7f68d47e7e02a110d8599199d952 Mon Sep 17 00:00:00 2001 From: zenidd Date: Mon, 23 Nov 2020 17:13:50 +0100 Subject: [PATCH 4/5] Updated changelog: PR306 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0837de65..5b388d6c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ All notable changes to this project will be documented in this file. - Update to Wazuh version 4.0.2 +### Fixed + +- Syscheck 'report_changes' option ([@oletos7j](https://github.com/oletos7j)) [PR#306](https://github.com/wazuh/wazuh-puppet/pull/306) + ## Wazuh Puppet v4.0.1 From 635f3098755cfda08e188698b0da59ea02047655 Mon Sep 17 00:00:00 2001 From: zenidd Date: Thu, 26 Nov 2020 11:50:35 +0100 Subject: [PATCH 5/5] update License year --- manifests/repo_elasticsearch-oss.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/repo_elasticsearch-oss.pp b/manifests/repo_elasticsearch-oss.pp index e3a12129..185958a8 100644 --- a/manifests/repo_elasticsearch-oss.pp +++ b/manifests/repo_elasticsearch-oss.pp @@ -1,4 +1,4 @@ -# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) +# Wazuh App Copyright (C) 2020 Wazuh Inc. (License GPLv2) # Installation of Elastic repository class wazuh::repo_elastic (