5330 Commits

Author	SHA1	Message	Date
Jason Ertel	35617acaeb	Update cacerts to reflect new path; this changed due to ES 7.16.2	2021-12-20 12:12:00 -05:00
Jason Ertel	6f116a2d01	Switch to new Ubuntu SSL dir	2021-12-20 09:43:59 -05:00
Jason Ertel	d6c651af1c	Remove old patch dir from previously-patched installations	2021-12-20 09:42:27 -05:00
Jason Ertel	b8fcec04b8	Remove patched jar due to upgrade of Elastic images to 7.16.2	2021-12-20 09:27:03 -05:00
Jason Ertel	6556a37869	Merge branch 'master' into patch/1.3.91	2021-12-20 09:20:03 -05:00
Jason Ertel	5af2bd8fa4	Upgrade to Elastic 7.16.2	2021-12-20 09:16:28 -05:00
Jason Ertel	c94d5fa9dc	Strip JndiLookup.class from log4j-core jars, to match Elastic's mitigation approach	2021-12-13 09:27:13 -05:00
Jason Ertel	8365b5f140	Strip JndiLookup.class from log4j-core jars, to match Elastic's mitigation approach	2021-12-13 09:02:41 -05:00
Mike Reeves	dcd56de890	Update log4j2.properties	2021-12-10 14:23:38 -05:00
Mike Reeves	3d7b963912	Update log4j2.properties	2021-12-10 14:16:16 -05:00
Mike Reeves	09253b637e	Create jvm.options	2021-12-10 14:12:43 -05:00
Mike Reeves	c81ce48bff	Update log4j2.properties	2021-12-10 14:10:35 -05:00
Mike Reeves	73ec595baa	Update init.sls	2021-12-10 14:10:05 -05:00
Mike Reeves	45346b6318	Update log4j2.properties	2021-12-10 12:01:39 -05:00
Mike Reeves	e48de18480	Update init.sls	2021-12-10 12:00:12 -05:00
Mike Reeves	66c8cc6e86	Update init.sls	2021-12-10 11:59:12 -05:00
Mike Reeves	8dcb64d87c	Update init.sls	2021-12-10 11:56:33 -05:00
Mike Reeves	4561e13871	Update log4j2.properties	2021-12-10 10:19:58 -05:00
Mike Reeves	ea26e402c8	Update log4j2.properties	2021-12-10 10:17:49 -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
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
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