Commit Graph

9033 Commits

Author SHA1 Message Date
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
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
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
weslambert
ff25d6f80b Merge pull request #6447 from Security-Onion-Solutions/eg_dashes
Add initial EG dashboards
2021-12-03 18:05:22 -05:00
Wes Lambert
0571612ea1 Add initial EG dashes 2021-12-03 22:38:30 +00:00
Mike Reeves
f697d88090 Update HOTFIX 2021-12-03 15:36:16 -05:00
Mike Reeves
ad03241910 Merge pull request #6445 from Security-Onion-Solutions/TOoSmOotH-patch-3
Apply hotfix to all 2.3.90 installs
2021-12-03 15:24:33 -05:00
Mike Reeves
f82d204c0e Update soup 2021-12-03 15:20:33 -05:00
Mike Reeves
780daf8aa7 Apply hotfix to all 2.3.90 installs 2021-12-03 15:15:45 -05:00
Josh Patterson
5008b647b0 Merge pull request #6441 from Security-Onion-Solutions/hf/soc_append2.3.90
export LC_CTYPE="en_US.UTF-8" in soup
2021-12-03 15:10:12 -05:00
m0duspwnens
65b1ab833d run salt-call locally as if no Salt master were present during reinstall - https://github.com/Security-Onion-Solutions/securityonion/discussions/6435 2021-12-03 12:00:29 -05:00