Commit Graph
128 Commits
Author SHA1 Message Date
Jose M c94b82b42d Bump version 2019-08-16 10:02:55 +02:00
manuasir 3cd812ad8e Added OSS images and deleting every XPACK occurrence 2019-07-29 16:24:13 +02:00
Manuel J. Bernal 881a0abfa5 Bump version 2019-07-20 18:32:33 +02:00
manuasir 8a6225856d Change Elasticsearch output in Filebeat if env var was set 2019-06-18 18:56:41 +02:00
Manuel J. Bernal d81ab1e304 Bump version 2019-06-12 17:04:42 +02:00
manuasir 4a01fcc01f Bump version 2019-06-04 15:21:14 +02:00
manuasir 5d1432b729 Fixed conflicts 2019-06-03 18:59:13 +02:00
Jose M 6a82b98fcf Bump version. 2019-05-24 16:39:24 +02:00
manuasir 2e4f1ffe45 Updating to 3.9.1-6.8.0 2019-05-21 19:13:15 +02: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 20d2891e23 Correct copyright header 2019-05-14 15:01:19 +02:00
manuasir 72725daa75 Bump version. 2019-05-09 16:43:49 +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
Mayte Ariza 9db7bbd160 Removing logs from Wazuh image (#153) 2019-04-29 18:01:11 +02:00
manuasir 66adf7fd6f Merging k8s changes into 3.9. 2019-04-25 16:06:02 +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
manuasir 274d6248d3 Bump version. 2019-04-02 18:21:04 +02:00
manuasir b99d54eb25 Bump version 2019-03-29 19:03:28 +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 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
l ebca6b3696 Fixing duplicate alerts with kubernetes 2019-03-26 16:30:50 +01:00
AlfonsoRBJ 92d957730c remove alerts on build time 2019-03-25 17:36:27 +01:00
AlfonsoRBJ 8823405dd9 remove alerts content 2019-03-22 14:47:22 +01:00
l b06e4c4a5e Upgrade Elastic stack version to 6.6.1 2019-03-19 10:48:07 +01:00
l 532b691172 Changing copyright year to 2019 2019-03-15 15:11:49 +01:00
l 3dce66e869 Fixing missing packets, env vars and config file of filebeat 2019-03-13 17:25:48 +01:00
migruiz4 d149327275 Resolved conflicts refactoring Dockerfile 2019-02-12 18:05:52 +01:00
havidarou 15f35ca6a8 Adding env variables for alerts data flow 2019-02-08 15:32:36 +00:00
AlfonsoRBJ ffe3dde43a Improvements to Kibana settings added (#91) 2019-02-01 19:00:22 +01:00
AlfonsoRBJ f3cc91fdf6 Filebeat registry (#109)
* Add filebeat registry

* Remove registry enrty
2019-02-01 18:50:25 +01:00
AlfonsoRBJ cb2e49eb54 Add Wazuh-Elasticsearch (#106) 2019-02-01 18:43:51 +01:00
AlfonsoRBJ d1c8d72bc3 Update to Wazuh version 3.8.2 2019-01-30 17:52:13 +01:00
AlfonsoRBJ c195f38458 Undo update 3.8.2 2019-01-30 17:50:05 +01:00
AlfonsoRBJ 01296a6c9e Update to Wazuh version 3.8.2 2019-01-30 17:46:18 +01:00
AlfonsoRBJ dcf644e37a Update to Wazuh version 3.8.1 (#102) 2019-01-24 17:15:57 +01:00
Jesus Linares 2f74ec6fdb Merge branch '3.8.0_6.5.4' 2019-01-18 15:34:34 -05:00
AlfonsoRBJ e85c9419b7 Remove cluster.py work around (#99) 2019-01-18 16:38:41 +01:00
AlfonsoRBJ eed4b0b9dc Upgrade version 3.8.0_6.5.4 (#97) 2019-01-14 17:17:00 +01:00
Jesus Linares ed913c1e71 Merge branch '3.7.2_6.5.4' 2019-01-03 09:43:37 -05:00
Jesús Linares 81035c39db Update Filebeat configuration (#88) 2019-01-03 15:37:48 +01:00
AlfonsoRBJ ef5fbe15a5 Temporary fix for Wazuh cluster master node in K8S 2018-12-27 12:46:57 +01:00
AlfonsoRBJ 020047aa8f Update Elastic Stack version to 6.5.4 2018-12-21 11:40:19 +01:00
Jesus Linares e275dc9446 Merge branch '3.7.2_6.5.3'
Conflicts:
	README.md
	VERSION
	docker-compose.yml
	kibana/Dockerfile
	wazuh/Dockerfile
2018-12-20 11:50:30 -05:00
AlfonsoRBJ 5e3b25aa95 Merge pull request #81 from wazuh/Issue_68-AWS_error
Erasing temporary fix for AWS integration
2018-12-20 13:23:46 +01:00
AlfonsoRBJ 12bb0cba4a Merge pull request #80 from LuisGi93/3.7.2_6.5.3
entrypoint.sh updated so docker upgrade is posible
2018-12-20 13:19:09 +01:00
cadoming 608b25df4c erasing temporary fix for AWS integration 2018-12-20 12:02:14 +00:00