yahoo_1999/fk-wazuh
1
0
Fork 0
forked from wazuh/wazuh-docker
Code Pull Requests Activity
554 Commits 125 Branches 170 Tags
da68eaf83e7406c5bb7f4b60f30dd6a38329d11b
Commit Graph
41 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Manuel J. Bernal 9a58958bcb Merge pull request #373 from wazuh/add-opendistro-support 
Add opendistro support and bump to 4.0-staging
 2020-09-30 13:46:07 +02:00
manuasir cfd1d9725d Merge branch 'add-opendistro-support' of https://github.com/wazuh/wazuh-docker into add-opendistro-support 2020-08-25 16:47:15 +02:00
manuasir 274342e24d Disabled basic auth 2020-08-25 16:47:11 +02:00
manuasir 67e259a681 Merge branch 'feature-github-actions' into devel-rework 2020-07-30 00:33:04 +02:00
Manuel J. Bernal 6419f35716 Merge pull request #364 from wazuh/bump-devel-rework-3.13.1_7.8.0 
Bump version to 3.13.1_7.8.0
 2020-07-22 18:29:58 +02:00
Manuel J. Bernal b886fd6c4d Merge pull request #333 from wazuh/feature-pristine-elastic 
Use official ES image without rebuilding
 2020-06-19 14:56:23 +02:00
Manuel J. Bernal 18f5f02153 Merge pull request #354 from wazuh/feature-rework-bump-s6 
Bump S6-overlay version
 2020-06-18 12:42:33 +02:00
Manuel J. Bernal 6c0af46903 Merge pull request #271 from wazuh/fix-266-filebeat 
Updated Filebeat configuration file
 2019-11-13 15:33:02 +01:00
manuasir 846ff81102 Updated Filebeat configuration file, fixes #266 2019-11-13 15:31:06 +01:00
Manuel J. Bernal 35914c35e1 Merge pull request #261 from coveord/feature/node-name-hostname 
Allow using the hostname as node_name for managers
 2019-10-08 12:06:29 +02:00
manuasir 60f04d3987 Merge branch 'stable' into devel 2019-10-01 15:25:20 +02:00
manuasir 2c31757953 Merge branch '3.10.2_7.3.2' 2019-10-01 15:09:37 +02:00
Manuel J. Bernal 505767ef31 Merge pull request #249 from wazuh/3.10.2_7.3.2-release 
Wazuh Docker Release 3.10.2 7.3.2
 2019-09-24 14:28:43 +02:00
manuasir 57e71d5545 Using ELK 7.3.0 2019-08-20 13:47:19 +02:00
manuasir 1562808cf6 Merge branch '3.9.3_7.2.0' 2019-07-22 16:37:13 +02:00
Manuel J. Bernal b0782505e1 Merge pull request #218 from wazuh/issue-217 
Adapt Kibana image to v7.2.0
 2019-07-22 16:35:47 +02:00
manuasir 507d27a448 Updated Kibana RESTful API version to v2 2019-07-22 16:30:26 +02:00
manuasir 40bb635036 Allowing install Wazuh plugin as root 2019-07-22 16:19:41 +02:00
Manuel J. Bernal a481d9c376 Merge pull request #213 from wazuh/3.9.3_fix_cluster_config 
Fixed duplicated cluster configuration
 2019-07-20 00:00:31 +02:00
manuasir 5db7509b52 Fixed cluster configuration 2019-07-19 18:06:27 +02:00
manuasir 7a6c3f5f5e Merged to master 2019-06-18 19:18:59 +02:00
Manuel J. Bernal 3aff6de0d0 Merge pull request #192 from wazuh/issue-191 
Changing Filebeat configuration if environment variable is set
 2019-06-18 19:11:46 +02:00
manuasir 8a6225856d Change Elasticsearch output in Filebeat if env var was set 2019-06-18 18:56:41 +02:00
manuasir e6cddf8e1d Removed Logstash occurrences 2019-06-18 18:56:21 +02:00
manuasir 286714606b Merge branch '3.9.1_7.1.0' 2019-06-04 15:33:52 +02:00
manuasir 0af05f88fa Merge branch '3.9.1_6.8.0' 2019-06-04 15:33:45 +02:00
manuasir 4a01fcc01f Bump version 2019-06-04 15:21:14 +02:00
manuasir e6da7606b9 Fixed conflicts 2019-06-03 19:00:40 +02:00
manuasir 5d1432b729 Fixed conflicts 2019-06-03 18:59:13 +02:00
manuasir 22ad4360f5 Add XPACK_SECURITY_ENABLED and KIBANA_INDEX options to Kibana container. 2019-06-03 17:20:11 +02:00
manuasir 7944897a0d Fixed template URL 2019-05-22 12:21:55 +02:00
manuasir 2e4f1ffe45 Updating to 3.9.1-6.8.0 2019-05-21 19:13:15 +02:00
Manuel J. Bernal 01e8e18f61 Merge pull request #178 from wazuh/kibana-elastic-port 
Allow port change for elasticsearch url in kibana
 2019-05-18 11:52:08 +02:00
Manuel J. Bernal f63d9fa387 Include protocol and port in LOGSTASH_OUTPUT environment variable (#164) 
* Including protocol and port in the LOGSTASH_OUTPUT env var.
 2019-05-10 22:26:49 +02:00
Manuel J. Bernal 0cef2a5974 Include protocol and port in LOGSTASH_OUTPUT environment variable (#164) 
* Including protocol and port in the LOGSTASH_OUTPUT env var.
 2019-05-10 22:24:41 +02:00
manuasir 72725daa75 Bump version. 2019-05-09 16:43:49 +02:00
manuasir dc70fb864d Bump version. 2019-04-30 17:01:02 +02:00
manuasir efab5fe0bd Updated CHANGELOG. 2019-04-29 18:34:50 +02:00
Manuel J. Bernal baa0ac6c22 Merge pull request #119 from wazuh/3.8.2_6.5.4-allow-xpac-req 
Added support for secure HTTPS xPack requests
 2019-04-29 17:06:52 +02:00
manuasir 99008b5e69 Added a conditional flag for enabling XPACK auth requests. 2019-04-29 17:04:38 +02:00
manuasir 2eeb44f902 Fixed conflict. 2019-04-29 12:17:42 +02:00