From 7d19eaa5534de9121d0a7c652355e63e5f5ba31f Mon Sep 17 00:00:00 2001 From: c-bordon Date: Thu, 3 Oct 2024 12:04:45 -0300 Subject: [PATCH 1/8] Bumped branch 4.10.2 to 4.10.2 version --- CHANGELOG.md | 6 ++++++ README.md | 1 + VERSION | 4 ++-- roles/wazuh/ansible-filebeat-oss/defaults/main.yml | 2 +- roles/wazuh/ansible-wazuh-agent/defaults/main.yml | 2 +- roles/wazuh/ansible-wazuh-manager/defaults/main.yml | 2 +- roles/wazuh/check-packages/defaults/main.yml | 2 +- roles/wazuh/wazuh-dashboard/defaults/main.yml | 4 ++-- roles/wazuh/wazuh-dashboard/vars/debian.yml | 2 +- roles/wazuh/wazuh-indexer/defaults/main.yml | 2 +- 10 files changed, 17 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88bb9af7..4fa047e6 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. +## [v4.10.2] + +### Added + +- Update to [Wazuh v4.10.2](https://github.com/wazuh/wazuh/blob/v4.10.2/CHANGELOG.md#v4101) + ## [v4.10.1] ### Added diff --git a/README.md b/README.md index ea1db267..4fbe88b4 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ These playbooks install and configure Wazuh agent, manager and indexer and dashb | Wazuh version | Elastic | ODFE | |---------------|---------|--------| +| v4.10.2 | | | | v4.10.1 | | | | v4.10.0 | | | | v4.9.1 | | | diff --git a/VERSION b/VERSION index 48ef5d92..6091366b 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-ANSIBLE_VERSION="v4.10.1" -REVISION="41010" +WAZUH-ANSIBLE_VERSION="v4.10.2" +REVISION="41020" diff --git a/roles/wazuh/ansible-filebeat-oss/defaults/main.yml b/roles/wazuh/ansible-filebeat-oss/defaults/main.yml index 9eff77dd..0a114f06 100644 --- a/roles/wazuh/ansible-filebeat-oss/defaults/main.yml +++ b/roles/wazuh/ansible-filebeat-oss/defaults/main.yml @@ -1,7 +1,7 @@ --- filebeat_version: 7.10.2 -wazuh_template_branch: v4.10.1 +wazuh_template_branch: v4.10.2 filebeat_node_name: node-1 diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index 7b6e4023..65a67a7d 100644 --- a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml @@ -1,5 +1,5 @@ --- -wazuh_agent_version: 4.10.1 +wazuh_agent_version: 4.10.2 # Custom packages installation diff --git a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml index 3dc16b9f..46ad45e9 100644 --- a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml @@ -1,5 +1,5 @@ --- -wazuh_manager_version: 4.10.1 +wazuh_manager_version: 4.10.2 wazuh_manager_fqdn: "wazuh-server" wazuh_manager_package_state: present diff --git a/roles/wazuh/check-packages/defaults/main.yml b/roles/wazuh/check-packages/defaults/main.yml index 19497f97..82980c75 100644 --- a/roles/wazuh/check-packages/defaults/main.yml +++ b/roles/wazuh/check-packages/defaults/main.yml @@ -1,2 +1,2 @@ --- -wazuh_version: 4.10.1 +wazuh_version: 4.10.2 diff --git a/roles/wazuh/wazuh-dashboard/defaults/main.yml b/roles/wazuh/wazuh-dashboard/defaults/main.yml index 9b7d4e9a..de0a9eb4 100644 --- a/roles/wazuh/wazuh-dashboard/defaults/main.yml +++ b/roles/wazuh/wazuh-dashboard/defaults/main.yml @@ -8,12 +8,12 @@ dashboard_node_name: node-1 dashboard_server_host: "0.0.0.0" dashboard_server_port: "443" dashboard_server_name: "dashboard" -wazuh_version: 4.10.1 +wazuh_version: 4.10.2 indexer_cluster_nodes: - 127.0.0.1 # The Wazuh dashboard package repository -dashboard_version: "4.10.1" +dashboard_version: "4.10.2" # API credentials wazuh_api_credentials: diff --git a/roles/wazuh/wazuh-dashboard/vars/debian.yml b/roles/wazuh/wazuh-dashboard/vars/debian.yml index cd7c14b4..82a3de7e 100644 --- a/roles/wazuh/wazuh-dashboard/vars/debian.yml +++ b/roles/wazuh/wazuh-dashboard/vars/debian.yml @@ -1,2 +1,2 @@ --- -dashboard_version: 4.10.1 +dashboard_version: 4.10.2 diff --git a/roles/wazuh/wazuh-indexer/defaults/main.yml b/roles/wazuh/wazuh-indexer/defaults/main.yml index dde6d76d..b9b76d7b 100644 --- a/roles/wazuh/wazuh-indexer/defaults/main.yml +++ b/roles/wazuh/wazuh-indexer/defaults/main.yml @@ -1,6 +1,6 @@ --- # Cluster Settings -indexer_version: 4.10.1 +indexer_version: 4.10.2 single_node: false indexer_node_name: node-1 From 57c2c32c20efbe45c8e8cec9120531f6911e9abe Mon Sep 17 00:00:00 2001 From: vcerenu Date: Wed, 18 Dec 2024 14:29:46 -0300 Subject: [PATCH 2/8] Bump new version --- CHANGELOG.md | 8 +++++++- README.md | 1 + VERSION | 4 ++-- roles/wazuh/ansible-filebeat-oss/defaults/main.yml | 2 +- roles/wazuh/ansible-wazuh-agent/defaults/main.yml | 2 +- roles/wazuh/ansible-wazuh-manager/defaults/main.yml | 2 +- roles/wazuh/check-packages/defaults/main.yml | 2 +- roles/wazuh/wazuh-dashboard/defaults/main.yml | 4 ++-- roles/wazuh/wazuh-dashboard/vars/debian.yml | 2 +- roles/wazuh/wazuh-indexer/defaults/main.yml | 2 +- 10 files changed, 18 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b2ddc63f..2b96b549 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,17 @@ # Change Log All notable changes to this project will be documented in this file. +## [v4.10.3] + +### Added + +- Update to [Wazuh v4.10.3](https://github.com/wazuh/wazuh/blob/v4.10.3/CHANGELOG.md#v4103) + ## [v4.10.2] ### Added -- Update to [Wazuh v4.10.2](https://github.com/wazuh/wazuh/blob/v4.10.2/CHANGELOG.md#v4101) +- Update to [Wazuh v4.10.2](https://github.com/wazuh/wazuh/blob/v4.10.2/CHANGELOG.md#v4102) ## [v4.10.1] diff --git a/README.md b/README.md index ed99a105..fa415bd4 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ These playbooks install and configure Wazuh agent, manager and indexer and dashb | Wazuh version | Elastic | ODFE | |---------------|---------|--------| +| v4.10.3 | | | | v4.10.2 | | | | v4.10.1 | | | | v4.10.0 | | | diff --git a/VERSION b/VERSION index 6091366b..f770ea47 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-ANSIBLE_VERSION="v4.10.2" -REVISION="41020" +WAZUH-ANSIBLE_VERSION="v4.10.3" +REVISION="41030" diff --git a/roles/wazuh/ansible-filebeat-oss/defaults/main.yml b/roles/wazuh/ansible-filebeat-oss/defaults/main.yml index 0a114f06..5f2645a9 100644 --- a/roles/wazuh/ansible-filebeat-oss/defaults/main.yml +++ b/roles/wazuh/ansible-filebeat-oss/defaults/main.yml @@ -1,7 +1,7 @@ --- filebeat_version: 7.10.2 -wazuh_template_branch: v4.10.2 +wazuh_template_branch: v4.10.3 filebeat_node_name: node-1 diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index 65a67a7d..7a512ba9 100644 --- a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml @@ -1,5 +1,5 @@ --- -wazuh_agent_version: 4.10.2 +wazuh_agent_version: 4.10.3 # Custom packages installation diff --git a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml index 46ad45e9..026ee229 100644 --- a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml @@ -1,5 +1,5 @@ --- -wazuh_manager_version: 4.10.2 +wazuh_manager_version: 4.10.3 wazuh_manager_fqdn: "wazuh-server" wazuh_manager_package_state: present diff --git a/roles/wazuh/check-packages/defaults/main.yml b/roles/wazuh/check-packages/defaults/main.yml index 82980c75..16513361 100644 --- a/roles/wazuh/check-packages/defaults/main.yml +++ b/roles/wazuh/check-packages/defaults/main.yml @@ -1,2 +1,2 @@ --- -wazuh_version: 4.10.2 +wazuh_version: 4.10.3 diff --git a/roles/wazuh/wazuh-dashboard/defaults/main.yml b/roles/wazuh/wazuh-dashboard/defaults/main.yml index de0a9eb4..b6506cb4 100644 --- a/roles/wazuh/wazuh-dashboard/defaults/main.yml +++ b/roles/wazuh/wazuh-dashboard/defaults/main.yml @@ -8,12 +8,12 @@ dashboard_node_name: node-1 dashboard_server_host: "0.0.0.0" dashboard_server_port: "443" dashboard_server_name: "dashboard" -wazuh_version: 4.10.2 +wazuh_version: 4.10.3 indexer_cluster_nodes: - 127.0.0.1 # The Wazuh dashboard package repository -dashboard_version: "4.10.2" +dashboard_version: "4.10.3" # API credentials wazuh_api_credentials: diff --git a/roles/wazuh/wazuh-dashboard/vars/debian.yml b/roles/wazuh/wazuh-dashboard/vars/debian.yml index 82a3de7e..54e83bb6 100644 --- a/roles/wazuh/wazuh-dashboard/vars/debian.yml +++ b/roles/wazuh/wazuh-dashboard/vars/debian.yml @@ -1,2 +1,2 @@ --- -dashboard_version: 4.10.2 +dashboard_version: 4.10.3 diff --git a/roles/wazuh/wazuh-indexer/defaults/main.yml b/roles/wazuh/wazuh-indexer/defaults/main.yml index b9b76d7b..8c074396 100644 --- a/roles/wazuh/wazuh-indexer/defaults/main.yml +++ b/roles/wazuh/wazuh-indexer/defaults/main.yml @@ -1,6 +1,6 @@ --- # Cluster Settings -indexer_version: 4.10.2 +indexer_version: 4.10.3 single_node: false indexer_node_name: node-1 From 3eeabe90db5a79fae8b77be0fd172fa608b1c0c1 Mon Sep 17 00:00:00 2001 From: Jesus Garcia Date: Thu, 19 Dec 2024 11:09:29 -0500 Subject: [PATCH 3/8] Update GHA runners to use 'ubuntu-22.02' instead of 'ubuntu-latest' --- .github/workflows/al_aio.yml | 4 ++-- .github/workflows/al_wazuh.yml | 4 ++-- .github/workflows/centos_aio.yml | 4 ++-- .github/workflows/centos_wazuh.yml | 4 ++-- .github/workflows/ubuntu_aio.yml | 4 ++-- .github/workflows/ubuntu_wazuh.yml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/al_aio.yml b/.github/workflows/al_aio.yml index cd121303..076a5e21 100644 --- a/.github/workflows/al_aio.yml +++ b/.github/workflows/al_aio.yml @@ -4,7 +4,7 @@ on: [pull_request, workflow_dispatch, release] jobs: start-runner: name: Start self-hosted EC2 runner - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 outputs: label: ${{ steps.start-ec2-runner.outputs.label }} ec2-instance-id: ${{ steps.start-ec2-runner.outputs.ec2-instance-id }} @@ -49,7 +49,7 @@ jobs: needs: - start-runner # required to get output from the start-runner job - install-aio-single-instance # required to wait when the main job is done - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 if: ${{ always() }} # required to stop the runner even if the error happened in the previous jobs steps: - name: Configure AWS credentials diff --git a/.github/workflows/al_wazuh.yml b/.github/workflows/al_wazuh.yml index 8200e866..4e5157d7 100644 --- a/.github/workflows/al_wazuh.yml +++ b/.github/workflows/al_wazuh.yml @@ -4,7 +4,7 @@ on: [pull_request, workflow_dispatch, release] jobs: start-runner: name: Start self-hosted EC2 runner - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 outputs: label: ${{ steps.start-ec2-runner.outputs.label }} ec2-instance-id: ${{ steps.start-ec2-runner.outputs.ec2-instance-id }} @@ -49,7 +49,7 @@ jobs: needs: - start-runner # required to get output from the start-runner job - install-wazuh-single-instance # required to wait when the main job is done - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 if: ${{ always() }} # required to stop the runner even if the error happened in the previous jobs steps: - name: Configure AWS credentials diff --git a/.github/workflows/centos_aio.yml b/.github/workflows/centos_aio.yml index 0d03a168..58488e91 100644 --- a/.github/workflows/centos_aio.yml +++ b/.github/workflows/centos_aio.yml @@ -4,7 +4,7 @@ on: [pull_request, workflow_dispatch, release] jobs: start-runner: name: Start self-hosted EC2 runner - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 outputs: label: ${{ steps.start-ec2-runner.outputs.label }} ec2-instance-id: ${{ steps.start-ec2-runner.outputs.ec2-instance-id }} @@ -58,7 +58,7 @@ jobs: needs: - start-runner # required to get output from the start-runner job - install-aio-single-instance # required to wait when the main job is done - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 if: ${{ always() }} # required to stop the runner even if the error happened in the previous jobs steps: - name: Configure AWS credentials diff --git a/.github/workflows/centos_wazuh.yml b/.github/workflows/centos_wazuh.yml index 17e90e39..cced7849 100644 --- a/.github/workflows/centos_wazuh.yml +++ b/.github/workflows/centos_wazuh.yml @@ -4,7 +4,7 @@ on: [pull_request, workflow_dispatch, release] jobs: start-runner: name: Start self-hosted EC2 runner - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 outputs: label: ${{ steps.start-ec2-runner.outputs.label }} ec2-instance-id: ${{ steps.start-ec2-runner.outputs.ec2-instance-id }} @@ -58,7 +58,7 @@ jobs: needs: - start-runner # required to get output from the start-runner job - install-wazuh-single-instance # required to wait when the main job is done - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 if: ${{ always() }} # required to stop the runner even if the error happened in the previous jobs steps: - name: Configure AWS credentials diff --git a/.github/workflows/ubuntu_aio.yml b/.github/workflows/ubuntu_aio.yml index 05eb3778..32ff7db7 100644 --- a/.github/workflows/ubuntu_aio.yml +++ b/.github/workflows/ubuntu_aio.yml @@ -4,7 +4,7 @@ on: [pull_request, workflow_dispatch, release] jobs: start-runner: name: Start self-hosted EC2 runner - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 outputs: label: ${{ steps.start-ec2-runner.outputs.label }} ec2-instance-id: ${{ steps.start-ec2-runner.outputs.ec2-instance-id }} @@ -58,7 +58,7 @@ jobs: needs: - start-runner # required to get output from the start-runner job - install-aio-single-instance # required to wait when the main job is done - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 if: ${{ always() }} # required to stop the runner even if the error happened in the previous jobs steps: - name: Configure AWS credentials diff --git a/.github/workflows/ubuntu_wazuh.yml b/.github/workflows/ubuntu_wazuh.yml index 64db955e..245c4c7f 100644 --- a/.github/workflows/ubuntu_wazuh.yml +++ b/.github/workflows/ubuntu_wazuh.yml @@ -4,7 +4,7 @@ on: [pull_request, workflow_dispatch, release] jobs: start-runner: name: Start self-hosted EC2 runner - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 outputs: label: ${{ steps.start-ec2-runner.outputs.label }} ec2-instance-id: ${{ steps.start-ec2-runner.outputs.ec2-instance-id }} @@ -58,7 +58,7 @@ jobs: needs: - start-runner # required to get output from the start-runner job - install-wazuh-single-instance # required to wait when the main job is done - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 if: ${{ always() }} # required to stop the runner even if the error happened in the previous jobs steps: - name: Configure AWS credentials From 8cd25cc3ad98822f8e2ad11daad4ba85febaae4c Mon Sep 17 00:00:00 2001 From: Jesus Garcia Date: Thu, 19 Dec 2024 11:33:28 -0500 Subject: [PATCH 4/8] Add changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b96b549..6a52b0dd 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 v4.10.3](https://github.com/wazuh/wazuh/blob/v4.10.3/CHANGELOG.md#v4103) +### Changed + +- Use fixed version of Ubuntu-22.04 in GHA runners instead of latest version ([#1479](https://github.com/wazuh/wazuh-ansible/pull/1479)) \- (PR Checks Workflows) + ## [v4.10.2] ### Added From 0a37fc66a33d5b25e162693d46498f814935479a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Fri, 20 Dec 2024 11:27:26 -0300 Subject: [PATCH 5/8] Bump to 4.12.0 --- CHANGELOG.md | 10 ++-------- README.md | 1 + VERSION | 4 ++-- roles/wazuh/ansible-filebeat-oss/defaults/main.yml | 2 +- roles/wazuh/ansible-wazuh-agent/defaults/main.yml | 2 +- roles/wazuh/ansible-wazuh-manager/defaults/main.yml | 2 +- roles/wazuh/check-packages/defaults/main.yml | 2 +- roles/wazuh/vars/repo.yml | 2 +- roles/wazuh/vars/repo_pre-release.yml | 2 +- roles/wazuh/vars/repo_staging.yml | 2 +- roles/wazuh/wazuh-dashboard/defaults/main.yml | 4 ++-- roles/wazuh/wazuh-dashboard/vars/debian.yml | 2 +- roles/wazuh/wazuh-indexer/defaults/main.yml | 2 +- 13 files changed, 16 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a52b0dd..98bcb051 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,22 +1,16 @@ # Change Log All notable changes to this project will be documented in this file. -## [v4.10.3] +## [v4.12.0] ### Added -- Update to [Wazuh v4.10.3](https://github.com/wazuh/wazuh/blob/v4.10.3/CHANGELOG.md#v4103) +- Update to [Wazuh v4.12.0](https://github.com/wazuh/wazuh/blob/v4.12.0/CHANGELOG.md#v4120) ### Changed - Use fixed version of Ubuntu-22.04 in GHA runners instead of latest version ([#1479](https://github.com/wazuh/wazuh-ansible/pull/1479)) \- (PR Checks Workflows) -## [v4.10.2] - -### Added - -- Update to [Wazuh v4.10.2](https://github.com/wazuh/wazuh/blob/v4.10.2/CHANGELOG.md#v4102) - ## [v4.10.1] ### Added diff --git a/README.md b/README.md index fa415bd4..c98d0caa 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ These playbooks install and configure Wazuh agent, manager and indexer and dashb | Wazuh version | Elastic | ODFE | |---------------|---------|--------| +| v4.12.0 | | | | v4.10.3 | | | | v4.10.2 | | | | v4.10.1 | | | diff --git a/VERSION b/VERSION index f770ea47..a04f9d1f 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-ANSIBLE_VERSION="v4.10.3" -REVISION="41030" +WAZUH-ANSIBLE_VERSION="v4.12.0" +REVISION="41200" diff --git a/roles/wazuh/ansible-filebeat-oss/defaults/main.yml b/roles/wazuh/ansible-filebeat-oss/defaults/main.yml index 5f2645a9..499ab5d0 100644 --- a/roles/wazuh/ansible-filebeat-oss/defaults/main.yml +++ b/roles/wazuh/ansible-filebeat-oss/defaults/main.yml @@ -1,7 +1,7 @@ --- filebeat_version: 7.10.2 -wazuh_template_branch: v4.10.3 +wazuh_template_branch: v4.12.0 filebeat_node_name: node-1 diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index 7a512ba9..43b125db 100644 --- a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml @@ -1,5 +1,5 @@ --- -wazuh_agent_version: 4.10.3 +wazuh_agent_version: 4.12.0 # Custom packages installation diff --git a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml index 026ee229..5990b3b7 100644 --- a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml @@ -1,5 +1,5 @@ --- -wazuh_manager_version: 4.10.3 +wazuh_manager_version: 4.12.0 wazuh_manager_fqdn: "wazuh-server" wazuh_manager_package_state: present diff --git a/roles/wazuh/check-packages/defaults/main.yml b/roles/wazuh/check-packages/defaults/main.yml index 16513361..2a574cb4 100644 --- a/roles/wazuh/check-packages/defaults/main.yml +++ b/roles/wazuh/check-packages/defaults/main.yml @@ -1,2 +1,2 @@ --- -wazuh_version: 4.10.3 +wazuh_version: 4.12.0 diff --git a/roles/wazuh/vars/repo.yml b/roles/wazuh/vars/repo.yml index 9ec6815e..bddab500 100644 --- a/roles/wazuh/vars/repo.yml +++ b/roles/wazuh/vars/repo.yml @@ -14,7 +14,7 @@ wazuh_macos_arm_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.arm64.pkg wazuh_macos_intel_package_url: "https://packages.wazuh.com/4.x/macos/{{ wazuh_macos_intel_package_name }}" wazuh_macos_arm_package_url: "https://packages.wazuh.com/4.x/macos/{{ wazuh_macos_arm_package_name }}" -certs_gen_tool_version: "4.10" +certs_gen_tool_version: "4.12" # Url of certificates generator tool certs_gen_tool_url: "https://packages.wazuh.com/{{ certs_gen_tool_version }}/wazuh-certs-tool.sh" diff --git a/roles/wazuh/vars/repo_pre-release.yml b/roles/wazuh/vars/repo_pre-release.yml index 922f32c3..4a7c2558 100644 --- a/roles/wazuh/vars/repo_pre-release.yml +++ b/roles/wazuh/vars/repo_pre-release.yml @@ -14,7 +14,7 @@ wazuh_macos_arm_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.arm64.pkg wazuh_macos_intel_package_url: "https://packages-dev.wazuh.com/pre-release/{{ wazuh_macos_intel_package_name }}" wazuh_macos_arm_package_url: "https://packages-dev.wazuh.com/pre-release/macos/{{ wazuh_macos_arm_package_name }}" -certs_gen_tool_version: "4.10" +certs_gen_tool_version: "4.12" # Url of certificates generator tool certs_gen_tool_url: "https://packages-dev.wazuh.com/{{ certs_gen_tool_version }}/wazuh-certs-tool.sh" diff --git a/roles/wazuh/vars/repo_staging.yml b/roles/wazuh/vars/repo_staging.yml index c073a4e0..4e91443f 100644 --- a/roles/wazuh/vars/repo_staging.yml +++ b/roles/wazuh/vars/repo_staging.yml @@ -15,7 +15,7 @@ wazuh_macos_arm_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.arm64.pkg wazuh_macos_intel_package_url: "https://packages-dev.wazuh.com/staging/macos/{{ wazuh_macos_intel_package_name }}" wazuh_macos_arm_package_url: "https://packages-dev.wazuh.com/staging/macos/{{ wazuh_macos_arm_package_name }}" -certs_gen_tool_version: "4.10" +certs_gen_tool_version: "4.12" # Url of certificates generator tool certs_gen_tool_url: "https://packages-dev.wazuh.com/{{ certs_gen_tool_version }}/wazuh-certs-tool.sh" diff --git a/roles/wazuh/wazuh-dashboard/defaults/main.yml b/roles/wazuh/wazuh-dashboard/defaults/main.yml index b6506cb4..6f157dd8 100644 --- a/roles/wazuh/wazuh-dashboard/defaults/main.yml +++ b/roles/wazuh/wazuh-dashboard/defaults/main.yml @@ -8,12 +8,12 @@ dashboard_node_name: node-1 dashboard_server_host: "0.0.0.0" dashboard_server_port: "443" dashboard_server_name: "dashboard" -wazuh_version: 4.10.3 +wazuh_version: 4.12.0 indexer_cluster_nodes: - 127.0.0.1 # The Wazuh dashboard package repository -dashboard_version: "4.10.3" +dashboard_version: "4.12.0" # API credentials wazuh_api_credentials: diff --git a/roles/wazuh/wazuh-dashboard/vars/debian.yml b/roles/wazuh/wazuh-dashboard/vars/debian.yml index 54e83bb6..cfc784c4 100644 --- a/roles/wazuh/wazuh-dashboard/vars/debian.yml +++ b/roles/wazuh/wazuh-dashboard/vars/debian.yml @@ -1,2 +1,2 @@ --- -dashboard_version: 4.10.3 +dashboard_version: 4.12.0 diff --git a/roles/wazuh/wazuh-indexer/defaults/main.yml b/roles/wazuh/wazuh-indexer/defaults/main.yml index 8c074396..0ff28806 100644 --- a/roles/wazuh/wazuh-indexer/defaults/main.yml +++ b/roles/wazuh/wazuh-indexer/defaults/main.yml @@ -1,6 +1,6 @@ --- # Cluster Settings -indexer_version: 4.10.3 +indexer_version: 4.12.0 single_node: false indexer_node_name: node-1 From d094df0158ee778bdb75a183f9afeab25108cf7a Mon Sep 17 00:00:00 2001 From: Jesus Garcia Date: Mon, 20 Jan 2025 10:07:06 -0500 Subject: [PATCH 6/8] Remove parameter 'warn: false' from ansible roles --- roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml | 2 +- roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml | 2 +- roles/wazuh/check-packages/tasks/main.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml b/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml index 4d232711..043ad9ae 100644 --- a/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml +++ b/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml @@ -30,7 +30,7 @@ set -o pipefail curl -s {{ wazuh_agent_config.repo.gpg }} | apt-key add - args: - warn: false + # warn: false executable: /bin/bash changed_when: false when: diff --git a/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml b/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml index 347d5203..fdbfddee 100644 --- a/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml +++ b/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml @@ -18,7 +18,7 @@ set -o pipefail curl -s {{ wazuh_manager_config.repo.gpg }} | apt-key add - args: - warn: false + # warn: false executable: /bin/bash changed_when: false when: diff --git a/roles/wazuh/check-packages/tasks/main.yml b/roles/wazuh/check-packages/tasks/main.yml index bbee623b..467657da 100644 --- a/roles/wazuh/check-packages/tasks/main.yml +++ b/roles/wazuh/check-packages/tasks/main.yml @@ -3,7 +3,7 @@ shell: | ./check_packages.sh {{ wazuh_version }} args: - warn: false + # warn: false executable: /bin/bash chdir: "{{ role_path }}/scripts/" delegate_to: localhost From 7a4d21649744b6ebfbd24329ec402bb307d1e204 Mon Sep 17 00:00:00 2001 From: Jesus Garcia Date: Tue, 21 Jan 2025 09:44:14 -0500 Subject: [PATCH 7/8] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a52b0dd..bfc87edc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file. ### Changed - Use fixed version of Ubuntu-22.04 in GHA runners instead of latest version ([#1479](https://github.com/wazuh/wazuh-ansible/pull/1479)) \- (PR Checks Workflows) +- Implement minor changes for Wazuh ansible arm64 support ([#1518](https://github.com/wazuh/wazuh-ansible/pull/1518)) ## [v4.10.2] From 856f9b3edff5eefbc2871e0f63455cfffafaf5b5 Mon Sep 17 00:00:00 2001 From: Jesus Garcia Date: Mon, 17 Feb 2025 10:50:43 -0500 Subject: [PATCH 8/8] Standardize version file format to VERSION.json --- CHANGELOG.md | 1 + README.md | 2 +- VERSION | 2 -- VERSION.json | 4 ++++ 4 files changed, 6 insertions(+), 3 deletions(-) delete mode 100644 VERSION create mode 100644 VERSION.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 71466789..26a6469d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file. ### Changed +- Standardize version file format ([#1553](https://github.com/wazuh/wazuh-ansible/pull/1553)) - Use fixed version of Ubuntu-22.04 in GHA runners instead of latest version ([#1479](https://github.com/wazuh/wazuh-ansible/pull/1479)) \- (PR Checks Workflows) - Implement minor changes for Wazuh ansible arm64 support ([#1518](https://github.com/wazuh/wazuh-ansible/pull/1518)) diff --git a/README.md b/README.md index 51372c98..0f5acfce 100644 --- a/README.md +++ b/README.md @@ -98,7 +98,7 @@ These playbooks install and configure Wazuh agent, manager and indexer and dashb │ │ ├── wazuh-single.yml │ │ ├── README.md - │ ├── VERSION + │ ├── VERSION.json │ ├── CHANGELOG.md ## Example: production-ready distributed environment diff --git a/VERSION b/VERSION deleted file mode 100644 index a04f9d1f..00000000 --- a/VERSION +++ /dev/null @@ -1,2 +0,0 @@ -WAZUH-ANSIBLE_VERSION="v4.12.0" -REVISION="41200" diff --git a/VERSION.json b/VERSION.json new file mode 100644 index 00000000..23a3b07a --- /dev/null +++ b/VERSION.json @@ -0,0 +1,4 @@ +{ + "version": "4.12.0", + "stage": "alpha0" +}