paulmataruso/wazuh-docker-mirror
1
0
Fork 0
mirror of https://github.com/wazuh/wazuh-docker.git synced 2025-11-03 13:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,705 Commits 92 Branches 158 Tags
dc167c2316a31c9f46135aa670d9cd0089c8d93c
Commit Graph

1705 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Ereñú
dc167c2316 Merge pull request #1114 from wazuh/merge-4.8.0-into-master 
Merge 4.8.0 into master
 2023-11-14 08:08:04 -03:00
Victor Ereñú
6b910bc636 Merge pull request #1113 from wazuh/test-sign-old-commits 
Merge 4.8.0 last commits into 4.8.0 branch
 2023-11-14 08:02:13 -03:00
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
Victor Ereñú
6591e7e4a1 Merge pull request #1109 from wazuh/merge-4.7.0-into.4.7.1 
Merge 4.7.0 into 4.7.1
 2023-11-14 04:34:08 -03:00
vcerenu
a97c14e807 resolving conflicts 2023-11-14 04:29:00 -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
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
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
Carlos Bordon
49bc23682f Merge pull request #1093 from wazuh/merge-4.8.0-into-master 
Merge 4.8.0 into master
 2023-10-31 14:03:42 -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
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
122acb404d Merge pull request #1083 from wazuh/merge-4.8.0-into-master 
Merge 4.8.0 into master
 2023-10-24 10:20:14 +02:00
David Correa Rodríguez
efac96b011 Merge branch '4.8.0' into merge-4.8.0-into-master 2023-10-24 10:12:51 +02: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
Victor Ereñú
ee9fdc383a Merge pull request #974 from DevinNorgarb/patch-1 
Fix typos in README.md
 2023-10-24 04:23:42 -03: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ñú
103c7e66df Merge pull request #1069 from wazuh/merge-4.8.0-into-master 
Merge 4.8.0 into master
 2023-10-23 05:48:29 -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