Commit Graph

1563 Commits

Author SHA1 Message Date
David Correa Rodríguez
7312f86235 Merge remote-tracking branch 'origin/4.6.0' into merge-4.6.0-into-4.7.0 2023-09-22 12:07:13 +02:00
Gonzalo Acuña
149df5e492 Merge pull request #973 from wazuh/17617-vdt-alas2023-support
Add Amazon Linux 2023 VDT default configuration
2023-09-21 11:03:11 -03:00
Leonardo Quiceno
8cc5c8b0bb Add Amazon Linux 2023 VDT support 2023-09-18 12:55:54 -05: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
vcerenu
5769159cf9 change RBAC database procedure 2023-09-18 12:05:29 -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
17029c5510 Merge pull request #985 from wazuh/merge-4.6.0-into-4.7.0
Merge `4.6.0` into `4.7.0`
2023-09-07 10:43:35 -03:00
David Correa Rodríguez
2234517218 Merge branch '4.6.0' into merge-4.6.0-into-4.7.0 2023-09-07 14:41:11 +02: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
2de4a28098 Merge pull request #962 from wazuh/merge-4.6.0-into-4.7.0
Merge 4.6.0 into 4.7.0
2023-08-24 13:14:32 -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
Gonzalo Acuña
cb7d8785c6 Merge pull request #930 from wazuh/926-update-the-vulnerability-detector-default-configuration-block-with-missing-providers
Update the vulnerability detector default configuration block with missing providers
2023-08-14 15:19:54 -03:00
vcerenu
f1001c2f25 add jammy version into VD 2023-08-11 15:45:26 -03:00
Gonzalo Acuña
17ed766228 Merge pull request #937 from wazuh/merge-4.6.0-into-4.7.0
Merge `4.6.0` into `4.7.0`
2023-08-11 08:14:30 -03:00
David Correa Rodríguez
6c91bac96d Merge pull request #936 from wazuh/merge-4.5.2-into-4.6.0
Merge `4.5.2` into `4.6.0`
2023-08-11 12:39:39 +02:00
David Correa Rodríguez
216b5a6818 Merge pull request #935 from wazuh/merge-4.5.1-into-4.5.2
Merge `4.5.1` into `4.5.2`
2023-08-11 12:25:04 +02:00
David Correa Rodríguez
e19fa14013 Merge pull request #934 from wazuh/merge-4.5-into-4.5.1
Merge `4.5` into `4.5.1`
v4.5.1-rc1
2023-08-11 11:58:49 +02:00
vcerenu
57c7eaa5af remove stretch and add rhel 9 into VD 2023-08-10 16:46:21 -03:00
vcerenu
fbe073612c add suse vd options 2023-08-10 09:19:59 -03:00
Gonzalo Acuña
1dec665a97 Merge pull request #925 from wazuh/10774-alma-support
Updating vulnerability detector default configuration with AlmaLinux support
2023-08-09 09:46:28 -03:00
pereyra-m
757e5dbf05 Updating ossec.conf file with the AlmaLinux support in the vulnerability detector section 2023-08-07 17:32:03 -03:00
Gonzalo Acuña
32b1d88e36 Merge pull request #919 from wazuh/917-fix-conditional-block-in-build-imagesh-script
Fixed conditional block in images building
2023-08-03 10:02:24 -03:00
David Correa Rodríguez
94be842afc Restored IMAGE_VERSION variable 2023-08-03 11:51:01 +02:00
David Correa Rodríguez
d20bbe247c Fixed conditional block in images building 2023-08-03 11:45:56 +02:00
Gonzalo Acuña
e01d39e138 Merge pull request #915 from wazuh/911-typos-in-the-script
Typos in the script in charge of create Wazuh indexer's certificates
v4.5.0
2023-08-01 13:50:24 -03:00
vcerenu
1eeca6267b fix typos in cert generator image 2023-08-01 13:07:04 -03:00
Gonzalo Acuña
d755ffbac8 Merge pull request #914 from wazuh/6282-add-notes-about
Modify ulimit
2023-08-01 12:01:13 -03:00