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.

Sign up for GitHub

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

Jump to bottom

Merge 4.6.0 into 4.7.0 #5860

Merged
merged 11 commits into from
Sep 7, 2023
Merged

Merge 4.6.0 into 4.7.0 #5860

merged 11 commits into from
Sep 7, 2023

Conversation

Desvelao
Copy link
Member

@Desvelao Desvelao commented Sep 7, 2023

Merge 4.6.0 into 4.7.0

Tostti and others added 11 commits August 30, 2023 11:08
@Tostti
Update package json
33dee69
@Tostti
Update version in changelog
067a334
@Tostti
Update tag script
5691c1f
@Tostti
Update revisions
23211fc
@Tostti
Modify opensearch version in 4.6.0 (#5832)
0d32b07 
### 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
@asteriscos
Bump revision 02
f3f2fc5
@AlexRuiz7
Bump Node version to 16.20.0
a3c2ac5
@AlexRuiz7
Fix revision number (#5837)
ee2ac0b 
Revert to 00
@Desvelao
Fix wrong filter button in Management > Decoders > Manage decoders fi…
923e5ed 
…les (#5813)

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

* fix: removed unused buttonOptions property in Management > Rules

* changelog: add entry
@Desvelao @asteriscos @yenienserrano
Merge 4.5.3 into 4.6.0 (#5859)
4b39a71 
* 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>
@Desvelao
merge: merge 4.6.0 into 4.7.0
572d6b8
@Desvelao Desvelao requested a review from a team as a code owner September 7, 2023 08:31
@Desvelao Desvelao self-assigned this Sep 7, 2023
@Desvelao Desvelao linked an issue Sep 7, 2023 that may be closed by this pull request
Maintain production and numbered branches post release 4.5.2 in wazuh-kibana-app repository #5855
Closed
13 tasks
@Desvelao Desvelao mentioned this pull request Sep 7, 2023
Closed
13 tasks
yenienserrano
yenienserrano approved these changes Sep 7, 2023
View reviewed changes
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 a80a2a0 into 4.7.0 Sep 7, 2023
2 checks passed
@Desvelao Desvelao deleted the merge-4.7.0-into-4.6.0 branch September 7, 2023 08:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yenienserrano yenienserrano yenienserrano approved these changes

Assignees

@Desvelao Desvelao

Labels
None yet
Projects
None yet
Milestone
No milestone
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
@Desvelao @yenienserrano @Tostti @asteriscos @AlexRuiz7