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.8.1 #5057

Merged
merged 114 commits into from
Mar 1, 2024
Merged

Merge 4.8.0 into 4.8.1 #5057

merged 114 commits into from
Mar 1, 2024

Conversation

damarisg
Copy link
Member

@damarisg damarisg commented Mar 1, 2024

Related issue
#5050

Description

Merge 4.8.0 into 4.8.1

javiersanchz and others added 30 commits January 29, 2024 18:34
@javiersanchz
fix: change files syntax artifacts_path
aa4a27a
@davidjiglesias
Merge pull request #4780 from wazuh/feature/4298-fix-performance-test
578027a 
Fix test cluster performance
@Rebits
fix: macOS restart agent handler
e8b84c3
@Rebits
feat: include macOS to VD E2E env by default
ca956ca
@Rebits
fix: migrate E2E timeouts to waiters module
33d2f29
@Rebits
docs: include 4949 changelog
c7e5f11
@Rebits
docs: include 4948 changelog
4490fae
@MARCOSD4
fix: added pre-release and staging filebeat package url
6ab041e
@Rebits
feat: added keystore function to conf module
4194f1c
@Rebits
fix: change VD E2E configuration
feb759f
@Rebits
fix: typo in System modify files method
d8e8132
@Rebits
fix: modify file in case of not providing os name in inv
e8d72f6
@Rebits
fix: typo in install package method
1c3c4a6
@davidjiglesias
Merge pull request #4949 from wazuh/fix/6234-sqlite-error-mitigation-…
92c9265 
…quickfix

Migrate E2E timeouts to waiters module
@davidjiglesias
Merge branch '4.8.0' into fix/4930-macos-missing-handler
898549e
@davidjiglesias
Merge pull request #4948 from wazuh/fix/4930-macos-missing-handler
9a60efe 
Fix macOS Vulnerability Detection handler provision in E2E tests
@davidjiglesias
Merge pull request #4952 from wazuh/fix/4935-change-e2e-vd-configurat…
004cb19 
…ion-keystore

Change e2e vd configuration keystore
@davidjiglesias
Merge pull request #4953 from wazuh/fix/4936-fix-modify-system-files
96f3976 
Fix Modify file method in system module
@davidjiglesias
Merge pull request #4954 from wazuh/fix/4939-install-package-system
3f4b3c5 
Fix install package HostManager method
@MARCOSD4
add: added filebeat vars to roles.yaml
b687ca1
@Rebits
fix: get variable system method
c4fd31d
@MARCOSD4
fix: fix in main.yml
23a7816
@Rebits
fix: monitoring e2e method
73f7a6f
@davidjiglesias
Merge pull request #4958 from wazuh/fix/4941-fix-key-error
7eb080a 
Fix get_host_variables for system tests
@MARCOSD4
fix: vars removed from roles.yaml
82ca219
@Rebits
feat: migrate filebeat url logic to inventory schema
8d4c1fe
@Rebits
fix: filebeat schema parameters
210cee7
@Rebits
refac: filebeat provisioning tasks
242b1e7
@Rebits
Merge branch '4.8.0' into fix/4937-monitoring-e2e
2af4b36
@juliamagan
refactor: delete duplicated check
f2693cd
Rebits and others added 25 commits February 22, 2024 17:25
@Rebits
Merge branch '4.8.0' into fix/4937-monitoring-e2e
538a310
@Rebits
Merge branch '4.8.0' into fix/4938-timeout-increase
fb5775f
@davidjiglesias
Merge pull request #4959 from wazuh/fix/4937-monitoring-e2e
a0d6afe 
Fix monitoring module for e2e tests
@davidjiglesias
Merge branch '4.8.0' into fix/4938-timeout-increase
18893fb
@davidjiglesias
Merge pull request #5003 from wazuh/fix/4938-timeout-increase
735ec8b 
Fix timeout and performance issues in Indexer E2E requests
@davidjiglesias
Merge pull request #5007 from wazuh/enhancement/5006-fix-wazuhdb-stat…
e021b1b 
…s-API-parsing

Fix wazuhdb stats API parsing
@juliamagan
docs: fix changelog entry
be6a408
@juliamagan
Merge pull request #5012 from wazuh/enhancement/5011-update-changelog
9b13bdd 
Fix changelog entry
@juliamagan
Merge branch '4.7.3' of github.com:wazuh/wazuh-qa into merge-4.7.3-in…
457be70 
…to-4.8.0
@juliamagan
Merge pull request #5013 from wazuh/merge-4.7.3-into-4.8.0
c934911 
Merge 4.7.3 into 4.8.0
@damarisg
update: Increase revision (#5018)
af7dac5
@damarisg
Update changelog (#5020)
6e19ed1 
* update: Update Changelog

* update: remove space on Changelog
@Rebits
fix: dependency errors in VD tests
2c54331
@Rebits
fix: move check consistency function to VD module
50c33e4
@Rebits
feat: bump version to 40714
ee9066f
@Rebits
Merge pull request #5048 from wazuh/enhacement/5045-bump-revision
9c6fb63 
Bump revision to 40714
@Rebits
fix: change logging level in VD functions
6f3fe36
@Deblintrake09
Handle VDT data missing in wazuhdb API (#5014)
4d41d94 
* handle vdt table data

* fix api status code handling
@rauldpm
Merge pull request #5032 from wazuh/fix/5019-initial-scans-fix
d24dc06 
Fix Initial scans tests
@Rebits
Merge branch '4.7.3' into merge-4.7.3-into-4.8.0
51b26f3
@Rebits
Merge pull request #5051 from wazuh/merge-4.7.3-into-4.8.0
fdb6d9f 
Merge 4.7.3 into 4.8.0
@damarisg
update: Update CHANGELOG to 4.8.0 (#5054)
593658d
@damarisg
update: Update revision to 4.8.0 (#5055)
212f2c2
@damarisg
update: Fix typo to 4.8.0 (#5056)
f030a3a
@damarisg
Merge branch '4.8.0' into 4.8.1
5c9de2d
@damarisg damarisg mentioned this pull request Mar 1, 2024
Closed
11 tasks
@damarisg damarisg linked an issue Mar 1, 2024 that may be closed by this pull request
Scheduled upward merges for numbered branches in wazuh-qa repository - Fortnight #5 #5050
Closed
11 tasks
@damarisg damarisg merged commit b7e1f8a into 4.8.1 Mar 1, 2024
2 of 4 checks passed
@damarisg damarisg deleted the enhancemente/5050-merge-4.8.0-into-4.8.1 branch March 1, 2024 19:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fcaffieri fcaffieri fcaffieri approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Scheduled upward merges for numbered branches in wazuh-qa repository - Fortnight #5