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 #2860

Merged
merged 40 commits into from
Mar 4, 2024
Merged

Merge 4.8.0 into 4.8.1 #2860

merged 40 commits into from
Mar 4, 2024

Conversation

TomasTurina
Copy link
Member

Related issue
#2859

davidcr01 and others added 30 commits February 9, 2024 12:08
@davidcr01
Removed debug variable in Admin certificate generation
bd78a8e
@teddytpc1
Merge pull request #2821 from wazuh/bug/2815-remove-debug-variable-in…
d451c6b 
…-admin-certificate-generation

Removed debug variable in Admin certificate generation
@davidcr01
Improved cleanup in OVA generation
1b35009
@davidcr01
Added postProvision.sh script to OVA generation
c7f538c
@MiguelazoDS
Do not decompress .tar.xz file, remove xz dependency
2d0f5b1
@teddytpc1
Merge pull request #2827 from wazuh/2816-ova-report-alerts-before-fir…
9e47efa 
…st-use

Improved clean-up in OVA generation
@vikman90
Bump version to 4.7.3 (#2832)
2375131 
* Bump version to 4.7.3

* Amend `source_branch` version bump
@davidcr01
Added wazuh alerts injection to indexer
e4c9624
@davidcr01
Removed ISM script calls
8e11ec5
@davidcr01
Updated cluster initialization script in Offline GHA
5fd88ea
Move VD template
b5ab80a
@davidcr01
Changed localhost to 127.0.0.1 in Offline GHA
f8b7bc9
@davidcr01
Added retry structure to Dashboard initialization
9810ddd
@davidcr01
Debugging GHA
0e4e146
Add possibility to build wazuh with same branch name
a1def9a
@teddytpc1
Merge pull request #2835 from wazuh/change/2833-rollback-ism-changes-…
0eb99f6 
…in-installation-assistant

Rollback ISM changes in Installation Assistant
@rauldpm
Removed ISM changes
58ac813
@Dwordcito
Merge pull request #2836 from wazuh/21955-move-vd-template
e0c725b 
Move Vulnerability Detection Template to Templates Folder
@Dwordcito
Merge pull request #2822 from wazuh/enhancement/21800-defer-vuldet-co…
f3f8cf8 
…ntent-decompression

Do not decompress .tar.xz file, remove xz dependency
@davidcr01
Fix Offline GHA
8a82b91
@teddytpc1
Merge pull request #2839 from wazuh/change/2833-fix-offline-gha
a06e804 
Fix Offline GHA
@rauldpm @juliamagan
Fixed script port options
45cc33f 
Co-authored-by: Julia Magán <[email protected]>
@rauldpm
Removed ISM modifications from Wazuh indexer config files
3feaa8e
@MarcelKemp
Update release date for 4.7.3
3daa2b9
@MarcelKemp
Merge pull request #2843 from wazuh/change/2842-release-date-4.7.3
b90e03f 
Update release date for 4.7.3
@davidjiglesias
Merge pull request #2838 from wazuh/change/2834-rollback-ism
b77cd60 
Remove ISM changes from Wazuh indexer
@davidcr01
Rollback ISM changes for OVA generation
fa76e79
@mjcr99
Revert "Add SPECS for SCA policy Amazon Linux 2023"
1ee9a40 
This reverts commit 069cefb.
@mjcr99
Revert "Added 2023 to posible DIST_VER variable"
04562aa 
This reverts commit db3984a.
@mjcr99
Revert Rocky Linux 8 SCA files inclusion
7a18d69
teddytpc1 and others added 9 commits February 22, 2024 13:52
@teddytpc1
Merge pull request #2844 from wazuh/2833-rollback-ism-ova
f9a5086 
Rollback ISM changes in OVA
@MarcelKemp
Merge pull request #2846 from wazuh/fix/2845-revert-changes-related-t…
472252c 
…o-amanzon-linux-2023-and-rocky-linux-8-sca-files

Revert changes related to amazon linux 2023 and rocky linux 8 sca files
@MarcelKemp
Merge branch '4.7.3' into merge-4.7.3-into-4.8.0
f794b69
@davidcr01
Fixed certificates generation output
3877c69
@teddytpc1
Merge pull request #2850 from wazuh/bug/2837-fix-cert-tool-when-incom…
11e7103 
…plete-config

Fixed certificates generation output
@MarcelKemp
Merge pull request #2849 from wazuh/merge-4.7.3-into-4.8.0
79c6f4f 
Merge 4.7.3 into 4.8.0
@TomasTurina
Update dates for 4.8.0
ecc6df2
@TomasTurina
Merge pull request #2853 from wazuh/update_changelog_4.8.0_beta2
e72c5f3 
Update dates for 4.8.0
@TomasTurina
Merge branch '4.8.0' into merge-4.8.0-into-4.8.1
8dc962b
@TomasTurina TomasTurina requested a review from cborla March 4, 2024 17:31
@TomasTurina TomasTurina self-assigned this Mar 4, 2024
@TomasTurina TomasTurina linked an issue Mar 4, 2024 that may be closed by this pull request
Post release tasks for 4.7.3 #2859
Closed
14 tasks
@TomasTurina TomasTurina mentioned this pull request Mar 4, 2024
Closed
14 tasks
cborla
cborla approved these changes Mar 4, 2024
View reviewed changes
Copy link
Member

@cborla cborla left a comment

Choose a reason for hiding this comment

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

LGTM

@TomasTurina TomasTurina merged commit 320fdf8 into 4.8.1 Mar 4, 2024
88 of 96 checks passed
@TomasTurina TomasTurina deleted the merge-4.8.0-into-4.8.1 branch March 4, 2024 19:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cborla cborla cborla approved these changes

Assignees

@TomasTurina TomasTurina

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.3