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.

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

Merge 4.7.0 into 4.7.1 #1035

Merged
merged 44 commits into from
Oct 9, 2023
Merged
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
be19c70
remove goss install
vcerenu Sep 14, 2023
e9f689d
remove goss directory
vcerenu Sep 14, 2023
d1c252c
Merge pull request #996 from wazuh/979-remove-goss-from-manager-image
teddytpc1 Sep 14, 2023
2ac53b9
add custom directory and persistence
vcerenu Sep 15, 2023
37f565b
add custom directory and persistence
vcerenu Sep 15, 2023
0fbbf5a
add shuffle scripts into permanent data
vcerenu Sep 15, 2023
41515e9
Merge pull request #998 from wazuh/258-shuffle-permanent-data
teddytpc1 Sep 15, 2023
088b855
Merge pull request #997 from wazuh/990-persist-logo
teddytpc1 Sep 18, 2023
62627e3
Merge remote-tracking branch 'origin/4.5.3' into merge-4.5.3-into-4.6.0
davidcr01 Sep 22, 2023
d6b73cb
Merge pull request #1008 from wazuh/merge-4.5.3-into-4.6.0
teddytpc1 Sep 22, 2023
7d5b1c4
Revision Bump
teddytpc1 Sep 22, 2023
958e466
Merge pull request #1013 from wazuh/bump-4.6.0-revision
teddytpc1 Sep 22, 2023
5f3a048
Bump revision to 40507
davidcr01 Sep 28, 2023
93c53a7
Merge pull request #1021 from wazuh/change/1020-bump-revision-4.5.3-rc2
teddytpc1 Sep 28, 2023
d5dc67e
Fixing Wazuh indexer files permissions
c-bordon Sep 28, 2023
d9b053c
Testing with another dir for opensearch security policy
c-bordon Sep 28, 2023
8fa20ab
Fixed sed command
c-bordon Sep 28, 2023
23d34f6
Fixed OpenSearch security plugin warnings
c-bordon Oct 2, 2023
905b4de
Testing change permissions in entrypoint
c-bordon Oct 2, 2023
c3c8ea3
Changing files permissions
c-bordon Oct 3, 2023
b22fa23
Updated build image script
c-bordon Oct 3, 2023
3fd3f42
Added check for wazuh/wazuh branch
c-bordon Oct 3, 2023
36c06dc
Added validation for dev branch
c-bordon Oct 3, 2023
545ef68
Fixed validation
c-bordon Oct 3, 2023
e205c87
.env file updated
c-bordon Oct 4, 2023
a2ee29b
Updated file permissions to have the same permissions as in package i…
c-bordon Oct 4, 2023
7172c81
Update order of variables
c-bordon Oct 4, 2023
d6a72c6
Merge pull request #1024 from wazuh/bug/1017-warning-opensearchsecuri…
teddytpc1 Oct 4, 2023
893796c
Restore .env file
c-bordon Oct 4, 2023
8ac3ea1
Added final space
c-bordon Oct 4, 2023
1b41068
Updated README file
c-bordon Oct 4, 2023
c550c1a
Added validation for version in master branch
c-bordon Oct 4, 2023
9d3701f
Merge pull request #1025 from wazuh/enhancement/1016-allow-branch-par…
teddytpc1 Oct 4, 2023
61bfe58
Changed validation order for wazuh branch
c-bordon Oct 4, 2023
b4db7f1
Merge pull request #1026 from wazuh/bug/change-validation-order-for-w…
teddytpc1 Oct 4, 2023
d7e051a
Bump 4.5.3 revision
teddytpc1 Oct 5, 2023
ded91b2
Merge pull request #1029 from wazuh/bump-4.5.3-revision
teddytpc1 Oct 5, 2023
8d1c239
Merge branch '4.5.3' into merge-4.5.3-into-4.6.0
davidcr01 Oct 6, 2023
fa2f2b2
Merge pull request #1031 from wazuh/merge-4.5.3-into-4.6.0
davidcr01 Oct 6, 2023
64f0836
Bump revision to 40602
davidcr01 Oct 6, 2023
89e0fc9
Merge pull request #1033 from wazuh/bump-revision-4.6.0
teddytpc1 Oct 6, 2023
14dcc8b
Merge 4.6.0 into 4.7.0
davidcr01 Oct 9, 2023
c18a1ec
Merge pull request #1034 from wazuh/merge-4.6.0-into-4.7.0
vcerenu Oct 9, 2023
25be906
Merge branch '4.7.0' into merge-4.7.0-into-4.7.1
davidcr01 Oct 9, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
.env file updated
c-bordon committed Oct 4, 2023

Verified

This commit was signed with the committer’s verified signature.
c-bordon Carlos Bordon
commit e205c87d3763eb27cc356a89fe41fd311966d439
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
WAZUH_VERSION=4.6.0
WAZUH_IMAGE_VERSION=4.6.0
WAZUH_TAG_REVISION=1
FILEBEAT_TEMPLATE_BRANCH=v4.6.0
FILEBEAT_TEMPLATE_BRANCH=4.6.0
WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.2.tar.gz
WAZUH_UI_REVISION=1