From bf4ac0c2dd4e9ff00c4b2f8591525fbc569e074d Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Thu, 18 May 2023 17:08:39 -0400
Subject: [PATCH] Allow additional docker parameters

---
 salt/docker/defaults.yaml | 15 +++++++++++++++
 salt/pcap/enabled.sls     |  4 +++-
 salt/telegraf/enabled.sls |  2 ++
 salt/zeek/enabled.sls     |  2 ++
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/salt/docker/defaults.yaml b/salt/docker/defaults.yaml
index d94918fb3..c7f61762b 100644
--- a/salt/docker/defaults.yaml
+++ b/salt/docker/defaults.yaml
@@ -177,4 +177,19 @@ docker:
       final_octet: 45
       custom_bind_mounts: []
       extra_hosts: []
+      extra_env: []
+    'so-telegraf':
+      final_octet: 99
+      custom_bind_mounts: []
+      extra_hosts: []
+      extra_env: []
+    'so-pcap':
+      final_octet: 99
+      custom_bind_mounts: []
+      extra_hosts: []
+      extra_env: []
+    'so-zeek':
+      final_octet: 99
+      custom_bind_mounts: []
+      extra_hosts: []
       extra_env: []
\ No newline at end of file
diff --git a/salt/pcap/enabled.sls b/salt/pcap/enabled.sls
index ea86e8192..b7b030516 100644
--- a/salt/pcap/enabled.sls
+++ b/salt/pcap/enabled.sls
@@ -5,7 +5,9 @@
 
 {% from 'allowed_states.map.jinja' import allowed_states %}
 {% if sls.split('.')[0] in allowed_states %}
-{% from 'vars/globals.map.jinja' import GLOBALS %}
+{%   from 'vars/globals.map.jinja' import GLOBALS %}
+{%   from 'docker/docker.map.jinja' import DOCKER %}
+
 
 include:
   - pcap.config
diff --git a/salt/telegraf/enabled.sls b/salt/telegraf/enabled.sls
index 9d8834112..209c85fb0 100644
--- a/salt/telegraf/enabled.sls
+++ b/salt/telegraf/enabled.sls
@@ -6,6 +6,8 @@
 {% from 'allowed_states.map.jinja' import allowed_states %}
 {% if sls.split('.')[0] in allowed_states %}
 {%   from 'vars/globals.map.jinja' import GLOBALS %}
+{%   from 'docker/docker.map.jinja' import DOCKER %}
+
 
 include:
   - telegraf.config
diff --git a/salt/zeek/enabled.sls b/salt/zeek/enabled.sls
index 7f8c23655..7d444ff43 100644
--- a/salt/zeek/enabled.sls
+++ b/salt/zeek/enabled.sls
@@ -6,6 +6,8 @@
 {% from 'allowed_states.map.jinja' import allowed_states %}
 {% if sls.split('.')[0] in allowed_states %}
 {%   from 'vars/globals.map.jinja' import GLOBALS %}
+{%   from 'docker/docker.map.jinja' import DOCKER %}
+
 
 include:
   - zeek.config