Merge pull request #5213 from Security-Onion-Solutions/hotfix/curator

stop curator and remove from so-status for manager

salt/curator/init.sls

@@ -158,6 +158,13 @@ delete_so-curator_so-status.disabled:
     - name: /opt/so/conf/so-status/so-status.conf
     - regex: ^so-curator$
     {% endif %}
+
+  {% else %}
+delete_so-curator_so-status:
+  file.line:
+    - name: /opt/so/conf/so-status/so-status.conf
+    - match: ^so-curator$
+    - mode: delete
   {% endif %}
 
 # Begin Curator Cron Jobs

salt/curator/map.jinja

@@ -4,9 +4,12 @@
 {% do CURATOROPTIONS.update({'manage_sostatus': True}) %}
 
 # don't start the docker container if curator is disabled via pillar
-{% if not ENABLED %}
+{% if not ENABLED or grains.id.split('_')|last == 'manager'%}
   {% do CURATOROPTIONS.update({'start': False}) %}
   {% do CURATOROPTIONS.update({'status': 'absent'}) %}
+  {% if grains.id.split('_')|last == 'manager' %}
+    {% do CURATOROPTIONS.update({'manage_sostatus': False}) %}
+  {% endif %}
 {% else %}
   {% do CURATOROPTIONS.update({'start': True}) %}
   {% do CURATOROPTIONS.update({'status': 'running'}) %}

salt/top.sls

@@ -195,6 +195,7 @@ base:
     {%- if FILEBEAT %}
     - filebeat
     {%- endif %}
+    - curator
     - utility
     - schedule
     {%- if FLEETMANAGER or FLEETNODE %}