CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
9,041 Commits 24 Branches 119 Tags
c68efd56c2f60107553a7e285dd07ef9f0723b7c
Commit Graph

9041 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Ertel
c68efd56c2 Merge branch 'dev' into kilo 2021-12-15 20:01:55 -05:00
Mike Reeves
0f76227631 Merge pull request #6585 from Security-Onion-Solutions/unhotfix 
Unhotfix
 2021-12-15 17:23:02 -05:00
Mike Reeves
465ba1b7d3 Change CA certs location 2021-12-15 17:08:36 -05:00
Mike Reeves
61955b7928 Change CA certs location 2021-12-15 13:50:19 -05:00
Jason Ertel
ffa8ca57a7 Merge pull request #6579 from Security-Onion-Solutions/unhotfix 
Remove some previous hotfix code
 2021-12-15 12:34:00 -05:00
Mike Reeves
7cd1b1c482 Remove some previous hotfix code 2021-12-15 12:26:53 -05:00
Doug Burks
09f0bdba91 Merge pull request #6574 from Security-Onion-Solutions/dougburks-patch-1 
fix typo in so-image-common
 2021-12-15 07:45:24 -05:00
Doug Burks
7d1f9c51e8 fix typo in so-image-common 2021-12-15 07:24:30 -05:00
Mike Reeves
5006e34208 Merge pull request #6560 from Security-Onion-Solutions/mergerz 
Merge latest hotfix
 2021-12-14 10:57:49 -05:00
Mike Reeves
30344ba0ef Fix conflicts 2021-12-14 10:55:19 -05:00
Mike Reeves
85cf096322 Merge pull request #6541 from Security-Onion-Solutions/hotfix/2.3.90 
Hotfix/2.3.90
2.3.90-20211213 		2021-12-13 12:41:24 -05:00
Mike Reeves
4eaf3f8d8b Merge pull request #6540 from Security-Onion-Solutions/2390hotfix3 
2.3.90-20211213 Hotfix
 2021-12-13 12:12:03 -05:00
Mike Reeves
d90904b4d4 2.3.90-20211213 Hotfix 2021-12-13 12:09:09 -05:00
Mike Reeves
65cc9930e7 Merge pull request #6537 from Security-Onion-Solutions/TOoSmOotH-patch-1 
Update HOTFIX
 2021-12-13 11:13:40 -05:00
Mike Reeves
7f982d2824 Update HOTFIX 2021-12-13 11:12:18 -05:00
Mike Reeves
d3ac1f7994 Merge pull request #6533 from Security-Onion-Solutions/jertel/hotfix-20211213 
Add missing logstash lib
 2021-12-13 09:30:32 -05:00
Jason Ertel
c94d5fa9dc Strip JndiLookup.class from log4j-core jars, to match Elastic's mitigation approach 2021-12-13 09:27:13 -05:00
Mike Reeves
83d1cdad90 Merge pull request #6532 from Security-Onion-Solutions/jertel/hotfix-20211213 
Strip JndiLookup.class from log4j-core jars, to match Elastic's mitigation approach
 2021-12-13 09:05:30 -05:00
Jason Ertel
8365b5f140 Strip JndiLookup.class from log4j-core jars, to match Elastic's mitigation approach 2021-12-13 09:02:41 -05:00
Mike Reeves
4d6cd66d9d Merge pull request #6521 from Security-Onion-Solutions/hotfix/2.3.90 
Hotfix/2.3.90
2.3.90-20211210 		2021-12-10 16:20:29 -05:00
Mike Reeves
1946965c5f Merge pull request #6520 from Security-Onion-Solutions/2390hotfix0day 
2.3.90-20211210 Hotfix
 2021-12-10 15:49:38 -05:00
Mike Reeves
c9a14788ed 2.3.90-20211210 Hotfix 2021-12-10 15:42:53 -05:00
Mike Reeves
ce963a02d9 Merge pull request #6517 from Security-Onion-Solutions/ES0day2 
Add JVM Options for logstash
 2021-12-10 14:25:52 -05:00
Mike Reeves
dcd56de890 Update log4j2.properties 2021-12-10 14:23:38 -05:00
Mike Reeves
3d7b963912 Update log4j2.properties 2021-12-10 14:16:16 -05:00
Mike Reeves
09253b637e Create jvm.options 2021-12-10 14:12:43 -05:00
Mike Reeves
c81ce48bff Update log4j2.properties 2021-12-10 14:10:35 -05:00
Mike Reeves
73ec595baa Update init.sls 2021-12-10 14:10:05 -05:00
Mike Reeves
04862fcc06 Merge pull request #6514 from Security-Onion-Solutions/ES0day2 
Throw the log4j into the java options
 2021-12-10 12:04:31 -05:00
Mike Reeves
45346b6318 Update log4j2.properties 2021-12-10 12:01:39 -05:00
Mike Reeves
e48de18480 Update init.sls 2021-12-10 12:00:12 -05:00
Mike Reeves
66c8cc6e86 Update init.sls 2021-12-10 11:59:12 -05:00
Mike Reeves
8dcb64d87c Update init.sls 2021-12-10 11:56:33 -05:00
Mike Reeves
ae3e980852 Merge pull request #6513 from Security-Onion-Solutions/EShotfix 
Update log4j2.properties
 2021-12-10 10:35:43 -05:00
Mike Reeves
11f1fe7ab1 Update HOTFIX 2021-12-10 10:21:50 -05:00
Mike Reeves
4561e13871 Update log4j2.properties 2021-12-10 10:19:58 -05:00
Mike Reeves
ea26e402c8 Update log4j2.properties 2021-12-10 10:17:49 -05:00
Jason Ertel
83d86aebb1 Perform full email match 2021-12-09 15:04:00 -05:00
Jason Ertel
2761662eb9 Add status presets 2021-12-09 13:09:56 -05:00
Josh Brower
d3bbae23ca Merge pull request #6499 from Security-Onion-Solutions/fix/beats-logstash 
Use id for doc id if it exists
 2021-12-09 09:47:14 -05:00
Josh Brower
656ea974dc Use id for doc id if it exists 2021-12-09 09:16:58 -05:00
Jason Ertel
a9b7b9ee92 Jinjafy case params 2021-12-08 17:41:48 -05:00
Jason Ertel
b73eb76c94 Make case module dynamic 2021-12-07 11:51:02 -05:00
Mike Reeves
892899b7f9 Merge pull request #6477 from Security-Onion-Solutions/merge-202112071526 
Merge hotfix
 2021-12-07 10:30:13 -05:00
Jason Ertel
702d95c63a Merge branch 'master' into merge-202112071527 2021-12-07 10:28:00 -05:00
Mike Reeves
9f41df641e Merge pull request #6470 from Security-Onion-Solutions/hotfix/2.3.90 
HOTFIX: 2.3.90-20211206
2.3.90-20211206 		2021-12-07 09:51:01 -05:00
Mike Reeves
9f94ecfab7 Merge pull request #6466 from Security-Onion-Solutions/2390updates3 
2.3.90 hotfix 20211206
 2021-12-06 11:07:14 -05:00
Mike Reeves
4188282724 2.3.90 hotfix 20211206 2021-12-06 11:03:49 -05:00
Mike Reeves
3945933dec Merge pull request #6446 from Security-Onion-Solutions/TOoSmOotH-patch-4 
Update HOTFIX
 2021-12-06 09:38:02 -05:00
Mike Reeves
73a1a3878f Update HOTFIX 2021-12-06 09:37:07 -05:00