Merge pull request #8825 from Security-Onion-Solutions/config

resolve inode issue with soc_users_roles when deleting a user; other minor improvements

salt/common/tools/sbin/so-user

@@ -573,7 +573,7 @@ function deleteUser() {
   rolesTmpFile="${socRolesFile}.tmp"
   createFile "$rolesTmpFile" "$soUID" "$soGID"
   grep -v "$identityId" "$socRolesFile" > "$rolesTmpFile"
-  mv "$rolesTmpFile" "$socRolesFile"
+  cat "$rolesTmpFile" > "$socRolesFile"
 }
 
 case "${operation}" in

salt/soc/defaults.yaml

@@ -1,5 +1,6 @@
 soc:
   logFilename: /opt/sensoroni/logs/sensoroni-server.log
+  logLevel: info
   actions:
     - name: actionHunt
       description: actionHuntHelp

salt/soc/files/bin/salt-relay.sh

@@ -109,7 +109,7 @@ function manage_user() {
   esac
 
   if [[ exit_code -eq 0 ]]; then
-    log "Successful command execution"
+    log "Successful command execution: $response"
     $(echo "true" > "${SOC_PIPE}")
   else
     log "Unsuccessful command execution: $response ($exit_code)"
@@ -150,7 +150,7 @@ function manage_salt() {
   esac
 
   if [[ exit_code -eq 0 ]]; then
-    log "Successful command execution"
+    log "Successful command execution: $response"
     $(echo "true" > "${SOC_PIPE}")
   else
     log "Unsuccessful command execution: $response ($exit_code)"

salt/soc/soc_soc.yaml

@@ -1,4 +1,8 @@
 soc:
+  logLevel:
+    description: The SOC log level, useful for enabling debug logging for advanced troubleshooting. Allowed values are debug, info, warn, error. The SOC log is available at /opt/so/log/soc/sensoroni-server.log.
+    global: True
+    regex: (info|debug|warn|error)
   files:
     soc:
       banner__md: