Merge pull request #1185 from Security-Onion-Solutions/issue/1049

Issue/1049

salt/common/maps/import.map.jinja

@@ -5,8 +5,6 @@
     'so-soc',
     'so-kratos',
     'so-elasticsearch',
-    'so-kibana',
+    'so-kibana'
-    'so-suricata',
-    'so-zeek'
   ]
 } %}

salt/firewall/assigned_hostgroups.map.yaml

@@ -506,6 +506,7 @@ role:
             portgroups:
               - {{ portgroups.beats_5044 }}
               - {{ portgroups.beats_5644 }}
+              - {{ portgroups.sensoroni }}
           search_node:
             portgroups:
               - {{ portgroups.redis }}

salt/pcap/init.sls

@@ -18,6 +18,7 @@
 {% set INTERFACE = salt['pillar.get']('sensor:interface', 'bond0') %}
 {% set BPF_STENO = salt['pillar.get']('steno:bpf', None) %}
 {% set BPF_COMPILED = "" %}
+{% from "pcap/map.jinja" import START with context %}
 
 # PCAP Section
 
@@ -131,6 +132,7 @@ sensoronilog:
 so-steno:
   docker_container.running:
     - image: {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-steno:{{ VERSION }}
+    - start: {{ START }}
     - network_mode: host
     - privileged: True
     - port_bindings:

salt/pcap/map.jinja

@@ -0,0 +1,6 @@
+# don't start the docker container if it is an import node
+{% if grains.id.split('_')|last == 'import' %}
+  {% set START = False %}
+{% else %}
+  {% set START = True %}
+{% endif %}

salt/suricata/init.sls

@@ -23,6 +23,7 @@
 
 {# import_yaml 'suricata/files/defaults2.yaml' as suricata #}
 {% from 'suricata/suricata_config.map.jinja' import suricata_defaults as suricata_config with context %}
+{% from "suricata/map.jinja" import START with context %}
 
 # Suricata
 
@@ -134,6 +135,7 @@ suribpf:
 so-suricata:
   docker_container.running:
     - image: {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-suricata:{{ VERSION }}
+    - start: {{ START }}
     - privileged: True
     - environment:
       - INTERFACE={{ interface }}

salt/suricata/map.jinja

@@ -0,0 +1,6 @@
+# don't start the docker container if it is an import node
+{% if grains.id.split('_')|last == 'import' %}
+  {% set START = False %}
+{% else %}
+  {% set START = True %}
+{% endif %}

salt/top.sls

@@ -399,6 +399,7 @@ base:
     - firewall
     - idstools
     - suricata.manager
+    - pcap
     - elasticsearch
     - kibana
     - filebeat

salt/zeek/init.sls

@@ -1,3 +1,5 @@
+{% from "zeek/map.jinja" import START with context %}
+
 {% set VERSION = salt['pillar.get']('global:soversion', 'HH1.2.2') %}
 {% set IMAGEREPO = salt['pillar.get']('global:imagerepo') %}
 {% set MANAGER = salt['grains.get']('master') %}
@@ -167,6 +169,7 @@ localzeeksync:
 so-zeek:
   docker_container.running:
     - image: {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-zeek:{{ VERSION }}
+    - start: {{ START }}
     - privileged: True
     - binds:
       - /nsm/zeek/logs:/nsm/zeek/logs:rw

salt/zeek/map.jinja

@@ -0,0 +1,6 @@
+# don't start the docker container if it is an import node
+{% if grains.id.split('_')|last == 'import' %}
+  {% set START = False %}
+{% else %}
+  {% set START = True %}
+{% endif %}

setup/so-functions

@@ -804,6 +804,7 @@ docker_seed_registry() {
 			"so-filebeat:$VERSION" \
 			"so-suricata:$VERSION" \
 			"so-soc:$VERSION" \
+			"so-steno:$VERSION" \
 			"so-elasticsearch:$VERSION" \
 			"so-kibana:$VERSION" \
 			"so-kratos:$VERSION" \

setup/so-setup

@@ -577,7 +577,7 @@ fi
 		salt-call state.apply -l info elasticsearch >> $setup_log 2>&1
 	fi
 
-	if [[ $is_sensor ]]; then
+	if [[ $is_sensor || $is_import ]]; then
 		set_progress_str 65 "$(print_salt_state_apply 'pcap')"
 		salt-call state.apply -l info pcap >> $setup_log 2>&1
 	fi