5296 Commits

Author	SHA1	Message	Date
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
Josh Brower	5f3601ac78	Unset pw reset for new Fleet users	2021-11-17 17:06:01 -05:00
Josh Brower	2fe4fa06a6	Merge pull request #6265 from Security-Onion-Solutions/fix/fleet-users ... Fix FleetDM SA Creation for SOUP	2021-11-17 14:09:59 -05:00
Josh Brower	773c580e77	Fix FleetDM SA Creation for SOUP	2021-11-17 14:08:34 -05:00
Mike Reeves	aca684d55a	Merge pull request #6264 from Security-Onion-Solutions/fix/fleet-users ... Migrate FleetDM user mgt to fleetctl	2021-11-17 13:16:05 -05:00
Josh Brower	6f391dbe50	Migrate FleetDM user mgt to fleetctl	2021-11-17 13:13:25 -05:00
William Wernert	262d2023b5	Add new ipv4 address w/ cidr mask validator	2021-11-17 12:41:25 -05:00
m0duspwnens	ac400f1c41	change how soc endgame added to manager pillar in soup	2021-11-17 11:07:12 -05:00
Josh Patterson	a16e6aca22	Merge pull request #6257 from Security-Onion-Solutions/es_soup_ingest ... escape raw and endraw	2021-11-17 07:56:01 -05:00
m0duspwnens	ce21ae11f5	escape raw and endraw	2021-11-17 07:53:15 -05:00
Mike Reeves	fdd9706669	Merge pull request #6255 from Security-Onion-Solutions/kilo	2021-11-16 18:09:40 -05:00
Jason Ertel	8fa9a180b2	Refactor upgrade and post-upgrade version to function mappings; fix missing version upgrades from older 2.3.61 releases and earlier; Drop support for upgrading ancient RC releases	2021-11-16 18:08:28 -05:00
Josh Patterson	6288365a50	Merge pull request #6254 from Security-Onion-Solutions/es_soup_ingest ... wrap common ingest in raw endraw since json and no jinja	2021-11-16 16:47:53 -05:00
m0duspwnens	5448107310	wrap common ingest in raw endraw since json and no jinja	2021-11-16 16:43:33 -05:00
Jason Ertel	1bd8e226b4	Force DB migration since installations on 2.3.50 or earlier will skip the Kratos 0.6 version	2021-11-16 15:58:04 -05:00
m0duspwnens	5945326817	soup for es ingest common and watch esingestdynamicconf for so-elastic docker	2021-11-16 14:00:41 -05:00
Josh Brower	8bb2789c6f	Merge pull request #6237 from Security-Onion-Solutions/kilo ... Migrate to email field instead of username due to breaking change in …	2021-11-16 12:06:08 -05:00
Jason Ertel	11fc0da971	Migrate to email field instead of username due to breaking change in FleetDM 4.x	2021-11-16 12:03:46 -05:00
Mike Reeves	2514d36ccd	Merge pull request #6232 from Security-Onion-Solutions/TOoSmOotH-patch-3 ... Update init.sls	2021-11-15 17:11:08 -05:00
Mike Reeves	b51405d5e8	Update soup	2021-11-15 17:04:46 -05:00
Mike Reeves	731bbabe4c	Update init.sls	2021-11-15 17:00:34 -05:00
William Wernert	f674555290	Check CIDR validity completely	2021-11-15 15:43:05 -05:00
m0duspwnens	6f9db25ea7	change kibana logging to json	2021-11-15 14:23:47 -05:00