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

Merged
merged 40 commits into from
Jan 11, 2024
Merged

Merge 4.8.0 into 4.8.1 #2759

merged 40 commits into from
Jan 11, 2024

Conversation

pereyra-m
Copy link
Member

Related issue
Closes #2757

This PR aims to merge 4.8.0 into 4.8.1

Dwordcito and others added 30 commits November 23, 2023 16:17
@Dwordcito
Add new libraries to the manager spec file.
b855574
@MiguelazoDS @Dwordcito
Adding flatccrt library to rpm SPECS
aa9a9e4
@Dwordcito
Remove cpe helper installation
ef65612
@Dwordcito
Remove libflatcc from specs files.
6c8bd2b
@jftuduri
Add indexer config to ossec.conf if missing
be4f235
@jftuduri
Revert "Add indexer config to ossec.conf if missing"
7f9a95c 
This reverts commit be4f235.
@Dwordcito
Merge branch '4.8.0' into dev-14153-vulndet-refactor
dc4219e
@jftuduri
Add indexer config to ossec.conf if missing, on upgrade
9ceb882
@tsarquis88 @jftuduri
Update old VD config when installing Wazuh manager
dded7ee 
Co-authored-by: Kevin Cardenas <[email protected]>
@tsarquis88 @jftuduri
Improve script by doing it more general
d370b7b
@tsarquis88 @jftuduri
Revert "Improve script by doing it more general"
220b931 
This reverts commit d0e0905.
@tsarquis88 @jftuduri
Rename variables to shorter names
a35d415
@tsarquis88 @jftuduri
Reuse script
9b5dc85
@tsarquis88 @jftuduri
Fix path
e01f47d
@jftuduri @tsarquis88
Add indexer config to ossec.conf if missing, on upgrade
40548b1 
Co-authored-by: Tomas <[email protected]>
@Damian-Mangold
Merge pull request #2684 from wazuh/dev-2683-fix-upgrade-config-failure
7d4e737 
 Ensure <indexer> config is present in ossec.conf after upgrade via deb package
@Damian-Mangold
Merge pull request #2711 from wazuh/dev-2706-fix-rpm-upgrade-config-f…
8317813 
…ailure

 Ensure <indexer> config is present in ossec.conf after upgrade via rpm
@diegodfrf
Add flag --download-content to generate_debian_package.sh
1622614
@diegodfrf
Add var download_content to build.sh
838881e
@diegodfrf
Add var DOWNLOAD_CONTENT_ENABLED to rules
c55ec47
@diegodfrf
Add decompress to postinst
34c902d
@diegodfrf
Fix var DOWNLOAD_CONTENT
6339a60
@diegodfrf
Change owner queue/vd
63993b4
@diegodfrf
Add --download-content option to generate_rpm_package.sh
586ce07
@diegodfrf
Add --define _download_content_enabled in build.sh
5ac6297
@diegodfrf
Add download content in install.sh call
f27da25
@diegodfrf
Rename vd.tar.xz to vd_1.0.0_vd_4.8.0.tar.xz
1adb361
@diegodfrf
Update folder name vd_updater
e152a5e
@diegodfrf
Update _vdfilename
b05c2a4
@diegodfrf
Fix rm command
b4069cf
Dwordcito and others added 10 commits December 31, 2023 00:58
@pereyra-m pereyra-m requested a review from Dwordcito January 11, 2024 04:43
@pereyra-m pereyra-m mentioned this pull request Jan 11, 2024
Closed
8 tasks
@pereyra-m pereyra-m linked an issue Jan 11, 2024 that may be closed by this pull request
Post release tasks for 4.7.2 #2757
Closed
8 tasks
@MarcelKemp MarcelKemp mentioned this pull request Jan 11, 2024
Closed
3 tasks
@MarcelKemp
Copy link
Member

Failing checks

  • Test-install-deb-systems (ubuntu:xenial, manager, amd64)
  • Test-install-deb-systems (ubuntu:bionic, manager, amd64)
  • Test-install-deb-systems (ubuntu:focal, manager, amd64)
  • Test-install-deb-systems (ubuntu:jammy, manager, amd64)
  • Test-install-deb-systems (debian:stretch, manager, amd64)
  • Test-install-deb-systems (debian:buster, manager, amd64)
  • Test-install-deb-systems (debian:bullseye, manager, amd64) 
    File not found: /build_wazuh/rpmbuild/BUILDROOT/wazuh-manager-4.8.1-merge.4.8.0.into.4.8.1.x86_64/var/ossec/queue/indexer/vd_states_template.json
    File not found: /build_wazuh/rpmbuild/BUILDROOT/wazuh-manager-4.8.1-merge.4.8.0.into.4.8.1.x86_64/var/ossec/vd_1.0.0_vd_4.8.0.tar.xz
    Directory not found: /build_wazuh/rpmbuild/BUILDROOT/wazuh-manager-4.8.1-merge.4.8.0.into.4.8.1.x86_64/var/ossec/queue/vd

Reported issue

@MarcelKemp MarcelKemp merged commit f57bbd9 into 4.8.1 Jan 11, 2024
26 of 35 checks passed
@MarcelKemp MarcelKemp deleted the merge-4.8.0-into-4.8.1 branch January 11, 2024 12:20
@MarcelKemp MarcelKemp mentioned this pull request Jan 11, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MarcelKemp MarcelKemp MarcelKemp approved these changes

@Dwordcito Dwordcito Awaiting requested review from Dwordcito

Assignees

@MarcelKemp MarcelKemp

@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.2
8 participants
@pereyra-m @MarcelKemp @Dwordcito @MiguelazoDS @jftuduri @tsarquis88 @Damian-Mangold @diegodfrf