Commit Graph

6781 Commits

Author SHA1 Message Date
Mike Reeves
75f9138a40 Merge pull request #3514 from Security-Onion-Solutions/fix/accept-hostname-proxy
[fix] Also accept a hostname in the proxy URL
2021-03-17 17:51:59 -04:00
William Wernert
96ac742b69 [fix] Also accept a hostname in the proxy URL 2021-03-17 17:31:47 -04:00
Mike Reeves
a3b7388aba Merge pull request #3511 from Security-Onion-Solutions/fix/elastic-license-agree
Make the Elastic license prompt case insensitive
2021-03-17 16:57:32 -04:00
William Wernert
7da027abc1 Make the Elastic license prompt case insensitive 2021-03-17 16:55:34 -04:00
Josh Brower
8fd3f102f1 Merge pull request #3509 from Security-Onion-Solutions/fix/kibana-space-defaults
Add space defaults script
2021-03-17 15:55:11 -04:00
Josh Brower
7583593152 Add space defaults scripot 2021-03-17 15:47:36 -04:00
Jason Ertel
dc0d989942 Merge pull request #3504 from Security-Onion-Solutions/issue/3493
UPGRADE: docker-ce, docker-ce-cli, containerd to latest
2021-03-17 13:51:31 -04:00
William Wernert
46d346aa62 Merge pull request #3503 from Security-Onion-Solutions/foxtrot
Foxtrot
2021-03-17 12:07:40 -04:00
William Wernert
16d6e116fa Merge branch 'dev' into foxtrot
# Conflicts:
#	salt/idstools/init.sls
2021-03-17 11:52:54 -04:00
Mike Reeves
52b836d456 Merge pull request #3498 from Security-Onion-Solutions/fix/so-rule-apply
Fix so-rule apply - manually tested
2021-03-17 11:28:16 -04:00
William Wernert
8aac9d6bea Reorder states in sync_files.sls 2021-03-17 10:46:17 -04:00
William Wernert
99a37a56a9 [fix] Change the commands so-rule uses to apply changes 2021-03-17 10:36:43 -04:00
m0duspwnens
f63cc10602 https://github.com/Security-Onion-Solutions/securityonion/issues/3493 2021-03-17 10:26:52 -04:00
William Wernert
c0163108ab Merge branch 'dev' into foxtrot
# Conflicts:
#	salt/common/tools/sbin/soup
2021-03-17 10:23:51 -04:00
m0duspwnens
aa14dda155 https://github.com/Security-Onion-Solutions/securityonion/issues/3493 2021-03-17 10:20:20 -04:00
Mike Reeves
fbdb627ab7 Merge pull request #3488 from Security-Onion-Solutions/issue/3288
insert instead of append
2021-03-17 09:17:20 -04:00
m0duspwnens
68ce7a902d insert instead of append 2021-03-17 09:14:19 -04:00
Doug Burks
2ba130b44c Merge pull request #3487 from Security-Onion-Solutions/issue/3486
FEATURE: soup should provide some initial information and then prompt…
2021-03-17 09:02:29 -04:00
Doug Burks
d32c1de411 FEATURE: soup should provide some initial information and then prompt the user to continue #3486 2021-03-17 09:00:46 -04:00
Josh Brower
d21abd9693 Merge pull request #3482 from Security-Onion-Solutions/feature/revert-livequery-hunt
Temp revert Fleet Live Query to Hunt
2021-03-17 08:29:28 -04:00
Josh Brower
bba9913be1 Temp revert Fleet Live Query to Hunt 2021-03-17 08:25:25 -04:00
Jason Ertel
1b6f681ae1 Merge pull request #3477 from Security-Onion-Solutions/esheap
Esheap
2021-03-17 08:14:13 -04:00
Mike Reeves
137e1a699d Fix the math 2021-03-16 19:01:10 -04:00
Mike Reeves
2f3488b134 Merge pull request #3476 from Security-Onion-Solutions/issue/3288
Issue/3288
2021-03-16 18:56:07 -04:00
Mike Reeves
7719a26a96 Change ES Heap calculation 2021-03-16 18:53:41 -04:00
m0duspwnens
53c3b19a08 Merge remote-tracking branch 'remotes/origin/dev' into issue/3288 2021-03-16 16:46:32 -04:00
Doug Burks
065f1c2927 Merge pull request #3473 from Security-Onion-Solutions/fix/shorten-elastic-license-url
Shorten Elastic License URL to avoid line wrap
2021-03-16 16:43:38 -04:00
Doug Burks
388524ec4e Shorten Elastic License URL to avoid line wrap 2021-03-16 16:39:14 -04:00
m0duspwnens
38a497932c https://github.com/Security-Onion-Solutions/securityonion/issues/3288 2021-03-16 16:36:35 -04:00
weslambert
8d29f757b1 Merge pull request #3471 from Security-Onion-Solutions/kilo
Reverse Zeek index close/delete count for Curator
2021-03-16 14:34:46 -04:00
Josh Brower
b56434aea1 Merge pull request #3470 from Security-Onion-Solutions/feature/disable-features-ui
Feature/disable certain features in Kibana UI
2021-03-16 14:00:21 -04:00
Josh Brower
abd4f92088 Cleanup curl output 2021-03-16 13:53:28 -04:00
Josh Brower
c855e0a55a Disable certain Features within the default space 2021-03-16 13:48:13 -04:00
Wes Lambert
7a02150389 Reverse Zeek index close/delete count for Curator 2021-03-16 17:16:55 +00:00
weslambert
5fd483a99d Merge pull request #3466 from Security-Onion-Solutions/soup2340
Soup for 2.3.40
2021-03-16 13:03:33 -04:00
Mike Reeves
d92c1c11aa Merge pull request #3463 from Security-Onion-Solutions/kilo
Ignore TIME_WAIT when checking for Strelka frontend port reservation
2021-03-16 12:59:16 -04:00
Mike Reeves
71c6bb71c1 Merge remote-tracking branch 'remotes/origin/dev' into soup2340 2021-03-16 12:56:24 -04:00
Mike Reeves
e528d84ebe Update Elastic License Text 2021-03-16 12:56:06 -04:00
William Wernert
129db23062 Move interface message to later in setup 2021-03-16 12:34:44 -04:00
William Wernert
1e7aaf9ffb Collect manager info before showing message about copying ssh key 2021-03-16 12:32:37 -04:00
Mike Reeves
2851840e76 Fix Logging 2021-03-16 12:18:01 -04:00
Josh Brower
7b748128ea Merge pull request #3462 from Security-Onion-Solutions/delta
Fixes IP & Port mappings
2021-03-16 12:05:23 -04:00
Josh Brower
4d6cac4a2a Merge remote-tracking branch 'remotes/origin/dev' into delta 2021-03-16 11:57:17 -04:00
William Wernert
c8bbe078a6 Use more lines on proxy error message 2021-03-16 11:42:15 -04:00
William Wernert
6a48d7f478 Print curl error to populate variable 2021-03-16 11:34:36 -04:00
Wes Lambert
038c58f3d5 Ignore TIME_WAIT when checking for Strelka frontend port reservation 2021-03-16 14:51:16 +00:00
William Wernert
59c62393b5 Change back to validating proxy, show user error message from curl 2021-03-16 10:18:02 -04:00
Mike Reeves
00025e5c74 Fix Syntax Error 2021-03-16 09:34:53 -04:00
Josh Brower
71ae5b60ea Update Sigmac mappings and config for IPs and ports 2021-03-16 09:32:40 -04:00
Josh Brower
44c75122ed Update Sigmac mappings and config for IPs and ports 2021-03-16 09:05:35 -04:00