From 7f1579dcd173de3fd20e90368d06b9b82e9169d8 Mon Sep 17 00:00:00 2001 From: Jesus Garcia Date: Fri, 17 Jan 2025 08:11:12 -0500 Subject: [PATCH 1/4] Add lock_timeout to yum tasks for improved package installation reliability --- CHANGELOG.md | 2 +- roles/wazuh/ansible-filebeat-oss/tasks/main.yml | 3 ++- .../tasks/installation_from_custom_packages.yml | 1 + roles/wazuh/ansible-wazuh-manager/tasks/RedHat.yml | 5 ++++- .../tasks/installation_from_custom_packages.yml | 1 + roles/wazuh/wazuh-indexer/tasks/RedHat.yml | 5 ++++- 6 files changed, 13 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9ac04a3..b30180d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ All notable changes to this project will be documented in this file. ### Changed -- None +- Add Yum lock timeout to Ansible task ([#1511](https://github.com/wazuh/wazuh-ansible/pull/1511)) ### Fixed diff --git a/roles/wazuh/ansible-filebeat-oss/tasks/main.yml b/roles/wazuh/ansible-filebeat-oss/tasks/main.yml index 0e47cb3b..d4255a68 100644 --- a/roles/wazuh/ansible-filebeat-oss/tasks/main.yml +++ b/roles/wazuh/ansible-filebeat-oss/tasks/main.yml @@ -17,6 +17,7 @@ yum: name: "filebeat-{{ filebeat_version }}" state: present + lock_timeout: 200 register: install tags: - install @@ -31,7 +32,7 @@ tags: - install - init - until: "install is not failed" + until: "install is not failed" retries: 10 delay: 10 when: ansible_os_family == 'Debian' diff --git a/roles/wazuh/ansible-wazuh-agent/tasks/installation_from_custom_packages.yml b/roles/wazuh/ansible-wazuh-agent/tasks/installation_from_custom_packages.yml index aa50004f..99103f29 100644 --- a/roles/wazuh/ansible-wazuh-agent/tasks/installation_from_custom_packages.yml +++ b/roles/wazuh/ansible-wazuh-agent/tasks/installation_from_custom_packages.yml @@ -11,6 +11,7 @@ yum: name: "{{ wazuh_custom_packages_installation_agent_rpm_url }}" state: present + lock_timeout: 200 when: - ansible_os_family|lower == "redhat" - wazuh_custom_packages_installation_agent_enabled diff --git a/roles/wazuh/ansible-wazuh-manager/tasks/RedHat.yml b/roles/wazuh/ansible-wazuh-manager/tasks/RedHat.yml index d652c26f..eb50c4e1 100644 --- a/roles/wazuh/ansible-wazuh-manager/tasks/RedHat.yml +++ b/roles/wazuh/ansible-wazuh-manager/tasks/RedHat.yml @@ -62,7 +62,10 @@ - wazuh_manager_config.cluster.disable != 'yes' - name: RedHat/CentOS/Fedora | Install OpenJDK 1.8 - yum: name=java-1.8.0-openjdk state=present + yum: + name: java-1.8.0-openjdk + state: present + lock_timeout: 200 when: - wazuh_manager_config.cis_cat.disable == 'no' - wazuh_manager_config.cis_cat.install_java == 'yes' diff --git a/roles/wazuh/ansible-wazuh-manager/tasks/installation_from_custom_packages.yml b/roles/wazuh/ansible-wazuh-manager/tasks/installation_from_custom_packages.yml index e238ad0f..e52d1e8a 100644 --- a/roles/wazuh/ansible-wazuh-manager/tasks/installation_from_custom_packages.yml +++ b/roles/wazuh/ansible-wazuh-manager/tasks/installation_from_custom_packages.yml @@ -14,6 +14,7 @@ yum: name: "{{ wazuh_custom_packages_installation_manager_rpm_url }}" state: present + lock_timeout: 200 when: - wazuh_custom_packages_installation_manager_enabled - not (ansible_distribution|lower == "centos" and ansible_distribution_major_version >= "8") diff --git a/roles/wazuh/wazuh-indexer/tasks/RedHat.yml b/roles/wazuh/wazuh-indexer/tasks/RedHat.yml index 59175213..c2a9c54d 100644 --- a/roles/wazuh/wazuh-indexer/tasks/RedHat.yml +++ b/roles/wazuh/wazuh-indexer/tasks/RedHat.yml @@ -18,7 +18,8 @@ yum: name: amazon-linux-extras state: present - when: + lock_timeout: 200 + when: - ansible_distribution == 'Amazon' - ansible_distribution_major_version == '2' @@ -40,6 +41,8 @@ - name: RedHat/CentOS/Fedora | Install Indexer dependencies yum: name: "{{ packages }}" + state: present + lock_timeout: 200 vars: packages: - wget From bf67bd9be619facc39219209f4d96ec7c77c482f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Fri, 17 Jan 2025 15:30:49 -0300 Subject: [PATCH 2/4] Bump to 4.10.2 --- CHANGELOG.md | 18 ++++++++++++++++++ README.md | 1 + VERSION | 4 ++-- .../ansible-filebeat-oss/defaults/main.yml | 2 +- .../ansible-wazuh-agent/defaults/main.yml | 2 +- .../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, 29 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41107efb..68457a91 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.10.2] + +### Added + +- none + +### Changed + +- None + +### Fixed + +- None + +### Deleted + +- None + ## [4.10.1] ### Added diff --git a/README.md b/README.md index 10451bf7..ed99a105 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.2 | | | diff --git a/VERSION b/VERSION index f7edd2f3..6091366b 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-ANSIBLE_VERSION="v4.10.1" -REVISION="41011" +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 b72e80ba839c16ea99750377589cdab9446885d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Fri, 24 Jan 2025 08:56:11 -0300 Subject: [PATCH 3/4] Revision bump --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 7083e06e..8197aa78 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-ANSIBLE_VERSION="v4.11.0" -REVISION="41100" +REVISION="41101" From 7abc5bbac1b58e2d990e3b1ca69db40fdd6a3b77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Anguita=20L=C3=B3pez?= Date: Tue, 4 Feb 2025 13:12:43 +0100 Subject: [PATCH 4/4] updated changelog and readme deleting 4.10.2 references --- CHANGELOG.md | 18 ------------------ README.md | 1 - 2 files changed, 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 62ccb42d..bbdc0728 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,24 +19,6 @@ All notable changes to this project will be documented in this file. - None -## [4.10.2] - -### Added - -- None - -### Changed - -- None - -### Fixed - -- None - -### Deleted - -- None - ## [v4.10.1] ### Added diff --git a/README.md b/README.md index 16dfb494..8b3c572c 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,6 @@ These playbooks install and configure Wazuh agent, manager and indexer and dashb | Wazuh version | Elastic | ODFE | |---------------|---------|--------| | v4.11.0 | | | -| v4.10.2 | | | | v4.10.1 | | | | v4.10.0 | | | | v4.9.2 | | |