From 3e2b2dd451d03ae620e2a037e4019e07767f1452 Mon Sep 17 00:00:00 2001
From: nd <git@notandy.de>
Date: Sun, 7 Jun 2020 00:08:42 +0200
Subject: [PATCH] fixed labels and made ipv4 the default

---
 defaults/main.yml         | 7 +++++++
 templates/node-scraper.j2 | 5 ++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 98b32d2..8fcb33a 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -209,18 +209,25 @@ prometheus_agent:
           http_2xx:
             prober: http
             http:
+              preferred_ip_protocol: ip4
           http_post_2xx:
             prober: http
             http:
               method: POST
+              preferred_ip_protocol: ip4
           tcp_connect:
             prober: tcp
+            tcp:
+              preferred_ip_protocol: ip4
           ssh_banner:
             prober: tcp
             tcp:
+              preferred_ip_protocol: ip4
               query_response:
               - expect: "^SSH-2.0-"
           icmp:
+            icmp:
+              preferred_ip_protocol: ip4
             prober: icmp
       jobs: {}
   scrape_timeout: ~
diff --git a/templates/node-scraper.j2 b/templates/node-scraper.j2
index e74c355..37904ce 100644
--- a/templates/node-scraper.j2
+++ b/templates/node-scraper.j2
@@ -23,6 +23,7 @@
 {% set job=prometheus_agent.agents.blackbox.jobs[j] %}
 - job_name: "prometheus-agent - blackbox - {{ j }} : {{ inventory_hostname }}"
   scheme: https
+  metrics_path: /probe
 {% for i in ['scrape_timeout', 'scrape_interval'] if (prometheus_agent|combine(job))[i] %}
   {{ i }}: {{ (prometheus_agent|combine(job))[i] }}
 {% endfor %}
@@ -42,9 +43,11 @@
   - source_labels: [__address__]
     target_label: __param_target
   - source_labels: [__param_target]
-    target_label: instance
+    target_label: target
   - replacement: 'blackbox'
     target_label: job
+  - replacement: '{{ inventory_hostname }}'
+    target_label: instance
   - replacement: '{{ job.module }}'
     target_label: module
   - target_label: __address__