From ca1498fca160cebebdaad028566e4c90f7e99e5e Mon Sep 17 00:00:00 2001 From: Josh Brower Date: Fri, 17 Nov 2023 12:19:22 -0500 Subject: [PATCH 1/2] Dont update Defend Integration --- salt/manager/tools/sbin/soup | 1 - 1 file changed, 1 deletion(-) diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup index 7123a36e5..5168918d2 100755 --- a/salt/manager/tools/sbin/soup +++ b/salt/manager/tools/sbin/soup @@ -536,7 +536,6 @@ up_to_2.4.30() { . $UPDATE_DIR/salt/elasticfleet/tools/sbin/so-elastic-fleet-common elastic_fleet_integration_remove endpoints-initial elastic-defend-endpoints - /usr/sbin/so-elastic-fleet-integration-policy-elastic-defend # Elastic Update for this release, so download Elastic Agent files determine_elastic_agent_upgrade From 7aadc3851f90d0e61a5f13773e9b9c8eb993441f Mon Sep 17 00:00:00 2001 From: Josh Brower Date: Fri, 17 Nov 2023 13:08:15 -0500 Subject: [PATCH 2/2] Remove state file --- salt/manager/tools/sbin/soup | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup index 5168918d2..c9d4b1936 100755 --- a/salt/manager/tools/sbin/soup +++ b/salt/manager/tools/sbin/soup @@ -530,13 +530,14 @@ up_to_2.4.20() { up_to_2.4.30() { - # Remove older defend integration json + # Remove older defend integration json & installed integration rm -f /opt/so/conf/elastic-fleet/integrations/endpoints-initial/elastic-defend-endpoints.json . $UPDATE_DIR/salt/elasticfleet/tools/sbin/so-elastic-fleet-common - elastic_fleet_integration_remove endpoints-initial elastic-defend-endpoints + rm -f /opt/so/state/eaintegrations.txt + # Elastic Update for this release, so download Elastic Agent files determine_elastic_agent_upgrade rm -f /opt/so/state/estemplates*.txt