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

just dont run curator on manager
This commit is contained in:
Josh Patterson
2021-08-19 15:27:55 -04:00
committed by GitHub
2 changed files with 2 additions and 6 deletions

View File

@@ -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'}) %}

View File

@@ -189,7 +189,6 @@ base:
{%- if KIBANA %}
- kibana
{%- endif %}
- curator
{%- if ELASTALERT %}
- elastalert
{%- endif %}