312 Commits

Author	SHA1	Message	Date
Jason Ertel	6356a0bf95	add support for nested keys	2023-11-20 16:18:30 -05:00
Mike Reeves	2ae87de409	Merge branch 'hotfix/2.4.30' into TOoSmOotH-patch-2	2023-11-17 17:05:11 -05:00
Mike Reeves	d89beefc8c	Update soup	2023-11-17 16:53:11 -05:00
Josh Brower	9c371fc374	Remove state file	2023-11-17 16:52:34 -05:00
Mike Reeves	e226efa799	Update soup	2023-11-17 16:35:12 -05:00
Josh Brower	7aadc3851f	Remove state file	2023-11-17 13:08:15 -05:00
Josh Brower	ca1498fca1	Dont update Defend Integration	2023-11-17 12:19:22 -05:00
Josh Brower	089a111ae8	use updated code	2023-11-17 11:20:13 -05:00
Josh Brower	5920a14478	Move API check logic	2023-11-16 20:34:01 -05:00
Josh Brower	6b8e48c973	Remove highstate	2023-11-16 11:41:20 -05:00
Josh Brower	109ee55d8c	Add to pre for .30 soup	2023-11-16 11:37:38 -05:00
Josh Brower	ff8cd194f1	Make sure kibana API is up	2023-11-16 11:21:34 -05:00
Josh Brower	d5dd0d88ed	.30 hotfix	2023-11-16 10:58:23 -05:00
Mike Reeves	fe7af49a82	Update soup	2023-11-13 08:37:46 -05:00
Jason Ertel	bc044fa2d5	more coverage	2023-11-08 18:42:06 -05:00
Jason Ertel	9317e51f20	add yaml helper script; refactor python testing	2023-11-08 18:26:37 -05:00
Jason Ertel	33a8ef1568	add yaml helper script; refactor python testing	2023-11-08 18:24:23 -05:00
weslambert	9df3a8fc18	Merge pull request #11740 from Security-Onion-Solutions/fix/elastic_templates ... Remove template files	2023-11-08 15:20:01 -05:00
weslambert	36098e6314	Remove template files	2023-11-08 14:32:58 -05:00
Josh Patterson	610374816d	Merge pull request #11714 from Security-Onion-Solutions/change/so-minion ... apply es and soc states to manager if new search or hn are added	2023-11-03 16:43:16 -04:00
Josh Brower	0086c24729	Upgrade Elastic Agent	2023-11-03 15:21:06 -04:00
m0duspwnens	9d2b84818f	apply es and soc states to manager if new search or hn are added	2023-11-03 15:00:13 -04:00
m0duspwnens	4d7b1095b7	Merge remote-tracking branch 'origin/2.4/dev' into fix/soupagrepo	2023-11-01 10:31:59 -04:00
m0duspwnens	338146fedd	fix repo update during soup for airgap	2023-11-01 10:19:56 -04:00
Mike Reeves	cc3a69683c	Delete salt/manager/tools/sbin/so-allow-view	2023-10-31 12:55:47 -04:00
Josh Patterson	4bbcc5002a	Revert "Revert "Upgrade/salt3006.3"" ... This reverts commit c41e19ad0b.	2023-10-27 10:56:45 -04:00
Mike Reeves	f1dbea6e2d	Merge pull request #11623 from Security-Onion-Solutions/warmui ... Warm Node UI Changes	2023-10-27 10:36:23 -04:00
Mike Reeves	dc53b49f15	Update soup	2023-10-25 15:53:39 -04:00
Jason Ertel	b20177b0ef	Merge branch '2.4/dev' into kilo	2023-10-25 15:19:57 -04:00
Josh Patterson	c41e19ad0b	Revert "Upgrade/salt3006.3"	2023-10-25 11:01:13 -04:00
Jason Ertel	a28cc274ba	Merge branch '2.4/dev' into kilo	2023-10-25 09:04:36 -04:00
m0duspwnens	3e343bff84	fix line to log properly	2023-10-24 16:40:51 -04:00
m0duspwnens	1d6e32fbab	dont exit if salt isnt running	2023-10-24 15:08:50 -04:00
m0duspwnens	180ba3a958	if deb fam, stop salt-master and salt-minion after salt upgrade	2023-10-24 13:24:52 -04:00
m0duspwnens	6d3465626e	if deb fam, stop salt-master and salt-minion after salt upgrade	2023-10-24 12:52:25 -04:00
m0duspwnens	752390be2e	merge with dev, fix confict	2023-10-24 09:40:09 -04:00
m0duspwnens	dc3ca99c12	ask the minion if it can see itself in the mine	2023-10-20 17:16:33 -04:00
m0duspwnens	7e3aa11a73	check mine is populated with ip before telling node to highstate	2023-10-20 16:27:20 -04:00
m0duspwnens	c588bf4395	update mine and highstate minion when added	2023-10-20 13:43:12 -04:00
m0duspwnens	dbfccdfff8	fix logging when using wait_for_minion	2023-10-19 16:53:03 -04:00
m0duspwnens	37e803917e	have soup wait_for_salt_minion() before running any highstate	2023-10-19 15:58:10 -04:00
m0duspwnens	90bde94371	handle debian family salt upgrade for soup	2023-10-19 13:46:48 -04:00
m0duspwnens	13a5c8baa7	remove extra ||	2023-10-19 11:19:51 -04:00
m0duspwnens	c5610edd83	handle salt for r9 and c9	2023-10-19 11:12:20 -04:00
m0duspwnens	02e22c87e8	Merge remote-tracking branch 'origin/2.4/dev' into upgrade/salt3006.3	2023-10-19 09:15:31 -04:00
m0duspwnens	2206cdb0fa	change soup comment	2023-10-18 15:04:39 -04:00
m0duspwnens	53fcafea50	redo how we check if salt-master is ready and accessible	2023-10-16 16:31:43 -04:00
m0duspwnens	07902d17cc	display container dl status during soup	2023-10-16 11:20:19 -04:00
Mike Reeves	b8d586addd	Merge pull request #11533 from Security-Onion-Solutions/2.4/main ... 2.4/main	2023-10-12 16:19:29 -04:00
defensivedepth	98eab906af	Apply named state	2023-10-12 11:00:24 -04:00