yahoo_1999/fk-wazuh
1
0
Fork 0
forked from wazuh/wazuh-docker
Code Pull Requests Activity
1,687 Commits 125 Branches 170 Tags
95bd43c7e56476ae867af3c4e8d71f4cbf157bd5
Commit Graph
1687 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
vcerenu 95bd43c7e5 change revision tag 2023-11-14 05:50:13 -03:00
vcerenu ff5e59982b change hostname from apply ism policy 2023-11-14 05:50:08 -03:00
vcerenu ed136c994e change apt-key add command 2023-11-14 05:50:02 -03:00
vcerenu b55cfaa9a0 add ism policies 2023-11-14 05:49:35 -03:00
Carlos Bordon a68da465d3 Merge pull request #1098 from wazuh/change/updateIndexerFiles-to4.8.0 
Updated security config files
 2023-11-09 09:15:01 -03:00
c-bordon 486c41e3f9 Updated security config files 2023-11-09 09:09:08 -03: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
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 7c814de638 Merge pull request #1082 from wazuh/merge-4.7.1-into-4.8.0 
Merge 4.7.1 into 4.8.0
 2023-10-24 10:00:25 +02:00
David Correa Rodríguez 1ee77e40ce Merge branch '4.7.1' into merge-4.7.1-into-4.8.0 2023-10-24 09:54:35 +02: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
Gonzalo Acuña 2cd1ca79e6 Merge pull request #1074 from wazuh/idr-394-defRoute 
Dashboard default route update
 2023-10-23 13:53:46 -03:00
Gonzalo Acuña 4c2582952f Dashboard default route update 2023-10-23 13:28:22 -03: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ñú 40618586a9 Merge pull request #1068 from wazuh/merge-4.7.1-into-4.8.0 
Merge 4.7.1 into 4.8.0
 2023-10-23 05:43:06 -03:00
vcerenu 274c0bc692 resolving conflicts 2023-10-23 05:39:31 -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ñú 7474e836b6 Merge pull request #1048 from wazuh/merge-4.7.1-into-master 
Merge 4.7.1 into master
 2023-10-11 06:00:37 -03:00
vcerenu acb3688346 resolving conflicts 2023-10-11 05:47:56 -03:00
vcerenu 4d153f6705 bump new builder script 2023-10-11 05:44:48 -03:00
Victor Ereñú 85ba8cb9b0 Merge pull request #1036 from wazuh/merge-4.7.1-into-master 
Merge 4.7.1 into master
 2023-10-09 06:52:26 -03:00
vcerenu 5aaeb0d944 Updated version in new builder script 2023-10-09 11:45:24 +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