Commit Graph

682 Commits

Author SHA1 Message Date
Josh Patterson
e5c0f8a46c allow for dhcp4 2025-04-30 16:09:57 -04:00
Josh Patterson
5965459423 Merge remote-tracking branch 'origin/2.4/dev' into vlb2 2025-04-30 13:11:12 -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
ed80c4e13b Merge remote-tracking branch 'origin/2.4/dev' into vlb2 2025-04-23 15:42:04 -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 Patterson
21bb325157 Merge remote-tracking branch 'origin/2.4/dev' into vlb2 2025-04-14 08:22:42 -04:00
Josh Brower
4c3518385b Change timeout to 1s 2025-04-11 07:37:09 -04:00
Josh Patterson
8ab38956d1 change from error to warning 2025-04-09 11:19:55 -04:00
Josh Patterson
f6a0e62853 include managerhype in orch. run hypervisor state before libvirt states 2025-04-08 09:50:26 -04:00
Josh Patterson
445afca6ee use vrt 2025-04-03 13:44:13 -04:00
Josh Patterson
9e16c03d25 Merge remote-tracking branch 'origin/2.4/dev' into vlb2 2025-04-03 08:47:54 -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
Josh Patterson
64f71143dc fix docker fw rules managerhype 2025-03-31 15:51:32 -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
Josh Patterson
f9bf4e4130 Merge remote-tracking branch 'origin/2.4/dev' into vlb2 2025-03-27 11:26:32 -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
Josh Patterson
269919b980 run setup_hypervisor.setup_environment for mangerhype if needed 2025-03-18 09:39:49 -04:00
Josh Patterson
44a5b3b1e5 MANAGERHYPE setup is now complete! 2025-03-12 21:05:04 -04:00
Josh Patterson
6c472dd383 Merge remote-tracking branch 'origin/2.4/dev' into vlb2 2025-03-05 08:58:03 -05: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
Josh Patterson
8047e196fe fix pipeline workers, zeek/suricata lbprocs, CPUCORES and CORECOUNT 2025-02-28 17:21:06 -05:00
Josh Patterson
cc1b030c00 q
xMerge remote-tracking branch 'origin/2.4/dev' into vlb2
2025-02-24 15:32:54 -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 Patterson
3246176c0a comments 2025-02-21 14:34:08 -05:00
Josh Patterson
b68f561e6f progress and hw tracking for soc hypervisor dynamic annotations 2025-02-21 09:50:01 -05: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
Josh Patterson
ad54afe39a ensure socore:socore ownership 2025-02-15 12:11:23 -05:00
Josh Patterson
e193347fb4 add hypervisor to host keys first connection. cleaner qcow2 logging. 2025-02-15 10:54:49 -05: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
Josh Patterson
160c84ec1a Merge pull request #14200 from Security-Onion-Solutions/2.4/dev
2.4/dev
2025-02-06 17:41:22 -05:00
m0duspwnens
7159678385 create predicatble interfaces 2025-02-06 15:30:46 -05:00