From fd2312a2acffa949e54904bc3b65cdce0525c739 Mon Sep 17 00:00:00 2001
From: Josh Brower <Josh@DefensiveDepth.com>
Date: Tue, 7 Mar 2023 15:13:35 -0500
Subject: [PATCH 1/3] Remove EA install from manager highstates

---
 salt/top.sls | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/salt/top.sls b/salt/top.sls
index 69d99f6de..889c95f99 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -106,7 +106,6 @@ base:
     - playbook
     - redis
     {%- endif %}
-    - elastic-fleet.install_agent_grid
     - docker_clean
 
   '*_manager and G@saltversion:{{saltversion}}':
@@ -148,7 +147,6 @@ base:
     - schedule
     - soctopus
     - playbook
-    - elastic-fleet.install_agent_grid
     - docker_clean
 
   '*_standalone and G@saltversion:{{saltversion}}':
@@ -201,7 +199,6 @@ base:
     - playbook
     - docker_clean
     - elastic-fleet
-    - elastic-fleet.install_agent_grid
 
   '*_searchnode and G@saltversion:{{saltversion}}':
     - match: compound
@@ -259,7 +256,6 @@ base:
     - schedule
     - soctopus
     - playbook
-    - elastic-fleet.install_agent_grid
     - docker_clean
 
   '*_heavynode and G@saltversion:{{saltversion}}':
@@ -320,7 +316,6 @@ base:
     - zeek
     - schedule
     - docker_clean
-    - elastic-fleet.install_agent_grid
     - elastic-fleet
 
   '*_receiver and G@saltversion:{{saltversion}}':

From e93c052d346ae8743403f5f10c482931a3f55068 Mon Sep 17 00:00:00 2001
From: weslambert <wlambertts@gmail.com>
Date: Tue, 7 Mar 2023 15:21:53 -0500
Subject: [PATCH 2/3] Add the new index format to the global delete action file
 for Curator

---
 salt/curator/files/action/delete.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/salt/curator/files/action/delete.yml b/salt/curator/files/action/delete.yml
index e51b08538..fb8ae30cb 100644
--- a/salt/curator/files/action/delete.yml
+++ b/salt/curator/files/action/delete.yml
@@ -15,7 +15,7 @@ actions:
     filters:
     - filtertype: pattern
       kind: regex
-      value: '^(logstash-.*|so-.*)$'
+      value: '^(logstash-.*|so-.*|.ds-logs-.*-so.*)$'
     - filtertype: pattern
       kind: regex
       value: '^(so-case.*)$'

From 2d7ce41a703d28b402c275ad05ce8ebb1636511c Mon Sep 17 00:00:00 2001
From: weslambert <wlambertts@gmail.com>
Date: Tue, 7 Mar 2023 16:16:55 -0500
Subject: [PATCH 3/3] Remove reference to 'so-curator-cluster-warm' script
 since it has been removed

---
 salt/curator/init.sls | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/salt/curator/init.sls b/salt/curator/init.sls
index 4a828beb6..94a666f53 100644
--- a/salt/curator/init.sls
+++ b/salt/curator/init.sls
@@ -113,15 +113,6 @@ curclusterdelete:
     - mode: 755
     - template: jinja
 
-curclustercwarm: 
-  file.managed:
-    - name: /usr/sbin/so-curator-cluster-warm
-    - source: salt://curator/files/bin/so-curator-cluster-warm
-    - user: 934
-    - group: 939
-    - mode: 755
-    - template: jinja
-
 so-curator:
   docker_container.{{ CURATOROPTIONS.status }}:
     - image: {{ GLOBALS.registry_host }}:5000/{{ GLOBALS.image_repo }}/so-curator:{{ GLOBALS.so_version }}