From 7ade618870185e01d0edeb879c83c61b0ee1b377 Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Tue, 6 Mar 2018 14:16:47 -0500
Subject: [PATCH] Bro Salt Module - Full Pillar Node Automation

---
 salt/bro/files/node.cfg | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/salt/bro/files/node.cfg b/salt/bro/files/node.cfg
index dc7ee3094..ef0c59b91 100644
--- a/salt/bro/files/node.cfg
+++ b/salt/bro/files/node.cfg
@@ -1,7 +1,8 @@
 {%- set interface = salt['pillar.get']('sensor:interface', '') %}
-{%- if salt['pillar.get']('sensor:bro_pins')|length > 1 %}
-{%- if salt['pillar.get']('sensor:bro_proxies'|length > 1) %}
-  {%- set proxies =  salt['pillar.get']('sensor:bro_proxies') %}
+
+{%- if salt['pillar.get']('sensor:bro_pins') %}
+{%- if salt['pillar.get']('sensor:bro_proxies') %}
+  {%- set proxies =  salt['pillar.get']('sensor:bro_proxies', '1') %}
 {%- else %}
   {%- set proxies = (salt['pillar.get']('sensor:bro_pins')|length/10)|round(0, 'ceil')|int %}
 {%- endif %}
@@ -9,11 +10,11 @@
 type=manager
 host=localhost
 
-{%- for demproxies in range(proxies) %}
+{% for demproxies in range(proxies) %}
 [proxy-{{ demproxies }}]
 type=proxy
 host=localhost
-{%- endfor %}
+{% endfor %}
 
 [worker-1]
 type=worker
@@ -21,12 +22,12 @@ host=localhost
 interface=af_packet::{{ interface }}
 lb_method=custom
 
-{%- if salt['pillar.get']('sensor:bro_lbprocs'|length > 1) %}
-lb_procs={{ lbprocs }}
+{%- if salt['pillar.get']('sensor:bro_lbprocs') %}
+lb_procs={{ salt['pillar.get']('sensor:bro_lbprocs', '45') }}
 {%- else %}
 lb_procs={{ salt['pillar.get']('sensor:bro_pins')|length }}
 {%- endif %}
-{%- if salt['pillar.get']('sensor:bro_pins'|length > 1) %}
+{%- if salt['pillar.get']('sensor:bro_pins') %}
 pin_cpus={{ salt['pillar.get']('sensor:bro_pins')|join(", ") }}
 {%- endif %}
 af_packet_fanout_id=23