Merge 4.10.0 into 4.10.1 #633
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 tasks
QU3B1M
approved these changes
Jan 10, 2025
AlexRuiz7
added a commit
that referenced
this pull request
Jan 10, 2025
* Upgrade integrations to the last version (#447) * Upgrade third-party integrations to latest product versions (#368) * Upgrade third-party integrations to latest product versions * Improve compatibility matrix * Change versions in /integrations/.env Signed-off-by: Malena Casas <malena.casas@wazuh.com> * Fix Splunk integrations (#362) * Add table with the version of the integrations * Update CHANGELOG.md Signed-off-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> --------- Signed-off-by: Malena Casas <malena.casas@wazuh.com> Signed-off-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> Co-authored-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> Co-authored-by: JuanGarriuz <juangarriuz@gmail.com> * Merge 4.9.1 into 4.10.0 (#454) * Prepare 4.9.1-rc2 (#436) * Update docker/README.md (#438) * Support new stage 4.9.1-rc3 (#443) * Update operational--integrations_maintenance_request.md (#449) Signed-off-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> --------- Signed-off-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> * Fix GitHub Actions build process dependency errors (#457) * Switch from latest to 22.04 runner * Remove nonexistent packages from workflow provisioner * Remove freeglut3 from provision.sh * Update calendarTime and scan_date fields type (#458) * Merge 4.9.1 into 4.10.0 (#469) * Support for v4.9.1-alpha4 (#461) * Prepare final release notes for 4.9.1 * Fix release date for 4.10.0 in RPM spec file (#471) * Preserve status of wazuh-indexer on upgrade (#498) * Update pre- and post-inst scripts for deb and rpm to store and restore service status * Update prerm script to avoid stopping the service on upgrade * Remove extra spaces and update rpm restart command * Merge 4.9.2 into 4.10.0 (#510) * Support for v4.9.1-alpha4 (#461) * Prepare final release notes for 4.9.1 * Support new version 4.9.2 (#494) * Support new version 4.9.2 * Add estimated release date for 4.9.2 * Fix estimates release date for 4.9.2 * Fix 4.9.1 release notes title --------- Signed-off-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> * Update Changelog and release date (#595) * Support new Wazuh version 4.10.1 (#615) * Support new stage RC3 for 4.10.0 (#629) (#633) * Clear Changelog * Remove new line in VERSION --------- Signed-off-by: Malena Casas <malena.casas@wazuh.com> Signed-off-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> Co-authored-by: Malena Casas <malena.casas@wazuh.com> Co-authored-by: JuanGarriuz <juangarriuz@gmail.com> Co-authored-by: Fede Galland <99492720+f-galland@users.noreply.github.com> Co-authored-by: Kevin Ledesma <kevinledesmam95@gmail.com>
AlexRuiz7
added a commit
that referenced
this pull request
Jan 10, 2025
* Merge 4.10.0 into 4.10.1 (#470) * Upgrade integrations to the last version (#447) * Upgrade third-party integrations to latest product versions (#368) * Upgrade third-party integrations to latest product versions * Improve compatibility matrix * Change versions in /integrations/.env Signed-off-by: Malena Casas <malena.casas@wazuh.com> * Fix Splunk integrations (#362) * Add table with the version of the integrations * Update CHANGELOG.md Signed-off-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> --------- Signed-off-by: Malena Casas <malena.casas@wazuh.com> Signed-off-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> Co-authored-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> Co-authored-by: JuanGarriuz <juangarriuz@gmail.com> * Merge 4.9.1 into 4.10.0 (#454) * Prepare 4.9.1-rc2 (#436) * Update docker/README.md (#438) * Support new stage 4.9.1-rc3 (#443) * Update operational--integrations_maintenance_request.md (#449) Signed-off-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> --------- Signed-off-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> * Fix Github Actions build process dependency errors (#457) * Switch from latest to 22.04 runner * Remove non-existant packages from workflow provisioner * Remove freeglut3 from provision.sh * Update calendarTime and scan_date fields type (#458) * Merge 4.9.1 into 4.10.0 (#469) * Support for v4.9.1-alpha4 (#461) * Prepare final release notes for 4.9.1 --------- Signed-off-by: Malena Casas <malena.casas@wazuh.com> Signed-off-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> Co-authored-by: Malena Casas <malena.casas@wazuh.com> Co-authored-by: JuanGarriuz <juangarriuz@gmail.com> Co-authored-by: Fede Galland <99492720+f-galland@users.noreply.github.com> Co-authored-by: Kevin Ledesma <kevinledesmam95@gmail.com> * Fix release date for 4.10.0 in RPM spec file Signed-off-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> * Merge 4.10.0 into 4.10.1 (#511) * Upgrade integrations to the last version (#447) * Upgrade third-party integrations to latest product versions (#368) * Upgrade third-party integrations to latest product versions * Improve comtability matrix * Change versions in /integrations/.env Signed-off-by: Malena Casas <malena.casas@wazuh.com> * Fix Splunk integrations (#362) * Add table with the version of the integrations * Update CHANGELOG.md Signed-off-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> --------- Signed-off-by: Malena Casas <malena.casas@wazuh.com> Signed-off-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> Co-authored-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> Co-authored-by: JuanGarriuz <juangarriuz@gmail.com> * Merge 4.9.1 into 4.10.0 (#454) * Prepare 4.9.1-rc2 (#436) * Update docker/README.md (#438) * Support new stage 4.9.1-rc3 (#443) * Update operational--integrations_maintenance_request.md (#449) Signed-off-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> --------- Signed-off-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> * Fix Github Actions build process dependency errors (#457) * Switch from latest to 22.04 runner * Remove non-existant packages from workflow provisioner * Remove freeglut3 from provision.sh * Update calendarTime and scan_date fields type (#458) * Merge 4.9.1 into 4.10.0 (#469) * Support for v4.9.1-alpha4 (#461) * Prepare final release notes for 4.9.1 * Fix release date for 4.10.0 in RPM spec file (#471) * Preserve status of wazuh-indexer on upgrade (#498) * Update pre and post inst scripts for deb and rpm to store and restore service status * Update prerm script to avoid stopping the service on upgrade * Remove extra spaces and update rpm restart command * Merge 4.9.2 into 4.10.0 (#510) * Support for v4.9.1-alpha4 (#461) * Prepare final release notes for 4.9.1 * Support new version 4.9.2 (#494) * Support new version 4.9.2 * Add estimated release date for 4.9.2 * Fix estimates release date for 4.9.2 * Fix 4.9.1 release notes title --------- Signed-off-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> --------- Signed-off-by: Malena Casas <malena.casas@wazuh.com> Signed-off-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> Co-authored-by: Malena Casas <malena.casas@wazuh.com> Co-authored-by: JuanGarriuz <juangarriuz@gmail.com> Co-authored-by: Fede Galland <99492720+f-galland@users.noreply.github.com> Co-authored-by: Kevin Ledesma <kevinledesmam95@gmail.com> Signed-off-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> * Merge 4.10.0 into 4.10.1 (#596) * Upgrade integrations to the last version (#447) * Upgrade third-party integrations to latest product versions (#368) * Upgrade third-party integrations to latest product versions * Improve comtability matrix * Change versions in /integrations/.env Signed-off-by: Malena Casas <malena.casas@wazuh.com> * Fix Splunk integrations (#362) * Add table with the version of the integrations * Update CHANGELOG.md Signed-off-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> --------- Signed-off-by: Malena Casas <malena.casas@wazuh.com> Signed-off-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> Co-authored-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> Co-authored-by: JuanGarriuz <juangarriuz@gmail.com> * Merge 4.9.1 into 4.10.0 (#454) * Prepare 4.9.1-rc2 (#436) * Update docker/README.md (#438) * Support new stage 4.9.1-rc3 (#443) * Update operational--integrations_maintenance_request.md (#449) Signed-off-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> --------- Signed-off-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> * Fix Github Actions build process dependency errors (#457) * Switch from latest to 22.04 runner * Remove non-existant packages from workflow provisioner * Remove freeglut3 from provision.sh * Update calendarTime and scan_date fields type (#458) * Merge 4.9.1 into 4.10.0 (#469) * Support for v4.9.1-alpha4 (#461) * Prepare final release notes for 4.9.1 * Fix release date for 4.10.0 in RPM spec file (#471) * Preserve status of wazuh-indexer on upgrade (#498) * Update pre and post inst scripts for deb and rpm to store and restore service status * Update prerm script to avoid stopping the service on upgrade * Remove extra spaces and update rpm restart command * Merge 4.9.2 into 4.10.0 (#510) * Support for v4.9.1-alpha4 (#461) * Prepare final release notes for 4.9.1 * Support new version 4.9.2 (#494) * Support new version 4.9.2 * Add estimated release date for 4.9.2 * Fix estimates release date for 4.9.2 * Fix 4.9.1 release notes title --------- Signed-off-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> * Update Changelog and release date (#595) --------- Signed-off-by: Malena Casas <malena.casas@wazuh.com> Signed-off-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> Co-authored-by: Malena Casas <malena.casas@wazuh.com> Co-authored-by: JuanGarriuz <juangarriuz@gmail.com> Co-authored-by: Fede Galland <99492720+f-galland@users.noreply.github.com> Co-authored-by: Kevin Ledesma <kevinledesmam95@gmail.com> * Support new Wazuh version 4.11.0 (#616) * Merge 4.10.1 into 4.11.0 (#634) * Upgrade integrations to the last version (#447) * Upgrade third-party integrations to latest product versions (#368) * Upgrade third-party integrations to latest product versions * Improve compatibility matrix * Change versions in /integrations/.env Signed-off-by: Malena Casas <malena.casas@wazuh.com> * Fix Splunk integrations (#362) * Add table with the version of the integrations * Update CHANGELOG.md Signed-off-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> --------- Signed-off-by: Malena Casas <malena.casas@wazuh.com> Signed-off-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> Co-authored-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> Co-authored-by: JuanGarriuz <juangarriuz@gmail.com> * Merge 4.9.1 into 4.10.0 (#454) * Prepare 4.9.1-rc2 (#436) * Update docker/README.md (#438) * Support new stage 4.9.1-rc3 (#443) * Update operational--integrations_maintenance_request.md (#449) Signed-off-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> --------- Signed-off-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> * Fix GitHub Actions build process dependency errors (#457) * Switch from latest to 22.04 runner * Remove nonexistent packages from workflow provisioner * Remove freeglut3 from provision.sh * Update calendarTime and scan_date fields type (#458) * Merge 4.9.1 into 4.10.0 (#469) * Support for v4.9.1-alpha4 (#461) * Prepare final release notes for 4.9.1 * Fix release date for 4.10.0 in RPM spec file (#471) * Preserve status of wazuh-indexer on upgrade (#498) * Update pre- and post-inst scripts for deb and rpm to store and restore service status * Update prerm script to avoid stopping the service on upgrade * Remove extra spaces and update rpm restart command * Merge 4.9.2 into 4.10.0 (#510) * Support for v4.9.1-alpha4 (#461) * Prepare final release notes for 4.9.1 * Support new version 4.9.2 (#494) * Support new version 4.9.2 * Add estimated release date for 4.9.2 * Fix estimates release date for 4.9.2 * Fix 4.9.1 release notes title --------- Signed-off-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> * Update Changelog and release date (#595) * Support new Wazuh version 4.10.1 (#615) * Support new stage RC3 for 4.10.0 (#629) (#633) * Clear Changelog * Remove new line in VERSION --------- Signed-off-by: Malena Casas <malena.casas@wazuh.com> Signed-off-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> Co-authored-by: Malena Casas <malena.casas@wazuh.com> Co-authored-by: JuanGarriuz <juangarriuz@gmail.com> Co-authored-by: Fede Galland <99492720+f-galland@users.noreply.github.com> Co-authored-by: Kevin Ledesma <kevinledesmam95@gmail.com> * Remove duplicate line in the preinst script --------- Signed-off-by: Malena Casas <malena.casas@wazuh.com> Signed-off-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> Co-authored-by: Malena Casas <malena.casas@wazuh.com> Co-authored-by: JuanGarriuz <juangarriuz@gmail.com> Co-authored-by: Fede Galland <99492720+f-galland@users.noreply.github.com> Co-authored-by: Kevin Ledesma <kevinledesmam95@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR merges 4.10.0 into 4.10.1.
Related Issues
Resolves #632
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.