Commit Graph

6815 Commits

Author SHA1 Message Date
Jason Ertel
e69f6270f9 Merge branch 'dev' into kilo 2021-03-19 11:15:47 -04:00
Jason Ertel
83a3488a06 Update changes.json to reflect 2.3.40 changes 2021-03-19 11:15:27 -04:00
Mike Reeves
de61886441 Merge pull request #3544 from Security-Onion-Solutions/feature/setup-kibana-space
Configure default Space in Kibana during setup
2021-03-19 09:02:18 -04:00
Josh Brower
9d533e5db0 Merge pull request #3542 from Security-Onion-Solutions/fix/fleet-custom-hostname
Fix Fleet Custom Hostname Reactor
2021-03-19 08:21:30 -04:00
Josh Brower
d020f1d1a1 Fix Fleet Custom Hostname Reactor 2021-03-19 08:15:47 -04:00
William Wernert
b595c6ddf7 Configure default Space in Kibana during setup 2021-03-18 16:00:13 -04:00
Mike Reeves
28999af493 Merge pull request #3539 from Security-Onion-Solutions/fix/postsoup
Fix/postsoup
2021-03-18 15:46:36 -04:00
Josh Brower
77b8aecfd9 add so-kibana-space-defaults 2021-03-18 15:40:12 -04:00
Mike Reeves
2e84af621e Add postloop for 2.3.40 2021-03-18 15:14:10 -04:00
William Wernert
6b2947ca6a Merge pull request #3535 from Security-Onion-Solutions/fix/cloud-var
Set is_cloud variable in the main shell process
2021-03-18 14:00:58 -04:00
Mike Reeves
2bd3a6418d Merge pull request #3536 from Security-Onion-Solutions/kilo
Refresh fieldcaps every 5 minutes
2021-03-18 13:57:24 -04:00
Jason Ertel
cc30abfe1b Refresh fieldcaps every 5 minutes 2021-03-18 13:48:57 -04:00
William Wernert
0edf419bcb Remove redundant message 2021-03-18 13:16:45 -04:00
William Wernert
360f0d4dfd Also print stdout message to log 2021-03-18 13:12:16 -04:00
William Wernert
27ff823bc0 [fix] Don't set is_cloud in a subshell 2021-03-18 13:09:46 -04:00
Mike Reeves
1f85506fb1 Merge pull request #3532 from Security-Onion-Solutions/fix/packaging
Also add python packaging lib package to common state
2021-03-18 11:30:56 -04:00
William Wernert
cb0fb93f77 Also add python packaging lib package to common state 2021-03-18 11:28:25 -04:00
William Wernert
fcf0417fbf Merge pull request #3528 from Security-Onion-Solutions/fix/default-no-proxy
Change proxy prompt to default to no
2021-03-18 09:57:03 -04:00
William Wernert
c910a2d2a0 Change proxy prompt to default to no 2021-03-18 09:52:11 -04:00
William Wernert
066a8598a6 Merge pull request #3523 from Security-Onion-Solutions/issue/3493
fix docker versions in setup
2021-03-18 09:31:35 -04:00
William Wernert
b5770964c4 Merge pull request #3522 from Security-Onion-Solutions/fix/install-network-manager
[fix] CentOS ami does not include NetworkManager, so install it
2021-03-18 09:10:41 -04:00
William Wernert
31725ac627 [fix] Indent 2021-03-18 09:09:29 -04:00
m0duspwnens
dbe54708ef fix docker versions in setup https://github.com/Security-Onion-Solutions/securityonion/issues/3493 2021-03-18 09:09:28 -04:00
William Wernert
163cb8f3ca [fix] Typo 2021-03-18 09:08:31 -04:00
William Wernert
4f104c860e [fix] CentOS ami does not include NetworkManager, so install it 2021-03-18 09:00:02 -04:00
Mike Reeves
db605adaf6 Merge pull request #3517 from Security-Onion-Solutions/fix/restarting-docker-message 2021-03-17 21:15:37 -04:00
Mike Reeves
308f10fbdd Merge pull request #3510 from Security-Onion-Solutions/kilo 2021-03-17 21:14:45 -04:00
William Wernert
6e3d951b01 [fix] Show message in terminal when restarting Docker to avoid confusion 2021-03-17 20:17:23 -04:00
Mike Reeves
9a2b5fa301 Merge pull request #3516 from Security-Onion-Solutions/add_suricata_eve_clean
https://github.com/Security-Onion-Solutions/securityonion/issues/3515
2021-03-17 18:50:23 -04:00
m0duspwnens
ec179f8e9b https://github.com/Security-Onion-Solutions/securityonion/issues/3515 2021-03-17 18:44:25 -04:00
Jason Ertel
bc002cb9fb Merge branch 'dev' into kilo 2021-03-17 18:29:52 -04:00
Jason Ertel
4e9f629231 Reformat inactiveTools list in JSON format 2021-03-17 18:25:05 -04:00
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
Jason Ertel
42809083e8 Merge branch 'dev' into kilo 2021-03-17 17:14:29 -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
Jason Ertel
4de809ecbd Automatically hide SOC tools that are not installed. Resolves #1643. 2021-03-17 16:13:50 -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