Merge pull request #11241 from Security-Onion-Solutions/jertel/sod

salt/common/tools/sbin/so-test

@@ -11,4 +11,4 @@ set -e
 so-tcpreplay /opt/samples/* 2> /dev/null
 
 # Ingest sample pfsense log entry
-echo "<134>$(date '+%b %d %H:%M:%S') filterlog[31624]: 84,,,1567509287,igb0.244,match,pass,in,4,0x0,,64,0,0,DF,6,tcp,64,192.168.1.1,10.10.10.10,56320,443,0,S,3333585167,,65535,,mss;nop;wscale;nop;nop;TS;sackOK;eol" | nc -uv -w1 localhost 514 > /dev/null 2>&1
+echo "<134>$(date '+%b %d %H:%M:%S') filterlog[31624]: 84,,,1567509287,igb0.244,match,pass,in,4,0x0,,64,0,0,DF,6,tcp,64,192.168.1.1,10.10.10.10,56320,443,0,S,3333585167,,65535,,mss;nop;wscale;nop;nop;TS;sackOK;eol" | nc -uv -w1 127.0.0.1 514 > /dev/null 2>&1

salt/soc/defaults.yaml

@@ -1012,6 +1012,7 @@ soc:
           verifyCert: false
         salt:
           queueDir: /opt/sensoroni/queue
+          timeoutMs: 45000
           longRelayTimeoutMs: 120000
         sostatus:
           refreshIntervalMs: 30000

salt/soc/soc_soc.yaml

@@ -116,6 +116,10 @@ soc:
             description: Duration (in milliseconds) to wait for a response from the Salt API when executing tasks known for being long running before giving up and showing an error on the SOC UI.
             global: True
             advanced: True
+          relayTimeoutMs:
+            description: Duration (in milliseconds) to wait for a response from the Salt API when executing common grid management tasks before giving up and showing an error on the SOC UI.
+            global: True
+            advanced: True
       client:
         enableReverseLookup:
           description: Set to true to enable reverse DNS lookups for IP addresses in the SOC UI.