464 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Manuel Gutierrez	e2559957da	Use batch mode on htpasswd	2020-02-04 12:39:22 +01:00
Manuel Gutierrez	4f7ae19d81	Merge pull request #300 from wazuh/release-wazuh_3.11.3_7.5.2 ... Release wazuh 3.11.3 7.5.2	2020-01-28 19:08:12 +01:00
Manuel Gutierrez	d1f1e401b1	Fix typo in CHANGELOG	2020-01-28 18:23:54 +01:00
Manuel Gutierrez	ea27c239b2	Update Changelog	2020-01-28 12:36:06 +01:00
Manuel Gutierrez	e437c1a4ec	Update VERSION file	2020-01-28 12:35:51 +01:00
Manuel Gutierrez	1f57ad6619	Bump versions to 3.11.3_7.5.2	2020-01-28 12:35:24 +01:00
Jose M. Garcia	61a1385462	Merge pull request #298 from wazuh/release-wazuh_3.11.2_7.5.1 ... Release wazuh 3.11.2 7.5.1	2020-01-22 15:58:07 +01:00
Manuel Gutierrez	427b87d6e1	Update CHANGELOG.md	2020-01-22 15:54:13 +01:00
Manuel Gutierrez	8615cd4d21	Bump nodejs to v10	2020-01-22 15:48:27 +01:00
Manuel Gutierrez	a4a64e66f4	Update CHANGELOG.md	2020-01-22 14:39:07 +01:00
Manuel Gutierrez	a561deeaec	Update VERSION	2020-01-22 14:38:53 +01:00
Manuel Gutierrez	9f710f90c3	Bump to version 3.11.2_7.5.1	2020-01-22 14:38:28 +01:00
Manuel J. Bernal	4b054e88ca	Merge pull request #293 from AnthonySendra/patch-1 ... Fix S3 plugin installation in Elasticsearch	2020-01-15 15:11:30 +01:00
Anthony Sendra	43da69277f	fix s3 plugin	2020-01-10 12:49:09 +01:00
Jose M. Garcia	17865358d8	Merge pull request #289 from wazuh/wazuh-release-v3.11.1_7.5.1 ... Wazuh Release v3.11.1_7.5.1	2020-01-07 15:47:05 +01:00
Jose M	95cb2fa3aa	Update CHANGELOG.md	2020-01-07 15:11:08 +01:00
Jose M	bba5b90716	Update CHANGELOG.md	2020-01-07 14:56:04 +01:00
Jose M	afb1c1fba3	Bump version to 3.11.1_7.5.1	2020-01-07 14:55:52 +01:00
Jose M	95b6b70a70	Merge branch 'master' into devel	2020-01-07 14:38:55 +01:00
Jose M. Garcia	44a7a9b16f	Merge pull request #287 from wazuh/3.11.0_7.5.1 ... Release 3.11.0_7.5.1	2019-12-27 17:30:46 +01:00
Manuel Gutierrez	49f1b476b5	Update changelog	2019-12-27 17:17:39 +01:00
Manuel Gutierrez	e83a092449	Clarify comment	2019-12-27 17:07:58 +01:00
Manuel Gutierrez	380ba92708	Check for previous API settings on Wazuh Plugin	2019-12-27 15:48:49 +01:00
Manuel Gutierrez	7e8e11bfd6	Write API entry to wazuh.yml	2019-12-26 16:56:24 +01:00
Manuel Gutierrez	3c7d0f441d	Remove API setup from Elasticsearch image	2019-12-26 16:49:31 +01:00
Manuel Gutierrez	23fffddf95	Remove default entry	2019-12-26 13:30:10 +01:00
Manuel Gutierrez	88ec0fc043	Update config filename	2019-12-24 18:06:45 +01:00
Manuel Gutierrez	774d14ee18	Update changelog	2019-12-24 17:02:53 +01:00
Manuel Gutierrez	66f50039b0	Bump version to 3.11.0_7.5.1	2019-12-24 16:42:49 +01: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	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
Jean-Philippe Lachance	237f55d7e2	* Apply Jose's code review	2019-10-07 11:03:40 -04:00
Jean-Philippe Lachance	8cdfca24cf	+ Add a simple sed in the Wazuh manager configuration script to replace "to_be_replaced_by_hostname" by the hostname in ossec.conf	2019-10-03 10:00:37 -04: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
Jose M	6c9fce8964	Bump version to 3.10.2_7.3.2	2019-09-24 14:24:05 +02:00
Jose M	1f7e3a4498	Update CHANGELOG.md	2019-09-24 14:22:57 +02:00
Jose M	6d44063077	Update docker-compose with 3.10.0_7.3.2 images	2019-09-24 13:12:57 +02:00
Jose M	8fc6512164	Bump version to 3.10.0_7.3.2	2019-09-24 13:05:43 +02:00
Jose M	aaed0058ce	Update CHANGELOG.md	2019-09-24 13:04:41 +02:00
manuasir	57e71d5545	Using ELK 7.3.0	2019-08-20 13:47:19 +02:00
Jose M	6d393f976a	Change Filebeat link to production.	2019-08-13 12:17:27 +02:00
Jose M	f7eaf56691	Bump version	2019-08-12 17:32:26 +02:00
Jose M	2c9c0f6cea	Update README.md	2019-08-12 17:31:58 +02:00
Jose M	c2f43d0d29	Update CHANGELOG.md	2019-08-12 17:31:51 +02:00
Jose M	a2dd5867a1	Bump docker-compose to 3.9.4_7.2.0	2019-08-12 17:27:11 +02:00