From f17e7f752427db175810e567f33cd9fb5d92e45a Mon Sep 17 00:00:00 2001
From: pz2891 <ziolkowski28paul@gmail.com>
Date: Fri, 20 Aug 2021 18:22:00 +0200
Subject: [PATCH] Add snmp pdu password to generate config

---
 monitoring.yml                                     | 14 ++++++++++++++
 .../templates/prometheus.yml.j2                    |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/monitoring.yml b/monitoring.yml
index 16c0981..bb3c92a 100755
--- a/monitoring.yml
+++ b/monitoring.yml
@@ -5,6 +5,8 @@
     prometheus_alertmanager: docker-ovh.adm.auro.re:9093
     snmp_unifi_password: "{{ vault_snmp_unifi_password }}"
     snmp_switch_community: "{{ vault_snmp_switch_community }}"
+    snmp_pdu_user: "{{ vault_snmp_pdu_user }}"
+    snmp_pdu_password: "{{ vault_snmp_pdu_password }}"
 
     # Prometheus targets.json
     prometheus_targets:
@@ -20,6 +22,8 @@
     prometheus_alertmanager: docker-ovh.adm.auro.re:9093
     snmp_unifi_password: "{{ vault_snmp_unifi_password }}"
     snmp_switch_community: "{{ vault_snmp_switch_community }}"
+    snmp_pdu_user: "{{ vault_snmp_pdu_user }}"
+    snmp_pdu_password: "{{ vault_snmp_pdu_password }}"
 
     # Prometheus targets.json
     prometheus_targets:
@@ -38,6 +42,8 @@
     prometheus_alertmanager: docker-ovh.adm.auro.re:9093
     snmp_unifi_password: "{{ vault_snmp_unifi_password }}"
     snmp_switch_community: "{{ vault_snmp_switch_community }}"
+    snmp_pdu_user: "{{ vault_snmp_pdu_user }}"
+    snmp_pdu_password: "{{ vault_snmp_pdu_password }}"
 
     # Prometheus targets.json
     prometheus_ups_snmp_targets:
@@ -79,6 +85,8 @@
     prometheus_alertmanager: docker-ovh.adm.auro.re:9093
     snmp_unifi_password: "{{ vault_snmp_unifi_password }}"
     snmp_switch_community: "{{ vault_snmp_switch_community }}"
+    snmp_pdu_user: "{{ vault_snmp_pdu_user }}"
+    snmp_pdu_password: "{{ vault_snmp_pdu_password }}"
 
     # Prometheus targets.json
     prometheus_ups_snmp_targets:
@@ -98,6 +106,8 @@
     prometheus_alertmanager: docker-ovh.adm.auro.re:9093
     snmp_unifi_password: "{{ vault_snmp_unifi_password }}"
     snmp_switch_community: "{{ vault_snmp_switch_community }}"
+    snmp_pdu_user: "{{ vault_snmp_pdu_user }}"
+    snmp_pdu_password: "{{ vault_snmp_pdu_password }}"
 
     # Prometheus targets.json
     prometheus_targets:
@@ -130,6 +140,8 @@
     prometheus_alertmanager: docker-ovh.adm.auro.re:9093
     snmp_unifi_password: "{{ vault_snmp_unifi_password }}"
     snmp_switch_community: "{{ vault_snmp_switch_community }}"
+    snmp_pdu_user: "{{ vault_snmp_pdu_user }}"
+    snmp_pdu_password: "{{ vault_snmp_pdu_password }}"
 
     # Prometheus targets.json
     prometheus_targets:
@@ -148,6 +160,8 @@
   vars:
     prometheus_alertmanager: docker-ovh.adm.auro.re:9093
     snmp_unifi_password: "{{ vault_snmp_unifi_password }}"
+    snmp_pdu_user: "{{ vault_snmp_pdu_user }}"
+    snmp_pdu_password: "{{ vault_snmp_pdu_password }}"
 
     # Prometheus targets.json
     prometheus_targets:
diff --git a/roles/prometheus_federate/templates/prometheus.yml.j2 b/roles/prometheus_federate/templates/prometheus.yml.j2
index 71e6874..4757b98 100644
--- a/roles/prometheus_federate/templates/prometheus.yml.j2
+++ b/roles/prometheus_federate/templates/prometheus.yml.j2
@@ -36,7 +36,7 @@ scrape_configs:
         - '{job="unifi_snmp"}'
         - '{job="django"}'
         - '{job="ups_snmp"}'
-        - '{job="django"}'
+        - '{job="apc_pdu_snmp"}'
         - '{job="docker"}'
         - '{job="switch_snmp"}'
 ...