From e2d74b115f1580f29c6c659ad68ce8d060e20b73 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Thu, 19 Aug 2021 15:26:22 -0400
Subject: [PATCH] just dont run curator on manager

---
 salt/curator/map.jinja | 7 ++-----
 salt/top.sls           | 1 -
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/salt/curator/map.jinja b/salt/curator/map.jinja
index 9b4a75a96..c77509fbc 100644
--- a/salt/curator/map.jinja
+++ b/salt/curator/map.jinja
@@ -3,13 +3,10 @@
 {% set TRUECLUSTER = salt['pillar.get']('elasticsearch:true_cluster', False) %}
 {% do CURATOROPTIONS.update({'manage_sostatus': True}) %}
 
-# don't start the docker container if searchnode and true clustering is enabled or curator disabled via pillar or true cluster not enabled and manager
-{% if not ENABLED or (TRUECLUSTER and grains.id.split('_')|last == 'searchnode') or (not TRUECLUSTER and grains.id.split('_')|last == 'manager') %}
+# don't start the docker container if curator is disabled via pillar
+{% if not ENABLED %}
   {% do CURATOROPTIONS.update({'start': False}) %}
   {% do CURATOROPTIONS.update({'status': 'absent'}) %}
-  {% if (TRUECLUSTER and grains.id.split('_')|last == 'searchnode') or (not TRUECLUSTER and grains.id.split('_')|last == 'manager') %}
-    {% do CURATOROPTIONS.update({'manage_sostatus': False}) %}
-  {% endif %}%}
 {% else %}
   {% do CURATOROPTIONS.update({'start': True}) %}
   {% do CURATOROPTIONS.update({'status': 'running'}) %}
diff --git a/salt/top.sls b/salt/top.sls
index 4f0792c0c..4a0347e2f 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -189,7 +189,6 @@ base:
     {%- if KIBANA %}
     - kibana
     {%- endif %}
-    - curator
     {%- if ELASTALERT %}
     - elastalert
     {%- endif %}