From efc8621524e50f83a071bd03e15d0e5b1aca254b Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Tue, 15 Nov 2022 10:31:37 -0500
Subject: [PATCH] Fix some settings and add all defaults

---
 salt/docker/defaults.yaml    | 48 ++++++++++++++++++++++++++++++++----
 salt/docker/docker.map.jinja |  2 +-
 2 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/salt/docker/defaults.yaml b/salt/docker/defaults.yaml
index ae41918e9..fdfb6ff70 100644
--- a/salt/docker/defaults.yaml
+++ b/salt/docker/defaults.yaml
@@ -1,8 +1,46 @@
 docker:
-  bip: 172.17.0.1
-  range: 172.17.0.0/24
-  sosrange: 172.17.1.0/24
-  sosbip: 172.17.1.1
+  bip: '172.17.0.1'
+  range: '172.17.0.0/24'
+  sosrange: '172.17.1.0/24'
+  sosbip: '172.17.1.1'
   containers:
+    'registry':
+      final_octet: 20
+    'so-elastic-agent':
+      final_octet: 21
     'so-elasticsearch':
-      final_octet: 22
\ No newline at end of file
+      final_octet: 22
+    'so-filebeat':
+      final_octet: 23
+    'so-grafana':
+      final_octet: 24
+    'so-idh':
+      final_octet: 25
+    'so-influxdb':
+      final_octet: 26
+    'so-kibana':
+      final_octet: 27
+    'so-kratos':
+      final_octet: 28
+    'so-logstash':
+      final_octet: 29
+    'so-mysql':
+      final_octet: 30
+    'so-nginx':
+      final_octet: 31
+    'so-playbook':
+      final_octet: 32
+    'so-redis':
+      final_octet: 33
+    'so-soc':
+      final_octet: 34
+    'so-soctopus':
+      final_octet: 35
+    'so-strelka-backend':
+      final_octet: 36
+    'so-strelka-filestream':
+      final_octet: 37
+    'so-strelka-frontend':
+      final_octet: 38
+    'so-strelka-manager':
+      final_octet: 39
diff --git a/salt/docker/docker.map.jinja b/salt/docker/docker.map.jinja
index 61416f7a4..7046fc196 100644
--- a/salt/docker/docker.map.jinja
+++ b/salt/docker/docker.map.jinja
@@ -1,6 +1,6 @@
 {% import_yaml 'docker/defaults.yaml' as DOCKERDEFAULTS %}
 {% set DOCKER = salt['pillar.get']('docker', DOCKERDEFAULTS.docker, merge=True) %}
-{% set RANGESPLIT = DOCKER.range.split('.') %}
+{% set RANGESPLIT = DOCKER.sosrange.split('.') %}
 {% set FIRSTTHREE = RANGESPLIT[0] ~ '.' ~ RANGESPLIT[1] ~ '.' ~ RANGESPLIT[2] ~ '.' %}
 
 {% for container, vals in DOCKER.containers.items() %}