Commit Graph

1525 Commits

Author SHA1 Message Date
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
c-bordon
7172c818c7 Update order of variables 2023-10-04 11:16:04 -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
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
Gonzalo Acuña
d6b73cb3dc Merge pull request #1008 from wazuh/merge-4.5.3-into-4.6.0
Merge 4.5.3 into 4.6.0
2023-09-22 06:36:48 -03:00
David Correa Rodríguez
62627e32fd Merge remote-tracking branch 'origin/4.5.3' into merge-4.5.3-into-4.6.0 2023-09-22 11:11:45 +02:00
Gonzalo Acuña
536dd51aa7 Merge pull request #1000 from wazuh/18966-error-in-wazuh-docker-startup
Error in Wazuh Docker startup
2023-09-18 14:37:34 -03:00
Gonzalo Acuña
088b855f73 Merge pull request #997 from wazuh/990-persist-logo
Persist the custom logo in the Wazuh dashboard
v4.5.3-rc1
2023-09-18 14:14:30 -03:00
vcerenu
5769159cf9 change RBAC database procedure 2023-09-18 12:05:29 -03:00
Gonzalo Acuña
41515e9c49 Merge pull request #998 from wazuh/258-shuffle-permanent-data
Check the permanent_data.env file and include any missing files
2023-09-15 14:44:27 -03:00
vcerenu
0fbbf5aee2 add shuffle scripts into permanent data 2023-09-15 13:31:00 -03:00
vcerenu
37f565bb8a add custom directory and persistence 2023-09-15 12:49:32 -03:00
vcerenu
2ac53b9b3d add custom directory and persistence 2023-09-15 12:41:05 -03:00
Gonzalo Acuña
d1c252c6c0 Merge pull request #996 from wazuh/979-remove-goss-from-manager-image
Remove goss install
2023-09-14 16:14:58 -03:00
vcerenu
e9f689dbfc remove goss directory 2023-09-14 15:17:13 -03:00
vcerenu
be19c70082 remove goss install 2023-09-14 12:25:57 -03:00
Gonzalo Acuña
0c6077c3e0 Merge pull request #992 from wazuh/984-build-imagessh-script-is-not-capable-of-using-repos-majorminorpatch-branches
Change wazuh template origin
2023-09-13 11:09:44 -03:00
vcerenu
de7754364d change wazuh template origin 2023-09-12 15:49:31 -03:00
Gonzalo Acuña
73ada94ed6 Merge pull request #988 from wazuh/987-add-support-to-define-the-default-value-of-extensionsgithub-and-extensionsoffice-in-the-wazuh-dashboard-docker-image
Add extensions into wazuh.yml
2023-09-08 14:13:00 -03:00
vcerenu
63817dfd55 add extensions for wazuh.yml 2023-09-07 12:15:25 -03:00
Gonzalo Acuña
637110c278 Merge pull request #983 from wazuh/merge-4.5.3-into-4.6.0
Merge `4.5.3` into `4.6.0`
2023-09-07 09:01:40 -03:00
David Correa Rodríguez
b18c068650 Added empty line to changelog 2023-09-07 13:58:32 +02:00
David Correa Rodríguez
9a871dbbcb Merge branch '4.5.3' into merge-4.5.3-into-4.6.0 2023-09-07 13:39:58 +02:00
Gonzalo Acuña
1fae0d3452 Merge pull request #982 from wazuh/merge-4.5.2-into-4.5.3
Merge `4.5.2` into `4.5.3`
2023-09-07 08:12:25 -03:00
David Correa Rodríguez
0a4c057492 Merge branch '4.5.2' into merge-4.5.2-into-4.5.3 2023-09-07 10:29:02 +02:00
David Jose Iglesias Lopez
2902a0ce0b Merge pull request #977 from wazuh/bump-revision-40505
Bump revision to 40505
v4.5.2
2023-09-04 11:49:42 +02:00
David Correa Rodríguez
c0fb4172f3 Bump revision to 40505 2023-09-04 11:11:37 +02:00
Gonzalo Acuña
8886e2347e Merge pull request #968 from wazuh/951-fix-wazuh-dashboard-modules-persist
Fixed Wazuh dashboard modules persistency
2023-08-30 15:06:24 -03:00
Gonzalo Acuña
f1d8565989 Merge pull request #971 from wazuh/bump-4.5.3
Bump to `4.5.3`
2023-08-29 08:28:50 -03:00
David Correa Rodríguez
e5abd5d24e Bump to 4.5.3 2023-08-29 11:29:26 +02:00
David Correa Rodríguez
902b0d8e52 Fixed Wazuh dashboard modules persistency 2023-08-28 13:11:25 +02:00
Gonzalo Acuña
b377a0f6eb Merge pull request #966 from wazuh/18542-vdt-bookworm-support
Add Debian Bookworm to VDT default configuration
v4.6.0-alpha1
2023-08-25 13:17:17 -03:00
Mateo Cervilla
44e9bebed0 Add Debian Bookworm VDT support 2023-08-25 12:24:01 -03:00
Gonzalo Acuña
760fc8ccbf Merge pull request #961 from wazuh/merge-4.5.2-into-4.6.0
Merge 4.5.2 into 4.6.0
2023-08-24 13:10:01 -03:00
vcerenu
44303d3701 resolving conflicts 2023-08-24 12:45:02 -03:00
Gonzalo Acuña
c0d97893a4 Merge pull request #960 from wazuh/merge-4.5.1-into-4.5.2
Merge 4.5.1 into 4.5.2
2023-08-24 12:31:06 -03:00
vcerenu
0826f2c176 change revision 2023-08-24 12:23:15 -03:00
vcerenu
d531b8dd72 Resolving conflicts 2023-08-24 12:06:35 -03:00
Gonzalo Acuña
41267d4ddf Merge pull request #946 from wazuh/944-bump-revision-2
Revision update
v4.5.1-rc2 v4.5.1
2023-08-17 12:20:42 -03:00
Gonzalo Acuña
67f34fb8fe Revision update 2023-08-17 12:17:12 -03:00
Gonzalo Acuña
865f7625f4 Merge pull request #945 from wazuh/944-bump-revision
Revision update
2023-08-17 09:02:13 -03:00
Gonzalo Acuña
c56952eaa0 Revision update 2023-08-17 08:56:16 -03:00