Commit Graph

11044 Commits

Author SHA1 Message Date
Mike Reeves
f6a765addc Merge pull request #12467 from Security-Onion-Solutions/TOoSmOotH-patch-3
Update VERSION
2024-02-29 14:13:44 -05:00
Mike Reeves
8b56c0a744 Update VERSION 2024-02-29 14:12:35 -05:00
Mike Reeves
b1db4137d0 Merge pull request #12462 from Security-Onion-Solutions/2.3.290
2.3.290
2024-02-29 09:15:41 -05:00
Mike Reeves
44ef164713 2.3.290 2024-02-29 09:08:37 -05:00
Jason Ertel
43f7dce297 Merge pull request #12407 from Security-Onion-Solutions/jertel/mergem
Jertel/mergem
2024-02-21 13:18:08 -05:00
Jason Ertel
4e4a4686f1 Merge branch 'master' into jertel/mergem 2024-02-21 13:14:29 -05:00
Jason Ertel
b5f44e48ab Merge pull request #12403 from Security-Onion-Solutions/jertel/disctemplate
add message at top for clickable link
2024-02-21 12:42:04 -05:00
Jason Ertel
a44448519b add message at top for clickable link 2024-02-21 10:53:50 -05:00
Jason Ertel
6245ee9a5b Merge branch 'master' into jertel/disctemplate 2024-02-21 10:43:28 -05:00
Jason Ertel
49ca970076 add message at top for clickable link 2024-02-21 10:41:28 -05:00
Jason Ertel
f49fb7cbae Merge pull request #12401 from Security-Onion-Solutions/jertel/disctemplate
template improvements
2024-02-21 10:39:03 -05:00
Jason Ertel
7692c9be53 template improvements 2024-02-21 10:36:07 -05:00
Jason Ertel
25ef12cdc5 Merge pull request #12395 from Security-Onion-Solutions/jertel/mergemaster
Jertel/mergemaster
2024-02-21 07:18:22 -05:00
Jason Ertel
2967adca90 Merge branch 'master' into jertel/mergemaster 2024-02-20 16:56:14 -05:00
Jason Ertel
d198458366 Merge pull request #12392 from Security-Onion-Solutions/jertel/glm_master
thread locking
2024-02-20 16:55:16 -05:00
Jason Ertel
9e98b409a5 thread locking 2024-02-20 16:00:41 -05:00
Doug Burks
ba8f729976 Merge pull request #12335 from Security-Onion-Solutions/dougburks-patch-1
Update soup for 2.3.290
2024-02-09 11:18:59 -05:00
Doug Burks
5b67795c23 Update soup for 2.3.290 2024-02-09 11:12:43 -05:00
Jason Ertel
483bf60ae3 Merge pull request #12233 from Security-Onion-Solutions/jertel/23guidelines
Update 2-4.yml
2024-01-23 10:07:35 -05:00
Doug Burks
1a9350f60b Update 2-4.yml 2024-01-23 10:05:59 -05:00
Doug Burks
f4afda0975 Merge pull request #12232 from Security-Onion-Solutions/dougburks-patch-1
Improve Github Discussions template for 2.4 category
2024-01-23 09:57:40 -05:00
Doug Burks
137372337c Update 2-4.yml 2024-01-23 09:51:45 -05:00
Mike Reeves
1521532c60 Merge pull request #11880 from Security-Onion-Solutions/TOoSmOotH-patch-1
Update VERSION
2023-11-28 15:33:48 -05:00
Mike Reeves
ada32967dc Update VERSION 2023-11-28 15:30:49 -05:00
Mike Reeves
d5d2b5fbc7 Merge pull request #11879 from Security-Onion-Solutions/dev
2.3.280
2.3.280-20231128
2023-11-28 15:21:56 -05:00
Mike Reeves
84d6fcb752 Merge pull request #11878 from Security-Onion-Solutions/2.3.280
2.3.280
2023-11-28 15:00:34 -05:00
Mike Reeves
de9e9a2716 2.3.280 2023-11-28 14:58:25 -05:00
Josh Patterson
cec6cff19d Merge pull request #11874 from Security-Onion-Solutions/23souphs
so-nginx watch managerssl to restart if changed
2023-11-27 12:48:06 -05:00
m0duspwnens
7311d6480c so-nginx watch managerssl to restart if changed 2023-11-27 12:15:09 -05:00
Josh Patterson
f967c8e362 Merge pull request #11873 from Security-Onion-Solutions/23souphs
enable highstate after starting minion
2023-11-27 11:12:45 -05:00
m0duspwnens
cfad6414d2 enable highstate after starting minion 2023-11-27 11:10:39 -05:00
Josh Patterson
0fdaed9cf7 Merge pull request #11864 from Security-Onion-Solutions/import/suriinterface
suricata interface None if so-import
2023-11-22 10:42:43 -05:00
m0duspwnens
1dc88781f1 suricata interface None if so-import 2023-11-22 10:11:34 -05:00
Mike Reeves
0cfb8b0816 Merge pull request #11834 from Security-Onion-Solutions/TOoSmOotH-patch-1
Update signing_policies.conf
2023-11-20 15:59:21 -05:00
Mike Reeves
c0968d3843 Update signing_policies.conf 2023-11-20 15:57:29 -05:00
Mike Reeves
3b133e87cd Merge pull request #11831 from Security-Onion-Solutions/TOoSmOotH-patch-3
Update signing_policies.conf
2023-11-20 15:19:42 -05:00
Mike Reeves
fee9b61ce9 Update soup 2023-11-20 15:14:25 -05:00
Mike Reeves
57612c69fe Update signing_policies.conf 2023-11-20 15:11:50 -05:00
Mike Reeves
94accb0e8c Update signing_policies.conf 2023-11-20 15:09:13 -05:00
Josh Patterson
3b8d1d470e Merge pull request #11798 from Security-Onion-Solutions/m0duspwnens-patch-1
Update soup
2023-11-15 15:23:46 -05:00
Josh Patterson
c624a44b0e Update soup
add quote
2023-11-15 15:19:54 -05:00
weslambert
bc509a0aa9 Merge pull request #11772 from Security-Onion-Solutions/upgrade/elastic_8_10_4
Elastic 8.10.4
2023-11-13 09:36:49 -05:00
Doug Burks
ee0ef3217f Merge pull request #11771 from Security-Onion-Solutions/dougburks-patch-1
Add EOL warning to README.md
2023-11-13 09:18:50 -05:00
weslambert
18e319cbe3 Elastic 8.10.4 2023-11-13 09:17:33 -05:00
Doug Burks
3316e1261d Add EOL warning to README.md 2023-11-13 09:16:25 -05:00
weslambert
b7cf44466c Elastic 8.10.4 2023-11-13 09:16:23 -05:00
Mike Reeves
e321aa52a5 Merge pull request #11749 from Security-Onion-Solutions/TOoSmOotH-patch-6
Update soup
2023-11-09 10:49:34 -05:00
Mike Reeves
07df045e79 Update soup 2023-11-09 10:38:53 -05:00
Mike Reeves
7b11ddb032 Update soup 2023-11-09 10:25:16 -05:00
Jorge Reyes
ac4428940e Merge pull request #11561 from Security-Onion-Solutions/2.3/zeek6
Zeek 6 upgrade
2023-10-23 09:25:21 -04:00