636 Commits

Author	SHA1	Message	Date
Josh Patterson	f988af52f6	check master status after highstate incase master service restart	2025-05-02 15:41:21 -04:00
Jason Ertel	b858543a60	Merge pull request #14578 from Security-Onion-Solutions/jertel/wip ... excluded harmless log error; suppress so-user grep output	2025-04-29 09:46:48 -04:00
Jason Ertel	5ecb483596	excluded harmless log error; suppress so-user grep output	2025-04-29 09:35:36 -04:00
Josh Patterson	272410ecae	Merge pull request #14568 from Security-Onion-Solutions/fixem ... Fixem	2025-04-23 13:28:29 -04:00
Josh Patterson	19514a969b	use file.directory	2025-04-23 08:41:53 -04:00
Josh Patterson	77f88371b8	manage default and local in separate states	2025-04-23 08:30:37 -04:00
Jason Ertel	2f8d8d2d96	Merge branch '2.4/dev' into jertel/wip	2025-04-16 15:55:34 -04:00
Jason Ertel	366e39950a	subord annotations; ensure node reboots occur in background	2025-04-16 15:55:16 -04:00
Josh Brower	4c3518385b	Change timeout to 1s	2025-04-11 07:37:09 -04:00
Jason Ertel	ba10228fef	Update soup	2025-04-01 09:42:10 -04:00
Mike Reeves	71f146d1d9	Update soup	2025-04-01 09:36:22 -04:00
Mike Reeves	02ad08035e	Resolve Conflicts	2025-03-31 11:36:55 -04:00
Mike Reeves	335d8851e6	Resolve Conflicts	2025-03-31 11:32:35 -04:00
Jason Ertel	99aa383e01	soup and version updates	2025-03-26 12:11:53 -04:00
Josh Patterson	0fbb6afee1	soup for 2.4.150	2025-03-24 15:51:22 -04:00
Josh Patterson	0952b7528f	update mine ... update mine after salt-master restart and before highstate	2025-03-22 12:57:13 -04:00
Josh Patterson	51625e19ad	Merge pull request #14423 from Security-Onion-Solutions/salt3006.10 ... work with quotes in version	2025-03-21 08:25:55 -04:00
Josh Patterson	760ff1e45b	work with quotes in version	2025-03-21 08:20:04 -04:00
Jason Ertel	3f3e7ea1e8	add no-op soup functions for 2.4.140	2025-03-18 10:12:23 -04:00
Jason Ertel	85450693a2	Merge branch '2.4/dev' into jertel/wip	2025-03-04 10:55:29 -05:00
Jason Ertel	0047246cf2	reduce stdout verbosity	2025-03-04 10:55:12 -05:00
reyesj2	d7c06e5ff4	run elasticsearch state, right before completing soup to ensure templates for optional integrations are loaded	2025-02-24 09:02:56 -06:00
Josh Brower	6d0350793d	Remove old defend json	2025-02-23 14:02:17 -05:00
Jason Ertel	7155ccaf96	ensure override for nmcli exists in /etc	2025-02-21 17:10:39 -05:00
reyesj2	c1282e77a0	move removal of eaintegrations.txt to up_to_2.4.130	2025-02-21 14:02:22 -06:00
Josh Brower	22f3865602	Dont upgrade integrations during pre-phase	2025-02-21 09:32:36 -05:00
Jorge Reyes	a3dba9b566	Merge pull request #14255 from Security-Onion-Solutions/foxtrot ... ES 8.17.1	2025-02-18 14:58:46 -06:00
reyesj2	85dcfbf368	update kibana default space	2025-02-17 12:27:36 -06:00
reyesj2	03b76cbcf5	remove state files	2025-02-13 08:51:50 -06:00
reyesj2	3b69ff9fc9	integration policy update	2025-02-10 13:16:25 -06:00
Joshua Brower	4636a8d9b1	Refresh Agent installers	2025-02-05 09:38:33 -05:00
Jorge Reyes	abcfe638c9	Merge pull request #14153 from Security-Onion-Solutions/reyesj2/es-integ-tmp ... Reyesj2/es integ tmp	2025-01-27 14:07:32 -06:00
Joshua Brower	e994f3a220	Fix commits	2025-01-27 14:48:50 -05:00
reyesj2	a373d96c3c	run managed_soc_annotations.sls from manager state	2025-01-27 13:45:03 -06:00
reyesj2	5b8f8fb62f	add/remove es annotations/defaults automagically ... Signed-off-by: reyesj2 <94730068+reyesj2@users.noreply.github.com>	2025-01-23 12:47:22 -06:00
Jason Ertel	db9387764d	fix issue with first-time api client permission toggling	2025-01-22 17:41:04 -05:00
reyesj2	76abf37351	Merge remote-tracking branch 'origin/2.4/dev' into foxtrot	2025-01-21 09:03:04 -06:00
reyesj2	1396083b7d	use so-elasticsearch-query where possible; simplify suricata.alerts index reroute ... Signed-off-by: reyesj2 <94730068+reyesj2@users.noreply.github.com>	2025-01-17 13:29:46 -06:00
reyesj2	d35ffef503	merge 2.4/dev ... Signed-off-by: reyesj2 <94730068+reyesj2@users.noreply.github.com>	2025-01-17 11:23:54 -06:00
reyesj2	01a2e4cd4f	check for index existence before attemping rollover ... Signed-off-by: reyesj2 <94730068+reyesj2@users.noreply.github.com>	2025-01-17 09:27:28 -06:00
reyesj2	d573c0922d	add 2.4.111 -> postupgrade check ... Signed-off-by: reyesj2 <94730068+reyesj2@users.noreply.github.com>	2025-01-16 18:25:06 -06:00
reyesj2	45d3438d18	update ingest pipeline for imported logs ... Signed-off-by: reyesj2 <94730068+reyesj2@users.noreply.github.com>	2025-01-16 17:33:14 -06:00
reyesj2	a21535b0a2	run elasticsearch state to sync templates ... Signed-off-by: reyesj2 <94730068+reyesj2@users.noreply.github.com>	2025-01-06 21:33:07 -06:00
Jason Ertel	bd96b5d722	invalidate user sessions when an admin changes the user's password	2025-01-06 17:23:10 -05:00
Mike Reeves	09ef096620	Update soup	2024-12-23 08:27:45 -05:00
Mike Reeves	9c10094914	Fix conflict	2024-12-18 10:19:40 -05:00
defensivedepth	17405b849a	Delete uneeded files	2024-12-17 16:01:31 -05:00
Jason Ertel	3bf7870729	Merge pull request #13955 from Security-Onion-Solutions/jertel/wip ... soup corrections	2024-11-16 21:31:08 -05:00
Jason Ertel	0eebe48492	soup corrections	2024-11-16 21:20:24 -05:00
Jason Ertel	cc44558f40	Merge pull request #13954 from Security-Onion-Solutions/jertel/wip ... revert prev commit	2024-11-16 12:08:49 -05:00