Compare commits

..

4 Commits

Author SHA1 Message Date
Josh Patterson
6472c610d0 fix enable/disable suricata pcap
suricata pcap can now be enabled/disabled through pcap:enabled grid config / pillar
2026-03-10 11:01:11 -04:00
Mike Reeves
179c1ea7f7 Merge pull request #15570 from Security-Onion-Solutions/TOoSmOotH-patch-1
Add date to HOTFIX file
2026-03-10 10:20:16 -04:00
Mike Reeves
db964cad21 Add date to HOTFIX file 2026-03-10 10:18:25 -04:00
Mike Reeves
42bc657b60 Merge pull request #15542 from Security-Onion-Solutions/2.4/dev
2.4.210
2026-03-02 15:03:21 -05:00
2 changed files with 8 additions and 1 deletions

1
HOTFIX
View File

@@ -0,0 +1 @@
20260311

View File

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