Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge 4.8.0 into 4.9.0 #5317

Merged
merged 158 commits into from
Apr 30, 2024
Merged

Merge 4.8.0 into 4.9.0 #5317

merged 158 commits into from
Apr 30, 2024

Conversation

rauldpm
Copy link
Member

@rauldpm rauldpm commented Apr 30, 2024 •
edited
Loading

Related issue
#5307

Description

Merge 4.8.0 into 4.9.0

Note: 4.8.1 and 4.8.2 changes were migrated to 4.9.0 in branch maintenance tasks

MARCOSD4 and others added 30 commits March 11, 2024 16:57
@MARCOSD4
Add wazuh-indexer option
52558b1
@santipadilla
Change package installation with npm
c99ea7d
@santipadilla
Change package uninstallation with npm
6e38208
@santipadilla
Blank space correction
65cdacf
@Rebits
fix: update indexer configuration
39d3d83
@Rebits
fix: update wait_until_vd_is_updated regex
b124400
@santipadilla
Installation of npm packages for all OS
54924bf
@santipadilla
Uninstallation of npm packages for all OS
0d9950e
@Rebits
fix: test group sync status
a980ae5
@rafabailon
feat: change grafana packages
6fe973f
@Rebits
fix: restore stoud in run command method
b69c1f0
@rafabailon
feat: adapt tests
8da7fbd
@rafabailon
feat: Use grafana in all ubuntu and centos tests
5f1362b
@rafabailon
feat: fix centos packages
c5c0029
@santipadilla
npm command for all vd testing OS
1f680a2
@santipadilla
Helpful comments
06641b7
@juliamagan
Merge pull request #5127 from wazuh/fix/5126-update-vd-conf
9898369 
Update Indexer configuration in VD E2E tests
@juliamagan
fix: fix parser for non packages vulnerabilities
3df11bd
@MARCOSD4
fix: add alerts.json to the report
9512ce2
@juliamagan
docs: update changelog
f9d309d
@MARCOSD4
fix: fix a typo error
73ec330
@santipadilla
Arrangement of returns
b924e9a
@MARCOSD4
add: add description to the scan cases test
2523139
@Rebits
feat: increase timeout to 40
53b8e4f
@Rebits
feat: increase timeout to 40
6988bec
@Rebits
feat: increase timeout to 20
b8eb2da
@juliamagan
fix: fix typo
b6095de
@MARCOSD4
fix: fix install_package function
e537ebf
@juliamagan
Merge pull request #5135 from wazuh/enhancement/5103-change-grafana-p…
be145cc 
…ackages

Change Grafana Packages in Vulnerability Tests
@juliamagan
fix: filter by timestamp
cb71001
juliamagan and others added 24 commits April 19, 2024 10:08
@juliamagan
Merge pull request #5271 from wazuh/enhancement/5270-update-changelog
e2c9391 
Update 4.8.0 changelog
@juliamagan
refactor: bump revision
9caf709
@juliamagan
Merge pull request #5272 from wazuh/enhancement/5270-bump-revision
9997fc0 
Bump revision for 4.8.0 Beta 6
@Rebits
docs: update get_indexer_values docstring
751e327
@Rebits
refac: get_index_values function
d0cdea6
@Rebits
refac: migrate indexer filter to indexer_api module
51a9ab0
@MARCOSD4
feat: include vulnerabilities and alerts statistics
5222225
@Rebits
docs: include indexer filters docstring
bdadff4
@Rebits
fix: use vulns filter instead of alerts in second scan test
fa1fa74
@Rebits
refac: filters method
89b1250
@juliamagan
refactor: bump revision
6c96d7d
@juliamagan
Merge pull request #5283 from wazuh/enhancement/5282-bump-revision
42b0d7e 
Bump revision for 4.7.4 RC1
@Rebits
doc: include 5266 pr changelog
982c568
@Rebits
doc: improve 5266 pr changelog entry
b0a2fa5
@davidjiglesias
Merge pull request #5266 from wazuh/fix/5239-vd-timestamp-filter
5c4efff 
Fix change greater than timestamp by detected_at in vulnerability index
@MARCOSD4
docs: edit comments
1d540a8
@juliamagan
refactor: bump revision
028e453
@juliamagan
Merge pull request #5292 from wazuh/enhancement/5291-bump-revision
a8ddf36 
Bump revision for 4.7.4 RC 2
@MARCOSD4
docs: update changelog
5e177be
@MARCOSD4
Merge branch '4.8.0' into enhancement/6208-indexer-statistics
8eba16a
@juliamagan
Merge pull request #5090 from wazuh/enhancement/6208-indexer-statistics
f79f2d3 
Add wazuh-indexer option in binary.py script
@rauldpm
Merge remote-tracking branch 'origin/4.7.4' into merge-4.7.4-into-4.8.0
6f20dad
@rauldpm
Merge pull request #5316 from wazuh/merge-4.7.4-into-4.8.0
eaca31e 
Merge 4.7.4 into 4.8.0
@rauldpm
Merge remote-tracking branch 'origin/4.8.0' into merge-4.8.0-into-4.9.0
2df2821
@rauldpm rauldpm self-assigned this Apr 30, 2024
@rauldpm rauldpm mentioned this pull request Apr 30, 2024
Closed
6 tasks
pro-akim
pro-akim approved these changes Apr 30, 2024
View reviewed changes
Copy link
Member

@pro-akim pro-akim left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review Notes

LGTM

CHANGELOG.md Show resolved Hide resolved
@rauldpm rauldpm merged commit 4eb62a8 into 4.9.0 Apr 30, 2024
@rauldpm rauldpm deleted the merge-4.8.0-into-4.9.0 branch April 30, 2024 11:01
@rauldpm rauldpm linked an issue Apr 30, 2024 that may be closed by this pull request
Post release tasks for 4.7.4 #5307
Closed
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pro-akim pro-akim pro-akim approved these changes

Assignees

@rauldpm rauldpm

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Post release tasks for 4.7.4
8 participants
@rauldpm @pro-akim @MARCOSD4 @santipadilla @Rebits @rafabailon @juliamagan @davidjiglesias