salt/common/suse.sls

@@ -2,7 +2,7 @@ include:
   - firewalld
   - profile.seccheck
   - profile.zypp
-  - profile.prometheus.node_exporter
+  - profile.node_exporter
   - users
   - .ssh
   - postfix.config

salt/profile/prometheus/targets.sls

@@ -1,18 +0,0 @@
-{%- set mypillar = salt['pillar.get']('profile:prometheus:targets') %}
-{%- set targetsdir = '/etc/prometheus/targets' %}
-
-{%- if mypillar | length %}
-{{ targetsdir }}:
-  file.directory:
-    - group: prometheus
-
-{%- for group, nodes in mypillar.items() %}
-{{ targetsdir }}/{{ group }}.json:
-  file.serialize:
-    - dataset: {{ nodes }}
-    - serializer: json
-{%- endfor %}
-
-{%- else %}
-{%- do salt.log.debug('profile.prometheus: no targets defined') %}
-{%- endif %}

salt/role/monitoring/prometheus-alertmanager.sls

@@ -1,2 +1,2 @@
 include:
-  - prometheus.config
+  - .prometheus

salt/role/monitoring/prometheus-exporter-blackbox.sls

@@ -1,2 +1,2 @@
 include:
-  - prometheus.config
+  - .prometheus

salt/role/monitoring/prometheus.sls

@@ -1,3 +1,2 @@
 include:
   - prometheus.config
-  - profile.prometheus.targets