Commit Graph
69 Commits
Author SHA1 Message Date
manuasir 8d5e090a03 Removed deprecated services 2020-10-16 13:47:24 +02:00
manuasir eb59ed2e39 Resolved conflicts 2020-10-16 13:40:32 +02:00
Manuel J. Bernal eba4fdf8eb Bump docker-compose version 2020-07-14 19:18:31 +02:00
manuasir 1f825c13be Bump version 2020-07-14 19:15:07 +02:00
Manuel J. Bernal 63880eab51 WIP: test build execution 2020-05-04 15:27:05 +02:00
Manuel J. Bernal fa55036943 Added parameter to build 2020-05-04 15:25:39 +02:00
Manuel J. Bernal 6dab191255 First GitHub action test 2020-05-04 15:23:48 +02:00
manuasir 99361ee0e4 Merge branch 'stable' 2019-12-16 19:37:57 +01:00
Manuel J. Bernal 89eda06a27 Bump version 2019-12-16 19:34:57 +01: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 9740ddcf3e Added more fixes to configuration files 2019-07-19 23:03:11 +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
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 f60195a075 Merge branch '3.9.0_6.7.2' 2019-05-18 12:01:56 +02:00
manuasir 7c49e389a8 Merge branch '3.9.0_6.7.2' 2019-05-10 22:49:17 +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 66adf7fd6f Merging k8s changes into 3.9. 2019-04-25 16:06:02 +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
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. 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
Manuel J. Bernal 582e93b955 Update CHANGELOG.md 2019-04-02 20:58:16 +02:00
manuasir 274d6248d3 Bump version. 2019-04-02 18:21:04 +02:00
Manuel J. Bernal b47f723285 Merge pull request #130 from wazuh/update-3.8.2_6.6.2
Upgrade Elastic stack version to 6.6.2
2019-03-29 19:05:17 +01:00
manuasir b99d54eb25 Bump version 2019-03-29 19:03:28 +01:00
Manuel J. Bernal 2b0f2955d0 Merge pull request #129 from wazuh/update-3.8.2_6.6.1
Upgrade Elastic stack version to 6.6.1
2019-03-29 18:52:41 +01:00
Manuel J. Bernal 38644d380c Update CHANGELOG.md 2019-03-29 18:51:52 +01:00
manuasir 86bc43a494 Bump version 2019-03-29 18:44:36 +01:00
manuasir 8e5ad87619 Added vm.max_map_count to README 2019-03-29 18:27:17 +01:00
manuasir 2bd0138d6f Merge branch '3.8.2_6.5.4' into update-3.8.2_6.6.1 2019-03-29 16:20:10 +01:00
Manuel J. Bernal 92b2814fb1 Merge pull request #140 from wazuh/3.8.2_6.5.4-s3_repository
New features for Elasticsearch image: S3 repository plugin and configure_s3.sh
2019-03-27 12:50:59 +01:00
Manuel J. Bernal 260762968d Merge pull request #137 from wazuh/remove-build-time-alerts
Remove alerts created in build time
2019-03-27 11:29:55 +01:00
Manuel J. Bernal beb9bee27b Merge pull request #141 from wazuh/dev-duplicate-alerts-fix
Fixing duplicate alerts with kubernetes
2019-03-27 11:28:49 +01:00
Manuel J. Bernal 49f6f673c6 Merge pull request #136 from wazuh/dev-nginx-credentials
Setting Nginx docker to support several user/passwords in Kibana
2019-03-27 11:26:02 +01:00
Manuel J. Bernal 73e5b99983 Merge pull request #135 from wazuh/dev-logstash-entrypoint
New Logstash entrypoint added
2019-03-22 10:58:11 +01:00
Manuel J. Bernal e563df4093 Merge branch '3.8.2_6.5.4' into dev-logstash-entrypoint 2019-03-22 10:57:15 +01:00
Manuel J. Bernal 18e955090a Merge pull request #133 from wazuh/dev-welcome-screen
Welcome screen management
2019-03-21 19:20:58 +01:00
Manuel J. Bernal 7e2549a85a Merge pull request #121 from wazuh/3.8.2_6.5.4-refactor
Refactor of Wazuh Dockerfile
2019-03-15 15:44:47 +01:00
Manuel J. Bernal f8dada12b1 Merge pull request #128 from wazuh/fix-copyright-year
Changing copyright year to 2019
2019-03-15 15:27:34 +01:00
Manuel J. Bernal 3b7705e868 Merge pull request #126 from wazuh/3.8.2_6.5.4-refractor-fix
Fixing missing packets, env vars and config file of filebeat
2019-03-13 17:52:51 +01:00
Manuel J. Bernal 10ae694a92 Merge pull request #120 from wazuh/3.8.2_6.5.4-update-compose
Updating docker-compose file
2019-02-13 12:23:38 +01:00
manuasir bc18ef46e6 Deleted unused file 2019-02-12 18:06:23 +01:00
manuasir fdd2c9d2bf Updating docker-compose file 2019-02-12 17:38:49 +01:00
manuasir 89e6af0d9a Added authorization to every Elastic request 2019-02-12 17:10:46 +01:00
manuasir 9a841fdbd3 Added support for secure HTTPS xPac requests 2019-02-11 15:28:43 +01:00
Manuel J. Bernal 649489297b Merge pull request #118 from wazuh/3.8.2_6.5.4-env-data-flow
Adding env variables for alerts data flow
2019-02-08 21:46:27 +01:00
Manuel J. Bernal 22eeee3592 Merge pull request #117 from wazuh/kibana-optimized
Wazuh-Kibana customizable at plugin level
2019-02-08 17:17:33 +01:00
Manuel J. Bernal 4687360677 Merge pull request #111 from wazuh/disable-xpack
Adding the option to disable some xpack features
2019-02-07 16:57:53 +01:00