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.2 into master #6914

Merged
merged 57 commits into from
Jan 4, 2024
Merged

Merge 4.8.2 into master #6914

merged 57 commits into from
Jan 4, 2024

Conversation

javimed
Copy link
Member

@javimed javimed commented Jan 4, 2024 •
edited
Loading

Description

This PR carries latest changes from earlier branches into master

Checks

Docs building

  • Compiles without warnings.

Code formatting and web optimization

  • Uses three spaces indentation.
  • Adds or updates meta descriptions accordingly.
  • Updates the redirects.js script if necessary (check this guide).

Writing style

  • Uses present tense, active voice, and semi-formal registry.
  • Uses short, simple sentences.
  • Uses bold for user interface elements, italics for key terms or emphasis, and code font for Bash commands, file names, REST paths, and code.

javimed and others added 30 commits August 31, 2023 20:00
@javimed
Expand on the <group> element
c6500a7
@javimed
Change rule examples and improve texts
1737cbf
@JorgeMarinoDev
wAdding difference of usage for <group> element as enclosing or inner…
f18631f 
… element in Rules definition
@vcerenu
add filebeat install into worker deployment
bcddd96
@ncvicchi
Added alpine linux procedure as well as audit 3.1.1 and higher versio…
97ecb14 
…ns note
@ncvicchi @mjcr99
Update source/user-manual/capabilities/file-integrity/advanced-settin…
cf02e88 
…gs.rst

Co-authored-by: Manuel Cano <[email protected]>
@ncvicchi @mjcr99
Update source/user-manual/capabilities/file-integrity/advanced-settin…
52d853c 
…gs.rst

Co-authored-by: Manuel Cano <[email protected]>
@vcerenu
add wazuh manager name variables
006635b
@ncvicchi
Added a missing command to restart audit after copying plugin
c6c5187
@vcerenu
fix assignation
043bf02
@vcerenu
fix assignation
9554a94
@AlexRuiz7
Update upgrade guide
c9b978e 
Adds a missing step to update Fielbeat's ingest pipelines
@javimed
Merge pull request #6872 from wazuh/870-add-filebeat-install-into-worker
0e9f754 
Add filebeat install into worker nodes
@javimed
Add changes from review
371fac3
@javimed
Merge pull request #6871 from wazuh/19585-whodata_with_audit_3_1
929ced7 
Whodata 3.1+ & Alpine Linux support
@AlexRuiz7
Update upgrading-central-components.rst
c8ac8dc
@javimed
Merge pull request #6879 from wazuh/update-upgrade-guide
b6c386a 
Update upgrade guide
@javimed
Merge branch '4.7' into merge-4.7-into-4.7.2
3c65da8
@javimed
Merge pull request #6881 from wazuh/merge-4.7-into-4.7.2
fdd1495 
Merge 4.7 into 4.7.2
@javimed
Update 4.7.2 docs changelog
cb3220f
@javimed
Merge pull request #6882 from wazuh/maintenance/6880-update-4.7.2-cha…
e10b2f3 
…ngelog

Update 4.7.2 docs changelog
@javimed
Update 4.7.2 release notes
2ed9c87
@javimed
Merge pull request #6883 from wazuh/maintenance/6880-update-4.7.2-rel…
5991311 
…ease-notes

Update 4.7.2 release notes
@javimed
Update 4.8.0 release notes
9533476
@javimed
Merge pull request #6889 from wazuh/maintenance/update-4.8.0-release-…
336e72a 
…notes

Update 4.8.0 release notes
Add MacOS 14 SCA Policies
1d79588
@javimed
Add changes from review
8c44a9e
@javimed
Merge pull request #6890 from wazuh/6887-macos-14-sca
b7e0e09 
Add MacOS 14 to SCA policies table
@javimed
Update source/user-manual/ruleset/ruleset-xml-syntax/rules.rst
81e9fe4
@javimed
Merge branch '4.7' into 6268-confusing-group-tag
8c3b811
TomasTurina and others added 26 commits December 28, 2023 13:34
@TomasTurina
Fix YARA outdated link and typo
0f95605
@javimed
Switch use case positions
cb0fac9
@javimed
Merge pull request #6895 from wazuh/change/switch-use-case-positions
64a909a 
Switch use case positions
@javimed
Merge pull request #6894 from wazuh/fix/apply-yara-recommendations
0da969b 
Apply YARA recommendations - AR with YARA
@javimed
Remove WPK unavailable notice
4fd65df
@javimed
Merge pull request #6897 from wazuh/maintenance/remove-wpk-unavailabl…
e0f5ab3 
…e-notice-4.7

Remove WPK unavailable notice
@javimed
Update 4.8.0 release notes
a81e635
@javimed
Merge pull request #6901 from wazuh/maintenance/update-4.8.0-release-…
ee052b9 
…notes

Update 4.8.0 release notes
@javimed
Support 4.8.2 version
45d3897
@javimed
Add 4.8.2 release notes page to redirects
d34a0da
@javimed
Merge pull request #6904 from wazuh/maintenance/bump-version-to-4.8.2
5e5eb8b 
Support 4.8.2 version
@javimed
Update 4.7.2 docs changelog
c2db492
@javimed
Merge branch '4.7' into merge-4.7-into-4.7.2
f64a6ce
@javimed
Merge pull request #6908 from wazuh/merge-4.7-into-4.7.2
16c0a91 
Merge 4.7 into 4.7.2
@javimed
Merge pull request #6907 from wazuh/maintenance/6906-update-4.7.2-cha…
a659194 
…ngelog

Update 4.7.2 docs changelog
@javimed
Merge branch '4.7.2' into merge-4.7.2-into-4.8.0
bc00341
@javimed
Merge pull request #6909 from wazuh/merge-4.7.2-into-4.8.0
f46cf7c 
Merge 4.7.2 into 4.8.0
@javimed
Update 4.8.0 docs changelog
5e0d0ca
@javimed
Merge pull request #6910 from wazuh/maintenance/6906-update-4.8.0-doc…
caaf105 
…s-changelog

Update 4.8.0 docs changelog
@javimed
Merge branch '4.8.0' into merge-4.8.0-into-4.8.1
cae8cb7
@javimed
Merge pull request #6911 from wazuh/merge-4.8.0-into-4.8.1
c40ed99 
Merge 4.8.0 into 4.8.1
@javimed
Update 4.8.1 docs changelog
3184aba
@javimed
Merge pull request #6912 from wazuh/maintenance/6906-update-4.8.1-doc…
fda9263 
…s-changelog

Update 4.8.1 docs changelog
@javimed
Merge branch '4.8.1' into merge-4.8.1-into-4.8.2
0d5dbfb
@javimed
Merge pull request #6913 from wazuh/merge-4.8.1-into-4.8.2
5e77460 
Merge 4.8.1 into 4.8.2
@javimed
Merge branch '4.8.2' into merge-4.8.2-into-master
3737013
@javimed javimed self-assigned this Jan 4, 2024
@javimed javimed linked an issue Jan 4, 2024 that may be closed by this pull request
Scheduled upward merges for numbered branches in wazuh-documentation repository - Fortnight #1 #6906
Closed
9 tasks
@javimed javimed merged commit 906e239 into master Jan 4, 2024
3 checks passed
@javimed javimed deleted the merge-4.8.2-into-master branch January 4, 2024 20:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@javimed javimed

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Scheduled upward merges for numbered branches in wazuh-documentation repository - Fortnight #1
6 participants
@javimed @JorgeMarinoDev @vcerenu @ncvicchi @AlexRuiz7 @TomasTurina