Merge branch '2.4/dev' into kilo

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.*)$'

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 }}

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}}':