yahoo_1999/fk-wazuh
1
0
Fork 0
forked from wazuh/wazuh-docker
Code Pull Requests Activity
1,665 Commits 125 Branches 170 Tags
794e9a27f4d790ba0ee71dd1c66a2eb03b2e6ff9
Commit Graph
1665 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
David Correa Rodríguez 794e9a27f4 Merge branch '4.7.0' into merge-4.7.0-into-4.7.1 2023-11-24 10:21:33 +01:00
Victor Ereñú dcf48426c1 Merge pull request #1129 from wazuh/chenge_revision_number 
Change revision number
v4.7.0 		2023-11-23 07:58:19 -03:00
vcerenu f8eb0b5f1d change revision number 2023-11-23 07:47:39 -03:00
Gonzalo Acuña 139f7a52f6 Merge pull request #1124 from wazuh/1119-update-filebeat-module-download-url 
Update Filebeat module download URL
 2023-11-22 09:38:08 -03:00
Gonzalo Acuña 2df37520a7 Merge pull request #1125 from wazuh/change/492-remove-report-dependencies 
Removed report dependencies from Wazuh dashboard image
 2023-11-22 09:00:13 -03:00
c-bordon 423fc248ef Removed report dependencies from Wazuh dashboard image 2023-11-21 15:05:17 -03:00
vcerenu 12d45d83ad add dheck for filebeat repository 2023-11-21 10:24:37 -03:00
vcerenu f7f90941ed add dheck for filebeat repository 2023-11-21 09:52:52 -03:00
Carlos Bordon 6c50089d53 Merge pull request #1117 from wazuh/change/1116-update-filebeat-module-to-03-version 
Updated Filebeat module version to 0.3
 2023-11-14 15:11:57 -03:00
c-bordon 56ccf81185 Fixed wrong file 2023-11-14 14:29:46 -03:00
c-bordon 20a3f170d8 Updated Filebeat module version to 0.3 2023-11-14 14:28:35 -03:00
Carlos Bordon 25e4c24c87 Merge pull request #1105 from wazuh/change_revision 
Support new stage RC 1 for 4.7.0 in wazuh-docker repository
 2023-11-13 09:40:15 -03:00
vcerenu 2ccd5dc431 change revision number 2023-11-13 09:33:37 -03:00
David Jose Iglesias Lopez 504e1f2017 Merge pull request #1091 from wazuh/enhancement/337-change-repo-name 
Update links to wazuh-kibana-app repo
 2023-11-02 16:30:51 +01:00
Victor Ereñú 15413250e8 Merge pull request #1095 from wazuh/1094-support-new-stage-alpha-2 
Bump revision number
 2023-11-02 12:22:30 -03:00
vcerenu fa956c53e7 bump revision number 2023-11-02 12:07:17 -03:00
rafabailon d352019385 Rename Kibana as Dashboard 2023-10-31 10:09:45 +01:00
Gonzalo Acuña 27962e38f1 Merge pull request #1086 from wazuh/maintenance/1332-update-wazuh-kibana-app-references 
Updated wazuh-kibana-app reference
 2023-10-25 12:40:14 -03:00
David Correa Rodríguez f1140fc088 Updated wazuh-kibana-app references 2023-10-25 15:56:11 +02:00
Gonzalo Acuña 0ecf533cdc Merge pull request #1085 from wazuh/1079-make-directories-for-docker-composeyml 
Make directories for docker-compose.yml
 2023-10-25 09:47:02 -03:00
vcerenu cda712949a add mounted directories into dockerfile 2023-10-25 09:20:33 -03:00
vcerenu 4a95d18b9a add mounted directories into dockerfile 2023-10-25 06:29:09 -03:00
David Correa Rodríguez bfae09af52 Merge pull request #1081 from wazuh/merge-4.7.0-into-4.7.1 
Merge 4.7.0 into 4.7.1
 2023-10-24 09:53:02 +02:00
David Correa Rodríguez 1c0b12deaa Merge branch '4.7.0' into merge-4.7.0-into-4.7.1 2023-10-24 09:48:38 +02:00
David Correa Rodríguez 92b3395abc Merge pull request #1080 from wazuh/merge-4.6.0-into-4.7.0 
Merge 4.6.0 into 4.7.0
 2023-10-24 09:47:17 +02:00
David Correa Rodríguez b1d10f879c Merge branch '4.6.0' into merge-4.6.0-into-4.7.0 2023-10-24 09:42:48 +02:00
David Correa Rodríguez 98e96a5260 Merge pull request #1077 from wazuh/merge-4.5.4-into-4.6.0 
Merge 4.5.4 into 4.6.0
v4.6.0 		2023-10-24 09:40:50 +02:00
David Correa Rodríguez 84e57b9c9a Merge branch '4.5.4' into merge-4.5.4-into-4.6.0 2023-10-24 09:25:31 +02:00
Victor Ereñú e13cfcf454 Merge pull request #1073 from wazuh/bump-revision-4.6.0 
Bump revision 40603
 2023-10-23 12:33:32 -03:00
vcerenu e48255641f bump revision 2023-10-23 12:21:49 -03:00
Victor Ereñú c4d6a254cc Merge pull request #1067 from wazuh/merge-4.7.0-into-4.7.1 
Merge 4.7.0 into 4.7.1
 2023-10-23 05:37:06 -03:00
vcerenu d45e2d984e resolving conflicts 2023-10-23 05:27:21 -03:00
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
David Correa Rodríguez 3a3218f0d4 Merge pull request #1061 from wazuh/bump-revision-40510 
Bump revision to 40510
v4.5.4 		2023-10-19 12:00:04 +02:00
David Correa Rodríguez dd86d1b707 Bump revision to 40510 2023-10-19 11:46:24 +02: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 8aad8651d7 Merge pull request #1058 from wazuh/bump-version-4.5.4 
Bump 4.5.4 version
 2023-10-17 09:03:27 -03:00
vcerenu 3c073ab5ea bump 4.5.4 version 2023-10-17 09:01:18 -03: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