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.

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

Merge 4.10.1 into 4.10.2 #597

Merged
merged 5 commits into from
Dec 13, 2024
Merged

Merge 4.10.1 into 4.10.2 #597

merged 5 commits into from
Dec 13, 2024

Conversation

AlexRuiz7
Copy link
Member

Description

This PR merges 4.10.1 into 4.10.2.

Related Issues

Resolves #594

Check List

  • Functionality includes testing.
  • API changes companion pull request created, if applicable.
  • Public documentation issue/PR created, if applicable.

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.

AlexRuiz7 and others added 5 commits October 17, 2024 14:38
* 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

---------

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>
* 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>
* 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>
@AlexRuiz7 AlexRuiz7 self-assigned this Dec 13, 2024
@AlexRuiz7 AlexRuiz7 requested a review from a team as a code owner December 13, 2024 13:47
@AlexRuiz7 AlexRuiz7 merged commit 841932e into 4.10.2 Dec 13, 2024
6 checks passed
@AlexRuiz7 AlexRuiz7 deleted the merge-4.10.1-into-4.10.2 branch December 13, 2024 13:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Scheduled upward merges for numbered branches in wazuh-indexer repository - Fortnight #24
3 participants