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.7.0 into master #5861

Merged
merged 16 commits into from
Sep 7, 2023
Merged

Merge 4.7.0 into master #5861

merged 16 commits into from
Sep 7, 2023

Conversation

Desvelao
Copy link
Member

@Desvelao Desvelao commented Sep 7, 2023

Merge 4.7.0 into master

asteriscos and others added 15 commits August 29, 2023 16:53
* Fix inventory unit tests

* Fix agent.table.test.tsx
### Description
This PR aims to change the OpenSerarch version to 2.8.0 
 
### Issues Resolved
#5831 


### Check List
- [ ] All tests pass
  - [ ] `yarn test:jest`
- [ ] New functionality includes testing.
- [ ] New functionality has been documented.
- [ ] Update [CHANGELOG.md](./../CHANGELOG.md)
- [ ] Commits are signed per the DCO using --signoff
* Update package json

* Update versions in changelog

* Update tag script
…les (#5813)

* fix: custom filter in Management > Decoders > Manage decoders files

* fix: removed unused buttonOptions property in Management > Rules

* changelog: add entry
* Bump 4.5.3 (#5824)

* Merge 4.5.2 into 4.5.3 (#5856)

* Bump revision to 02 (4.5.2) (#5844)

bump: revision to 02

* Add environments for 4.5 (#5797)

* Add environments for 4.5

* Add saml required: false

* Fix readme

* Fix readme 4.4

* Update README.md

* Update README.md

---------

Co-authored-by: Ian Yenien Serrano <63758389+yenienserrano@users.noreply.github.com>

---------

Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>
Co-authored-by: Ian Yenien Serrano <63758389+yenienserrano@users.noreply.github.com>
Merge 4.6.0 into 4.7.0
@Desvelao Desvelao requested a review from a team as a code owner September 7, 2023 08:45
@Desvelao Desvelao self-assigned this Sep 7, 2023
Copy link
Member

@yenienserrano yenienserrano left a comment

Choose a reason for hiding this comment

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

LGTM

@github-actions
Copy link
Contributor

github-actions bot commented Sep 7, 2023

Code coverage (Jest) % values
Statements 11.72% ( 4041 / 34475 )
Branches 7.96% ( 1855 / 23283 )
Functions 11.22% ( 925 / 8244 )
Lines 11.91% ( 3929 / 32977 )

@Desvelao Desvelao merged commit 5e9f2b3 into master Sep 7, 2023
2 checks passed
@Desvelao Desvelao deleted the merge-master-into-4.7.0 branch September 7, 2023 09:13
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.

Maintain production and numbered branches post release 4.5.2 in wazuh-kibana-app repository
5 participants