From 27c80b6a501c03ad536e7dea1c39a7ee0752d937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Anguita=20L=C3=B3pez?= Date: Fri, 18 Oct 2024 10:23:56 +0200 Subject: [PATCH 1/9] bump revision to 41003 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index b204178d..b8909609 100644 --- a/VERSION +++ b/VERSION @@ -1,3 +1,3 @@ WAZUH-PUPPET_VERSION="v4.10.0" -REVISION="41002" +REVISION="41003" VERSION=4.10.0 From 90baab33eec82d0fed009e621a5a49cec198581d Mon Sep 17 00:00:00 2001 From: vcerenu Date: Wed, 23 Oct 2024 13:54:53 -0300 Subject: [PATCH 2/9] Delete API parameters from wazuh.yml template --- manifests/params_manager.pp | 6 +----- templates/wazuh_api_yml.erb | 4 ---- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/manifests/params_manager.pp b/manifests/params_manager.pp index 65582de9..e3740a21 100644 --- a/manifests/params_manager.pp +++ b/manifests/params_manager.pp @@ -314,7 +314,7 @@ #API - $wazuh_api_host = '0.0.0.0' + $wazuh_api_host = ['0.0.0.0'] $wazuh_api_port = '55000' $wazuh_api_file = undef @@ -341,10 +341,6 @@ $wazuh_api_cors_allow_headers = '"*"' $wazuh_api_cors_allow_credentials = 'no' - # Cache (time in seconds) - $wazuh_api_cache_enabled = 'yes' - $wazuh_api_cache_time = '0.750' - # Access parameters $wazuh_api_access_max_login_attempts = 5 $wazuh_api_access_block_time = 300 diff --git a/templates/wazuh_api_yml.erb b/templates/wazuh_api_yml.erb index 6b2e67b0..f8b856af 100644 --- a/templates/wazuh_api_yml.erb +++ b/templates/wazuh_api_yml.erb @@ -24,10 +24,6 @@ cors: expose_headers: <%= @wazuh_api_cors_expose_headers %> allow_headers: <%= @wazuh_api_cors_allow_headers %> allow_credentials: <%= @wazuh_api_cors_allow_credentials %> -# Cache (time in seconds) -cache: - enabled: <%= @wazuh_api_cache_enabled %> - time: <%= @wazuh_api_cache_time %> # Access parameters access: max_login_attempts: <%= @wazuh_api_access_max_login_attempts %> From dd93a3254fb408ee571ab1289f1f688d8e0be601 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Wed, 23 Oct 2024 14:05:18 -0300 Subject: [PATCH 3/9] Delete API parameters from wazuh.yml template --- manifests/manager.pp | 3 --- 1 file changed, 3 deletions(-) diff --git a/manifests/manager.pp b/manifests/manager.pp index 702d0639..33c8d5be 100644 --- a/manifests/manager.pp +++ b/manifests/manager.pp @@ -283,9 +283,6 @@ $wazuh_api_cors_allow_credentials = $::wazuh::params_manager::wazuh_api_cors_allow_credentials, - $wazuh_api_cache_enabled = $::wazuh::params_manager::wazuh_api_cache_enabled, - - $wazuh_api_cache_time = $::wazuh::params_manager::wazuh_api_cache_time, $wazuh_api_access_max_login_attempts = $::wazuh::params_manager::wazuh_api_access_max_login_attempts, $wazuh_api_access_block_time = $::wazuh::params_manager::wazuh_api_access_block_time, From 8eb25c299e389b312ad91358ff6d88244cc8d495 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Wed, 23 Oct 2024 14:11:08 -0300 Subject: [PATCH 4/9] Add Changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 26468f63..26c33080 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file. ### Changed +- Delete API parameters from wazuh.yml template ([#1155](https://github.com/wazuh/wazuh-puppet/pull/1155)) \- - Add URI file after upload ([#1143](https://github.com/wazuh/wazuh-puppet/pull/1143)) \- (Puppet Module Builder) - Modfy Puppet module builder ([#1113](https://github.com/wazuh/wazuh-puppet/pull/1113)) \- (Puppet Module Builder) From f81333eb53205646629e3afed6f7330080ceef41 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Wed, 23 Oct 2024 14:16:01 -0300 Subject: [PATCH 5/9] Add Changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 26c33080..fd613c73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ All notable changes to this project will be documented in this file. ### Changed -- Delete API parameters from wazuh.yml template ([#1155](https://github.com/wazuh/wazuh-puppet/pull/1155)) \- +- Delete API parameters from wazuh.yml template ([#1155](https://github.com/wazuh/wazuh-puppet/pull/1155)) \- (Puppet Module) - Add URI file after upload ([#1143](https://github.com/wazuh/wazuh-puppet/pull/1143)) \- (Puppet Module Builder) - Modfy Puppet module builder ([#1113](https://github.com/wazuh/wazuh-puppet/pull/1113)) \- (Puppet Module Builder) From 12bd5155d6e7d956b5ec39c8257cea4b5e99922f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Anguita=20L=C3=B3pez?= Date: Fri, 25 Oct 2024 12:25:03 +0200 Subject: [PATCH 6/9] support new wazuh version 4.9.2 --- 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 | 4 ++-- manifests/indexer.pp | 2 +- manifests/params_agent.pp | 2 +- manifests/params_manager.pp | 4 ++-- metadata.json | 2 +- 10 files changed, 19 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 82a6ae43..9d795787 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.9.2 + +### Added + +- Support to 4.9.2 Wazuh release. + ## Wazuh Puppet v4.9.1 ### Added diff --git a/VERSION b/VERSION index 1936939e..576e5936 100644 --- a/VERSION +++ b/VERSION @@ -1,3 +1,3 @@ -WAZUH-PUPPET_VERSION="v4.9.1" -REVISION="40914" -VERSION=4.9.1 +WAZUH-PUPPET_VERSION="v4.9.2" +REVISION="40920" +VERSION=4.9.2 diff --git a/kitchen/test/integration/agent/agent_spec.rb b/kitchen/test/integration/agent/agent_spec.rb index 625951a5..bd713d9e 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.9.1-1' } + its('version') { is_expected.to eq '4.9.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 50cf2670..1d297f89 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.9.1-1' } + its('version') { is_expected.to eq '4.9.2-1' } end # Verifying service diff --git a/manifests/dashboard.pp b/manifests/dashboard.pp index d2cf3be4..8628854f 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.9.1', + $dashboard_version = '4.9.2', $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 796997bd..8253b179 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.9.1_7.10.2', - $wazuh_extensions_version = 'v4.9.1', + $wazuh_app_version = '4.9.2_7.10.2', + $wazuh_extensions_version = 'v4.9.2', $wazuh_filebeat_module = 'wazuh-filebeat-0.4.tar.gz', $wazuh_node_name = 'master', diff --git a/manifests/indexer.pp b/manifests/indexer.pp index 068488d0..097cd79d 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.9.1', + $indexer_version = '4.9.2', $indexer_fileuser = 'wazuh-indexer', $indexer_filegroup = 'wazuh-indexer', diff --git a/manifests/params_agent.pp b/manifests/params_agent.pp index 6bda2585..168e26a2 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.9.1' + $agent_package_version = '4.9.2' $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 362796ca..202881b7 100644 --- a/manifests/params_manager.pp +++ b/manifests/params_manager.pp @@ -5,7 +5,7 @@ 'Linux': { # Installation - $server_package_version = '4.9.1' + $server_package_version = '4.9.2' $manage_firewall = false @@ -557,7 +557,7 @@ $keys_group = 'Administrators' $agent_service = 'WazuhSvc' - $agent_package = 'Wazuh Agent 4.9.1' + $agent_package = 'Wazuh Agent 4.9.2' $server_service = '' $server_package = '' $api_service = '' diff --git a/metadata.json b/metadata.json index 1dc7efbf..55d1f9a5 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "wazuh-wazuh", - "version": "4.9.1", + "version": "4.9.2", "author": "WAZUH", "summary": "Install and configure Wazuh-HIDS client and server", "license": "Apache-2.0", From a56c889deec315400e8029281308b103f72b363a Mon Sep 17 00:00:00 2001 From: c-bordon Date: Mon, 28 Oct 2024 10:58:22 -0300 Subject: [PATCH 7/9] Updated 4.9.2 revision --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 576e5936..d2b1259a 100644 --- a/VERSION +++ b/VERSION @@ -1,3 +1,3 @@ WAZUH-PUPPET_VERSION="v4.9.2" -REVISION="40920" +REVISION="40921" VERSION=4.9.2 From a6c7596014d534b81ce08ffc17130820d4df513c Mon Sep 17 00:00:00 2001 From: c-bordon Date: Mon, 4 Nov 2024 15:08:00 -0300 Subject: [PATCH 8/9] Merge 4.9.2 into 4.10.0 --- 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 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/VERSION b/VERSION index d2b1259a..b8909609 100644 --- a/VERSION +++ b/VERSION @@ -1,3 +1,3 @@ -WAZUH-PUPPET_VERSION="v4.9.2" -REVISION="40921" -VERSION=4.9.2 +WAZUH-PUPPET_VERSION="v4.10.0" +REVISION="41003" +VERSION=4.10.0 diff --git a/kitchen/test/integration/agent/agent_spec.rb b/kitchen/test/integration/agent/agent_spec.rb index bd713d9e..032f460c 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.9.2-1' } + its('version') { is_expected.to eq '4.10.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 1d297f89..ad91e132 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.9.2-1' } + its('version') { is_expected.to eq '4.10.0-1' } end # Verifying service diff --git a/manifests/dashboard.pp b/manifests/dashboard.pp index 8628854f..2ef790ce 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.9.2', + $dashboard_version = '4.10.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 8253b179..74b68a7a 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.9.2_7.10.2', - $wazuh_extensions_version = 'v4.9.2', + $wazuh_app_version = '4.10.0_7.10.2', + $wazuh_extensions_version = 'v4.10.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 097cd79d..78944851 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.9.2', + $indexer_version = '4.10.0', $indexer_fileuser = 'wazuh-indexer', $indexer_filegroup = 'wazuh-indexer', diff --git a/manifests/params_agent.pp b/manifests/params_agent.pp index 168e26a2..a39a5254 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.9.2' + $agent_package_version = '4.10.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 202881b7..25ebccb0 100644 --- a/manifests/params_manager.pp +++ b/manifests/params_manager.pp @@ -5,7 +5,7 @@ 'Linux': { # Installation - $server_package_version = '4.9.2' + $server_package_version = '4.10.0' $manage_firewall = false @@ -557,7 +557,7 @@ $keys_group = 'Administrators' $agent_service = 'WazuhSvc' - $agent_package = 'Wazuh Agent 4.9.2' + $agent_package = 'Wazuh Agent 4.10.0' $server_service = '' $server_package = '' $api_service = '' diff --git a/metadata.json b/metadata.json index 55d1f9a5..b317b3af 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "wazuh-wazuh", - "version": "4.9.2", + "version": "4.10.0", "author": "WAZUH", "summary": "Install and configure Wazuh-HIDS client and server", "license": "Apache-2.0", From 84e9466bc16e9a737fe0d52820521ea8a8489141 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Mon, 4 Nov 2024 15:13:35 -0300 Subject: [PATCH 9/9] Merge conlfict are resolved --- .github/workflows/Puppet_module_builder.yml | 143 ++++++++++++++++++++ .gitignore | 1 + CHANGELOG.md | 21 +++ manifests/indexer.pp | 2 +- manifests/manager.pp | 3 - manifests/params_manager.pp | 8 +- metadata.json | 0 templates/wazuh_api_yml.erb | 4 - 8 files changed, 168 insertions(+), 14 deletions(-) create mode 100644 .github/workflows/Puppet_module_builder.yml mode change 100644 => 100755 metadata.json diff --git a/.github/workflows/Puppet_module_builder.yml b/.github/workflows/Puppet_module_builder.yml new file mode 100644 index 00000000..0ee9e91a --- /dev/null +++ b/.github/workflows/Puppet_module_builder.yml @@ -0,0 +1,143 @@ +run-name: Puppet module ${{ inputs.is_stage && ' - is stage' || '' }}${{ inputs.checksum && ' - checksum' || '' }} ${{ inputs.id }} +name: Puppet Module Builder + +on: + workflow_dispatch: + inputs: + upload: + description: "Upload ?" + type: boolean + default: false + is_stage: + description: "Is stage ?" + type: boolean + default: false + checksum: + description: "Checksum ?" + type: boolean + default: false + wazuh_puppet_reference: + description: "wazuh-puppet reference" + type: string + default: "4.10.0" + required: false + id: + description: "ID used to identify the workflow uniquely." + type: string + required: false + workflow_call: + inputs: + upload: + description: "Upload ?" + type: boolean + default: false + is_stage: + description: "Is stage ?" + type: boolean + default: false + checksum: + description: "Checksum ?" + type: boolean + default: false + wazuh_puppet_reference: + description: "wazuh-puppet reference" + type: string + default: "4.10.0" + required: false + id: + type: string + required: false + +permissions: + id-token: write # This is required for requesting the JWT + contents: read # This is required for actions/checkout + +env: + S3_PATH: "development/wazuh/4.x/secondary/puppet-module/" + +jobs: + build_module: + runs-on: ubuntu-22.04 + steps: + - name: Checkout code + uses: actions/checkout@v4 + with: + ref: ${{ inputs.wazuh_puppet_reference }} + + - name: View parameters + run: echo "${{ toJson(inputs) }}" + + - name: Create environment variables for workflow + run: | + PUPPET_MODULE_REPO=$(jq .name ${{ github.workspace }}/metadata.json | sed -e 's|["'\'']||g') + PUPPET_MODULE_VERSION=$(jq .version ${{ github.workspace }}/metadata.json | sed -e 's|["'\'']||g') + calculatedSha=$(git rev-parse --short ${{ github.sha }}) + echo "PUPPET_MODULE_REPO=$PUPPET_MODULE_REPO" >> "$GITHUB_ENV" + echo "PUPPET_MODULE_VERSION=$PUPPET_MODULE_VERSION" >> "$GITHUB_ENV" + echo "COMMIT_SHORT_SHA=$calculatedSha" >> $GITHUB_ENV + + - name: Install dependencies + run: | + curl -O https://apt.puppet.com/puppet-tools-release-jammy.deb + sudo dpkg -i puppet-tools-release-jammy.deb + sudo apt-get update + sudo apt-get install pdk + pdk set config user.analytics.disabled false --type boolean --force + + - name: Modify name for stage build + if: ${{ inputs.is_stage == false }} + run: | + pip install sde + PUPPET_MODULE_VERSION="${PUPPET_MODULE_VERSION}-${{ env.COMMIT_SHORT_SHA}}" + sde version $PUPPET_MODULE_VERSION ${{ github.workspace }}/metadata.json + echo "PUPPET_MODULE_VERSION=$PUPPET_MODULE_VERSION" >> "$GITHUB_ENV" + + - name: Build Wazuh Puppet module + run: | + mkdir -p ${{ github.workspace }}/output + pdk build --force --target-dir=${{ github.workspace }}/output/ + PUPPET_MODULE_NAME=${{ env.PUPPET_MODULE_REPO }}-${{ env.PUPPET_MODULE_VERSION }}.tar.gz + echo "PUPPET_MODULE_NAME=$PUPPET_MODULE_NAME" >> "$GITHUB_ENV" + + - name: Build Wazuh Puppet module checksum + if: ${{ inputs.checksum == true }} + run: | + sha512sum ${{ github.workspace }}/output/${{ env.PUPPET_MODULE_NAME }} > ${{ github.workspace }}/output/${{ env.PUPPET_MODULE_NAME }}.sha512 + + + - name: Create Puppet module artifact + uses: actions/upload-artifact@v4 + with: + name: Puppet module artifact + path: ${{ github.workspace }}/output/${{ env.PUPPET_MODULE_NAME }} + retention-days: 1 + + - name: Create Puppet module checksum artifact + if: ${{ inputs.checksum == true }} + uses: actions/upload-artifact@v4 + with: + name: Puppet module checksum artifact + path: ${{ github.workspace }}/output/${{ env.PUPPET_MODULE_NAME }}.sha512 + retention-days: 1 + + - name: Configure aws credentials + if: ${{ inputs.upload == true }} + uses: aws-actions/configure-aws-credentials@v4 + with: + role-to-assume: ${{ secrets.AWS_IAM_PUPPET_ROLE }} + aws-region: "${{ secrets.AWS_REGION }}" + + - name: Upload Puppet module to S3 + if: ${{ inputs.upload == true }} + run: | + aws s3 cp ${{ github.workspace }}/output/${{ env.PUPPET_MODULE_NAME }} s3://${{ vars.AWS_S3_BUCKET }}/${{ env.S3_PATH }} + s3uri="s3://${{ vars.AWS_S3_BUCKET }}/${{ env.S3_PATH }}/${{ env.PUPPET_MODULE_NAME }}" + echo "S3 URI: ${s3uri}" + + - name: Create checksum file and upload + if: ${{ inputs.checksum == true && inputs.upload == true }} + run: | + aws s3 cp ${{ github.workspace }}/output/${{ env.PUPPET_MODULE_NAME }}.sha512 s3://${{ vars.AWS_S3_BUCKET }}/${{ env.S3_PATH }} + s3uri="s3://${{ vars.AWS_S3_BUCKET }}/${{ env.S3_PATH }}/${{ env.PUPPET_MODULE_NAME }}.sha512" + echo "S3 sha512 URI: ${s3uri}" + diff --git a/.gitignore b/.gitignore index 1c34e1e3..d9052c2b 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ kitchen/.librarian/ kitchen/.pytest_cache/ kitchen/.* kitchen/modules/ +output/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d795787..26dc6a0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,27 @@ # Change Log All notable changes to this project will be documented in this file. +## Wazuh Puppet v4.10.0 + +### Added + +- Wazuh Puppet module builder ([#1107](https://github.com/wazuh/wazuh-puppet/pull/1107)) \- (Puppet Module Builder) +- Wazuh Puppet module builder ([#1109](https://github.com/wazuh/wazuh-puppet/pull/1109)) \- (Puppet Module Builder) + +### Changed + +- Delete API parameters from wazuh.yml template ([#1155](https://github.com/wazuh/wazuh-puppet/pull/1155)) \- (Puppet Module) +- Add URI file after upload ([#1143](https://github.com/wazuh/wazuh-puppet/pull/1143)) \- (Puppet Module Builder) +- Modfy Puppet module builder ([#1113](https://github.com/wazuh/wazuh-puppet/pull/1113)) \- (Puppet Module Builder) + +### Fixed + +- Changed GitHub Runner OS version to Ubuntu 22.04. ([#1142](https://github.com/wazuh/wazuh-puppet/pull/1142)) + +### Deleted + +- None + ## Wazuh Puppet v4.9.2 ### Added diff --git a/manifests/indexer.pp b/manifests/indexer.pp index 78944851..402f9da4 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.0', + $indexer_version = '4.10.0-1', $indexer_fileuser = 'wazuh-indexer', $indexer_filegroup = 'wazuh-indexer', diff --git a/manifests/manager.pp b/manifests/manager.pp index 702d0639..33c8d5be 100644 --- a/manifests/manager.pp +++ b/manifests/manager.pp @@ -283,9 +283,6 @@ $wazuh_api_cors_allow_credentials = $::wazuh::params_manager::wazuh_api_cors_allow_credentials, - $wazuh_api_cache_enabled = $::wazuh::params_manager::wazuh_api_cache_enabled, - - $wazuh_api_cache_time = $::wazuh::params_manager::wazuh_api_cache_time, $wazuh_api_access_max_login_attempts = $::wazuh::params_manager::wazuh_api_access_max_login_attempts, $wazuh_api_access_block_time = $::wazuh::params_manager::wazuh_api_access_block_time, diff --git a/manifests/params_manager.pp b/manifests/params_manager.pp index 25ebccb0..e3740a21 100644 --- a/manifests/params_manager.pp +++ b/manifests/params_manager.pp @@ -5,7 +5,7 @@ 'Linux': { # Installation - $server_package_version = '4.10.0' + $server_package_version = '4.10.0-1' $manage_firewall = false @@ -314,7 +314,7 @@ #API - $wazuh_api_host = '0.0.0.0' + $wazuh_api_host = ['0.0.0.0'] $wazuh_api_port = '55000' $wazuh_api_file = undef @@ -341,10 +341,6 @@ $wazuh_api_cors_allow_headers = '"*"' $wazuh_api_cors_allow_credentials = 'no' - # Cache (time in seconds) - $wazuh_api_cache_enabled = 'yes' - $wazuh_api_cache_time = '0.750' - # Access parameters $wazuh_api_access_max_login_attempts = 5 $wazuh_api_access_block_time = 300 diff --git a/metadata.json b/metadata.json old mode 100644 new mode 100755 diff --git a/templates/wazuh_api_yml.erb b/templates/wazuh_api_yml.erb index 6b2e67b0..f8b856af 100644 --- a/templates/wazuh_api_yml.erb +++ b/templates/wazuh_api_yml.erb @@ -24,10 +24,6 @@ cors: expose_headers: <%= @wazuh_api_cors_expose_headers %> allow_headers: <%= @wazuh_api_cors_allow_headers %> allow_credentials: <%= @wazuh_api_cors_allow_credentials %> -# Cache (time in seconds) -cache: - enabled: <%= @wazuh_api_cache_enabled %> - time: <%= @wazuh_api_cache_time %> # Access parameters access: max_login_attempts: <%= @wazuh_api_access_max_login_attempts %>