 Mike Reeves
|
72fd25dcaf
|
Merge pull request #14482 from Security-Onion-Solutions/TOoSmOotH-patch-2
Update 2-4.yml
|
2025-03-31 12:03:49 -04:00 |
|
|
Mike Reeves
|
eef4b82afb
|
Update 2-4.yml
|
2025-03-31 11:46:03 -04:00 |
|
|
Mike Reeves
|
1d4d442554
|
Merge pull request #14481 from Security-Onion-Solutions/patchmerge
Patchmerge
|
2025-03-31 11:38:29 -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 |
|
|
Mike Reeves
|
e4d2513609
|
Merge pull request #14479 from Security-Onion-Solutions/patch/2.4.141
2.4.141
2.4.141-20250331
|
2025-03-31 11:21:30 -04:00 |
|
 Josh Patterson
|
7aad298720
|
Merge remote-tracking branch 'origin/2.4/dev' into vlb2
|
2025-03-31 11:14:47 -04:00 |
|
|
Mike Reeves
|
22fae2e98d
|
Merge pull request #14478 from Security-Onion-Solutions/2.4.141
2.4.141
|
2025-03-31 10:38:30 -04:00 |
|
|
Mike Reeves
|
3850558be3
|
2.4.141
|
2025-03-31 10:37:04 -04:00 |
|
|
Josh Patterson
|
5b785d3ef8
|
Merge pull request #14477 from Security-Onion-Solutions/issue/14431
heavy node exclude so-import-pcap and so-pcap-import
|
2025-03-31 09:49:09 -04:00 |
|
|
Josh Patterson
|
8b874e46d0
|
heavy node exclude so-import-pcap and so-pcap-import
|
2025-03-31 09:09:15 -04:00 |
|
|
Josh Patterson
|
4165b33995
|
Merge remote-tracking branch 'origin/2.4/dev' into vlb2
|
2025-03-27 15:34:39 -04:00 |
|
|
Josh Patterson
|
3e10c95b7b
|
Merge pull request #14463 from Security-Onion-Solutions/mineimp
break out manager from non manager in top
|
2025-03-27 14:04:19 -04:00 |
|
|
Josh Patterson
|
1d058729e5
|
break out manager from non manager
|
2025-03-27 13:27:34 -04:00 |
|
|
Josh Patterson
|
f9bf4e4130
|
Merge remote-tracking branch 'origin/2.4/dev' into vlb2
|
2025-03-27 11:26:32 -04:00 |
|
|
Josh Patterson
|
056a29ea89
|
Merge pull request #14457 from Security-Onion-Solutions/mineimp
prevent manager node type highstate failure from missing network.ip_addrs in mine
|
2025-03-26 15:12:23 -04:00 |
|
|
Josh Patterson
|
667e66bbef
|
rename mine update and highstate state
|
2025-03-26 13:56:49 -04:00 |
|
|
Josh Patterson
|
595ff8dce2
|
Merge remote-tracking branch 'origin/2.4/dev' into mineimp
|
2025-03-26 13:09:36 -04:00 |
|
 Jason Ertel
