[fix] Pull docker/config.sls changes from dev

This commit is contained in:
William Wernert
2020-05-04 10:28:44 -04:00
parent c82f55695c
commit 26e40f433b

View File

@@ -1,19 +1,18 @@
{%- set FLEETMASTER = salt['pillar.get']('static:fleet_master', False) -%}
{%- set FLEETNODE = salt['pillar.get']('static:fleet_node', False) -%}
{% set WAZUH = salt['pillar.get']('master:wazuh', '0') %}
{% set THEHIVE = salt['pillar.get']('master:thehive', '0') %}
{% set PLAYBOOK = salt['pillar.get']('master:playbook', '0') %}
{% set FREQSERVER = salt['pillar.get']('master:freq', '0') %}
{% set DOMAINSTATS = salt['pillar.get']('master:domainstats', '0') %}
{% set BROVER = salt['pillar.get']('static:broversion', 'COMMUNITY') %} {% set BROVER = salt['pillar.get']('static:broversion', 'COMMUNITY') %}
{% set WAZUH = salt['pillar.get']('static:wazuh', False) %} {% set GRAFANA = salt['pillar.get']('master:grafana', '0') %}
{% set THEHIVE = salt['pillar.get']('master:thehive', False) %}
{% set PLAYBOOK = salt['pillar.get']('master:playbook', False) %}
{% set FREQSERVER = salt['pillar.get']('master:freq', False) %}
{% set DOMAINSTATS = salt['pillar.get']('master:domainstats', False) %}
{% set STRELKA = salt['pillar.get']('static:strelka', False) %}
{% set GRAFANA = salt['pillar.get']('master:grafana', False) %}
{% set FLEETMASTER = salt['pillar.get']('static:fleet_master', False) %}
{% set FLEETNODE = salt['pillar.get']('static:fleet_node', False) %}
eval: eval:
containers: containers:
- so-core - so-nginx
- so-telegraf - so-telegraf
{% if GRAFANA %} {% if GRAFANA == '1' %}
- so-influxdb - so-influxdb
- so-grafana - so-grafana
{% endif %} {% endif %}
@@ -27,34 +26,35 @@ eval:
- so-redis - so-redis
{% endif %} {% endif %}
- so-elasticsearch - so-elasticsearch
- so-logstash
- so-kibana - so-kibana
- so-steno - so-steno
- so-suricata - so-suricata
- so-zeek - so-zeek
- so-curator - so-curator
- so-elastalert - so-elastalert
{% if WAZUH %} {% if WAZUH != '0' %}
- so-wazuh - so-wazuh
{% endif %} {% endif %}
- so-soctopus - so-soctopus
{% if THEHIVE %} {% if THEHIVE != '0' %}
- so-thehive - so-thehive
- so-thehive-es - so-thehive-es
- so-cortex - so-cortex
{% endif %} {% endif %}
{% if PLAYBOOK %} {% if PLAYBOOK != '0' %}
- so-playbook - so-playbook
- so-navigator - so-navigator
{% endif %} {% endif %}
{% if FREQSERVER %} {% if FREQSERVER != '0' %}
- so-freqserver - so-freqserver
{% endif %} {% endif %}
{% if DOMAINSTATS %} {% if DOMAINSTATS != '0' %}
- so-domainstats - so-domainstats
{% endif %} {% endif %}
heavy_node: heavy_node:
containers: containers:
- so-core - so-nginx
- so-telegraf - so-telegraf
- so-redis - so-redis
- so-logstash - so-logstash
@@ -69,7 +69,7 @@ heavy_node:
{% endif %} {% endif %}
helix: helix:
containers: containers:
- so-core - so-nginx
- so-telegraf - so-telegraf
- so-idstools - so-idstools
- so-steno - so-steno
@@ -79,14 +79,14 @@ helix:
- so-filebeat - so-filebeat
hot_node: hot_node:
containers: containers:
- so-core - so-nginx
- so-telegraf - so-telegraf
- so-logstash - so-logstash
- so-elasticsearch - so-elasticsearch
- so-curator - so-curator
master_search: master_search:
containers: containers:
- so-core - so-nginx
- so-telegraf - so-telegraf
- so-soc - so-soc
- so-kratos - so-kratos
@@ -99,36 +99,37 @@ master_search:
- so-kibana - so-kibana
- so-elastalert - so-elastalert
- so-filebeat - so-filebeat
- so-soctopus
{% if FLEETMASTER %} {% if FLEETMASTER %}
- so-mysql - so-mysql
- so-fleet - so-fleet
- so-redis - so-redis
{% endif %} {% endif %}
{% if WAZUH %} {% if WAZUH != '0' %}
- so-wazuh - so-wazuh
{% endif %} {% endif %}
- so-soctopus - so-soctopus
{% if THEHIVE %} {% if THEHIVE != '0' %}
- so-thehive - so-thehive
- so-thehive-es - so-thehive-es
- so-cortex - so-cortex
{% endif %} {% endif %}
{% if PLAYBOOK %} {% if PLAYBOOK != '0' %}
- so-playbook - so-playbook
- so-navigator - so-navigator
{% endif %} {% endif %}
{% if FREQSERVER %} {% if FREQSERVER != '0' %}
- so-freqserver - so-freqserver
{% endif %} {% endif %}
{% if DOMAINSTATS %} {% if DOMAINSTATS != '0' %}
- so-domainstats - so-domainstats
{% endif %} {% endif %}
master: master:
containers: containers:
- so-dockerregistry - so-dockerregistry
- so-core - so-nginx
- so-telegraf - so-telegraf
{% if GRAFANA %} {% if GRAFANA == '1' %}
- so-influxdb - so-influxdb
- so-grafana - so-grafana
{% endif %} {% endif %}
@@ -136,6 +137,7 @@ master:
- so-kratos - so-kratos
- so-acng - so-acng
- so-idstools - so-idstools
- so-redis
- so-elasticsearch - so-elasticsearch
- so-logstash - so-logstash
- so-kibana - so-kibana
@@ -146,44 +148,44 @@ master:
- so-fleet - so-fleet
- so-redis - so-redis
{% endif %} {% endif %}
{% if WAZUH %} {% if WAZUH != '0' %}
- so-wazuh - so-wazuh
{% endif %} {% endif %}
- so-soctopus - so-soctopus
{% if THEHIVE %} {% if THEHIVE != '0' %}
- so-thehive - so-thehive
- so-thehive-es - so-thehive-es
- so-cortex - so-cortex
{% endif %} {% endif %}
{% if PLAYBOOK %} {% if PLAYBOOK != '0' %}
- so-playbook - so-playbook
- so-navigator - so-navigator
{% endif %} {% endif %}
{% if FREQSERVER %} {% if FREQSERVER != '0' %}
- so-freqserver - so-freqserver
{% endif %} {% endif %}
{% if DOMAINSTATS %} {% if DOMAINSTATS != '0' %}
- so-domainstats - so-domainstats
{% endif %} {% endif %}
parser_node: parser_node:
containers: containers:
- so-core - so-nginx
- so-telegraf - so-telegraf
- so-logstash - so-logstash
search_node: search_node:
containers: containers:
- so-core - so-nginx
- so-telegraf - so-telegraf
- so-logstash - so-logstash
- so-elasticsearch - so-elasticsearch
- so-curator - so-curator
- so-filebeat - so-filebeat
{% if WAZUH %} {% if WAZUH != '0' %}
- so-wazuh - so-wazuh
{% endif %} {% endif %}
sensor: sensor:
containers: containers:
- so-core - so-nginx
- so-telegraf - so-telegraf
- so-steno - so-steno
- so-suricata - so-suricata
@@ -194,7 +196,7 @@ sensor:
- so-filebeat - so-filebeat
warm_node: warm_node:
containers: containers:
- so-core - so-nginx
- so-telegraf - so-telegraf
- so-elasticsearch - so-elasticsearch
fleet: fleet:
@@ -204,6 +206,6 @@ fleet:
- so-fleet - so-fleet
- so-redis - so-redis
- so-filebeat - so-filebeat
- so-core - so-nginx
- so-telegraf - so-telegraf
{% endif %} {% endif %}