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.2 into master (#102) #121

Merged
merged 1 commit into from
Oct 17, 2024
Merged

Merge 4.10.2 into master (#102) #121

merged 1 commit into from
Oct 17, 2024

Conversation

Tostti
Copy link
Member

@Tostti Tostti commented Oct 17, 2024

Merge 4.10.2 into master

Caution

Merge PR strategy: Create a merge commit

Commits:

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

* 2.13 release notes

Signed-off-by: Stephen Crawford <[email protected]>

* Fix style and package

Signed-off-by: Stephen Crawford <[email protected]>

* Fix style and package

Signed-off-by: Stephen Crawford <[email protected]>

* Fix link

Signed-off-by: Stephen Crawford <[email protected]>

---------

Signed-off-by: Stephen Crawford <[email protected]>
(cherry picked from commit 7c8058f)

Co-authored-by: Stephen Crawford <[email protected]>

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

* Add required ml permissions to support new roles

Signed-off-by: Sicheng Song <[email protected]>

* Add ml permissions

Signed-off-by: Sicheng Song <[email protected]>

* Remove internal ml action permissions

Signed-off-by: Sicheng Song <[email protected]>

* Add back internal ml action permissions

Signed-off-by: Sicheng Song <[email protected]>

---------

Signed-off-by: Sicheng Song <[email protected]>
(cherry picked from commit f0cd1cf)

Co-authored-by: Sicheng Song <[email protected]>

* 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

---------

Co-authored-by: Alex Ruiz Becerra <[email protected]>
Co-authored-by: yenienserrano <[email protected]>

* 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

---------

Signed-off-by: Ian Yenien Serrano <[email protected]>
Co-authored-by: yenienserrano <[email protected]>
Co-authored-by: Ian Yenien Serrano <[email protected]>

* Disable tenant popup (#5)

Co-authored-by: Alex Ruiz Becerra <[email protected]>

* Replace readme (#16)

* Replace readme

* Replace Opensearch to Wazuh

* Update README.md

Signed-off-by: Ian Yenien Serrano <[email protected]>

---------

Signed-off-by: Ian Yenien Serrano <[email protected]>

* Add GitHub workflow for automated build  (#15)

* Manual build

* Workflow for automated build

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

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

---------

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

* Create codeql.yml

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

* Revert changes in cypress-test.yml

* Revert changes in integration-test.yml

* Fix integration test

* Fix cypress test tenancy disabled

---------

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: Alex Ruiz Becerra <[email protected]>
Co-authored-by: Álex Ruiz <[email protected]>

* Skip overview page test

* Skip test for issue

* Skip test for issue

---------

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: Alex Ruiz Becerra <[email protected]>
Co-authored-by: Álex Ruiz <[email protected]>

* Fix home image and lint

* Fix lint

* Fix snapshot

* Fix integration test

* Revert selector

---------

Signed-off-by: Ian Yenien Serrano <[email protected]>
Signed-off-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 of the GitHub actions to create the packages (#33)

* Update Build manual Github action

* Add wazuh version in package.json

* Update package.json

Signed-off-by: Ian Yenien Serrano <[email protected]>

---------

Signed-off-by: Ian Yenien Serrano <[email protected]>

* 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: 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]>
Co-authored-by: Nicolas Agustin Guevara Pihen <[email protected]>
@Tostti Tostti self-assigned this Oct 17, 2024
@Tostti Tostti mentioned this pull request Oct 17, 2024
7 tasks
@Tostti Tostti changed the title Merge 4.9.1 into 4.10.0 (#102) Merge 4.10.2 into master (#102) Oct 17, 2024
Copy link
Member

@asteriscos asteriscos left a comment

Choose a reason for hiding this comment

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

LGTM 🟢

@Tostti Tostti merged commit c243585 into master Oct 17, 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.

4 participants