5318 Commits

Author	SHA1	Message	Date
Mike Reeves	b92cbb01b3	SSL modifications	2021-12-09 13:13:01 -05:00
Mike Reeves	a7f0d81555	SSL modifications	2021-12-09 13:07:00 -05:00
Jason Ertel	702d95c63a	Merge branch 'master' into merge-202112071527	2021-12-07 10:28:00 -05:00
Wes Lambert	0571612ea1	Add initial EG dashes	2021-12-03 22:38:30 +00:00
Mike Reeves	f82d204c0e	Update soup	2021-12-03 15:20:33 -05:00
Mike Reeves	780daf8aa7	Apply hotfix to all 2.3.90 installs	2021-12-03 15:15:45 -05:00
m0duspwnens	c6773a0bbc	move "Preparing soup" to main so shows in soup.log	2021-12-03 10:26:22 -05:00
m0duspwnens	ff2d2c7c04	export LC_CTYPE="en_US.UTF-8" - https://github.com/Security-Onion-Solutions/securityonion/discussions/6431	2021-12-02 16:39:32 -05:00
Mike Reeves	f5761c73a5	Fix for the clustername used in wrong context	2021-12-02 15:30:35 -05:00
m0duspwnens	8d667795a7	only add soc:es_index_patterns to pillar if not already present	2021-12-02 10:28:17 -05:00
m0duspwnens	7a664ab8f7	more error proof up_to_2.3.90 function	2021-12-02 10:02:26 -05:00
Jason Ertel	e549cfdf82	Reign in the Wazuh port check to only complain if a non-Docker process is listening on 55000.	2021-12-02 09:35:13 -05:00
Josh Brower	97cd679d74	Fix FleetDM nginx errors	2021-12-02 08:17:01 -05:00
William Wernert	6e7188b4d8	Merge branch 'hotfix/2.3.90' into hotfix-merge ... # Conflicts: # HOTFIX	2021-12-01 14:40:34 -05:00
m0duspwnens	5e0ac89841	merge with master	2021-12-01 14:27:58 -05:00
m0duspwnens	c571b2c499	handle redirect if more than 1 match from compgen	2021-12-01 13:17:14 -05:00
Josh Patterson	63cb486698	remove redirect to /dev/null for compgen	2021-12-01 10:16:04 -05:00
Dustin Lee	8a394380cb	add subjectAltName to filebeat.crt ... IP SAN is required for Endgame integration w/Logstash when DNS resolution is unavailable	2021-11-30 16:24:08 -05:00
William Wernert	8d87fae6a8	Remove airgap repo file if it shouldn't exist	2021-11-30 15:46:22 -05:00
Jason Ertel	4f283c2d86	Suppres grep output	2021-11-23 14:52:40 -05:00
Jason Ertel	801d42ed20	Correct if check to inline the command instead of checking for emptiness of a variable	2021-11-23 14:51:06 -05:00
Jason Ertel	59fc122eec	Force restart of wazuh since conf file is changing	2021-11-23 13:29:04 -05:00
Jason Ertel	bd59d65f02	Strip trailing newlines from version and hotfix files	2021-11-23 13:12:27 -05:00
Jason Ertel	01ceded223	Handle CRs in hotfix	2021-11-23 13:03:40 -05:00
Jason Ertel	3c37bd61ab	Add debug logging	2021-11-23 12:46:59 -05:00
Jason Ertel	7627d37386	Add 2.3.90 WAZUH hotfix corrective function	2021-11-23 12:21:28 -05:00
Josh Patterson	c67b2b6936	Update soup ... only check if salt was upgraded if upgrade_salt function was called	2021-11-23 11:14:10 -05:00
Jason Ertel	af4c04be59	Fix #6325 - Prevent XML header from outputting to ossec.conf	2021-11-23 10:57:21 -05:00
Jason Ertel	4672b0c15c	Fix #6317 - Do not attempt to whitelist when wazuh isn't enabled	2021-11-23 10:06:14 -05:00
m0duspwnens	c0f183fb5e	add comment	2021-11-19 16:37:27 -05:00
m0duspwnens	d602339c45	render and md5sum soup and so-common	2021-11-19 16:32:59 -05:00
William Wernert	bebd62187d	Check soup in /usr/sbin rather than the saltstack default dir	2021-11-19 11:23:32 -05:00
William Wernert	23b91ee7e5	Fix indent on playbook_admin and playbook_automation secrets	2021-11-19 10:27:11 -05:00
Josh Brower	8bd4ba3acd	Fix FleetDM - disable stats	2021-11-19 09:49:34 -05:00
m0duspwnens	9dd89f6be7	run redis state before fleet state for eval highstate	2021-11-18 17:41:56 -05:00
Mike Reeves	796eb59dc6	Merge pull request #6288 from Security-Onion-Solutions/syncesusers_so-kratos ... wait for up to 5 minutes for kratos to respond before proceeding	2021-11-18 16:42:18 -05:00
m0duspwnens	55fed43469	wait for up to 5 minutes for kratos to respond before proceeding	2021-11-18 16:35:35 -05:00
William Wernert	4149236cda	Check for more invalid cidr syntax	2021-11-18 15:18:12 -05:00
Mike Reeves	a0425a48e6	Merge pull request #6282 from Security-Onion-Solutions/syncesusers_so-kratos ... remove restart policy for kratos container	2021-11-18 11:43:16 -05:00
m0duspwnens	4b89bf7bbc	remove restart policy for kratos container	2021-11-18 11:41:07 -05:00
Jason Ertel	9c0e8cedba	Merge pull request #6279 from Security-Onion-Solutions/syncesusers_so-kratos ... restart kratos if failure	2021-11-18 10:49:12 -05:00
m0duspwnens	5054da0027	restart kratos if failure	2021-11-18 10:48:06 -05:00
Jason Ertel	96f1f0174b	Merge pull request #6275 from Security-Onion-Solutions/syncesusers_so-kratos ... break kratos state out from soc state	2021-11-18 09:13:10 -05:00
m0duspwnens	cd1f0c0440	break kratos state out from soc state	2021-11-18 09:10:00 -05:00
Mike Reeves	12546a8efa	Merge pull request #6271 from Security-Onion-Solutions/fix/fleet-users ... Fix soup - fleetdm SA user	2021-11-17 19:48:15 -05:00
Josh Brower	3f5956b56d	Fix soup - fleetdm SA user	2021-11-17 19:47:16 -05:00
Josh Brower	66e2de0934	Merge pull request #6268 from Security-Onion-Solutions/fix/fleet-users ... Fix soup - fleetdm SA user	2021-11-17 18:26:11 -05:00
Josh Brower	c93794a402	Fix soup - fleetdm SA user	2021-11-17 18:22:34 -05:00
m0duspwnens	59ef734064	syncesusers require so-kratos	2021-11-17 18:16:06 -05:00
Josh Brower	922657afbc	Merge pull request #6266 from Security-Onion-Solutions/fix/fleet-users ... Unset pw reset for new Fleet users	2021-11-17 17:10:27 -05:00