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.8.0 into 4.8.1 #2746

Merged
merged 16 commits into from
Jan 5, 2024
Merged

Merge 4.8.0 into 4.8.1 #2746

merged 16 commits into from
Jan 5, 2024

Conversation

MarcelKemp
Copy link
Member

Related issue
#2740

This PR aims to merge branch 4.8.0 into 4.8.1.

rauldpm and others added 15 commits December 19, 2023 23:45
@rauldpm
Added wazuh-filebeat template to Wazuh indexer
fa1a551
@rauldpm
Merge remote-tracking branch 'origin/4.8.0' into enhancement/2697-add…
1568ddb 
…-filebeat-template-indexer
@vikman90
Update release date for 4.7.2
ce878c4
@vikman90
Merge pull request #2720 from wazuh/change/4.7.2-release-date
6ac1f30 
Update release date for 4.7.2
@davidjiglesias
Merge pull request #2712 from wazuh/enhancement/2697-add-filebeat-tem…
85eed5a 
…plate-indexer

Added wazuh-filebeat template to Wazuh indexer
@rauldpm
Fixed Filebeat template URL in Wazuh indexer base
b1300d9
@Rebits
Merge pull request #2723 from wazuh/enhancement/2722-add-filebeat-tem…
c9b11d3 
…plate-indexer

Fixed Filebeat template URL in Wazuh indexer
@AlexRuiz7
Update indexer-ism-init.sh (#2726)
dc6e1cb 
Fixes yellow cluster status on single node deployment caused by ISM plugin's configuration indices having 1 replica index.
@c-bordon
The change was reverted to obtain the Wazuh version of the VERSION file
19cafa2
@teddytpc1
Merge pull request #2727 from wazuh/change/2724-ova-generation-fails-…
88b3f81 
…for-v472-rc1-to4.7.2

The change was reverted to obtain the Wazuh version of the VERSION file
@AlexRuiz7
Update indexer-ism-init.sh (#2733)
e4b1e9b 
* Update indexer-ism-init.sh

Update ism-init script to parametrize the path of the wazuh-template

* Update indexer-ism-init.sh
@pereyra-m
Merge branch '4.7.2' into merge-4.7.2-into-4.8.0
b838cd3
@pereyra-m
Fix source branch version
c7d4df1
@MarcelKemp
Merge pull request #2741 from wazuh/merge-4.7.2-into-4.8.0
085aeb3 
Merge 4.7.2 into 4.8.0
@MarcelKemp
Merge branch '4.8.0' into merge-4.8.0-into-4.8.1
d483da8
@MarcelKemp MarcelKemp added the type/maintenance Maintenance issue label Jan 5, 2024
@MarcelKemp MarcelKemp self-assigned this Jan 5, 2024
@MarcelKemp MarcelKemp mentioned this pull request Jan 5, 2024
Closed
9 tasks
@MarcelKemp MarcelKemp linked an issue Jan 5, 2024 that may be closed by this pull request
Scheduled upward merges for numbered branches in wazuh-packages repository - Fortnight #1 #2740
Closed
9 tasks
@MarcelKemp MarcelKemp mentioned this pull request Jan 5, 2024
Closed
3 tasks
@MarcelKemp
Copy link
Member Author

The errors of the failed checks, along with their reasons, are reported in the following issue, in which at least the generation part of the wazuh-indexer package should be fixed:

@MarcelKemp MarcelKemp merged commit 57fb6c3 into 4.8.1 Jan 5, 2024
32 of 54 checks passed
@MarcelKemp MarcelKemp deleted the merge-4.8.0-into-4.8.1 branch January 5, 2024 18:49
@jotacarma90 jotacarma90 restored the merge-4.8.0-into-4.8.1 branch January 18, 2024 14:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TomasTurina TomasTurina TomasTurina approved these changes

@Dwordcito Dwordcito Awaiting requested review from Dwordcito

Assignees

@MarcelKemp MarcelKemp

Labels
type/maintenance Maintenance issue
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Scheduled upward merges for numbered branches in wazuh-packages repository - Fortnight #1
10 participants
@MarcelKemp @TomasTurina @rauldpm @vikman90 @davidjiglesias @Rebits @AlexRuiz7 @c-bordon @teddytpc1 @pereyra-m