|
99aa383e01
|
soup and version updates
|
2025-03-26 12:11:53 -04:00 |
|
|
Josh Patterson
|
5f116b3e43
|
Merge pull request #14453 from Security-Onion-Solutions/x509v2_fix
patch x509_v2 state salt issue 66929
|
2025-03-26 11:41:50 -04:00 |
|
|
Josh Patterson
|
bb8f0605e1
|
patch x509_v2 state salt issue 66929
|
2025-03-26 10:50:04 -04:00 |
|
|
Josh Patterson
|
5836bc5bd1
|
remove require since maybe some failure from mine.update
|
2025-03-25 21:58:42 -04:00 |
|
|
Josh Patterson
|
55c815cae8
|
simplify highstate rerun when node_data pillar empty
|
2025-03-25 19:44:38 -04:00 |
|
|
Josh Patterson
|
79388af645
|
only managers need node_ips
|
2025-03-25 10:17:43 -04:00 |
|
|
Josh Patterson
|
d7e831fbeb
|
add mine_update reactor config for master
|
2025-03-24 20:45:35 -04:00 |
|
|
Josh Patterson
|
8f40b66e3b
|
update mine instead of failing highstate if no node_data
|
2025-03-24 19:49:24 -04:00 |
|
|
Josh Patterson
|
0fe3038802
|
Merge pull request #14444 from Security-Onion-Solutions/minionService
salt-minion service wait for ip on mainint
|
2025-03-24 16:27:32 -04:00 |
|
|
Josh Patterson
|
cd9b04e1bb
|
Merge pull request #14443 from Security-Onion-Solutions/soup150
soup for 2.4.150
|
2025-03-24 15:55:28 -04:00 |
|
|
Josh Patterson
|
0fbb6afee1
|
soup for 2.4.150
|
2025-03-24 15:51:22 -04:00 |
|
|
Josh Patterson
|
402e26fc19
|
Merge remote-tracking branch 'origin/2.4/dev' into minionService
|
2025-03-24 15:42:07 -04:00 |
|
|
Mike Reeves
|
b6e10b1de7
|
Merge pull request #14440 from Security-Onion-Solutions/TOoSmOotH-patch-1
Update VERSION
|
2025-03-24 15:17:15 -04:00 |
|
|
Mike Reeves
|
54f3a8cb91
|
Update 2-4.yml
|
2025-03-24 15:16:43 -04:00 |
|
|
Mike Reeves
|
1f98cef816
|
Update VERSION
|
2025-03-24 15:15:57 -04:00 |
|
|
Mike Reeves
|
7a71a5369c
|
Merge pull request #14439 from Security-Onion-Solutions/2.4/dev
2.4.140
2.4.140-20250324
|
2025-03-24 15:08:43 -04:00 |
|
|
Mike Reeves
|
964b631d58
|
Merge pull request #14438 from Security-Onion-Solutions/2.4.140
2.4.140
|
2025-03-24 13:43:49 -04:00 |
|
|
Mike Reeves
|
dcb667b32d
|
2.4.140
|
2025-03-24 13:35:39 -04:00 |
|
|
Josh Patterson
|
e61d37893a
|
start salt-minion service when mainint has ip
|
2025-03-24 12:33:10 -04:00 |
|
|
Josh Patterson
|
60bd960251
|
Merge pull request #14434 from Security-Onion-Solutions/backto3006.9
roll back to 3006.9 but leave prep in place for future upgrades
|
2025-03-23 12:09:52 -04:00 |
|
|
Josh Patterson
|
b974c6e8df
|
roll back to 3006.9 but leave prep in place for future upgrades
|
2025-03-23 12:07:39 -04:00 |
|
|
Josh Patterson
|
7484495021
|
Merge pull request #14433 from Security-Onion-Solutions/soupupdatemine140
update mine
|
2025-03-22 12:59: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 Brower
|
14c95a5fe0
|
Merge pull request #14432 from Security-Onion-Solutions/jbfix
Remove pcapoutdir
|
2025-03-22 07:13:44 -04:00 |
|
|
Josh Brower
|
d0bb86a24f
|
Remove pcapoutdir
|
2025-03-22 07:12:19 -04:00 |
|
 Jorge Reyes
|
749825af19
|
Merge pull request #14429 from Security-Onion-Solutions/reyesj2-patch-3
FIX: elastic fleet package list get more than 300 results per query
|
2025-03-21 15:07:15 -05:00 |
|
|
reyesj2
|
844283cc38
|
get more results
|
2025-03-21 14:55:52 -05:00 |
|
 Jason Ertel
|
ae0bf1ccdf
|
Merge pull request #14428 from Security-Onion-Solutions/jertel/wip
ignore false positives
|
2025-03-21 14:56:56 -04:00 |
|
|
Jason Ertel
|
a0637fa25d
|
ignore false positives
|
2025-03-21 14:54:52 -04:00 |
|
|
Josh Patterson
|
d2a21c1e4c
|
Merge pull request #14427 from Security-Onion-Solutions/pcapperms
move pcapoutdir
|
2025-03-21 14:50:33 -04:00 |
|
|
Josh Patterson
|
ed23340157
|
move pcapoutdir
|
2025-03-21 14:48:31 -04:00 |
|
|
Jason Ertel
|
ef6dbf9e46
|
Merge pull request #14425 from Security-Onion-Solutions/jertel/wip
support pcap imports for sensors in distributed grids
|
2025-03-21 13:17:18 -04:00 |
|