From fe54819c35319d3659aac9cb24857018018f2f14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Wed, 11 Sep 2024 12:59:37 +0200 Subject: [PATCH 01/12] fix: temporary elimination of agents for testing --- .../e2e_vulnerability_detector.yaml | 33 ------------------- 1 file changed, 33 deletions(-) diff --git a/provisioning/environments/e2e_vulnerability_detector.yaml b/provisioning/environments/e2e_vulnerability_detector.yaml index f0fe3aff01..91904bb054 100644 --- a/provisioning/environments/e2e_vulnerability_detector.yaml +++ b/provisioning/environments/e2e_vulnerability_detector.yaml @@ -3,40 +3,7 @@ manager1: os: ubuntu_22 type: master -manager2: - roles: [manager, filebeat] - os: ubuntu_22 - 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 ceed223d7917e51007f0792b9f8599a029ee8b68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Wed, 11 Sep 2024 16:07:17 +0200 Subject: [PATCH 02/12] fix: add offline-url element --- .../test_vulnerability_detector/configurations/manager.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/end_to_end/test_vulnerability_detector/configurations/manager.yaml b/tests/end_to_end/test_vulnerability_detector/configurations/manager.yaml index 9f2497a2c7..98ce713dd1 100644 --- a/tests/end_to_end/test_vulnerability_detector/configurations/manager.yaml +++ b/tests/end_to_end/test_vulnerability_detector/configurations/manager.yaml @@ -7,6 +7,8 @@ value: 'yes' - feed-update-interval: value: 10h + - offline-url: + value: 'https://localhost' - section: indexer elements: - enabled: From a5a769a5bf79afb61565b50deb0d19523010700d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Wed, 11 Sep 2024 21:50:39 +0200 Subject: [PATCH 03/12] fix: reestablish all agents --- .../e2e_vulnerability_detector.yaml | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/provisioning/environments/e2e_vulnerability_detector.yaml b/provisioning/environments/e2e_vulnerability_detector.yaml index 91904bb054..f0fe3aff01 100644 --- a/provisioning/environments/e2e_vulnerability_detector.yaml +++ b/provisioning/environments/e2e_vulnerability_detector.yaml @@ -3,7 +3,40 @@ manager1: os: ubuntu_22 type: master +manager2: + roles: [manager, filebeat] + os: ubuntu_22 + 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 c1228c3c65f181a661e69855808f6d59b53844b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Thu, 12 Sep 2024 09:37:11 +0200 Subject: [PATCH 04/12] fix: temporary removal of agents for testing --- .../e2e_vulnerability_detector.yaml | 33 ------------------- 1 file changed, 33 deletions(-) diff --git a/provisioning/environments/e2e_vulnerability_detector.yaml b/provisioning/environments/e2e_vulnerability_detector.yaml index f0fe3aff01..91904bb054 100644 --- a/provisioning/environments/e2e_vulnerability_detector.yaml +++ b/provisioning/environments/e2e_vulnerability_detector.yaml @@ -3,40 +3,7 @@ manager1: os: ubuntu_22 type: master -manager2: - roles: [manager, filebeat] - os: ubuntu_22 - 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 bf94bd56edb5e40cb6288e7bbb79f53b2b157345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Fri, 13 Sep 2024 09:00:37 +0200 Subject: [PATCH 05/12] fix: temporary removal of offline-url for testing --- .../test_vulnerability_detector/configurations/manager.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/end_to_end/test_vulnerability_detector/configurations/manager.yaml b/tests/end_to_end/test_vulnerability_detector/configurations/manager.yaml index 98ce713dd1..9f2497a2c7 100644 --- a/tests/end_to_end/test_vulnerability_detector/configurations/manager.yaml +++ b/tests/end_to_end/test_vulnerability_detector/configurations/manager.yaml @@ -7,8 +7,6 @@ value: 'yes' - feed-update-interval: value: 10h - - offline-url: - value: 'https://localhost' - section: indexer elements: - enabled: From da32a46902366f86a55d357b9b36872829ec6e95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Fri, 13 Sep 2024 09:32:26 +0200 Subject: [PATCH 06/12] fix: add offline-url element --- .../test_vulnerability_detector/configurations/manager.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/end_to_end/test_vulnerability_detector/configurations/manager.yaml b/tests/end_to_end/test_vulnerability_detector/configurations/manager.yaml index 9f2497a2c7..98ce713dd1 100644 --- a/tests/end_to_end/test_vulnerability_detector/configurations/manager.yaml +++ b/tests/end_to_end/test_vulnerability_detector/configurations/manager.yaml @@ -7,6 +7,8 @@ value: 'yes' - feed-update-interval: value: 10h + - offline-url: + value: 'https://localhost' - section: indexer elements: - enabled: From a3f44e6e34ebd9cdc488220ac9d1694021d0e28b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Fri, 13 Sep 2024 09:38:31 +0200 Subject: [PATCH 07/12] fix: reestablish all agents --- .../e2e_vulnerability_detector.yaml | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/provisioning/environments/e2e_vulnerability_detector.yaml b/provisioning/environments/e2e_vulnerability_detector.yaml index 91904bb054..f0fe3aff01 100644 --- a/provisioning/environments/e2e_vulnerability_detector.yaml +++ b/provisioning/environments/e2e_vulnerability_detector.yaml @@ -3,7 +3,40 @@ manager1: os: ubuntu_22 type: master +manager2: + roles: [manager, filebeat] + os: ubuntu_22 + 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 14e3e5d0c00a0a3b028ebf589623ea8cfa55a70a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Fri, 13 Sep 2024 09:40:21 +0200 Subject: [PATCH 08/12] docs: update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d155161e1..0d605440cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ All notable changes to this project will be documented in this file. - Added support for macOS 14.6 to the Allocation module (Vagrant) ([#5671](https://github.com/wazuh/wazuh-qa/pull/5671)) \- (Framework) +### Changed + +- Change in VD E2E tests to use package feed instead of CTI feed ([#5739](https://github.com/wazuh/wazuh-qa/pull/5739)) \- (Tests) + ### Fixed - Increase results windows in E2E Vulnerability detection ([#5712](https://github.com/wazuh/wazuh-qa/pull/5712/)) \- (Framework + Tests) From 1d748b143a8c195134beacec9912abe577284f45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Tue, 17 Sep 2024 12:04:01 +0200 Subject: [PATCH 09/12] fix: temporal remove of agents for testing --- .../e2e_vulnerability_detector.yaml | 33 ------------------- 1 file changed, 33 deletions(-) diff --git a/provisioning/environments/e2e_vulnerability_detector.yaml b/provisioning/environments/e2e_vulnerability_detector.yaml index f0fe3aff01..91904bb054 100644 --- a/provisioning/environments/e2e_vulnerability_detector.yaml +++ b/provisioning/environments/e2e_vulnerability_detector.yaml @@ -3,40 +3,7 @@ manager1: os: ubuntu_22 type: master -manager2: - roles: [manager, filebeat] - os: ubuntu_22 - 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 048e18dd9ab2b82a1e95d39cb6ae47b2e983d090 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Tue, 17 Sep 2024 12:06:26 +0200 Subject: [PATCH 10/12] docs: update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d605440cc..0c3b97d0b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file. ### Changed - Change in VD E2E tests to use package feed instead of CTI feed ([#5739](https://github.com/wazuh/wazuh-qa/pull/5739)) \- (Tests) +- Improve VD plots title ([#5740](https://github.com/wazuh/wazuh-qa/pull/5740)) \- (Framework) ### Fixed From 4fb275a6b4f7c95d18000995172c942999f516d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Tue, 17 Sep 2024 12:07:30 +0200 Subject: [PATCH 11/12] docs: update changelog --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c3b97d0b7..0d605440cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,6 @@ All notable changes to this project will be documented in this file. ### Changed - Change in VD E2E tests to use package feed instead of CTI feed ([#5739](https://github.com/wazuh/wazuh-qa/pull/5739)) \- (Tests) -- Improve VD plots title ([#5740](https://github.com/wazuh/wazuh-qa/pull/5740)) \- (Framework) ### Fixed From d2a030ebc9f3afe614ad104393d8a8fb559fb14b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Padilla=20=C3=81lvarez?= Date: Tue, 17 Sep 2024 14:09:26 +0200 Subject: [PATCH 12/12] fix: reestablish all agents --- .../e2e_vulnerability_detector.yaml | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/provisioning/environments/e2e_vulnerability_detector.yaml b/provisioning/environments/e2e_vulnerability_detector.yaml index 91904bb054..f0fe3aff01 100644 --- a/provisioning/environments/e2e_vulnerability_detector.yaml +++ b/provisioning/environments/e2e_vulnerability_detector.yaml @@ -3,7 +3,40 @@ manager1: os: ubuntu_22 type: master +manager2: + roles: [manager, filebeat] + os: ubuntu_22 + 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