yahoo_1999/fk-wazuh
1
0
Fork 0
forked from wazuh/wazuh-docker
Code Pull Requests Activity
2,524 Commits 125 Branches 170 Tags
d0dacc8471ef91d4ed6cc3d3bea3fdd1db23ec1b
Commit Graph
74 Commits
Author SHA1 Message Date
Gonzalo Acuña f43faae24b Conflicts resolution 2025-06-19 12:28:14 -03:00
vcerenu 02de528417 Bump 5.0.0 version 2025-05-13 14:54:48 -03:00
Gonzalo Acuña 7371f40bb1 Bump to 6.0 2025-05-13 14:38:22 -03:00
vcerenu b2de3600ce Bump 4.13.0 version 2025-03-10 13:44:19 -03:00
Enrique Araque e60c07a18f Merge 4.11.1 into 4.12.0 2025-03-07 12:18:07 +01:00
Jesus Garcia fc8a8d6869 Bump 4.11.1-rc1 revision 2025-02-26 14:40:25 -05:00
vcerenu 69df531ca9 Resolve conflicts 2024-10-17 13:04:31 -03:00
David Correa Rodríguez 301ea9e21a Merge branch '4.8.2' into merge-4.8.2-into-4.9.0 2024-09-23 10:20:48 +02:00
vcerenu 73fffcf52d Modify check repository for image builder 2024-09-05 13:12:47 -03:00
David Correa Rodríguez d5a60b7264 Merge branch '4.10.0' into merge-4.10.0-into-master 2024-08-21 12:30:00 +02:00
David Correa Rodríguez bbc4529088 Merge branch '4.9.1' into merge-4.9.1-into-4.10.0 2024-08-21 12:10:54 +02:00
vcerenu 2ee7cfa515 Add eazuh.yml file in the Wazuh dashboard image build process 2024-07-19 12:25:09 -03:00
David Correa Rodríguez 1a1bc2d72b Merge branch 'master' into merge-4.10.0-into-master 2024-07-19 15:38:49 +02:00
Carlos Bordon 54b2d4ce33 Revert "Revert merges of 4.9.0 branch into master branch" 2024-07-19 10:34:13 -03:00
David Correa Rodríguez 096f0abb32 Merge branch '4.10.0' into merge-4.10.0-into-master 2024-07-19 13:19:41 +02:00
David Correa Rodríguez 719d4c2b05 Merge branch '4.9.0' into merge-4.9.0-into-4.10.0 2024-07-19 11:32:51 +02:00
David Correa Rodríguez eded59bc25 Revert "Merge branch '4.9.0' into merge-4.9.0-into-master" 
This reverts commit 4923750ea4, reversing
changes made to e1d70c35fe.
 2024-07-19 09:27:46 +02:00
David Correa Rodríguez 4923750ea4 Merge branch '4.9.0' into merge-4.9.0-into-master 2024-07-18 14:48:50 +02:00
Carlos Anguita López 9c36a8a13b Removed references to modules because they are now enabled by default 2024-07-04 12:53:33 +02:00
vcerenu 24f12a72d7 Modify Wazuh indexer and dashboard Dockerfles 2024-06-25 09:33:41 -03:00
vcerenu 8019e386bc Bump 4.10.0 version 2024-06-19 10:20:28 -03:00
vcerenu 10f278cadb add environment variables for configure wazuh indexer and dashboard files 2024-04-23 11:43:29 -03:00
David Correa Rodríguez 935aee6d2a Fixed references to 4.8 in master 2024-03-19 11:39:01 +01:00
David Correa Rodríguez 219843dbb8 Fixed references to 4.8 version 2024-03-19 11:32:06 +01:00
vcerenu 992fa82f6d update base and fix wazuh manager build 2024-02-29 11:11:59 -03:00
David Correa Rodríguez 37d38ecf92 Fixed identation 2023-11-16 15:59:44 +01:00
David Correa Rodríguez 573090edcb Added variables in validations for different repositories 2023-11-16 15:54:25 +01:00
David Correa Rodríguez c38a25224c Adapted docker build to multiple Wazuh Dashboards plugins 2023-11-16 13:52:41 +01:00
Carlos Bordon 4863d54c99 Merge pull request #1092 from wazuh/merge-4.7.1-into-4.8.0 
Merge 4.7.1 into 4.8.0
 2023-10-31 13:52:40 -03:00
David Correa Rodríguez f1140fc088 Updated wazuh-kibana-app references 2023-10-25 15:56:11 +02:00
Gonzalo Acuña 4c2582952f Dashboard default route update 2023-10-23 13:28:22 -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
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
vcerenu 63817dfd55 add extensions for wazuh.yml 2023-09-07 12:15:25 -03:00
vcerenu 919500bd74 bump master to 4.8.0 2023-07-14 16:22:52 -03:00
vcerenu 8e3b8aada8 bump 4.6 version 2023-06-23 10:33:35 -03:00
vcerenu 6a98b87b8e bump 4.7 version 2023-06-22 17:26:55 -03:00
vcerenu dd46f8a2c1 bump 4.6 version 2023-05-18 22:06:21 +02:00
vcerenu 697b7538cc bump release 4.5.0 2023-05-18 22:04:56 +02:00
vcerenu fd9c09a7e5 change dashboard and indexer base repository 2023-05-18 22:03:47 +02:00
vcerenu b838023509 modify base path 2023-05-18 22:03:45 +02:00
vcerenu e9764b0a6a add 4.4 version 2023-05-18 22:03:39 +02:00
vcerenu 6398b66e10 add 4.4 version 2023-05-18 22:03:38 +02:00
vcerenu 312466704d bump release 4.5.0 2023-05-18 21:25:00 +02:00
vcerenu e25635cb25 change dashboard and indexer base repository 2023-03-28 16:59:49 -03:00
vcerenu 271f421cd4 modify base path 2022-12-26 11:12:16 -03:00
vcerenu 8febf33d58 add 4.4 version 2022-12-01 13:02:13 -03:00
vcerenu e11e7a10b8 add 4.4 version 2022-12-01 11:58:21 -03:00
vcerenu e9a0be25ce resolving conflicts in 4.3 merge 2022-11-30 15:27:48 -03:00
vcerenu f933733a85 add option to recreate keystore in entrypoint 2022-07-01 10:59:52 -03:00