From 90aac9412884d72f06b55cc337c80a746b4501c4 Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Wed, 8 May 2019 17:59:42 -0400 Subject: [PATCH] Reverted back to promtheus naming, instead of -ng, for easier drop-in. --- prometheus/alertmanager.sls | 8 ++++---- prometheus/exporter/blackbox.sls | 6 +++--- prometheus/exporter/haproxy.sls | 6 +++--- prometheus/exporter/node.sls | 6 +++--- prometheus/exporter/rabbitmq.sls | 6 +++--- prometheus/server.sls | 6 +++--- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/prometheus/alertmanager.sls b/prometheus/alertmanager.sls index 07ab3b9..30e32fb 100644 --- a/prometheus/alertmanager.sls +++ b/prometheus/alertmanager.sls @@ -28,7 +28,7 @@ alertmanager_config: alertmanager_config: file.managed: - name: {{ prometheus.alertmanager.args.config_file }} - - source: salt://prometheus-ng/files/config.jinja + - source: salt://prometheus/files/config.jinja - template: jinja - user: {{ prometheus.user }} - group: {{ prometheus.group }} @@ -39,7 +39,7 @@ alertmanager_config: alertmanager_defaults: file.managed: - name: /etc/default/alertmanager - - source: salt://prometheus-ng/files/default-alertmanager.jinja + - source: salt://prometheus/files/default-alertmanager.jinja - template: jinja - defaults: config_file: {{ prometheus.alertmanager.args.config_file }} @@ -58,10 +58,10 @@ alertmanager_service_unit: file.managed: {%- if grains.get('init') == 'systemd' %} - name: /etc/systemd/system/alertmanager.service - - source: salt://prometheus-ng/files/alertmanager.systemd.jinja + - source: salt://prometheus/files/alertmanager.systemd.jinja {%- elif grains.get('init') == 'upstart' %} - name: /etc/init/alertmanager.conf - - source: salt://prometheus-ng/files/alertmanager.upstart.jinja + - source: salt://prometheus/files/alertmanager.upstart.jinja {%- endif %} - watch: - file: alertmanager_defaults diff --git a/prometheus/exporter/blackbox.sls b/prometheus/exporter/blackbox.sls index e397c4d..8774bf4 100644 --- a/prometheus/exporter/blackbox.sls +++ b/prometheus/exporter/blackbox.sls @@ -25,7 +25,7 @@ blackbox_exporter_bin_link: blackbox_exporter_defaults: file.managed: - name: /etc/default/blackbox_exporter - - source: salt://prometheus-ng/files/default-blackbox_exporter.jinja + - source: salt://prometheus/files/default-blackbox_exporter.jinja - template: jinja - defaults: config_file: {{ prometheus.exporter.blackbox.args.config_file }} @@ -34,10 +34,10 @@ blackbox_exporter_service_unit: file.managed: {%- if grains.get('init') == 'systemd' %} - name: /etc/systemd/system/blackbox_exporter.service - - source: salt://prometheus-ng/files/exporter.systemd.jinja + - source: salt://prometheus/files/exporter.systemd.jinja {%- elif grains.get('init') == 'upstart' %} - name: /etc/init/blackbox_exporter.conf - - source: salt://prometheus-ng/files/exporter.upstart.jinja + - source: salt://prometheus/files/exporter.upstart.jinja {%- endif %} - context: svc: node_exporter diff --git a/prometheus/exporter/haproxy.sls b/prometheus/exporter/haproxy.sls index c89c33b..55adfbf 100644 --- a/prometheus/exporter/haproxy.sls +++ b/prometheus/exporter/haproxy.sls @@ -25,7 +25,7 @@ haproxy_exporter_bin_link: haproxy_exporter_defaults: file.managed: - name: /etc/default/haproxy_exporter - - source: salt://prometheus-ng/files/default-haproxy_exporter.jinja + - source: salt://prometheus/files/default-haproxy_exporter.jinja - template: jinja - defaults: scrape_uri: {{ prometheus.exporter.haproxy.args.scrape_uri }} @@ -34,10 +34,10 @@ haproxy_exporter_service_unit: file.managed: {%- if grains.get('init') == 'systemd' %} - name: /etc/systemd/system/haproxy_exporter.service - - source: salt://prometheus-ng/files/exporter.systemd.jinja + - source: salt://prometheus/files/exporter.systemd.jinja {%- elif grains.get('init') == 'upstart' %} - name: /etc/init/haproxy_exporter.conf - - source: salt://prometheus-ng/files/exporter.upstart.jinja + - source: salt://prometheus/files/exporter.upstart.jinja {%- endif %} - context: svc: node_exporter diff --git a/prometheus/exporter/node.sls b/prometheus/exporter/node.sls index e61253c..87d31ea 100644 --- a/prometheus/exporter/node.sls +++ b/prometheus/exporter/node.sls @@ -25,17 +25,17 @@ node_exporter_bin_link: node_exporter_defaults: file.managed: - name: /etc/default/node_exporter - - source: salt://prometheus-ng/files/default-node_exporter.jinja + - source: salt://prometheus/files/default-node_exporter.jinja - template: jinja node_exporter_service_unit: file.managed: {%- if grains.get('init') == 'systemd' %} - name: /etc/systemd/system/node_exporter.service - - source: salt://prometheus-ng/files/exporter.systemd.jinja + - source: salt://prometheus/files/exporter.systemd.jinja {%- elif grains.get('init') == 'upstart' %} - name: /etc/init/node_exporter.conf - - source: salt://prometheus-ng/files/exporter.upstart.jinja + - source: salt://prometheus/files/exporter.upstart.jinja {%- endif %} - context: svc: node_exporter diff --git a/prometheus/exporter/rabbitmq.sls b/prometheus/exporter/rabbitmq.sls index cc907e3..e59f74c 100644 --- a/prometheus/exporter/rabbitmq.sls +++ b/prometheus/exporter/rabbitmq.sls @@ -25,17 +25,17 @@ rabbitmq_exporter_bin_link: rabbitmq_exporter_defaults: file.managed: - name: /etc/default/rabbitmq_exporter - - source: salt://prometheus-ng/files/default-rabbitmq_exporter.jinja + - source: salt://prometheus/files/default-rabbitmq_exporter.jinja - template: jinja rabbitmq_exporter_service_unit: file.managed: {%- if grains.get('init') == 'systemd' %} - name: /etc/systemd/system/rabbitmq_exporter.service - - source: salt://prometheus-ng/files/exporter.systemd.jinja + - source: salt://prometheus/files/exporter.systemd.jinja {%- elif grains.get('init') == 'upstart' %} - name: /etc/init/rabbitmq_exporter.conf - - source: salt://prometheus-ng/files/exporter.upstart.jinja + - source: salt://prometheus/files/exporter.upstart.jinja {%- endif %} - context: svc: node_exporter diff --git a/prometheus/server.sls b/prometheus/server.sls index 311fba1..b6b96d1 100644 --- a/prometheus/server.sls +++ b/prometheus/server.sls @@ -28,7 +28,7 @@ prometheus_server_config: prometheus_defaults: file.managed: - name: /etc/default/prometheus - - source: salt://prometheus-ng/files/default-prometheus.jinja + - source: salt://prometheus/files/default-prometheus.jinja - template: jinja - defaults: config_file: {{ prometheus.server.args.config_file }} @@ -51,10 +51,10 @@ prometheus_service_unit: file.managed: {%- if grains.get('init') == 'systemd' %} - name: /etc/systemd/system/prometheus.service - - source: salt://prometheus-ng/files/prometheus.systemd.jinja + - source: salt://prometheus/files/prometheus.systemd.jinja {%- elif grains.get('init') == 'upstart' %} - name: /etc/init/prometheus.conf - - source: salt://prometheus-ng/files/prometheus.upstart.jinja + - source: salt://prometheus/files/prometheus.upstart.jinja {%- endif %} - context: user: {{ prometheus.user }}