From 2e82d06f27add577be5c2bce50de309173158e95 Mon Sep 17 00:00:00 2001 From: Wes Lambert Date: Tue, 12 Nov 2019 21:10:31 +0000 Subject: [PATCH] only configure Telegraf if Grafana enabled --- salt/common/init.sls | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/salt/common/init.sls b/salt/common/init.sls index 93940669c..505289bc0 100644 --- a/salt/common/init.sls +++ b/salt/common/init.sls @@ -141,6 +141,8 @@ 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: @@ -213,9 +215,6 @@ 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: