Merge pull request #163 from m0duspwnens/master

reverting for Security-Onion-Solutions#111
This commit is contained in:
Mike Reeves
2019-12-12 16:54:36 -05:00
committed by GitHub

View File

@@ -142,8 +142,6 @@ so-core:
- watch:
- file: /opt/so/conf/nginx/nginx.conf
# If master or eval, install Grafana/Telegraf/Influx
{% if grains['role'] == 'so-master' or grains['role'] == 'so-eval' and GRAFANA == 1 %}
# Add Telegraf to monitor all the things.
tgraflogdir:
file.directory:
@@ -216,6 +214,9 @@ so-telegraf:
- /opt/so/conf/telegraf/etc/telegraf.conf
- /opt/so/conf/telegraf/scripts
# If its a master or eval lets install the back end for now
{% if grains['role'] == 'so-master' or grains['role'] == 'so-eval' and GRAFANA == 1 %}
# Influx DB
influxconfdir:
file.directory: