yahoo_1999/fk-wazuh
1
0
Fork 0
forked from wazuh/wazuh-docker
Code Pull Requests Activity
271 Commits 125 Branches 170 Tags
3b7705e8683020daf07ea95e5d4ac00aecff2735
Commit Graph
271 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
AlfonsoRBJ 7a9b32fbd9 Merge pull request #84 from wazuh/cluster-hostname-k8s 
Temporary fix for Wazuh cluster master node in Kubernetes
 2018-12-27 12:49:55 +01:00
AlfonsoRBJ ef5fbe15a5 Temporary fix for Wazuh cluster master node in K8S 2018-12-27 12:46:57 +01:00
AlfonsoRBJ a8e1661aa6 Bump version 3729 v3.7.2_6.5.4 2018-12-21 11:46:06 +01:00
AlfonsoRBJ c7abb4239f Update CHANGELOG.md 2018-12-21 11:45:12 +01:00
AlfonsoRBJ 68b4703f7a Update Elastic Stack to version 6.5.4 2018-12-21 11:43:39 +01:00
AlfonsoRBJ 2e66d5f3ee Merge pull request #82 from wazuh/Update-to-Elastic-6.5.4 
Update Elastic Stack version to 6.5.4
 2018-12-21 11:42:21 +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
Jesus Linares 2a03d08a5b Update changelog v3.7.2_6.5.3 2018-12-20 11:39:23 -05:00
AlfonsoRBJ 40a74df00d Bump version 3728 2018-12-20 13:26:02 +01:00
AlfonsoRBJ 05fa996ffd Update CHANGELOG.md 2018-12-20 13:25:36 +01:00
AlfonsoRBJ edd2e250e8 Update CHANGELOG.md 2018-12-20 13:24:48 +01: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 49663b71bb Update VERSION 2018-12-20 13:22:08 +01:00
AlfonsoRBJ 77f123460e Update CHANGELOG.md 2018-12-20 13:21:33 +01:00
AlfonsoRBJ 458bfcde09 Update CHANGELOG.md 2018-12-20 13:21:16 +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
LuisGi93 7cce0d9c9e entrypoint.sh updated so docker upgrade is posible 2018-12-19 20:05:33 +01:00
AlfonsoRBJ cd0d180c93 Update Wazuh version 3.7.2 2018-12-18 18:28:02 +01:00
AlfonsoRBJ 16335e1f70 Bump version 3726 2018-12-17 11:19:26 +01:00
AlfonsoRBJ e3e81a4671 Update Wazuh-Docker to 3.7.1_6.5.3 2018-12-17 11:14:34 +01:00
AlfonsoRBJ 7e83951672 Merge pull request #77 from wazuh/3.7.1_6.5.3 
Using etc folder as a mounting point (#73)
 2018-12-17 10:55:42 +01:00
José Luis Ruiz 31b43aa2f1 Upgrade to Elastic 6.5.3 and Wazuh 3.7.1 (#75) 2018-12-14 18:56:01 +01:00
AlfonsoRBJ 6b3018a56b Update README.md 2018-12-13 12:19:07 +01:00
Javier Castro 6fbae577dd Using etc folder as a mounting point (#73) 2018-11-26 15:56:36 +01:00
Jesus Linares 5b5c6200bb Update changelog and bump version v3.7.0_6.5.0 2018-11-23 12:23:16 -05:00
AlfonsoRBJ 63a85e84a8 Bump Version 3.7.0_6.5.0 3700 2018-11-23 18:17:55 +01:00
AlfonsoRBJ bd162140a9 Update CHANGELOG.md 2018-11-23 17:55:16 +01:00
AlfonsoRBJ b140600d25 Update Elastick Stack to 6.5.0 2018-11-23 11:33:12 +01:00
AlfonsoRBJ f5037c392e Merge pull request #71 from jlruizmlg/patch-1 
Update branch to apply the template
 2018-11-23 10:34:14 +01:00
AlfonsoRBJ 9ef497f426 Merge pull request #72 from wazuh/3.7.0_6.4.3 
Update master to 3.7.0 6.4.3
 2018-11-23 10:27:14 +01:00
José Luis Ruiz aa38747e7c Update branch to apply the template 
This commit fixes the branch name where pull the template from Elastic.
 2018-11-22 10:48:04 +01:00
AlfonsoRBJ 322c9520f9 New repository content (#70) 2018-11-19 09:34:59 +01:00
AlfonsoRBJ 6f355f0405 Add compatiblity with AWS-integration (#69) 2018-11-19 09:34:16 +01:00
AlfonsoRBJ 2d1f61e5b5 Merge pull request #67 from wazuh/smtp-packages 
Added SMTP packages
 2018-11-16 16:05:12 +01:00
AlfonsoRBJ fb0409697f Update docker-compose.yml 
When merging the code, the build section for the wazuh container will not be necessary.
 2018-11-16 16:03:49 +01:00
AlfonsoRBJ c4237ad894 ossec-init.conf must not be included 
As soon as it is updated, this file will show the old version.
 2018-11-16 10:13:01 +01:00
AlfonsoRBJ 002cf2fbff ossec-init.conf must not be included 
As soon as it is updated, this file will show the old version.
 2018-11-16 09:41:36 +01:00
AlfonsoRBJ 9f0643f456 Added SMTP packages 
We have added the SMTP packages that are missing.

For its installation we have to add the universe repository.
 2018-11-13 14:51:14 +01:00
Vikman Fernandez-Castro 69da45fc9d Update list of shared directories 2018-11-11 13:27:39 +01:00
Vikman Fernandez-Castro a441251d1a Update to Wazuh 3.7.0 and Elastic 6.4.3 2018-11-11 13:26:01 +01:00
AlfonsoRBJ 1c0d2e2147 Merge pull request #65 from wazuh/3.6.1_6.4.2_upgrade 
3.6.1 6.4.2 upgrade
 2018-11-06 17:14:43 +01:00
AlfonsoRBJ 59831ffb07 Update data_dirs.env 2018-11-06 15:21:35 +01:00
AlfonsoRBJ 92cfd70ad0 Merge pull request #61 from forana/ossec-home-dir 
Set ossec user's home path
 2018-11-06 11:32:36 +01:00
AlfonsoRBJ ee885299c7 Merge pull request #60 from forana/license 
added license file to match https://github.com/wazuh/wazuh
 2018-11-06 09:02:48 +01:00
AlfonsoRBJ dd98a6d849 Merge pull request #59 from forana/nginx-note 
added description for wazuh-nginx
 2018-11-05 16:48:26 +01:00
AlfonsoRBJ 3668ff8842 Merge pull request #55 from forana/filebeat-harvester 
updated logstash config to remove deprecation warnings
 2018-11-05 16:36:47 +01:00
AlfonsoRBJ 4eb99e978c Merge pull request #51 from wazuh/fix-nginx-kibana-6.4.0 
Increased proxy buffer for NGINX Kibana
 2018-11-05 12:34:16 +01:00
AlfonsoRBJ 440bbbe49b Merge pull request #58 from forana/custom-hooks 
Allow custom scripts or commands before service start
 2018-10-30 13:00:00 +01:00