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

Merged
merged 24 commits into from
Dec 22, 2023
Merged

Merge 4.8.0 into 4.8.1 #2718

merged 24 commits into from
Dec 22, 2023

Conversation

pereyra-m
Copy link
Member

Related issue
#2704

This PR aims to merge branch 4.8.0 into 4.8.1

Dwordcito and others added 24 commits December 7, 2023 15:59
@Dwordcito
Update release ETA for 4.7.1
a634bd6
@Dwordcito
Merge pull request #2672 from wazuh/operational/2671-change-eta
c6610cf 
Update release ETA for 4.7.1
@davidcr01
Fixed source branch value
ac5ed67
@teddytpc1
Merge pull request #2675 from wazuh/bug/fix-source-branch-4.7.1
ab7ec2e 
Fixed source branch value
@davidcr01
Removed gnupg from RPM dependency list
721cabf
@teddytpc1
Merge pull request #2677 from wazuh/enhancement/2663-investigate-if-g…
88773a9 
…pg-gnupg-package-is-necessary-as-dependency-in-wia

Removed `gnupg` package as RPM dependency in WIA
@davidcr01
Added common_checkAptLock function
bd36383
@teddytpc1
Merge pull request #2687 from wazuh/bug/2686-function-installcommon_c…
3fdcb53 
…heckaptlock-is-not-found-in-wia

Added `common_checkAptLock` function
@mjcr99
Added Debian12 SCA to SPECS
ec50d63
@vikman90
Merge pull request #2693 from wazuh/enhancement/2280-specs-for-new-sc…
340abef 
…a-debian-linux-12

Add Debian12 SCA to SPECS
@davidcr01
Updated Filebeat module version to 0.4
9366d1a
@davidcr01
Updated Filebeat module version to 0.4 in Offline GHA
20e32d8
@teddytpc1
Merge pull request #2696 from wazuh/change/599-resource-description-a…
8bc3f17 
…dapt-the-devops-repositories-to-use-the-new-filebeat-module-packages

Updated Filebeat module version to 0.4 in WIA
@davidcr01
Fixed source_branch variable definition
2c8724f
@teddytpc1
Merge pull request #2708 from wazuh/bug/2702-the-git-package-should-n…
ad35e08 
…ot-be-a-dependency-to-build-the-wazuh-unattended-scripts

Fixed `source_branch` variable definition
@AlexRuiz7
Update indexer-ism-init.sh (#2700)
bf82f5d 
* Update `indexer-ism-init.sh`

Updates the script to upload the wazuh-template.json to the indexer.

* Revert log file path
@c-bordon
Removed wazuh-template json
8d1ca4d
@c-bordon
Added end space
62afa40
@MarcelKemp
Merge branch '4.7.1' into merge-4.7.1-into-4.7.2
5028538
@vikman90
Merge pull request #2714 from wazuh/merge-4.7.1-into-4.7.2
63271de 
Merge 4.7.1 into 4.7.2
@MarcelKemp
Merge branch '4.7.2' into merge-4.7.2-into-4.8.0
204af29
@teddytpc1
Merge pull request #2713 from wazuh/change/1475-remove-wazuh-template…
4b95993 
…-download-from-indexer-to4.8.0

Removed wazuh-template json
@Dwordcito
Merge pull request #2715 from wazuh/merge-4.7.2-into-4.8.0
233ca6f 
Merge 4.7.2 into 4.8.0
@pereyra-m
Merge branch '4.8.0' into merge-4.8.0-into-4.8.1
57f8be8
@pereyra-m pereyra-m requested a review from Dwordcito December 22, 2023 03:22
@pereyra-m pereyra-m self-assigned this Dec 22, 2023
@pereyra-m pereyra-m mentioned this pull request Dec 22, 2023
Closed
8 tasks
@jotacarma90
Copy link
Member

There are some failing checks related to All In One and Distributed Cases.
They will be solved in another issue #2717

@vikman90 vikman90 merged commit 4188607 into 4.8.1 Dec 22, 2023
57 of 74 checks passed
@vikman90 vikman90 deleted the merge-4.8.0-into-4.8.1 branch December 22, 2023 08:13
@MarcelKemp MarcelKemp linked an issue Dec 26, 2023 that may be closed by this pull request
Post release tasks for 4.7.1 #2704
Closed
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jotacarma90 jotacarma90 jotacarma90 approved these changes

@Dwordcito Dwordcito Awaiting requested review from Dwordcito

Assignees

@pereyra-m pereyra-m

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Post release tasks for 4.7.1
10 participants
@pereyra-m @jotacarma90 @vikman90 @Dwordcito @davidcr01 @teddytpc1 @mjcr99 @AlexRuiz7 @c-bordon @MarcelKemp