Commit Graph

464 Commits

Author SHA1 Message Date
Jose M
adc4efb694 Bump version 2019-08-12 17:26:01 +02:00
Jose M
62e39920cd Update CHANGELOG.md 2019-08-12 17:25:32 +02:00
Jose M
2a77c6a6e6 Implement wazuh Filebeat Module 2019-08-12 17:20:56 +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
61b1f45bc4 Updated docker-compose 2019-07-20 18:33:04 +02:00
Manuel J. Bernal
881a0abfa5 Bump version 2019-07-20 18:32:33 +02:00
manuasir
d8c14e108c Merge branch '3.9.3_7.2.0' of https://github.com/wazuh/wazuh-docker into 3.9.3_7.2.0 2019-07-20 18:24:29 +02:00
Manuel J. Bernal
60b32d0d21 Improve cluster configuration 2019-07-20 18:23:33 +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
Manuel J. Bernal
9740ddcf3e Added more fixes to configuration files 2019-07-19 23:03:11 +02:00
manuasir
5db7509b52 Fixed cluster configuration 2019-07-19 18:06:27 +02:00
Jose M
e00cd1081a Fix Bash syntax error with multiple conditions on ES and Kibana 2019-07-17 15:20:06 +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
Manuel J. Bernal
ad4084a8da Updated docker-compose 2019-06-12 19:57:28 +02:00
Manuel J. Bernal
11b926ffa3 Updated changelog 2019-06-12 19:53:34 +02:00
Manuel J. Bernal
d81ab1e304 Bump version 2019-06-12 17:04:42 +02:00
Manuel J. Bernal
a6b453b9df Bump version 2019-06-12 17:03:30 +02:00
Manuel J. Bernal
ee0303fd36 Added docker images from tag 2019-06-10 21:33:06 +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
Jose M
6a82b98fcf Bump version. 2019-05-24 16:39:24 +02:00
Jose M
1922ae145a Added 'cluster.initial_master_nodes' and related env variable. 2019-05-24 16:35:29 +02:00
manuasir
7944897a0d Fixed template URL 2019-05-22 12:21:55 +02:00
Manuel J. Bernal
771396ae9e Fixed conflicts 2019-05-21 23:53:30 +02:00
Manuel J. Bernal
09164c4285 Bump version 2019-05-21 23:47:05 +02:00
Manuel J. Bernal
948aaf289c Fixed sed command in kibana_settings 2019-05-21 23:46:12 +02:00
Manuel J. Bernal
d96e94f4fa Changed entrypoint copy location 2019-05-21 23:45:58 +02:00
Manuel J. Bernal
8077b9b084 Bump version 2019-05-21 23:45:55 +02:00
Manuel J. Bernal
f66f986abb Fixed sed command in kibana_settings 2019-05-21 23:18:51 +02:00
Manuel J. Bernal
569d3ee931 Changed entrypoint copy location 2019-05-21 23:18:35 +02:00
manuasir
2e4f1ffe45 Updating to 3.9.1-6.8.0 2019-05-21 19:13:15 +02:00
manuasir
f60195a075 Merge branch '3.9.0_6.7.2' 2019-05-18 12:01:56 +02:00
Javier Castro
2c67ad822e Allow port change for elasticsearch url in kibana 2019-05-18 11:56:30 +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
Javier Castro
447c15c823
Allow port change for elasticsearch url in kibana 2019-05-17 12:56:45 -07:00
Jesús Ángel
780dfe1a51 Updated Filebeat config for Elastic 7 2019-05-14 15:06:12 +02:00
Jesús Ángel
eadc765860 Remove Logstash output 2019-05-14 15:06:00 +02:00
Jesús Ángel
ae3734db18 Adding template. Using "elastic-7-2" branch 2019-05-14 15:05:49 +02:00
Jesús Ángel
91d4ec5c4b Uncomment "elasticsearch.hosts" setting 2019-05-14 15:05:06 +02:00
Jesús Ángel
d6074f5f7e Temporary using staging Wazuh app (testing) 2019-05-14 15:04:44 +02:00