diff --git a/HOTFIX b/HOTFIX index e69de29bb..6fe743c83 100644 --- a/HOTFIX +++ b/HOTFIX @@ -0,0 +1 @@ +20260311 diff --git a/salt/suricata/map.jinja b/salt/suricata/map.jinja index 3d378b69d..781935fe9 100644 --- a/salt/suricata/map.jinja +++ b/salt/suricata/map.jinja @@ -16,7 +16,13 @@ {% do SURICATAMERGED.config.outputs['pcap-log'].update({'bpf-filter': PCAPBPF|join(" ")}) %} {% endif %} -{% do SURICATAMERGED.config.outputs['pcap-log'].update({'enabled': 'yes'}) %} +{% set PCAP = salt['pillar.get']('pcap', {'enabled': false}) %} +{% if PCAP.enabled and GLOBALS.role != 'so-import'%} +{% do SURICATAMERGED.config.outputs['pcap-log'].update({'enabled': 'yes'}) %} +{% else %} +{% do SURICATAMERGED.config.outputs['pcap-log'].update({'enabled': 'no'}) %} +{% endif %} + {# move the items in suricata.pcap into suricata.config.outputs.pcap-log. these items were placed under suricata.config for ease of access in SOC #} {% do SURICATAMERGED.config.outputs['pcap-log'].update({'compression': SURICATAMERGED.pcap.compression}) %} {% do SURICATAMERGED.config.outputs['pcap-log'].update({'lz4-checksum': SURICATAMERGED.pcap['lz4-checksum']}) %}