From a22c343de701a466cb96a9af96a794849798be48 Mon Sep 17 00:00:00 2001 From: Jesus Garcia Date: Fri, 20 Dec 2024 09:20:40 -0500 Subject: [PATCH 1/2] Bump 4.12.0 version --- .github/workflows/Puppet_module_builder.yml | 4 ++-- CHANGELOG.md | 18 ++++++++++++++++++ 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 | 4 ++-- manifests/indexer.pp | 2 +- manifests/params_agent.pp | 2 +- manifests/params_manager.pp | 4 ++-- metadata.json | 2 +- 11 files changed, 33 insertions(+), 15 deletions(-) diff --git a/.github/workflows/Puppet_module_builder.yml b/.github/workflows/Puppet_module_builder.yml index 9d99b891..07cea331 100644 --- a/.github/workflows/Puppet_module_builder.yml +++ b/.github/workflows/Puppet_module_builder.yml @@ -19,7 +19,7 @@ on: wazuh_puppet_reference: description: "wazuh-puppet reference" type: string - default: "4.10.3" + default: "4.12.0" required: false id: description: "ID used to identify the workflow uniquely." @@ -42,7 +42,7 @@ on: wazuh_puppet_reference: description: "wazuh-puppet reference" type: string - default: "4.10.3" + default: "4.12.0" required: false id: type: string diff --git a/CHANGELOG.md b/CHANGELOG.md index 9056d1bc..3ec7323a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,24 @@ # Change Log All notable changes to this project will be documented in this file. +## [4.12.0] + +### Added + +- None + +### Changed + +- None + +### Fixed + +- None + +### Deleted + +- None + ## Wazuh Puppet v4.10.3 ### Added diff --git a/VERSION b/VERSION index 3f63cd5f..0e7478b9 100644 --- a/VERSION +++ b/VERSION @@ -1,3 +1,3 @@ -WAZUH-PUPPET_VERSION="v4.10.3" -REVISION="41030" -VERSION=4.10.3 +WAZUH-PUPPET_VERSION="v4.12.0" +REVISION="41200" +VERSION=4.12.0 \ No newline at end of file diff --git a/kitchen/test/integration/agent/agent_spec.rb b/kitchen/test/integration/agent/agent_spec.rb index 6640a058..ee255384 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.10.3-1' } + its('version') { is_expected.to eq '4.12.0-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 9feeaf91..557fa186 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.10.3-1' } + its('version') { is_expected.to eq '4.12.0-1' } end # Verifying service diff --git a/manifests/dashboard.pp b/manifests/dashboard.pp index d88bd9a3..78b44e3c 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.10.3', + $dashboard_version = '4.12.0', $indexer_server_ip = 'localhost', $indexer_server_port = '9200', $manager_api_host = '127.0.0.1', diff --git a/manifests/filebeat_oss.pp b/manifests/filebeat_oss.pp index b1af69c7..a95415cf 100644 --- a/manifests/filebeat_oss.pp +++ b/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.10.3_7.10.2', - $wazuh_extensions_version = 'v4.10.3', + $wazuh_app_version = '4.12.0_7.10.2', + $wazuh_extensions_version = 'v4.12.0', $wazuh_filebeat_module = 'wazuh-filebeat-0.4.tar.gz', $wazuh_node_name = 'master', diff --git a/manifests/indexer.pp b/manifests/indexer.pp index 3687cb29..d4057c92 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.10.3-1', + $indexer_version = '4.12.0-1', $indexer_fileuser = 'wazuh-indexer', $indexer_filegroup = 'wazuh-indexer', diff --git a/manifests/params_agent.pp b/manifests/params_agent.pp index f7f29ab9..bb876e98 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.10.3' + $agent_package_version = '4.12.0' $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 c6554a5c..6fa12918 100644 --- a/manifests/params_manager.pp +++ b/manifests/params_manager.pp @@ -5,7 +5,7 @@ 'Linux': { # Installation - $server_package_version = '4.10.3-1' + $server_package_version = '4.12.0-1' $manage_firewall = false @@ -553,7 +553,7 @@ $keys_group = 'Administrators' $agent_service = 'WazuhSvc' - $agent_package = 'Wazuh Agent 4.10.3' + $agent_package = 'Wazuh Agent 4.12.0' $server_service = '' $server_package = '' $api_service = '' diff --git a/metadata.json b/metadata.json index 21d64d68..96ed0225 100755 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "wazuh-wazuh", - "version": "4.10.3", + "version": "4.12.0", "author": "WAZUH", "summary": "Install and configure Wazuh-HIDS client and server", "license": "Apache-2.0", From 63aa14ad74e36979f554013f03fe2e76e2627ecc Mon Sep 17 00:00:00 2001 From: Jesus Garcia Date: Fri, 20 Dec 2024 09:29:30 -0500 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ec7323a..33c22302 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,42 +19,6 @@ All notable changes to this project will be documented in this file. - None -## Wazuh Puppet v4.10.3 - -### Added - -- None - -### Changed - -- None - -### Fixed - -- None - -### Deleted - -- None - -## Wazuh Puppet v4.10.2 - -### Added - -- None - -### Changed - -- None - -### Fixed - -- None - -### Deleted - -- None - ## Wazuh Puppet v4.10.1 ### Added