Skip to content

Commit

Permalink
Merge pull request #5493 from wazuh/merge-4.8.0-into-4.8.1
Browse files Browse the repository at this point in the history
Merge 4.8.0 into 4.8.1
  • Loading branch information
juliamagan authored Jun 12, 2024
2 parents 5947cec + 25fc4b3 commit 3cd69e3
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
8 changes: 6 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ All notable changes to this project will be documented in this file.

## [4.8.1] - TBD

## [4.8.0] - TBD
## [4.8.0] - 12/06/2024

### 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)
Expand Down Expand Up @@ -69,6 +70,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)
Expand Down Expand Up @@ -118,7 +120,9 @@ All notable changes to this project will be documented in this file.
- Fix test cluster performance. ([#4780](https://github.com/wazuh/wazuh-qa/pull/4780)) \- (Framework)
- Fixed the graphic generation for the logcollectord statistics files. ([#5021](https://github.com/wazuh/wazuh-qa/pull/5021)) \- (Framework)

## [4.7.5] - TBD
## [4.7.5] - 31/05/2024

- No changes

## [4.7.4] - 29/04/2024

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3cd69e3

Please sign in to comment.