diff --git a/salt/top.sls b/salt/top.sls index 01eed5343..4b560c3c1 100644 --- a/salt/top.sls +++ b/salt/top.sls @@ -399,6 +399,7 @@ base: - firewall - idstools - suricata.manager + - pcap - elasticsearch - kibana - filebeat diff --git a/salt/zeek/init.sls b/salt/zeek/init.sls index 8743878da..f6e1e999e 100644 --- a/salt/zeek/init.sls +++ b/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 diff --git a/salt/zeek/map.jinja b/salt/zeek/map.jinja new file mode 100644 index 000000000..ad4d70e80 --- /dev/null +++ b/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 %} \ No newline at end of file diff --git a/setup/so-functions b/setup/so-functions index 5a63d7c12..8e94dc373 100755 --- a/setup/so-functions +++ b/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" \ diff --git a/setup/so-setup b/setup/so-setup index 45b08433f..56647b1b4 100755 --- a/setup/so-setup +++ b/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