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.7.1 into master #1036

Merged
merged 47 commits into from
Oct 9, 2023
Merged

Merge 4.7.1 into master #1036

merged 47 commits into from
Oct 9, 2023

Commits on Sep 14, 2023

  1. remove goss install

    @vcerenu
    vcerenu committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    be19c70 View commit details
    Browse the repository at this point in the history

  2. remove goss directory

    @vcerenu
    vcerenu committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    e9f689d View commit details
    Browse the repository at this point in the history

  3. Merge pull request #996 from wazuh/979-remove-goss-from-manager-image 

    Remove goss install
    @teddytpc1
    teddytpc1 authored Sep 14, 2023
    Configuration menu
    Copy the full SHA
    d1c252c View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2023

  1. add custom directory and persistence

    @vcerenu
    vcerenu committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    2ac53b9 View commit details
    Browse the repository at this point in the history

  2. add custom directory and persistence

    @vcerenu
    vcerenu committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    37f565b View commit details
    Browse the repository at this point in the history

  3. add shuffle scripts into permanent data

    @vcerenu
    vcerenu committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    0fbbf5a View commit details
    Browse the repository at this point in the history

  4. Merge pull request #998 from wazuh/258-shuffle-permanent-data 

    Check the permanent_data.env file and include any missing files
    @teddytpc1
    teddytpc1 authored Sep 15, 2023
    Configuration menu
    Copy the full SHA
    41515e9 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2023

  1. Merge pull request #997 from wazuh/990-persist-logo 

    Persist the custom logo in the Wazuh dashboard
    @teddytpc1
    teddytpc1 authored Sep 18, 2023
    Configuration menu
    Copy the full SHA
    088b855 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2023

  1. Merge remote-tracking branch 'origin/4.5.3' into merge-4.5.3-into-4.6.0

    @davidcr01
    davidcr01 committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    62627e3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1008 from wazuh/merge-4.5.3-into-4.6.0 

    Merge 4.5.3 into 4.6.0
    @teddytpc1
    teddytpc1 authored Sep 22, 2023
    Configuration menu
    Copy the full SHA
    d6b73cb View commit details
    Browse the repository at this point in the history

  3. Revision Bump

    @teddytpc1
    teddytpc1 committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    7d5b1c4 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1013 from wazuh/bump-4.6.0-revision 

    Revision Bump
    @teddytpc1
    teddytpc1 authored Sep 22, 2023
    Configuration menu
    Copy the full SHA
    958e466 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2023

  1. Bump revision to 40507

    @davidcr01
    davidcr01 committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    5f3a048 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1021 from wazuh/change/1020-bump-revision-4.5.3-rc2 

    Bump revision to 40507
    @teddytpc1
    teddytpc1 authored Sep 28, 2023
    Configuration menu
    Copy the full SHA
    93c53a7 View commit details
    Browse the repository at this point in the history

  3. Fixing Wazuh indexer files permissions

    @c-bordon
    c-bordon committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    d5dc67e View commit details
    Browse the repository at this point in the history

  4. Testing with another dir for opensearch security policy

    @c-bordon
    c-bordon committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    d9b053c View commit details
    Browse the repository at this point in the history

  5. Fixed sed command

    @c-bordon
    c-bordon committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    8fa20ab View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2023

  1. Fixed OpenSearch security plugin warnings

    @c-bordon
    c-bordon committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    23d34f6 View commit details
    Browse the repository at this point in the history

  2. Testing change permissions in entrypoint

    @c-bordon
    c-bordon committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    905b4de View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2023

  1. Changing files permissions

    @c-bordon
    c-bordon committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    c3c8ea3 View commit details
    Browse the repository at this point in the history

  2. Updated build image script

    @c-bordon
    c-bordon committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    b22fa23 View commit details
    Browse the repository at this point in the history

  3. Added check for wazuh/wazuh branch

    @c-bordon
    c-bordon committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    3fd3f42 View commit details
    Browse the repository at this point in the history

  4. Added validation for dev branch

    @c-bordon
    c-bordon committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    36c06dc View commit details
    Browse the repository at this point in the history

  5. Fixed validation

    @c-bordon
    c-bordon committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    545ef68 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2023

  1. .env file updated

    @c-bordon
    c-bordon committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    e205c87 View commit details
    Browse the repository at this point in the history

  2. Updated file permissions to have the same permissions as in package i… 

    …nstallation in Wazuh indexer
    @c-bordon
    c-bordon committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    a2ee29b View commit details
    Browse the repository at this point in the history

  3. Update order of variables

    @c-bordon
    c-bordon committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    7172c81 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1024 from wazuh/bug/1017-warning-opensearchsecuri… 

    …typlugin-wazuh-indexer-has-insecure-file-permissions-should-be-0600-to4.6.0

