2920 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Josh Brower	a37ce376a7	Merge pull request #676 from Security-Onion-Solutions/bugfix/elastalert-nidsalert ... Playbook hivealert fixes	2020-05-13 19:28:19 -04:00
Josh Brower	8a68e6adb3	Playbook hivealert fixes	2020-05-13 19:27:14 -04:00
Josh Patterson	0e43a948b5	Merge pull request #675 from Security-Onion-Solutions/issue/668 ... add missing install for apt-get	2020-05-13 17:38:44 -04:00
m0duspwnens	367f99bf6e	add missing install for apt-get	2020-05-13 17:38:11 -04:00
Josh Patterson	e8778a2ad7	Merge pull request #674 from Security-Onion-Solutions/issue/668 ... point gpg key to archive/2019.2.5	2020-05-13 17:24:04 -04:00
m0duspwnens	d82c6c34ed	Merge branch 'issue/668' of https://github.com/Security-Onion-Solutions/securityonion-saltstack into issue/668	2020-05-13 17:22:34 -04:00
m0duspwnens	f3ff8dc18c	add quiet option back to wget	2020-05-13 17:22:24 -04:00
Josh Patterson	5e2a1b9346	Merge branch 'dev' into issue/668	2020-05-13 17:17:53 -04:00
m0duspwnens	1499a0c5fd	point gpg key to archive/2019.2.5	2020-05-13 17:16:15 -04:00
Josh Brower	e9deb99d2f	Merge pull request #673 from Security-Onion-Solutions/bugfix/elastalert-nidsalert ... Elastalert - NIDS fix	2020-05-13 17:04:00 -04:00
Josh Brower	c3627c38e3	Elastalert - NIDS fix	2020-05-13 17:03:14 -04:00
Josh Patterson	1b764f5d90	Merge pull request #672 from Security-Onion-Solutions/issue/668 ... remove space in package install	2020-05-13 16:43:34 -04:00
m0duspwnens	64cddfeed3	remove space in package install	2020-05-13 16:42:49 -04:00
Josh Brower	48ee1fe016	Merge pull request #671 from Security-Onion-Solutions/bugfix/elastalert ... Elastalert --> TheHive fixes	2020-05-13 16:35:22 -04:00
Josh Brower	6e4ee26a58	Elastalert --> TheHive fixes	2020-05-13 16:34:35 -04:00
William Wernert	92bb1499c4	Merge branch 'dev' of github.com:Security-Onion-Solutions/securityonion-saltstack into dev ... # Conflicts: # setup/so-functions	2020-05-13 16:20:10 -04:00
William Wernert	d7f5246dc4	[feat] Add quiet flag to wget	2020-05-13 16:19:06 -04:00
William Wernert	8c8e0bf0e4	[fix] Set hostname correctly so salt picks it up before reboot	2020-05-13 16:15:41 -04:00
Josh Patterson	c0c173fd71	Merge pull request #670 from Security-Onion-Solutions/issue/668 ... fix the missed changes for 2019.2.5 salt upgrade	2020-05-13 16:04:58 -04:00
m0duspwnens	c4ba7b3024	fix the missed changes for 2019.2.5 salt upgrade - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/668	2020-05-13 16:03:22 -04:00
Josh Patterson	a06498d8fb	Merge pull request #669 from Security-Onion-Solutions/issue/668 ... pin salt repo to 2019.2.5 for centos7	2020-05-13 15:19:34 -04:00
m0duspwnens	9d33d6ae62	pin salt repo to 2019.2.5 for centos - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/668	2020-05-13 15:18:07 -04:00
Josh Patterson	9c98d7d570	Merge pull request #667 from Security-Onion-Solutions/issue/227 ... add newline to mastersearch tab	2020-05-13 14:10:07 -04:00
m0duspwnens	5b57c58b84	add newline to mastersearch tab	2020-05-13 14:09:15 -04:00
William Wernert	5623f2e9a4	[fix] INSTALLERTYPE > install_type	2020-05-13 13:25:55 -04:00
William Wernert	c7aac11868	[fix] Don't redirect echo twice	2020-05-13 13:04:39 -04:00
William Wernert	530dd3b82b	[fix] Don't redirect echo twice	2020-05-13 12:49:37 -04:00
William Wernert	6cdcda30f4	Merge branch 'dev' of github.com:Security-Onion-Solutions/securityonion-saltstack into dev	2020-05-13 12:43:54 -04:00
William Wernert	8ce520317e	[fix] Sensor needs to set up firewall before installing packages	2020-05-13 12:43:50 -04:00
Josh Brower	bb0a89f12b	Merge pull request #666 from Security-Onion-Solutions/bugfix/playbook-updateplays ... Playbook - update plays	2020-05-13 12:20:30 -04:00
Josh Brower	23b4870ee6	Playbook - update plays	2020-05-13 12:19:37 -04:00
Jason Ertel	db51ab9d45	Adjust elastalert salt setup to match new so-elastalert image	2020-05-13 12:14:18 -04:00
Josh Patterson	e9cf0f8599	Merge pull request #665 from Security-Onion-Solutions/issue/227 ... Issue/227	2020-05-13 12:11:43 -04:00
m0duspwnens	d94a76a2c7	fix docker_container_cpu calculations for grafana	2020-05-13 12:06:02 -04:00
William Wernert	36b16cd2fe	[fix] Remove extra backslash	2020-05-13 11:57:17 -04:00
William Wernert	846a875429	[fix] Install epel before installing argon2	2020-05-13 11:54:57 -04:00
m0duspwnens	581000b920	add grafana dashboard for mastersearch node - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/227	2020-05-13 11:52:10 -04:00
William Wernert	10cd6dd8d9	Merge branch 'dev' of github.com:Security-Onion-Solutions/securityonion-saltstack into dev	2020-05-12 18:07:10 -04:00
William Wernert	24dd4e0489	[fix] Add user to SOC after state has been applied	2020-05-12 18:07:04 -04:00
Mike Reeves	50fc9a4713	Merge pull request #664 from Security-Onion-Solutions/feature/defaultsearch ... Remove Keyword	2020-05-12 17:55:32 -04:00
Mike Reeves	0b0c8d8471	Remove Keyword	2020-05-12 17:54:25 -04:00
William Wernert	1230cc57d7	[fix] Correct percentages	2020-05-12 17:54:03 -04:00
William Wernert	75af1e9920	Merge branch 'dev' of github.com:Security-Onion-Solutions/securityonion-saltstack into dev	2020-05-12 17:52:48 -04:00
William Wernert	08007a491f	[fix] reboot error fix	2020-05-12 17:52:44 -04:00
William Wernert	cb69edc6dd	[fix] Add back call to add_web_user	2020-05-12 17:50:52 -04:00
Mike Reeves	71f99528ae	Move idstools and master earlier in the setup	2020-05-12 17:47:55 -04:00
Josh Brower	bc4b4385bf	Merge pull request #662 from Security-Onion-Solutions/bugfix/soctopus-config ... soctopus config fix	2020-05-12 17:04:22 -04:00
Josh Patterson	81d66207ed	Merge pull request #661 from Security-Onion-Solutions/quickfix/common ... move statedir and salttmp from salt state to common state	2020-05-12 17:00:13 -04:00
Josh Brower	d270c8f32d	soctopus config fix	2020-05-12 16:59:35 -04:00
m0duspwnens	d5b2a6f059	move statedir and salttmp from salt state to common state	2020-05-12 16:58:26 -04:00