CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
just dont run curator on manager
This commit is contained in:
Josh Patterson
2021-08-19 15:27:55 -04:00
committed by GitHub
parent 13741400f1 e2d74b115f
commit 21f3b3d985
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
salt/curator/map.jinja
View File

@@ -3,13 +3,10 @@
{% set TRUECLUSTER = salt['pillar.get']('elasticsearch:true_cluster', False) %} {% set TRUECLUSTER = salt['pillar.get']('elasticsearch:true_cluster', False) %}
{% do CURATOROPTIONS.update({'manage_sostatus': True}) %} {% 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 # don't start the docker container if curator is disabled via pillar
{% if not ENABLED or (TRUECLUSTER and grains.id.split('_')|last == 'searchnode') or (not TRUECLUSTER and grains.id.split('_')|last == 'manager') %} {% if not ENABLED %}
{% do CURATOROPTIONS.update({'start': False}) %} {% do CURATOROPTIONS.update({'start': False}) %}
{% do CURATOROPTIONS.update({'status': 'absent'}) %} {% 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 %} {% else %}
{% do CURATOROPTIONS.update({'start': True}) %} {% do CURATOROPTIONS.update({'start': True}) %}
{% do CURATOROPTIONS.update({'status': 'running'}) %} {% do CURATOROPTIONS.update({'status': 'running'}) %}

1
salt/top.sls
View File

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