Skip to content

Migrate main to 3.1.0 #1005

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

Merged
merged 167 commits into from
Jul 8, 2025
Merged

Migrate main to 3.1.0 #1005

merged 167 commits into from
Jul 8, 2025

Conversation

Jorgesnchz
Copy link
Member

Description

This PR migrates the change's performed in wazuh-indexer over OpenSearch 3.1.0 version

Related Issues

Resolves #1000

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 30 commits June 27, 2025 12:00
* Update CODEOWNERS

* Update README.md and SECURITY.md

* Add Wazuh configuration files

* Update README.md

Signed-off-by: Álex Ruiz <[email protected]>
Signed-off-by: Álex Ruiz <[email protected]>
Signed-off-by: Álex Ruiz <[email protected]>
Signed-off-by: Álex Ruiz <[email protected]>
* Add ECS mappings generator, documentation and files for vulnerability detector

* Add event generator script

* Update template settings

---------

Signed-off-by: Álex Ruiz <[email protected]>
* Add ECS mappings generator, documentation and files for vulnerability detector

* Add event generator script

* Add default query fields

---------

Signed-off-by: Álex Ruiz <[email protected]>
Signed-off-by: Álex Ruiz <[email protected]>
Signed-off-by: Álex Ruiz <[email protected]>
* Fix bug with -i option

* Improve error handling
* Improve ISM init script

* Change log file path
* Update config files

* Add VERSION file
* Ignore artifacts folder

* Update build script

- Updated to v2.11.0 version.
- Skipped compilation of the plugins
- The artifact nameis sent to a text file, to access it easily in
GitHub Actions.

* Add GH action to build min packages

* Remove commented code

* Remove unused code
* Add very basic Docker environment

That will do for now

* Add latest changes

* Update Docker environment

- Remove build.md which was included by mistake.
- Improve dev.sh script.
- Update .gitignore to exclude artifacts folder.
- Create .dockerignore file.
- Replace get_version.sh script with inline command.
- Reduce image size by using alpine as base image.

---------

Signed-off-by: Álex Ruiz <[email protected]>
* Rename packages to wazuh-indexer

* Include VERSION file into packages

* Apply Wazuh version to packages names

* Improve build.sh script

Apply suggestions from ShellCheck
* Remove 'events' ECS field

* Add 'wazuh' custom field

* Update event_generator.py for vulnerability detector
Updates the script to upload the wazuh-template.json to the indexer.

Signed-off-by: Álex Ruiz <[email protected]>
* Add script to assemble arm64 and x64 archives (tar)

* Cleanup

* Update config file with latest upstream changes

* Change packages maintainer information

* Fix wrong substitution of config files

* Update dockerignore to ignore git folder

* Update wazuh-indexer.rpm.spec

Remove unnecessary echo commands

* Add wazuh-indexer-performance-analyzer.service

Required to assembly RPM. The plugin does not install this file, so it needs to be added manually.

* Update assemble.sh

Successfully assemble RPM x64. Runner needed to arm64

* Update `build.yml`

* Add WIP documentation for packages' generation

* Test new approach using reusable workflows

* Fix errors

* Restructure reusable workflow

* Fix upload and download paths

* New try

- Adds a reusable workflow to return the version of Wazuh set in source code.
- Attempt to dynamically generate artifacts name to normalize them for usage between jobs.
- Adds revision as input for the workflow.
- Cleanup

* Emulate assemble to test upload of the reusable assembly workflow

* Add Caching Gradle dependencies

* Remove extra '-' in the packages names on the assembly job

* Final cleanup

* Enable RPM package assemble

Remove unused code

* Fix regex to get package name

* Fix download-artifact destination path

* Exclude unimplemented deb assembly

Extend example to run with Act
* Add template and settings to disable replicas on ISM plugin internal indices

* Fix documentation

Replaces exit 1 statements with return 1

* Fix uncommented comment line
* Update ism-init script to parametrize the path of the wazuh-template

---------

Signed-off-by: Álex Ruiz <[email protected]>
* Add tools to assemble DEB packages

* Move wazuh-indexer-performance-analyzer.service to common

* Enable assembly of DEB packages

* Enable full set of plugins

* Actually skip tar assembly

* Add installation of dependencies for DEB assembly

* Install dependencies using sudo

* Format files

* Refactor assemble script
Signed-off-by: Álex Ruiz <[email protected]>
* Build scripts and GH workflows artifacts naming fix

* Add git to dev docker image

* Fixing jobs' inputs and outputs

* remove name input from r_assemble.yml

* Setting qualifier to 1 when not specified

* Add revision flag to scripts and workflow

