Merge branch 'dev' into experimental

This commit is contained in:
Mike Reeves
2020-09-13 14:54:00 -04:00
committed by GitHub
50 changed files with 569 additions and 32 deletions

View File

@@ -683,8 +683,13 @@ fi
fi
if [[ "$STRELKA" = 1 ]]; then
set_progress_str 80 "$(print_salt_state_apply 'strelka')"
salt-call state.apply -l info strelka >> $setup_log 2>&1
if [[ $is_sensor ]]; then
set_progress_str 80 "$(print_salt_state_apply 'strelka')"
salt-call state.apply -l info strelka >> $setup_log 2>&1
fi
if [[ $STRELKARULES == 1 ]]; then
/usr/sbin/so-yara-update >> $setup_log 2>&1
fi
fi
if [[ $is_manager || $is_helix || $is_import ]]; then

View File

@@ -412,6 +412,13 @@ whiptail_enable_components() {
[ -n "$TESTING" ] && return
GRAFANA=0
OSQUERY=0
WAZUH=0
THEHIVE=0
PLAYBOOK=0
STRELKA=0
COMPONENTS=$(whiptail --title "Security Onion Setup" --checklist \
"Select Components to install" 20 75 8 \
GRAFANA "Enable Grafana for system monitoring" ON \