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 branch 4.7.0 into master #6267

Merged
merged 55 commits into from
Jul 21, 2023
Merged

Merge branch 4.7.0 into master #6267

merged 55 commits into from
Jul 21, 2023

Conversation

s-ocando
Copy link
Contributor

Description

Merge branch 4.7.0 into master. Related issue: #6261

Checks

  • Compiles without warnings.
  • 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.
  • Uses three spaces indentation.
  • Adds or updates meta descriptions accordingly.
  • Updates the redirects.js script if necessary (check this guide).

nico-stefani and others added 30 commits June 8, 2023 14:48
@nico-stefani
#5903: Added new RBAC permission reference
d470a34
@nico-stefani
Rename section to Events
777b34f
@nico-stefani
Add use case explanation about Events ingestion
83adf29
@nico-stefani
Fix alphabetical order
ba4f203
@nico-stefani
Add versionaddded reference
3af6b36
@nico-stefani @Selutario
Apply suggestions from code review
5fdbf98 
Co-authored-by: José Luis López Sánchez <[email protected]>
@nico-stefani @javimed
Apply suggestions from code review
0e31be1 
Co-authored-by: Javier Medeot <[email protected]>
@nico-stefani
Bump versionaddded to 4.6.0
5f24621
@javimed
{ẂiP} Move cloud security sources
628f796
@GabrielEValenzuela
Add: Notes about wildcard Windows registers support
6503f0b
@GabrielEValenzuela
Fix: XML block
a5da9d7
@GabrielEValenzuela
Fix: Examples
0ef7791 
Add: Documentation in ossec.conf section
@GabrielEValenzuela
Mod: Location wildcard
5e3b98f
@GabrielEValenzuela
Change version from 4.5.0 to 4.6.0
dd130f7
@javimed @GabrielEValenzuela
Add editorial review changes
0b19ad9
@javimed @GabrielEValenzuela
Add editorial review changes
f14d70a
@javimed @GabrielEValenzuela
Change phrasing
4e4cbc9
@GabrielEValenzuela
Fix: Editor review
e5cc88e
@javimed
{WiP} Move cloud security sources
986f3d1
@javimed
{WiP} Move cloud security sources
8aa8025
@javimed
Add editorial review changes
252c04c
@fdalmaup
Add discard_regex parameter to Services
fb43956
@javimed
Undo orphan content removal
0f5042c
@javimed
Fix Wazuh indexer backup folder reference
50e5bb4
@javimed
Fix Wazuh indexer backup folder reference
1c81bd7
@vamera
Fixed a javacript error occurring while managing relative paths on th…
cb57ec3 
…e pages
@s-ocando
Merge pull request #6242 from wazuh/4.4-fix-relative-url
721ad14 
[4.4] Fixed an error occurring while managing relative paths
@s-ocando
Merge pull request #6237 from wazuh/fix-securityconfig-backup-reference
9e34da4 
Fix Wazuh indexer backup folder reference
@nico-stefani
Add better explanation about endpoint limits
fdc8793
@javimed @s-ocando
Update source/_static/js/redirects.js
e3f450d 
Co-authored-by: Sandra Ocando <[email protected]>
s-ocando and others added 23 commits July 14, 2023 16:06
@s-ocando
Merge pull request #6209 from wazuh/organize-cloud-source-files
0186286 
Organize cloud security sources
@nico-stefani
Add explanation about events endpoint
d384442
@javimed
Replace with bumped API version reference
fe4cab2
@javimed
Add changes from review
03a08cf
@javimed
Apply changes from review
1a70960
@javimed
Merge pull request #6151 from wazuh/5903-events-webhook-docs-bis
ccc3fab 
Add events webhook docs
@javimed
Apply changes from review
e7e3ab3
@vikman90
Merge pull request #5932 from wazuh/5926_wildcard_windows_registers
999617f 
FIM wildcard Windows registers documentation
@javimed
Update source/user-manual/reference/ossec-conf/wodle-s3.rst
d2e3305
@javimed
Merge pull request #6207 from wazuh/17388-update-aws-services-section
3538c44 
Add discard_regex parameter to Services
@javimed
Add ossec.conf references
5b9a1b9
@s-ocando
Bump version to 4.5.2
88967f2
@javimed
Merge pull request #6252 from wazuh/bump-version-to-4.5.2
4c16959 
Bump version to 4.5.2
@javimed @s-ocando
Apply suggestions from code review
ffa69a4 
Co-authored-by: Sandra Ocando <[email protected]>
@s-ocando
Merge pull request #6249 from wazuh/6248-clarify-manager-configuration
2a01083 
Add ossec.conf references
@javimed
Merge pull request #6262 from wazuh/merge-4.4-into-4.5.0
999df8f 
Merge branch 4.4 into 4.5.0
@javimed
Merge pull request #6263 from wazuh/merge-4.5.0-into-4.5.1
9687e2f 
Merge branch 4.5.0 into 4.5.1
@javimed
Merge pull request #6264 from wazuh/merge-4.5.1-into-4.5.2
8bb6342 
Merge branch 4.5.1 into 4.5.2
@s-ocando
Merge branch '4.6.0' into merge-4.5.2-into-4.6.0
2178523
@javimed
Merge pull request #6265 from wazuh/merge-4.5.2-into-4.6.0
854acf6 
Merge branch 4.5.2 into 4.6.0
@s-ocando
Merge branch '4.7.0' into merge-4.6.0-into-4.7.0
00ca7d0
@javimed
Merge pull request #6266 from wazuh/merge-4.6.0-into-4.7.0
8f8837c 
Merge branch 4.6.0 into 4.7.0
@s-ocando
Merge branch 'master' into merge-4.7.0-into-master
e8eb00d
@s-ocando s-ocando marked this pull request as ready for review July 21, 2023 14:06
javimed
javimed approved these changes Jul 21, 2023
View reviewed changes
Copy link
Member

@javimed javimed left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@javimed javimed merged commit 35cb943 into master Jul 21, 2023
3 checks passed
@javimed javimed deleted the merge-4.7.0-into-master branch July 21, 2023 14:38
@javimed javimed linked an issue Jul 21, 2023 that may be closed by this pull request
Scheduled upward merges for numbered branches in wazuh-documentation repository - Fortnight #14 #6261
Closed
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@javimed javimed javimed approved these changes

Assignees
No one assigned
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 #14
7 participants
@s-ocando @javimed @nico-stefani @GabrielEValenzuela @fdalmaup @vamera @vikman90