CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-08 10:12:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #163 from m0duspwnens/master

Browse Source 
reverting for Security-Onion-Solutions#111
This commit is contained in:
Mike Reeves
2019-12-12 16:54:36 -05:00
committed by GitHub
parent ed6ca5a3a9 349d8f4bd7
commit b04da4562c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
salt/common/init.sls
View File

@@ -142,8 +142,6 @@ so-core:
- watch: - watch:
- file: /opt/so/conf/nginx/nginx.conf - 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. # Add Telegraf to monitor all the things.
tgraflogdir: tgraflogdir:
file.directory: file.directory:
@@ -216,6 +214,9 @@ so-telegraf:
- /opt/so/conf/telegraf/etc/telegraf.conf - /opt/so/conf/telegraf/etc/telegraf.conf
- /opt/so/conf/telegraf/scripts - /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 # Influx DB
influxconfdir: influxconfdir:
file.directory: file.directory: