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

Commits on Jun 8, 2023

  1. #5903: Added new RBAC permission reference

    @nico-stefani
    nico-stefani committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    d470a34 View commit details
    Browse the repository at this point in the history

  2. Rename section to Events

    @nico-stefani
    nico-stefani committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    777b34f View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2023

  1. Add use case explanation about Events ingestion

    @nico-stefani
    nico-stefani committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    83adf29 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2023

  1. Fix alphabetical order

    @nico-stefani
    nico-stefani committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    ba4f203 View commit details
    Browse the repository at this point in the history

  2. Add versionaddded reference

    @nico-stefani
    nico-stefani committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    3af6b36 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2023

  1. Apply suggestions from code review 

    Co-authored-by: José Luis López Sánchez <[email protected]>
    @nico-stefani @Selutario
    nico-stefani and Selutario authored Jun 23, 2023
    Configuration menu
    Copy the full SHA
    5fdbf98 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2023

  1. Apply suggestions from code review 

    Co-authored-by: Javier Medeot <[email protected]>
    @nico-stefani @javimed
    nico-stefani and javimed authored Jun 28, 2023
    Configuration menu
    Copy the full SHA
    0e31be1 View commit details
    Browse the repository at this point in the history

  2. Bump versionaddded to 4.6.0

    @nico-stefani
    nico-stefani committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    5f24621 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2023

  1. {ẂiP} Move cloud security sources

    @javimed
    javimed committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    628f796 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2023

  1. Add: Notes about wildcard Windows registers support

    @GabrielEValenzuela
    GabrielEValenzuela committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    6503f0b View commit details
    Browse the repository at this point in the history

  2. Fix: XML block

    @GabrielEValenzuela
    GabrielEValenzuela committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    a5da9d7 View commit details
    Browse the repository at this point in the history

  3. Fix: Examples 

    Add: Documentation in ossec.conf section
    @GabrielEValenzuela
    GabrielEValenzuela committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    0ef7791 View commit details
    Browse the repository at this point in the history

  4. Mod: Location wildcard

    @GabrielEValenzuela
    GabrielEValenzuela committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    5e3b98f View commit details
    Browse the repository at this point in the history

  5. Change version from 4.5.0 to 4.6.0

    @GabrielEValenzuela
    GabrielEValenzuela committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    dd130f7 View commit details
    Browse the repository at this point in the history

  6. Add editorial review changes

    @javimed @GabrielEValenzuela
    javimed authored and GabrielEValenzuela committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    0b19ad9 View commit details
    Browse the repository at this point in the history

  7. Add editorial review changes

    @javimed @GabrielEValenzuela
    javimed authored and GabrielEValenzuela committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    f14d70a View commit details
    Browse the repository at this point in the history

  8. Change phrasing

    @javimed @GabrielEValenzuela
    javimed authored and GabrielEValenzuela committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    4e4cbc9 View commit details
    Browse the repository at this point in the history

  9. Fix: Editor review

    @GabrielEValenzuela
    GabrielEValenzuela committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    e5cc88e View commit details
    Browse the repository at this point in the history

  10. {WiP} Move cloud security sources

    @javimed
    javimed committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    986f3d1 View commit details
    Browse the repository at this point in the history

  11. {WiP} Move cloud security sources

    @javimed
    javimed committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    8aa8025 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2023

  1. Add editorial review changes

    @javimed
    javimed committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    252c04c View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2023

  1. Add discard_regex parameter to Services

    @fdalmaup
    fdalmaup committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    fb43956 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2023

  1. Undo orphan content removal

    @javimed
    javimed committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    0f5042c View commit details
    Browse the repository at this point in the history

  2. Fix Wazuh indexer backup folder reference

    @javimed
    javimed committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    50e5bb4 View commit details
    Browse the repository at this point in the history

  3. Fix Wazuh indexer backup folder reference

    @javimed
    javimed committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    1c81bd7 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2023

  1. Fixed a javacript error occurring while managing relative paths on th… 

    …e pages
    @vamera
    vamera committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    cb57ec3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #6242 from wazuh/4.4-fix-relative-url 

    [4.4] Fixed an error occurring while managing relative paths
    @s-ocando
    s-ocando authored Jul 14, 2023
    Configuration menu
    Copy the full SHA
    721ad14 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #6237 from wazuh/fix-securityconfig-backup-reference 

    Fix Wazuh indexer backup folder reference
    @s-ocando
    s-ocando authored Jul 14, 2023
    Configuration menu
    Copy the full SHA
    9e34da4 View commit details
    Browse the repository at this point in the history

  4. Add better explanation about endpoint limits

    @nico-stefani
    nico-stefani committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    fdc8793 View commit details
    Browse the repository at this point in the history

  5. Update source/_static/js/redirects.js 

    Co-authored-by: Sandra Ocando <[email protected]>
    @javimed @s-ocando
    javimed and s-ocando authored Jul 14, 2023
    Configuration menu
    Copy the full SHA
    e3f450d View commit details
    Browse the repository at this point in the history

  6. Merge pull request #6209 from wazuh/organize-cloud-source-files 

    Organize cloud security sources
    @s-ocando
    s-ocando authored Jul 14, 2023
    Configuration menu
    Copy the full SHA
    0186286 View commit details
    Browse the repository at this point in the history

  7. Add explanation about events endpoint

    @nico-stefani
    nico-stefani committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    d384442 View commit details
    Browse the repository at this point in the history

  8. Replace with bumped API version reference

    @javimed
    javimed committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    fe4cab2 View commit details
    Browse the repository at this point in the history

  9. Add changes from review

    @javimed
    javimed committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    03a08cf View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2023

  1. Apply changes from review

    @javimed
    javimed committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    1a70960 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #6151 from wazuh/5903-events-webhook-docs-bis 

    Add events webhook docs
    @javimed
    javimed authored Jul 17, 2023
    Configuration menu
    Copy the full SHA
    ccc3fab View commit details
    Browse the repository at this point in the history

  3. Apply changes from review

    @javimed
    javimed committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    e7e3ab3 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2023

  1. Merge pull request #5932 from wazuh/5926_wildcard_windows_registers 

    FIM wildcard Windows registers documentation
    @vikman90
    vikman90 authored Jul 18, 2023
    Configuration menu
    Copy the full SHA
    999617f View commit details
    Browse the repository at this point in the history

  2. Update source/user-manual/reference/ossec-conf/wodle-s3.rst

    @javimed
    javimed authored Jul 18, 2023
    Configuration menu
    Copy the full SHA
    d2e3305 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #6207 from wazuh/17388-update-aws-services-section 

    Add discard_regex parameter to Services
    @javimed
    javimed authored Jul 18, 2023
    Configuration menu
    Copy the full SHA
    3538c44 View commit details
    Browse the repository at this point in the history

  4. Add ossec.conf references

    @javimed
    javimed committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    5b9a1b9 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2023

  1. Bump version to 4.5.2

    @s-ocando
    s-ocando committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    88967f2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #6252 from wazuh/bump-version-to-4.5.2 

    Bump version to 4.5.2
    @javimed
    javimed authored Jul 19, 2023
    Configuration menu
    Copy the full SHA
    4c16959 View commit details
    Browse the repository at this point in the history

  3. Apply suggestions from code review 

    Co-authored-by: Sandra Ocando <[email protected]>
    @javimed @s-ocando
    javimed and s-ocando authored Jul 19, 2023
    Configuration menu
    Copy the full SHA
    ffa69a4 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #6249 from wazuh/6248-clarify-manager-configuration 

    Add ossec.conf references
    @s-ocando
    s-ocando authored Jul 19, 2023
    Configuration menu
    Copy the full SHA
    2a01083 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2023

  1. Merge pull request #6262 from wazuh/merge-4.4-into-4.5.0 

    Merge branch 4.4 into 4.5.0
    @javimed
    javimed authored Jul 21, 2023
    Configuration menu
    Copy the full SHA
    999df8f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #6263 from wazuh/merge-4.5.0-into-4.5.1 

    Merge branch 4.5.0 into 4.5.1
    @javimed
    javimed authored Jul 21, 2023
    Configuration menu
    Copy the full SHA
    9687e2f View commit details
    Browse the repository at this point in the history

  3. Merge pull request #6264 from wazuh/merge-4.5.1-into-4.5.2 

    Merge branch 4.5.1 into 4.5.2
    @javimed
    javimed authored Jul 21, 2023
    Configuration menu
    Copy the full SHA
    8bb6342 View commit details
    Browse the repository at this point in the history

  4. Merge branch '4.6.0' into merge-4.5.2-into-4.6.0

    @s-ocando
    s-ocando committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    2178523 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #6265 from wazuh/merge-4.5.2-into-4.6.0 

    Merge branch 4.5.2 into 4.6.0
    @javimed
    javimed authored Jul 21, 2023
    Configuration menu
    Copy the full SHA
    854acf6 View commit details
    Browse the repository at this point in the history

  6. Merge branch '4.7.0' into merge-4.6.0-into-4.7.0

    @s-ocando
    s-ocando committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    00ca7d0 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #6266 from wazuh/merge-4.6.0-into-4.7.0 

    Merge branch 4.6.0 into 4.7.0
    @javimed
    javimed authored Jul 21, 2023
    Configuration menu
    Copy the full SHA
    8f8837c View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into merge-4.7.0-into-master

    @s-ocando
    s-ocando authored Jul 21, 2023
    Configuration menu
    Copy the full SHA
    e8eb00d View commit details
    Browse the repository at this point in the history

  9. Fix image paths

    @s-ocando
    s-ocando committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    ca119e8 View commit details
    Browse the repository at this point in the history

  10. Merge branch '4.7.0' into merge-4.7.0-into-master

    @s-ocando
    s-ocando committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    0f7b808 View commit details
    Browse the repository at this point in the history