From e2a692bc2524ca57b5831ac130c3748d3e4e00fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Thu, 20 Jun 2024 11:48:40 +0200 Subject: [PATCH 01/29] fix: remove hardcoded branch --- provisioning/roles/wazuh/ansible-wazuh-agent/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provisioning/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/provisioning/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index 4e0477cd35..dc552df3d2 100644 --- a/provisioning/roles/wazuh/ansible-wazuh-agent/defaults/main.yml +++ b/provisioning/roles/wazuh/ansible-wazuh-agent/defaults/main.yml @@ -1,6 +1,6 @@ --- -wazuh_agent_version: 4.8.0 +wazuh_agent_version: "{{ wazuh_version }}" # Custom packages installation From 365b76b3db96c95a6915661533fe1ab6071002bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Thu, 20 Jun 2024 12:03:14 +0200 Subject: [PATCH 02/29] fix: remove hardcoded branch --- .../roles/wazuh/ansible-wazuh-manager/defaults/main.yml | 2 +- provisioning/roles/wazuh/check-packages/defaults/main.yml | 2 +- provisioning/roles/wazuh/wazuh-dashboard/defaults/main.yml | 4 ++-- provisioning/roles/wazuh/wazuh-dashboard/vars/debian.yml | 2 +- provisioning/roles/wazuh/wazuh-indexer/defaults/main.yml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/provisioning/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/provisioning/roles/wazuh/ansible-wazuh-manager/defaults/main.yml index 78bf48dfd7..eb8aef556b 100644 --- a/provisioning/roles/wazuh/ansible-wazuh-manager/defaults/main.yml +++ b/provisioning/roles/wazuh/ansible-wazuh-manager/defaults/main.yml @@ -1,6 +1,6 @@ --- -wazuh_manager_version: 4.8.0 +wazuh_manager_version: "{{ wazuh_version }}" wazuh_manager_fqdn: "wazuh-server" wazuh_manager_package_state: present diff --git a/provisioning/roles/wazuh/check-packages/defaults/main.yml b/provisioning/roles/wazuh/check-packages/defaults/main.yml index 7a91513886..5fea276baa 100644 --- a/provisioning/roles/wazuh/check-packages/defaults/main.yml +++ b/provisioning/roles/wazuh/check-packages/defaults/main.yml @@ -1,2 +1,2 @@ --- -wazuh_version: 4.8.0 +wazuh_version: "{{ wazuh_version }}" diff --git a/provisioning/roles/wazuh/wazuh-dashboard/defaults/main.yml b/provisioning/roles/wazuh/wazuh-dashboard/defaults/main.yml index d26912bfa2..016741807c 100644 --- a/provisioning/roles/wazuh/wazuh-dashboard/defaults/main.yml +++ b/provisioning/roles/wazuh/wazuh-dashboard/defaults/main.yml @@ -13,12 +13,12 @@ dashboard_node_name: node-1 dashboard_server_host: "0.0.0.0" dashboard_server_port: "443" dashboard_server_name: "dashboard" -wazuh_version: 4.8.0 +wazuh_version: "{{ wazuh_version }}" indexer_cluster_nodes: - 127.0.0.1 # The Wazuh dashboard package repository -dashboard_version: "4.8.0" +dashboard_version: "{{ wazuh_version }}" # API credentials wazuh_api_credentials: diff --git a/provisioning/roles/wazuh/wazuh-dashboard/vars/debian.yml b/provisioning/roles/wazuh/wazuh-dashboard/vars/debian.yml index ad178fecc1..2131a9c154 100644 --- a/provisioning/roles/wazuh/wazuh-dashboard/vars/debian.yml +++ b/provisioning/roles/wazuh/wazuh-dashboard/vars/debian.yml @@ -1,2 +1,2 @@ --- -dashboard_version: 4.8.0 +dashboard_version: "{{ wazuh_version }}" diff --git a/provisioning/roles/wazuh/wazuh-indexer/defaults/main.yml b/provisioning/roles/wazuh/wazuh-indexer/defaults/main.yml index d073abbaac..0f2d8d75d6 100644 --- a/provisioning/roles/wazuh/wazuh-indexer/defaults/main.yml +++ b/provisioning/roles/wazuh/wazuh-indexer/defaults/main.yml @@ -5,7 +5,7 @@ wazuh_custom_packages_installation_indexer_deb_url: "" wazuh_custom_packages_installation_indexer_rpm_url: "" # Cluster Settings -indexer_version: 4.8.0 +indexer_version: "{{ wazuh_version }}" single_node: false indexer_node_name: node-1 From 40c0a94c05d9c12c7fa28bf287e74572e8df5dfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Mon, 24 Jun 2024 11:23:36 +0200 Subject: [PATCH 03/29] fix: remove hardcode branch reference --- provisioning/roles/wazuh/ansible-filebeat-oss/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provisioning/roles/wazuh/ansible-filebeat-oss/defaults/main.yml b/provisioning/roles/wazuh/ansible-filebeat-oss/defaults/main.yml index affd0222ab..e0063bdfa5 100644 --- a/provisioning/roles/wazuh/ansible-filebeat-oss/defaults/main.yml +++ b/provisioning/roles/wazuh/ansible-filebeat-oss/defaults/main.yml @@ -1,7 +1,7 @@ --- filebeat_version: 7.10.2 -wazuh_template_branch: 4.8.1 +wazuh_template_branch: "v{{ wazuh_version }}" filebeat_node_name: node-1 From 1c333bb67d4333b813d6009b5d7fdb736aaec191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Mon, 24 Jun 2024 13:27:20 +0200 Subject: [PATCH 04/29] fix: temporal removal of macos --- provisioning/environments/e2e_vulnerability_detector.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/provisioning/environments/e2e_vulnerability_detector.yaml b/provisioning/environments/e2e_vulnerability_detector.yaml index f0fe3aff01..4097e4e793 100644 --- a/provisioning/environments/e2e_vulnerability_detector.yaml +++ b/provisioning/environments/e2e_vulnerability_detector.yaml @@ -34,9 +34,3 @@ agent5: os: ubuntu_22 manager: manager2 architecture: arm64v8 - -agent6: - roles: [agent] - os: macos_1400 - manager: manager1 - architecture: arm64v8 From 70f17242ff437be1ddfdf3a5e2117b69301715ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Mon, 24 Jun 2024 14:13:40 +0200 Subject: [PATCH 05/29] fix: add debug task --- .../roles/wazuh/ansible-filebeat-oss/tasks/config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/provisioning/roles/wazuh/ansible-filebeat-oss/tasks/config.yml b/provisioning/roles/wazuh/ansible-filebeat-oss/tasks/config.yml index c6dcbe942d..d034b1083e 100644 --- a/provisioning/roles/wazuh/ansible-filebeat-oss/tasks/config.yml +++ b/provisioning/roles/wazuh/ansible-filebeat-oss/tasks/config.yml @@ -9,6 +9,10 @@ mode: 0400 notify: restart filebeat + - name: Debug Wazuh version and template branch + debug: + msg: "Wazuh version is '{{ wazuh_version }}', Template branch is '{{ wazuh_template_branch }}'" + - name: Fetch latest Wazuh alerts template get_url: url: https://raw.githubusercontent.com/wazuh/wazuh/{{ wazuh_template_branch }}/extensions/elasticsearch/7.x/wazuh-template.json From ed291d2744c482af7ba12b72436150dee738fe57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Mon, 24 Jun 2024 15:26:42 +0200 Subject: [PATCH 06/29] fix: capital letters --- .../roles/wazuh/ansible-filebeat-oss/defaults/main.yml | 2 +- .../roles/wazuh/ansible-filebeat-oss/tasks/config.yml | 2 +- .../roles/wazuh/ansible-wazuh-agent/defaults/main.yml | 2 +- .../roles/wazuh/ansible-wazuh-manager/defaults/main.yml | 2 +- provisioning/roles/wazuh/check-packages/defaults/main.yml | 2 +- provisioning/roles/wazuh/check-packages/tasks/main.yml | 3 +-- provisioning/roles/wazuh/wazuh-dashboard/defaults/main.yml | 4 ++-- provisioning/roles/wazuh/wazuh-dashboard/vars/debian.yml | 2 +- provisioning/roles/wazuh/wazuh-indexer/defaults/main.yml | 2 +- 9 files changed, 10 insertions(+), 11 deletions(-) diff --git a/provisioning/roles/wazuh/ansible-filebeat-oss/defaults/main.yml b/provisioning/roles/wazuh/ansible-filebeat-oss/defaults/main.yml index e0063bdfa5..69fe87e632 100644 --- a/provisioning/roles/wazuh/ansible-filebeat-oss/defaults/main.yml +++ b/provisioning/roles/wazuh/ansible-filebeat-oss/defaults/main.yml @@ -1,7 +1,7 @@ --- filebeat_version: 7.10.2 -wazuh_template_branch: "v{{ wazuh_version }}" +wazuh_template_branch: "v{{ WAZUH_VERSION }}" filebeat_node_name: node-1 diff --git a/provisioning/roles/wazuh/ansible-filebeat-oss/tasks/config.yml b/provisioning/roles/wazuh/ansible-filebeat-oss/tasks/config.yml index d034b1083e..76a39c561b 100644 --- a/provisioning/roles/wazuh/ansible-filebeat-oss/tasks/config.yml +++ b/provisioning/roles/wazuh/ansible-filebeat-oss/tasks/config.yml @@ -11,7 +11,7 @@ - name: Debug Wazuh version and template branch debug: - msg: "Wazuh version is '{{ wazuh_version }}', Template branch is '{{ wazuh_template_branch }}'" + msg: "Wazuh version is '{{ WAZUH_VERSION }}', Template branch is '{{ wazuh_template_branch }}'" - name: Fetch latest Wazuh alerts template get_url: diff --git a/provisioning/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/provisioning/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index dc552df3d2..9866676097 100644 --- a/provisioning/roles/wazuh/ansible-wazuh-agent/defaults/main.yml +++ b/provisioning/roles/wazuh/ansible-wazuh-agent/defaults/main.yml @@ -1,6 +1,6 @@ --- -wazuh_agent_version: "{{ wazuh_version }}" +wazuh_agent_version: "{{ WAZUH_VERSION }}" # Custom packages installation diff --git a/provisioning/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/provisioning/roles/wazuh/ansible-wazuh-manager/defaults/main.yml index eb8aef556b..3c07824b3b 100644 --- a/provisioning/roles/wazuh/ansible-wazuh-manager/defaults/main.yml +++ b/provisioning/roles/wazuh/ansible-wazuh-manager/defaults/main.yml @@ -1,6 +1,6 @@ --- -wazuh_manager_version: "{{ wazuh_version }}" +wazuh_manager_version: "{{ WAZUH_VERSION }}" wazuh_manager_fqdn: "wazuh-server" wazuh_manager_package_state: present diff --git a/provisioning/roles/wazuh/check-packages/defaults/main.yml b/provisioning/roles/wazuh/check-packages/defaults/main.yml index 5fea276baa..182ea3d74a 100644 --- a/provisioning/roles/wazuh/check-packages/defaults/main.yml +++ b/provisioning/roles/wazuh/check-packages/defaults/main.yml @@ -1,2 +1,2 @@ --- -wazuh_version: "{{ wazuh_version }}" +wazuh_version: "{{ WAZUH_VERSION }}" diff --git a/provisioning/roles/wazuh/check-packages/tasks/main.yml b/provisioning/roles/wazuh/check-packages/tasks/main.yml index bbee623b55..fef31283af 100644 --- a/provisioning/roles/wazuh/check-packages/tasks/main.yml +++ b/provisioning/roles/wazuh/check-packages/tasks/main.yml @@ -1,11 +1,10 @@ --- - name: Check packages shell: | - ./check_packages.sh {{ wazuh_version }} + ./check_packages.sh {{ WAZUH_VERSION }} args: warn: false executable: /bin/bash chdir: "{{ role_path }}/scripts/" delegate_to: localhost become: no - diff --git a/provisioning/roles/wazuh/wazuh-dashboard/defaults/main.yml b/provisioning/roles/wazuh/wazuh-dashboard/defaults/main.yml index 016741807c..dd255698c1 100644 --- a/provisioning/roles/wazuh/wazuh-dashboard/defaults/main.yml +++ b/provisioning/roles/wazuh/wazuh-dashboard/defaults/main.yml @@ -13,12 +13,12 @@ dashboard_node_name: node-1 dashboard_server_host: "0.0.0.0" dashboard_server_port: "443" dashboard_server_name: "dashboard" -wazuh_version: "{{ wazuh_version }}" +wazuh_version: "{{ WAZUH_VERSION }}" indexer_cluster_nodes: - 127.0.0.1 # The Wazuh dashboard package repository -dashboard_version: "{{ wazuh_version }}" +dashboard_version: "{{ WAZUH_VERSION }}" # API credentials wazuh_api_credentials: diff --git a/provisioning/roles/wazuh/wazuh-dashboard/vars/debian.yml b/provisioning/roles/wazuh/wazuh-dashboard/vars/debian.yml index 2131a9c154..d5cabb87e0 100644 --- a/provisioning/roles/wazuh/wazuh-dashboard/vars/debian.yml +++ b/provisioning/roles/wazuh/wazuh-dashboard/vars/debian.yml @@ -1,2 +1,2 @@ --- -dashboard_version: "{{ wazuh_version }}" +dashboard_version: "{{ WAZUH_VERSION }}" diff --git a/provisioning/roles/wazuh/wazuh-indexer/defaults/main.yml b/provisioning/roles/wazuh/wazuh-indexer/defaults/main.yml index 0f2d8d75d6..11204e1e0e 100644 --- a/provisioning/roles/wazuh/wazuh-indexer/defaults/main.yml +++ b/provisioning/roles/wazuh/wazuh-indexer/defaults/main.yml @@ -5,7 +5,7 @@ wazuh_custom_packages_installation_indexer_deb_url: "" wazuh_custom_packages_installation_indexer_rpm_url: "" # Cluster Settings -indexer_version: "{{ wazuh_version }}" +indexer_version: "{{ WAZUH_VERSION }}" single_node: false indexer_node_name: node-1 From 995d39bc6535833ebe52f6a49afc6dd65685158b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Mon, 24 Jun 2024 16:51:28 +0200 Subject: [PATCH 07/29] fix: remove debug println --- .../roles/wazuh/ansible-filebeat-oss/tasks/config.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/provisioning/roles/wazuh/ansible-filebeat-oss/tasks/config.yml b/provisioning/roles/wazuh/ansible-filebeat-oss/tasks/config.yml index 76a39c561b..c6dcbe942d 100644 --- a/provisioning/roles/wazuh/ansible-filebeat-oss/tasks/config.yml +++ b/provisioning/roles/wazuh/ansible-filebeat-oss/tasks/config.yml @@ -9,10 +9,6 @@ mode: 0400 notify: restart filebeat - - name: Debug Wazuh version and template branch - debug: - msg: "Wazuh version is '{{ WAZUH_VERSION }}', Template branch is '{{ wazuh_template_branch }}'" - - name: Fetch latest Wazuh alerts template get_url: url: https://raw.githubusercontent.com/wazuh/wazuh/{{ wazuh_template_branch }}/extensions/elasticsearch/7.x/wazuh-template.json From 9ff2f5b5e55174b32f49b42ae75f856d7c9a39ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Tue, 25 Jun 2024 11:52:34 +0200 Subject: [PATCH 08/29] fix: change variable name --- .../roles/wazuh/ansible-wazuh-agent/defaults/main.yml | 2 +- .../roles/wazuh/ansible-wazuh-manager/defaults/main.yml | 2 +- provisioning/roles/wazuh/check-packages/defaults/main.yml | 2 +- provisioning/roles/wazuh/wazuh-dashboard/defaults/main.yml | 4 ++-- provisioning/roles/wazuh/wazuh-dashboard/vars/debian.yml | 2 +- provisioning/roles/wazuh/wazuh-indexer/defaults/main.yml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/provisioning/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/provisioning/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index 9866676097..aa07edda8b 100644 --- a/provisioning/roles/wazuh/ansible-wazuh-agent/defaults/main.yml +++ b/provisioning/roles/wazuh/ansible-wazuh-agent/defaults/main.yml @@ -1,6 +1,6 @@ --- -wazuh_agent_version: "{{ WAZUH_VERSION }}" +wazuh_agent_version: "{{ WAZUH_VERSION_REFERENCE }}" # Custom packages installation diff --git a/provisioning/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/provisioning/roles/wazuh/ansible-wazuh-manager/defaults/main.yml index 3c07824b3b..af21570ba6 100644 --- a/provisioning/roles/wazuh/ansible-wazuh-manager/defaults/main.yml +++ b/provisioning/roles/wazuh/ansible-wazuh-manager/defaults/main.yml @@ -1,6 +1,6 @@ --- -wazuh_manager_version: "{{ WAZUH_VERSION }}" +wazuh_manager_version: "{{ WAZUH_VERSION_REFERENCE }}" wazuh_manager_fqdn: "wazuh-server" wazuh_manager_package_state: present diff --git a/provisioning/roles/wazuh/check-packages/defaults/main.yml b/provisioning/roles/wazuh/check-packages/defaults/main.yml index 182ea3d74a..1e6d123c07 100644 --- a/provisioning/roles/wazuh/check-packages/defaults/main.yml +++ b/provisioning/roles/wazuh/check-packages/defaults/main.yml @@ -1,2 +1,2 @@ --- -wazuh_version: "{{ WAZUH_VERSION }}" +wazuh_version: "{{ WAZUH_VERSION_REFERENCE }}" diff --git a/provisioning/roles/wazuh/wazuh-dashboard/defaults/main.yml b/provisioning/roles/wazuh/wazuh-dashboard/defaults/main.yml index dd255698c1..e78d90e0df 100644 --- a/provisioning/roles/wazuh/wazuh-dashboard/defaults/main.yml +++ b/provisioning/roles/wazuh/wazuh-dashboard/defaults/main.yml @@ -13,12 +13,12 @@ dashboard_node_name: node-1 dashboard_server_host: "0.0.0.0" dashboard_server_port: "443" dashboard_server_name: "dashboard" -wazuh_version: "{{ WAZUH_VERSION }}" +wazuh_version: "{{ WAZUH_VERSION_REFERENCE }}" indexer_cluster_nodes: - 127.0.0.1 # The Wazuh dashboard package repository -dashboard_version: "{{ WAZUH_VERSION }}" +dashboard_version: "{{ WAZUH_VERSION_REFERENCE }}" # API credentials wazuh_api_credentials: diff --git a/provisioning/roles/wazuh/wazuh-dashboard/vars/debian.yml b/provisioning/roles/wazuh/wazuh-dashboard/vars/debian.yml index d5cabb87e0..a65a45bed2 100644 --- a/provisioning/roles/wazuh/wazuh-dashboard/vars/debian.yml +++ b/provisioning/roles/wazuh/wazuh-dashboard/vars/debian.yml @@ -1,2 +1,2 @@ --- -dashboard_version: "{{ WAZUH_VERSION }}" +dashboard_version: "{{ WAZUH_VERSION_REFERENCE }}" diff --git a/provisioning/roles/wazuh/wazuh-indexer/defaults/main.yml b/provisioning/roles/wazuh/wazuh-indexer/defaults/main.yml index 11204e1e0e..76bfaf3281 100644 --- a/provisioning/roles/wazuh/wazuh-indexer/defaults/main.yml +++ b/provisioning/roles/wazuh/wazuh-indexer/defaults/main.yml @@ -5,7 +5,7 @@ wazuh_custom_packages_installation_indexer_deb_url: "" wazuh_custom_packages_installation_indexer_rpm_url: "" # Cluster Settings -indexer_version: "{{ WAZUH_VERSION }}" +indexer_version: "{{ WAZUH_VERSION_REFERENCE }}" single_node: false indexer_node_name: node-1 From 4cb7ed42ce1bcdd7def0602952f6eee7c869bba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Tue, 25 Jun 2024 11:54:17 +0200 Subject: [PATCH 09/29] fix: change variable name --- provisioning/roles/wazuh/ansible-filebeat-oss/defaults/main.yml | 2 +- provisioning/roles/wazuh/check-packages/tasks/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/provisioning/roles/wazuh/ansible-filebeat-oss/defaults/main.yml b/provisioning/roles/wazuh/ansible-filebeat-oss/defaults/main.yml index 69fe87e632..0b366a6fb6 100644 --- a/provisioning/roles/wazuh/ansible-filebeat-oss/defaults/main.yml +++ b/provisioning/roles/wazuh/ansible-filebeat-oss/defaults/main.yml @@ -1,7 +1,7 @@ --- filebeat_version: 7.10.2 -wazuh_template_branch: "v{{ WAZUH_VERSION }}" +wazuh_template_branch: "v{{ WAZUH_VERSION_REFERENCE }}" filebeat_node_name: node-1 diff --git a/provisioning/roles/wazuh/check-packages/tasks/main.yml b/provisioning/roles/wazuh/check-packages/tasks/main.yml index fef31283af..35440af822 100644 --- a/provisioning/roles/wazuh/check-packages/tasks/main.yml +++ b/provisioning/roles/wazuh/check-packages/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: Check packages shell: | - ./check_packages.sh {{ WAZUH_VERSION }} + ./check_packages.sh {{ WAZUH_VERSION_REFERENCE }} args: warn: false executable: /bin/bash From 1f6f8f59bd94caff17b133e2be3e9c1235c86746 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Tue, 25 Jun 2024 12:57:40 +0200 Subject: [PATCH 10/29] fix: change variable name --- provisioning/roles/wazuh/check-packages/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provisioning/roles/wazuh/check-packages/tasks/main.yml b/provisioning/roles/wazuh/check-packages/tasks/main.yml index 35440af822..e5950894d1 100644 --- a/provisioning/roles/wazuh/check-packages/tasks/main.yml +++ b/provisioning/roles/wazuh/check-packages/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: Check packages shell: | - ./check_packages.sh {{ WAZUH_VERSION_REFERENCE }} + ./check_packages.sh {{ wazuh_version }} args: warn: false executable: /bin/bash From 592ec66dd8545e64d91ff1ce20647a10d2dca699 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Wed, 26 Jun 2024 09:20:44 +0200 Subject: [PATCH 11/29] fix: temporary agent removal --- .../e2e_vulnerability_detector.yaml | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/provisioning/environments/e2e_vulnerability_detector.yaml b/provisioning/environments/e2e_vulnerability_detector.yaml index 4097e4e793..5a3fefaab2 100644 --- a/provisioning/environments/e2e_vulnerability_detector.yaml +++ b/provisioning/environments/e2e_vulnerability_detector.yaml @@ -9,28 +9,6 @@ manager2: type: worker agent1: - roles: [agent] - os: centos_7 - manager: manager1 - -agent2: - roles: [agent] - os: windows_11 - manager: manager2 - -agent3: roles: [agent] os: ubuntu_22 manager: manager1 - -agent4: - roles: [agent] - os: centos_7 - manager: manager1 - architecture: arm64v8 - -agent5: - roles: [agent] - os: ubuntu_22 - manager: manager2 - architecture: arm64v8 From 0672d0095ee01d5681bb5f8779559f6a1b149669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Wed, 26 Jun 2024 11:51:44 +0200 Subject: [PATCH 12/29] fix: reset packages version --- .../roles/wazuh/ansible-wazuh-agent/defaults/main.yml | 2 +- .../roles/wazuh/ansible-wazuh-manager/defaults/main.yml | 2 +- provisioning/roles/wazuh/check-packages/defaults/main.yml | 2 +- provisioning/roles/wazuh/wazuh-dashboard/defaults/main.yml | 4 ++-- provisioning/roles/wazuh/wazuh-dashboard/vars/debian.yml | 2 +- provisioning/roles/wazuh/wazuh-indexer/defaults/main.yml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/provisioning/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/provisioning/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index aa07edda8b..4e0477cd35 100644 --- a/provisioning/roles/wazuh/ansible-wazuh-agent/defaults/main.yml +++ b/provisioning/roles/wazuh/ansible-wazuh-agent/defaults/main.yml @@ -1,6 +1,6 @@ --- -wazuh_agent_version: "{{ WAZUH_VERSION_REFERENCE }}" +wazuh_agent_version: 4.8.0 # Custom packages installation diff --git a/provisioning/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/provisioning/roles/wazuh/ansible-wazuh-manager/defaults/main.yml index af21570ba6..78bf48dfd7 100644 --- a/provisioning/roles/wazuh/ansible-wazuh-manager/defaults/main.yml +++ b/provisioning/roles/wazuh/ansible-wazuh-manager/defaults/main.yml @@ -1,6 +1,6 @@ --- -wazuh_manager_version: "{{ WAZUH_VERSION_REFERENCE }}" +wazuh_manager_version: 4.8.0 wazuh_manager_fqdn: "wazuh-server" wazuh_manager_package_state: present diff --git a/provisioning/roles/wazuh/check-packages/defaults/main.yml b/provisioning/roles/wazuh/check-packages/defaults/main.yml index 1e6d123c07..7a91513886 100644 --- a/provisioning/roles/wazuh/check-packages/defaults/main.yml +++ b/provisioning/roles/wazuh/check-packages/defaults/main.yml @@ -1,2 +1,2 @@ --- -wazuh_version: "{{ WAZUH_VERSION_REFERENCE }}" +wazuh_version: 4.8.0 diff --git a/provisioning/roles/wazuh/wazuh-dashboard/defaults/main.yml b/provisioning/roles/wazuh/wazuh-dashboard/defaults/main.yml index e78d90e0df..d26912bfa2 100644 --- a/provisioning/roles/wazuh/wazuh-dashboard/defaults/main.yml +++ b/provisioning/roles/wazuh/wazuh-dashboard/defaults/main.yml @@ -13,12 +13,12 @@ dashboard_node_name: node-1 dashboard_server_host: "0.0.0.0" dashboard_server_port: "443" dashboard_server_name: "dashboard" -wazuh_version: "{{ WAZUH_VERSION_REFERENCE }}" +wazuh_version: 4.8.0 indexer_cluster_nodes: - 127.0.0.1 # The Wazuh dashboard package repository -dashboard_version: "{{ WAZUH_VERSION_REFERENCE }}" +dashboard_version: "4.8.0" # API credentials wazuh_api_credentials: diff --git a/provisioning/roles/wazuh/wazuh-dashboard/vars/debian.yml b/provisioning/roles/wazuh/wazuh-dashboard/vars/debian.yml index a65a45bed2..ad178fecc1 100644 --- a/provisioning/roles/wazuh/wazuh-dashboard/vars/debian.yml +++ b/provisioning/roles/wazuh/wazuh-dashboard/vars/debian.yml @@ -1,2 +1,2 @@ --- -dashboard_version: "{{ WAZUH_VERSION_REFERENCE }}" +dashboard_version: 4.8.0 diff --git a/provisioning/roles/wazuh/wazuh-indexer/defaults/main.yml b/provisioning/roles/wazuh/wazuh-indexer/defaults/main.yml index 76bfaf3281..d073abbaac 100644 --- a/provisioning/roles/wazuh/wazuh-indexer/defaults/main.yml +++ b/provisioning/roles/wazuh/wazuh-indexer/defaults/main.yml @@ -5,7 +5,7 @@ wazuh_custom_packages_installation_indexer_deb_url: "" wazuh_custom_packages_installation_indexer_rpm_url: "" # Cluster Settings -indexer_version: "{{ WAZUH_VERSION_REFERENCE }}" +indexer_version: 4.8.0 single_node: false indexer_node_name: node-1 From 69affd3dce082f9f46133f7eff1092140d42cb7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Wed, 26 Jun 2024 12:00:11 +0200 Subject: [PATCH 13/29] docs: update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c67e0c56d..4d1393a71c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. ## [4.8.1] - TBD +### Changed + +- Remove hardcode reference to branch in provision playbook for E2E tests ([#5509](https://github.com/wazuh/wazuh-qa/issues/5509)) \- (Tests) + ## [4.8.0] - 12/06/2024 ### Added From 9c692d90e103abbebfc145348faadf8cc40cdb66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Wed, 26 Jun 2024 12:13:23 +0200 Subject: [PATCH 14/29] fix: change parameter --- provisioning/roles/wazuh/ansible-filebeat-oss/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provisioning/roles/wazuh/ansible-filebeat-oss/defaults/main.yml b/provisioning/roles/wazuh/ansible-filebeat-oss/defaults/main.yml index 0b366a6fb6..5de7ba000a 100644 --- a/provisioning/roles/wazuh/ansible-filebeat-oss/defaults/main.yml +++ b/provisioning/roles/wazuh/ansible-filebeat-oss/defaults/main.yml @@ -1,7 +1,7 @@ --- filebeat_version: 7.10.2 -wazuh_template_branch: "v{{ WAZUH_VERSION_REFERENCE }}" +wazuh_template_branch: "{{ WAZUH_VERSION_REFERENCE }}" filebeat_node_name: node-1 From b90480c1095e0bc9d52baecba3b0b6fd49b03bb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Wed, 26 Jun 2024 13:50:39 +0200 Subject: [PATCH 15/29] fix: change parameter name --- provisioning/roles/wazuh/ansible-filebeat-oss/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provisioning/roles/wazuh/ansible-filebeat-oss/defaults/main.yml b/provisioning/roles/wazuh/ansible-filebeat-oss/defaults/main.yml index 5de7ba000a..af8021bdc1 100644 --- a/provisioning/roles/wazuh/ansible-filebeat-oss/defaults/main.yml +++ b/provisioning/roles/wazuh/ansible-filebeat-oss/defaults/main.yml @@ -1,7 +1,7 @@ --- filebeat_version: 7.10.2 -wazuh_template_branch: "{{ WAZUH_VERSION_REFERENCE }}" +wazuh_template_branch: "{{ SOURCE_REFERENCE }}" filebeat_node_name: node-1 From f391ccb55b57b43d09876db9b8166c4f7a3fa025 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Wed, 26 Jun 2024 17:22:19 +0200 Subject: [PATCH 16/29] fix: reestablish all agents --- .../e2e_vulnerability_detector.yaml | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/provisioning/environments/e2e_vulnerability_detector.yaml b/provisioning/environments/e2e_vulnerability_detector.yaml index 5a3fefaab2..f0fe3aff01 100644 --- a/provisioning/environments/e2e_vulnerability_detector.yaml +++ b/provisioning/environments/e2e_vulnerability_detector.yaml @@ -9,6 +9,34 @@ manager2: type: worker agent1: + roles: [agent] + os: centos_7 + manager: manager1 + +agent2: + roles: [agent] + os: windows_11 + manager: manager2 + +agent3: + roles: [agent] + os: ubuntu_22 + manager: manager1 + +agent4: + roles: [agent] + os: centos_7 + manager: manager1 + architecture: arm64v8 + +agent5: roles: [agent] os: ubuntu_22 + manager: manager2 + architecture: arm64v8 + +agent6: + roles: [agent] + os: macos_1400 manager: manager1 + architecture: arm64v8 From 925d6fe810e6d8ded080c317c526efae23402203 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Thu, 27 Jun 2024 11:47:34 +0200 Subject: [PATCH 17/29] fix: remove unnecesary repository installation tasks --- .../wazuh/ansible-wazuh-agent/tasks/Linux.yml | 25 ----------------- .../ansible-wazuh-manager/defaults/main.yml | 28 ------------------- .../ansible-wazuh-manager/tasks/Debian.yml | 10 ------- .../ansible-wazuh-manager/tasks/RedHat.yml | 13 --------- .../wazuh/wazuh-dashboard/defaults/main.yml | 3 -- .../wazuh/wazuh-dashboard/tasks/Debian.yml | 11 -------- .../wazuh/wazuh-dashboard/tasks/RedHat.yml | 11 -------- .../wazuh/wazuh-dashboard/vars/debian.yml | 2 -- .../wazuh/wazuh-indexer/defaults/main.yml | 1 - .../wazuh/wazuh-indexer/tasks/Debian.yml | 24 ---------------- .../wazuh/wazuh-indexer/tasks/RedHat.yml | 8 ------ 11 files changed, 136 deletions(-) delete mode 100644 provisioning/roles/wazuh/wazuh-dashboard/vars/debian.yml diff --git a/provisioning/roles/wazuh/ansible-wazuh-agent/tasks/Linux.yml b/provisioning/roles/wazuh/ansible-wazuh-agent/tasks/Linux.yml index 99913e7b4b..eb747cbc7a 100644 --- a/provisioning/roles/wazuh/ansible-wazuh-agent/tasks/Linux.yml +++ b/provisioning/roles/wazuh/ansible-wazuh-agent/tasks/Linux.yml @@ -13,31 +13,6 @@ when: - wazuh_custom_packages_installation_agent_enabled -- name: Linux CentOS/RedHat | Install wazuh-agent - yum: - name: wazuh-agent-{{ wazuh_agent_version }} - state: present - lock_timeout: '{{ wazuh_agent_yum_lock_timeout }}' - when: - - ansible_os_family|lower == "redhat" - - not wazuh_agent_sources_installation.enabled - - not wazuh_custom_packages_installation_agent_enabled - tags: - - init - -- name: Linux Debian | Install wazuh-agent - apt: - name: "wazuh-agent={{ wazuh_agent_version }}-*" - state: present - cache_valid_time: 3600 - when: - - ansible_os_family|lower != "redhat" - - not wazuh_agent_sources_installation.enabled - - not wazuh_custom_packages_installation_agent_enabled - - not ansible_check_mode - tags: - - init - - name: Linux | Check if client.keys exists stat: path: "{{ wazuh_dir }}/etc/client.keys" diff --git a/provisioning/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/provisioning/roles/wazuh/ansible-wazuh-manager/defaults/main.yml index 78bf48dfd7..1405f28716 100644 --- a/provisioning/roles/wazuh/ansible-wazuh-manager/defaults/main.yml +++ b/provisioning/roles/wazuh/ansible-wazuh-manager/defaults/main.yml @@ -1,7 +1,5 @@ --- -wazuh_manager_version: 4.8.0 - wazuh_manager_fqdn: "wazuh-server" wazuh_manager_package_state: present @@ -10,32 +8,6 @@ wazuh_custom_packages_installation_manager_enabled: false wazuh_custom_packages_installation_manager_deb_url: "https://s3-us-west-1.amazonaws.com/packages-dev.wazuh.com/" wazuh_custom_packages_installation_manager_rpm_url: "https://s3-us-west-1.amazonaws.com/packages-dev.wazuh.com/" -# Sources installation -wazuh_manager_sources_installation: - enabled: false - branch: "v4.4.4" - user_language: "en" - user_no_stop: "y" - user_install_type: "server" - user_dir: "/var/ossec" - user_delete_dir: null - user_enable_active_response: null - user_enable_syscheck: "y" - user_enable_rootcheck: "y" - user_enable_openscap: "n" - user_enable_authd: "y" - user_generate_authd_cert: null - user_update: "y" - user_binaryinstall: null - user_enable_email: "n" - user_auto_start: "y" - user_email_address: null - user_email_smpt: null - user_enable_syslog: "n" - user_white_list: "n" - user_ca_store: null - threads: "2" - wazuh_dir: "/var/ossec" ########################################## diff --git a/provisioning/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml b/provisioning/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml index 1079f8d20b..a2ab137338 100644 --- a/provisioning/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml +++ b/provisioning/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml @@ -104,16 +104,6 @@ state: present when: wazuh_manager_sources_installation.enabled -- name: Debian/Ubuntu | Install wazuh-manager - apt: - name: - - "wazuh-manager={{ wazuh_manager_version }}-*" - state: present - tags: init - when: - - not wazuh_manager_sources_installation.enabled - - not wazuh_custom_packages_installation_manager_enabled - - include_tasks: "installation_from_sources.yml" when: - wazuh_manager_sources_installation.enabled diff --git a/provisioning/roles/wazuh/ansible-wazuh-manager/tasks/RedHat.yml b/provisioning/roles/wazuh/ansible-wazuh-manager/tasks/RedHat.yml index b873b02118..18c85f3205 100644 --- a/provisioning/roles/wazuh/ansible-wazuh-manager/tasks/RedHat.yml +++ b/provisioning/roles/wazuh/ansible-wazuh-manager/tasks/RedHat.yml @@ -99,19 +99,6 @@ state: present when: wazuh_manager_sources_installation.enabled -- name: CentOS/RedHat/Amazon | Install wazuh-manager - package: - name: "wazuh-manager-{{ wazuh_manager_version }}" - state: "{{ wazuh_manager_package_state }}" - register: wazuh_manager_main_packages_installed - until: wazuh_manager_main_packages_installed is succeeded - when: - - ansible_os_family|lower == "redhat" - - not wazuh_manager_sources_installation.enabled - - not wazuh_custom_packages_installation_manager_enabled - tags: - - init - - include_tasks: "../tasks/installation_from_sources.yml" when: - wazuh_manager_sources_installation.enabled diff --git a/provisioning/roles/wazuh/wazuh-dashboard/defaults/main.yml b/provisioning/roles/wazuh/wazuh-dashboard/defaults/main.yml index d26912bfa2..baa88020c7 100644 --- a/provisioning/roles/wazuh/wazuh-dashboard/defaults/main.yml +++ b/provisioning/roles/wazuh/wazuh-dashboard/defaults/main.yml @@ -17,9 +17,6 @@ wazuh_version: 4.8.0 indexer_cluster_nodes: - 127.0.0.1 -# The Wazuh dashboard package repository -dashboard_version: "4.8.0" - # API credentials wazuh_api_credentials: - id: "default" diff --git a/provisioning/roles/wazuh/wazuh-dashboard/tasks/Debian.yml b/provisioning/roles/wazuh/wazuh-dashboard/tasks/Debian.yml index 54610f2a45..c797319a19 100644 --- a/provisioning/roles/wazuh/wazuh-dashboard/tasks/Debian.yml +++ b/provisioning/roles/wazuh/wazuh-dashboard/tasks/Debian.yml @@ -20,17 +20,6 @@ ] state: present - - name: Install Wazuh dashboard - apt: - name: "wazuh-dashboard={{ dashboard_version }}-*" - state: present - update_cache: yes - register: install - - tags: - - install - when: not wazuh_custom_packages_installation_dashboard_enabled - - include_tasks: "install_from_custom_package.yml" when: - wazuh_custom_packages_installation_dashboard_enabled diff --git a/provisioning/roles/wazuh/wazuh-dashboard/tasks/RedHat.yml b/provisioning/roles/wazuh/wazuh-dashboard/tasks/RedHat.yml index 4ff1a0b451..1fc7b631c2 100644 --- a/provisioning/roles/wazuh/wazuh-dashboard/tasks/RedHat.yml +++ b/provisioning/roles/wazuh/wazuh-dashboard/tasks/RedHat.yml @@ -18,17 +18,6 @@ state: present ignore_errors: yes - - name: Install Wazuh dashboard - package: - name: "wazuh-dashboard-{{ dashboard_version }}" - state: present - update_cache: yes - register: install - - tags: - - install - when: not wazuh_custom_packages_installation_dashboard_enabled - - include_tasks: "install_from_custom_package.yml" when: - wazuh_custom_packages_installation_dashboard_enabled diff --git a/provisioning/roles/wazuh/wazuh-dashboard/vars/debian.yml b/provisioning/roles/wazuh/wazuh-dashboard/vars/debian.yml deleted file mode 100644 index ad178fecc1..0000000000 --- a/provisioning/roles/wazuh/wazuh-dashboard/vars/debian.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -dashboard_version: 4.8.0 diff --git a/provisioning/roles/wazuh/wazuh-indexer/defaults/main.yml b/provisioning/roles/wazuh/wazuh-indexer/defaults/main.yml index d073abbaac..6da93258de 100644 --- a/provisioning/roles/wazuh/wazuh-indexer/defaults/main.yml +++ b/provisioning/roles/wazuh/wazuh-indexer/defaults/main.yml @@ -5,7 +5,6 @@ wazuh_custom_packages_installation_indexer_deb_url: "" wazuh_custom_packages_installation_indexer_rpm_url: "" # Cluster Settings -indexer_version: 4.8.0 single_node: false indexer_node_name: node-1 diff --git a/provisioning/roles/wazuh/wazuh-indexer/tasks/Debian.yml b/provisioning/roles/wazuh/wazuh-indexer/tasks/Debian.yml index 4eccabee54..9957331f53 100644 --- a/provisioning/roles/wazuh/wazuh-indexer/tasks/Debian.yml +++ b/provisioning/roles/wazuh/wazuh-indexer/tasks/Debian.yml @@ -18,30 +18,6 @@ ] state: present -- name: Install wazuh-indexer - block: - - name: Add Wazuh indexer repository - block: - - name: Add apt repository signing key - apt_key: - url: "{{ wazuh_repo.gpg }}" - state: present - - - name: Add Wazuh indexer repository - apt_repository: - repo: "{{ wazuh_repo.apt }}" - state: present - filename: 'wazuh-indexer' - update_cache: yes - - - name: Install Wazuh indexer - apt: - name: wazuh-indexer={{ indexer_version }}-1 - state: present - register: install - tags: install - when: not wazuh_custom_packages_installation_indexer_enabled - - include_tasks: "install_from_custom_package.yml" when: - wazuh_custom_packages_installation_indexer_enabled diff --git a/provisioning/roles/wazuh/wazuh-indexer/tasks/RedHat.yml b/provisioning/roles/wazuh/wazuh-indexer/tasks/RedHat.yml index 690b5435b4..66a53253de 100644 --- a/provisioning/roles/wazuh/wazuh-indexer/tasks/RedHat.yml +++ b/provisioning/roles/wazuh/wazuh-indexer/tasks/RedHat.yml @@ -43,14 +43,6 @@ - wget - unzip - - name: Install Wazuh indexer - package: - name: wazuh-indexer-{{ indexer_version }} - state: present - register: install - tags: install - when: not wazuh_custom_packages_installation_indexer_enabled - tags: - install From 98b5d3144114c1eec21ee4e935accf88532ecad3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Thu, 27 Jun 2024 12:05:15 +0200 Subject: [PATCH 18/29] fix: remove unnecesary repository installation --- .../ansible-wazuh-agent/defaults/main.yml | 26 ------------------- provisioning/roles/wazuh/vars/repo.yml | 4 +-- .../roles/wazuh/vars/repo_pre-release.yml | 4 +-- .../roles/wazuh/vars/repo_staging.yml | 4 +-- 4 files changed, 3 insertions(+), 35 deletions(-) diff --git a/provisioning/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/provisioning/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index 4e0477cd35..ff732d6f77 100644 --- a/provisioning/roles/wazuh/ansible-wazuh-agent/defaults/main.yml +++ b/provisioning/roles/wazuh/ansible-wazuh-agent/defaults/main.yml @@ -1,37 +1,11 @@ --- -wazuh_agent_version: 4.8.0 - # Custom packages installation wazuh_custom_packages_installation_agent_enabled: false wazuh_custom_packages_installation_agent_deb_url: "" wazuh_custom_packages_installation_agent_rpm_url: "" -# Sources installation - -wazuh_agent_sources_installation: - enabled: false - branch: "master" - user_language: "y" - user_no_stop: "y" - user_install_type: "agent" - user_dir: "/var/ossec" - user_delete_dir: "y" - user_enable_active_response: "y" - user_enable_syscheck: "y" - user_enable_rootcheck: "y" - user_enable_openscap: "n" - user_enable_sca: "y" - user_enable_authd: "y" - user_generate_authd_cert: "n" - user_update: "y" - user_binaryinstall: null - user_agent_server_ip: "YOUR_MANAGER_IP" - user_agent_server_name: null - user_agent_config_profile: null - user_ca_store: "{{ wazuh_dir }}/wpk_root.pem" - wazuh_agent_yum_lock_timeout: 30 # We recommend the use of ansible-vault to protect Wazuh, api, agentless and authd credentials. diff --git a/provisioning/roles/wazuh/vars/repo.yml b/provisioning/roles/wazuh/vars/repo.yml index 870e4393c6..0ddbf62f1c 100644 --- a/provisioning/roles/wazuh/vars/repo.yml +++ b/provisioning/roles/wazuh/vars/repo.yml @@ -3,10 +3,8 @@ wazuh_repo: yum: 'https://packages-dev.wazuh.com/4.x/yum/' gpg: 'https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH' key_id: '0DCFCA5547B19D2A6099506096B3EE5F29111145' -wazuh_winagent_config_url: "https://packages.wazuh.com/4.x/windows/wazuh-agent-{{ wazuh_agent_version }}-1.msi" -wazuh_winagent_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.msi" certs_gen_tool_version: 4.8 # Url of certificates generator tool -certs_gen_tool_url: "https://packages-dev.wazuh.com/{{ certs_gen_tool_version }}/wazuh-certs-tool.sh" \ No newline at end of file +certs_gen_tool_url: "https://packages-dev.wazuh.com/{{ certs_gen_tool_version }}/wazuh-certs-tool.sh" diff --git a/provisioning/roles/wazuh/vars/repo_pre-release.yml b/provisioning/roles/wazuh/vars/repo_pre-release.yml index 23469ce116..bdb8144453 100644 --- a/provisioning/roles/wazuh/vars/repo_pre-release.yml +++ b/provisioning/roles/wazuh/vars/repo_pre-release.yml @@ -3,10 +3,8 @@ wazuh_repo: yum: 'https://packages-dev.wazuh.com/pre-release/yum/' gpg: 'https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH' key_id: '0DCFCA5547B19D2A6099506096B3EE5F29111145' -wazuh_winagent_config_url: "https://packages-dev.wazuh.com/pre-release/windows/wazuh-agent-{{ wazuh_agent_version }}-1.msi" -wazuh_winagent_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.msi" certs_gen_tool_version: 4.8 # Url of certificates generator tool -certs_gen_tool_url: "https://packages-dev.wazuh.com/{{ certs_gen_tool_version }}/wazuh-certs-tool.sh" \ No newline at end of file +certs_gen_tool_url: "https://packages-dev.wazuh.com/{{ certs_gen_tool_version }}/wazuh-certs-tool.sh" diff --git a/provisioning/roles/wazuh/vars/repo_staging.yml b/provisioning/roles/wazuh/vars/repo_staging.yml index 06343c8802..ee6d684121 100644 --- a/provisioning/roles/wazuh/vars/repo_staging.yml +++ b/provisioning/roles/wazuh/vars/repo_staging.yml @@ -3,10 +3,8 @@ wazuh_repo: yum: 'https://packages-dev.wazuh.com/staging/yum/' gpg: 'https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH' key_id: '0DCFCA5547B19D2A6099506096B3EE5F29111145' -wazuh_winagent_config_url: "https://packages-dev.wazuh.com/staging/windows/wazuh-agent-{{ wazuh_agent_version }}-1.msi" -wazuh_winagent_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.msi" certs_gen_tool_version: 4.8 # Url of certificates generator tool -certs_gen_tool_url: "https://packages-dev.wazuh.com/{{ certs_gen_tool_version }}/wazuh-certs-tool.sh" \ No newline at end of file +certs_gen_tool_url: "https://packages-dev.wazuh.com/{{ certs_gen_tool_version }}/wazuh-certs-tool.sh" From fb60cce9705a3647df017b36cdd79dd0133389a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Thu, 27 Jun 2024 12:49:52 +0200 Subject: [PATCH 19/29] fix: remove unnecessary repository installation tasks --- .../ansible-wazuh-agent/defaults/main.yml | 1 - .../ansible-wazuh-agent/tasks/Windows.yml | 8 -- .../wazuh/check-packages/defaults/main.yml | 2 - .../check-packages/scripts/check_packages.sh | 80 ------------------- .../roles/wazuh/check-packages/tasks/main.yml | 10 --- .../wazuh/wazuh-dashboard/defaults/main.yml | 1 - 6 files changed, 102 deletions(-) delete mode 100644 provisioning/roles/wazuh/check-packages/defaults/main.yml delete mode 100755 provisioning/roles/wazuh/check-packages/scripts/check_packages.sh delete mode 100644 provisioning/roles/wazuh/check-packages/tasks/main.yml diff --git a/provisioning/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/provisioning/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index ff732d6f77..81569478fa 100644 --- a/provisioning/roles/wazuh/ansible-wazuh-agent/defaults/main.yml +++ b/provisioning/roles/wazuh/ansible-wazuh-agent/defaults/main.yml @@ -30,7 +30,6 @@ wazuh_winagent_config: check_md5: True md5: a03806b7302767d0470d65d3f103fabb -wazuh_winagent_config_url: https://packages.wazuh.com/4.x/windows/wazuh-agent-4.8.0-1.msi wazuh_winagent_package_name: wazuh-agent-4.8.0-1.msi wazuh_winagent_package_name_generic: wazuh-agent.msi wazuh_dir: "/var/ossec" diff --git a/provisioning/roles/wazuh/ansible-wazuh-agent/tasks/Windows.yml b/provisioning/roles/wazuh/ansible-wazuh-agent/tasks/Windows.yml index d5c12a1e2d..4890b05365 100644 --- a/provisioning/roles/wazuh/ansible-wazuh-agent/tasks/Windows.yml +++ b/provisioning/roles/wazuh/ansible-wazuh-agent/tasks/Windows.yml @@ -23,14 +23,6 @@ path: "{{ wazuh_winagent_config.download_dir }}{{ wazuh_winagent_package_name }}" register: wazuh_package_downloaded -- name: Windows | Download Wazuh Agent package - win_get_url: - url: "{{ wazuh_winagent_config_url }}" - dest: "{{ wazuh_winagent_config.download_dir }}" - when: - - not wazuh_package_downloaded.stat.exists - - not wazuh_custom_packages_installation_agent_enabled - - name: Windows | Verify the Wazuh Agent installer win_stat: path: "{{ wazuh_winagent_config.download_dir }}{{ wazuh_winagent_package_name }}" diff --git a/provisioning/roles/wazuh/check-packages/defaults/main.yml b/provisioning/roles/wazuh/check-packages/defaults/main.yml deleted file mode 100644 index 7a91513886..0000000000 --- a/provisioning/roles/wazuh/check-packages/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -wazuh_version: 4.8.0 diff --git a/provisioning/roles/wazuh/check-packages/scripts/check_packages.sh b/provisioning/roles/wazuh/check-packages/scripts/check_packages.sh deleted file mode 100755 index 20c6204788..0000000000 --- a/provisioning/roles/wazuh/check-packages/scripts/check_packages.sh +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash - -VERSION=$1 -#echo $VERSION -## Replace VERSION with $VERSION in packages_uri.txt and save it as packages_uri_new.txt -sed 's,VERSION,'$VERSION',g' ../files/packages_uri.txt > ../files/packages_uri_new.txt - -checkPackages(){ - ## Set S3 Bucket URL - if [ $1 == "production" ]; then - echo "production" - PACKAGES_URL=https://packages.wazuh.com/4.x/ - elif [ $1 == "pre-release" ]; then - echo "pre-release" - PACKAGES_URL=https://packages-dev.wazuh.com/pre-release/ - elif [ $1 == "staging" ]; then - echo "staging" - PACKAGES_URL=https://packages-dev.wazuh.com/staging/ - CHECK_WIN_PACKAGE=$(grep windows ../files/packages_uri_new.txt) - echo $CHECK_WIN_PACKAGE - if [ -n "$CHECK_WIN_PACKAGE" ]; then - WIN_AGENT_NAME=$(aws s3 ls s3://packages-dev.wazuh.com/staging/windows/wazuh-agent-$VERSION --region=us-west-1 | tail -1 | awk '{printf $4}') - if [ -z $WIN_AGENT_NAME ]; then - echo "Windows agent package for version " $VERSION " does not exist in the staging repository" - exit 1 - fi - WIN_AGENT_URI="windows/"$WIN_AGENT_NAME - echo $PACKAGES_URL$WIN_AGENT_URI "check" - sed -i 's,windows/.*,'$WIN_AGENT_URI',g' ../files/packages_uri_new.txt - sed -i 's,wazuh_winagent_config_url.*,wazuh_winagent_config_url: \"'$PACKAGES_URL$WIN_AGENT_URI'\",g' ../../vars/repo_staging.yml - sed -i 's,wazuh_winagent_package_name.*,wazuh_winagent_package_name: \"'$WIN_AGENT_NAME'\",g' ../../vars/repo_staging.yml - fi - fi - - ## Set EXISTS to 0 (true) - EXISTS=0 - - ## Loop through the packages_uri_new.txt file - while IFS= read -r URI - do - echo "$URI" - ## Check if the package exists - PACKAGE=$(curl --silent -I $PACKAGES_URL$URI | grep -E "^HTTP" | awk '{print $2}') - ## If it does not exist set EXISTS to 1 (false) - if [ "$PACKAGE" != "200" ]; then - EXISTS=1 - #echo $PACKAGES_URL$URI "does not exist" - return $EXISTS - fi - done < ../files/packages_uri_new.txt - - return $EXISTS -} - -replaceVars(){ - sed -i "s|packages_repository:.*|packages_repository: $1|g" ../../vars/repo_vars.yml - -} - -## Call the checkPackages function for each repository -if checkPackages "production"; then - echo "production" - replaceVars "production" - exit 0 -elif checkPackages "pre-release"; then - echo "pre-release" - replaceVars "pre-release" - exit 0 -elif checkPackages "production"; then - echo "production" - replaceVars "production" - exit 0 -elif checkPackages "staging"; then - echo "staging" - replaceVars "staging" - exit 0 -else - echo "Failed" - exit 1 -fi \ No newline at end of file diff --git a/provisioning/roles/wazuh/check-packages/tasks/main.yml b/provisioning/roles/wazuh/check-packages/tasks/main.yml deleted file mode 100644 index e5950894d1..0000000000 --- a/provisioning/roles/wazuh/check-packages/tasks/main.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - - name: Check packages - shell: | - ./check_packages.sh {{ wazuh_version }} - args: - warn: false - executable: /bin/bash - chdir: "{{ role_path }}/scripts/" - delegate_to: localhost - become: no diff --git a/provisioning/roles/wazuh/wazuh-dashboard/defaults/main.yml b/provisioning/roles/wazuh/wazuh-dashboard/defaults/main.yml index baa88020c7..13f0527ee9 100644 --- a/provisioning/roles/wazuh/wazuh-dashboard/defaults/main.yml +++ b/provisioning/roles/wazuh/wazuh-dashboard/defaults/main.yml @@ -13,7 +13,6 @@ dashboard_node_name: node-1 dashboard_server_host: "0.0.0.0" dashboard_server_port: "443" dashboard_server_name: "dashboard" -wazuh_version: 4.8.0 indexer_cluster_nodes: - 127.0.0.1 From b87f54f72f68be4f98c20bd8ad7fb590abed3c7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Thu, 27 Jun 2024 13:22:59 +0200 Subject: [PATCH 20/29] fix: remove unnecessary repository installation tasks --- .../ansible-wazuh-agent/defaults/main.yml | 1 - .../ansible-wazuh-agent/tasks/Windows.yml | 29 ------------------- 2 files changed, 30 deletions(-) diff --git a/provisioning/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/provisioning/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index 81569478fa..67570e03ca 100644 --- a/provisioning/roles/wazuh/ansible-wazuh-agent/defaults/main.yml +++ b/provisioning/roles/wazuh/ansible-wazuh-agent/defaults/main.yml @@ -30,7 +30,6 @@ wazuh_winagent_config: check_md5: True md5: a03806b7302767d0470d65d3f103fabb -wazuh_winagent_package_name: wazuh-agent-4.8.0-1.msi wazuh_winagent_package_name_generic: wazuh-agent.msi wazuh_dir: "/var/ossec" macos_wazuh_dir: "/Library/Ossec" diff --git a/provisioning/roles/wazuh/ansible-wazuh-agent/tasks/Windows.yml b/provisioning/roles/wazuh/ansible-wazuh-agent/tasks/Windows.yml index 4890b05365..efee98924c 100644 --- a/provisioning/roles/wazuh/ansible-wazuh-agent/tasks/Windows.yml +++ b/provisioning/roles/wazuh/ansible-wazuh-agent/tasks/Windows.yml @@ -18,30 +18,6 @@ when: - not check_path.stat.exists -- name: Windows | Check if Wazuh installer is already downloaded - win_stat: - path: "{{ wazuh_winagent_config.download_dir }}{{ wazuh_winagent_package_name }}" - register: wazuh_package_downloaded - -- name: Windows | Verify the Wazuh Agent installer - win_stat: - path: "{{ wazuh_winagent_config.download_dir }}{{ wazuh_winagent_package_name }}" - get_checksum: true - checksum_algorithm: md5 - register: wazuh_agent_status - failed_when: - - wazuh_agent_status.stat.checksum != wazuh_winagent_config.md5 - when: - - wazuh_winagent_config.check_md5 - - not wazuh_custom_packages_installation_agent_enabled - - -- name: Windows | Install Agent if not already installed - win_package: - path: "{{ wazuh_winagent_config.download_dir }}{{ wazuh_winagent_package_name }}" - state: present - when: not wazuh_custom_packages_installation_agent_enabled - - name: Windows | Check if client.keys exists win_stat: path: "{{ wazuh_agent_win_path }}client.keys" @@ -86,11 +62,6 @@ tags: - config -- name: Windows | Delete downloaded Wazuh agent installer file - win_file: - path: "{{ wazuh_winagent_config.download_dir }}{{ wazuh_winagent_package_name }}" - state: absent - - include_tasks: "installation_from_custom_packages.yml" when: - wazuh_custom_packages_installation_agent_enabled From 04d324e31471e6e502b7ca1ae91cb7d008327906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Thu, 27 Jun 2024 14:08:53 +0200 Subject: [PATCH 21/29] fix: change hardcode cert variable --- provisioning/roles/wazuh/vars/repo.yml | 2 +- provisioning/roles/wazuh/vars/repo_pre-release.yml | 2 +- provisioning/roles/wazuh/vars/repo_staging.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/provisioning/roles/wazuh/vars/repo.yml b/provisioning/roles/wazuh/vars/repo.yml index 0ddbf62f1c..68dee72ae9 100644 --- a/provisioning/roles/wazuh/vars/repo.yml +++ b/provisioning/roles/wazuh/vars/repo.yml @@ -4,7 +4,7 @@ wazuh_repo: gpg: 'https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH' key_id: '0DCFCA5547B19D2A6099506096B3EE5F29111145' -certs_gen_tool_version: 4.8 +certs_gen_tool_version: {{ CERTS_GEN_TOOL_VERSION }} # 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/provisioning/roles/wazuh/vars/repo_pre-release.yml b/provisioning/roles/wazuh/vars/repo_pre-release.yml index bdb8144453..d8c09bce90 100644 --- a/provisioning/roles/wazuh/vars/repo_pre-release.yml +++ b/provisioning/roles/wazuh/vars/repo_pre-release.yml @@ -4,7 +4,7 @@ wazuh_repo: gpg: 'https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH' key_id: '0DCFCA5547B19D2A6099506096B3EE5F29111145' -certs_gen_tool_version: 4.8 +certs_gen_tool_version: {{ CERTS_GEN_TOOL_VERSION }} # 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/provisioning/roles/wazuh/vars/repo_staging.yml b/provisioning/roles/wazuh/vars/repo_staging.yml index ee6d684121..37b419411e 100644 --- a/provisioning/roles/wazuh/vars/repo_staging.yml +++ b/provisioning/roles/wazuh/vars/repo_staging.yml @@ -4,7 +4,7 @@ wazuh_repo: gpg: 'https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH' key_id: '0DCFCA5547B19D2A6099506096B3EE5F29111145' -certs_gen_tool_version: 4.8 +certs_gen_tool_version: {{ CERTS_GEN_TOOL_VERSION }} # Url of certificates generator tool certs_gen_tool_url: "https://packages-dev.wazuh.com/{{ certs_gen_tool_version }}/wazuh-certs-tool.sh" From 622d79de85c4b598f93915d6740d1bea70252a07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Thu, 27 Jun 2024 19:44:09 +0200 Subject: [PATCH 22/29] fix: add commas --- provisioning/roles/wazuh/vars/repo.yml | 2 +- provisioning/roles/wazuh/vars/repo_pre-release.yml | 2 +- provisioning/roles/wazuh/vars/repo_staging.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/provisioning/roles/wazuh/vars/repo.yml b/provisioning/roles/wazuh/vars/repo.yml index 68dee72ae9..bc10d89538 100644 --- a/provisioning/roles/wazuh/vars/repo.yml +++ b/provisioning/roles/wazuh/vars/repo.yml @@ -4,7 +4,7 @@ wazuh_repo: gpg: 'https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH' key_id: '0DCFCA5547B19D2A6099506096B3EE5F29111145' -certs_gen_tool_version: {{ CERTS_GEN_TOOL_VERSION }} +certs_gen_tool_version: "{{ CERTS_GEN_TOOL_VERSION }}" # 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/provisioning/roles/wazuh/vars/repo_pre-release.yml b/provisioning/roles/wazuh/vars/repo_pre-release.yml index d8c09bce90..cd3e8fee4f 100644 --- a/provisioning/roles/wazuh/vars/repo_pre-release.yml +++ b/provisioning/roles/wazuh/vars/repo_pre-release.yml @@ -4,7 +4,7 @@ wazuh_repo: gpg: 'https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH' key_id: '0DCFCA5547B19D2A6099506096B3EE5F29111145' -certs_gen_tool_version: {{ CERTS_GEN_TOOL_VERSION }} +certs_gen_tool_version: "{{ CERTS_GEN_TOOL_VERSION }}" # 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/provisioning/roles/wazuh/vars/repo_staging.yml b/provisioning/roles/wazuh/vars/repo_staging.yml index 37b419411e..6c53daed4c 100644 --- a/provisioning/roles/wazuh/vars/repo_staging.yml +++ b/provisioning/roles/wazuh/vars/repo_staging.yml @@ -4,7 +4,7 @@ wazuh_repo: gpg: 'https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH' key_id: '0DCFCA5547B19D2A6099506096B3EE5F29111145' -certs_gen_tool_version: {{ CERTS_GEN_TOOL_VERSION }} +certs_gen_tool_version: "{{ CERTS_GEN_TOOL_VERSION }}" # Url of certificates generator tool certs_gen_tool_url: "https://packages-dev.wazuh.com/{{ certs_gen_tool_version }}/wazuh-certs-tool.sh" From a5a4cae2ddcbb101506555ff145b070683e3c76b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Thu, 27 Jun 2024 21:02:06 +0200 Subject: [PATCH 23/29] fix: restore source variables --- .../ansible-wazuh-agent/defaults/main.yml | 24 +++++++++++++++++ .../ansible-wazuh-manager/defaults/main.yml | 26 +++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/provisioning/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/provisioning/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index 67570e03ca..566418a76a 100644 --- a/provisioning/roles/wazuh/ansible-wazuh-agent/defaults/main.yml +++ b/provisioning/roles/wazuh/ansible-wazuh-agent/defaults/main.yml @@ -6,6 +6,30 @@ wazuh_custom_packages_installation_agent_enabled: false wazuh_custom_packages_installation_agent_deb_url: "" wazuh_custom_packages_installation_agent_rpm_url: "" +# Sources installation + +wazuh_agent_sources_installation: + enabled: false + branch: "master" + user_language: "y" + user_no_stop: "y" + user_install_type: "agent" + user_dir: "/var/ossec" + user_delete_dir: "y" + user_enable_active_response: "y" + user_enable_syscheck: "y" + user_enable_rootcheck: "y" + user_enable_openscap: "n" + user_enable_sca: "y" + user_enable_authd: "y" + user_generate_authd_cert: "n" + user_update: "y" + user_binaryinstall: null + user_agent_server_ip: "YOUR_MANAGER_IP" + user_agent_server_name: null + user_agent_config_profile: null + user_ca_store: "{{ wazuh_dir }}/wpk_root.pem" + wazuh_agent_yum_lock_timeout: 30 # We recommend the use of ansible-vault to protect Wazuh, api, agentless and authd credentials. diff --git a/provisioning/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/provisioning/roles/wazuh/ansible-wazuh-manager/defaults/main.yml index 1405f28716..33b3e0a23c 100644 --- a/provisioning/roles/wazuh/ansible-wazuh-manager/defaults/main.yml +++ b/provisioning/roles/wazuh/ansible-wazuh-manager/defaults/main.yml @@ -8,6 +8,32 @@ wazuh_custom_packages_installation_manager_enabled: false wazuh_custom_packages_installation_manager_deb_url: "https://s3-us-west-1.amazonaws.com/packages-dev.wazuh.com/" wazuh_custom_packages_installation_manager_rpm_url: "https://s3-us-west-1.amazonaws.com/packages-dev.wazuh.com/" +# Sources installation +wazuh_manager_sources_installation: + enabled: false + branch: "v4.4.4" + user_language: "en" + user_no_stop: "y" + user_install_type: "server" + user_dir: "/var/ossec" + user_delete_dir: null + user_enable_active_response: null + user_enable_syscheck: "y" + user_enable_rootcheck: "y" + user_enable_openscap: "n" + user_enable_authd: "y" + user_generate_authd_cert: null + user_update: "y" + user_binaryinstall: null + user_enable_email: "n" + user_auto_start: "y" + user_email_address: null + user_email_smpt: null + user_enable_syslog: "n" + user_white_list: "n" + user_ca_store: null + threads: "2" + wazuh_dir: "/var/ossec" ########################################## From 548f06446cce1d8eb63d031ee258f7b9946177f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Thu, 27 Jun 2024 21:45:38 +0200 Subject: [PATCH 24/29] fix: temporal remove of agents --- .../e2e_vulnerability_detector.yaml | 28 ------------------- 1 file changed, 28 deletions(-) diff --git a/provisioning/environments/e2e_vulnerability_detector.yaml b/provisioning/environments/e2e_vulnerability_detector.yaml index f0fe3aff01..5a3fefaab2 100644 --- a/provisioning/environments/e2e_vulnerability_detector.yaml +++ b/provisioning/environments/e2e_vulnerability_detector.yaml @@ -9,34 +9,6 @@ manager2: type: worker agent1: - roles: [agent] - os: centos_7 - manager: manager1 - -agent2: - roles: [agent] - os: windows_11 - manager: manager2 - -agent3: - roles: [agent] - os: ubuntu_22 - manager: manager1 - -agent4: - roles: [agent] - os: centos_7 - manager: manager1 - architecture: arm64v8 - -agent5: roles: [agent] os: ubuntu_22 - manager: manager2 - architecture: arm64v8 - -agent6: - roles: [agent] - os: macos_1400 manager: manager1 - architecture: arm64v8 From 2135afa674e6e415cf2983f43d402fa3f4a1a4ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Fri, 28 Jun 2024 08:38:13 +0200 Subject: [PATCH 25/29] docs: update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ed7e8bbf1..9e90450634 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ All notable changes to this project will be documented in this file. ### Changed -- Remove hardcode reference to branch in provision playbook for E2E tests ([#5509](https://github.com/wazuh/wazuh-qa/issues/5509)) \- (Tests) +- Remove hardcode references to branch in provision playbook for E2E tests ([#5509](https://github.com/wazuh/wazuh-qa/issues/5509)) \- (Tests) - Fix test_consistency_initial_scans by adding a 30-minute wait before collecting vulnerabilities. ([#5507](https://github.com/wazuh/wazuh-qa/pull/5507)) \- (Tests) ## [4.8.0] - 12/06/2024 From 331da44cba403cbfe877b16015a418327d9566cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Fri, 28 Jun 2024 08:49:19 +0200 Subject: [PATCH 26/29] fix: reestablish all test agents --- .../e2e_vulnerability_detector.yaml | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/provisioning/environments/e2e_vulnerability_detector.yaml b/provisioning/environments/e2e_vulnerability_detector.yaml index 5a3fefaab2..f0fe3aff01 100644 --- a/provisioning/environments/e2e_vulnerability_detector.yaml +++ b/provisioning/environments/e2e_vulnerability_detector.yaml @@ -9,6 +9,34 @@ manager2: type: worker agent1: + roles: [agent] + os: centos_7 + manager: manager1 + +agent2: + roles: [agent] + os: windows_11 + manager: manager2 + +agent3: + roles: [agent] + os: ubuntu_22 + manager: manager1 + +agent4: + roles: [agent] + os: centos_7 + manager: manager1 + architecture: arm64v8 + +agent5: roles: [agent] os: ubuntu_22 + manager: manager2 + architecture: arm64v8 + +agent6: + roles: [agent] + os: macos_1400 manager: manager1 + architecture: arm64v8 From 15d8c2c9856a20b1a456401210e4da2740a6289e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= <147649306+santipadilla@users.noreply.github.com> Date: Fri, 28 Jun 2024 12:01:31 +0200 Subject: [PATCH 27/29] Update CHANGELOG.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Julia Magán <80041853+juliamagan@users.noreply.github.com> --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e90450634..f82f0d5c2c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ All notable changes to this project will be documented in this file. ### Changed -- Remove hardcode references to branch in provision playbook for E2E tests ([#5509](https://github.com/wazuh/wazuh-qa/issues/5509)) \- (Tests) +- Remove hardcoded references in provision playbook for E2E tests ([#5517](https://github.com/wazuh/wazuh-qa/pull/5517)) \- (Framework) - Fix test_consistency_initial_scans by adding a 30-minute wait before collecting vulnerabilities. ([#5507](https://github.com/wazuh/wazuh-qa/pull/5507)) \- (Tests) ## [4.8.0] - 12/06/2024 From 286fa11992f53cf4cf0d284933c2ded7485f78f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Mon, 1 Jul 2024 13:47:05 +0200 Subject: [PATCH 28/29] fix: remove agents for testing --- .../e2e_vulnerability_detector.yaml | 28 ------------------- 1 file changed, 28 deletions(-) diff --git a/provisioning/environments/e2e_vulnerability_detector.yaml b/provisioning/environments/e2e_vulnerability_detector.yaml index f0fe3aff01..5a3fefaab2 100644 --- a/provisioning/environments/e2e_vulnerability_detector.yaml +++ b/provisioning/environments/e2e_vulnerability_detector.yaml @@ -9,34 +9,6 @@ manager2: type: worker agent1: - roles: [agent] - os: centos_7 - manager: manager1 - -agent2: - roles: [agent] - os: windows_11 - manager: manager2 - -agent3: - roles: [agent] - os: ubuntu_22 - manager: manager1 - -agent4: - roles: [agent] - os: centos_7 - manager: manager1 - architecture: arm64v8 - -agent5: roles: [agent] os: ubuntu_22 - manager: manager2 - architecture: arm64v8 - -agent6: - roles: [agent] - os: macos_1400 manager: manager1 - architecture: arm64v8 From c20dfd7d9de4921ef1280ef5da3beadf0e6a57f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Mon, 1 Jul 2024 14:39:01 +0200 Subject: [PATCH 29/29] fix: reestablish all agents --- .../e2e_vulnerability_detector.yaml | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/provisioning/environments/e2e_vulnerability_detector.yaml b/provisioning/environments/e2e_vulnerability_detector.yaml index 5a3fefaab2..f0fe3aff01 100644 --- a/provisioning/environments/e2e_vulnerability_detector.yaml +++ b/provisioning/environments/e2e_vulnerability_detector.yaml @@ -9,6 +9,34 @@ manager2: type: worker agent1: + roles: [agent] + os: centos_7 + manager: manager1 + +agent2: + roles: [agent] + os: windows_11 + manager: manager2 + +agent3: + roles: [agent] + os: ubuntu_22 + manager: manager1 + +agent4: + roles: [agent] + os: centos_7 + manager: manager1 + architecture: arm64v8 + +agent5: roles: [agent] os: ubuntu_22 + manager: manager2 + architecture: arm64v8 + +agent6: + roles: [agent] + os: macos_1400 manager: manager1 + architecture: arm64v8