From 056a450ad01df759fe645ff6e658eb1d15b6c99e Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Wed, 8 May 2019 10:26:22 -0400 Subject: [PATCH] Fixed how services works in prometheus exporters --- prometheus/exporters.sls | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/prometheus/exporters.sls b/prometheus/exporters.sls index bf8ce8f..0feaa30 100644 --- a/prometheus/exporters.sls +++ b/prometheus/exporters.sls @@ -19,9 +19,10 @@ - require: - file: {{ exporter }}-exporter-bin-dir +{# {{ exporter }}_exporter_service: service.running: - - name: {{ exporter }}-exporter + - name: {{ exporter }}_exporter - enable: True {%- if grains.get('noservices') %} - onlyif: /bin/false @@ -30,6 +31,7 @@ - watch: - file: {{ exporter }}_exporter_service_config_file {%- endif %} +#} {%- for svc, svc_parameters in parameters.get('services', {}).iteritems() %} {%- if svc_parameters.get('enabled', False) %} @@ -52,7 +54,12 @@ - require: - archive: {{ exporter }}_exporter_extracted - watch_in: - - service: {{ exporter }}_exporter_service + - service: {{ exporter }}_{{ svc }}_exporter_service + +{{ exporter }}_{{ svc }}_exporter_service: + service.running: + - name: {{ svc}} + - enable: True {# {{ _exporter_serviceorter }}_{{ svc }}_exporter_config_file: