From 018186ccbd1d63ec1e0785e13a9579f27751264c Mon Sep 17 00:00:00 2001
From: Wes <wlambertts@gmail.com>
Date: Thu, 28 Sep 2023 16:43:56 +0000
Subject: [PATCH 1/3] Upgrade packages and load integrations when packages
 change

---
 salt/elasticfleet/config.sls | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/salt/elasticfleet/config.sls b/salt/elasticfleet/config.sls
index 902b5eb4c..82b975697 100644
--- a/salt/elasticfleet/config.sls
+++ b/salt/elasticfleet/config.sls
@@ -59,6 +59,14 @@ eastatedir:
     - group: 939
     - makedirs: True
 
+eapackageupgrade:
+  file.managed:
+    - name: /usr/sbin/so-elastic-fleet-package-upgrade
+    - source: salt://elasticfleet/tools/sbin_jinja/so-elastic-fleet-package-upgrade
+    - user: 947
+    - group: 939
+    - template: jinja
+
 {%   if GLOBALS.role != "so-fleet" %}
 eaintegrationsdir:
   file.directory:
@@ -88,6 +96,7 @@ ea-integrations-load:
     - onchanges:
       - file: eaintegration
       - file: eadynamicintegration
+      - file: eapackageupgrade
 {% endif %}
 {% else %}
 

From 8c44481ee15a2776d32cff1b1e0e6e68619300f5 Mon Sep 17 00:00:00 2001
From: Wes <wlambertts@gmail.com>
Date: Thu, 28 Sep 2023 17:57:31 +0000
Subject: [PATCH 2/3] Load templates after package changes

---
 .../tools/sbin_jinja/so-elastic-fleet-package-upgrade            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-package-upgrade b/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-package-upgrade
index 2fb3f7798..a092e3ecb 100644
--- a/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-package-upgrade
+++ b/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-package-upgrade
@@ -15,3 +15,4 @@ elastic_fleet_package_install "{{ PACKAGE }}" "$VERSION"
 echo
 {%- endfor %}
 echo
+/usr/sbin/so-elasticsearch-templates-load

From 670cd190518ba9337d63af1dbff0d8052c674241 Mon Sep 17 00:00:00 2001
From: Wes <wlambertts@gmail.com>
Date: Thu, 28 Sep 2023 18:04:07 +0000
Subject: [PATCH 3/3] Exclude package upgrade script

---
 salt/elasticfleet/config.sls | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/salt/elasticfleet/config.sls b/salt/elasticfleet/config.sls
index 82b975697..d2e357c91 100644
--- a/salt/elasticfleet/config.sls
+++ b/salt/elasticfleet/config.sls
@@ -37,6 +37,8 @@ elasticfleet_sbin_jinja:
     - group: 939 
     - file_mode: 755
     - template: jinja
+    - exclude_pat:
+      - so-elastic-fleet-package-upgrade # exclude this because we need to watch it for changes
 
 eaconfdir:
   file.directory: