From 9315effc227f1da105823a1bd0abc81722d4dace Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Sun, 7 Jun 2020 15:54:57 +0200 Subject: [PATCH] proper naming and actually using the state --- hardware/raspberrypi/init.sls | 12 ++++++++++-- .../prometheus-exporter/{ini.sls => init.sls} | 0 2 files changed, 10 insertions(+), 2 deletions(-) rename hardware/raspberrypi/prometheus-exporter/{ini.sls => init.sls} (100%) diff --git a/hardware/raspberrypi/init.sls b/hardware/raspberrypi/init.sls index 2a2dcab..6755bee 100644 --- a/hardware/raspberrypi/init.sls +++ b/hardware/raspberrypi/init.sls @@ -1,4 +1,9 @@ - +{% +set has_promeexporter = salt['pillar.get']( + 'prometheus:service:wanted', + default=False +%} + {% set has_fan = salt['pillar.get']( 'hardware:raspberrypi:fan:has_fan', @@ -6,7 +11,10 @@ set has_fan = salt['pillar.get']( ) %} -{%- if has_fan %} include: +{%- if 'node_exporter' in has_promexporter %} + - .prometheus-exporter +{%- endif %} +{%- if has_fan %} - .fan {%- endif %} diff --git a/hardware/raspberrypi/prometheus-exporter/ini.sls b/hardware/raspberrypi/prometheus-exporter/init.sls similarity index 100% rename from hardware/raspberrypi/prometheus-exporter/ini.sls rename to hardware/raspberrypi/prometheus-exporter/init.sls