From 1eb05539f252adc920c4097440643cd7b24f5171 Mon Sep 17 00:00:00 2001
From: Eric Renfro <psi-jack@linux-help.org>
Date: Wed, 8 May 2019 20:34:24 -0400
Subject: [PATCH] Updated defaults and parsing

---
 prometheus/defaults.yaml                | 6 ++++++
 prometheus/exporter/blackbox.sls        | 3 ++-
 prometheus/exporter/haproxy.sls         | 5 +++--
 prometheus/exporter/node.sls            | 4 ++--
 prometheus/exporter/rabbitmq.sls        | 8 +++++---
 prometheus/files/exporter.systemd.jinja | 2 +-
 6 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/prometheus/defaults.yaml b/prometheus/defaults.yaml
index 80b28c8..0db901f 100644
--- a/prometheus/defaults.yaml
+++ b/prometheus/defaults.yaml
@@ -25,11 +25,14 @@ prometheus:
       install_dir: /opt
       source: https://github.com/prometheus/node_exporter/releases/download/v0.17.0/node_exporter-0.17.0.linux-amd64.tar.gz
       source_hash: https://github.com/prometheus/node_exporter/releases/download/v0.17.0/sha256sums.txt
+      url: ""
+      args: []
     blackbox:
       version: 0.14.0.linux-amd64
       install_dir: /opt
       source: https://github.com/prometheus/blackbox_exporter/releases/download/v0.14.0/blackbox_exporter-0.14.0.linux-amd64.tar.gz
       source_hash: https://github.com/prometheus/blackbox_exporter/releases/download/v0.14.0/sha256sums.txt
+      url: ""
       args:
         config_file: /etc/prometheus/blackbox_exporter.yml
     haproxy:
@@ -37,6 +40,7 @@ prometheus:
       install_dir: /opt
       source: https://github.com/prometheus/haproxy_exporter/releases/download/v0.10.0/haproxy_exporter-0.10.0.linux-amd64.tar.gz
       source_hash: https://github.com/prometheus/haproxy_exporter/releases/download/v0.10.0/sha256sums.txt
+      url: ""
       args:
         scrape_uri: 'unix:/run/haproxy/admin.sock'
     rabbitmq:
@@ -44,3 +48,5 @@ prometheus:
       install_dir: /opt
       source: https://github.com/kbudde/rabbitmq_exporter/releases/download/v0.24.0/rabbitmq_exporter-0.24.0.linux-amd64.tar.gz
       source_hash: sha256=dbbd44a5a4b4a22ba338b9732c014587bc11513a5d6d2e3e519fc313b1cc46d4
+      url: ""
+      args: []
diff --git a/prometheus/exporter/blackbox.sls b/prometheus/exporter/blackbox.sls
index 8774bf4..047bae7 100644
--- a/prometheus/exporter/blackbox.sls
+++ b/prometheus/exporter/blackbox.sls
@@ -39,7 +39,8 @@ blackbox_exporter_service_unit:
     - name: /etc/init/blackbox_exporter.conf
     - source: salt://prometheus/files/exporter.upstart.jinja
 {%- endif %}
-    - context:
+    - template: jinja
+    - defaults:
         svc: node_exporter
         user: {{ prometheus.user }}
         group: {{ prometheus.group }}
diff --git a/prometheus/exporter/haproxy.sls b/prometheus/exporter/haproxy.sls
index f9b3604..3f67eac 100644
--- a/prometheus/exporter/haproxy.sls
+++ b/prometheus/exporter/haproxy.sls
@@ -44,8 +44,9 @@ haproxy_exporter_service_unit:
         svc: node_exporter
         user: {{ prometheus.user }}
         group: {{ prometheus.group }}
-        bin_path: {{ prometheus.exporter.node.version_path }}
-        args: {{ prometheus.exporter.get('args', []) }}
+        bin_path: {{ prometheus.exporter.haproxy.version_path }}
+        args: {{ prometheus.exporter.haproxy.args }}
+        url: {{ prometheus.exporter.haproxy.url }}
     - require_in:
       - file: haproxy_exporter_service
 
diff --git a/prometheus/exporter/node.sls b/prometheus/exporter/node.sls
index 0d733b7..6b8f623 100644
--- a/prometheus/exporter/node.sls
+++ b/prometheus/exporter/node.sls
@@ -43,8 +43,8 @@ node_exporter_service_unit:
         user: {{ prometheus.user }}
         group: {{ prometheus.group }}
         bin_path: {{ prometheus.exporter.node.version_path }}
-        args: {{ prometheus.exporter.node.get('args', []) }}
-        url: {{ prometheus.exporter.node.get('url', None) }}
+        args: {{ prometheus.exporter.node.args }}
+        url: {{ prometheus.exporter.node.url }}
     - require_in:
       - file: node_exporter_service
 
diff --git a/prometheus/exporter/rabbitmq.sls b/prometheus/exporter/rabbitmq.sls
index e59f74c..2dc5c02 100644
--- a/prometheus/exporter/rabbitmq.sls
+++ b/prometheus/exporter/rabbitmq.sls
@@ -37,12 +37,14 @@ rabbitmq_exporter_service_unit:
     - name: /etc/init/rabbitmq_exporter.conf
     - source: salt://prometheus/files/exporter.upstart.jinja
 {%- endif %}
-    - context:
+    - template: jinja
+    - defaults:
         svc: node_exporter
         user: {{ prometheus.user }}
         group: {{ prometheus.group }}
-        bin_path: {{ prometheus.exporter.node.version_path }}
-        args: {{ prometheus.exporter.get('args', []) }}
+        bin_path: {{ prometheus.exporter.rabbitmq.version_path }}
+        args: {{ prometheus.exporter.rabbitmq.args }}
+        url: {{ prometheus.exporter.rabbitmq.url }}
     - require_in:
       - file: rabbitmq_exporter_service
 
diff --git a/prometheus/files/exporter.systemd.jinja b/prometheus/files/exporter.systemd.jinja
index a1d7c2f..41fd784 100644
--- a/prometheus/files/exporter.systemd.jinja
+++ b/prometheus/files/exporter.systemd.jinja
@@ -1,6 +1,6 @@
 [Unit]
 Description=Prometheus {{ svc }} Exporter
-{%- if url is string and url is not None %}
+{%- if url  %}
 Documentation={{ url }}
 {%- endif %}
 Wants=basic.target