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 #903 from Security-Onion-Solutions/quickfix/suricata

Browse Source 
fix suricata state if suripins or suri procs arent set
This commit is contained in:
Josh Patterson
2020-06-29 15:39:40 -04:00
committed by GitHub
parent abe063602b d7580fe6a0
commit 6bc7f023ff
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
salt/suricata/suricata_config.map.jinja
View File

@@ -1,6 +1,5 @@
{% import_yaml 'suricata/defaults.yaml' as suricata_defaults with context %} {% import_yaml 'suricata/defaults.yaml' as suricata_defaults with context %}
{% import_yaml 'suricata/suricata_meta.yaml' as suricata_meta with context %} {% import_yaml 'suricata/suricata_meta.yaml' as suricata_meta with context %}
{% from 'suricata/threading.map.jinja' import cpu_affinity with context %}
{% from 'suricata/afpacket.map.jinja' import afpacket %} {% from 'suricata/afpacket.map.jinja' import afpacket %}
{% set suricata_pillar = salt['pillar.get']('suricata:config', {}) %} {% set suricata_pillar = salt['pillar.get']('suricata:config', {}) %}
{% set default_evelog_index = [] %} {% set default_evelog_index = [] %}
@@ -50,8 +49,11 @@ HOME_NET: "[{{salt['pillar.get']('static:hnmaster', '')}}]"
{% endif %} {% endif %}
{% do suricata_defaults.suricata.config.update(default_packet_size) %} {% do suricata_defaults.suricata.config.update(default_packet_size) %}
{% do suricata_defaults.suricata.config.threading.update(cpu_affinity) %}
{% do suricata_defaults.suricata.config.update(afpacket) %} {% do suricata_defaults.suricata.config.update(afpacket) %}
{% do suricata_defaults.suricata.config.vars['address-groups'].update(homenet) %} {% do suricata_defaults.suricata.config.vars['address-groups'].update(homenet) %}
{% if salt['pillar.get']('sensor:suriprocs', salt['pillar.get']('sensor:suripins', {})) %}
{% from 'suricata/threading.map.jinja' import cpu_affinity with context %}
{% do suricata_defaults.suricata.config.threading.update(cpu_affinity) %}
{% endif %}
{% do salt['defaults.merge'](suricata_defaults.suricata.config, suricata_pillar, in_place=True) %} {% do salt['defaults.merge'](suricata_defaults.suricata.config, suricata_pillar, in_place=True) %}