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.2 into 4.9.0 #2868

Merged
merged 56 commits into from
Mar 7, 2024
Merged

Merge 4.8.2 into 4.9.0 #2868

merged 56 commits into from
Mar 7, 2024

Conversation

TomasTurina
Copy link
Member

Related issue
#2859

davidcr01 and others added 30 commits February 6, 2024 12:20
@davidcr01
lsof and openssl are installed separately
1776922
@davidcr01
Fixed uninstalling dependencies when not installing
9ecc7a1
@davidcr01
Changed to 4.8.0 for testing
8123ee0
@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
@tdrauncieal
Fix passwords parser in success test
1c06f49
@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 <80041853+juliamagan@users.noreply.github.com>
@Dwordcito
Merge pull request #2831 from wazuh/2818-test-password
81ca23a 
Fix passwords parser
@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
teddytpc1 and others added 16 commits February 23, 2024 10:20
@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
@davidcr01
Merge branch '4.8.2' into bug/2772-wia-should-install-the-lsof-or-ope…
aa8507c 
…nssl-package-only-when-needed
@davidcr01
Restored version for testing
0938c3f
@TomasTurina
Merge branch '4.8.0' into merge-4.8.0-into-4.8.1
8dc962b
@TomasTurina
Remove rocky 8 sca references
a9bc5e1
@TomasTurina
Merge pull request #2860 from wazuh/merge-4.8.0-into-4.8.1
320fdf8 
Merge 4.8.0 into 4.8.1
@TomasTurina
Remove indexer-ism-init script
bd4d440
@TomasTurina
Merge pull request #2863 from wazuh/2838-remove-indexer-ism-init
d7807af 
Remove indexer-ism-init script
@TomasTurina
Merge branch '4.8.1' into merge-4.8.1-into-4.8.2
3108beb
@teddytpc1
Merge pull request #2862 from wazuh/bug/2772-wia-should-install-the-l…
fa31bf3 
…sof-or-openssl-package-only-when-needed

The `lsof` and `openssl` packages are installed only when needed in Installation Assistant
@MarcelKemp
Revert "Merge pull request #2846 from wazuh/fix/2845-revert-changes-r…
77c45fe 
…elated-to-amanzon-linux-2023-and-rocky-linux-8-sca-files"

This reverts commit 472252c, reversing
changes made to f9a5086.
@TomasTurina
Merge pull request #2861 from wazuh/merge-4.8.1-into-4.8.2
85b49c9 
Merge 4.8.1 into 4.8.2
@TomasTurina
Merge branch '4.8.2' into merge-4.8.2-into-4.9.0
e289fed
@TomasTurina TomasTurina self-assigned this Mar 6, 2024
@TomasTurina TomasTurina linked an issue Mar 6, 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 6, 2024
Closed
14 tasks
@MarcelKemp
Copy link
Member

Failing checks

Because the failure of the All in One and Distributed Cases checks comes from the Wazuh dashboard generation error:

Plugin installation was unsuccessful due to error "Plugin wazuh [2.12.0] is incompatible with OpenSearch Dashboards [2.10.0]"

Which would be fixed with the following changes:

I determine that it is not necessary to wait for such changes, and even propose to remove both the check to update the indexer and dashboard ECR images + remove the checks that test indexer and dashboard as of 4.9.0, in favour of the redesign being done in the next issue for 4.9.0:

@MarcelKemp MarcelKemp merged commit d67c561 into 4.9.0 Mar 7, 2024
77 of 94 checks passed
@MarcelKemp MarcelKemp deleted the merge-4.8.2-into-4.9.0 branch March 7, 2024 15:43
This was referenced Mar 7, 2024
Merged
Closed
This was referenced Apr 2, 2024
Merged
Merged
This was referenced Apr 30, 2024
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MarcelKemp MarcelKemp MarcelKemp 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