* Fix copying of packages at assemble.sh

* Use suffix variable instead of architecture

* Fix suffix name in assemble.sh

* Mix solutions to comply with the package naming convention

* Remove unused code

* Use correct name for assembled package

Remove code no longer needed

* Remove outdated comments

---------

Co-authored-by: Álex Ruiz <[email protected]>
* Switching to short SHA commit form in package names

Signed-off-by: Fede Tux <[email protected]>

* Update r_commit_sha.yml

Signed-off-by: Federico Gustavo Galland <[email protected]>

* Update r_commit_sha.yml

Signed-off-by: Álex Ruiz <[email protected]>

---------

Signed-off-by: Fede Tux <[email protected]>
Signed-off-by: Federico Gustavo Galland <[email protected]>
Signed-off-by: Álex Ruiz <[email protected]>
Co-authored-by: Fede Tux <[email protected]>
Co-authored-by: Álex Ruiz <[email protected]>
* add remove files function to assemble.sh

* Remove unneeded files on assembled tar packages

* Remove duplicated function

Fix wrong variable assignment

---------

Co-authored-by: Álex Ruiz <[email protected]>
* add remove files function to assemble.sh

* Remove unneeded files on assembled tar packages

* Remove duplicated function

Fix wrong variable assignment

* Adding function to package Wazuh`s tools to assemble.sh

* Make the files' versions follow the repo's VERSION file

* Fix download of Wazuh tools for packages assembly

---------

Signed-off-by: Álex Ruiz <[email protected]>
Co-authored-by: Álex Ruiz <[email protected]>
abbonno and others added 19 commits June 27, 2025 12:07
Signed-off-by: Alvaro Gonzalez Luque <[email protected]>
Signed-off-by: Álex Ruiz Becerra <[email protected]>
Co-authored-by: Álex Ruiz Becerra <[email protected]>
Signed-off-by: QU3B1M <[email protected]>
Co-authored-by: Kevin Ledesma <[email protected]>
Co-authored-by: GitHub Actions <[email protected]>
Signed-off-by: Jorge Sánchez <[email protected]>
Co-authored-by: Alex Ruiz <[email protected]>
Co-authored-by: Álex Ruiz Becerra <[email protected]>
Co-authored-by: Kevin Ledesma <[email protected]>
Co-authored-by: Jorgesnchz <[email protected]>
Co-authored-by: Alvaro Gonzalez Luque <[email protected]>
Signed-off-by: Jorge Sánchez <[email protected]>
Signed-off-by: Raul Del Pozo Moreno <[email protected]>
Signed-off-by: Álex Ruiz Becerra <[email protected]>
Co-authored-by: Jorge Sánchez <[email protected]>
Co-authored-by: Kevin Ledesma <[email protected]>
Co-authored-by: abbonno <[email protected]>
Co-authored-by: Fede Galland <[email protected]>
Co-authored-by: Alvaro Gonzalez Luque <[email protected]>
Co-authored-by: Raul Del Pozo Moreno <[email protected]>
Signed-off-by: Álex Ruiz Becerra <[email protected]>
Co-authored-by: Álex Ruiz Becerra <[email protected]>
@Jorgesnchz Jorgesnchz self-assigned this Jun 27, 2025
@Jorgesnchz
Copy link
Member Author

The error in the workflows is expected, this is the run where the version of indexer are plugins are based on Opensearch 3.1.0: https://github.com/wazuh/wazuh-indexer/actions/runs/15923862623

@Jorgesnchz Jorgesnchz linked an issue Jun 27, 2025 that may be closed by this pull request
6 tasks
Jorgesnchz and others added 3 commits July 3, 2025 16:19
Signed-off-by: Jorge Sánchez <[email protected]>
Signed-off-by: Álex Ruiz Becerra <[email protected]>
Co-authored-by: abbonno <[email protected]>
Co-authored-by: Álex Ruiz Becerra <[email protected]>
Signed-off-by: Álex Ruiz Becerra <[email protected]>
Co-authored-by: Álex Ruiz Becerra <[email protected]>
@Jorgesnchz
Copy link
Member Author

Jorgesnchz commented Jul 3, 2025

Copy link
Member

@AlexRuiz7 AlexRuiz7 left a comment

Choose a reason for hiding this comment

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

No commits missed
image

@AlexRuiz7 AlexRuiz7 merged commit 09cf8f4 into main-3.1.0 Jul 8, 2025
33 of 35 checks passed
@AlexRuiz7 AlexRuiz7 deleted the migrate-main-to-3.1.0 branch July 8, 2025 13:47
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.

Compatibility with OpenSearch 3.1.0
6 participants