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

Merged
merged 2 commits into from
Dec 13, 2024
Merged

Merge 4.10.1 into 4.10.2 #144

merged 2 commits into from
Dec 13, 2024

Conversation

Desvelao
Copy link
Member

Merge 4.10.1 into 4.10.2

Caution

Merge PR strategy: Create a merge commit

Desvelao and others added 2 commits December 13, 2024 16:11
* Bump revision (#116)

* chore: bump 4.10.0 rev 03 (#123)

* Bump revision 04 (#133)

* Update the actions' version (#131)

* Support Wazuh 5.0.0

* Merge 4.9.1 into 4.10.0 (#102) (#121)

* 2.13 release notes (opensearch-project#1832) (opensearch-project#1837)

* 2.13 release notes



* Fix style and package



* Fix style and package



* Fix link



---------


(cherry picked from commit 7c8058f)



* Add required ml permissions to support new roles (opensearch-project#1838) (opensearch-project#1844)

* Add required ml permissions to support new roles



* Add ml permissions



* Remove internal ml action permissions



* Add back internal ml action permissions



---------


(cherry picked from commit f0cd1cf)



* Add compatibility with OpenSearch 2.11.0 (#31)

* Bump version Security Dashboards Plugin 2.9.0.0 (#21)

* Upgrade to version 2.8.0 of Security Dashboards Plugin (#20)

* Patch actions and workflows. Skip integration tests that fail (#4)

* Change plugin name in actions and workflows

* Patch install-dashboards action

* Change jest config path

* Skip tests

---------




* Change Wazuh logo and titles (#3)

* Change Wazuh logo and titles

* Don't force custom logo to have 100% width

* Add comment

* Fix lint

* Fix prettier

* Update snapshots

---------





* Disable tenant popup (#5)



* Replace readme (#16)

* Replace readme

* Replace Opensearch to Wazuh

* Update README.md



---------



* Add GitHub workflow for automated build  (#15)

* Manual build

* Workflow for automated build

* Update .github/workflows/dev-environment.yml



---------




* Create codeql.yml



* Revert changes in cypress-test.yml

* Revert changes in integration-test.yml

* Fix integration test

* Fix cypress test tenancy disabled

---------







* Skip overview page test

* Skip test for issue

* Skip test for issue

---------







* Fix home image and lint

* Fix lint

* Fix snapshot

* Fix integration test

* Revert selector

---------







* Update of the GitHub actions to create the packages (#33)

* Update Build manual Github action

* Add wazuh version in package.json

* Update package.json



---------



* Change order of security in left menu (#36)

* Change order of security in left menu

* Fix cypress test

* Fix repository tests (#46)

* Initial commit

* Removed Windows and Mac tests

* Fix oidc test

* Fix SAML test

* Bump 4.9.0 to revision 01 (#56)

* chore: bump 4.9.0 revision 02 (#64)

* Bump revision 03 (#74)

* chore: bump to 4.9.1 revision 00 (#76)

* Update the security policy (#95)

* change: update the security policy

* fix: security policy

* Update repository security policy (#97)

* chore(bump): revision 4.9.1 01 (#99)

---------

Signed-off-by: Ian Yenien Serrano <[email protected]>
Signed-off-by: Álex Ruiz <[email protected]>
Co-authored-by: Antonio <[email protected]>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Stephen Crawford <[email protected]>
Co-authored-by: Sicheng Song <[email protected]>
Co-authored-by: Álex Ruiz <[email protected]>
Co-authored-by: Ian Yenien Serrano <[email protected]>
Co-authored-by: Federico Rodriguez <[email protected]>
Co-authored-by: yenienserrano <[email protected]>

* Update all workflows to use actions/checkout@v4 for improved compatibility and performance

* Update GitHub workflows to use actions/setup-java@v4 with Temurin distribution for better support and performance

* Update workflows to use derek-ho/start-opensearch@v6 for enhanced features and compatibility across all GitHub actions

* Update workflows to use derek-ho/setup-opensearch-dashboards@v3 for better features and compatibility across all GitHub actions

* Update workflows to use tibdex/[email protected] for improved installation retrieval method and enhanced functionality

* Update workflows to use actions/upload-artifact@v4 for improved artifact upload and added overwrite functionality

* Update run-cypress-tests action to use Wandalen/wretry.action@v3 for improved reliability in test retries

* Update backport workflow to use VachaShah/backport@v2 for enhanced features and improved functionality in backporting changes

* Update Wazuh version to 4.10.0 with revision 03

* Update Wazuh revision to "00" in package.json

* Fix missing newline at end of package.json file

* Update SECURITY.md to redirect vulnerability reports to OpenSearch Security via email

* Revise SECURITY.md to establish Wazuh's formal security policy and guidelines for reporting vulnerabilities

---------

Signed-off-by: Ian Yenien Serrano <[email protected]>
Signed-off-by: Álex Ruiz <[email protected]>
Co-authored-by: Tostti <[email protected]>
Co-authored-by: Nicolas Agustin Guevara Pihen <[email protected]>
Co-authored-by: Antonio <[email protected]>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Stephen Crawford <[email protected]>
Co-authored-by: Sicheng Song <[email protected]>
Co-authored-by: Álex Ruiz <[email protected]>
Co-authored-by: Ian Yenien Serrano <[email protected]>
Co-authored-by: Federico Rodriguez <[email protected]>
Co-authored-by: yenienserrano <[email protected]>

* chore: bump 4.10.0 rev 05 (#137)

* Apply reference name change (#138)

* chore(bump): 4.10.0 rev 06 (#141)

* fix: conflict

* fix: typo

---------

Signed-off-by: Ian Yenien Serrano <[email protected]>
Signed-off-by: Álex Ruiz <[email protected]>
Co-authored-by: Federico Rodriguez <[email protected]>
Co-authored-by: Nicolas Agustin Guevara Pihen <[email protected]>
Co-authored-by: Guido Modarelli <[email protected]>
Co-authored-by: Tostti <[email protected]>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Stephen Crawford <[email protected]>
Co-authored-by: Sicheng Song <[email protected]>
Co-authored-by: Álex Ruiz <[email protected]>
Co-authored-by: Ian Yenien Serrano <[email protected]>
Co-authored-by: yenienserrano <[email protected]>
Copy link

@guidomodarelli guidomodarelli left a comment

Choose a reason for hiding this comment

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

Legend:
⚫ 🠆 The test hasn't started yet.
🟢 🠆 All checks passed.
🟡 🠆 There is at least one expected fail or skipped test and no failures.
🔴 🠆 There is at least one failed check.
⚪ 🠆 Doesn't apply.
🔧 🠆 Request changes.

CR 🟢

@Desvelao Desvelao merged commit e14778f into 4.10.2 Dec 13, 2024
24 of 26 checks passed
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-security-dashboards-plugin repository - Fortnight #24
2 participants