Merge pull request #5166 from Security-Onion-Solutions/issue/2806

Issue/2806

salt/curator/init.sls

@@ -140,22 +140,24 @@ so-curator:
     - force: True
   {% endif %}
 
+  {% if CURATOROPTIONS.manage_sostatus %}
 append_so-curator_so-status.conf:
   file.append:
     - name: /opt/so/conf/so-status/so-status.conf
     - text: so-curator
     - unless: grep -q so-curator /opt/so/conf/so-status/so-status.conf
 
-  {% if not CURATOROPTIONS.start %}
+    {% if not CURATOROPTIONS.start %}
 so-curator_so-status.disabled:
   file.comment:
     - name: /opt/so/conf/so-status/so-status.conf
     - regex: ^so-curator$
-  {% else %}
+    {% else %}
 delete_so-curator_so-status.disabled:
   file.uncomment:
     - name: /opt/so/conf/so-status/so-status.conf
     - regex: ^so-curator$
+    {% endif %}
   {% endif %}
 
 # Begin Curator Cron Jobs

salt/curator/map.jinja

@@ -1,11 +1,15 @@
 {% set CURATOROPTIONS = {} %}
 {% set ENABLED = salt['pillar.get']('curator:enabled', True) %}
 {% 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') %}
   {% 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'}) %}