From bf78faa0f081c873d371fa0ec2cf22c970755add Mon Sep 17 00:00:00 2001
From: Josh Brower <josh@defensivedepth.com>
Date: Wed, 9 Aug 2023 10:43:34 -0400
Subject: [PATCH] Enable upgrade check during state run

---
 salt/elasticfleet/enabled.sls                                | 5 +++++
 .../tools/sbin_jinja/so-elastic-agent-grid-upgrade           | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/salt/elasticfleet/enabled.sls b/salt/elasticfleet/enabled.sls
index 096610af2..82c7735db 100644
--- a/salt/elasticfleet/enabled.sls
+++ b/salt/elasticfleet/enabled.sls
@@ -109,6 +109,11 @@ so-elastic-fleet:
 so-elastic-fleet-integrations:
   cmd.run:
     - name: /usr/sbin/so-elastic-fleet-integration-policy-load
+
+so-elastic-agent-grid-upgrade:
+  cmd.run:
+    - name: /usr/sbin/so-elastic-agent-grid-upgrade
+    - retry: True
 {%  endif %}
 
 delete_so-elastic-fleet_so-status.disabled:
diff --git a/salt/elasticfleet/tools/sbin_jinja/so-elastic-agent-grid-upgrade b/salt/elasticfleet/tools/sbin_jinja/so-elastic-agent-grid-upgrade
index 23bf304f2..b1ca8c476 100644
--- a/salt/elasticfleet/tools/sbin_jinja/so-elastic-agent-grid-upgrade
+++ b/salt/elasticfleet/tools/sbin_jinja/so-elastic-agent-grid-upgrade
@@ -14,8 +14,8 @@ fi
 RAW_JSON=$(curl -K /opt/so/conf/elasticsearch/curl.config -L "http://localhost:5601/api/fleet/agents?perPage=20&page=1&kuery=policy_id%20%3A%20so-grid-nodes_%2A&showInactive=false&showUpgradeable=true&getStatusSummary=true")
 
 # Check to make sure that the server responded with good data - else, bail from script
-CHECKSUM=$(jq -r '.statusSummary.online' <<< "$RAW_JSON")
-if [ "$CHECKSUM" -lt 1 ]; then
+CHECKSUM=$(jq -r '.page' <<< "$RAW_JSON")
+if [ "$CHECKSUM" -ne 1 ]; then
  printf "Failed to query for current Grid Agents...\n"
  exit 1
 fi