Updated file permissions to have the same permissions as in package installation in Wazuh indexer
    @teddytpc1
    teddytpc1 authored Oct 4, 2023
    Configuration menu
    Copy the full SHA
    d6a72c6 View commit details
    Browse the repository at this point in the history

  5. Restore .env file

    @c-bordon
    c-bordon committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    893796c View commit details
    Browse the repository at this point in the history

  6. Added final space

    @c-bordon
    c-bordon committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    8ac3ea1 View commit details
    Browse the repository at this point in the history

  7. Updated README file

    @c-bordon
    c-bordon committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    1b41068 View commit details
    Browse the repository at this point in the history

  8. Added validation for version in master branch

    @c-bordon
    c-bordon committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    c550c1a View commit details
    Browse the repository at this point in the history

  9. Merge pull request #1025 from wazuh/enhancement/1016-allow-branch-par… 

    …ameters-on-build-imagessh-to4.6.0

Updated build-images.sh script to support build parameters
    @teddytpc1
    teddytpc1 authored Oct 4, 2023
    Configuration menu
    Copy the full SHA
    9d3701f View commit details
    Browse the repository at this point in the history

  10. Changed validation order for wazuh branch

    @c-bordon
    c-bordon committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    61bfe58 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #1026 from wazuh/bug/change-validation-order-for-w… 

    …azuh-branch-to4.6.0

Changed validation order for wazuh branch
    @teddytpc1
    teddytpc1 authored Oct 4, 2023
    Configuration menu
    Copy the full SHA
    b4db7f1 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2023

  1. Bump 4.5.3 revision

    @teddytpc1
    teddytpc1 committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    d7e051a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1029 from wazuh/bump-4.5.3-revision 

    Bump 4.5.3 revision
    @teddytpc1
    teddytpc1 authored Oct 5, 2023
    Configuration menu
    Copy the full SHA
    ded91b2 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2023

  1. Merge branch '4.5.3' into merge-4.5.3-into-4.6.0

    @davidcr01
    davidcr01 committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    8d1c239 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1031 from wazuh/merge-4.5.3-into-4.6.0 

    Merge 4.5.3 into 4.6.0
    @davidcr01
    davidcr01 authored Oct 6, 2023
    Configuration menu
    Copy the full SHA
    fa2f2b2 View commit details
    Browse the repository at this point in the history

  3. Bump revision to 40602

    @davidcr01
    davidcr01 committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    64f0836 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1033 from wazuh/bump-revision-4.6.0 

    Bump revision to 40602
    @teddytpc1
    teddytpc1 authored Oct 6, 2023
    Configuration menu
    Copy the full SHA
    89e0fc9 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2023

  1. Merge 4.6.0 into 4.7.0

    @davidcr01
    davidcr01 committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    14dcc8b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1034 from wazuh/merge-4.6.0-into-4.7.0 

    Merge 4.6.0 into 4.7.0
    @vcerenu
    vcerenu authored Oct 9, 2023
    Configuration menu
    Copy the full SHA
    c18a1ec View commit details
    Browse the repository at this point in the history

  3. Merge branch '4.7.0' into merge-4.7.0-into-4.7.1

    @davidcr01
    davidcr01 committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    25be906 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1035 from wazuh/merge-4.7.0-into-4.7.1 

    Merge 4.7.0 into 4.7.1
    @vcerenu
    vcerenu authored Oct 9, 2023
    Configuration menu
    Copy the full SHA
    1e29e8f View commit details
    Browse the repository at this point in the history

  5. Merge branch '4.7.1' into merge-4.7.1-into-master

    @davidcr01
    davidcr01 committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    6b89644 View commit details
    Browse the repository at this point in the history

  6. Updated version in new builder script

    @vcerenu @davidcr01
    vcerenu authored and davidcr01 committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    5aaeb0d View commit details
    Browse the repository at this point in the history