From 3286d55ef270bc30f7c5c5ea7bfeb79e11cb064c Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Thu, 15 Sep 2022 13:46:14 -0400
Subject: [PATCH] Modify Steno Config

---
 salt/pcap/files/config | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/salt/pcap/files/config b/salt/pcap/files/config
index 24f9a579e..d6046e0bb 100644
--- a/salt/pcap/files/config
+++ b/salt/pcap/files/config
@@ -1,19 +1,12 @@
-{%- set INTERFACE = salt['pillar.get']('sensor:interface', 'bond0') %}
-{%- set DISKFREEPERCENTAGE = salt['pillar.get']('steno:diskfreepercentage', 10) %}
-{%- set MAXFILES = salt['pillar.get']('steno:maxfiles', 30000) %}
-{%- set BLOCKS = salt['pillar.get']('steno:blocks', 2048) %}
-{%- set FILEMB = salt['pillar.get']('steno:filemb', 4096) %}
-{%- set AIOPS = salt['pillar.get']('steno:aiops', 128) %} 
-{%- set THREADS = salt['pillar.get']('steno:threads', 1) %}
+{%- set INTERFACE = salt['pillar.get']('sensor:interface') %}
+{%- set DISKFREEPERCENTAGE = salt['pillar.get']('pcap:config:diskfreepercentage') %}
+{%- set MAXFILES = salt['pillar.get']('pcap:config:maxdirectoryfiles') %}
+{%- set BLOCKS = salt['pillar.get']('pcap:config:blocks') %}
+{%- set FILEMB = salt['pillar.get']('pcap:config:preallocate_file_mb') %}
+{%- set AIOPS = salt['pillar.get']('pcap:config:aiops') %} 
 {
   "Threads": [
     { "PacketsDirectory": "/nsm/pcap", "IndexDirectory": "/nsm/pcapindex", "MaxDirectoryFiles": {{ MAXFILES }}, "DiskFreePercentage": {{ DISKFREEPERCENTAGE }} }
-  {%- if THREADS > 1 %}
-      {%- for i in range(2,THREADS+1) %}
-    , { "PacketsDirectory": "/nsm/pcap" , "IndexDirectory": "/nsm/pcapindex", "MaxDirectoryFiles": {{ MAXFILES }}, "DiskFreePercentage": {{ DISKFREEPERCENTAGE }} }
-      {%- endfor %}
-  {%- endif %}
-  ]
   , "StenotypePath": "/usr/bin/stenotype"
   , "Interface": "{{ INTERFACE }}"
   , "Port": 1234