From 7f7f2c15d0bf6b88817b8213ec3208a82a1e5f19 Mon Sep 17 00:00:00 2001
From: Jason Ertel <jason.ertel@securityonionsolutions.com>
Date: Tue, 27 Sep 2022 10:29:21 -0400
Subject: [PATCH] add support for querying active salt jobs (future use)

---
 salt/soc/files/bin/salt-relay.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/salt/soc/files/bin/salt-relay.sh b/salt/soc/files/bin/salt-relay.sh
index 386b91612..eec0949d1 100755
--- a/salt/soc/files/bin/salt-relay.sh
+++ b/salt/soc/files/bin/salt-relay.sh
@@ -121,7 +121,7 @@ function manage_salt() {
   request=$1
   op=$(echo "$request" | jq -r .operation)
   minion=$(echo "$request" | jq -r .minion)
-  if [[ -s $minion ]]; then
+  if [[ -s $minion || "$minion" == "null" ]]; then
     minion=$(cat /etc/salt/minion | grep "id:" | awk '{print $2}')
   fi
 
@@ -137,6 +137,12 @@ function manage_salt() {
       response=$(salt --async $minion state.highstate queue=True)
       exit_code=$?
       ;;
+    activejobs)
+      log "Querying active salt jobs"
+      response=$(salt-run jobs.active -out json -l quiet)
+      $(echo "$response" > "${SOC_PIPE}")
+      return
+      ;;
     *)
       response="Unsupported salt operation: $op"
       exit_code=1