Linux-Help
/
formula-grafana
mirror of
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixes 

Change-Id: I2992d1543bd09542239eefd9fd23434f1f374df2
This commit is contained in:
Swann Croiset 2017-05-03 15:21:43 +02:00
parent a89a9c1065
commit 4931237ebc
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
grafana/collector.sls
View File

@ -1,5 +1,4 @@
{%- from "grafana/map.jinja" import collector with context %}
{%- if collector.get('enabled', False) %}
{%- if pillar.get('grafana', {}).get('collector', {}).get('enabled', False) %}
# This state is only used to map grains.collector pillar. Grains are now
# managed from salt.minion.grains so we will just include it in case it's

8
grafana/meta/salt.yml
View File

@ -1,6 +1,5 @@
grain:
{%- if pillar.grafana.collector is defined %}
{%- if collector.get('enabled', False) %}
{%- if pillar.grafana.collector is defined %}
{%- if pillar.grafana.collector.get('enabled', False) %}
{%- set service_grains = {} %}
{%- for service_name, service in pillar.iteritems() %}
{%- if service.get('_support', {}).get('grafana', {}).get('enabled', False) %}
@ -10,7 +9,8 @@ grain:
{%- set service_grains = salt['grains.filter_by']({'default': service_grains}, merge=grains_yaml) %}
{%- endif %}
{%- endfor %}
grain:
grafana:
{{ service_grains|yaml(False)|indent(4) }}
{%- endif %}
{%- endif %}
{%- endif %}