Remove version 3.0.0 from discussion template

.github/workflows/pythontest.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.14"]
+        python-version: ["3.13"]
         python-code-path: ["salt/sensoroni/files/analyzers", "salt/manager/tools/sbin"]
 
     steps:

salt/_modules/needs_restarting.py

@@ -1,14 +1,24 @@
+from os import path
 import subprocess
 
 def check():
 
+  osfam = __grains__['os_family']
   retval = 'False'
 
-  cmd = 'needs-restarting -r > /dev/null 2>&1'
+  if osfam == 'Debian':
+    if path.exists('/var/run/reboot-required'):
+      retval = 'True'
 
-  try:
-    needs_restarting = subprocess.check_call(cmd, shell=True)
-  except subprocess.CalledProcessError:
-    retval = 'True'
+  elif osfam == 'RedHat':
+    cmd = 'needs-restarting -r > /dev/null 2>&1'
+    
+    try:
+      needs_restarting = subprocess.check_call(cmd, shell=True)
+    except subprocess.CalledProcessError:
+      retval = 'True'
+
+  else:
+    retval = 'Unsupported OS: %s' % os
 
   return retval

salt/backup/soc_backup.yaml

@@ -1,10 +1,10 @@
 backup:
   locations:
     description: List of locations to back up to the destination.
-    helpLink: backup
+    helpLink: backup.html
     global: True
   destination:
     description: Directory to store the configuration backups in.
-    helpLink: backup
+    helpLink: backup.html
     global: True
     

salt/bpf/soc_bpf.yaml

@@ -3,14 +3,14 @@ bpf:
     description: List of BPF filters to apply to the PCAP engine.
     multiline: True
     forcedType: "[]string"
-    helpLink: bpf
+    helpLink: bpf.html
   suricata:
     description: List of BPF filters to apply to Suricata. This will apply to alerts and, if enabled, to metadata and PCAP logs generated by Suricata.
     multiline: True
     forcedType: "[]string"
-    helpLink: bpf
+    helpLink: bpf.html
   zeek:
     description: List of BPF filters to apply to Zeek.
     multiline: True
     forcedType: "[]string"
-    helpLink: bpf
+    helpLink: bpf.html

salt/ca/trustca.sls

@@ -3,6 +3,8 @@
 # https://securityonion.net/license; you may not use this file except in compliance with the
 # Elastic License 2.0.
 
+{% from 'vars/globals.map.jinja' import GLOBALS %}
+
 include:
   - docker
 
@@ -16,3 +18,9 @@ trusttheca:
     - show_changes: False
     - makedirs: True
 
+{% if GLOBALS.os_family == 'Debian' %}
+symlinkca:
+  file.symlink:
+    - target: /etc/pki/tls/certs/intca.crt
+    - name: /etc/ssl/certs/intca.crt
+{% endif %}

salt/common/files/daemon.json

@@ -0,0 +1,19 @@
+{
+  "registry-mirrors": [
+    "https://:5000"
+  ],
+  "bip": "172.17.0.1/24",
+  "default-address-pools": [
+    {
+      "base": "172.17.0.0/24",
+      "size": 24
+    }
+  ],
+  "default-ulimits": {
+      "nofile": {
+        "Name": "nofile",
+        "Soft": 1048576,
+        "Hard": 1048576
+      }
+  }
+}

salt/common/init.sls

@@ -20,6 +20,11 @@ kernel.printk:
   sysctl.present:
     - value: "3 4 1 3"
 
+# Remove variables.txt from /tmp - This is temp
+rmvariablesfile:
+  file.absent:
+    - name: /tmp/variables.txt
+
 # Add socore Group
 socoregroup:
   group.present:
@@ -144,6 +149,28 @@ common_sbin_jinja:
       - so-import-pcap
 {% endif %}
 
+{% if GLOBALS.role == 'so-heavynode' %}
+remove_so-pcap-import_heavynode:
+  file.absent:
+    - name: /usr/sbin/so-pcap-import
+
+remove_so-import-pcap_heavynode:
+  file.absent:
+    - name: /usr/sbin/so-import-pcap
+{% endif %}
+
+{% if not GLOBALS.is_manager%}
+# prior to 2.4.50 these scripts were in common/tools/sbin on the manager because of soup and distributed to non managers
+# these two states remove the scripts from non manager nodes
+remove_soup:
+  file.absent:
+    - name: /usr/sbin/soup
+
+remove_so-firewall:
+  file.absent:
+    - name: /usr/sbin/so-firewall
+{% endif %}
+
 so-status_script:
   file.managed:
     - name: /usr/sbin/so-status

salt/common/packages.sls

@@ -1,5 +1,52 @@
 # we cannot import GLOBALS from vars/globals.map.jinja in this state since it is called in setup.virt.init
 # since it is early in setup of a new VM, the pillars imported in GLOBALS are not yet defined
+{% if grains.os_family == 'Debian' %}
+commonpkgs:
+  pkg.installed:
+    - skip_suggestions: True
+    - pkgs:
+      - apache2-utils
+      - wget
+      - ntpdate
+      - jq
+      - curl
+      - ca-certificates
+      - software-properties-common
+      - apt-transport-https
+      - openssl
+      - netcat-openbsd
+      - sqlite3
+      - libssl-dev
+      - procps
+      - python3-dateutil
+      - python3-docker
+      - python3-packaging
+      - python3-lxml
+      - git
+      - rsync
+      - vim
+      - tar
+      - unzip
+      - bc
+      {% if grains.oscodename != 'focal' %}
+      - python3-rich
+      {% endif %}
+
+{%     if grains.oscodename == 'focal' %}
+# since Ubuntu requires and internet connection we can use pip to install modules
+python3-pip:
+  pkg.installed
+
+python-rich:
+  pip.installed:
+    - name: rich
+    - target: /usr/local/lib/python3.8/dist-packages/
+    - require:
+      - pkg: python3-pip
+{%     endif %}
+{% endif %}
+
+{% if grains.os_family == 'RedHat' %}
 
 remove_mariadb:
   pkg.removed:
@@ -37,3 +84,5 @@ commonpkgs:
       - unzip
       - wget
       - yum-utils
+
+{% endif %}

salt/common/soup_scripts.sls

@@ -11,6 +11,14 @@
 {%   endif %}
 {%   set SOVERSION = salt['file.read']('/etc/soversion').strip() %}
 
+remove_common_soup:
+  file.absent:
+    - name: /opt/so/saltstack/default/salt/common/tools/sbin/soup
+
+remove_common_so-firewall:
+  file.absent:
+    - name: /opt/so/saltstack/default/salt/common/tools/sbin/so-firewall
+
 # This section is used to put the scripts in place in the Salt file system
 # in case a state run tries to overwrite what we do in the next section.
 copy_so-common_common_tools_sbin:

salt/common/tools/sbin/so-common

