From 546c562ef0ad9779c41adacc03378e515d826c50 Mon Sep 17 00:00:00 2001
From: Jason Ertel <github@jasonertel.com>
Date: Fri, 1 Sep 2023 10:31:02 -0400
Subject: [PATCH] expose standard relay timeout in config UI; up default to 45s
 to accommodate sluggish pillar.get calls

---
 salt/soc/defaults.yaml | 1 +
 salt/soc/soc_soc.yaml  | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/salt/soc/defaults.yaml b/salt/soc/defaults.yaml
index 05543cd19..6d8ed5bfd 100644
--- a/salt/soc/defaults.yaml
+++ b/salt/soc/defaults.yaml
@@ -1012,6 +1012,7 @@ soc:
           verifyCert: false
         salt:
           queueDir: /opt/sensoroni/queue
+          timeoutMs: 45000
           longRelayTimeoutMs: 120000
         sostatus:
           refreshIntervalMs: 30000
diff --git a/salt/soc/soc_soc.yaml b/salt/soc/soc_soc.yaml
index e94144069..291f564ed 100644
--- a/salt/soc/soc_soc.yaml
+++ b/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.