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

improve verbosity of setup logs

Browse Source
This commit is contained in:
Jason Ertel
2023-11-06 11:22:35 -05:00
parent ef1dfc3152
commit b99c7ce76e
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
setup/so-setup
View File

@@ -774,6 +774,7 @@ if ! [[ -f $install_opt_file ]]; then
title "Setting up Elastic Fleet" title "Setting up Elastic Fleet"
logCmd "salt-call state.apply elasticfleet.config" logCmd "salt-call state.apply elasticfleet.config"
if ! logCmd so-elastic-fleet-setup; then if ! logCmd so-elastic-fleet-setup; then
error "Failed to run so-elastic-fleet-setup"
fail_setup fail_setup
fi fi
if [[ ! $is_import ]]; then if [[ ! $is_import ]]; then

8
setup/so-verify
View File

@@ -61,8 +61,11 @@ log_has_errors() {
grep -vE "Running scope as unit" &> "$error_log" grep -vE "Running scope as unit" &> "$error_log"
if [[ $? -eq 0 ]]; then if [[ $? -eq 0 ]]; then
# This function succeeds (returns 0) if errors are detected
return 0 return 0
fi fi
# No errors found, return 1 (function failed to find errors)
return 1 return 1
} }
@@ -121,7 +124,10 @@ main() {
echo "WARNING: Failed setup a while ago" echo "WARNING: Failed setup a while ago"
exit_code=1 exit_code=1
elif log_has_errors; then elif log_has_errors; then
echo "WARNING: Errors detected during setup" echo "WARNING: Errors detected during setup."
echo "--------- ERRORS ---------"
cat $error_log
echo "--------------------------"
exit_code=1 exit_code=1
touch /root/failure touch /root/failure
elif using_iso && cron_error_in_mail_spool; then elif using_iso && cron_error_in_mail_spool; then