yahoo_1999/fk-wazuh
1
0
Fork 0
forked from wazuh/wazuh-docker
Code Pull Requests Activity
1,589 Commits 125 Branches 170 Tags
69868c0c709602664e26c81b3fe6d4b87f09a671
Commit Graph
1589 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Gonzalo Acuña 69868c0c70 Merge pull request #1011 from wazuh/merge-4.7.1-into-master 
Merge 4.7.1 into master
 2023-09-22 07:48:54 -03:00
David Correa Rodríguez d8f7fd6767 Merge remote-tracking branch 'origin/4.7.1' into merge-4.7.1-into-master 2023-09-22 12:47:11 +02:00
Gonzalo Acuña a98e57bb6c Merge pull request #1010 from wazuh/merge-4.7.0-into-4.7.1 
Merge 4.7.0 into 4.7.1
 2023-09-22 07:32:20 -03:00
David Correa Rodríguez b3441a6b07 Updated TEMPLATE_VERSION variable 2023-09-22 12:23:37 +02:00
David Correa Rodríguez a3e2a2d88b Merge remote-tracking branch 'origin/4.7.0' into merge-4.7.0-into-4.7.1 2023-09-22 12:22:38 +02:00
Gonzalo Acuña 6407325761 Merge pull request #1009 from wazuh/merge-4.6.0-into-4.7.0 
Merge 4.6.0 into 4.7.0
 2023-09-22 07:09:17 -03:00
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
Gonzalo Acuña 8fbda5afd3 Merge pull request #1005 from wazuh/idr-263-security-policy 
Create SECURITY.md
 2023-09-20 08:43:39 -03:00
Gonzalo Acuña b40e90d19c Create SECURITY.md 
Wazuh security policy added.
 2023-09-20 08:29:53 -03:00
Gonzalo Acuña a6c22d9618 Merge pull request #1003 from wazuh/bump-version-4.7.1 
Bump version to 4.7.1
 2023-09-20 08:14:05 -03:00
David Correa Rodríguez d449ae7f76 Bump version to 4.7.1 2023-09-20 11:01:19 +02: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 dcef9834b4 Merge pull request #986 from wazuh/merge-4.7.0-into-master 
Merge `4.7.0` into `master`
 2023-09-07 11:28:04 -03:00
David Correa Rodríguez 9253127ce8 Merge branch '4.7.0' into merge-4.7.0-into-master 2023-09-07 16:21:42 +02: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 3434070c06 Merge pull request #948 from wazuh/modify_scan_version 
Change repository checkout
 2023-08-24 15:38:41 -03:00
Gonzalo Acuña 8169e95107 Merge pull request #963 from wazuh/merge-4.7.0-into-master 
Merge 4.7.0 into master
 2023-08-24 13:34:29 -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
vcerenu 1d8332725f add fetch 2023-08-18 15:23:12 -03:00
vcerenu a2f50192b6 add new step 2023-08-18 15:21:07 -03:00
vcerenu bd513e80cc add new step 2023-08-18 15:18:56 -03:00
vcerenu 6a4dc3c3eb change repository checkout 2023-08-18 15:11:21 -03:00
Gonzalo Acuña 41267d4ddf Merge pull request #946 from wazuh/944-bump-revision-2 
Revision update
v4.5.1 v4.5.1-rc2 		2023-08-17 12:20:42 -03:00
Gonzalo Acuña 67f34fb8fe Revision update 2023-08-17 12:17:12 -03:00