Merge pull request #544 from Security-Onion-Solutions/bugfix/fleet-so-status

so-status Fleet node
This commit is contained in:
Josh Brower
2020-04-09 10:05:01 -04:00
committed by GitHub

View File

@@ -1,4 +1,5 @@
{% set OSQUERY = salt['pillar.get']('master:osquery', '0') %}
{%- 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') %}
@@ -7,7 +8,6 @@
{% set BROVER = salt['pillar.get']('static:broversion', 'COMMUNITY') %}
{% set GRAFANA = salt['pillar.get']('master:grafana', '0') %}
eval:
containers:
- so-core
@@ -20,7 +20,7 @@ eval:
- so-soc
- so-kratos
- so-idstools
{% if OSQUERY != '0' %}
{% if FLEETMASTER %}
- so-mysql
- so-fleet
- so-redis
@@ -100,7 +100,7 @@ master_search:
- so-elastalert
- so-filebeat
- so-soctopus
{% if OSQUERY != '0' %}
{% if FLEETMASTER %}
- so-mysql
- so-fleet
- so-redis
@@ -143,7 +143,7 @@ master:
- so-kibana
- so-elastalert
- so-filebeat
{% if OSQUERY != '0' %}
{% if FLEETMASTER %}
- so-mysql
- so-fleet
- so-redis
@@ -199,4 +199,13 @@ warm_node:
- so-core
- so-telegraf
- so-elasticsearch
fleet:
containers:
{% if FLEETNODE %}
- so-mysql
- so-fleet
- so-redis
- so-filebeat
- so-core
- so-telegraf
{% endif %}