@@ -349,16 +349,21 @@ get_random_value() {
 }
 
 gpg_rpm_import() {
-	if [[ "$WHATWOULDYOUSAYYAHDOHERE" == "setup" ]]; then
-		local RPMKEYSLOC="../salt/repo/client/files/$OS/keys"
-	else
-		local RPMKEYSLOC="$UPDATE_DIR/salt/repo/client/files/$OS/keys"
+	if [[ $is_oracle ]]; then
+	    if [[ "$WHATWOULDYOUSAYYAHDOHERE" == "setup" ]]; then
+	        local RPMKEYSLOC="../salt/repo/client/files/$OS/keys"
+	    else
+	        local RPMKEYSLOC="$UPDATE_DIR/salt/repo/client/files/$OS/keys"
+	    fi
+		RPMKEYS=('RPM-GPG-KEY-oracle' 'RPM-GPG-KEY-EPEL-9' 'SALT-PROJECT-GPG-PUBKEY-2023.pub' 'docker.pub' 'securityonion.pub')
+		for RPMKEY in "${RPMKEYS[@]}"; do
+    	        rpm --import $RPMKEYSLOC/$RPMKEY
+	        echo "Imported $RPMKEY"
+	    done
+	elif [[ $is_rpm ]]; then
+		echo "Importing the security onion GPG key"
+		rpm --import ../salt/repo/client/files/oracle/keys/securityonion.pub
 	fi
-	RPMKEYS=('RPM-GPG-KEY-oracle' 'RPM-GPG-KEY-EPEL-9' 'SALT-PROJECT-GPG-PUBKEY-2023.pub' 'docker.pub' 'securityonion.pub')
-	for RPMKEY in "${RPMKEYS[@]}"; do
-		rpm --import $RPMKEYSLOC/$RPMKEY
-		echo "Imported $RPMKEY"
-	done
 }
 
 header() {
@@ -545,22 +550,6 @@ retry() {
         return $exitcode
 }
 
-rollover_index() {
-  idx=$1
-  exists=$(so-elasticsearch-query $idx -o /dev/null -w "%{http_code}")
-  if [[ $exists -eq 200 ]]; then
-    rollover=$(so-elasticsearch-query $idx/_rollover -o /dev/null -w "%{http_code}" -XPOST)
-
-    if [[ $rollover -eq 200 ]]; then
-      echo "Successfully triggered rollover for $idx..."
-    else
-      echo "Could not trigger rollover for $idx..."
-    fi
-  else
-    echo "Could not find index $idx..."
-  fi
-}
-
 run_check_net_err() {
 	local cmd=$1
 	local err_msg=${2:-"Unknown error occured, please check /root/$WHATWOULDYOUSAYYAHDOHERE.log for details."} # Really need to rename that variable
@@ -626,19 +615,69 @@ salt_minion_count() {
 }
 
 set_os() {
-	if [ -f /etc/redhat-release ] && grep -q "Red Hat Enterprise Linux release 9" /etc/redhat-release && [ -f /etc/oracle-release ]; then
-		OS=oracle
-		OSVER=9
-		is_oracle=true
-		is_rpm=true
+	if [ -f /etc/redhat-release ]; then
+		if grep -q "Rocky Linux release 9" /etc/redhat-release; then
+			OS=rocky
+			OSVER=9
+			is_rocky=true
+			is_rpm=true
+		elif grep -q "CentOS Stream release 9" /etc/redhat-release; then
+			OS=centos
+			OSVER=9
+			is_centos=true
+			is_rpm=true
+		elif grep -q "AlmaLinux release 9" /etc/redhat-release; then
+			OS=alma
+			OSVER=9
+			is_alma=true
+			is_rpm=true
+		elif grep -q "Red Hat Enterprise Linux release 9" /etc/redhat-release; then
+			if [ -f /etc/oracle-release ]; then
+				OS=oracle
+				OSVER=9
+				is_oracle=true
+				is_rpm=true
+			else
+				OS=rhel
+				OSVER=9
+				is_rhel=true
+				is_rpm=true
+			fi
+		fi
+		cron_service_name="crond"
+	elif [ -f /etc/os-release ]; then
+		if grep -q "UBUNTU_CODENAME=focal" /etc/os-release; then
+			OSVER=focal
+			UBVER=20.04
+			OS=ubuntu
+			is_ubuntu=true
+			is_deb=true
+		elif grep -q "UBUNTU_CODENAME=jammy" /etc/os-release; then
+			OSVER=jammy
+			UBVER=22.04
+			OS=ubuntu
+			is_ubuntu=true
+			is_deb=true
+		elif grep -q "VERSION_CODENAME=bookworm" /etc/os-release; then
+			OSVER=bookworm
+			DEBVER=12
+			is_debian=true
+			OS=debian
+			is_deb=true
+		fi
+		cron_service_name="cron"
 	fi
-	cron_service_name="crond"
 }
 
 set_minionid() {
 	MINIONID=$(lookup_grain id)
 }
 
+set_palette() {
+	if [[ $is_deb ]]; then
+	    update-alternatives --set newt-palette /etc/newt/palette.original
+    fi
+}
 
 set_version() {
 	CURRENTVERSION=0.0.0

salt/common/tools/sbin/so-log-check

@@ -131,7 +131,6 @@ if [[ $EXCLUDE_STARTUP_ERRORS == 'Y' ]]; then
     EXCLUDED_ERRORS="$EXCLUDED_ERRORS|not configured for GeoIP"     # SO does not bundle the maxminddb with Zeek
     EXCLUDED_ERRORS="$EXCLUDED_ERRORS|HTTP 404: Not Found"          # Salt loops until Kratos returns 200, during startup Kratos may not be ready
     EXCLUDED_ERRORS="$EXCLUDED_ERRORS|Cancelling deferred write event maybeFenceReplicas because the event queue is now closed" # Kafka controller log during shutdown/restart
-    EXCLUDED_ERRORS="$EXCLUDED_ERRORS|Redis may have been restarted" # Redis likely restarted by salt
 fi
 
 if [[ $EXCLUDE_FALSE_POSITIVE_ERRORS == 'Y' ]]; then

salt/curator/disabled.sls

@@ -0,0 +1,34 @@
+# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one
+# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at
+# https://securityonion.net/license; you may not use this file except in compliance with the
+# Elastic License 2.0.
+
+so-curator:
+  docker_container.absent:
+    - force: True
+
+so-curator_so-status.disabled:
+  file.line:
+    - name: /opt/so/conf/so-status/so-status.conf
+    - match: ^so-curator$
+    - mode: delete
+
+so-curator-cluster-close:
+  cron.absent:
+    - identifier: so-curator-cluster-close
+
+so-curator-cluster-delete:
+  cron.absent:
+    - identifier: so-curator-cluster-delete
+
+delete_curator_configuration:
+  file.absent:
+    - name: /opt/so/conf/curator
+    - recurse: True
+
+{% set files = salt.file.find(path='/usr/sbin', name='so-curator*') %}
+{% if files|length > 0 %}
+delete_curator_scripts:
+  file.absent:
+    - names: {{files|yaml}}
+{% endif %}

salt/docker/defaults.yaml

@@ -1,10 +1,6 @@
 docker:
   range: '172.17.1.0/24'
   gateway: '172.17.1.1'
-  ulimits:
-    - name: nofile
-      soft: 1048576
-      hard: 1048576
   containers:
     'so-dockerregistry':
       final_octet: 20
@@ -13,7 +9,6 @@ docker:
       custom_bind_mounts: []
       extra_hosts: []
       extra_env: []
-      ulimits: []
     'so-elastic-fleet':
       final_octet: 21
       port_bindings:
@@ -21,7 +16,6 @@ docker:
       custom_bind_mounts: []
       extra_hosts: []
       extra_env: []
-      ulimits: []
     'so-elasticsearch':
       final_octet: 22
       port_bindings:
@@ -30,16 +24,6 @@ docker:
       custom_bind_mounts: []
       extra_hosts: []
       extra_env: []
-      ulimits:
-        - name: memlock
-          soft: -1
-          hard: -1
-        - name: nofile
-          soft: 65536
-          hard: 65536
-        - name: nproc
-          soft: 4096
-          hard: 4096
     'so-influxdb':
       final_octet: 26
       port_bindings:
@@ -47,7 +31,6 @@ docker:
       custom_bind_mounts: []
       extra_hosts: []
       extra_env: []
-      ulimits: []
     'so-kibana':
       final_octet: 27
       port_bindings:
@@ -55,7 +38,6 @@ docker:
       custom_bind_mounts: []
       extra_hosts: []
       extra_env: []
-      ulimits: []
     'so-kratos':
       final_octet: 28
       port_bindings:
@@ -64,7 +46,6 @@ docker:
       custom_bind_mounts: []
       extra_hosts: []
       extra_env: []
-      ulimits: []
     'so-hydra':
       final_octet: 30
       port_bindings:
@@ -73,7 +54,6 @@ docker:
       custom_bind_mounts: []
       extra_hosts: []
       extra_env: []
-      ulimits: []
     'so-logstash':
       final_octet: 29
       port_bindings:
@@ -90,7 +70,6 @@ docker:
       custom_bind_mounts: []
       extra_hosts: []
       extra_env: []
-      ulimits: []
     'so-nginx':
       final_octet: 31
       port_bindings:
@@ -102,7 +81,6 @@ docker:
       custom_bind_mounts: []
       extra_hosts: []
       extra_env: []
-      ulimits: []
     'so-nginx-fleet-node':
       final_octet: 31
       port_bindings:
@@ -110,7 +88,6 @@ docker:
       custom_bind_mounts: []
       extra_hosts: []
       extra_env: []
-      ulimits: []
     'so-redis':
       final_octet: 33
       port_bindings:
@@ -119,13 +96,11 @@ docker:
       custom_bind_mounts: []
       extra_hosts: []
       extra_env: []
-      ulimits: []
     'so-sensoroni':
       final_octet: 99
       custom_bind_mounts: []
       extra_hosts: []
       extra_env: []
-      ulimits: []
     'so-soc':
       final_octet: 34
       port_bindings:
@@ -133,19 +108,16 @@ docker:
       custom_bind_mounts: []
       extra_hosts: []
       extra_env: []
-      ulimits: []
     'so-strelka-backend':
       final_octet: 36
       custom_bind_mounts: []
       extra_hosts: []
       extra_env: []
-      ulimits: []
     'so-strelka-filestream':
       final_octet: 37
       custom_bind_mounts: []
       extra_hosts: []
       extra_env: []
-      ulimits: []
     'so-strelka-frontend':
       final_octet: 38
       port_bindings:
@@ -153,13 +125,11 @@ docker:
       custom_bind_mounts: []
       extra_hosts: []
       extra_env: []
-      ulimits: []
     'so-strelka-manager':
       final_octet: 39
       custom_bind_mounts: []
       extra_hosts: []
       extra_env: []
-      ulimits: []
     'so-strelka-gatekeeper':
       final_octet: 40
       port_bindings:
@@ -167,7 +137,6 @@ docker:
       custom_bind_mounts: []
       extra_hosts: []
       extra_env: []
-      ulimits: []
     'so-strelka-coordinator':
       final_octet: 41
       port_bindings:
@@ -175,13 +144,11 @@ docker:
       custom_bind_mounts: []
       extra_hosts: []
       extra_env: []
-      ulimits: []
     'so-elastalert':
       final_octet: 42
       custom_bind_mounts: []
       extra_hosts: []
       extra_env: []
-      ulimits: []
     'so-elastic-fleet-package-registry':
       final_octet: 44
       port_bindings:
@@ -189,13 +156,11 @@ docker:
       custom_bind_mounts: []
       extra_hosts: []
       extra_env: []
-      ulimits: []
     'so-idh':
       final_octet: 45
       custom_bind_mounts: []
       extra_hosts: []
       extra_env: []
-      ulimits: []
     'so-elastic-agent':
       final_octet: 46
       port_bindings:
@@ -204,28 +169,23 @@ docker:
       custom_bind_mounts: []
       extra_hosts: []
       extra_env: []
-      ulimits: []
     'so-telegraf':
       final_octet: 99
       custom_bind_mounts: []
       extra_hosts: []
       extra_env: []
-      ulimits: []
     'so-suricata':
       final_octet: 99
       custom_bind_mounts: []
       extra_hosts: []
       extra_env: []
-      ulimits: []
+      ulimits:
+        - memlock=524288000
     'so-zeek':
       final_octet: 99
       custom_bind_mounts: []
       extra_hosts: []
       extra_env: []
-      ulimits:
-        - name: core
-          soft: 0
-          hard: 0
     'so-kafka':
       final_octet: 88
       port_bindings:
@@ -236,4 +196,3 @@ docker:
       custom_bind_mounts: []
       extra_hosts: []
       extra_env: []
-      ulimits: []

salt/docker/docker.map.jinja

@@ -1,8 +1,8 @@
 {% import_yaml 'docker/defaults.yaml' as DOCKERDEFAULTS %}
-{% set DOCKERMERGED = salt['pillar.get']('docker', DOCKERDEFAULTS.docker, merge=True) %}
-{% set RANGESPLIT = DOCKERMERGED.range.split('.') %}
+{% set DOCKER = salt['pillar.get']('docker', DOCKERDEFAULTS.docker, merge=True) %}
+{% set RANGESPLIT = DOCKER.range.split('.') %}
 {% set FIRSTTHREE = RANGESPLIT[0] ~ '.' ~ RANGESPLIT[1] ~ '.' ~ RANGESPLIT[2] ~ '.' %}
 
-{% for container, vals in DOCKERMERGED.containers.items() %}
-{%   do DOCKERMERGED.containers[container].update({'ip': FIRSTTHREE ~ DOCKERMERGED.containers[container].final_octet}) %}
+{% for container, vals in DOCKER.containers.items() %}
+{%   do DOCKER.containers[container].update({'ip': FIRSTTHREE ~ DOCKER.containers[container].final_octet}) %}
 {% endfor %}

salt/docker/files/daemon.json.jinja

@@ -1,24 +0,0 @@
-{% from 'docker/docker.map.jinja' import DOCKERMERGED -%}
-{
-  "registry-mirrors": [
-    "https://:5000"
-  ],
-  "bip": "172.17.0.1/24",
-  "default-address-pools": [
-    {
-      "base": "172.17.0.0/24",
-      "size": 24
-    }
-  ]
-{%- if DOCKERMERGED.ulimits %},
-  "default-ulimits": {
-{%-   for ULIMIT in DOCKERMERGED.ulimits %}
-      "{{ ULIMIT.name }}": {
-        "Name": "{{ ULIMIT.name }}",
-        "Soft": {{ ULIMIT.soft }},
-        "Hard": {{ ULIMIT.hard }}
-      }{{ "," if not loop.last else "" }}
-{%-   endfor %}
-  }
-{%- endif %}
-}

salt/docker/init.sls

@@ -3,7 +3,7 @@
 # https://securityonion.net/license; you may not use this file except in compliance with the
 # Elastic License 2.0.
 
-{% from 'docker/docker.map.jinja' import DOCKERMERGED %}
+{% from 'docker/docker.map.jinja' import DOCKER %}
 {% from 'vars/globals.map.jinja' import GLOBALS %}
 
 # docker service requires the ca.crt
@@ -15,6 +15,39 @@ dockergroup:
     - name: docker
     - gid: 920
 
+{% if GLOBALS.os_family == 'Debian' %}
+{%    if grains.oscodename == 'bookworm' %}
+dockerheldpackages:
+  pkg.installed:
+    - pkgs:
+      - containerd.io: 2.2.1-1~debian.12~bookworm
+      - docker-ce: 5:29.2.1-1~debian.12~bookworm
+      - docker-ce-cli: 5:29.2.1-1~debian.12~bookworm
+      - docker-ce-rootless-extras: 5:29.2.1-1~debian.12~bookworm
+    - hold: True
+    - update_holds: True
+{%    elif grains.oscodename == 'jammy' %}
+dockerheldpackages:
+  pkg.installed:
+    - pkgs:
+      - containerd.io: 2.2.1-1~ubuntu.22.04~jammy
+      - docker-ce: 5:29.2.1-1~ubuntu.22.04~jammy
+      - docker-ce-cli: 5:29.2.1-1~ubuntu.22.04~jammy
+      - docker-ce-rootless-extras: 5:29.2.1-1~ubuntu.22.04~jammy
+    - hold: True
+    - update_holds: True
+{%    else %}
+dockerheldpackages:
+  pkg.installed:
+    - pkgs:
+      - containerd.io: 1.7.21-1
+      - docker-ce: 5:27.2.0-1~ubuntu.20.04~focal
+      - docker-ce-cli: 5:27.2.0-1~ubuntu.20.04~focal
+      - docker-ce-rootless-extras: 5:27.2.0-1~ubuntu.20.04~focal
+    - hold: True
+    - update_holds: True
+{%   endif %}
+{% else %}
 dockerheldpackages:
   pkg.installed:
     - pkgs:
@@ -24,6 +57,7 @@ dockerheldpackages:
       - docker-ce-rootless-extras: 29.2.1-1.el9
     - hold: True
     - update_holds: True
+{% endif %}
 
 #disable docker from managing iptables
 iptables_disabled:
@@ -41,9 +75,10 @@ dockeretc:
   file.directory:
     - name: /etc/docker
 
+# Manager daemon.json
 docker_daemon:
   file.managed:
-    - source: salt://docker/files/daemon.json.jinja
+    - source: salt://common/files/daemon.json
     - name: /etc/docker/daemon.json
     - template: jinja 
 
@@ -74,8 +109,8 @@ dockerreserveports:
 sos_docker_net:
   docker_network.present:
     - name: sobridge
-    - subnet: {{ DOCKERMERGED.range }}
-    - gateway: {{ DOCKERMERGED.gateway }}
+    - subnet: {{ DOCKER.range }}
+    - gateway: {{ DOCKER.gateway }}
     - options:
         com.docker.network.bridge.name: 'sobridge'
         com.docker.network.driver.mtu: '1500'

salt/docker/soc_docker.yaml

@@ -1,82 +1,44 @@
 docker:
   gateway:
     description: Gateway for the default docker interface.
-    helpLink: docker
+    helpLink: docker.html
     advanced: True
   range:
     description: Default docker IP range for containers.
-    helpLink: docker
-    advanced: True
-  ulimits:
-    description: |
-      Default ulimit settings applied to all containers via the Docker daemon. Each entry specifies a resource name (e.g. nofile, memlock, core, nproc) with soft and hard limits. Individual container ulimits override these defaults. Valid resource names include: cpu, fsize, data, stack, core, rss, nproc, nofile, memlock, as, locks, sigpending, msgqueue, nice, rtprio, rttime.
-    forcedType: "[]{}"
-    syntax: json
-    advanced: True
     helpLink: docker.html
-    uiElements:
-    - field: name
-      label: Resource Name
-      required: True
-      regex: ^(cpu|fsize|data|stack|core|rss|nproc|nofile|memlock|as|locks|sigpending|msgqueue|nice|rtprio|rttime)$
-      regexFailureMessage: You must enter a valid ulimit name (cpu, fsize, data, stack, core, rss, nproc, nofile, memlock, as, locks, sigpending, msgqueue, nice, rtprio, rttime).
-    - field: soft
-      label: Soft Limit
-      forcedType: int
-    - field: hard
-      label: Hard Limit
-      forcedType: int
+    advanced: True
   containers:
     so-dockerregistry: &dockerOptions
       final_octet:
         description: Last octet of the container IP address.
-        helpLink: docker
+        helpLink: docker.html
         readonly: True
         advanced: True
         global: True
       port_bindings:
         description: List of port bindings for the container.
-        helpLink: docker
+        helpLink: docker.html
         advanced: True
         multiline: True
         forcedType: "[]string"
       custom_bind_mounts:
         description: List of custom local volume bindings.
         advanced: True
-        helpLink: docker
+        helpLink: docker.html
         multiline: True
         forcedType: "[]string"
       extra_hosts:
         description: List of additional host entries for the container.
         advanced: True
-        helpLink: docker
+        helpLink: docker.html
         multiline: True
         forcedType: "[]string"
       extra_env:
         description: List of additional ENV entries for the container.
         advanced: True
-        helpLink: docker
+        helpLink: docker.html
         multiline: True
         forcedType: "[]string"
-      ulimits:
-        description: |
-          Ulimit settings for the container. Each entry specifies a resource name (e.g. nofile, memlock, core, nproc) with optional soft and hard limits. Valid resource names include: cpu, fsize, data, stack, core, rss, nproc, nofile, memlock, as, locks, sigpending, msgqueue, nice, rtprio, rttime.
-        advanced: True
-        helpLink: docker.html
-        forcedType: "[]{}"
-        syntax: json
-        uiElements:
-        - field: name
-          label: Resource Name
-          required: True
-          regex: ^(cpu|fsize|data|stack|core|rss|nproc|nofile|memlock|as|locks|sigpending|msgqueue|nice|rtprio|rttime)$
-          regexFailureMessage: You must enter a valid ulimit name (cpu, fsize, data, stack, core, rss, nproc, nofile, memlock, as, locks, sigpending, msgqueue, nice, rtprio, rttime).
-        - field: soft
-          label: Soft Limit
-          forcedType: int
-        - field: hard
-          label: Hard Limit
-          forcedType: int
     so-elastic-fleet: *dockerOptions
     so-elasticsearch: *dockerOptions
     so-influxdb: *dockerOptions
@@ -100,6 +62,42 @@ docker:
     so-idh: *dockerOptions
     so-elastic-agent: *dockerOptions
     so-telegraf: *dockerOptions
-    so-suricata: *dockerOptions
+    so-suricata:
+      final_octet:
+        description: Last octet of the container IP address.
+        helpLink: docker.html
+        readonly: True
+        advanced: True
+        global: True
+      port_bindings:
+        description: List of port bindings for the container.
+        helpLink: docker.html
+        advanced: True
+        multiline: True
+        forcedType: "[]string"
+      custom_bind_mounts:
+        description: List of custom local volume bindings.
+        advanced: True
+        helpLink: docker.html
+        multiline: True
+        forcedType: "[]string"
+      extra_hosts:
+        description: List of additional host entries for the container.
+        advanced: True
+        helpLink: docker.html
+        multiline: True
+        forcedType: "[]string"
+      extra_env:
+        description: List of additional ENV entries for the container.
+        advanced: True
+        helpLink: docker.html
+        multiline: True
+        forcedType: "[]string"
+      ulimits:
+        description: Ulimits for the container, in bytes.
+        advanced: True
+        helpLink: docker.html
+        multiline: True
+        forcedType: "[]string"
     so-zeek: *dockerOptions
     so-kafka: *dockerOptions

salt/elastalert/enabled.sls

@@ -6,7 +6,7 @@
 {% 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 DOCKERMERGED %}
+{%   from 'docker/docker.map.jinja' import DOCKER %}
 
 include:
   - elastalert.config
@@ -24,7 +24,7 @@ so-elastalert:
     - user: so-elastalert
     - networks:
       - sobridge:
-        - ipv4_address: {{ DOCKERMERGED.containers['so-elastalert'].ip }}
+        - ipv4_address: {{ DOCKER.containers['so-elastalert'].ip }}
     - detach: True
     - binds:
       - /opt/so/rules/elastalert:/opt/elastalert/rules/:ro
@@ -33,30 +33,24 @@ so-elastalert:
       - /opt/so/conf/elastalert/predefined/:/opt/elastalert/predefined/:ro
       - /opt/so/conf/elastalert/custom/:/opt/elastalert/custom/:ro
       - /opt/so/conf/elastalert/elastalert_config.yaml:/opt/elastalert/config.yaml:ro
-      {% if DOCKERMERGED.containers['so-elastalert'].custom_bind_mounts %}
-        {% for BIND in DOCKERMERGED.containers['so-elastalert'].custom_bind_mounts %}
+      {% if DOCKER.containers['so-elastalert'].custom_bind_mounts %}
+        {% for BIND in DOCKER.containers['so-elastalert'].custom_bind_mounts %}
       - {{ BIND }}
         {% endfor %}
       {% endif %}
     - extra_hosts:
       - {{ GLOBALS.manager }}:{{ GLOBALS.manager_ip }}
-      {% if DOCKERMERGED.containers['so-elastalert'].extra_hosts %}
-        {% for XTRAHOST in DOCKERMERGED.containers['so-elastalert'].extra_hosts %}
+      {% if DOCKER.containers['so-elastalert'].extra_hosts %}
+        {% for XTRAHOST in DOCKER.containers['so-elastalert'].extra_hosts %}
       - {{ XTRAHOST }}
         {% endfor %}
       {% endif %}
-      {% if DOCKERMERGED.containers['so-elastalert'].extra_env %}
+      {% if DOCKER.containers['so-elastalert'].extra_env %}
     - environment:
-        {% for XTRAENV in DOCKERMERGED.containers['so-elastalert'].extra_env %}
+        {% for XTRAENV in DOCKER.containers['so-elastalert'].extra_env %}
       - {{ XTRAENV }}
         {% endfor %}
       {% endif %}
-    {% if DOCKERMERGED.containers['so-elastalert'].ulimits %}
-    - ulimits:
-    {%   for ULIMIT in DOCKERMERGED.containers['so-elastalert'].ulimits %}
-      - {{ ULIMIT.name }}={{ ULIMIT.soft }}:{{ ULIMIT.hard }}
-    {%   endfor %}
-    {% endif %}
     - require:
       - cmd: wait_for_elasticsearch
       - file: elastarules

salt/elastalert/files/custom/placeholder

@@ -0,0 +1 @@
+THIS IS A PLACEHOLDER FILE

salt/elastalert/soc_elastalert.yaml

@@ -1,48 +1,47 @@
 elastalert:
   enabled:
     description: Enables or disables the ElastAlert 2 process. This process is critical for ensuring alerts arrive in SOC, and for outbound notification delivery.
-    forcedType: bool
-    helpLink: elastalert
+    helpLink: elastalert.html
   alerter_parameters:
     title: Custom Configuration Parameters
     description: Optional configuration parameters made available as defaults for all rules and alerters. Use YAML format for these parameters, and reference the ElastAlert 2 documentation, located at https://elastalert2.readthedocs.io, for available configuration parameters. Requires a valid Security Onion license key.
     global: True
     multiline: True
     syntax: yaml
-    helpLink: elastalert
+    helpLink: elastalert.html
     forcedType: string
   jira_api_key:
     title: Jira API Key
     description: Optional configuration parameter for Jira API Key, used instead of the Jira username and password. Requires a valid Security Onion license key.
     global: True
     sensitive: True
-    helpLink: elastalert
+    helpLink: elastalert.html
     forcedType: string
   jira_pass:
     title: Jira Password
     description: Optional configuration parameter for Jira password. Requires a valid Security Onion license key.
     global: True
     sensitive: True
-    helpLink: elastalert
+    helpLink: elastalert.html
     forcedType: string
   jira_user:
     title: Jira Username
     description: Optional configuration parameter for Jira username. Requires a valid Security Onion license key.
     global: True
-    helpLink: elastalert
+    helpLink: elastalert.html
     forcedType: string
   smtp_pass:
     title: SMTP Password
     description: Optional configuration parameter for SMTP password, required for authenticating email servers. Requires a valid Security Onion license key.
     global: True
     sensitive: True
-    helpLink: elastalert
+    helpLink: elastalert.html
     forcedType: string
   smtp_user:
     title: SMTP Username
     description: Optional configuration parameter for SMTP username, required for authenticating email servers. Requires a valid Security Onion license key.
     global: True
-    helpLink: elastalert
+    helpLink: elastalert.html
     forcedType: string
   files:
     custom:
@@ -50,131 +49,91 @@ elastalert:
         description: Optional custom Certificate Authority for connecting to an AlertManager server. To utilize this custom file, the alertmanager_ca_certs key must be set to /opt/elastalert/custom/alertmanager_ca.crt in the Alerter Parameters setting. Requires a valid Security Onion license key.
         global: True
         file: True
-        helpLink: elastalert
+        helpLink: elastalert.html
       gelf_ca__crt:
         description: Optional custom Certificate Authority for connecting to a Graylog server. To utilize this custom file, the graylog_ca_certs key must be set to /opt/elastalert/custom/graylog_ca.crt in the Alerter Parameters setting. Requires a valid Security Onion license key.
         global: True
         file: True
-        helpLink: elastalert
+        helpLink: elastalert.html
       http_post_ca__crt:
         description: Optional custom Certificate Authority for connecting to a generic HTTP server, via the legacy HTTP POST alerter. To utilize this custom file, the http_post_ca_certs key must be set to /opt/elastalert/custom/http_post2_ca.crt in the Alerter Parameters setting. Requires a valid Security Onion license key.
         global: True
         file: True
-        helpLink: elastalert
+        helpLink: elastalert.html
       http_post2_ca__crt:
         description: Optional custom Certificate Authority for connecting to a generic HTTP server, via the newer HTTP POST 2 alerter. To utilize this custom file, the http_post2_ca_certs key must be set to /opt/elastalert/custom/http_post2_ca.crt in the Alerter Parameters setting. Requires a valid Security Onion license key.
         global: True
         file: True
-        helpLink: elastalert
+        helpLink: elastalert.html
       ms_teams_ca__crt:
         description: Optional custom Certificate Authority for connecting to Microsoft Teams server. To utilize this custom file, the ms_teams_ca_certs key must be set to /opt/elastalert/custom/ms_teams_ca.crt in the Alerter Parameters setting. Requires a valid Security Onion license key.
         global: True
         file: True
-        helpLink: elastalert
+        helpLink: elastalert.html
       pagerduty_ca__crt:
         description: Optional custom Certificate Authority for connecting to PagerDuty server. To utilize this custom file, the pagerduty_ca_certs key must be set to /opt/elastalert/custom/pagerduty_ca.crt in the Alerter Parameters setting. Requires a valid Security Onion license key.
         global: True
         file: True
-        helpLink: elastalert
+        helpLink: elastalert.html
       rocket_chat_ca__crt:
         description: Optional custom Certificate Authority for connecting to PagerDuty server. To utilize this custom file, the rocket_chart_ca_certs key must be set to /opt/elastalert/custom/rocket_chat_ca.crt in the Alerter Parameters setting. Requires a valid Security Onion license key.
         global: True
         file: True
-        helpLink: elastalert
+        helpLink: elastalert.html
       smtp__crt:
         description: Optional custom certificate for connecting to an SMTP server. To utilize this custom file, the smtp_cert_file key must be set to /opt/elastalert/custom/smtp.crt in the Alerter Parameters setting. Requires a valid Security Onion license key.
         global: True
         file: True
-        helpLink: elastalert
+        helpLink: elastalert.html
       smtp__key:
         description: Optional custom certificate key for connecting to an SMTP server. To utilize this custom file, the smtp_key_file key must be set to /opt/elastalert/custom/smtp.key in the Alerter Parameters setting. Requires a valid Security Onion license key.
         global: True
         file: True
-        helpLink: elastalert
+        helpLink: elastalert.html
       slack_ca__crt:
         description: Optional custom Certificate Authority for connecting to Slack. To utilize this custom file, the slack_ca_certs key must be set to /opt/elastalert/custom/slack_ca.crt in the Alerter Parameters setting. Requires a valid Security Onion license key.
         global: True
         file: True
-        helpLink: elastalert
+        helpLink: elastalert.html
   config:
-    scan_subdirectories:
-      description: Recursively scan subdirectories for rules.
-      forcedType: bool
-      advanced: True
-      global: True
-      helpLink: elastalert
     disable_rules_on_error:
       description: Disable rules on failure.
-      forcedType: bool
       global: True
-      helpLink: elastalert
+      helpLink: elastalert.html
     run_every:
       minutes:
         description: Amount of time in minutes between searches.
         global: True
-        helpLink: elastalert
+        helpLink: elastalert.html
     buffer_time:
       minutes:
         description: Amount of time in minutes to look through.
         global: True
-        helpLink: elastalert
+        helpLink: elastalert.html
     old_query_limit:
       minutes:
         description: Amount of time in minutes between queries to start at the most recently run query.
         global: True
-        helpLink: elastalert
+        helpLink: elastalert.html
     es_conn_timeout:
       description: Timeout in seconds for connecting to and reading from Elasticsearch.
       global: True
-      helpLink: elastalert
+      helpLink: elastalert.html
     max_query_size:
       description: The maximum number of documents that will be returned from Elasticsearch in a single query.
       global: True
-      helpLink: elastalert
-    use_ssl:
-      description: Use SSL to connect to Elasticsearch.
-      forcedType: bool
-      advanced: True
-      global: True
-      helpLink: elastalert
-    verify_certs:
-      description: Verify TLS certificates when connecting to Elasticsearch.
-      forcedType: bool
-      advanced: True
-      global: True
-      helpLink: elastalert
+      helpLink: elastalert.html
     alert_time_limit:
       days:
         description: The retry window for failed alerts.
         global: True
-        helpLink: elastalert
+        helpLink: elastalert.html
     index_settings:
       shards:
         description: The number of shards for elastalert indices.
         global: True
-        helpLink: elastalert
+        helpLink: elastalert.html
       replicas:
         description: The number of replicas for elastalert indices.
         global: True
-        helpLink: elastalert
-    logging:
-      incremental:
-        description: When incremental is false (the default), the logging configuration is applied in full, replacing any existing logging setup. When true, only the level attributes of existing loggers and handlers are updated, leaving the rest of the logging configuration unchanged.
-        forcedType: bool
-        advanced: True
-        global: True
-        helpLink: elastalert
-      disable_existing_loggers:
-        description: Disable existing loggers.
-        forcedType: bool
-        advanced: True
-        global: True
-        helpLink: elastalert
-      loggers:
-        '':
-          propagate:
-            description: Propagate log messages to parent loggers.
-            forcedType: bool
-            advanced: True
-            global: True
-            helpLink: elastalert
+        helpLink: elastalert.html

salt/elastic-fleet-package-registry/enabled.sls

@@ -6,7 +6,7 @@
 {% 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 DOCKERMERGED %}
+{%   from 'docker/docker.map.jinja' import DOCKER %}
 
 include:
   - elastic-fleet-package-registry.config
@@ -21,36 +21,30 @@ so-elastic-fleet-package-registry:
     - user: 948
     - networks:
       - sobridge:
-        - ipv4_address: {{ DOCKERMERGED.containers['so-elastic-fleet-package-registry'].ip }}
+        - ipv4_address: {{ DOCKER.containers['so-elastic-fleet-package-registry'].ip }}
     - extra_hosts:
         - {{ GLOBALS.hostname }}:{{ GLOBALS.node_ip }}
-        {% if DOCKERMERGED.containers['so-elastic-fleet-package-registry'].extra_hosts %}
-          {% for XTRAHOST in DOCKERMERGED.containers['so-elastic-fleet-package-registry'].extra_hosts %}
+        {% if DOCKER.containers['so-elastic-fleet-package-registry'].extra_hosts %}
+          {% for XTRAHOST in DOCKER.containers['so-elastic-fleet-package-registry'].extra_hosts %}
         - {{ XTRAHOST }}
           {% endfor %}
         {% endif %}
     - port_bindings:
-      {% for BINDING in DOCKERMERGED.containers['so-elastic-fleet-package-registry'].port_bindings %}
+      {% for BINDING in DOCKER.containers['so-elastic-fleet-package-registry'].port_bindings %}
       - {{ BINDING }}
       {% endfor %}
-    {% if DOCKERMERGED.containers['so-elastic-fleet-package-registry'].custom_bind_mounts %}
+    {% if DOCKER.containers['so-elastic-fleet-package-registry'].custom_bind_mounts %}
     - binds:
-        {% for BIND in DOCKERMERGED.containers['so-elastic-fleet-package-registry'].custom_bind_mounts %}
+        {% for BIND in DOCKER.containers['so-elastic-fleet-package-registry'].custom_bind_mounts %}
       - {{ BIND }}
         {% endfor %}
     {% endif %}
-    {% if DOCKERMERGED.containers['so-elastic-fleet-package-registry'].extra_env %}
+    {% if DOCKER.containers['so-elastic-fleet-package-registry'].extra_env %}
     - environment:
-        {% for XTRAENV in DOCKERMERGED.containers['so-elastic-fleet-package-registry'].extra_env %}
+        {% for XTRAENV in DOCKER.containers['so-elastic-fleet-package-registry'].extra_env %}
       - {{ XTRAENV }}
         {% endfor %}
       {% endif %}
-    {% if DOCKERMERGED.containers['so-elastic-fleet-package-registry'].ulimits %}
-    - ulimits:
-    {%   for ULIMIT in DOCKERMERGED.containers['so-elastic-fleet-package-registry'].ulimits %}
-      - {{ ULIMIT.name }}={{ ULIMIT.soft }}:{{ ULIMIT.hard }}
-    {%   endfor %}
-    {% endif %}
 delete_so-elastic-fleet-package-registry_so-status.disabled:
   file.uncomment:
     - name: /opt/so/conf/so-status/so-status.conf

salt/elastic-fleet-package-registry/soc_elastic-fleet-package-registry.yaml

@@ -1,5 +1,4 @@
 elastic_fleet_package_registry:
   enabled:
     description: Enables or disables the Fleet package registry process. This process must remain enabled to allow Elastic Agent packages to be updated.
-    forcedType: bool
     advanced: True

salt/elasticagent/enabled.sls

@@ -6,7 +6,7 @@
 {% 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 DOCKERMERGED %}
+{%   from 'docker/docker.map.jinja' import DOCKER %}
 
 include:
   - ca
@@ -22,17 +22,17 @@ so-elastic-agent:
     - user: 949
     - networks:
       - sobridge:
-        - ipv4_address: {{ DOCKERMERGED.containers['so-elastic-agent'].ip }}
+        - ipv4_address: {{ DOCKER.containers['so-elastic-agent'].ip }}
     - extra_hosts:
         - {{ GLOBALS.manager }}:{{ GLOBALS.manager_ip }}
         - {{ GLOBALS.hostname }}:{{ GLOBALS.node_ip }}
-        {% if DOCKERMERGED.containers['so-elastic-agent'].extra_hosts %}
-          {% for XTRAHOST in DOCKERMERGED.containers['so-elastic-agent'].extra_hosts %}
+        {% if DOCKER.containers['so-elastic-agent'].extra_hosts %}
+          {% for XTRAHOST in DOCKER.containers['so-elastic-agent'].extra_hosts %}
         - {{ XTRAHOST }}
           {% endfor %}
         {% endif %}
     - port_bindings:
-      {% for BINDING in DOCKERMERGED.containers['so-elastic-agent'].port_bindings %}
+      {% for BINDING in DOCKER.containers['so-elastic-agent'].port_bindings %}
       - {{ BINDING }}
       {% endfor %}
     - binds:
@@ -41,25 +41,19 @@ so-elastic-agent:
       - /etc/pki/tls/certs/intca.crt:/etc/pki/tls/certs/intca.crt:ro 
       - /nsm:/nsm:ro
       - /opt/so/log:/opt/so/log:ro
-     {% if DOCKERMERGED.containers['so-elastic-agent'].custom_bind_mounts %}
-        {% for BIND in DOCKERMERGED.containers['so-elastic-agent'].custom_bind_mounts %}
+     {% if DOCKER.containers['so-elastic-agent'].custom_bind_mounts %}
+        {% for BIND in DOCKER.containers['so-elastic-agent'].custom_bind_mounts %}
       - {{ BIND }}
         {% endfor %}
       {% endif %}
     - environment:
       - FLEET_CA=/etc/pki/tls/certs/intca.crt
       - LOGS_PATH=logs
-      {% if DOCKERMERGED.containers['so-elastic-agent'].extra_env %}
-        {% for XTRAENV in DOCKERMERGED.containers['so-elastic-agent'].extra_env %}
+      {% if DOCKER.containers['so-elastic-agent'].extra_env %}
+        {% for XTRAENV in DOCKER.containers['so-elastic-agent'].extra_env %}
       - {{ XTRAENV }}
         {% endfor %}
       {% endif %}
-    {% if DOCKERMERGED.containers['so-elastic-agent'].ulimits %}
-    - ulimits:
-    {%   for ULIMIT in DOCKERMERGED.containers['so-elastic-agent'].ulimits %}
-      - {{ ULIMIT.name }}={{ ULIMIT.soft }}:{{ ULIMIT.hard }}
-    {%   endfor %}
-    {% endif %}
     - require:
       - file: create-elastic-agent-config
       - file: trusttheca

salt/elasticagent/soc_elasticagent.yaml

@@ -1,5 +1,4 @@
 elasticagent:
   enabled:
     description: Enables or disables the Elastic Agent process. This process must remain enabled to allow collection of node events.
-    forcedType: bool
     advanced: True

salt/elasticfleet/enabled.sls

@@ -6,7 +6,7 @@
 {% 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 DOCKERMERGED %}
+{%   from 'docker/docker.map.jinja' import DOCKER %}
 {%   from 'elasticfleet/map.jinja' import ELASTICFLEETMERGED %}
 
 {#   This value is generated during node install and stored in minion pillar #}
@@ -94,17 +94,17 @@ so-elastic-fleet:
     - user: 947
     - networks:
       - sobridge:
-        - ipv4_address: {{ DOCKERMERGED.containers['so-elastic-fleet'].ip }}
+        - ipv4_address: {{ DOCKER.containers['so-elastic-fleet'].ip }}
     - extra_hosts:
         - {{ GLOBALS.manager }}:{{ GLOBALS.manager_ip }}
         - {{ GLOBALS.hostname }}:{{ GLOBALS.node_ip }}
-        {% if DOCKERMERGED.containers['so-elastic-fleet'].extra_hosts %}
-          {% for XTRAHOST in DOCKERMERGED.containers['so-elastic-fleet'].extra_hosts %}
+        {% if DOCKER.containers['so-elastic-fleet'].extra_hosts %}
+          {% for XTRAHOST in DOCKER.containers['so-elastic-fleet'].extra_hosts %}
         - {{ XTRAHOST }}
           {% endfor %}
         {% endif %}
     - port_bindings:
-      {% for BINDING in DOCKERMERGED.containers['so-elastic-fleet'].port_bindings %}
+      {% for BINDING in DOCKER.containers['so-elastic-fleet'].port_bindings %}
       - {{ BINDING }}
       {% endfor %}
     - binds:
@@ -112,8 +112,8 @@ so-elastic-fleet:
       - /etc/pki/elasticfleet-server.key:/etc/pki/elasticfleet-server.key:ro
       - /etc/pki/tls/certs/intca.crt:/etc/pki/tls/certs/intca.crt:ro
       - /opt/so/log/elasticfleet:/usr/share/elastic-agent/logs 
-     {% if DOCKERMERGED.containers['so-elastic-fleet'].custom_bind_mounts %}
-        {% for BIND in DOCKERMERGED.containers['so-elastic-fleet'].custom_bind_mounts %}
+     {% if DOCKER.containers['so-elastic-fleet'].custom_bind_mounts %}
+        {% for BIND in DOCKER.containers['so-elastic-fleet'].custom_bind_mounts %}
       - {{ BIND }}
         {% endfor %}
       {% endif %}      
@@ -128,17 +128,11 @@ so-elastic-fleet:
       - FLEET_CA=/etc/pki/tls/certs/intca.crt     
       - FLEET_SERVER_ELASTICSEARCH_CA=/etc/pki/tls/certs/intca.crt
       - LOGS_PATH=logs
-      {% if DOCKERMERGED.containers['so-elastic-fleet'].extra_env %}
-        {% for XTRAENV in DOCKERMERGED.containers['so-elastic-fleet'].extra_env %}
+      {% if DOCKER.containers['so-elastic-fleet'].extra_env %}
+        {% for XTRAENV in DOCKER.containers['so-elastic-fleet'].extra_env %}
       - {{ XTRAENV }}
         {% endfor %}
       {% endif %}
-    {% if DOCKERMERGED.containers['so-elastic-fleet'].ulimits %}
-    - ulimits:
-    {%   for ULIMIT in DOCKERMERGED.containers['so-elastic-fleet'].ulimits %}
-      - {{ ULIMIT.name }}={{ ULIMIT.soft }}:{{ ULIMIT.hard }}
-    {%   endfor %}
-    {% endif %}
     - watch:
       - file: trusttheca
       - x509: etc_elasticfleet_key

salt/elasticfleet/soc_elasticfleet.yaml

@@ -1,15 +1,14 @@
 elasticfleet:
   enabled:
     description: Enables or disables the Elastic Fleet process. This process is critical for managing Elastic Agents.
-    forcedType: bool
     advanced: True
-    helpLink: elastic-fleet
+    helpLink: elastic-fleet.html
   enable_manager_output:
     description: Setting this option to False should only be considered if there is at least one receiver node in the grid. If True, Elastic Agent will send events to the manager and receivers. If False, events will only be send to the receivers.
     advanced: True
     global: True
     forcedType: bool
-    helpLink: elastic-fleet
+    helpLink: elastic-fleet.html
   files:
     soc:
       elastic-defend-disabled-filters__yaml:
@@ -18,7 +17,7 @@ elasticfleet:
         syntax: yaml
         file: True
         global: True
-        helpLink: elastic-fleet
+        helpLink: elastic-fleet.html
         advanced: True
       elastic-defend-custom-filters__yaml:
         title: Custom Elastic Defend filters
@@ -26,32 +25,31 @@ elasticfleet:
         syntax: yaml
         file: True
         global: True
-        helpLink: elastic-fleet
+        helpLink: elastic-fleet.html
         advanced: True
   logging:
     zeek:
       excluded:
         description: This is a list of Zeek logs that are excluded from being shipped through the data processing pipeline. If you remove a log from this list, Elastic Agent will attempt to process it. If an ingest node pipeline is not available to process the logs, you may experience errors.
         forcedType: "[]string"
-        helpLink: zeek
+        helpLink: zeek.html
   config:
     defend_filters:
       enable_auto_configuration:
         description: Enable auto-configuration and management of the Elastic Defend Exclusion filters.
-        forcedType: bool
         global: True
-        helpLink: elastic-fleet
+        helpLink: elastic-fleet.html
         advanced: True
     subscription_integrations:
       description: Enable the installation of integrations that require an Elastic license.
       global: True
       forcedType: bool
-      helpLink: elastic-fleet
+      helpLink: elastic-fleet.html
     auto_upgrade_integrations:
       description: Enables or disables automatically upgrading Elastic Agent integrations.
       global: True
       forcedType: bool
-      helpLink: elastic-fleet
+      helpLink: elastic-fleet.html
     outputs:
       logstash:
         bulk_max_size:
@@ -59,68 +57,67 @@ elasticfleet:
           global: True
           forcedType: int
           advanced: True
-          helpLink: elastic-fleet
+          helpLink: elastic-fleet.html
         worker:
           description: The number of workers per configured host publishing events.
           global: True
           forcedType: int
           advanced: true
-          helpLink: elastic-fleet
+          helpLink: elastic-fleet.html
         queue_mem_events:
           title: queued events
           description: The number of events the queue can store. This value should be evenly divisible by the smaller of 'bulk_max_size' to avoid sending partial batches to the output.
           global: True
           forcedType: int
           advanced: True
-          helpLink: elastic-fleet
+          helpLink: elastic-fleet.html
         timeout:
           description: The number of seconds to wait for responses from the Logstash server before timing out. Eg 30s
           regex: ^[0-9]+s$
           advanced: True
           global: True
-          helpLink: elastic-fleet
+          helpLink: elastic-fleet.html
         loadbalance:
           description: If true and multiple Logstash hosts are configured, the output plugin load balances published events onto all Logstash hosts. If false, the output plugin sends all events to one host (determined at random) and switches to another host if the selected one becomes unresponsive.
           forcedType: bool
           advanced: True
           global: True
-          helpLink: elastic-fleet
+          helpLink: elastic-fleet.html
         compression_level:
           description: The gzip compression level. The compression level must be in the range of 1 (best speed) to 9 (best compression).
           regex: ^[1-9]$
           forcedType: int
           advanced: True
           global: True
-          helpLink: elastic-fleet
+          helpLink: elastic-fleet.html
     server:
       custom_fqdn:
         description: Custom FQDN for Agents to connect to. One per line.
         global: True
-        helpLink: elastic-fleet
+        helpLink: elastic-fleet.html
         advanced: True
         forcedType: "[]string"
       enable_auto_configuration:
         description: Enable auto-configuration of Logstash Outputs & Fleet Host URLs.
-        forcedType: bool
         global: True
-        helpLink: elastic-fleet
+        helpLink: elastic-fleet.html
         advanced: True
       endpoints_enrollment:
         description: Endpoint enrollment key.
         global: True
-        helpLink: elastic-fleet
+        helpLink: elastic-fleet.html
         sensitive: True
         advanced: True
       es_token:
         description: Elastic auth token.
         global: True
-        helpLink: elastic-fleet
+        helpLink: elastic-fleet.html
         sensitive: True
         advanced: True
       grid_enrollment:
         description: Grid enrollment key.
         global: True
-        helpLink: elastic-fleet
+        helpLink: elastic-fleet.html
         sensitive: True
         advanced: True
   optional_integrations:
@@ -128,57 +125,57 @@ elasticfleet:
       enabled_nodes:
         description: Fleet nodes with the Sublime Platform integration enabled. Enter one per line.
         global: True
-        helpLink: elastic-fleet
+        helpLink: elastic-fleet.html
         advanced: True
         forcedType: "[]string"
       api_key:
         description: API key for Sublime Platform.
         global: True
-        helpLink: elastic-fleet
+        helpLink: elastic-fleet.html
         advanced: True
         forcedType: string
         sensitive: True
       base_url:
         description: Base URL for Sublime Platform.
         global: True
-        helpLink: elastic-fleet
+        helpLink: elastic-fleet.html
         advanced: True
         forcedType: string
       poll_interval:
         description: Poll interval for alerts from Sublime Platform.
         global: True
-        helpLink: elastic-fleet
+        helpLink: elastic-fleet.html
         advanced: True
         forcedType: string
       limit:
         description: The maximum number of message groups to return from Sublime Platform.
         global: True
-        helpLink: elastic-fleet
+        helpLink: elastic-fleet.html
         advanced: True
         forcedType: int
     kismet:
       base_url:
         description: Base URL for Kismet.
         global: True
-        helpLink: elastic-fleet
+        helpLink: elastic-fleet.html
         advanced: True
         forcedType: string
       poll_interval:
         description: Poll interval for wireless device data from Kismet. Integration is currently configured to return devices seen as active by any Kismet sensor within the last 10 minutes.
         global: True
-        helpLink: elastic-fleet
+        helpLink: elastic-fleet.html
         advanced: True
         forcedType: string
       api_key:
         description: API key for Kismet.
         global: True
-        helpLink: elastic-fleet
+        helpLink: elastic-fleet.html
         advanced: True
         forcedType: string
         sensitive: True
       enabled_nodes:
         description: Fleet nodes with the Kismet integration enabled. Enter one per line.
         global: True
-        helpLink: elastic-fleet
+        helpLink: elastic-fleet.html
         advanced: True
         forcedType: "[]string"

salt/elasticsearch/config.map.jinja

@@ -6,6 +6,8 @@
 {% from 'vars/globals.map.jinja' import GLOBALS %}
 {% import_yaml 'elasticsearch/defaults.yaml' as ELASTICSEARCHDEFAULTS with context %}
 
+{% set HIGHLANDER = salt['pillar.get']('global:highlander', False) %}
+
 {# this is a list of dicts containing hostname:ip for elasticsearch nodes that need to know about each other for cluster #}
 {% set ELASTICSEARCH_SEED_HOSTS = [] %}
 {% set node_data = salt['pillar.get']('elasticsearch:nodes', {GLOBALS.role.split('-')[1]: {GLOBALS.hostname: {'ip': GLOBALS.node_ip}}}) %}
@@ -34,8 +36,14 @@
       {% endfor %}
     {% endif %}
 {% elif grains.id.split('_') | last == 'searchnode' %}
+  {% if HIGHLANDER %}
+        {% do ELASTICSEARCHDEFAULTS.elasticsearch.config.node.roles.extend(['ml', 'master', 'transform']) %}
+  {% endif %}
   {% do ELASTICSEARCHDEFAULTS.elasticsearch.config.update({'discovery': {'seed_hosts': [GLOBALS.manager]}}) %}
 {% endif %}
+{% if HIGHLANDER %}
+      {% do ELASTICSEARCHDEFAULTS.elasticsearch.config.xpack.ml.update({'enabled': true}) %}
+{% endif %}
 
 {% do ELASTICSEARCHDEFAULTS.elasticsearch.config.node.update({'name': GLOBALS.hostname}) %}
 {% do ELASTICSEARCHDEFAULTS.elasticsearch.config.cluster.update({'name': GLOBALS.hostname}) %}

salt/elasticsearch/config.sls

@@ -10,7 +10,7 @@
 
 vm.max_map_count:
   sysctl.present:
-    - value: {{ ELASTICSEARCHMERGED.vm.max_map_count }}
+    - value: 262144
 
 # Add ES Group
 elasticsearchgroup:
@@ -98,6 +98,10 @@ esrolesdir:
     - group: 939
     - makedirs: True
 
+eslibdir:
+  file.absent:
+    - name: /opt/so/conf/elasticsearch/lib
+
 esingestdynamicconf:
   file.recurse:
     - name: /opt/so/conf/elasticsearch/ingest
@@ -115,6 +119,11 @@ esingestconf:
     - group: 939
     - show_changes: False
 
+# Remove .fleet_final_pipeline-1 because we are using global@custom now
+so-fleet-final-pipeline-remove:
+  file.absent:
+    - name: /opt/so/conf/elasticsearch/ingest/.fleet_final_pipeline-1
+
 # Auto-generate Elasticsearch ingest node pipelines from pillar
 {% for pipeline, config in ELASTICSEARCHMERGED.pipelines.items() %}
 es_ingest_conf_{{pipeline}}:

salt/elasticsearch/defaults.yaml

@@ -2,8 +2,6 @@ elasticsearch:
   enabled: false
   version: 9.0.8
   index_clean: true
-  vm:
-    max_map_count: 1048576
   config:
     action:
       destructive_requires_name: true
@@ -119,7 +117,7 @@ elasticsearch:
         ignore_missing_component_templates: []
         index_patterns:
         - so-case*
-        priority: 501
+        priority: 500
         template:
           mappings:
             date_detection: false
@@ -131,6 +129,8 @@ elasticsearch:
                 match_mapping_type: string
           settings:
             index:
+              lifecycle:
+                name: so-case-logs
               mapping:
                 total_fields:
                   limit: 1500
@@ -141,7 +141,14 @@ elasticsearch:
               sort:
                 field: '@timestamp'
                 order: desc
+      policy:
+        phases:
+          hot:
+            actions: {}
+            min_age: 0ms
     so-common:
+      close: 30
+      delete: 365
       index_sorting: false
       index_template:
         composed_of:
@@ -205,9 +212,7 @@ elasticsearch:
         - common-settings
         - common-dynamic-mappings
         - winlog-mappings
-        data_stream:
-          allow_custom_routing: false
-          hidden: false
+        data_stream: {}
         ignore_missing_component_templates: []
         index_patterns:
         - logs-*-so*
@@ -267,7 +272,7 @@ elasticsearch:
         ignore_missing_component_templates: []
         index_patterns:
         - so-detection*
-        priority: 501
+        priority: 500
         template:
           mappings:
             date_detection: false
@@ -279,6 +284,8 @@ elasticsearch:
                 match_mapping_type: string
           settings:
             index:
+              lifecycle:
+                name: so-detection-logs
               mapping:
                 total_fields:
                   limit: 1500
@@ -289,6 +296,11 @@ elasticsearch:
               sort:
                 field: '@timestamp'
                 order: desc
+      policy:
+        phases:
+          hot:
+            actions: {}
+            min_age: 0ms
     sos-backup:
       index_sorting: false
       index_template:
@@ -448,7 +460,7 @@ elasticsearch:
         ignore_missing_component_templates: []
         index_patterns:
         - endgame*
-        priority: 501
+        priority: 500
         template:
           mappings:
             date_detection: false
@@ -496,6 +508,8 @@ elasticsearch:
                 priority: 50
             min_age: 30d
     so-idh:
+      close: 30
+      delete: 365
       index_sorting: false
       index_template:
         composed_of:
@@ -550,13 +564,10 @@ elasticsearch:
         - dtc-user_agent-mappings
         - common-settings
         - common-dynamic-mappings
-        data_stream:
-          allow_custom_routing: false
-          hidden: false
         ignore_missing_component_templates: []
         index_patterns:
-        - logs-idh-so*
-        priority: 501
+        - so-idh-*
+        priority: 500
         template:
           mappings:
             date_detection: false
@@ -666,13 +677,11 @@ elasticsearch:
         - common-dynamic-mappings
         - winlog-mappings
         - hash-mappings
-        data_stream:
-          allow_custom_routing: false
-          hidden: false
+        data_stream: {}
         ignore_missing_component_templates: []
         index_patterns:
         - logs-import-so*
-        priority: 501
+        priority: 500
         template:
           mappings:
             date_detection: false
@@ -727,7 +736,7 @@ elasticsearch:
         ignore_missing_component_templates: []
         index_patterns:
         - so-ip*
-        priority: 501
+        priority: 500
         template:
           mappings:
             date_detection: false
@@ -742,12 +751,19 @@ elasticsearch:
               mapping:
                 total_fields:
                   limit: 1500
+              lifecycle:
+                name: so-ip-mappings-logs
               number_of_replicas: 0
               number_of_shards: 1
               refresh_interval: 30s
               sort:
                 field: '@timestamp'
                 order: desc
+      policy:
+        phases:
+          hot:
+            actions: {}
+            min_age: 0ms
     so-items:
       index_sorting: false
       index_template:
@@ -756,7 +772,7 @@ elasticsearch:
         ignore_missing_component_templates: []
         index_patterns:
         - .items-default-**
-        priority: 501
+        priority: 500
         template:
           mappings:
             date_detection: false
@@ -835,6 +851,8 @@ elasticsearch:
                 priority: 50
             min_age: 30d
     so-kratos:
+      close: 30
+      delete: 365
       index_sorting: false
       index_template:
         composed_of:
@@ -855,7 +873,7 @@ elasticsearch:
         ignore_missing_component_templates: []
         index_patterns:
         - logs-kratos-so*
-        priority: 501
+        priority: 500
         template:
           mappings:
             date_detection: false
@@ -903,6 +921,8 @@ elasticsearch:
                 priority: 50
             min_age: 30d
     so-hydra:
+      close: 30
+      delete: 365
       index_sorting: false
       index_template:
         composed_of:
@@ -963,7 +983,7 @@ elasticsearch:
         ignore_missing_component_templates: []
         index_patterns:
         - logs-hydra-so*
-        priority: 501
+        priority: 500
         template:
           mappings:
             date_detection: false
@@ -1018,7 +1038,7 @@ elasticsearch:
         ignore_missing_component_templates: []
         index_patterns:
         - .lists-default-**
-        priority: 501
+        priority: 500
         template:
           mappings:
             date_detection: false
@@ -1504,9 +1524,6 @@ elasticsearch:
         - so-fleet_integrations.ip_mappings-1
         - so-fleet_globals-1
         - so-fleet_agent_id_verification-1
-        data_stream:
-          allow_custom_routing: false
-          hidden: false
         ignore_missing_component_templates:
         - logs-elastic_agent.cloudbeat@custom
         index_patterns:
@@ -1742,9 +1759,6 @@ elasticsearch:
         - so-fleet_integrations.ip_mappings-1
         - so-fleet_globals-1
         - so-fleet_agent_id_verification-1
-        data_stream:
-          allow_custom_routing: false
-          hidden: false
         ignore_missing_component_templates:
         - logs-elastic_agent.heartbeat@custom
         index_patterns:
@@ -3004,6 +3018,8 @@ elasticsearch:
                 priority: 50
             min_age: 30d
     so-logs-soc:
+      close: 30
+      delete: 365
       index_sorting: false
       index_template:
         composed_of:
@@ -3058,13 +3074,11 @@ elasticsearch:
         - dtc-user_agent-mappings
         - common-settings
         - common-dynamic-mappings
-        data_stream:
-          allow_custom_routing: false
-          hidden: false
+        data_stream: {}
         ignore_missing_component_templates: []
         index_patterns:
         - logs-soc-so*
-        priority: 501
+        priority: 500
         template:
           mappings:
             date_detection: false
@@ -3654,13 +3668,10 @@ elasticsearch:
         - vulnerability-mappings
         - common-settings
         - common-dynamic-mappings
-        data_stream:
-          allow_custom_routing: false
-          hidden: false
         ignore_missing_component_templates: []
         index_patterns:
         - logs-logstash-default*
-        priority: 501
+        priority: 500
         template:
           mappings:
             date_detection: false
@@ -3958,13 +3969,10 @@ elasticsearch:
         - vulnerability-mappings
         - common-settings
         - common-dynamic-mappings
-        data_stream:
-          allow_custom_routing: false
-          hidden: false
         ignore_missing_component_templates: []
         index_patterns:
-        - logs-redis.log*
-        priority: 501
+        - logs-redis-default*
+        priority: 500
         template:
           mappings:
             date_detection: false
@@ -4075,13 +4083,11 @@ elasticsearch:
         - common-settings
         - common-dynamic-mappings
         - hash-mappings
-        data_stream:
-          allow_custom_routing: false
-          hidden: false
+        data_stream: {}
         ignore_missing_component_templates: []
         index_patterns:
         - logs-strelka-so*
-        priority: 501
+        priority: 500
         template:
           mappings:
             date_detection: false
@@ -4191,13 +4197,11 @@ elasticsearch:
         - common-settings
         - common-dynamic-mappings
         - hash-mappings
-        data_stream:
-          allow_custom_routing: false
-          hidden: false
+        data_stream: {}
         ignore_missing_component_templates: []
         index_patterns:
         - logs-suricata-so*
-        priority: 501
+        priority: 500
         template:
           mappings:
             date_detection: false
@@ -4307,13 +4311,11 @@ elasticsearch:
         - common-settings
         - common-dynamic-mappings
         - hash-mappings
-        data_stream:
-          allow_custom_routing: false
-          hidden: false
+        data_stream: {}
         ignore_missing_component_templates: []
         index_patterns:
         - logs-suricata.alerts-*
-        priority: 501
+        priority: 500
         template:
           mappings:
             date_detection: false
@@ -4423,13 +4425,11 @@ elasticsearch:
         - vulnerability-mappings
         - common-settings
         - common-dynamic-mappings
-        data_stream:
-          allow_custom_routing: false
-          hidden: false
+        data_stream: {}
         ignore_missing_component_templates: []
         index_patterns:
         - logs-syslog-so*
-        priority: 501
+        priority: 500
         template:
           mappings:
             date_detection: false
@@ -4541,13 +4541,11 @@ elasticsearch:
         - common-settings
         - common-dynamic-mappings
         - hash-mappings
-        data_stream:
-          allow_custom_routing: false
-          hidden: false
+        data_stream: {}
         ignore_missing_component_templates: []
         index_patterns:
         - logs-zeek-so*
-        priority: 501
+        priority: 500
         template:
           mappings:
             date_detection: false

salt/elasticsearch/enabled.sls

@@ -6,7 +6,7 @@
 {% 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 DOCKERMERGED %}
+{%   from 'docker/docker.map.jinja' import DOCKER %}
 {%   from 'elasticsearch/config.map.jinja' import ELASTICSEARCH_NODES %}
 {%   from 'elasticsearch/config.map.jinja' import ELASTICSEARCH_SEED_HOSTS %}
 {%   from 'elasticsearch/config.map.jinja' import ELASTICSEARCHMERGED %}
@@ -28,15 +28,15 @@ so-elasticsearch:
     - user: elasticsearch
     - networks:
       - sobridge:
-        - ipv4_address: {{ DOCKERMERGED.containers['so-elasticsearch'].ip }}
+        - ipv4_address: {{ DOCKER.containers['so-elasticsearch'].ip }}
     - extra_hosts:
     {% for node in ELASTICSEARCH_NODES %}
     {%   for hostname, ip in node.items() %}
       - {{hostname}}:{{ip}}
     {%   endfor %}
     {% endfor %}
-    {% if DOCKERMERGED.containers['so-elasticsearch'].extra_hosts %}
-      {% for XTRAHOST in DOCKERMERGED.containers['so-elasticsearch'].extra_hosts %}
+    {% if DOCKER.containers['so-elasticsearch'].extra_hosts %}
+      {% for XTRAHOST in DOCKER.containers['so-elasticsearch'].extra_hosts %}
       - {{ XTRAHOST }}
       {% endfor %}
     {% endif %}
@@ -45,19 +45,17 @@ so-elasticsearch:
       - discovery.type=single-node
       {% endif %}
       - ES_JAVA_OPTS=-Xms{{ GLOBALS.elasticsearch.es_heap }} -Xmx{{ GLOBALS.elasticsearch.es_heap }} -Des.transport.cname_in_publish_address=true -Dlog4j2.formatMsgNoLookups=true
-      {% if DOCKERMERGED.containers['so-elasticsearch'].extra_env %}
-        {% for XTRAENV in DOCKERMERGED.containers['so-elasticsearch'].extra_env %}
+      ulimits:
+      - memlock=-1:-1
+      - nofile=65536:65536
+      - nproc=4096
+      {% if DOCKER.containers['so-elasticsearch'].extra_env %}
+        {% for XTRAENV in DOCKER.containers['so-elasticsearch'].extra_env %}
       - {{ XTRAENV }}
         {% endfor %}
       {% endif %}
-    {% if DOCKERMERGED.containers['so-elasticsearch'].ulimits %}
-    - ulimits:
-    {%   for ULIMIT in DOCKERMERGED.containers['so-elasticsearch'].ulimits %}
-      - {{ ULIMIT.name }}={{ ULIMIT.soft }}:{{ ULIMIT.hard }}
-    {%   endfor %}
-    {% endif %}
     - port_bindings:
-      {% for BINDING in DOCKERMERGED.containers['so-elasticsearch'].port_bindings %}
+      {% for BINDING in DOCKER.containers['so-elasticsearch'].port_bindings %}
       - {{ BINDING }}
       {% endfor %}
     - binds:
@@ -77,8 +75,8 @@ so-elasticsearch:
       - {{ repo }}:{{ repo }}:rw
         {% endfor %}
       {% endif %}
-      {% if DOCKERMERGED.containers['so-elasticsearch'].custom_bind_mounts %}
-        {% for BIND in DOCKERMERGED.containers['so-elasticsearch'].custom_bind_mounts %}
+      {% if DOCKER.containers['so-elasticsearch'].custom_bind_mounts %}
+        {% for BIND in DOCKER.containers['so-elasticsearch'].custom_bind_mounts %}
       - {{ BIND }}
         {% endfor %}
       {% endif %}

salt/elasticsearch/files/ingest-dynamic/common

@@ -1,3 +1,5 @@
+{%- set HIGHLANDER = salt['pillar.get']('global:highlander', False) -%}
+{%- raw -%}
 {
   "description" : "common",
   "processors" : [
@@ -65,7 +67,19 @@
     { "append":          { "if": "ctx.dataset_tag_temp != null", "field": "tags", "value": "{{dataset_tag_temp.1}}"  } },
     { "grok":            { "if": "ctx.http?.response?.status_code != null", "field": "http.response.status_code", "patterns": ["%{NUMBER:http.response.status_code:long} %{GREEDYDATA}"]} },
     { "set":             { "if": "ctx?.metadata?.kafka != null" , "field": "kafka.id", "value": "{{metadata.kafka.partition}}{{metadata.kafka.offset}}{{metadata.kafka.timestamp}}", "ignore_failure": true } },
-    { "remove":          { "field": [ "message2", "type", "fields", "category", "module", "dataset", "dataset_tag_temp", "event.dataset_temp" ], "ignore_missing": true, "ignore_failure": true } },
+    { "remove":          { "field": [ "message2", "type", "fields", "category", "module", "dataset", "dataset_tag_temp", "event.dataset_temp" ], "ignore_missing": true, "ignore_failure": true } }
+{%- endraw %}
+{%- if HIGHLANDER %}
+    ,
+    {
+      "pipeline": {
+        "name": "ecs"
+      }
+    }
+{%- endif %}
+{%- raw %}
+    ,
     { "pipeline": { "name": "global@custom", "ignore_missing_pipeline": true, "description": "[Fleet] Global pipeline for all data streams" } }
   ]
 }
+{% endraw %}

salt/elasticsearch/soc_elasticsearch.yaml

@@ -1,9 +1,8 @@
 elasticsearch:
   enabled:
     description: Enables or disables the Elasticsearch process. This process provides the log event storage system. WARNING - Disabling this process is unsupported.
-    forcedType: bool
     advanced: True
-    helpLink: elasticsearch
+    helpLink: elasticsearch.html
   version:
     description: "This specifies the version of the following containers: so-elastic-fleet-package-registry, so-elastic-agent, so-elastic-fleet, so-kibana, so-logstash and so-elasticsearch. Modifying this value in the Elasticsearch defaults.yaml will result in catastrophic grid failure."
     readonly: True
@@ -11,20 +10,15 @@ elasticsearch:
     advanced: True
   esheap:
     description: Specify the memory heap size in (m)egabytes for Elasticsearch.
-    helpLink: elasticsearch
+    helpLink: elasticsearch.html
   index_clean:
     description: Determines if indices should be considered for deletion by available disk space in the cluster. Otherwise, indices will only be deleted by the age defined in the ILM settings. This setting only applies to EVAL, STANDALONE, and HEAVY NODE installations. Other installations can only use ILM settings.
     forcedType: bool
-    helpLink: elasticsearch
-  vm:
-    max_map_count:
-      description: The maximum number of memory map areas a process may use. Elasticsearch uses a mmapfs directory by default to store its indices. The default operating system limits on mmap counts could be too low, which may result in out of memory exceptions.
-      forcedType: int
-      helpLink: elasticsearch
+    helpLink: elasticsearch.html
   retention: 
     retention_pct:
       decription: Total percentage of space used by Elasticsearch for multi node clusters
-      helpLink: elasticsearch
+      helpLink: elasticsearch.html
       global: True
   config:
     cluster:
@@ -32,102 +26,55 @@ elasticsearch:
         description: The name of the Security Onion Elasticsearch cluster, for identification purposes.
         readonly: True
         global: True
-        helpLink: elasticsearch
+        helpLink: elasticsearch.html
       logsdb:
         enabled:
           description: Enables or disables the Elasticsearch logsdb index mode. When enabled, most logs-* datastreams will convert to logsdb from standard after rolling over.
           forcedType: bool
           global: True
           advanced: True
-          helpLink: elasticsearch
+          helpLink: elasticsearch.html
       routing:
         allocation:
           disk:
-            threshold_enabled:
+            threshold_enabled: 
               description: Specifies whether the Elasticsearch node will monitor the available disk space for low disk space conditions and take action to protect the cluster.
-              forcedType: bool
-              helpLink: elasticsearch
+              helpLink: elasticsearch.html
             watermark:
               low: 
                 description: The lower percentage of used disk space representing a healthy node.
-                helpLink: elasticsearch
+                helpLink: elasticsearch.html
               high: 
                 description: The higher percentage of used disk space representing an unhealthy node.
-                helpLink: elasticsearch
+                helpLink: elasticsearch.html
               flood_stage: 
                 description: The max percentage of used disk space that will cause the node to take protective actions, such as blocking incoming events.
-                helpLink: elasticsearch
-    action:
-      destructive_requires_name:
-        description: Requires explicit index names when deleting indices. Prevents accidental deletion of indices via wildcard patterns.
-        advanced: True
-        forcedType: bool
-        helpLink: elasticsearch
+                helpLink: elasticsearch.html
     script:
-      max_compilations_rate:
+      max_compilations_rate: 
         description: Max rate of script compilations permitted in the Elasticsearch cluster. Larger values will consume more resources.
         global: True
-        helpLink: elasticsearch
+        helpLink: elasticsearch.html
     indices:
-      id_field_data:
-        enabled:
-          description: Enables or disables loading of field data on the _id field.
-          advanced: True
-          forcedType: bool
-          helpLink: elasticsearch
       query:
         bool:
-          max_clause_count:
+          max_clause_count: 
             description: Max number of boolean clauses per query.
             global: True
-            helpLink: elasticsearch
-    xpack:
-      ml:
-        enabled:
-          description: Enables or disables machine learning on the node.
-          forcedType: bool
-          advanced: True
-          helpLink: elasticsearch
-      security:
-        enabled:
-          description: Enables or disables Elasticsearch security features.
-          forcedType: bool
-          advanced: True
-          helpLink: elasticsearch
-        authc:
-          anonymous:
-            authz_exception:
-              description: Controls whether an authorization exception is thrown when anonymous user does not have the required privileges.
-              advanced: True
-              forcedType: bool
-              helpLink: elasticsearch
-        http:
-          ssl:
-            enabled:
-              description: Enables or disables TLS/SSL for the HTTP layer.
-              advanced: True
-              forcedType: bool
-              helpLink: elasticsearch
-        transport:
-          ssl:
-            enabled:
-              description: Enables or disables TLS/SSL for the transport layer.
-              advanced: True
-              forcedType: bool
-              helpLink: elasticsearch
+            helpLink: elasticsearch.html
   pipelines:
     custom001: &pipelines
       description:
         description: Description of the ingest node pipeline
         global: True
         advanced: True
-        helpLink: elasticsearch
+        helpLink: elasticsearch.html
       processors:
         description: Processors for the ingest node pipeline
         global: True
         advanced: True
         multiline: True
-        helpLink: elasticsearch
+        helpLink: elasticsearch.html
     custom002: *pipelines
     custom003: *pipelines
     custom004: *pipelines
@@ -147,24 +94,24 @@ elasticsearch:
                 description: Number of replicas required for all indices. Multiple replicas protects against data loss, but also increases storage costs. This setting will be applied to all indices.
                 forcedType: int
                 global: True
-                helpLink: elasticsearch
+                helpLink: elasticsearch.html
               refresh_interval: 
                 description: Seconds between index refreshes. Shorter intervals can cause query performance to suffer since this is a synchronous and resource-intensive operation.
                 global: True
-                helpLink: elasticsearch
+                helpLink: elasticsearch.html
               number_of_shards: 
                 description: Number of shards required for this index. Using multiple shards increases fault tolerance, but also increases storage and network costs.
                 global: True
-                helpLink: elasticsearch
+                helpLink: elasticsearch.html
               sort:
                 field:
                   description: The field to sort by. Must set index_sorting to True.
                   global: True
-                  helpLink: elasticsearch
+                  helpLink: elasticsearch.html
                 order:
                   description: The order to sort by. Must set index_sorting to True.
                   global: True
-                  helpLink: elasticsearch
+                  helpLink: elasticsearch.html
       policy:
         phases:
           hot:
@@ -174,16 +121,16 @@ elasticsearch:
                   description: Priority of index. This is used for recovery after a node restart. Indices with higher priorities are recovered before indices with lower priorities.
                   forcedType: int
                   global: True
-                  helpLink: elasticsearch
+                  helpLink: elasticsearch.html
               rollover:
                 max_age:
                   description: Maximum age of index.  Once an index reaches this limit, it will be rolled over into a new index.
                   global: True
-                  helpLink: elasticsearch
+                  helpLink: elasticsearch.html
                 max_primary_shard_size:
                   description: Maximum primary shard size. Once an index reaches this limit, it will be rolled over into a new index.
                   global: True
-                  helpLink: elasticsearch
+                  helpLink: elasticsearch.html
               shrink:
                 method:
                   description: Shrink the index to a new index with fewer primary shards. Shrink operation is by count or size.
@@ -231,13 +178,13 @@ elasticsearch:
               regex: ^[0-9]{1,5}d$
               forcedType: string
               global: True
-              helpLink: elasticsearch
+              helpLink: elasticsearch.html
             actions:
               set_priority:
                 priority:
                   description: Used for index recovery after a node restart. Indices with higher priorities are recovered before indices with lower priorities.
                   global: True
-                  helpLink: elasticsearch
+                  helpLink: elasticsearch.html
               allocate:
                 number_of_replicas:
                   description: Set the number of replicas. Remains the same as the previous phase by default.
@@ -250,14 +197,14 @@ elasticsearch:
               regex: ^[0-9]{1,5}d$
               forcedType: string
               global: True
-              helpLink: elasticsearch
+              helpLink: elasticsearch.html
             actions:
               set_priority:
                 priority:
                   description: Priority of index. This is used for recovery after a node restart. Indices with higher priorities are recovered before indices with lower priorities.
                   forcedType: int
                   global: True
-                  helpLink: elasticsearch
+                  helpLink: elasticsearch.html
               shrink:
                 method:
                   description: Shrink the index to a new index with fewer primary shards. Shrink operation is by count or size.
@@ -310,14 +257,13 @@ elasticsearch:
               regex: ^[0-9]{1,5}d$
               forcedType: string
               global: True
-              helpLink: elasticsearch
+              helpLink: elasticsearch.html
     so-logs: &indexSettings
-      index_sorting:
+      index_sorting: 
         description: Sorts the index by event time, at the cost of additional processing resource consumption.
-        forcedType: bool
         global: True
         advanced: True
-        helpLink: elasticsearch
+        helpLink: elasticsearch.html
       index_template:
         index_patterns:
           description: Patterns for matching multiple indices or tables.
@@ -325,7 +271,7 @@ elasticsearch:
           multiline: True
           global: True
           advanced: True
-          helpLink: elasticsearch
+          helpLink: elasticsearch.html
         template:
           settings:
             index:
@@ -334,35 +280,35 @@ elasticsearch:
                 forcedType: int
                 global: True
                 advanced: True
-                helpLink: elasticsearch
+                helpLink: elasticsearch.html
               mapping:
                 total_fields:
                   limit:
                     description: Max number of fields that can exist on a single index. Larger values will consume more resources.
                     global: True
                     advanced: True
-                    helpLink: elasticsearch
+                    helpLink: elasticsearch.html
               refresh_interval: 
                 description: Seconds between index refreshes. Shorter intervals can cause query performance to suffer since this is a synchronous and resource-intensive operation.
                 global: True
                 advanced: True
-                helpLink: elasticsearch
+                helpLink: elasticsearch.html
               number_of_shards: 
                 description: Number of shards required for this index. Using multiple shards increases fault tolerance, but also increases storage and network costs.
                 global: True
                 advanced: True
-                helpLink: elasticsearch
+                helpLink: elasticsearch.html
               sort:
                 field:
                   description: The field to sort by. Must set index_sorting to True.
                   global: True
                   advanced: True
-                  helpLink: elasticsearch
+                  helpLink: elasticsearch.html
                 order:
                   description: The order to sort by. Must set index_sorting to True.
                   global: True
                   advanced: True
-                  helpLink: elasticsearch
+                  helpLink: elasticsearch.html
           mappings:
             _meta:
               package:
@@ -370,43 +316,43 @@ elasticsearch:
                   description: Meta settings for the mapping.
                   global: True
                   advanced: True
-                  helpLink: elasticsearch
+                  helpLink: elasticsearch.html
               managed_by:
                   description: Meta settings for the mapping.
                   global: True
                   advanced: True
-                  helpLink: elasticsearch
+                  helpLink: elasticsearch.html
               managed:
                   description: Meta settings for the mapping.
                   forcedType: bool
                   global: True
                   advanced: True
-                  helpLink: elasticsearch
+                  helpLink: elasticsearch.html
         composed_of:
           description: The index template is composed of these component templates.
           forcedType: "[]string"
           global: True
           advanced: True
-          helpLink: elasticsearch
+          helpLink: elasticsearch.html
         priority:
           description: The priority of the index template.
           forcedType: int
           global: True
           advanced: True
-          helpLink: elasticsearch
+          helpLink: elasticsearch.html
         data_stream:
           hidden:
             description: Hide the data stream.
             forcedType: bool
             global: True
             advanced: True
-            helpLink: elasticsearch
+            helpLink: elasticsearch.html
           allow_custom_routing:
             description: Allow custom routing for the data stream.
             forcedType: bool
             global: True
             advanced: True
-            helpLink: elasticsearch
+            helpLink: elasticsearch.html
       policy:
         phases:
           hot:
@@ -414,7 +360,7 @@ elasticsearch:
               description: Minimum age of index. This determines when the index should be moved to the hot tier.
               global: True
               advanced: True
-              helpLink: elasticsearch
+              helpLink: elasticsearch.html
             actions:
               set_priority:
                 priority:
@@ -422,18 +368,18 @@ elasticsearch:
                   forcedType: int
                   global: True
                   advanced: True
-                  helpLink: elasticsearch
+                  helpLink: elasticsearch.html
               rollover:
                 max_age:
                   description: Maximum age of index.  Once an index reaches this limit, it will be rolled over into a new index.
                   global: True
                   advanced: True
-                  helpLink: elasticsearch
+                  helpLink: elasticsearch.html
                 max_primary_shard_size:
                   description: Maximum primary shard size. Once an index reaches this limit, it will be rolled over into a new index.
                   global: True
                   advanced: True
-                  helpLink: elasticsearch
+                  helpLink: elasticsearch.html
               shrink:
                 method:
                   description: Shrink the index to a new index with fewer primary shards. Shrink operation is by count or size.
@@ -482,7 +428,7 @@ elasticsearch:
               forcedType: string
               global: True
               advanced: True
-              helpLink: elasticsearch
+              helpLink: elasticsearch.html
             actions:
               set_priority:
                 priority:
@@ -490,18 +436,18 @@ elasticsearch:
                   forcedType: int
                   global: True
                   advanced: True
-                  helpLink: elasticsearch
+                  helpLink: elasticsearch.html
               rollover:
                 max_age:
                   description: Maximum age of index.  Once an index reaches this limit, it will be rolled over into a new index.
                   global: True
                   advanced: True
-                  helpLink: elasticsearch
+                  helpLink: elasticsearch.html
                 max_primary_shard_size:
                   description: Maximum primary shard size. Once an index reaches this limit, it will be rolled over into a new index.
                   global: True
                   advanced: True
-                  helpLink: elasticsearch
+                  helpLink: elasticsearch.html
               shrink:
                 method:
                   description: Shrink the index to a new index with fewer primary shards. Shrink operation is by count or size.
@@ -555,7 +501,7 @@ elasticsearch:
               forcedType: string
               global: True
               advanced: True
-              helpLink: elasticsearch
+              helpLink: elasticsearch.html
             actions:
               set_priority:
                 priority:
@@ -563,7 +509,7 @@ elasticsearch:
                   forcedType: int
                   global: True
                   advanced: True
-                  helpLink: elasticsearch
+                  helpLink: elasticsearch.html
               allocate:
                 number_of_replicas:
                   description: Set the number of replicas. Remains the same as the previous phase by default.
@@ -577,25 +523,25 @@ elasticsearch:
               forcedType: string
               global: True
               advanced: True
-              helpLink: elasticsearch
+              helpLink: elasticsearch.html
         _meta:
           package:
             name:
               description: Meta settings for the mapping.
               global: True
               advanced: True
-              helpLink: elasticsearch
+              helpLink: elasticsearch.html
           managed_by:
             description: Meta settings for the mapping.
             global: True
             advanced: True
-            helpLink: elasticsearch
+            helpLink: elasticsearch.html
           managed:
             description: Meta settings for the mapping.
             forcedType: bool
             global: True
             advanced: True
-            helpLink: elasticsearch
+            helpLink: elasticsearch.html
     so-logs-system_x_auth: *indexSettings
     so-logs-system_x_syslog: *indexSettings
     so-logs-system_x_system: *indexSettings
@@ -658,21 +604,20 @@ elasticsearch:
     so-metrics-fleet_server_x_agent_status: &fleetMetricsSettings
       index_sorting:
         description: Sorts the index by event time, at the cost of additional processing resource consumption.
-        forcedType: bool
         advanced: True
         readonly: True
-        helpLink: elasticsearch
+        helpLink: elasticsearch.html
       index_template:
         ignore_missing_component_templates:
           description: Ignore component templates if they aren't in Elasticsearch.
           advanced: True
           readonly: True
-          helpLink: elasticsearch
+          helpLink: elasticsearch.html
         index_patterns:
           description: Patterns for matching multiple indices or tables.
           advanced: True
           readonly: True
-          helpLink: elasticsearch
+          helpLink: elasticsearch.html
         template:
           settings:
             index:
@@ -680,35 +625,33 @@ elasticsearch:
                 description: Type of mode used for this index. Time series indices can be used for metrics to reduce necessary storage.
                 advanced: True
                 readonly: True
-                helpLink: elasticsearch
+                helpLink: elasticsearch.html
               number_of_replicas:
                 description: Number of replicas required for this index. Multiple replicas protects against data loss, but also increases storage costs.
                 advanced: True
                 readonly: True
-                helpLink: elasticsearch
+                helpLink: elasticsearch.html
         composed_of:
           description: The index template is composed of these component templates.
           advanced: True
           readonly: True
-          helpLink: elasticsearch
+          helpLink: elasticsearch.html
         priority:
           description: The priority of the index template.
           advanced: True
           readonly: True
-          helpLink: elasticsearch
+          helpLink: elasticsearch.html
         data_stream:
           hidden:
             description: Hide the data stream.
-            forcedType: bool
             advanced: True
             readonly: True
-            helpLink: elasticsearch
+            helpLink: elasticsearch.html
           allow_custom_routing:
             description: Allow custom routing for the data stream.
-            forcedType: bool
             advanced: True
             readonly: True
-            helpLink: elasticsearch
+            helpLink: elasticsearch.html
     so-metrics-fleet_server_x_agent_versions: *fleetMetricsSettings
   so_roles:
     so-manager: &soroleSettings
@@ -719,7 +662,7 @@ elasticsearch:
             forcedType: "[]string"
             global: False
             advanced: True
-            helpLink: elasticsearch
+            helpLink: elasticsearch.html
     so-managersearch: *soroleSettings
     so-standalone: *soroleSettings
     so-searchnode: *soroleSettings

salt/firewall/init.sls

@@ -27,12 +27,14 @@ iptables_config:
     - source: salt://firewall/iptables.jinja
     - template: jinja
 
+{%   if grains.os_family == 'RedHat' %}
 disable_firewalld:
   service.dead:
     - name: firewalld
     - enable: False
     - require:
       - file: iptables_config
+{%   endif %}
 
 iptables_restore:
   cmd.run:
@@ -42,6 +44,7 @@ iptables_restore:
     - onlyif:
       - iptables-restore --test {{ iptmap.configfile }}
 
+{%   if grains.os_family == 'RedHat' %}
 enable_firewalld:
   service.running:
     - name: firewalld
@@ -49,6 +52,7 @@ enable_firewalld:
     - onfail:
       - file: iptables_config
       - cmd: iptables_restore
+{%   endif %}
 
 {% else %}
 

salt/firewall/ipt.map.jinja

@@ -1,6 +1,14 @@
-{% set iptmap = {
-    'service': 'iptables',
-    'iptpkg': 'iptables-nft',
-    'persistpkg': 'iptables-nft-services',
-    'configfile': '/etc/sysconfig/iptables'
-} %}
+{% set iptmap = salt['grains.filter_by']({
+    'Debian': {
+        'service': 'netfilter-persistent',
+        'iptpkg': 'iptables',
+        'persistpkg': 'iptables-persistent',
+        'configfile': '/etc/iptables/rules.v4'
+    },
+    'RedHat': {
+        'service': 'iptables',
+        'iptpkg': 'iptables-nft',
+        'persistpkg': 'iptables-nft-services',
+        'configfile': '/etc/sysconfig/iptables'
+    },
+}) %}

salt/firewall/iptables.jinja

@@ -1,5 +1,5 @@
 {%- from 'vars/globals.map.jinja' import GLOBALS %}
-{%- from 'docker/docker.map.jinja' import DOCKERMERGED %}
+{%- from 'docker/docker.map.jinja' import DOCKER %}
 {%- from 'firewall/map.jinja' import FIREWALL_MERGED %}
 {%- set role = GLOBALS.role.split('-')[1] %}
 {%- from 'firewall/containers.map.jinja' import NODE_CONTAINERS %}
@@ -8,9 +8,9 @@
 {%- set D1 = [] %}
 {%- set D2 = [] %}
 {%- for container in NODE_CONTAINERS %}
-{%-   set IP = DOCKERMERGED.containers[container].ip %}
-{%-   if DOCKERMERGED.containers[container].port_bindings is defined %}
-{%-     for binding in DOCKERMERGED.containers[container].port_bindings %}
+{%-   set IP = DOCKER.containers[container].ip %}
+{%-   if DOCKER.containers[container].port_bindings is defined %}
+{%-     for binding in DOCKER.containers[container].port_bindings %}
 {#-       cant split int so we convert to string #}
 {%-       set binding = binding|string %}
 {#-          split the port binding by /. if proto not specified, default is tcp #}
@@ -33,13 +33,13 @@
 {%-           set hostPort = bsa[0] %}
 {%-           set containerPort = bsa[1] %}
 {%-         endif %}
-{%-         do PR.append("-A POSTROUTING -s " ~ DOCKERMERGED.containers[container].ip ~ "/32 -d " ~ DOCKERMERGED.containers[container].ip ~ "/32 -p " ~  proto ~ " -m " ~ proto  ~ " --dport " ~ containerPort ~ " -j MASQUERADE") %}
+{%-         do PR.append("-A POSTROUTING -s " ~ DOCKER.containers[container].ip ~ "/32 -d " ~ DOCKER.containers[container].ip ~ "/32 -p " ~  proto ~ " -m " ~ proto  ~ " --dport " ~ containerPort ~ " -j MASQUERADE") %}
 {%-         if bindip | length and bindip != '0.0.0.0' %}
-{%-           do D1.append("-A DOCKER -d " ~ bindip ~ "/32 ! -i sobridge -p " ~ proto ~ " -m " ~ proto ~ " --dport " ~ hostPort ~ " -j DNAT --to-destination " ~ DOCKERMERGED.containers[container].ip ~ ":" ~ containerPort) %}
+{%-           do D1.append("-A DOCKER -d " ~ bindip ~ "/32 ! -i sobridge -p " ~ proto ~ " -m " ~ proto ~ " --dport " ~ hostPort ~ " -j DNAT --to-destination " ~ DOCKER.containers[container].ip ~ ":" ~ containerPort) %}
 {%-         else %}
-{%-           do D1.append("-A DOCKER ! -i sobridge -p " ~ proto ~ " -m " ~ proto ~ " --dport " ~ hostPort ~ " -j DNAT --to-destination " ~ DOCKERMERGED.containers[container].ip ~ ":" ~ containerPort) %}
+{%-           do D1.append("-A DOCKER ! -i sobridge -p " ~ proto ~ " -m " ~ proto ~ " --dport " ~ hostPort ~ " -j DNAT --to-destination " ~ DOCKER.containers[container].ip ~ ":" ~ containerPort) %}
 {%-         endif %}
-{%-         do D2.append("-A DOCKER -d " ~ DOCKERMERGED.containers[container].ip ~ "/32 ! -i sobridge -o sobridge -p " ~ proto ~ " -m " ~ proto ~ " --dport " ~ containerPort ~ " -j ACCEPT") %}
+{%-         do D2.append("-A DOCKER -d " ~ DOCKER.containers[container].ip ~ "/32 ! -i sobridge -o sobridge -p " ~ proto ~ " -m " ~ proto ~ " --dport " ~ containerPort ~ " -j ACCEPT") %}
 {%-     endfor %}
 {%-   endif %}
 {%- endfor %}
@@ -52,7 +52,7 @@
 :DOCKER - [0:0]
 -A PREROUTING -m addrtype --dst-type LOCAL -j DOCKER
 -A OUTPUT ! -d 127.0.0.0/8 -m addrtype --dst-type LOCAL -j DOCKER
--A POSTROUTING -s {{DOCKERMERGED.range}} ! -o sobridge -j MASQUERADE
+-A POSTROUTING -s {{DOCKER.range}} ! -o sobridge -j MASQUERADE
 {%- for rule in PR %}
 {{ rule }}
 {%- endfor %}

salt/firewall/map.jinja

@@ -1,11 +1,11 @@
 {% from 'vars/globals.map.jinja' import GLOBALS %}
-{% from 'docker/docker.map.jinja' import DOCKERMERGED %}
+{% from 'docker/docker.map.jinja' import DOCKER %}
 {% import_yaml 'firewall/defaults.yaml' as FIREWALL_DEFAULT %}
 
 {# add our ip to self #}
 {% do FIREWALL_DEFAULT.firewall.hostgroups.self.append(GLOBALS.node_ip) %}
 {# add dockernet range #}
-{% do FIREWALL_DEFAULT.firewall.hostgroups.dockernet.append(DOCKERMERGED.range) %}
+{% do FIREWALL_DEFAULT.firewall.hostgroups.dockernet.append(DOCKER.range) %}
 
 {% if GLOBALS.role == 'so-idh' %}
 {%   from 'idh/opencanary_config.map.jinja' import IDH_PORTGROUPS %}

salt/firewall/soc_firewall.yaml

@@ -3,7 +3,7 @@ firewall:
     analyst: &hostgroupsettings
       description: List of IP or CIDR blocks to allow access to this hostgroup.
       forcedType: "[]string"
-      helpLink: firewall
+      helpLink: firewall.html
       multiline: True
       regex: ^(([0-9]{1,3}\.){3}[0-9]{1,3}(\/([0-9]|[1-2][0-9]|3[0-2]))?)?$
       regexFailureMessage: You must enter a valid IP address or CIDR.
@@ -11,7 +11,7 @@ firewall:
     anywhere: &hostgroupsettingsadv
       description: List of IP or CIDR blocks to allow access to this hostgroup.
       forcedType: "[]string"
-      helpLink: firewall
+      helpLink: firewall.html
       multiline: True
       advanced: True
       regex: ^(([0-9]{1,3}\.){3}[0-9]{1,3}(\/([0-9]|[1-2][0-9]|3[0-2]))?)?$
@@ -22,7 +22,7 @@ firewall:
     dockernet: &ROhostgroupsettingsadv
       description: List of IP or CIDR blocks to allow access to this hostgroup.
       forcedType: "[]string"
-      helpLink: firewall
+      helpLink: firewall.html
       multiline: True
       advanced: True
       readonly: True
@@ -53,7 +53,7 @@ firewall:
     customhostgroup0: &customhostgroupsettings
       description: List of IP or CIDR blocks to allow to this hostgroup.
       forcedType: "[]string"
-      helpLink: firewall
+      helpLink: firewall.html
       advanced: True
       multiline: True
       regex: ^(([0-9]{1,3}\.){3}[0-9]{1,3}(\/([0-9]|[1-2][0-9]|3[0-2]))?)?$
@@ -73,14 +73,14 @@ firewall:
       tcp: &tcpsettings
         description: List of TCP ports for this port group.
         forcedType: "[]string"
-        helpLink: firewall
+        helpLink: firewall.html
         advanced: True
         multiline: True
         duplicates: True
       udp: &udpsettings
         description: List of UDP ports for this port group.
         forcedType: "[]string"
-        helpLink: firewall
+        helpLink: firewall.html
         advanced: True
         multiline: True
         duplicates: True
@@ -206,7 +206,7 @@ firewall:
                 advanced: True
                 multiline: True
                 forcedType: "[]string"
-                helpLink: firewall
+                helpLink: firewall.html
                 duplicates: True
             sensor:
               portgroups: *portgroupsdocker
@@ -262,7 +262,7 @@ firewall:
                 advanced: True
                 multiline: True
                 forcedType: "[]string"
-                helpLink: firewall
+                helpLink: firewall.html
                 duplicates: True
             dockernet: 
               portgroups: *portgroupshost

salt/host/soc_host.yaml

@@ -1,7 +1,7 @@
 host:
   mainint:
     description: Main interface of the grid host.
-    helpLink: ip-address
+    helpLink: host.html    
   mainip:
     description: Main IP address of the grid host.
-    helpLink: ip-address
+    helpLink: host.html

salt/hydra/enabled.sls

@@ -11,7 +11,7 @@
 
 {% from 'allowed_states.map.jinja' import allowed_states %}
 {% if sls.split('.')[0] in allowed_states %}
-{%   from 'docker/docker.map.jinja' import DOCKERMERGED %}
+{%   from 'docker/docker.map.jinja' import DOCKER %}
 {%   from 'vars/globals.map.jinja' import GLOBALS %}
 {%   if 'api' in salt['pillar.get']('features', []) %}
 
@@ -26,38 +26,32 @@ so-hydra:
     - name: so-hydra
     - networks:
       - sobridge:
-        - ipv4_address: {{ DOCKERMERGED.containers['so-hydra'].ip }}
+        - ipv4_address: {{ DOCKER.containers['so-hydra'].ip }}
     - binds:
       - /opt/so/conf/hydra/:/hydra-conf:ro
       - /opt/so/log/hydra/:/hydra-log:rw
       - /nsm/hydra/db:/hydra-data:rw
-      {% if DOCKERMERGED.containers['so-hydra'].custom_bind_mounts %}
-        {% for BIND in DOCKERMERGED.containers['so-hydra'].custom_bind_mounts %}
+      {% if DOCKER.containers['so-hydra'].custom_bind_mounts %}
+        {% for BIND in DOCKER.containers['so-hydra'].custom_bind_mounts %}
       - {{ BIND }}
         {% endfor %}
       {% endif %}
     - port_bindings:
-      {% for BINDING in DOCKERMERGED.containers['so-hydra'].port_bindings %}
+      {% for BINDING in DOCKER.containers['so-hydra'].port_bindings %}
       - {{ BINDING }}
       {% endfor %}
-    {% if DOCKERMERGED.containers['so-hydra'].extra_hosts %}
+    {% if DOCKER.containers['so-hydra'].extra_hosts %}
     - extra_hosts:
-      {% for XTRAHOST in DOCKERMERGED.containers['so-hydra'].extra_hosts %}
+      {% for XTRAHOST in DOCKER.containers['so-hydra'].extra_hosts %}
       - {{ XTRAHOST }}
       {% endfor %}
     {% endif %}
-    {% if DOCKERMERGED.containers['so-hydra'].extra_env %}
+    {% if DOCKER.containers['so-hydra'].extra_env %}
     - environment:
-      {% for XTRAENV in DOCKERMERGED.containers['so-hydra'].extra_env %}
+      {% for XTRAENV in DOCKER.containers['so-hydra'].extra_env %}
       - {{ XTRAENV }}
       {% endfor %}
     {% endif %}
-    {% if DOCKERMERGED.containers['so-hydra'].ulimits %}
-    - ulimits:
-    {%   for ULIMIT in DOCKERMERGED.containers['so-hydra'].ulimits %}
-      - {{ ULIMIT.name }}={{ ULIMIT.soft }}:{{ ULIMIT.hard }}
-    {%   endfor %}
-    {% endif %}
     - restart_policy: unless-stopped
     - watch:
       - file: hydraconfig
@@ -73,7 +67,7 @@ delete_so-hydra_so-status.disabled:
 
 wait_for_hydra:
   http.wait_for_successful_query:
-    - name: 'http://{{ GLOBALS.manager }}:4444/health/alive'
+    - name: 'http://{{ GLOBALS.manager }}:4444/'
     - ssl: True
     - verify_ssl: False
     - status:

salt/hydra/soc_hydra.yaml

@@ -1,8 +1,7 @@
 hydra:
   enabled:
-    description: Enables or disables the API authentication system, used for service account authentication. Enabling this feature requires a valid Security Onion license key. Defaults to False.
-    forcedType: bool
-    helpLink: connect-api
+    description: Enables or disables the API authentication system, used for service account authentication. Enabling this feature requires a valid Security Onion license key. Defaults to False. 
+    helpLink: connect.html
     global: True
   config:
     ttl:
@@ -10,16 +9,16 @@ hydra:
         description: Amount of time that the generated access token will be valid. Specified in the form of 2h, which means 2 hours.
         global: True
         forcedType: string
-        helpLink: connect-api
+        helpLink: connect.html
     log:
       level: 
         description: Log level to use for Kratos logs.
         global: True
-        helpLink: connect-api
+        helpLink: connect.html
       format: 
         description: Log output format for Kratos logs.
         global: True
-        helpLink: connect-api
+        helpLink: connect.html
     secrets:
       system: 
         description: Secrets used for token generation. Generated during installation.
@@ -27,4 +26,4 @@ hydra:
         sensitive: True
         advanced: True
         forcedType: "[]string"
-        helpLink: connect-api
+        helpLink: connect.html

salt/idh/enabled.sls

@@ -6,7 +6,7 @@
 {% 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 DOCKERMERGED %}
+{%   from 'docker/docker.map.jinja' import DOCKER %}
 
 include:
   - idh.config
@@ -22,29 +22,23 @@ so-idh:
       - /nsm/idh:/var/tmp:rw
       - /opt/so/conf/idh/http-skins:/usr/local/lib/python3.12/site-packages/opencanary/modules/data/http/skin:ro
       - /opt/so/conf/idh/opencanary.conf:/etc/opencanaryd/opencanary.conf:ro
-      {% if DOCKERMERGED.containers['so-idh'].custom_bind_mounts %}
-        {% for BIND in DOCKERMERGED.containers['so-idh'].custom_bind_mounts %}
+      {% if DOCKER.containers['so-idh'].custom_bind_mounts %}
+        {% for BIND in DOCKER.containers['so-idh'].custom_bind_mounts %}
       - {{ BIND }}
         {% endfor %}
       {% endif %}
-    {% if DOCKERMERGED.containers['so-idh'].extra_hosts %}
+    {% if DOCKER.containers['so-idh'].extra_hosts %}
     - extra_hosts:
-      {% for XTRAHOST in DOCKERMERGED.containers['so-idh'].extra_hosts %}
+      {% for XTRAHOST in DOCKER.containers['so-idh'].extra_hosts %}
       - {{ XTRAHOST }}
       {% endfor %}
     {% endif %}
-    {% if DOCKERMERGED.containers['so-idh'].extra_env %}
+    {% if DOCKER.containers['so-idh'].extra_env %}
     - environment:
-      {% for XTRAENV in DOCKERMERGED.containers['so-idh'].extra_env %}
+      {% for XTRAENV in DOCKER.containers['so-idh'].extra_env %}
       - {{ XTRAENV }}
       {% endfor %}
     {% endif %}
-    {% if DOCKERMERGED.containers['so-idh'].ulimits %}
-    - ulimits:
-    {%   for ULIMIT in DOCKERMERGED.containers['so-idh'].ulimits %}
-      - {{ ULIMIT.name }}={{ ULIMIT.soft }}:{{ ULIMIT.hard }}
-    {%   endfor %}
-    {% endif %}
     - watch:
       - file: opencanary_config
     - require:

salt/idh/openssh/config.sls

@@ -3,6 +3,7 @@
 include:
   - idh.openssh
 
+{% if grains.os_family == 'RedHat' %}
 idh_sshd_selinux:
   selinux.port_policy_present:
     - port: {{ openssh_map.config.port }}
@@ -12,6 +13,7 @@ idh_sshd_selinux:
       - file: openssh_config
     - require:
       - pkg: python_selinux_mgmt_tools
+{% endif %}
 
 openssh_config:
   file.replace:

salt/idh/openssh/init.sls

@@ -16,6 +16,8 @@ openssh:
     - name: {{ openssh_map.service }}
   {% endif %}
 
+{% if grains.os_family == 'RedHat' %}
 python_selinux_mgmt_tools:
   pkg.installed:
     - name: policycoreutils-python-utils
+{% endif %}

salt/idh/soc_idh.yaml

@@ -1,12 +1,7 @@
 idh:
   enabled:
-    description: Enables or disables the Intrusion Detection Honeypot (IDH) process.
-    forcedType: bool
-    helpLink: idh
-  restrict_management_ip:
-    description: Restricts management IP access to the IDH node.
-    forcedType: bool
-    helpLink: idh
+    description: Enables or disables the Intrusion Detection Honeypot (IDH) process. 
+    helpLink: idh.html
   opencanary:
     config:
       logger:
@@ -15,7 +10,7 @@ idh:
           readonly: True
           advanced: True
           global: True
-          helpLink: idh
+          helpLink: idh.html
         kwargs:
             formatters:
               plain:
@@ -29,54 +24,53 @@ idh:
                   filename: *loggingOptions
       portscan_x_enabled: &serviceOptions
         description: To enable this opencanary module, set this value to true. To disable set to false. This option only applies to IDH nodes within your grid.
-        forcedType: bool
-        helpLink: idh
+        helpLink: idh.html
       portscan_x_logfile: *loggingOptions
       portscan_x_synrate:
         description: Portscan - syn rate limiting
         advanced: True
-        helpLink: idh 
+        helpLink: idh.html 
       portscan_x_nmaposrate:
         description: Portscan - nmap OS rate limiting
         advanced: True
-        helpLink: idh  
+        helpLink: idh.html  
       portscan_x_lorate: 
         description: Portscan - lo rate limiting
         advanced: True
-        helpLink: idh 
+        helpLink: idh.html 
       tcpbanner_x_maxnum:
         description:  Portscan - maxnum
         advanced: True
-        helpLink: idh 
+        helpLink: idh.html 
       tcpbanner_x_enabled: *serviceOptions
       tcpbanner_1_x_enabled: *serviceOptions
       tcpbanner_1_x_port: &portOptions
         description: Port the service should listen on.
         advanced: True
-        helpLink: idh
+        helpLink: idh.html
       tcpbanner_1_x_datareceivedbanner: &bannerOptions
         description: Data Received Banner
         advanced: True
-        helpLink: idh 
+        helpLink: idh.html 
       tcpbanner_1_x_initbanner: *bannerOptions
       tcpbanner_1_x_alertstring_x_enabled: *serviceOptions
       tcpbanner_1_x_keep_alive_x_enabled: *serviceOptions
       tcpbanner_1_x_keep_alive_secret:
         description: Keep Alive Secret
         advanced: True
-        helpLink: idh 
+        helpLink: idh.html 
       tcpbanner_1_x_keep_alive_probes:
         description: Keep Alive Probes
         advanced: True
-        helpLink: idh  
+        helpLink: idh.html  
       tcpbanner_1_x_keep_alive_interval:
         description: Keep Alive Interval
         advanced: True
-        helpLink: idh 
+        helpLink: idh.html 
       tcpbanner_1_x_keep_alive_idle:
         description: Keep Alive Idle
         advanced: True
-        helpLink: idh 
+        helpLink: idh.html 
       ftp_x_enabled: *serviceOptions
       ftp_x_port: *portOptions
       ftp_x_banner: *bannerOptions
@@ -88,11 +82,11 @@ idh:
       http_x_skin: &skinOptions
         description: HTTP skin
         advanced: True
-        helpLink: idh
+        helpLink: idh.html
       http_x_skinlist: &skinlistOptions
         description: List of skins to use for the service.
         advanced: True
-        helpLink: idh
+        helpLink: idh.html
       httpproxy_x_enabled: *serviceOptions
       httpproxy_x_port: *portOptions
       httpproxy_x_skin: *skinOptions
@@ -101,7 +95,7 @@ idh:
       mssql_x_version: &versionOptions
         description: Specify the version the service should present.
         advanced: True
-        helpLink: idh
+        helpLink: idh.html
       mssql_x_port: *portOptions
       mysql_x_enabled: *serviceOptions
       mysql_x_port: *portOptions
@@ -125,17 +119,16 @@ idh:
       telnet_x_honeycreds:
         description: Credentials list for the telnet service.
         advanced: True
-        helpLink: idh
+        helpLink: idh.html
       tftp_x_enabled: *serviceOptions
       tftp_x_port: *portOptions
       vnc_x_enabled: *serviceOptions
       vnc_x_port: *portOptions
   openssh:
-    enable:
+    enable: 
       description: This is the real SSH service for the host machine.
-      forcedType: bool
-      helpLink: idh
+      helpLink: idh.html
     config:
       port:
         description: Port that the real SSH service will listen on and will only be accessible from the manager.
-        helpLink: idh
+        helpLink: idh.html

salt/influxdb/enabled.sls

@@ -6,7 +6,7 @@
 {% 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 DOCKERMERGED %}
+{%   from 'docker/docker.map.jinja' import DOCKER %}
 {%   set PASSWORD = salt['pillar.get']('secrets:influx_pass') %}
 {%   set TOKEN = salt['pillar.get']('influxdb:token') %}
 
@@ -21,7 +21,7 @@ so-influxdb:
     - hostname: influxdb
     - networks:
       - sobridge:
-        - ipv4_address: {{ DOCKERMERGED.containers['so-influxdb'].ip }}
+        - ipv4_address: {{ DOCKER.containers['so-influxdb'].ip }}
     - environment:
       - INFLUXD_CONFIG_PATH=/conf/config.yaml
       - INFLUXDB_HTTP_LOG_ENABLED=false
@@ -31,8 +31,8 @@ so-influxdb:
       - DOCKER_INFLUXDB_INIT_ORG=Security Onion
       - DOCKER_INFLUXDB_INIT_BUCKET=telegraf/so_short_term
       - DOCKER_INFLUXDB_INIT_ADMIN_TOKEN={{ TOKEN }}
-      {% if DOCKERMERGED.containers['so-influxdb'].extra_env %}
-        {% for XTRAENV in DOCKERMERGED.containers['so-influxdb'].extra_env %}
+      {% if DOCKER.containers['so-influxdb'].extra_env %}
+        {% for XTRAENV in DOCKER.containers['so-influxdb'].extra_env %}
       - {{ XTRAENV }}
         {% endfor %}
       {% endif %}
@@ -43,27 +43,21 @@ so-influxdb:
       - /nsm/influxdb:/var/lib/influxdb2:rw
       - /etc/pki/influxdb.crt:/conf/influxdb.crt:ro
       - /etc/pki/influxdb.key:/conf/influxdb.key:ro
-      {% if DOCKERMERGED.containers['so-influxdb'].custom_bind_mounts %}
-        {% for BIND in DOCKERMERGED.containers['so-influxdb'].custom_bind_mounts %}
+      {% if DOCKER.containers['so-influxdb'].custom_bind_mounts %}
+        {% for BIND in DOCKER.containers['so-influxdb'].custom_bind_mounts %}
       - {{ BIND }}
         {% endfor %}
       {% endif %}
     - port_bindings:
-      {% for BINDING in DOCKERMERGED.containers['so-influxdb'].port_bindings %}
+      {% for BINDING in DOCKER.containers['so-influxdb'].port_bindings %}
       - {{ BINDING }}
       {% endfor %}
-    {% if DOCKERMERGED.containers['so-influxdb'].extra_hosts %}
+    {% if DOCKER.containers['so-influxdb'].extra_hosts %}
     - extra_hosts:
-      {% for XTRAHOST in DOCKERMERGED.containers['so-influxdb'].extra_hosts %}
+      {% for XTRAHOST in DOCKER.containers['so-influxdb'].extra_hosts %}
       - {{ XTRAHOST }}
       {% endfor %}
     {% endif %}
-    {% if DOCKERMERGED.containers['so-influxdb'].ulimits %}
-    - ulimits:
-    {%   for ULIMIT in DOCKERMERGED.containers['so-influxdb'].ulimits %}
-      - {{ ULIMIT.name }}={{ ULIMIT.soft }}:{{ ULIMIT.hard }}
-    {%   endfor %}
-    {% endif %}
     - watch:
       - file: influxdbconf
       - x509: influxdb_key

salt/influxdb/soc_influxdb.yaml

@@ -1,372 +1,358 @@
 influxdb:
   enabled:
     description: Enables the grid metrics collection storage system. Security Onion grid health monitoring requires this process to remain enabled. WARNING - Disabling the process is unsupported, and will cause unexpected results.
-    forcedType: bool
-    helpLink: influxdb
+    helpLink: influxdb.html
   config:
     assets-path:
       description: Path to the InfluxDB user interface assets located inside the so-influxdb container.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     bolt-path:
       description: Path to the bolt DB file located inside the so-influxdb container.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     engine-path:
       description: Path to the engine directory located inside the so-influxdb container. This directory stores the time series data.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     feature-flags:
       description: List of key=value flags to enable.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     flux-log-enabled:
       description: Controls whether detailed flux query logging is enabled.
-      forcedType: bool
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     hardening-enabled:
       description: If true, enforces outbound connections from the InfluxDB process must never attempt to reach an internal, private network address.
-      forcedType: bool
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     http-bind-address:
       description: The URL and port on which InfluxDB will listen for new connections.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     http-idle-timeout:
       description: Keep-alive timeout while a connection waits for new requests. A value of 0 is the same as no timeout enforced.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     http-read-header-timeout:
       description: The duration to wait for a request header before closing the connection. A value of 0 is the same as no timeout enforced.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     http-read-timeout:
       description: The duration to wait for the request to be fully read before closing the connection. A value of 0 is the same as no timeout enforced.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     http-write-timeout:
       description: The duration to wait for the response to be fully written before closing the connection. A value of 0 is the same as no timeout enforced.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     influxql-max-select-buckets:
       description: Maximum number of group-by clauses in a SELECT statement. A value of 0 is the same as unlimited.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     influxql-max-select-point:
       description: Maximum number of points that can be queried in a SELECT statement. A value of 0 is the same as unlimited.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     influxql-max-select-series:
       description: Maximum number of series that can be returned in a SELECT statement. A value of 0 is the same as unlimited.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     instance-id:
       description: Unique instance ID for this server, to avoid collisions in a replicated cluster.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     log-level:
       description: The log level to use for outputting log statements. Allowed values are debug, info, or error.
       global: True
       advanced: false
       regex: ^(info|debug|error)$
-      helpLink: influxdb
+      helpLink: influxdb.html
     metrics-disabled:
       description: If true, the HTTP endpoint that exposes internal InfluxDB metrics will be inaccessible.
-      forcedType: bool
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     no-tasks:
       description: If true, the task system will not process any queued tasks. Useful for troubleshooting startup problems.
-      forcedType: bool
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     pprof-disabled:
       description: If true, the profiling data HTTP endpoint will be inaccessible.
-      forcedType: bool
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     query-concurrency:
       description: Maximum number of queries to execute concurrently. A value of 0 is the same as unlimited.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     query-initial-memory-bytes:
       description: The initial number of bytes of memory to allocate for a new query.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     query-max-memory-bytes:
       description: The number of bytes of memory to allocate to all running queries. Should typically be the query bytes times the max concurrent queries.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     query-memory-bytes:
       description: Maximum number of bytes of memory to allocate to a query.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     query-queue-size:
       description: Maximum number of queries that can be queued at one time. If this value is reached, new queries will not be queued. A value of 0 is the same as unlimited.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     reporting-disabled:
       description: If true, prevents InfluxDB from sending telemetry updates to InfluxData's servers.
-      forcedType: bool
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     secret-store:
       description: Determines the type of storage used for secrets. Allowed values are bolt or vault.
       global: True
       advanced: True
       regex: ^(bolt|vault)$
-      helpLink: influxdb
+      helpLink: influxdb.html
     session-length:
       description: Number of minutes that a user login session can remain authenticated. 
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     session-renew-disabled:
       description: If true, user login sessions will renew after each request.
-      forcedType: bool
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     sqlite-path:
       description: Path to the Sqlite3 database inside the container. This database stored user data and other information about the database.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     storage-cache-max-memory-size:
       description: Maximum number of bytes to allocate to cache data per shard. If exceeded, new data writes will be rejected.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     storage-cache-snapshot-memory-size:
       description: Number of bytes to allocate to cache snapshot data. When the cache reaches this size, it will be written to disk to increase available memory.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     storage-cache-snapshot-write-cold-duration:
       description: Duration between snapshot writes to disk when the shard data hasn't been modified.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     storage-compact-full-write-cold-duration:
       description: Duration between shard compactions when the shard data hasn't been modified.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     storage-compact-throughput-burst:
       description: Maximum throughput (number of bytes per second) that compactions be written to disk.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     storage-max-concurrent-compactions:
       description: Maximum number of concurrent compactions. A value of 0 is the same as half the available CPU processors (procs).
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     storage-max-index-log-file-size:
       description: Maximum number of bytes of a write-ahead log (WAL) file before it will be compacted into an index on disk.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     storage-no-validate-field-size:
       description: If true, incoming requests will skip the field size validation.
-      forcedType: bool
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     storage-retention-check-interval:
       description: Interval between reviewing each bucket's retention policy and the age of the associated data.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     storage-series-file-max-concurrent-snapshot-compactions:
       description: Maximum number of concurrent snapshot compactions across all database partitions.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     storage-series-id-set-cache-size:
       description: Maximum size of the series cache results. Higher values may increase performance for repeated data lookups.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     storage-shard-precreator-advance-period:
       description: The duration before a successor shard group is created after the end-time has been reached. 
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     storage-shard-precreator-check-interval:
       description: Interval between checking if new shards should be created.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     storage-tsm-use-madv-willneed:
       description: If true, InfluxDB will manage TSM memory paging.
-      forcedType: bool
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     storage-validate-keys:
       description: If true, validates incoming requests for supported characters.
-      forcedType: bool
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     storage-wal-fsync-delay:
       description: Duration to wait before calling fsync. Useful for handling conflicts on slower disks.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     storage-wal-max-concurrent-writes:
       description: Maximum number of concurrent write-ahead log (WAL) writes to disk. The value of 0 is the same as CPU processors (procs) x 2.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     storage-wal-max-write-delay:
       description: Maximum duration to wait before writing the write-ahead log (WAL) to disk, when the concurrency limit has been exceeded. A value of 0 is the same as no timeout.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     storage-write-timeout:
       description: Maximum time to wait for a write-ahead log (WAL) to write to disk before aborting.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     store:
       description: The type of data store to use for HTTP resources. Allowed values are disk or memory. Memory should not be used for production Security Onion installations.
       global: True
       advanced: True
       regex: ^(disk|memory)$
-      helpLink: influxdb
+      helpLink: influxdb.html
     tls-cert: 
       description: The container path to the certificate to use for TLS encryption of the HTTP requests and responses.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     tls-key: 
       description: The container path to the certificate key to use for TLS encryption of the HTTP requests and responses.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     tls-min-version: 
       description: The minimum supported version of TLS to be enforced on all incoming HTTP requests.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     tls-strict-ciphers:
       description: If true, the allowed ciphers used with TLS connections are ECDHE_RSA_WITH_AES_256_GCM_SHA384, ECDHE_RSA_WITH_AES_256_CBC_SHA, RSA_WITH_AES_256_GCM_SHA384, or RSA_WITH_AES_256_CBC_SHA.
-      forcedType: bool
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     tracing-type: 
       description: The tracing format for debugging purposes. Allowed values are log or jaeger, or leave blank to disable tracing.
       global: True
       advanced: True
-      helpLink: influxdb
-    ui-disabled:
+      helpLink: influxdb.html
+    ui-disabled: 
       description: If true, the InfluxDB HTTP user interface will be disabled. This will prevent use of the included InfluxDB dashboard visualizations.
-      forcedType: bool
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     vault-addr: 
       description: Vault server address.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     vault-cacert: 
       description: Path to the Vault's single certificate authority certificate file within the container.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     vault-capath: 
       description: Path to the Vault's certificate authority directory within the container.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     vault-client-cert: 
       description: Vault client certificate path within the container.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     vault-client-key: 
       description: Vault client certificate key path within the container.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     vault-client-timeout: 
       description: Duration to wait for a response from the Vault server before aborting.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     vault-max-retries:
       description: Maximum number of retries when attempting to contact the Vault server. A value of 0 is the same as disabling retries.
       global: True
       advanced: True
-      helpLink: influxdb
-    vault-skip-verify:
+      helpLink: influxdb.html
+    vault-skip-verify: 
       description: Skip certification validation of the Vault server.
-      forcedType: bool
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     vault-tls-server-name: 
       description: SNI host to specify when using TLS to connect to the Vault server.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
     vault-token:   
       description: Vault token used for authentication.
       global: True
       advanced: True
-      helpLink: influxdb
+      helpLink: influxdb.html
   buckets:
     so_short_term:
       duration:
         description: Amount of time (in seconds) to keep short term data.
         global: True
-        helpLink: influxdb
+        helpLink: influxdb.html
       shard_duration:
         description: Amount of the time (in seconds) range covered by the shard group.
         global: True
-        helpLink: influxdb
+        helpLink: influxdb.html
     so_long_term:
       duration:
         description: Amount of time (in seconds) to keep long term downsampled data.
         global: True
-        helpLink: influxdb
+        helpLink: influxdb.html
       shard_duration:
         description: Amount of the time (in seconds) range covered by the shard group.
         global: True
-        helpLink: influxdb
+        helpLink: influxdb.html
   downsample:
     so_long_term:
       resolution:
         description: Amount of time to turn into a single data point.
         global: True
-        helpLink: influxdb
+        helpLink: influxdb.html

salt/kafka/enabled.sls

@@ -12,7 +12,7 @@
 {% 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 DOCKERMERGED %}
+{%   from 'docker/docker.map.jinja' import DOCKER %}
 {%   set KAFKANODES = salt['pillar.get']('kafka:nodes') %}
 {%   set KAFKA_EXTERNAL_ACCESS = salt['pillar.get']('kafka:config:external_access:enabled', default=False) %}
 {%   if 'gmd' in salt['pillar.get']('features', []) %}
@@ -31,22 +31,22 @@ so-kafka:
     - name: so-kafka
     - networks:
       - sobridge:
-        - ipv4_address: {{ DOCKERMERGED.containers['so-kafka'].ip }}
+        - ipv4_address: {{ DOCKER.containers['so-kafka'].ip }}
     - user: kafka
     - environment:
         KAFKA_HEAP_OPTS: -Xmx2G -Xms1G
-        KAFKA_OPTS: "-javaagent:/opt/jolokia/agents/jolokia-agent-jvm-javaagent.jar=port=8778,host={{ DOCKERMERGED.containers['so-kafka'].ip }},policyLocation=file:/opt/jolokia/jolokia.xml {%- if KAFKA_EXTERNAL_ACCESS %} -Djava.security.auth.login.config=/opt/kafka/config/kafka_server_jaas.conf {% endif -%}"
+        KAFKA_OPTS: "-javaagent:/opt/jolokia/agents/jolokia-agent-jvm-javaagent.jar=port=8778,host={{ DOCKER.containers['so-kafka'].ip }},policyLocation=file:/opt/jolokia/jolokia.xml {%- if KAFKA_EXTERNAL_ACCESS %} -Djava.security.auth.login.config=/opt/kafka/config/kafka_server_jaas.conf {% endif -%}"
     - extra_hosts:
       {% for node in KAFKANODES %}
       - {{ node }}:{{ KAFKANODES[node].ip }}
       {% endfor %}
-      {% if DOCKERMERGED.containers['so-kafka'].extra_hosts %}
-      {%   for XTRAHOST in DOCKERMERGED.containers['so-kafka'].extra_hosts %}
+      {% if DOCKER.containers['so-kafka'].extra_hosts %}
+      {%   for XTRAHOST in DOCKER.containers['so-kafka'].extra_hosts %}
       - {{ XTRAHOST }}
       {%   endfor %}
       {% endif %}
     - port_bindings:
-      {% for BINDING in DOCKERMERGED.containers['so-kafka'].port_bindings %}
+      {% for BINDING in DOCKER.containers['so-kafka'].port_bindings %}
       - {{ BINDING }}
       {% endfor %}
     - binds:
@@ -60,12 +60,6 @@ so-kafka:
       {% if KAFKA_EXTERNAL_ACCESS %}
       - /opt/so/conf/kafka/kafka_server_jaas.conf:/opt/kafka/config/kafka_server_jaas.conf:ro
       {% endif %}
-    {% if DOCKERMERGED.containers['so-kafka'].ulimits %}
-    - ulimits:
-    {%   for ULIMIT in DOCKERMERGED.containers['so-kafka'].ulimits %}
-      - {{ ULIMIT.name }}={{ ULIMIT.soft }}:{{ ULIMIT.hard }}
-    {%   endfor %}
-    {% endif %}
     - watch:
       {% for sc in ['server', 'client'] %}
       - file: kafka_kraft_{{sc}}_properties

salt/kafka/soc_kafka.yaml

@@ -1,258 +1,257 @@
 kafka:
   enabled:
     description: Set to True to enable Kafka. To avoid grid problems, do not enable Kafka until the related configuration is in place. Requires a valid Security Onion license key.
-    forcedType: bool
-    helpLink: kafka
+    helpLink: kafka.html
   cluster_id:
     description: The ID of the Kafka cluster.
     readonly: True
     advanced: True
     sensitive: True
-    helpLink: kafka
+    helpLink: kafka.html
   controllers:
     description: A comma-separated list of hostnames that will act as Kafka controllers. These hosts will be responsible for managing the Kafka cluster. Note that only manager and receiver nodes are eligible to run Kafka. This configuration needs to be set before enabling Kafka. Failure to do so may result in Kafka topics becoming unavailable requiring manual intervention to restore functionality or reset Kafka, either of which can result in data loss.
     forcedType: string
-    helpLink: kafka
+    helpLink: kafka.html
   reset:
     description: Disable and reset the Kafka cluster. This will remove all Kafka data including logs that may have not yet been ingested into Elasticsearch and reverts the grid to using REDIS as the global pipeline. This is useful when testing different Kafka configurations such as rearranging Kafka brokers / controllers allowing you to reset the cluster rather than manually fixing any issues arising from attempting to reassign a Kafka broker into a controller. Enter 'YES_RESET_KAFKA' and submit to disable and reset Kafka. Make any configuration changes required and re-enable Kafka when ready. This action CANNOT be reversed.
     advanced: True
-    helpLink: kafka
+    helpLink: kafka.html
   logstash:
     description: By default logstash is disabled when Kafka is enabled. This option allows you to specify any hosts you would like to re-enable logstash on alongside Kafka.
     forcedType: "[]string"
     multiline: True
     advanced: True
-    helpLink: kafka
+    helpLink: kafka.html
   config:
     password:
       description: The password used for the Kafka certificates.
       readonly: True
       sensitive: True
-      helpLink: kafka
+      helpLink: kafka.html
     trustpass:
       description: The password used for the Kafka truststore.
       readonly: True
       sensitive: True
-      helpLink: kafka
+      helpLink: kafka.html
     broker:
       auto_x_create_x_topics_x_enable:
         description: Enable the auto creation of topics.
         title: auto.create.topics.enable
         forcedType: bool
-        helpLink: kafka
+        helpLink: kafka.html
       default_x_replication_x_factor:
         description: The default replication factor for automatically created topics. This value must be less than the amount of brokers in the cluster. Hosts specified in controllers should not be counted towards total broker count.
         title: default.replication.factor
         forcedType: int
-        helpLink: kafka
+        helpLink: kafka.html
       inter_x_broker_x_listener_x_name:
         description: The name of the listener used for inter-broker communication.
         title: inter.broker.listener.name
-        helpLink: kafka
+        helpLink: kafka.html
       listeners:
         description: Set of URIs that is listened on and the listener names in a comma-seperated list.
-        helpLink: kafka
+        helpLink: kafka.html
       listener_x_security_x_protocol_x_map:
         description: Comma-seperated mapping of listener name and security protocols.
         title: listener.security.protocol.map
-        helpLink: kafka
+        helpLink: kafka.html
       log_x_dirs:
         description: Where Kafka logs are stored within the Docker container.
         title: log.dirs
-        helpLink: kafka
+        helpLink: kafka.html
       log_x_retention_x_check_x_interval_x_ms:
         description: Frequency at which log files are checked if they are qualified for deletion.
         title: log.retention.check.interval.ms
-        helpLink: kafka
+        helpLink: kafka.html
       log_x_retention_x_hours:
         description: How long, in hours, a log file is kept.
         title: log.retention.hours
         forcedType: int
-        helpLink: kafka
+        helpLink: kafka.html
       log_x_segment_x_bytes:
         description: The maximum allowable size for a log file.
         title: log.segment.bytes
         forcedType: int
-        helpLink: kafka
+        helpLink: kafka.html
       num_x_io_x_threads:
         description: The number of threads used by Kafka.
         title: num.io.threads
         forcedType: int
-        helpLink: kafka
+        helpLink: kafka.html
       num_x_network_x_threads:
         description: The number of threads used for network communication.
         title: num.network.threads
         forcedType: int
-        helpLink: kafka
+        helpLink: kafka.html
       num_x_partitions:
         description: The number of log partitions assigned per topic.
         title: num.partitions
         forcedType: int
-        helpLink: kafka
+        helpLink: kafka.html
       num_x_recovery_x_threads_x_per_x_data_x_dir:
         description: The number of threads used for log recuperation at startup and purging at shutdown. This ammount of threads is used per data directory.
         title: num.recovery.threads.per.data.dir
         forcedType: int
-        helpLink: kafka
+        helpLink: kafka.html
       offsets_x_topic_x_replication_x_factor:
         description: The offsets topic replication factor.
         title: offsets.topic.replication.factor
         forcedType: int
-        helpLink: kafka
+        helpLink: kafka.html
       process_x_roles:
         description: The role performed by Kafka brokers.
         title: process.roles
         readonly: True
-        helpLink: kafka
+        helpLink: kafka.html
       socket_x_receive_x_buffer_x_bytes:
         description: Size, in bytes of the SO_RCVBUF buffer. A value of -1 will use the OS default.
         title: socket.receive.buffer.bytes
         #forcedType: int - soc needs to allow -1 as an int before we can use this
-        helpLink: kafka
+        helpLink: kafka.html
       socket_x_request_x_max_x_bytes:
         description: The maximum bytes allowed for a request to the socket.
         title: socket.request.max.bytes
         forcedType: int
-        helpLink: kafka
+        helpLink: kafka.html
       socket_x_send_x_buffer_x_bytes:
         description: Size, in bytes of the SO_SNDBUF buffer. A value of -1 will use the OS default.
         title: socket.send.buffer.byte
         #forcedType: int - soc needs to allow -1 as an int before we can use this
-        helpLink: kafka
+        helpLink: kafka.html
       ssl_x_keystore_x_location:
         description: The key store file location within the Docker container.
         title: ssl.keystore.location
-        helpLink: kafka
+        helpLink: kafka.html
       ssl_x_keystore_x_password:
         description: The key store file password. Invalid for PEM format.
         title: ssl.keystore.password
         sensitive: True
-        helpLink: kafka
+        helpLink: kafka.html
       ssl_x_keystore_x_type: 
         description: The key store file format.
         title: ssl.keystore.type
         regex: ^(JKS|PKCS12|PEM)$
-        helpLink: kafka
+        helpLink: kafka.html
       ssl_x_truststore_x_location:
         description: The trust store file location within the Docker container.
         title: ssl.truststore.location
-        helpLink: kafka
+        helpLink: kafka.html
       ssl_x_truststore_x_type:
         description: The trust store file format.
         title: ssl.truststore.type
-        helpLink: kafka
+        helpLink: kafka.html
       ssl_x_truststore_x_password:
         description: The trust store file password. If null, the trust store file is still use, but integrity checking is disabled. Invalid for PEM format.
         title: ssl.truststore.password
         sensitive: True
-        helpLink: kafka
+        helpLink: kafka.html
       transaction_x_state_x_log_x_min_x_isr:
         description: Overrides min.insync.replicas for the transaction topic. When a producer configures acks to "all" (or "-1"), this setting determines the minimum number of replicas required to acknowledge a write as successful. Failure to meet this minimum triggers an exception (either NotEnoughReplicas or NotEnoughReplicasAfterAppend). When used in conjunction, min.insync.replicas and acks enable stronger durability guarantees. For instance, creating a topic with a replication factor of 3, setting min.insync.replicas to 2, and using acks of "all" ensures that the producer raises an exception if a majority of replicas fail to receive a write.
         title: transaction.state.log.min.isr
         forcedType: int
-        helpLink: kafka
+        helpLink: kafka.html
       transaction_x_state_x_log_x_replication_x_factor:
         description: Set the replication factor higher for the transaction topic to ensure availability. Internal topic creation will not proceed until the cluster size satisfies this replication factor prerequisite.
         title: transaction.state.log.replication.factor
         forcedType: int
-        helpLink: kafka
+        helpLink: kafka.html
     client:
       security_x_protocol:
         description: 'Broker communication protocol. Options are: SASL_SSL, PLAINTEXT, SSL, SASL_PLAINTEXT'
         title: security.protocol
         regex: ^(SASL_SSL|PLAINTEXT|SSL|SASL_PLAINTEXT)
-        helpLink: kafka
+        helpLink: kafka.html
       ssl_x_keystore_x_location:
         description: The key store file location within the Docker container.
         title: ssl.keystore.location
-        helpLink: kafka
+        helpLink: kafka.html
       ssl_x_keystore_x_password:
         description: The key store file password. Invalid for PEM format.
         title: ssl.keystore.password
         sensitive: True
-        helpLink: kafka
+        helpLink: kafka.html
       ssl_x_keystore_x_type:
         description: The key store file format.
         title: ssl.keystore.type
         regex: ^(JKS|PKCS12|PEM)$
-        helpLink: kafka
+        helpLink: kafka.html
       ssl_x_truststore_x_location:
         description: The trust store file location within the Docker container.
         title: ssl.truststore.location
-        helpLink: kafka
+        helpLink: kafka.html
       ssl_x_truststore_x_type:
         description: The trust store file format.
         title: ssl.truststore.type
-        helpLink: kafka
+        helpLink: kafka.html
       ssl_x_truststore_x_password:
         description: The trust store file password. If null, the trust store file is still use, but integrity checking is disabled. Invalid for PEM format.
         title: ssl.truststore.password
         sensitive: True
-        helpLink: kafka
+        helpLink: kafka.html
     controller:
       controller_x_listener_x_names:
         description: Set listeners used by the controller in a comma-seperated list.
         title: controller.listener.names
-        helpLink: kafka
+        helpLink: kafka.html
       listeners:
         description: Set of URIs that is listened on and the listener names in a comma-seperated list.
-        helpLink: kafka
+        helpLink: kafka.html
       listener_x_security_x_protocol_x_map:
         description: Comma-seperated mapping of listener name and security protocols.
         title: listener.security.protocol.map
-        helpLink: kafka
+        helpLink: kafka.html
       log_x_dirs:
         description: Where Kafka logs are stored within the Docker container.
         title: log.dirs
-        helpLink: kafka
+        helpLink: kafka.html
       log_x_retention_x_check_x_interval_x_ms:
         description: Frequency at which log files are checked if they are qualified for deletion.
         title: log.retention.check.interval.ms
-        helpLink: kafka
+        helpLink: kafka.html
       log_x_retention_x_hours:
         description: How long, in hours, a log file is kept.
         title: log.retention.hours
         forcedType: int
-        helpLink: kafka
+        helpLink: kafka.html
       log_x_segment_x_bytes:
         description: The maximum allowable size for a log file.
         title: log.segment.bytes
         forcedType: int
-        helpLink: kafka
+        helpLink: kafka.html
       process_x_roles:
         description: The role performed by controller node.
         title: process.roles
         readonly: True
-        helpLink: kafka
+        helpLink: kafka.html
     external_access:
       enabled:
         description: Enables or disables access to Kafka topics using user/password authentication. Used for producing / consuming messages via an external client.
         forcedType: bool
-        helpLink: kafka
+        helpLink: kafka.html
       listeners:
         description: Set of URIs that is listened on and the listener names in a comma-seperated list.
         title: listeners
         readonly: True
         advanced: True
-        helpLink: kafka
+        helpLink: kafka.html
       listener_x_security_x_protocol_x_map:
         description: External listener name and mapped security protocol.
         title: listener.security.protocol.map
         readonly: True
         advanced: True
-        helpLink: kafka
+        helpLink: kafka.html
       sasl_x_enabled_x_mechanisms:
         description: SASL/PLAIN is a simple username/password authentication mechanism, used with TLS to implement secure authentication.
         title: sasl.enabled.mechanisms
         readonly: True
         advanced: True
-        helpLink: kafka
+        helpLink: kafka.html
       sasl_x_mechanism_x_inter_x_broker_x_protocol:
         description: SASL mechanism used for inter-broker communication
         title: sasl.mechanism.inter.broker.protocol
         readonly: True
         advanced: True
-        helpLink: kafka
+        helpLink: kafka.html
       remote_users:
         user01: &remote_user
           username:

salt/kibana/enabled.sls

@@ -5,7 +5,7 @@
 
 {% from 'allowed_states.map.jinja' import allowed_states %}
 {% if sls.split('.')[0] in allowed_states %}
-{%   from 'docker/docker.map.jinja' import DOCKERMERGED %}
+{%   from 'docker/docker.map.jinja' import DOCKER %}
 {%   from 'vars/globals.map.jinja' import GLOBALS %}
 
 include:
@@ -20,20 +20,20 @@ so-kibana:
     - user: kibana
     - networks:
       - sobridge:
-        - ipv4_address: {{ DOCKERMERGED.containers['so-kibana'].ip }}
+        - ipv4_address: {{ DOCKER.containers['so-kibana'].ip }}
     - environment:
       - ELASTICSEARCH_HOST={{ GLOBALS.manager }}
       - ELASTICSEARCH_PORT=9200
       - MANAGER={{ GLOBALS.manager }}
-      {% if DOCKERMERGED.containers['so-kibana'].extra_env %}
-        {% for XTRAENV in DOCKERMERGED.containers['so-kibana'].extra_env %}
+      {% if DOCKER.containers['so-kibana'].extra_env %}
+        {% for XTRAENV in DOCKER.containers['so-kibana'].extra_env %}
       - {{ XTRAENV }}
         {% endfor %}
       {% endif %}
     - extra_hosts:
       - {{ GLOBALS.manager }}:{{ GLOBALS.manager_ip }}
-    {% if DOCKERMERGED.containers['so-kibana'].extra_hosts %}
-      {% for XTRAHOST in DOCKERMERGED.containers['so-kibana'].extra_hosts %}
+    {% if DOCKER.containers['so-kibana'].extra_hosts %}
+      {% for XTRAHOST in DOCKER.containers['so-kibana'].extra_hosts %}
       - {{ XTRAHOST }}
       {% endfor %}
     {% endif %}
@@ -42,21 +42,15 @@ so-kibana:
       - /opt/so/log/kibana:/var/log/kibana:rw
       - /opt/so/conf/kibana/customdashboards:/usr/share/kibana/custdashboards:ro
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
-      {% if DOCKERMERGED.containers['so-kibana'].custom_bind_mounts %}
-        {% for BIND in DOCKERMERGED.containers['so-kibana'].custom_bind_mounts %}
+      {% if DOCKER.containers['so-kibana'].custom_bind_mounts %}
+        {% for BIND in DOCKER.containers['so-kibana'].custom_bind_mounts %}
       - {{ BIND }}
         {% endfor %}
       {% endif %}
     - port_bindings:
-      {% for BINDING in DOCKERMERGED.containers['so-kibana'].port_bindings %}
+      {% for BINDING in DOCKER.containers['so-kibana'].port_bindings %}
       - {{ BINDING }}
       {% endfor %}
-    {% if DOCKERMERGED.containers['so-kibana'].ulimits %}
-    - ulimits:
-    {%   for ULIMIT in DOCKERMERGED.containers['so-kibana'].ulimits %}
-      - {{ ULIMIT.name }}={{ ULIMIT.soft }}:{{ ULIMIT.hard }}
-    {%   endfor %}
-    {% endif %}
     - watch:
       - file: kibanaconfig
 

salt/kibana/map.jinja

@@ -5,6 +5,7 @@
 
 {% from 'vars/globals.map.jinja' import GLOBALS %}
 {% import_yaml 'kibana/defaults.yaml' as KIBANADEFAULTS with context %}
+{% set HIGHLANDER = salt['pillar.get']('global:highlander', False) %}
 
 {% do KIBANADEFAULTS.kibana.config.server.update({'publicBaseUrl': 'https://' ~ GLOBALS.url_base ~ '/kibana'}) %}
 {% do KIBANADEFAULTS.kibana.config.elasticsearch.update({'hosts': ['https://' ~ GLOBALS.manager ~ ':9200']}) %}

salt/kibana/so_dashboard_load.sls

@@ -3,6 +3,7 @@
 # https://securityonion.net/license; you may not use this file except in compliance with the
 # Elastic License 2.0.
 
+{% set HIGHLANDER = salt['pillar.get']('global:highlander', False) %}
 include:
   - kibana.enabled
 
@@ -28,3 +29,27 @@ so-kibana-dashboard-load:
     - require:
       - sls: kibana.enabled
       - file: dashboard_saved_objects_template
+{%- if HIGHLANDER %}
+dashboard_saved_objects_template_hl:
+  file.managed:
+    - name: /opt/so/conf/kibana/hl.ndjson.template
+    - source: salt://kibana/files/hl.ndjson
+    - user: 932
+    - group: 939
+    - show_changes: False
+
+dashboard_saved_objects_hl_changes:
+  file.absent:
+    - names:
+      - /opt/so/state/kibana_hl.txt
+    - onchanges:
+      - file: dashboard_saved_objects_template_hl
+
+so-kibana-dashboard-load_hl:
+  cmd.run:
+    - name: /usr/sbin/so-kibana-config-load -i /opt/so/conf/kibana/hl.ndjson.template
+    - cwd: /opt/so
+    - require:
+      - sls: kibana.enabled
+      - file: dashboard_saved_objects_template_hl
+{%- endif %}

salt/kibana/soc_kibana.yaml

@@ -1,46 +1,10 @@
 kibana:
-  enabled:
+  enabled: 
     description: Enables or disables the Kibana front-end interface to Elasticsearch. Due to Kibana being used for loading certain configuration details in Elasticsearch, this process should remain enabled. WARNING - Disabling the process is unsupported, and will cause unexpected results.
-    forcedType: bool
-    helpLink: kibana
+    helpLink: kibana.html
   config:
-    server:
-      rewriteBasePath:
-        description: Specifies whether Kibana should rewrite requests that are prefixed with the server basePath.
-        forcedType: bool
-        global: True
-        advanced: True
-        helpLink: kibana
     elasticsearch:
       requestTimeout:
         description: The length of time before the request reaches timeout.
         global: True
-        helpLink: kibana
-    telemetry:
-      enabled:
-        description: Enables or disables telemetry data collection in Kibana.
-        forcedType: bool
-        global: True
-        advanced: True
-        helpLink: kibana
-    xpack:
-      security:
-        secureCookies:
-          description: Sets the secure flag on session cookies. Cookies are only sent over HTTPS when enabled.
-          forcedType: bool
-          global: True
-          advanced: True
-          helpLink: kibana
-        showInsecureClusterWarning:
-          description: Shows a warning in Kibana when the cluster does not have security enabled.
-          forcedType: bool
-          global: True
-          advanced: True
-          helpLink: kibana
-      apm:
-        enabled:
-          description: Enables or disables the APM agent in Kibana.
-          forcedType: bool
-          global: True
-          advanced: True
-          helpLink: kibana
+        helpLink: kibana.html

salt/kibana/tools/sbin_jinja/so-kibana-space-defaults

@@ -1,5 +1,6 @@
 #!/bin/bash
 . /usr/sbin/so-common
+{% set HIGHLANDER = salt['pillar.get']('global:highlander', False) %}
 wait_for_web_response "http://localhost:5601/api/spaces/space/default" "default" 300 "curl -K /opt/so/conf/elasticsearch/curl.config"
 ## This hackery will be removed if using Elastic Auth ##
 
@@ -8,6 +9,10 @@ SESSIONCOOKIE=$(curl -K /opt/so/conf/elasticsearch/curl.config -c - -X GET http:
 
 # Disable certain Features from showing up in the Kibana UI
 echo
-echo "Setting up default Kibana Space:"
+echo "Setting up default Space:"
+{% if HIGHLANDER %}
+curl -K /opt/so/conf/elasticsearch/curl.config -b "sid=$SESSIONCOOKIE" -L -X PUT "localhost:5601/api/spaces/space/default" -H 'kbn-xsrf: true' -H 'Content-Type: application/json' -d' {"id":"default","name":"Default","disabledFeatures":["enterpriseSearch"]} ' >> /opt/so/log/kibana/misc.log
+{% else %}
 curl -K /opt/so/conf/elasticsearch/curl.config -b "sid=$SESSIONCOOKIE" -L -X PUT "localhost:5601/api/spaces/space/default" -H 'kbn-xsrf: true' -H 'Content-Type: application/json' -d' {"id":"default","name":"Default","disabledFeatures":["ml","enterpriseSearch","logs","infrastructure","apm","uptime","monitoring","stackAlerts","actions","securitySolutionCasesV3","inventory","dataQuality","searchSynonyms","enterpriseSearchApplications","enterpriseSearchAnalytics","securitySolutionTimeline","securitySolutionNotes","entityManager"]} ' >> /opt/so/log/kibana/misc.log
+{% endif %}
 echo

salt/kratos/enabled.sls

@@ -5,7 +5,7 @@
 
 {% from 'allowed_states.map.jinja' import allowed_states %}
 {% if sls.split('.')[0] in allowed_states %}
-{%   from 'docker/docker.map.jinja' import DOCKERMERGED %}
+{%   from 'docker/docker.map.jinja' import DOCKER %}
 {%   from 'vars/globals.map.jinja' import GLOBALS %}
 
 include:
@@ -19,38 +19,32 @@ so-kratos:
     - name: so-kratos
     - networks:
       - sobridge:
-        - ipv4_address: {{ DOCKERMERGED.containers['so-kratos'].ip }}
+        - ipv4_address: {{ DOCKER.containers['so-kratos'].ip }}
     - binds:
       - /opt/so/conf/kratos/:/kratos-conf:ro
       - /opt/so/log/kratos/:/kratos-log:rw
       - /nsm/kratos/db:/kratos-data:rw
-      {% if DOCKERMERGED.containers['so-kratos'].custom_bind_mounts %}
-        {% for BIND in DOCKERMERGED.containers['so-kratos'].custom_bind_mounts %}
+      {% if DOCKER.containers['so-kratos'].custom_bind_mounts %}
+        {% for BIND in DOCKER.containers['so-kratos'].custom_bind_mounts %}
       - {{ BIND }}
         {% endfor %}
       {% endif %}
     - port_bindings:
-      {% for BINDING in DOCKERMERGED.containers['so-kratos'].port_bindings %}
+      {% for BINDING in DOCKER.containers['so-kratos'].port_bindings %}
       - {{ BINDING }}
       {% endfor %}
-    {% if DOCKERMERGED.containers['so-kratos'].extra_hosts %}
+    {% if DOCKER.containers['so-kratos'].extra_hosts %}
     - extra_hosts:
-      {% for XTRAHOST in DOCKERMERGED.containers['so-kratos'].extra_hosts %}
+      {% for XTRAHOST in DOCKER.containers['so-kratos'].extra_hosts %}
       - {{ XTRAHOST }}
       {% endfor %}
     {% endif %}
-    {% if DOCKERMERGED.containers['so-kratos'].extra_env %}
+    {% if DOCKER.containers['so-kratos'].extra_env %}
     - environment:
-      {% for XTRAENV in DOCKERMERGED.containers['so-kratos'].extra_env %}
+      {% for XTRAENV in DOCKER.containers['so-kratos'].extra_env %}
       - {{ XTRAENV }}
       {% endfor %}
     {% endif %}
-    {% if DOCKERMERGED.containers['so-kratos'].ulimits %}
-    - ulimits:
-    {%   for ULIMIT in DOCKERMERGED.containers['so-kratos'].ulimits %}
-      - {{ ULIMIT.name }}={{ ULIMIT.soft }}:{{ ULIMIT.hard }}
-    {%   endfor %}
-    {% endif %}
     - restart_policy: unless-stopped
     - watch:
       - file: kratosschema

salt/kratos/soc_kratos.yaml

@@ -1,91 +1,88 @@
 kratos:
   enabled:
     description: Enables or disables the Kratos authentication system. WARNING - Disabling this process will cause the grid to malfunction. Re-enabling this setting will require manual effort via SSH.
-    forcedType: bool
     advanced: True
-    helpLink: kratos
+    helpLink: kratos.html
 
   oidc:
-    enabled:
+    enabled: 
       description: Set to True to enable OIDC / Single Sign-On (SSO) to SOC. Requires a valid Security Onion license key.
-      forcedType: bool
       global: True
-      helpLink: oidc
+      helpLink: oidc.html
     config:
       id: 
         description: Customize the OIDC provider name. This name appears on the login page. Required. It is strongly recommended to leave this to the default value, unless you are aware of the other configuration pieces that will be affected by changing it.
         global: True
         forcedType: string
-        helpLink: oidc
+        helpLink: oidc.html
       provider:
         description: "Specify the provider type. Required. Valid values are: auth0, generic, github, google, microsoft"
         global: True
         forcedType: string
         regex: "auth0|generic|github|google|microsoft"
         regexFailureMessage: "Valid values are: auth0, generic, github, google, microsoft"
-        helpLink: oidc
+        helpLink: oidc.html
       client_id: 
         description: Specify the client ID, also referenced as the application ID. Required.
         global: True
         forcedType: string
-        helpLink: oidc
+        helpLink: oidc.html
       client_secret: 
         description: Specify the client secret. Required.
         global: True
         forcedType: string
-        helpLink: oidc
+        helpLink: oidc.html
       microsoft_tenant:
         description: Specify the Microsoft Active Directory Tenant ID. Required when provider is 'microsoft'.
         global: True
         forcedType: string
-        helpLink: oidc
+        helpLink: oidc.html
       subject_source: 
         description: The source of the subject identifier. Typically 'userinfo'. Only used when provider is 'microsoft'.
         global: True
         forcedType: string
         regex: me|userinfo
         regexFailureMessage: "Valid values are: me, userinfo"
-        helpLink: oidc
+        helpLink: oidc.html
       auth_url: 
         description: Provider's auth URL. Required when provider is 'generic'.
         global: True
         forcedType: string
-        helpLink: oidc
+        helpLink: oidc.html
       issuer_url: 
         description: Provider's issuer URL. Required when provider is 'auth0' or 'generic'.
         global: True
         forcedType: string
-        helpLink: oidc
+        helpLink: oidc.html
       mapper_url: 
         description: A file path or URL in Jsonnet format, used to map OIDC claims to the Kratos schema. Defaults to an included file that maps the email claim. Note that the contents of the included file can be customized via the "OIDC Claims Mapping" setting.
         advanced: True
         global: True
         forcedType: string
-        helpLink: oidc
+        helpLink: oidc.html
       token_url: 
         description: Provider's token URL. Required when provider is 'generic'.
         global: True
         forcedType: string
-        helpLink: oidc
+        helpLink: oidc.html
       scope: 
         description: List of scoped data categories to request in the authentication response. Typically 'email' and 'profile' are the minimum required scopes. However, GitHub requires `user:email', instead and Auth0 requires 'profile', 'email', and 'openid'.
         global: True
         forcedType: "[]string"
-        helpLink: oidc
+        helpLink: oidc.html
       pkce:
         description: Set to 'force' if the OIDC provider does not support auto-detection of PKCE, but does support PKCE. Set to `never` to disable PKCE. The default setting automatically attempts to detect if PKCE is supported. The provider's `well-known/openid-configuration` JSON response must contain the `S256` algorithm within the `code_challenge_methods_supported` list in order for the auto-detection to correctly detect PKCE is supported.
         global: True
         forcedType: string
-        helpLink: oidc
+        helpLink: oidc.html
       requested_claims: 
         id_token:
           email:
             essential:
               description: Specifies whether the email claim is necessary. Typically leave this value set to true.
-              forcedType: bool
               advanced: True
               global: True
-              helpLink: oidc
+              helpLink: oidc.html
   files:
     oidc__jsonnet:
       title: OIDC Claims Mapping
@@ -93,169 +90,164 @@ kratos:
       advanced: True
       file: True
       global: True
-      helpLink: oidc
+      helpLink: oidc.html
 
   config:
     session:
       lifespan: 
         description: Defines the length of a login session.
         global: True
-        helpLink: kratos
+        helpLink: kratos.html
       whoami:
         required_aal: 
           description: Sets the Authenticator Assurance Level. Leave as default to ensure proper security protections remain in place.
           global: True
           advanced: True
-          helpLink: kratos
+          helpLink: kratos.html
     selfservice:
       methods:
         password:
-          enabled:
+          enabled: 
             description: Set to True to enable traditional password authentication to SOC. Typically set to true, except when exclusively using OIDC authentication. Some external tool interfaces may not be accessible if local password authentication is disabled.
-            forcedType: bool
             global: True
             advanced: True
-            helpLink: oidc
+            helpLink: oidc.html
           config:
             haveibeenpwned_enabled:
               description: Set to True to check if a newly chosen password has ever been found in a published list of previously-compromised passwords. Requires outbound Internet connectivity when enabled.
-              forcedType: bool
               global: True
-              helpLink: kratos
+              helpLink: kratos.html
         totp:
-          enabled:
+          enabled: 
             description: Set to True to enable Time-based One-Time Password (TOTP) multi-factor authentication (MFA) to SOC. Enable to ensure proper security protections remain in place. Be aware that disabling this setting, after users have already setup TOTP, may prevent users from logging in.
-            forcedType: bool
             global: True
-            helpLink: kratos
+            helpLink: kratos.html
           config:
             issuer: 
               description: The name to show in the MFA authenticator app. Useful for differentiating between installations that share the same user email address.
               global: True
-              helpLink: kratos
+              helpLink: kratos.html
         webauthn:
           enabled:
             description: Set to True to enable Security Keys (WebAuthn / PassKeys) for passwordless or multi-factor authentication (MFA) SOC logins. Security Keys are a Public-Key Infrastructure (PKI) based authentication method, typically involving biometric hardware devices, such as laptop fingerprint scanners and USB hardware keys. Be aware that disabling this setting, after users have already setup their accounts with Security Keys, may prevent users from logging in.
-            forcedType: bool
             global: True
-            helpLink: kratos
+            helpLink: kratos.html
           config:
-            passwordless:
+            passwordless: 
               description: Set to True to utilize Security Keys (WebAuthn / PassKeys) for passwordless logins. Set to false to utilize Security Keys as a multi-factor authentication (MFA) method supplementing password logins. Be aware that changing this value, after users have already setup their accounts with the previous value, may prevent users from logging in.
-              forcedType: bool
               global: True
-              helpLink: kratos
+              helpLink: kratos.html
             rp:
               id: 
                 description: The internal identification used for registering new Security Keys. Leave as default to ensure Security Keys function properly.
                 global: True
                 advanced: True
-                helpLink: kratos
+                helpLink: kratos.html
               origin: 
                 description: The URL used to login to SOC. Leave as default to ensure Security Keys function properly.
                 global: True
                 advanced: True
-                helpLink: kratos
+                helpLink: kratos.html
               display_name: 
                 description: The name assigned to the security key. Note that URL_BASE is replaced with the hostname or IP address used to login to SOC, to help distinguish multiple Security Onion installations.
                 global: True
                 advanced: True
-                helpLink: kratos
+                helpLink: kratos.html
 
       flows:
         settings:
           privileged_session_max_age:
             description: The length of time after a successful authentication for a user's session to remain elevated to a privileged session. Privileged sessions are able to change passwords and other security settings for that user. If a session is no longer privileged then the user is redirected to the login form in order to confirm the security change.
             global: True
-            helpLink: kratos
+            helpLink: kratos.html
           ui_url: 
             description: User accessible URL containing the user self-service profile and security settings. Leave as default to ensure proper operation.
             global: True
             advanced: True
-            helpLink: kratos
+            helpLink: kratos.html
           required_aal:
             description: Sets the Authenticator Assurance Level for accessing user self-service profile and security settings. Leave as default to ensure proper security enforcement remains in place.
             global: True
             advanced: True
-            helpLink: kratos
+            helpLink: kratos.html
         verification:
           ui_url: 
             description: User accessible URL containing the Security Onion login page. Leave as default to ensure proper operation.
             global: True
             advanced: True
-            helpLink: kratos
+            helpLink: kratos.html
         login:
           ui_url: 
             description: User accessible URL containing the Security Onion login page. Leave as default to ensure proper operation.
             global: True
             advanced: True
-            helpLink: kratos
+            helpLink: kratos.html
           lifespan: 
             description: Defines the duration that a login form will remain valid.
             global: True
-            helpLink: kratos
+            helpLink: kratos.html
         error:
           ui_url: 
             description: User accessible URL containing the Security Onion login page. Leave as default to ensure proper operation.
             global: True
             advanced: True
-            helpLink: kratos
+            helpLink: kratos.html
         registration:
           ui_url: 
             description: User accessible URL containing the Security Onion login page. Leave as default to ensure proper operation.
             global: True
             advanced: True
-            helpLink: kratos
+            helpLink: kratos.html
       default_browser_return_url:
         description: Security Onion Console landing page URL. Leave as default to ensure proper operation.
         global: True
         advanced: True
-        helpLink: kratos
+        helpLink: kratos.html
       allowed_return_urls:
         description: Internal redirect URL. Leave as default to ensure proper operation.
         global: True
         advanced: True
-        helpLink: kratos
+        helpLink: kratos.html
     log:
       level: 
         description: Log level to use for Kratos logs.
         global: True
-        helpLink: kratos
+        helpLink: kratos.html
       format: 
         description: Log output format for Kratos logs.
         global: True
-        helpLink: kratos
+        helpLink: kratos.html
     secrets:
       default: 
         description: Secret key used for protecting session cookie data. Generated during installation.
         global: True
         sensitive: True
         advanced: True
-        helpLink: kratos
+        helpLink: kratos.html
     serve:
       public:
         base_url: 
           description: User accessible URL for authenticating to Kratos. Leave as default for proper operation.
           global: True
           advanced: True
-          helpLink: kratos
+          helpLink: kratos.html
       admin:
         base_url: 
           description: User accessible URL for accessing Kratos administration API. Leave as default for proper operation.
           global: True
           advanced: True
-          helpLink: kratos
+          helpLink: kratos.html
     hashers:
       bcrypt:
         cost: 
           description: Bcrypt hashing algorithm cost. Higher values consume more CPU and take longer to complete. Actual cost is computed as 2^X where X is the value in this setting.
           global: True
           advanced: True
-          helpLink: kratos
+          helpLink: kratos.html
     courier:
       smtp:
         connection_uri: 
           description: SMTPS URL for sending outbound account-related emails. Not utilized with the standard Security Onion installation.
           global: True
           advanced: True
-          helpLink: kratos
+          helpLink: kratos.html

salt/logstash/config.sls

@@ -36,6 +36,10 @@ logstash:
     - gid: 931
     - home: /opt/so/conf/logstash
 
+lslibdir:
+  file.absent:
+    - name: /opt/so/conf/logstash/lib
+
 logstash_sbin:
   file.recurse:
     - name: /usr/sbin

salt/logstash/enabled.sls

@@ -6,7 +6,7 @@
 {% 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 DOCKERMERGED %}
+{%   from 'docker/docker.map.jinja' import DOCKER %}
 {%   from 'logstash/map.jinja' import LOGSTASH_MERGED %}
 {%   from 'logstash/map.jinja' import LOGSTASH_NODES %}
 {%   set lsheap = LOGSTASH_MERGED.settings.lsheap %}
@@ -32,7 +32,7 @@ so-logstash:
     - name: so-logstash
     - networks:
       - sobridge:
-        - ipv4_address: {{ DOCKERMERGED.containers['so-logstash'].ip }}
+        - ipv4_address: {{ DOCKER.containers['so-logstash'].ip }}
     - user: logstash
     - extra_hosts:
     {% for node in LOGSTASH_NODES %}
@@ -40,20 +40,20 @@ so-logstash:
       - {{hostname}}:{{ip}}
     {%   endfor %}
     {% endfor %}
-    {% if DOCKERMERGED.containers['so-logstash'].extra_hosts %}
-    {%   for XTRAHOST in DOCKERMERGED.containers['so-logstash'].extra_hosts %}
+    {% if DOCKER.containers['so-logstash'].extra_hosts %}
+    {%   for XTRAHOST in DOCKER.containers['so-logstash'].extra_hosts %}
       - {{ XTRAHOST }}
     {%   endfor %}
     {% endif %}
     - environment:
       - LS_JAVA_OPTS=-Xms{{ lsheap }} -Xmx{{ lsheap }}
-    {% if DOCKERMERGED.containers['so-logstash'].extra_env %}
-    {%   for XTRAENV in DOCKERMERGED.containers['so-logstash'].extra_env %}
+    {% if DOCKER.containers['so-logstash'].extra_env %}
+    {%   for XTRAENV in DOCKER.containers['so-logstash'].extra_env %}
       - {{ XTRAENV }}
     {%   endfor %}
     {% endif %}
     - port_bindings:
-      {% for BINDING in DOCKERMERGED.containers['so-logstash'].port_bindings %}
+      {% for BINDING in DOCKER.containers['so-logstash'].port_bindings %}
       - {{ BINDING }}
       {% endfor %}
     - binds:
@@ -91,17 +91,11 @@ so-logstash:
       - /opt/so/log/fleet/:/osquery/logs:ro
       - /opt/so/log/strelka:/strelka:ro
       {% endif %}
-      {% if DOCKERMERGED.containers['so-logstash'].custom_bind_mounts %}
-        {% for BIND in DOCKERMERGED.containers['so-logstash'].custom_bind_mounts %}
+      {% if DOCKER.containers['so-logstash'].custom_bind_mounts %}
+        {% for BIND in DOCKER.containers['so-logstash'].custom_bind_mounts %}
       - {{ BIND }}
         {% endfor %}
       {% endif %}
-    {% if DOCKERMERGED.containers['so-logstash'].ulimits %}
-    - ulimits:
-    {%   for ULIMIT in DOCKERMERGED.containers['so-logstash'].ulimits %}
-      - {{ ULIMIT.name }}={{ ULIMIT.soft }}:{{ ULIMIT.hard }}
-    {%   endfor %}
-    {% endif %}
     - watch:
       - file: lsetcsync
       - file: trusttheca

salt/logstash/soc_logstash.yaml

@@ -1,14 +1,13 @@
 logstash:
-  enabled:
+  enabled: 
     description: Enables or disables the Logstash log event forwarding process. On most grid installations, when this process is disabled log events are unable to be ingested into the SOC backend.
-    forcedType: bool
-    helpLink: logstash
+    helpLink: logstash.html
   assigned_pipelines:
     roles:
       standalone: &assigned_pipelines
         description: List of defined pipelines to add to this role.
         advanced: True
-        helpLink: logstash
+        helpLink: logstash.html
         multiline: True
         forcedType: "[]string"
         duplicates: True
@@ -22,7 +21,7 @@ logstash:
     receiver: &defined_pipelines
       description: List of pipeline configurations assign to this group.
       advanced: True
-      helpLink: logstash
+      helpLink: logstash.html
       multiline: True
       forcedType: "[]string" 
       duplicates: True
@@ -40,7 +39,7 @@ logstash:
       advanced: True
       multiline: True
       forcedType: string
-      helpLink: logstash
+      helpLink: logstash.html
       duplicates: True
     custom002: *pipeline_config
     custom003: *pipeline_config
@@ -54,35 +53,35 @@ logstash:
   settings:
     lsheap: 
       description: Heap size to use for logstash
-      helpLink: logstash
+      helpLink: logstash.html
       global: False
   config:
     api_x_http_x_host:
       description: Host interface to listen to connections.
-      helpLink: logstash
+      helpLink: logstash.html
       readonly: True
       advanced: True
     path_x_logs: 
       description: Path inside the container to wrote logs.
-      helpLink: logstash
+      helpLink: logstash.html
       readonly: True
       advanced: True
     pipeline_x_workers: 
       description: Number of worker threads to process events in logstash.
-      helpLink: logstash
+      helpLink: logstash.html
       global: False
     pipeline_x_batch_x_size: 
       description: Logstash batch size.
-      helpLink: logstash
+      helpLink: logstash.html
       global: False
     pipeline_x_ecs_compatibility: 
       description: Sets ECS compatibility. This is set per pipeline so you should never need to change this.
-      helpLink: logstash
+      helpLink: logstash.html
       readonly: True
       advanced: True
   dmz_nodes:
     description: "List of receiver nodes in DMZs. Prevents sensors from sending to these receivers. Primarily used for external Elastic agents."
-    helpLink: logstash
+    helpLink: logstash.html
     multiline: True
     advanced: True
     forcedType: "[]string"

salt/manager/init.sls

@@ -63,9 +63,11 @@ yara_log_dir:
       - user
       - group
 
+{% if GLOBALS.os_family == 'RedHat' %}
 install_createrepo:
   pkg.installed:
     - name: createrepo_c
+{% endif %}
 
 repo_conf_dir:
   file.directory:

salt/manager/soc_manager.yaml

@@ -2,82 +2,81 @@ manager:
   reposync:
     enabled:
       description: This is the daily task of syncing the Security Onion OS packages. It is recommended that this setting remain enabled to ensure important updates are applied to the grid on an automated, scheduled basis.
-      forcedType: bool
       global: True
-      helpLink: soup
+      helpLink: soup.html
     hour:
       description: The hour of the day in which the repo sync takes place.
       global: True
-      helpLink: soup
+      helpLink: soup.html
     minute:
       description: The minute within the hour to run the repo sync.
       global: True
-      helpLink: soup
+      helpLink: soup.html
   elastalert:
     description: Enable elastalert 1=enabled 0=disabled.
     global: True
-    helpLink: elastalert
+    helpLink: elastalert.html
   no_proxy:
     description: String of hosts to ignore the proxy settings for.
     global: True
-    helpLink: proxy
+    helpLink: proxy.html
   proxy:
     description: Proxy server to use for updates.
     global: True
-    helpLink: proxy
+    helpLink: proxy.html
   additionalCA:
     description: Additional CA certificates to trust in PEM format.
     global: True
     advanced: True
     multiline: True
     forcedType: string
-    helpLink: proxy
+    helpLink: proxy.html
   insecureSkipVerify:
     description: Disable TLS verification for outgoing requests. This will make your installation less secure to MITM attacks. Recommended only for debugging purposes.
     advanced: True
     forcedType: bool
     global: True
-    helpLink: proxy
+    helpLink: proxy.html
   agent_monitoring:
     enabled:
       description: Enable monitoring elastic agents for health issues. Can be used to trigger an alert when a 'critical' agent hasn't checked in with fleet for longer than the configured offline threshold.
       global: True
-      helpLink: elastic-fleet
+      helpLink: elastic-fleet.html
       forcedType: bool
     config:
       critical_agents:
         description: List of 'critical' agents to log when they haven't checked in longer than the maximum allowed time. If there are no 'critical' agents specified all offline agents will be logged once they reach the offline threshold.
         global: True
         multiline: True
-        helpLink: elastic-fleet
+        helpLink: elastic-fleet.html
         forcedType: "[]string"
       custom_kquery:
         description: For more granular control over what agents to monitor for offline|degraded status add a kquery here. It is recommended to create & test within Elastic Fleet first to ensure your agents are targeted correctly using the query. eg 'status:offline AND tags:INFRA'
         global: True
-        helpLink: elastic-fleet
+        helpLink: elastic-fleet.html
         forcedType: string
         advanced: True
       offline_threshold:
         description: The maximum allowed time in hours a 'critical' agent has been offline before being logged.
         global: True
-        helpLink: elastic-fleet
+        helpLink: elastic-fleet.html
         forcedType: int
       realert_threshold:
         description: The time to pass before another alert for an offline agent exceeding the offline_threshold is generated.
         global: True
-        helpLink: elastic-fleet
+        helpLink: elastic-fleet.html
         forcedType: int
       page_size:
         description: The amount of agents that can be processed per API request to fleet.
         global: True
-        helpLink: elastic-fleet
+        helpLink: elastic-fleet.html
         forcedType: int
         advanced: True
       run_interval:
         description: The time in minutes between checking fleet agent statuses.
         global: True
         advanced: True
-        helpLink: elastic-fleet
+        helpLink: elastic-fleet.html
         forcedType: int
   managed_integrations:
     description: List of integrations to add into SOC config UI. Enter the full or partial integration name. Eg. 1password, 1pass
@@ -85,4 +84,4 @@ manager:
     multiline: True
     global: True
     advanced: True
-    helpLink: elasticsearch
+    helpLink: elasticsearch.html

salt/manager/tools/sbin/so-client

@@ -134,8 +134,8 @@ function require() {
 function verifyEnvironment() {
   require "jq"
   require "curl"
-  response=$(curl -Ss -L ${hydraUrl}/health/alive)
-  [[ "$response" != '{"status":"ok"}' ]] && fail "Unable to communicate with Hydra; specify URL via HYDRA_URL environment variable"
+  response=$(curl -Ss -L ${hydraUrl}/)
+  [[ "$response" != *"Error 404"* ]] && fail "Unable to communicate with Hydra; specify URL via HYDRA_URL environment variable"
 }
 
 function createFile() {

salt/manager/tools/sbin/so-minion

@@ -462,14 +462,19 @@ function add_sensor_to_minion() {
         echo "      lb_procs: '$CORECOUNT'"
         echo "suricata:"
         echo "  enabled: True "
-        echo "  pcap:"
-        echo "    enabled: True"
         if [[ $is_pcaplimit ]]; then
+            echo "  pcap:"
             echo "    maxsize: $MAX_PCAP_SPACE"
         fi
         echo "  config:"
         echo "    af-packet:"
         echo "      threads: '$CORECOUNT'"
+        echo "pcap:"
+        echo "  enabled: True"
+        if [[ $is_pcaplimit ]]; then
+            echo "  config:"
+            echo "    diskfreepercentage: $DFREEPERCENT"
+        fi
         echo "  "
     } >> $PILLARFILE
     if [ $? -ne 0 ]; then

salt/manager/tools/sbin/so-yaml.py

@@ -22,7 +22,7 @@ def showUsage(args):
     print('    removelistitem   - Remove a list item from a yaml key, if it exists and is a list. Requires KEY and LISTITEM args.', file=sys.stderr)
     print('    replacelistobject  - Replace a list object based on a condition. Requires KEY, CONDITION_FIELD, CONDITION_VALUE, and JSON_OBJECT args.', file=sys.stderr)
     print('    add              - Add a new key and set its value. Fails if key already exists. Requires KEY and VALUE args.', file=sys.stderr)
-    print('    get [-r]         - Displays (to stdout) the value stored in the given key. Requires KEY arg. Use -r for raw output without YAML formatting.', file=sys.stderr)
+    print('    get              - Displays (to stdout) the value stored in the given key. Requires KEY arg.', file=sys.stderr)
     print('    remove           - Removes a yaml key, if it exists. Requires KEY arg.', file=sys.stderr)
     print('    replace          - Replaces (or adds) a new key and set its value. Requires KEY and VALUE args.', file=sys.stderr)
     print('    help             - Prints this usage information.', file=sys.stderr)
@@ -256,7 +256,7 @@ def replacelistobject(args):
 def addKey(content, key, value):
     pieces = key.split(".", 1)
     if len(pieces) > 1:
-        if pieces[0] not in content or content[pieces[0]] is None:
+        if not pieces[0] in content:
             content[pieces[0]] = {}
         addKey(content[pieces[0]], pieces[1], value)
     elif key in content:
@@ -332,11 +332,6 @@ def getKeyValue(content, key):
 
 
 def get(args):
-    raw = False
-    if len(args) > 0 and args[0] == '-r':
-        raw = True
-        args = args[1:]
-
     if len(args) != 2:
         print('Missing filename or key arg', file=sys.stderr)
         showUsage(None)
@@ -351,15 +346,7 @@ def get(args):
         print(f"Key '{key}' not found by so-yaml.py", file=sys.stderr)
         return 2
 
-    if raw:
-        if isinstance(output, bool):
-            print(str(output).lower())
-        elif isinstance(output, (dict, list)):
-            print(yaml.safe_dump(output).strip())
-        else:
-            print(output)
-    else:
-        print(yaml.safe_dump(output))
+    print(yaml.safe_dump(output))
     return 0
 
 

salt/manager/tools/sbin/so-yaml_test.py

@@ -395,17 +395,6 @@ class TestRemove(unittest.TestCase):
             self.assertEqual(result, 0)
             self.assertIn("45\n...", mock_stdout.getvalue())
 
-    def test_get_int_raw(self):
-        with patch('sys.stdout', new=StringIO()) as mock_stdout:
-            filename = "/tmp/so-yaml_test-get.yaml"
-            file = open(filename, "w")
-            file.write("{key1: { child1: 123, child2: { deep1: 45 } }, key2: false, key3: [e,f,g]}")
-            file.close()
-
-            result = soyaml.get(["-r", filename, "key1.child2.deep1"])
-            self.assertEqual(result, 0)
-            self.assertEqual("45\n", mock_stdout.getvalue())
-
     def test_get_str(self):
         with patch('sys.stdout', new=StringIO()) as mock_stdout:
             filename = "/tmp/so-yaml_test-get.yaml"
@@ -417,51 +406,6 @@ class TestRemove(unittest.TestCase):
             self.assertEqual(result, 0)
             self.assertIn("hello\n...", mock_stdout.getvalue())
 
-    def test_get_str_raw(self):
-        with patch('sys.stdout', new=StringIO()) as mock_stdout:
-            filename = "/tmp/so-yaml_test-get.yaml"
-            file = open(filename, "w")
-            file.write("{key1: { child1: 123, child2: { deep1: \"hello\" } }, key2: false, key3: [e,f,g]}")
-            file.close()
-
-            result = soyaml.get(["-r", filename, "key1.child2.deep1"])
-            self.assertEqual(result, 0)
-            self.assertEqual("hello\n", mock_stdout.getvalue())
-
-    def test_get_bool(self):
-        with patch('sys.stdout', new=StringIO()) as mock_stdout:
-            filename = "/tmp/so-yaml_test-get.yaml"
-            file = open(filename, "w")
-            file.write("{key1: { child1: 123, child2: { deep1: 45 } }, key2: false, key3: [e,f,g]}")
-            file.close()
-
-            result = soyaml.get([filename, "key2"])
-            self.assertEqual(result, 0)
-            self.assertIn("false\n...", mock_stdout.getvalue())
-
-    def test_get_bool_raw(self):
-        with patch('sys.stdout', new=StringIO()) as mock_stdout:
-            filename = "/tmp/so-yaml_test-get.yaml"
-            file = open(filename, "w")
-            file.write("{key1: { child1: 123, child2: { deep1: 45 } }, key2: false, key3: [e,f,g]}")
-            file.close()
-
-            result = soyaml.get(["-r", filename, "key2"])
-            self.assertEqual(result, 0)
-            self.assertEqual("false\n", mock_stdout.getvalue())
-
-    def test_get_dict_raw(self):
-        with patch('sys.stdout', new=StringIO()) as mock_stdout:
-            filename = "/tmp/so-yaml_test-get.yaml"
-            file = open(filename, "w")
-            file.write("{key1: { child1: 123, child2: { deep1: 45 } }, key2: false, key3: [e,f,g]}")
-            file.close()
-
-            result = soyaml.get(["-r", filename, "key1"])
-            self.assertEqual(result, 0)
-            self.assertIn("child1: 123", mock_stdout.getvalue())
-            self.assertNotIn("...", mock_stdout.getvalue())
-
     def test_get_list(self):
         with patch('sys.stdout', new=StringIO()) as mock_stdout:
             filename = "/tmp/so-yaml_test-get.yaml"

salt/manager/tools/sbin/soup

@@ -88,7 +88,7 @@ check_err() {
         echo 'No route to host'
       ;;
       160)
-        echo 'Incompatible Elasticsearch upgrade'
+        echo 'Incompatiable Elasticsearch upgrade'
       ;;
       161)
         echo 'Required intermediate Elasticsearch upgrade not complete'
@@ -362,7 +362,7 @@ preupgrade_changes() {
     # This function is to add any new pillar items if needed.
     echo "Checking to see if changes are needed."
 
-    [[ "$INSTALLEDVERSION" =~ ^2\.4\.21[0-9]+$ ]] && up_to_3.0.0   
+    [[ "$INSTALLEDVERSION" == 2.4.210 ]] && up_to_3.0.0   
     true
 }
 
@@ -370,12 +370,12 @@ postupgrade_changes() {
     # This function is to add any new pillar items if needed.
     echo "Running post upgrade processes."
 
-    [[ "$POSTVERSION" =~ ^2\.4\.21[0-9]+$ ]] && post_to_3.0.0
+    [[ "$POSTVERSION" == 2.4.210 ]] && post_to_3.0.0
     true
 }
 
 check_minimum_version() {
-  if [[ ! "$INSTALLEDVERSION" =~ ^(2\.4\.21[0-9]+|3\.) ]]; then
+  if [[ "$INSTALLEDVERSION" != "2.4.210" ]] && [[ ! "$INSTALLEDVERSION" =~ ^3\. ]]; then
     echo "You must be on at least Security Onion 2.4.210 to upgrade. Currently installed version: $INSTALLEDVERSION"
     exit 1
   fi
@@ -383,87 +383,14 @@ check_minimum_version() {
 
 ### 3.0.0 Scripts ###
 
-convert_suricata_yes_no() {
-  echo "Starting suricata yes/no values to true/false conversion."
-  local SURICATA_FILE=/opt/so/saltstack/local/pillar/suricata/soc_suricata.sls
-  local MINIONDIR=/opt/so/saltstack/local/pillar/minions
-  local pillar_files=()
-
-  [[ -f "$SURICATA_FILE" ]] && pillar_files+=("$SURICATA_FILE")
-  for suffix in _eval _heavynode _sensor _standalone; do
-    for f in "$MINIONDIR"/*${suffix}.sls; do
-      [[ -f "$f" ]] && pillar_files+=("$f")
-    done
-  done
-
-  for pillar_file in "${pillar_files[@]}"; do
-    echo "Checking $pillar_file for suricata yes/no values."
-    local yaml_output
-    yaml_output=$(so-yaml.py get -r "$pillar_file" suricata 2>/dev/null) || continue
-
-    local keys_to_fix
-    keys_to_fix=$(python3 -c "
-import yaml, sys
-def find(d, prefix=''):
-    if isinstance(d, dict):
-        for k, v in d.items():
-            path = f'{prefix}.{k}' if prefix else k
-            if isinstance(v, dict):
-                find(v, path)
-            elif isinstance(v, str) and v.lower() in ('yes', 'no'):
-                print(f'{path} {v.lower()}')
-find(yaml.safe_load(sys.stdin) or {})
-" <<< "$yaml_output") || continue
-
-    while IFS=' ' read -r key value; do
-      [[ -z "$key" ]] && continue
-      if [[ "$value" == "yes" ]]; then
-        echo "Replacing suricata.${key} yes -> true in $pillar_file"
-        so-yaml.py replace "$pillar_file" "suricata.${key}" true
-      else
-        echo "Replacing suricata.${key} no -> false in $pillar_file"
-        so-yaml.py replace "$pillar_file" "suricata.${key}" false
-      fi
-    done <<< "$keys_to_fix"
-  done
-  echo "Completed suricata yes/no conversion."
-}
-
-migrate_pcap_to_suricata() {
-  echo "Starting pillar pcap.enabled to suricata.pcap.enabled migration."
-  local MINIONDIR=/opt/so/saltstack/local/pillar/minions
-  local PCAPFILE=/opt/so/saltstack/local/pillar/pcap/soc_pcap.sls
-
-  for pillar_file in "$PCAPFILE" "$MINIONDIR"/*.sls; do
-    [[ -f "$pillar_file" ]] || continue
-    pcap_enabled=$(so-yaml.py get -r "$pillar_file" pcap.enabled 2>/dev/null) || continue
-    echo "Migrating pcap.enabled -> suricata.pcap.enabled in $pillar_file"
-    so-yaml.py add "$pillar_file" suricata.pcap.enabled "$pcap_enabled"
-    so-yaml.py remove "$pillar_file" pcap
-  done
-  echo "Completed pcap.enabled to suricata.pcap.enabled pillar migration."
-}
-
 up_to_3.0.0() {
   determine_elastic_agent_upgrade
-  migrate_pcap_to_suricata
 
   INSTALLEDVERSION=3.0.0
 }
 
 post_to_3.0.0() {
-  for idx in "logs-idh-so" "logs-redis.log-default"; do
-    rollover_index "$idx"
-  done
-
-  # Remove ILM for so-case and so-detection indices
-  for idx in "so-case" "so-casehistory" "so-detection" "so-detectionhistory"; do
-    so-elasticsearch-query $idx/_ilm/remove -XPOST
-  done
-
-  # convert yes/no in suricata pillars to true/false
-  convert_suricata_yes_no
-
+  echo "Nothing to apply"
   POSTVERSION=3.0.0
 }
 
@@ -636,46 +563,78 @@ upgrade_check_salt() {
 upgrade_salt() {
   echo "Performing upgrade of Salt from $INSTALLEDSALTVERSION to $NEWSALTVERSION."
   echo ""
-  # Check if salt-cloud is installed
-  if rpm -q salt-cloud &>/dev/null; then
-    SALT_CLOUD_INSTALLED=true
-  fi
-  # Check if salt-cloud is configured
-  if [[ -f /etc/salt/cloud.profiles.d/socloud.conf ]]; then
-    SALT_CLOUD_CONFIGURED=true
-  fi
-
-  echo "Removing yum versionlock for Salt."
-  echo ""
-  yum versionlock delete "salt"
-  yum versionlock delete "salt-minion"
-  yum versionlock delete "salt-master"
-  # Remove salt-cloud versionlock if installed
-  if [[ $SALT_CLOUD_INSTALLED == true ]]; then
-    yum versionlock delete "salt-cloud"
-  fi
-  echo "Updating Salt packages."
-  echo ""
-  set +e
-  # Run with -r to ignore repos set by bootstrap
-  if [[ $SALT_CLOUD_INSTALLED == true ]]; then
+  # If rhel family
+  if [[ $is_rpm ]]; then
+    # Check if salt-cloud is installed
+    if rpm -q salt-cloud &>/dev/null; then
+      SALT_CLOUD_INSTALLED=true
+    fi
+    # Check if salt-cloud is configured
+    if [[ -f /etc/salt/cloud.profiles.d/socloud.conf ]]; then
+      SALT_CLOUD_CONFIGURED=true
+    fi
+    
+    echo "Removing yum versionlock for Salt."
+    echo ""
+    yum versionlock delete "salt"
+    yum versionlock delete "salt-minion"
+    yum versionlock delete "salt-master"
+    # Remove salt-cloud versionlock if installed
+    if [[ $SALT_CLOUD_INSTALLED == true ]]; then
+      yum versionlock delete "salt-cloud"
+    fi
+    echo "Updating Salt packages."
+    echo ""
+    set +e
+    # if oracle run with -r to ignore repos set by bootstrap
+    if [[ $OS == 'oracle' ]]; then
+      # Add -L flag only if salt-cloud is already installed
+      if [[ $SALT_CLOUD_INSTALLED == true ]]; then
+        run_check_net_err \
+        "sh $UPDATE_DIR/salt/salt/scripts/bootstrap-salt.sh -X -r -L -F -M stable \"$NEWSALTVERSION\"" \
+        "Could not update salt, please check $SOUP_LOG for details."
+      else
+        run_check_net_err \
+        "sh $UPDATE_DIR/salt/salt/scripts/bootstrap-salt.sh -X -r -F -M stable \"$NEWSALTVERSION\"" \
+        "Could not update salt, please check $SOUP_LOG for details."
+      fi
+    # if another rhel family variant we want to run without -r to allow the bootstrap script to manage repos
+    else
+      run_check_net_err \
+      "sh $UPDATE_DIR/salt/salt/scripts/bootstrap-salt.sh -X -F -M stable \"$NEWSALTVERSION\"" \
+      "Could not update salt, please check $SOUP_LOG for details."
+    fi
+    set -e
+    echo "Applying yum versionlock for Salt."
+    echo ""
+    yum versionlock add "salt-0:$NEWSALTVERSION-0.*"
+    yum versionlock add "salt-minion-0:$NEWSALTVERSION-0.*"
+    yum versionlock add "salt-master-0:$NEWSALTVERSION-0.*"
+    # Add salt-cloud versionlock if installed
+    if [[ $SALT_CLOUD_INSTALLED == true ]]; then
+      yum versionlock add "salt-cloud-0:$NEWSALTVERSION-0.*"
+    fi
+  # Else do Ubuntu things
+  elif [[ $is_deb ]]; then
+    # ensure these files don't exist when upgrading from 3006.9 to 3006.16
+    rm -f /etc/apt/keyrings/salt-archive-keyring-2023.pgp /etc/apt/sources.list.d/salt.list
+    echo "Removing apt hold for Salt."
+    echo ""
+    apt-mark unhold "salt-common"
+    apt-mark unhold "salt-master"
+    apt-mark unhold "salt-minion"
+    echo "Updating Salt packages."
+    echo ""
+    set +e
     run_check_net_err \
-    "sh $UPDATE_DIR/salt/salt/scripts/bootstrap-salt.sh -X -r -L -F -M stable \"$NEWSALTVERSION\"" \
+    "sh $UPDATE_DIR/salt/salt/scripts/bootstrap-salt.sh -X -F -M stable \"$NEWSALTVERSION\"" \
     "Could not update salt, please check $SOUP_LOG for details."
-  else
-    run_check_net_err \
-    "sh $UPDATE_DIR/salt/salt/scripts/bootstrap-salt.sh -X -r -F -M stable \"$NEWSALTVERSION\"" \
-    "Could not update salt, please check $SOUP_LOG for details."
-  fi
-  set -e
-  echo "Applying yum versionlock for Salt."
-  echo ""
-  yum versionlock add "salt-0:$NEWSALTVERSION-0.*"
-  yum versionlock add "salt-minion-0:$NEWSALTVERSION-0.*"
-  yum versionlock add "salt-master-0:$NEWSALTVERSION-0.*"
-  # Add salt-cloud versionlock if installed
-  if [[ $SALT_CLOUD_INSTALLED == true ]]; then
-    yum versionlock add "salt-cloud-0:$NEWSALTVERSION-0.*"
+    set -e
+    echo "Applying apt hold for Salt."
+    echo ""
+    apt-mark hold "salt-common"
+    apt-mark hold "salt-master"
+    apt-mark hold "salt-minion"
   fi
 
   echo "Checking if Salt was upgraded."
@@ -1112,10 +1071,6 @@ main() {
   echo ""
   set_os
 
-  if [[ ! $is_oracle ]]; then
-    fail "This OS is not supported. Security Onion requires Oracle Linux 9."
-  fi
-
   check_salt_master_status 1 || fail  "Could not talk to salt master: Please run 'systemctl status salt-master' to ensure the salt-master service is running and check the log at /opt/so/log/salt/master."
 
   echo "Checking to see if this is a manager."
@@ -1225,6 +1180,14 @@ main() {
       echo "Upgrading Salt"
       # Update the repo files so it can actually upgrade
       upgrade_salt
+
+      # for Debian based distro, we need to stop salt again after upgrade output below is from bootstrap-salt
+      # *  WARN: Not starting daemons on Debian based distributions
+      #    is not working mostly because starting them is the default behaviour.
+      if [[ $is_deb ]]; then
+        stop_salt_minion
+        stop_salt_master
+      fi
     fi
 
     preupgrade_changes

salt/nginx/enabled.sls

@@ -6,7 +6,7 @@
 {% 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 DOCKERMERGED %}
+{%   from 'docker/docker.map.jinja' import DOCKER %}
 {%   from 'nginx/map.jinja' import NGINXMERGED %}
 
 include:
@@ -37,11 +37,11 @@ so-nginx:
     - hostname: so-nginx
     - networks:
       - sobridge:
-        - ipv4_address: {{ DOCKERMERGED.containers[container_config].ip }}
+        - ipv4_address: {{ DOCKER.containers[container_config].ip }}
     - extra_hosts:
       - {{ GLOBALS.manager }}:{{ GLOBALS.manager_ip }}
-    {% if DOCKERMERGED.containers[container_config].extra_hosts %}
-      {% for XTRAHOST in DOCKERMERGED.containers[container_config].extra_hosts %}
+    {% if DOCKER.containers[container_config].extra_hosts %}
+      {% for XTRAHOST in DOCKER.containers[container_config].extra_hosts %}
       - {{ XTRAHOST }}
       {% endfor %}
     {% endif %}
@@ -64,26 +64,20 @@ so-nginx:
       - /opt/so/rules/nids/suri:/surirules:ro
       {%   endif %}
       {% endif %}
-      {% if DOCKERMERGED.containers[container_config].custom_bind_mounts %}
-        {% for BIND in DOCKERMERGED.containers[container_config].custom_bind_mounts %}
+      {% if DOCKER.containers[container_config].custom_bind_mounts %}
+        {% for BIND in DOCKER.containers[container_config].custom_bind_mounts %}
       - {{ BIND }}
         {% endfor %}
       {% endif %}
-    {% if DOCKERMERGED.containers[container_config].extra_env %}
+    {% if DOCKER.containers[container_config].extra_env %}
     - environment:
-      {% for XTRAENV in DOCKERMERGED.containers[container_config].extra_env %}
+      {% for XTRAENV in DOCKER.containers[container_config].extra_env %}
       - {{ XTRAENV }}
       {% endfor %}
     {% endif %}
-    {% if DOCKERMERGED.containers[container_config].ulimits %}
-    - ulimits:
-    {%   for ULIMIT in DOCKERMERGED.containers[container_config].ulimits %}
-      - {{ ULIMIT.name }}={{ ULIMIT.soft }}:{{ ULIMIT.hard }}
-    {%   endfor %}
-    {% endif %}
     - cap_add: NET_BIND_SERVICE
     - port_bindings:
-      {% for BINDING in DOCKERMERGED.containers[container_config].port_bindings %}
+      {% for BINDING in DOCKER.containers[container_config].port_bindings %}
       - {{ BINDING }}
       {% endfor %}
     - watch:

salt/nginx/etc/nginx.conf

@@ -1,5 +1,5 @@
 {%- from 'vars/globals.map.jinja' import GLOBALS %}
-{%- from 'docker/docker.map.jinja' import DOCKERMERGED %}
+{%- from 'docker/docker.map.jinja' import DOCKER %}
 {%- from 'nginx/map.jinja' import NGINXMERGED %}
 {%- set role = grains.id.split('_') | last %}
 {%- set influxpass = salt['pillar.get']('secrets:influx_pass') %}
@@ -387,13 +387,15 @@ http {
 		error_page 429 = @error429;
 
 		location @error401 {
-			if ($request_uri ~* (^/api/.*|^/connect/.*|^/oauth2/.*)) {
+			if ($request_uri ~* (^/connect/.*|^/oauth2/.*)) {
 				return    401;
 			}
 
-			add_header    Strict-Transport-Security   "max-age=31536000; includeSubDomains";
+			if ($request_uri ~* ^/(?!(^/api/.*))) {
+				add_header    Strict-Transport-Security   "max-age=31536000; includeSubDomains";
+			}
 
-			if ($request_uri ~* ^/(?!(login|auth|oauth2|$))) {
+			if ($request_uri ~* ^/(?!(api/|login|auth|oauth2|$))) {
 				add_header    Set-Cookie "AUTH_REDIRECT=$request_uri;Path=/;Max-Age=14400";
 			}
 			return        302 /auth/self-service/login/browser;

salt/nginx/soc_nginx.yaml

@@ -1,13 +1,12 @@
 nginx:
-  enabled:
+  enabled: 
     description: Enables or disables the Nginx web server and reverse proxy. WARNING - Disabling this process will prevent access to SOC and other important web interfaces and APIs. Re-enabling the process is a manual effort. Do not change this setting without instruction from Security Onion support.
-    forcedType: bool
     advanced: True
-    helpLink: nginx
+    helpLink: nginx.html
   external_suricata:
     description: Enable this to allow external access to Suricata Rulesets managed by Detections.
     advanced: True
-    helpLink: nginx
+    helplink: nginx.html
     forcedType: bool
   ssl:
     replace_cert:
@@ -16,33 +15,33 @@ nginx:
       advanced: True
       forcedType: bool
       title: Replace Default Cert
-      helpLink: nginx
+      helpLink: nginx.html
     ssl__key:
       description: If you enabled the replace_cert option, paste the contents of your .key file here.
       file: True
       title: SSL/TLS Key File
       advanced: True
       global: True
-      helpLink: nginx
+      helpLink: nginx.html
     ssl__crt:
       description: If you enabled the replace_cert option, paste the contents of your .crt file here.
       file: True
       title: SSL/TLS Cert File
       advanced: True
       global: True
-      helpLink: nginx
+      helpLink: nginx.html
     alt_names:
       description: Provide a list of alternate names to allow remote systems the ability to refer to the SOC API as another hostname.
       global: True
       forcedType: '[]string'
       multiline: True
-      helpLink: nginx
+      helpLink: nginx.html
   config:
     throttle_login_burst:
       description: Number of login requests that can burst without triggering request throttling. Higher values allow more repeated login attempts. Values greater than zero are required in order to provide a usable login flow.
       global: True
-      helpLink: nginx
+      helpLink: nginx.html
     throttle_login_rate:
       description: Number of login API requests per minute that can be processed without triggering a rate limit. Higher values allow more repeated login attempts. Requests are counted by unique client IP and averaged over time. Note that a single login flow will perform multiple requests to the login API, so this value will need to be adjusted accordingly.
       global: True
-      helpLink: nginx
+      helpLink: nginx.html

salt/ntp/init.sls

@@ -2,6 +2,7 @@
 # or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at 
 # https://securityonion.net/license; you may not use this file except in compliance with the
 # Elastic License 2.0.
+{% from 'vars/globals.map.jinja' import GLOBALS %}
 {% from 'ntp/config.map.jinja' import NTPCONFIG %}
 
 chrony_pkg:
@@ -16,7 +17,11 @@ chronyconf:
     - defaults:
         NTPCONFIG: {{ NTPCONFIG }}
 
+{% if GLOBALS.os_family == 'RedHat' %}
 chronyd:
+{% else %}
+chrony:
+{% endif %}
   service.running:
     - enable: True
     - watch: 

salt/ntp/soc_ntp.yaml

@@ -3,4 +3,4 @@ ntp:
     servers:
       description: NTP Server List
       title: NTP Servers
-      helpLink: ntp
+      helpLink: ntp.html

salt/patch/soc_patch.yaml

@@ -2,20 +2,19 @@ patch:
   os:
     enabled:
       description: Enable OS updates. WARNING - Disabling this setting will prevent important operating system updates from being applied on a scheduled basis.
-      forcedType: bool
-      helpLink: soup
+      helpLink: soup.html
     schedule_to_run: 
       description: Currently running schedule for updates.
-      helpLink: soup
+      helpLink: soup.html
     schedules:
       auto:
         splay: &splayOptions
           description: Seconds to splay updates.
-          helpLink: soup 
+          helpLink: soup.html 
         schedule:
           hours: 
             description: Run the OS updates every X hours. 
-            helpLink: soup
+            helpLink: soup.html
       monday:
         splay: *splayOptions
         schedule: 
@@ -52,7 +51,7 @@ patch:
           Monday: &dailyOptions
             description: List of times to apply OS patches daily.
             multiline: True
-            helpLink: soup
+            helpLink: soup.html
           Tuesday: *dailyOptions
           Wednesday: *dailyOptions
           Thursday: *dailyOptions
@@ -65,7 +64,7 @@ patch:
           Monday: &weekdayOptions
             description: List of times for weekdays.
             multiline: True
-            helpLink: soup
+            helpLink: soup.html
           Tuesday: *weekdayOptions
           Wednesday: *weekdayOptions
           Thursday: *weekdayOptions
@@ -76,5 +75,5 @@ patch:
           Saturday: &weekendOptions
             description: List of times for weekend days.
             multiline: true
-            helpLink: soup
+            helpLink: soup.html
           Sunday: *weekendOptions

salt/podman/files/podman.service

@@ -0,0 +1,17 @@
+[Unit]
+Description=Podman API Service
+Requires=podman.socket
+After=podman.socket
+Documentation=man:podman-api(1)
+StartLimitIntervalSec=0
+
+[Service]
+Type=oneshot
+Environment=REGISTRIES_CONFIG_PATH=/etc/containers/registries.conf
+ExecStart=/usr/bin/podman system service
+TimeoutStopSec=30
+KillMode=process
+
+[Install]
+WantedBy=multi-user.target
+Also=podman.socket

salt/podman/files/podman.socket

@@ -0,0 +1,10 @@
+[Unit]
+Description=Podman API Socket
+Documentation=man:podman-api(1)
+
+[Socket]
+ListenStream=%t/podman/podman.sock
+SocketMode=0660
+
+[Install]
+WantedBy=sockets.target

salt/podman/files/sobridge.conflist

@@ -0,0 +1,48 @@
+{
+   "args": {
+      "podman_options": {
+         "isolate": "true",
+         "mtu": "1500"
+      }
+   },
+   "cniVersion": "0.4.0",
+   "name": "sobridge",
+   "plugins": [
+      {
+         "type": "bridge",
+         "bridge": "sobridge",
+         "isGateway": true,
+         "ipMasq": false,
+         "mtu": 1500,
+         "hairpinMode": false,
+         "ipam": {
+            "type": "host-local",
+            "routes": [
+               {
+                  "dst": "0.0.0.0/0"
+               }
+            ],
+            "ranges": [
+               [
+                  {
+                     "subnet": "172.17.1.0/24",
+                     "gateway": "172.17.1.1"
+                  }
+               ]
+            ]
+         },
+         "capabilities": {
+            "ips": true
+         }
+      },
+      {
+         "type": "portmap",
+         "capabilities": {
+            "portMappings": false
+         }
+      },
+      {
+         "type": "tuning"
+      }
+   ]
+}

salt/podman/init.sls

@@ -0,0 +1,56 @@
+{% from 'docker/docker.map.jinja' import DOCKER %}
+
+Podman pkg:
+  pkg.installed:
+    - name: podman
+
+cnipkg:
+  pkg.installed:
+    - name: containernetworking-plugins
+
+{#
+Podman service:
+  file.managed:
+    - name: /usr/lib/systemd/system/podman.service
+    - source: salt://podman/podman.service
+#}
+
+sobridgeconf:
+  file.managed:
+    - name: /etc/cni/net.d/sobridge.conflist
+    - source: salt://podman/files/sobridge.conflist
+
+Podman_socket_service:
+  service.running:
+    - name: podman.socket
+    - enable: true
+
+Podman_service:
+  service.running:
+    - name: podman.service
+    - enable: true
+
+Docker socket:
+  file.symlink:
+    - name: /var/run/docker.sock
+    - target: /var/run/podman/podman.sock
+
+podman_docker_symlink:
+  file.symlink:
+    - name: /usr/bin/docker
+    - target: /usr/bin/podman
+
+{#
+sos_docker_net:
+  docker_network.present:
+    - name: sobridge
+    - subnet: {{ DOCKER.range }}
+    - gateway: {{ DOCKER.bip }}
+    - options:
+        com.docker.network.bridge.name: 'sobridge'
+        com.docker.network.driver.mtu: '1500'
+        com.docker.network.bridge.enable_ip_masquerade: 'true'
+        com.docker.network.bridge.enable_icc: 'true'
+        com.docker.network.bridge.host_binding_ipv4: '0.0.0.0'
+    - unless: 'docker network ls | grep sobridge'
+#}

salt/redis/enabled.sls

@@ -5,7 +5,7 @@
 
 {% from 'allowed_states.map.jinja' import allowed_states %}
 {% if sls.split('.')[0] in allowed_states %}
-{%   from 'docker/docker.map.jinja' import DOCKERMERGED %}
+{%   from 'docker/docker.map.jinja' import DOCKER %}
 {%   from 'vars/globals.map.jinja' import GLOBALS %}
 
 include:
@@ -21,9 +21,9 @@ so-redis:
     - user: socore
     - networks:
       - sobridge:
-        - ipv4_address: {{ DOCKERMERGED.containers['so-redis'].ip }}
+        - ipv4_address: {{ DOCKER.containers['so-redis'].ip }}
     - port_bindings:
-      {% for BINDING in DOCKERMERGED.containers['so-redis'].port_bindings %}
+      {% for BINDING in DOCKER.containers['so-redis'].port_bindings %}
       - {{ BINDING }}
       {% endfor %}
     - binds:
@@ -34,29 +34,23 @@ so-redis:
       - /etc/pki/redis.crt:/certs/redis.crt:ro
       - /etc/pki/redis.key:/certs/redis.key:ro
       - /etc/pki/tls/certs/intca.crt:/certs/ca.crt:ro
-      {% if DOCKERMERGED.containers['so-redis'].custom_bind_mounts %}
-        {% for BIND in DOCKERMERGED.containers['so-redis'].custom_bind_mounts %}
+      {% if DOCKER.containers['so-redis'].custom_bind_mounts %}
+        {% for BIND in DOCKER.containers['so-redis'].custom_bind_mounts %}
       - {{ BIND }}
         {% endfor %}
       {% endif %}
-    {% if DOCKERMERGED.containers['so-redis'].extra_hosts %}
+    {% if DOCKER.containers['so-redis'].extra_hosts %}
     - extra_hosts:
-      {% for XTRAHOST in DOCKERMERGED.containers['so-redis'].extra_hosts %}
+      {% for XTRAHOST in DOCKER.containers['so-redis'].extra_hosts %}
       - {{ XTRAHOST }}
       {% endfor %}
     {% endif %}
-    {% if DOCKERMERGED.containers['so-redis'].extra_env %}
+    {% if DOCKER.containers['so-redis'].extra_env %}
     - environment:
-      {% for XTRAENV in DOCKERMERGED.containers['so-redis'].extra_env %}
+      {% for XTRAENV in DOCKER.containers['so-redis'].extra_env %}
       - {{ XTRAENV }}
       {% endfor %}
     {% endif %}
-    {% if DOCKERMERGED.containers['so-redis'].ulimits %}
-    - ulimits:
-    {%   for ULIMIT in DOCKERMERGED.containers['so-redis'].ulimits %}
-      - {{ ULIMIT.name }}={{ ULIMIT.soft }}:{{ ULIMIT.hard }}
-    {%   endfor %}
-    {% endif %}
     - entrypoint: "redis-server /usr/local/etc/redis/redis.conf"
     - watch:
       - file: trusttheca

salt/redis/soc_redis.yaml

@@ -1,19 +1,18 @@
 redis:
-  enabled:
+  enabled: 
     description: Enables the log event in-memory buffering process. This process might already be disabled on some installation types. Disabling this process on distributed-capable grids can result in loss of log events.
-    forcedType: bool
-    helpLink: redis
+    helpLink: redis.html
   config:
     bind:
       description: The IP address to bind to.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     protected-mode:
       description: Force authentication to access redis.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     requirepass:
       description: Password for accessing Redis.
       global: True
@@ -22,262 +21,262 @@ redis:
       description: TLS cert file location.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     tls-key-file: 
       description: TLS key file location.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     tls-ca-cert-file:
       description: TLS CA file location.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     tls-port: 
       description: Port to use TLS encryption on.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     tls-auth-clients: 
       description: Force TLS authentication.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     port: 
       description: Non TLS port for Redis access.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     tcp-backlog: 
       description: Set the TCP backlog value. This is normally increasd in high request environments.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     timeout: 
       description: Time in seconds to close an idle connection. 0 to disable.
       global: True
-      helpLink: redis
+      helpLink: redis.html
     tcp-keepalive: 
       description: Time in seconds to send a keepalive.
       global: True
-      helpLink: redis
+      helpLink: redis.html
     tls-replication:
       description: Enable TLS replication links.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     tls-protocols:
       description: List of acceptable TLS protocols separated by spaces.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     tls-prefer-server-ciphers: 
       description: Prefer the server side ciphers.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     tls-session-caching:
       description: Enable TLS session caching.
       global: True
-      helpLink: redis
+      helpLink: redis.html
     tls-session-cache-size: 
       description: The number of TLS sessions to cache.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     tls-session-cache-timeout: 
       description: Timeout in seconds to cache TLS sessions.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     loglevel:
       description: Log verbosity level.
       global: True
-      helpLink: redis
+      helpLink: redis.html
     logfile:
       description: Log file name.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     syslog-enabled: 
       description: Enable syslog output.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     syslog-ident:
       description: Set the syslog identity.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     syslog-facility:
       description: Set the syslog facility.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     databases:
       description: Total amount of databases.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     always-show-logo:
       description: The amount of time that a write will wait before fsyncing.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     save:
       '900':
         description: Set the amount of keys that need to change to save after 15 minutes.
         global: True
-        helpLink: redis
+        helpLink: redis.html
       '300': 
         description: Set the amount of keys that need to change to save after 5 minutes.
         global: True
-        helpLink: redis
+        helpLink: redis.html
       '60': 
         description: Set the amount of keys that need to change to save after 1 minute
         global: True
-        helpLink: redis
+        helpLink: redis.html
     stop-writes-on-bgsave-error: 
       description: Stop writes to redis is there is an error with the save.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     rdbcompression:
       description: Compress string objects with LZF.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     rdbchecksum:
       description: Enable checksum of rdb files.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     dbfilename:
       description: Filename of the rdb saves.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     acllog-max-len:
       description: Maximum length of the ACL log.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     maxmemory:
       description: Maximum memory for storing redis objects.
       global: True
-      helpLink: redis
+      helpLink: redis.html
     maxmemory-policy:
       description: The policy to use when maxmemory is reached.
       global: True
-      helpLink: redis
+      helpLink: redis.html
     maxmemory-samples:
       description: maxmemory sample size.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     lua-time-limit:
       description: Maximum execution time of LUA scripts.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     slowlog-log-slower-than:
       description: Time in microseconds to write to the slow log.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     slowlog-max-len:
       description: Maximum size of the slow log.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     hash-max-ziplist-entries:
       description: Used for advanced performance tuning of Redis.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     hash-max-ziplist-value:
       description: Used for advanced performance tuning of Redis.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     list-max-ziplist-size:
       description: Used for advanced performance tuning of Redis.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     list-compress-depth:
       description: Depth for list compression.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     set-max-intset-entries:
       description: Sets the limit on the size of the set in order to use the special memory saving encoding.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     zset-max-ziplist-entries:
       description: Used for advanced performance tuning of Redis.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     zset-max-ziplist-value:
       description: Used for advanced performance tuning of Redis.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     hll-sparse-max-bytes:
       description: Used for advanced performance tuning of Redis.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     stream-node-max-bytes:
       description: Used for advanced performance tuning of Redis.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     stream-node-max-entries:
       description: Used for advanced performance tuning of Redis.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     activerehashing:
       description: Used for advanced performance tuning of Redis.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     client-output-buffer-limit:
       normal: 
         description: Used for advanced performance tuning of Redis.
         global: True
         advanced: True
-        helpLink: redis
+        helpLink: redis.html
       replica:
         description: Used for advanced performance tuning of Redis.
         global: True
         advanced: True
-        helpLink: redis
+        helpLink: redis.html
       pubsub: 
         description: Used for advanced performance tuning of Redis.
         global: True
         advanced: True
-        helpLink: redis
+        helpLink: redis.html
     hz: 
       description: Used for advanced performance tuning of Redis.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     dynamic-hz:
       description: Used for advanced performance tuning of Redis.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     rdb-save-incremental-fsync: 
       description: fsync redis data.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html
     jemalloc-bg-thread:
       description: Jemalloc background thread for purging.
       global: True
       advanced: True
-      helpLink: redis
+      helpLink: redis.html

salt/registry/enabled.sls

@@ -6,7 +6,7 @@
 {% 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 DOCKERMERGED %}
+{%   from 'docker/docker.map.jinja' import DOCKER %}
 
 include:
   - registry.ssl
@@ -20,10 +20,10 @@ so-dockerregistry:
     - hostname: so-registry
     - networks:
       - sobridge:
-        - ipv4_address: {{ DOCKERMERGED.containers['so-dockerregistry'].ip }}
+        - ipv4_address: {{ DOCKER.containers['so-dockerregistry'].ip }}
     - restart_policy: always
     - port_bindings:
-      {% for BINDING in DOCKERMERGED.containers['so-dockerregistry'].port_bindings %}
+      {% for BINDING in DOCKER.containers['so-dockerregistry'].port_bindings %}
       - {{ BINDING }}
       {% endfor %}
     - binds:
@@ -32,31 +32,25 @@ so-dockerregistry:
       - /nsm/docker-registry/docker:/var/lib/registry/docker:rw
       - /etc/pki/registry.crt:/etc/pki/registry.crt:ro
       - /etc/pki/registry.key:/etc/pki/registry.key:ro
-      {% if DOCKERMERGED.containers['so-dockerregistry'].custom_bind_mounts %}
-        {% for BIND in DOCKERMERGED.containers['so-dockerregistry'].custom_bind_mounts %}
+      {% if DOCKER.containers['so-dockerregistry'].custom_bind_mounts %}
+        {% for BIND in DOCKER.containers['so-dockerregistry'].custom_bind_mounts %}
       - {{ BIND }}
         {% endfor %}
       {% endif %}
-    {% if DOCKERMERGED.containers['so-dockerregistry'].extra_hosts %}
+    {% if DOCKER.containers['so-dockerregistry'].extra_hosts %}
     - extra_hosts:
-      {% for XTRAHOST in DOCKERMERGED.containers['so-dockerregistry'].extra_hosts %}
+      {% for XTRAHOST in DOCKER.containers['so-dockerregistry'].extra_hosts %}
       - {{ XTRAHOST }}
       {% endfor %}
     {% endif %}
     - client_timeout: 180
     - environment:
       - HOME=/root
-      {% if DOCKERMERGED.containers['so-dockerregistry'].extra_env %}
-        {% for XTRAENV in DOCKERMERGED.containers['so-dockerregistry'].extra_env %}
+      {% if DOCKER.containers['so-dockerregistry'].extra_env %}
+        {% for XTRAENV in DOCKER.containers['so-dockerregistry'].extra_env %}
       - {{ XTRAENV }}
         {% endfor %}
       {% endif %}
-    {% if DOCKERMERGED.containers['so-dockerregistry'].ulimits %}
-    - ulimits:
-    {%   for ULIMIT in DOCKERMERGED.containers['so-dockerregistry'].ulimits %}
-      - {{ ULIMIT.name }}={{ ULIMIT.soft }}:{{ ULIMIT.hard }}
-    {%   endfor %}
-    {% endif %}
     - retry:
         attempts: 5
         interval: 30

salt/registry/soc_registry.yaml

@@ -1,5 +1,4 @@
 registry:
   enabled:
     description: Enables or disables the Docker registry on the manager node. WARNING - If this process is disabled the grid will malfunction and a manual effort may be needed to re-enable the setting.
-    forcedType: bool
     advanced: True

salt/repo/client/map.jinja

@@ -1,29 +1,43 @@
-{% set REPOPATH = '/etc/yum.repos.d/' %}
-{% set ABSENTFILES = [
-       'centos-addons.repo',
-       'centos-devel.repo',
-       'centos-extras.repo',
-       'centos.repo',
-       'docker-ce.repo',
-       'epel.repo',
-       'epel-testing.repo',
-       'saltstack.repo',
-       'salt-latest.repo',
-       'wazuh.repo'
-       'Rocky-Base.repo',
-       'Rocky-CR.repo',
-       'Rocky-Debuginfo.repo',
-       'Rocky-fasttrack.repo',
-       'Rocky-Media.repo',
-       'Rocky-Sources.repo',
-       'Rocky-Vault.repo',
-       'Rocky-x86_64-kernel.repo',
-       'rocky-addons.repo',
-       'rocky-devel.repo',
-       'rocky-extras.repo',
-       'rocky.repo',
-       'oracle-linux-ol9.repo',
-       'uek-ol9.repo',
-       'virt-ol9.repo'
-     ]
-%}
+{% from 'vars/globals.map.jinja' import GLOBALS %}
+
+{% if GLOBALS.os_family == 'RedHat' %}
+  {% set REPOPATH = '/etc/yum.repos.d/' %}
+{%     if GLOBALS.os == 'OEL' %}
+  {% set ABSENTFILES = [
+         'centos-addons.repo',
+         'centos-devel.repo',
+         'centos-extras.repo',
+         'centos.repo',
+         'docker-ce.repo',
+         'epel.repo',
+         'epel-testing.repo',
+         'saltstack.repo',
+         'salt-latest.repo',
+         'wazuh.repo'
+         'Rocky-Base.repo',
+         'Rocky-CR.repo',
+         'Rocky-Debuginfo.repo',
+         'Rocky-fasttrack.repo',
+         'Rocky-Media.repo',
+         'Rocky-Sources.repo',
+         'Rocky-Vault.repo',
+         'Rocky-x86_64-kernel.repo',
+         'rocky-addons.repo',
+         'rocky-devel.repo',
+         'rocky-extras.repo',
+         'rocky.repo',
+         'oracle-linux-ol9.repo',
+         'uek-ol9.repo',
+         'virt-ol9.repo'
+       ]
+  %}
+{%     else %}
+  {% set ABSENTFILES = [] %}
+{%    endif %}
+
+{% else %}
+
+  {% set REPOPATH = '/etc/apt/sources.list.d/' %}
+  {% set ABSENTFILES = [] %}
+
+{% endif %}

salt/salt/init.sls

@@ -1,3 +1,10 @@
+{% if grains.oscodename == 'focal' %}
+saltpymodules:
+  pkg.installed:
+    - pkgs:
+      - python3-docker
+{% endif %}
+
 # distribute to minions for salt upgrades
 salt_bootstrap:
   file.managed:

salt/salt/map.jinja

@@ -17,12 +17,22 @@
 {% set SALTVERSION = saltminion.salt.minion.version | string %}
 {% set INSTALLEDSALTVERSION = grains.saltversion | string %}
 
-{% set SPLITCHAR = '-' %}
-{% set SALTPACKAGES = ['salt', 'salt-master', 'salt-minion', 'salt-cloud'] %}
-{% set SYSTEMD_UNIT_FILE = '/usr/lib/systemd/system/salt-minion.service' %}
+{% if grains.os_family == 'Debian' %}
+  {% set SPLITCHAR = '+' %}
+  {% set SALTPACKAGES = ['salt-common', 'salt-master', 'salt-minion', 'salt-cloud'] %}
+  {% set SYSTEMD_UNIT_FILE = '/lib/systemd/system/salt-minion.service' %}
+{% else %}
+  {% set SPLITCHAR = '-' %}
+  {% set SALTPACKAGES = ['salt', 'salt-master', 'salt-minion', 'salt-cloud'] %}
+  {% set SYSTEMD_UNIT_FILE = '/usr/lib/systemd/system/salt-minion.service' %}
+{% endif %}
 
 {% if INSTALLEDSALTVERSION != SALTVERSION %}
-  {% set UPGRADECOMMAND = 'yum clean all ; /usr/sbin/bootstrap-salt.sh -X -r -F stable ' ~ SALTVERSION %}
+  {% if grains.os_family|lower == 'redhat' %}
+      {% set UPGRADECOMMAND = 'yum clean all ; /usr/sbin/bootstrap-salt.sh -X -r -F stable ' ~ SALTVERSION %}
+  {% elif grains.os_family|lower == 'debian' %}
+    {% set UPGRADECOMMAND = '/usr/sbin/bootstrap-salt.sh -X -F stable ' ~ SALTVERSION %}
+  {% endif %}
 {% else %}
   {% set UPGRADECOMMAND = 'echo Already running Salt Minion version ' ~ SALTVERSION %}
 {% endif %}

salt/salt/master.sls

@@ -23,6 +23,15 @@ sync_runners:
     - name: saltutil.sync_runners
 {% endif %}
 
+# prior to 2.4.30 this engine ran on the manager with salt-minion
+# this has changed to running with the salt-master in 2.4.30
+remove_engines_config:
+  file.absent:
+    - name: /etc/salt/minion.d/engines.conf
+    - source: salt://salt/files/engines.conf
+    - watch_in:
+      - service: salt_minion_service
+
 checkmine_engine:
   file.managed:
     - name: /etc/salt/engines/checkmine.py

salt/sensor/soc_sensor.yaml

@@ -1,15 +1,15 @@
 sensor:
   interface:
     description: Main sensor monitoring interface.
-    helpLink: network-visibility
+    helpLink: network.html
     readonly: True
   mtu:
     description: Maximum Transmission Unit (MTU) of the sensor monitoring interface.
-    helpLink: network-visibility
+    helpLink: network.html
     readonly: True
   channels:
     description: Set the size of the nic channels. This is rarely changed from 1 
-    helpLink: network-visibility
+    helpLink: network.html
     forcedType: int
     node: True
     advanced: True

salt/sensoroni/enabled.sls

@@ -4,7 +4,7 @@
 # Elastic License 2.0.
 
 {% from 'vars/globals.map.jinja' import GLOBALS %}
-{% from 'docker/docker.map.jinja' import DOCKERMERGED %}
+{% from 'docker/docker.map.jinja' import DOCKER %}
 
 
 include:
@@ -23,29 +23,23 @@ so-sensoroni:
       - /opt/so/conf/sensoroni/templates:/opt/sensoroni/templates:ro
       - /opt/so/log/sensoroni:/opt/sensoroni/logs:rw
       - /nsm/suripcap/:/nsm/suripcap:rw
-      {% if DOCKERMERGED.containers['so-sensoroni'].custom_bind_mounts %}
-        {% for BIND in DOCKERMERGED.containers['so-sensoroni'].custom_bind_mounts %}
+      {% if DOCKER.containers['so-sensoroni'].custom_bind_mounts %}
+        {% for BIND in DOCKER.containers['so-sensoroni'].custom_bind_mounts %}
       - {{ BIND }}
         {% endfor %}
       {% endif %}
-    {% if DOCKERMERGED.containers['so-sensoroni'].extra_hosts %}
+    {% if DOCKER.containers['so-sensoroni'].extra_hosts %}
     - extra_hosts:
-      {% for XTRAHOST in DOCKERMERGED.containers['so-sensoroni'].extra_hosts %}
+      {% for XTRAHOST in DOCKER.containers['so-sensoroni'].extra_hosts %}
       - {{ XTRAHOST }}
       {% endfor %}
     {% endif %}
-    {% if DOCKERMERGED.containers['so-sensoroni'].extra_env %}
+    {% if DOCKER.containers['so-sensoroni'].extra_env %}
     - environment:
-      {% for XTRAENV in DOCKERMERGED.containers['so-sensoroni'].extra_env %}
+      {% for XTRAENV in DOCKER.containers['so-sensoroni'].extra_env %}
       - {{ XTRAENV }}
       {% endfor %}
     {% endif %}
-    {% if DOCKERMERGED.containers['so-sensoroni'].ulimits %}
-    - ulimits:
-    {%   for ULIMIT in DOCKERMERGED.containers['so-sensoroni'].ulimits %}
-      - {{ ULIMIT.name }}={{ ULIMIT.soft }}:{{ ULIMIT.hard }}
-    {%   endfor %}
-    {% endif %}
     - watch:
       - file: /opt/so/conf/sensoroni/sensoroni.json
     - require: