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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 8cf1c16d..7862dc47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,26 @@ # Change Log All notable changes to this project will be documented in this file. +## [v4.12.0] + +### Added + +- Update to [Wazuh v4.12.0](https://github.com/wazuh/wazuh/blob/v4.12.0/CHANGELOG.md#v4120) + +### 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)) + +### Fixed + +- None + +### Deleted + +- None + ## [4.11.2] ### Added diff --git a/README.md b/README.md index be378341..89d24022 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.11.2 | | | | v4.11.1 | | | | v4.11.0 | | | @@ -99,7 +100,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 63f9bf21..00000000 --- a/VERSION +++ /dev/null @@ -1,2 +0,0 @@ -WAZUH-ANSIBLE_VERSION="v4.11.2" -REVISION="41122" 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" +} diff --git a/roles/wazuh/ansible-filebeat-oss/defaults/main.yml b/roles/wazuh/ansible-filebeat-oss/defaults/main.yml index 34617ab5..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.11.2 +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 99ff2708..43b125db 100644 --- a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml @@ -1,5 +1,6 @@ --- -wazuh_agent_version: 4.11.2 +wazuh_agent_version: 4.12.0 + # Custom packages installation wazuh_custom_packages_installation_agent_enabled: false 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/defaults/main.yml b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml index e15176ab..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.11.2 +wazuh_manager_version: 4.12.0 wazuh_manager_fqdn: "wazuh-server" wazuh_manager_package_state: present 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/defaults/main.yml b/roles/wazuh/check-packages/defaults/main.yml index 32f9a93c..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.11.2 +wazuh_version: 4.12.0 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 diff --git a/roles/wazuh/vars/repo.yml b/roles/wazuh/vars/repo.yml index b8d3ad5f..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.11" +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 2322b747..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.11" +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 1fcd090f..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.11" +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 bd6cf590..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.11.2 +wazuh_version: 4.12.0 indexer_cluster_nodes: - 127.0.0.1 # The Wazuh dashboard package repository -dashboard_version: "4.11.2" +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 7f94121e..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.11.2 +dashboard_version: 4.12.0 diff --git a/roles/wazuh/wazuh-indexer/defaults/main.yml b/roles/wazuh/wazuh-indexer/defaults/main.yml index 767c926d..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.11.2 +indexer_version: 4.12.0 single_node: false indexer_node_name: node-1