Commit Graph

1629 Commits

Author SHA1 Message Date
vcerenu
781e6a4082 resolving conflicts 2023-10-23 05:25:42 -03:00
Victor Ereñú
0c7d298eea Merge pull request #1066 from wazuh/merge-4.6.0-into-4.7.0
Merge 4.6.0 into 4.7.0
2023-10-23 05:21:47 -03:00
Victor Ereñú
05ef9b899b Merge pull request #1065 from wazuh/merge-4.5.4-into-4.6.0
Bump 4.5.4 version
2023-10-23 05:14:00 -03:00
vcerenu
c46b1c0d82 resolving conflicts 2023-10-23 05:02:02 -03:00
Gonzalo Acuña
60563720f3 Merge pull request #1059 from wazuh/bug/1054-remove-filebeat-template-value
Removed value of Filebeat template variable
2023-10-17 11:05:17 -03:00
David Correa Rodríguez
0cd98767c8 Removed value of Filebeat template variable 2023-10-17 15:23:37 +02:00
Gonzalo Acuña
b8ff013b36 Merge pull request #1056 from wazuh/bug/1054-the-images-build-fails-due-to-filebeat-template-branch
Fixed Filebeat template bug in image generation
2023-10-17 08:33:09 -03:00
vcerenu
5106715b0c bump 4.5.4 version 2023-10-17 05:55:15 -03:00
David Correa Rodríguez
523a28b20d Fixed Filebeat template bug in image generation 2023-10-16 16:09:05 +02:00
David Correa Rodríguez
0f1cc4b955 Merge pull request #1053 from wazuh/bump-revision-40701
Bump revision to 40701
2023-10-13 11:42:21 +02:00
David Correa Rodríguez
aee83a1a2d Bump revision to 40701 2023-10-13 10:25:38 +02:00
Victor Ereñú
aa88dad36a Merge pull request #1038 from wazuh/merge-4.7.0-into-4.7.1
Merge 4.7.0 into 4.7.1
2023-10-09 06:37:00 -03:00
vcerenu
a424c683ae bump new builder script 2023-10-09 06:34:35 -03:00
Victor Ereñú
0555e4956b Merge pull request #1037 from wazuh/bump-4.7.0
Bump new builder script
2023-10-09 06:31:28 -03:00
vcerenu
dee2c3c8dc bump new builder script 2023-10-09 06:28:03 -03:00
Victor Ereñú
1e29e8fcfc Merge pull request #1035 from wazuh/merge-4.7.0-into-4.7.1
Merge 4.7.0 into 4.7.1
2023-10-09 06:04:29 -03:00
David Correa Rodríguez
25be906860 Merge branch '4.7.0' into merge-4.7.0-into-4.7.1 2023-10-09 10:50:11 +02:00
Victor Ereñú
c18a1eca56 Merge pull request #1034 from wazuh/merge-4.6.0-into-4.7.0
Merge 4.6.0 into 4.7.0
2023-10-09 05:33:57 -03:00
David Correa Rodríguez
14dcc8b6a6 Merge 4.6.0 into 4.7.0 2023-10-09 09:41:25 +02:00
Gonzalo Acuña
89e0fc9604 Merge pull request #1033 from wazuh/bump-revision-4.6.0
Bump revision to 40602
2023-10-06 09:15:14 -03:00
David Correa Rodríguez
64f083631d Bump revision to 40602 2023-10-06 14:11:05 +02:00
David Correa Rodríguez
fa2f2b2a31 Merge pull request #1031 from wazuh/merge-4.5.3-into-4.6.0
Merge 4.5.3 into 4.6.0
2023-10-06 10:48:10 +02:00
David Correa Rodríguez
8d1c239a3c Merge branch '4.5.3' into merge-4.5.3-into-4.6.0 2023-10-06 10:23:04 +02:00
Gonzalo Acuña
ded91b2f0a Merge pull request #1029 from wazuh/bump-4.5.3-revision
Bump 4.5.3 revision
v4.5.3
2023-10-05 11:48:22 -03:00
Gonzalo Acuña
d7e051af19 Bump 4.5.3 revision 2023-10-05 11:44:40 -03:00
Gonzalo Acuña
b4db7f16cc Merge pull request #1026 from wazuh/bug/change-validation-order-for-wazuh-branch-to4.6.0
Changed validation order for wazuh branch
2023-10-04 15:42:36 -03:00
c-bordon
61bfe58491 Changed validation order for wazuh branch 2023-10-04 15:38:39 -03:00
Gonzalo Acuña
9d3701fa60 Merge pull request #1025 from wazuh/enhancement/1016-allow-branch-parameters-on-build-imagessh-to4.6.0
Updated build-images.sh script to support build parameters
2023-10-04 13:49:42 -03:00
c-bordon
c550c1a852 Added validation for version in master branch 2023-10-04 12:29:15 -03:00
c-bordon
1b41068618 Updated README file 2023-10-04 11:55:39 -03:00
c-bordon
8ac3ea1e8a Added final space 2023-10-04 11:44:00 -03:00
c-bordon
893796c4a2 Restore .env file 2023-10-04 11:41:22 -03:00
Gonzalo Acuña
d6a72c6fb1 Merge pull request #1024 from wazuh/bug/1017-warning-opensearchsecurityplugin-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
2023-10-04 11:22:44 -03:00
c-bordon
7172c818c7 Update order of variables 2023-10-04 11:16:04 -03:00
c-bordon
a2ee29bfd3 Updated file permissions to have the same permissions as in package installation in Wazuh indexer 2023-10-04 09:36:08 -03:00
c-bordon
e205c87d37 .env file updated 2023-10-04 08:35:45 -03:00
c-bordon
545ef6851b Fixed validation 2023-10-03 16:59:08 -03:00
c-bordon
36c06dc4c8 Added validation for dev branch 2023-10-03 16:54:43 -03:00
c-bordon
3fd3f42389 Added check for wazuh/wazuh branch 2023-10-03 16:43:30 -03:00
c-bordon
b22fa235c7 Updated build image script 2023-10-03 15:52:25 -03:00
c-bordon
c3c8ea3d02 Changing files permissions 2023-10-03 12:20:17 -03:00
c-bordon
905b4de859 Testing change permissions in entrypoint 2023-10-02 08:49:17 -03:00
c-bordon
23d34f6a89 Fixed OpenSearch security plugin warnings 2023-10-02 08:27:49 -03:00
c-bordon
8fa20abbbd Fixed sed command 2023-09-28 14:29:53 -03:00
c-bordon
d9b053caf4 Testing with another dir for opensearch security policy 2023-09-28 12:48:38 -03:00
c-bordon
d5dc67e9c3 Fixing Wazuh indexer files permissions 2023-09-28 10:37:08 -03:00
Gonzalo Acuña
93c53a712d Merge pull request #1021 from wazuh/change/1020-bump-revision-4.5.3-rc2
Bump revision to 40507
2023-09-28 08:24:43 -03:00
David Correa Rodríguez
5f3a0481ba Bump revision to 40507 2023-09-28 12:14:34 +02:00
Gonzalo Acuña
958e466682 Merge pull request #1013 from wazuh/bump-4.6.0-revision
Revision Bump
v4.6.0-beta1
2023-09-22 14:49:59 -03:00
Gonzalo Acuña
7d5b1c4f85 Revision Bump 2023-09-22 14:37:02 -03:00