diff --git a/base/packages/prometheus/init.sls b/base/packages/prometheus/init.sls index 52dcf26..849ef47 100644 --- a/base/packages/prometheus/init.sls +++ b/base/packages/prometheus/init.sls @@ -4,15 +4,19 @@ set has_promexporter = salt['pillar.get']( default={} ) %} - {% set orig_prom_path = '/var/lib/prometheus/node-exporter' %} - -{%- if 'prometheus-node_exporter' in has_promexporter %} - +# This has to be here, otherwise: +# https://stackoverflow.com/questions/59268721/saltstack-use-include-twice-in-one-sls-file +# include: + {%- if 'prometheus-node_exporter' in has_promexporter %} - prometheus - systemd.reload + {%- else %} + - prometheus.clean + {%- endif %} +{%- if 'prometheus-node_exporter' in has_promexporter %} systemd-prometheus-node-exporter-service-override: file.managed: - name: /etc/systemd/system/prometheus-node-exporter.service.d/override.conf @@ -45,8 +49,4 @@ patch-smartmon.sh: - name: /usr/share/prometheus-node-exporter/smartmon.sh - source: salt://base/packages/prometheus/files/smartmon.sh - mode: 0755 - -{%- else %} -include: - - prometheus.clean {%- endif %}