From a753a3704cf9735860df5bf49fe141274310c108 Mon Sep 17 00:00:00 2001
From: Mike Reeves <luke@geekempire.com>
Date: Wed, 3 Oct 2018 10:14:59 -0400
Subject: [PATCH] Suricata Module - Make thread count automagic

---
 salt/suricata/files/suricata.yaml |  8 ++++----
 so-setup-network.sh               | 14 +++++++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/salt/suricata/files/suricata.yaml b/salt/suricata/files/suricata.yaml
index 4172a034a..fb3996b96 100644
--- a/salt/suricata/files/suricata.yaml
+++ b/salt/suricata/files/suricata.yaml
@@ -1344,15 +1344,15 @@ threading:
   {%- if salt['pillar.get']('sensor:suripins') %}
   cpu-affinity:
     - management-cpu-set:
-        cpu: [ {{ salt['pillar.get']('sensor:suripins') }} ]  # include only these cpus in affinity settings
+        cpu: [ {{ salt['pillar.get']('sensor:suripins')|join(",") }} ]  # include only these cpus in affinity settings
     - receive-cpu-set:
-        cpu: [ {{ salt['pillar.get']('sensor:suripins') }} ]  # include only these cpus in affinity settings
+        cpu: [ {{ salt['pillar.get']('sensor:suripins')|join(",") }} ]  # include only these cpus in affinity settings
     - worker-cpu-set:
-        cpu: [ {{ salt['pillar.get']('sensor:suripins') }} ]
+        cpu: [ {{ salt['pillar.get']('sensor:suripins')|join(",") }} ]
         mode: "exclusive"
         # Use explicitely 3 threads and don't compute number by using
         # detect-thread-ratio variable:
-        threads: {{ salt['pillar.get']('sensor:surithreads') }}
+        threads: {{ salt['pillar.get']('sensor:suripins')|length }}
         prio:
           default: "high"
   {% endif %}
diff --git a/so-setup-network.sh b/so-setup-network.sh
index 7a0897732..ad698214e 100644
--- a/so-setup-network.sh
+++ b/so-setup-network.sh
@@ -580,12 +580,16 @@ sensor_pillar() {
       PIN=$(echo $PIN |  cut -d\" -f2)
     echo "    - $PIN" >> $TMP/$HOSTNAME.sls
     done
-    SP=("${SURIPINS[@]//\"/}")
-    SPINS=${SP// /,}
-    SCOUNT=${#SURIPINS[@]}
+    for SPIN in $SURIPINS; do
+      SPIN=$(echo $SPIN |  cut -d\" -f2)
+    echo "    - $SPIN" >> $TMP/$HOSTNAME.sls
+    done
+    #SP=("${SURIPINS[@]//\"/}")
+    #SPINS=${SP// /,}
+    #SCOUNT=${#SURIPINS[@]}
 
-    echo "  suripins: $SPINS" >> $TMP/$HOSTNAME.sls
-    echo "  surithreads: $SCOUNT"
+    #echo "  suripins: $SPINS" >> $TMP/$HOSTNAME.sls
+    #echo "  surithreads: $SCOUNT"
   else
     echo "  bro_lbprocs: $BASICBRO" >> $TMP/$HOSTNAME.sls
     echo "  suriprocs: $BASICSURI" >> $TMP/$HOSTNAME.sls