230 Commits

Author	SHA1	Message	Date
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
defensivedepth	3b63ef149a	Merge remote-tracking branch 'remotes/origin/2.4/dev' into 2.4/kibanauser	2023-10-27 07:50:58 -04:00
defensivedepth	cc3ee43192	Make dirs as needed	2023-10-27 07:49:34 -04:00
Jason Ertel	a969c319f5	Merge pull request #11631 from Security-Onion-Solutions/kilo ... oidc	2023-10-26 12:30:06 -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
defensivedepth	3ad480453a	Rename to remove dupe	2023-10-25 07:20:07 -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
defensivedepth	310a6b4f27	Add kibana curl config	2023-10-24 14:21:01 -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
defensivedepth	967138cdff	Apply state correctly	2023-10-12 10:54:26 -04:00
defensivedepth	a671ac387a	Add hotfix changes	2023-10-12 09:45:20 -04:00
m0duspwnens	d357864d69	fix upgrade_salt function for oel	2023-10-11 15:32:11 -04:00
Jason Ertel	44b855dd93	merge 2.4/dev	2023-10-11 13:35:16 -04:00
m0duspwnens	89467adf9c	batch the salt mine update	2023-10-10 13:05:43 -04:00
m0duspwnens	ad01be66ea	remove checkmine engine. add x509.get_pem_entries to managers mine_functions. simplify mine update during soup	2023-09-29 14:09:04 -04:00
Mike Reeves	95d32cb076	Fix manager cron logic	2023-09-28 12:49:46 -04:00
Mike Reeves	5040df7551	Fix manager cron logic	2023-09-28 12:32:40 -04:00
Mike Reeves	7a21b7903d	Fix manager cron logic	2023-09-28 11:46:43 -04:00
Mike Reeves	a77a53f20b	Update init.sls	2023-09-28 11:10:17 -04:00
m0duspwnens	419acab48a	revert up_to_2.4.20	2023-09-27 19:17:13 -04:00
m0duspwnens	76c0b881ff	exclude import from snapshotting previous version pillars and states	2023-09-27 18:20:50 -04:00
m0duspwnens	036a21ff17	Merge remote-tracking branch 'origin/2.4/dev' into issue/11390	2023-09-26 11:01:44 -04:00
m0duspwnens	2abf434ebe	create snapshots of default, local salt and pillars during soup. rsync soup with --delete	2023-09-26 10:56:20 -04:00
Jason Ertel	fa3a79a787	Update soup to prune in background	2023-09-21 09:41:44 -04:00
Jason Ertel	a914a02273	prune unused volumes during upgrade	2023-09-18 14:43:02 -04:00
Mike Reeves	33d68478b6	Update so-minion	2023-09-13 11:48:16 -04:00
Mike Reeves	22c0323bda	Update so-minion	2023-09-13 10:57:45 -04:00
m0duspwnens	b64d4e3658	add telegraf pillar to desktop	2023-09-01 09:53:26 -04:00