CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-15 13:42:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup strelka in top and allowed_states

Browse Source
This commit is contained in:
m0duspwnens
2023-05-10 15:59:10 -04:00
parent 5b06aa518e
commit 4e4034e054
2 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
salt/allowed_states.map.jinja
View File

@@ -4,8 +4,6 @@
# Elastic License 2.0. # Elastic License 2.0.
{% set CURATOR = salt['pillar.get']('curator:enabled', True) %} {% set CURATOR = salt['pillar.get']('curator:enabled', True) %}
{% set REDIS = salt['pillar.get']('redis:enabled', True) %}
{% set STRELKA = salt['pillar.get']('strelka:enabled', '0') %}
{% set ISAIRGAP = salt['pillar.get']('global:airgap', False) %} {% set ISAIRGAP = salt['pillar.get']('global:airgap', False) %}
{% import_yaml 'salt/minion.defaults.yaml' as saltversion %} {% import_yaml 'salt/minion.defaults.yaml' as saltversion %}
{% set saltversion = saltversion.salt.minion.version %} {% set saltversion = saltversion.salt.minion.version %}
@@ -218,7 +216,7 @@
{% do allowed_states.append('zeek') %} {% do allowed_states.append('zeek') %}
{%- endif %} {%- endif %}
{% if STRELKA and grains.role in ['so-sensor', 'so-eval', 'so-standalone', 'so-heavynode'] %} {% if grains.role in ['so-sensor', 'so-eval', 'so-standalone', 'so-heavynode'] %}
{% do allowed_states.append('strelka') %} {% do allowed_states.append('strelka') %}
{% endif %} {% endif %}
@@ -251,7 +249,7 @@
{% do allowed_states.append('logstash') %} {% do allowed_states.append('logstash') %}
{% endif %} {% endif %}
{% if REDIS and grains.role in ['so-manager', 'so-standalone', 'so-managersearch', 'so-heavynode', 'so-receiver', 'so-eval'] %} {% if grains.role in ['so-manager', 'so-standalone', 'so-managersearch', 'so-heavynode', 'so-receiver', 'so-eval'] %}
{% do allowed_states.append('redis') %} {% do allowed_states.append('redis') %}
{% endif %} {% endif %}

9
salt/top.sls
View File

@@ -3,7 +3,6 @@
# https://securityonion.net/license; you may not use this file except in compliance with the # https://securityonion.net/license; you may not use this file except in compliance with the
# Elastic License 2.0. # Elastic License 2.0.
{% set STRELKA = salt['pillar.get']('strelka:enabled', '0') %}
{% import_yaml 'salt/minion.defaults.yaml' as saltversion %} {% import_yaml 'salt/minion.defaults.yaml' as saltversion %}
{% set saltversion = saltversion.salt.minion.version %} {% set saltversion = saltversion.salt.minion.version %}
{% set INSTALLEDSALTVERSION = grains.saltversion %} {% set INSTALLEDSALTVERSION = grains.saltversion %}
@@ -45,9 +44,7 @@ base:
- suricata - suricata
- healthcheck - healthcheck
- zeek - zeek
{%- if STRELKA %}
- strelka - strelka
{%- endif %}
- docker_clean - docker_clean
- elasticfleet.install_agent_grid - elasticfleet.install_agent_grid
@@ -76,9 +73,7 @@ base:
- pcap - pcap
- suricata - suricata
- zeek - zeek
{%- if STRELKA %}
- strelka - strelka
{%- endif %}
- curator - curator
- elastalert - elastalert
- utility - utility
@@ -146,9 +141,7 @@ base:
- pcap - pcap
- suricata - suricata
- zeek - zeek
{%- if STRELKA %}
- strelka - strelka
{%- endif %}
- curator - curator
- elastalert - elastalert
- utility - utility
@@ -211,9 +204,7 @@ base:
- logstash - logstash
- redis - redis
- curator - curator
{%- if STRELKA %}
- strelka - strelka
{%- endif %}
- pcap - pcap
- suricata - suricata
- zeek - zeek