Reverted back to promtheus naming, instead of -ng, for easier drop-in.

master
Eric Renfro 4 years ago
parent dd85a8284f
commit 90aac94128
Signed by: psi-jack
GPG Key ID: 14977F3A50D9A5BF
  1. 8
      prometheus/alertmanager.sls
  2. 6
      prometheus/exporter/blackbox.sls
  3. 6
      prometheus/exporter/haproxy.sls
  4. 6
      prometheus/exporter/node.sls
  5. 6
      prometheus/exporter/rabbitmq.sls
  6. 6
      prometheus/server.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

@ -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

@ -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

@ -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

@ -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

@ -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 }}

Loading…
Cancel
Save