Commit Graph
530 Commits
Author SHA1 Message Date
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 v3.8.2_6.5.4 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
Jesús Ángel 6ff836e9fc Removed template. Fix _type. Fix if condition. 2019-05-14 15:04:20 +02:00
Jesús Ángel 5799998308 Temporary fix for Elastic 7 cluster 2019-05-14 15:03:20 +02:00
Jesús Ángel 4adb9741e4 Do not add template in Elasticsearch Dockerfile 2019-05-14 15:02:50 +02:00
Jesús Ángel 1d4161cc02 Temporary using "build" instead of "image" 2019-05-14 15:02:21 +02:00
Jesús Ángel f462dd5846 Update README 2019-05-14 15:01:28 +02:00
Jesús Ángel 20d2891e23 Correct copyright header 2019-05-14 15:01:19 +02:00
Jesús Ángel e954a6486a Removed Logstash 2019-05-14 14:56:50 +02:00
manuasir 7c49e389a8 Merge branch '3.9.0_6.7.2' 2019-05-10 22:49:17 +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
Manuel J. Bernal eab0541d0a Bump version 2019-05-07 20:02:44 +02:00
manuasir 25cb3a82ea Merge branch '3.9.0_6.7.1' into stable 2019-05-03 17:57:04 +02:00
manuasir b43b1b4299 Merge branch '3.9.0_6.7.1' 2019-05-03 17:56:16 +02:00
Manuel J. Bernal 7bf7f532e0 Bump version 2019-05-03 17:48:22 +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
Mayte Ariza 9db7bbd160 Removing logs from Wazuh image (#153) 2019-04-29 18:01:11 +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
manuasir 66adf7fd6f Merging k8s changes into 3.9. 2019-04-25 16:06:02 +02:00
AlfonsoRBJ 3f75dbdd39 Add Elasticsearch cluster configuration (#146) 2019-04-25 15:52:05 +02:00
Manuel J. Bernal 3d8d612298 Merge pull request #151 from wazuh/k8s-cloud
Changing the original Wazuh docker image to allow adding code in entrypoint.sh
2019-04-17 16:04:57 +02:00
Mayte Ariza 49ace342a0 Entrypoint.sh: ! style history substitution removed 2019-04-17 15:54:38 +02:00
Mayte Ariza 5f2859d95e Entrypoint-scripts folder configured 2019-04-17 13:04:58 +02:00
Manuel J. Bernal bf52145e7a Merge pull request #124 from wazuh/fix-elastic-run-loop
Fixing docker run loop at the elasticsearch container
2019-04-04 12:46:29 +02:00
manuasir f44ba2a745 Merge branch 'stable' of https://github.com/wazuh/wazuh-docker into stable 2019-04-03 14:46:08 +02:00
manuasir 03f87a0927 Merge branch 'master' of https://github.com/wazuh/wazuh-docker 2019-04-03 14:45:44 +02:00
manuasir 61d3f460be Updated CHANGELOG. v3.8.2_6.7.0 2019-04-03 14:44:02 +02:00
manuasir 97b018b86a Updated CHANGELOG. 2019-04-03 14:43:46 +02:00
manuasir dab0f53634 Updated CHANGELOG. 2019-04-03 14:42:38 +02:00
manuasir c01c17623a Merge branch '3.8.2_6.7.0' 2019-04-03 14:41:42 +02:00
Manuel J. Bernal 9ed503b6e8 Merge pull request #144 from wazuh/update-3.8.2_6.7.0
Update to 3.8.2_6.7.0
2019-04-03 13:32:48 +02:00