From 41910e8a4b2a39c778cb852d09d423faf66cf74f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Rebollo=20P=C3=A9rez?= Date: Fri, 24 May 2024 15:04:38 +0100 Subject: [PATCH 1/5] feat: support wazuh-indexer monitoring --- deps/wazuh_testing/wazuh_testing/tools/performance/binary.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/wazuh_testing/wazuh_testing/tools/performance/binary.py b/deps/wazuh_testing/wazuh_testing/tools/performance/binary.py index eb02eef076..6a3d190615 100644 --- a/deps/wazuh_testing/wazuh_testing/tools/performance/binary.py +++ b/deps/wazuh_testing/wazuh_testing/tools/performance/binary.py @@ -78,7 +78,7 @@ def get_process_pids(cls, process_name, check_children=True) -> list: if any(filter(lambda x: f'{process_name}.py' in x, proc.cmdline())): pid = proc.pid break - elif process_name == 'wazuh-indexer': + elif process_name in ['wazuh-indexer', 'wazuh-dashboard']: if any(filter(lambda x: f'{process_name}' in x, proc.cmdline())): pid = proc.pid break From 11b022ed5568965b16831c7b3260c68eb918a68a Mon Sep 17 00:00:00 2001 From: Julia Date: Thu, 6 Jun 2024 09:05:58 +0200 Subject: [PATCH 2/5] docs: update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f283ec2dc3..c858b939d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file. ### Added +- Add functionality to obtain metrics from the dashboard ([#5432](https://github.com/wazuh/wazuh-qa/pull/5432)) \- (Framework) - Add `Timestamp` field to the indexer statistics ([#5357](https://github.com/wazuh/wazuh-qa/pull/5357)) \- (Framework) - Add `GeneratorVulnerabilityEvents` in agent simulator ([#5265](https://github.com/wazuh/wazuh-qa/pull/5265)) \- (Framework) - Add functionality to obtain statistics and metrics from the indexer ([#5090](https://github.com/wazuh/wazuh-qa/pull/5090)) \- (Framework) From e360039d2b84719a8599dc90fd51301d10f4d7d6 Mon Sep 17 00:00:00 2001 From: Julia Date: Thu, 6 Jun 2024 09:12:39 +0200 Subject: [PATCH 3/5] refactor: bump revision --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 9f514b1faf..682b5a5fb9 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { "version": "4.8.0", - "revision": "40811" + "revision": "40812" } From 5fd16e7a2795be7b3dc5a2ed34873a03239f282f Mon Sep 17 00:00:00 2001 From: Julia Date: Sun, 9 Jun 2024 15:11:19 +0200 Subject: [PATCH 4/5] fix: set requests version --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5215be5bc4..7094867f69 100644 --- a/requirements.txt +++ b/requirements.txt @@ -25,7 +25,7 @@ pytest-html==3.1.1 pytest==6.2.2 ; python_version < "3.9" pytest==7.1.2 ; python_version >= "3.9" pyyaml==6.0.1 -requests>=2.23.0 +requests==2.27.1 scipy>=1.0; platform_system == "Linux" or platform_system == "Darwin" or platform_system=='Windows' seaborn>=0.11.1; platform_system == "Linux" or platform_system == "Darwin" or platform_system=='Windows' setuptools~=56.0.0 From df5282b69972341c35a9caa9e8956b1fa5907468 Mon Sep 17 00:00:00 2001 From: Julia Date: Mon, 10 Jun 2024 09:29:36 +0200 Subject: [PATCH 5/5] docs: update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c858b939d0..5028188f30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -68,6 +68,7 @@ All notable changes to this project will be documented in this file. ### Fixed +- Set a stable `requets` version ([#5476](https://github.com/wazuh/wazuh-qa/pull/5476)) \- (Framework) - Include logic to retry package installation if the lock file is currently in use ([#5421](https://github.com/wazuh/wazuh-qa/pull/5421)) \- (Framework) - Increase E2E Vulnerability detection change manager test timeout ([#5414](https://github.com/wazuh/wazuh-qa/pull/5414)) \- (Tests) - Fix filter vulnerabilities function in case of multiple packages are used ([#5419](https://github.com/wazuh/wazuh-qa/pull/5419)) \- (Framework)