From 0d833188453160fe21d80c525687241846b8c05d Mon Sep 17 00:00:00 2001
From: Lzebulon <lzebulon@crans.org>
Date: Wed, 11 Feb 2026 15:53:11 +0100
Subject: [PATCH] fix: new snmp syntax & remove unused unifi snmp

---
 host_vars/fyre.adm.crans.org.yml              |   2 +
 .../templates/prometheus/snmp.yml.j2          | 405 ++----------------
 2 files changed, 26 insertions(+), 381 deletions(-)

diff --git a/host_vars/fyre.adm.crans.org.yml b/host_vars/fyre.adm.crans.org.yml
index 81b18048..6f6db9a0 100644
--- a/host_vars/fyre.adm.crans.org.yml
+++ b/host_vars/fyre.adm.crans.org.yml
@@ -119,6 +119,8 @@ loc_prometheus:
         params:
           module:
             - ilo
+          auth:
+            - auth_ilo
         relabel_configs:
           - source_labels: [__address__]
             target_label: __param_target
diff --git a/roles/prometheus-snmp-exporter/templates/prometheus/snmp.yml.j2 b/roles/prometheus-snmp-exporter/templates/prometheus/snmp.yml.j2
index 1a7d1fda..58f845e6 100644
--- a/roles/prometheus-snmp-exporter/templates/prometheus/snmp.yml.j2
+++ b/roles/prometheus-snmp-exporter/templates/prometheus/snmp.yml.j2
@@ -1,4 +1,28 @@
 {{ ansible_header | comment }}
+auths:
+  auth_eatonups:
+    version: 3
+    username: readuser
+  auth_procurve:
+    version: 3
+    # To create SNMPv3 user on HP procurve, execute:
+    # snmpv3 user snmp_prometheus auth sha {{ snmp_exporter.procurve_password }} priv aes {{ snmp_exporter.procurve_password }}
+    # snmpv3 group managerpriv user snmp_prometheus sec-model ver3
+    security_level: authPriv
+    username: snmp_prometheus
+    password: {{ snmp_exporter.procurve_password }}
+    auth_protocol: SHA
+    priv_protocol: AES
+    priv_password: {{ snmp_exporter.procurve_password }}
+  auth_ilo:
+    version: 3
+    security_level: authPriv
+    username: crans
+    password: {{ snmp_exporter.ilo_password }}
+    auth_protocol: SHA
+    priv_protocol: AES
+    priv_password: {{ snmp_exporter.ilo_priv_password }}
+
 
 eatonups:
   walk:
@@ -67,9 +91,6 @@ eatonups:
     oid: 1.3.6.1.4.1.534.1.6.6
     type: gauge
     help: The reading of an EMP's humidity sensor. - 1.3.6.1.4.1.534.1.6.6
-  version: 3
-  auth:
-    username: readuser
 
 procurve_switch:
   walk:
@@ -110,376 +131,6 @@ procurve_switch:
     indexes:
     - labelname: ifIndex
       type: gauge
-  version: 3
-  auth:
-    # To create SNMPv3 user on HP procurve, execute:
-    # snmpv3 user snmp_prometheus auth sha {{ snmp_exporter.procurve_password }} priv aes {{ snmp_exporter.procurve_password }}
-    # snmpv3 group managerpriv user snmp_prometheus sec-model ver3
-    security_level: authPriv
-    username: snmp_prometheus
-    password: {{ snmp_exporter.procurve_password }}
-    auth_protocol: SHA
-    priv_protocol: AES
-    priv_password: {{ snmp_exporter.procurve_password }}
-
-ubiquiti_unifi:
-  walk:
-  - 1.3.6.1.4.1.41112.1.6
-  get:
-  - 1.3.6.1.2.1.1.5.0
-  - 1.3.6.1.2.1.1.6.0
-  metrics:
-  - name: unifi_sys_location
-    oid: 1.3.6.1.2.1.1.6
-    type: DisplayString
-    help: The physical location of this node as a geohash
-      - 1.3.6.1.2.1.1.6
-  - name: unifi_vap_channel
-    oid: 1.3.6.1.4.1.41112.1.6.1.2.1.4
-    type: gauge
-    help: ' - 1.3.6.1.4.1.41112.1.6.1.2.1.4'
-    indexes:
-    - labelname: unifi_vap_index
-      type: gauge
-    lookups:
-    - labels: [unifi_vap_index]
-      labelname: unifi_vap_essid
-      oid: 1.3.6.1.4.1.41112.1.6.1.2.1.6
-      type: DisplayString
-    - labels: [unifi_vap_index]
-      labelname: unifi_vap_radio
-      oid: 1.3.6.1.4.1.41112.1.6.1.2.1.9
-      type: DisplayString
-    - labels: []
-      labelname: unifi_vap_index
-  - name: unifi_vap_num_stations
-    oid: 1.3.6.1.4.1.41112.1.6.1.2.1.8
-    type: gauge
-    help: ' - 1.3.6.1.4.1.41112.1.6.1.2.1.8'
-    indexes:
-    - labelname: unifi_vap_index
-      type: gauge
-    lookups:
-    - labels: [unifi_vap_index]
-      labelname: unifi_vap_essid
-      oid: 1.3.6.1.4.1.41112.1.6.1.2.1.6
-      type: DisplayString
-    - labels: [unifi_vap_index]
-      labelname: unifi_vap_radio
-      oid: 1.3.6.1.4.1.41112.1.6.1.2.1.9
-      type: DisplayString
-    - labels: []
-      labelname: unifi_vap_index
-  - name: unifi_vap_rx_bytes
-    oid: 1.3.6.1.4.1.41112.1.6.1.2.1.10
-    type: counter
-    help: ' - 1.3.6.1.4.1.41112.1.6.1.2.1.10'
-    indexes:
-    - labelname: unifi_vap_index
-      type: gauge
-    lookups:
-    - labels: [unifi_vap_index]
-      labelname: unifi_vap_essid
-      oid: 1.3.6.1.4.1.41112.1.6.1.2.1.6
-      type: DisplayString
-    - labels: [unifi_vap_index]
-      labelname: unifi_vap_radio
-      oid: 1.3.6.1.4.1.41112.1.6.1.2.1.9
-      type: DisplayString
-    - labels: []
-      labelname: unifi_vap_index
-  - name: unifi_vap_rx_crypts
-    oid: 1.3.6.1.4.1.41112.1.6.1.2.1.11
-    type: counter
-    help: ' - 1.3.6.1.4.1.41112.1.6.1.2.1.11'
-    indexes:
-    - labelname: unifi_vap_index
-      type: gauge
-    lookups:
-    - labels: [unifi_vap_index]
-      labelname: unifi_vap_essid
-      oid: 1.3.6.1.4.1.41112.1.6.1.2.1.6
-      type: DisplayString
-    - labels: [unifi_vap_index]
-      labelname: unifi_vap_radio
-      oid: 1.3.6.1.4.1.41112.1.6.1.2.1.9
-      type: DisplayString
-    - labels: []
-      labelname: unifi_vap_index
-  - name: unifi_vap_rx_dropped
-    oid: 1.3.6.1.4.1.41112.1.6.1.2.1.12
-    type: counter
-    help: ' - 1.3.6.1.4.1.41112.1.6.1.2.1.12'
-    indexes:
-    - labelname: unifi_vap_index
-      type: gauge
-    lookups:
-    - labels: [unifi_vap_index]
-      labelname: unifi_vap_essid
-      oid: 1.3.6.1.4.1.41112.1.6.1.2.1.6
-      type: DisplayString
-    - labels: [unifi_vap_index]
-      labelname: unifi_vap_radio
-      oid: 1.3.6.1.4.1.41112.1.6.1.2.1.9
-      type: DisplayString
-    - labels: []
-      labelname: unifi_vap_index
-  - name: unifi_vap_rx_errors
-    oid: 1.3.6.1.4.1.41112.1.6.1.2.1.13
-    type: counter
-    help: ' - 1.3.6.1.4.1.41112.1.6.1.2.1.13'
-    indexes:
-    - labelname: unifi_vap_index
-      type: gauge
-    lookups:
-    - labels: [unifi_vap_index]
-      labelname: unifi_vap_essid
-      oid: 1.3.6.1.4.1.41112.1.6.1.2.1.6
-      type: DisplayString
-    - labels: [unifi_vap_index]
-      labelname: unifi_vap_radio
-      oid: 1.3.6.1.4.1.41112.1.6.1.2.1.9
-      type: DisplayString
-    - labels: []
-      labelname: unifi_vap_index
-  - name: unifi_vap_rx_frags
-    oid: 1.3.6.1.4.1.41112.1.6.1.2.1.14
-    type: counter
-    help: ' - 1.3.6.1.4.1.41112.1.6.1.2.1.14'
-    indexes:
-    - labelname: unifi_vap_index
-      type: gauge
-    lookups:
-    - labels: [unifi_vap_index]
-      labelname: unifi_vap_essid
-      oid: 1.3.6.1.4.1.41112.1.6.1.2.1.6
-      type: DisplayString
-    - labels: [unifi_vap_index]
-      labelname: unifi_vap_radio
-      oid: 1.3.6.1.4.1.41112.1.6.1.2.1.9
-      type: DisplayString
-    - labels: []
-      labelname: unifi_vap_index
-  - name: unifi_vap_rx_packets
-    oid: 1.3.6.1.4.1.41112.1.6.1.2.1.15
-    type: counter
-    help: ' - 1.3.6.1.4.1.41112.1.6.1.2.1.15'
-    indexes:
-    - labelname: unifi_vap_index
-      type: gauge
-    lookups:
-    - labels: [unifi_vap_index]
-      labelname: unifi_vap_essid
-      oid: 1.3.6.1.4.1.41112.1.6.1.2.1.6
-      type: DisplayString
-    - labels: [unifi_vap_index]
-      labelname: unifi_vap_radio
-      oid: 1.3.6.1.4.1.41112.1.6.1.2.1.9
-      type: DisplayString
-    - labels: []
-      labelname: unifi_vap_index
-  - name: unifi_vap_tx_bytes
-    oid: 1.3.6.1.4.1.41112.1.6.1.2.1.16
-    type: counter
-    help: ' - 1.3.6.1.4.1.41112.1.6.1.2.1.16'
-    indexes:
-    - labelname: unifi_vap_index
-      type: gauge
-    lookups:
-    - labels: [unifi_vap_index]
-      labelname: unifi_vap_essid
-      oid: 1.3.6.1.4.1.41112.1.6.1.2.1.6
-      type: DisplayString
-    - labels: [unifi_vap_index]
-      labelname: unifi_vap_radio
-      oid: 1.3.6.1.4.1.41112.1.6.1.2.1.9
-      type: DisplayString
-    - labels: []
-      labelname: unifi_vap_index
-  - name: unifi_vap_tx_dropped
-    oid: 1.3.6.1.4.1.41112.1.6.1.2.1.17
-    type: counter
-    help: ' - 1.3.6.1.4.1.41112.1.6.1.2.1.17'
-    indexes:
-    - labelname: unifi_vap_index
-      type: gauge
-    lookups:
-    - labels: [unifi_vap_index]
-      labelname: unifi_vap_essid
-      oid: 1.3.6.1.4.1.41112.1.6.1.2.1.6
-      type: DisplayString
-    - labels: [unifi_vap_index]
-      labelname: unifi_vap_radio
-      oid: 1.3.6.1.4.1.41112.1.6.1.2.1.9
-      type: DisplayString
-    - labels: []
-      labelname: unifi_vap_index
-  - name: unifi_vap_tx_errors
-    oid: 1.3.6.1.4.1.41112.1.6.1.2.1.18
-    type: counter
-    help: ' - 1.3.6.1.4.1.41112.1.6.1.2.1.18'
-    indexes:
-    - labelname: unifi_vap_index
-      type: gauge
-    lookups:
-    - labels: [unifi_vap_index]
-      labelname: unifi_vap_essid
-      oid: 1.3.6.1.4.1.41112.1.6.1.2.1.6
-      type: DisplayString
-    - labels: [unifi_vap_index]
-      labelname: unifi_vap_radio
-      oid: 1.3.6.1.4.1.41112.1.6.1.2.1.9
-      type: DisplayString
-    - labels: []
-      labelname: unifi_vap_index
-  - name: unifi_vap_tx_packets
-    oid: 1.3.6.1.4.1.41112.1.6.1.2.1.19
-    type: counter
-    help: ' - 1.3.6.1.4.1.41112.1.6.1.2.1.19'
-    indexes:
-    - labelname: unifi_vap_index
-      type: gauge
-    lookups:
-    - labels: [unifi_vap_index]
-      labelname: unifi_vap_essid
-      oid: 1.3.6.1.4.1.41112.1.6.1.2.1.6
-      type: DisplayString
-    - labels: [unifi_vap_index]
-      labelname: unifi_vap_radio
-      oid: 1.3.6.1.4.1.41112.1.6.1.2.1.9
-      type: DisplayString
-    - labels: []
-      labelname: unifi_vap_index
-  - name: unifi_vap_tx_retries
-    oid: 1.3.6.1.4.1.41112.1.6.1.2.1.20
-    type: counter
-    help: ' - 1.3.6.1.4.1.41112.1.6.1.2.1.20'
-    indexes:
-    - labelname: unifi_vap_index
-      type: gauge
-    lookups:
-    - labels: [unifi_vap_index]
-      labelname: unifi_vap_essid
-      oid: 1.3.6.1.4.1.41112.1.6.1.2.1.6
-      type: DisplayString
-    - labels: [unifi_vap_index]
-      labelname: unifi_vap_radio
-      oid: 1.3.6.1.4.1.41112.1.6.1.2.1.9
-      type: DisplayString
-    - labels: []
-      labelname: unifi_vap_index
-  - name: unifi_vap_tx_power
-    oid: 1.3.6.1.4.1.41112.1.6.1.2.1.21
-    type: gauge
-    help: ' - 1.3.6.1.4.1.41112.1.6.1.2.1.21'
-    indexes:
-    - labelname: unifi_vap_index
-      type: gauge
-    lookups:
-    - labels: [unifi_vap_index]
-      labelname: unifi_vap_essid
-      oid: 1.3.6.1.4.1.41112.1.6.1.2.1.6
-      type: DisplayString
-    - labels: [unifi_vap_index]
-      labelname: unifi_vap_radio
-      oid: 1.3.6.1.4.1.41112.1.6.1.2.1.9
-      type: DisplayString
-    - labels: []
-      labelname: unifi_vap_index
-  - name: unifi_if_index
-    oid: 1.3.6.1.4.1.41112.1.6.2.1.1.1
-    type: gauge
-    help: ' - 1.3.6.1.4.1.41112.1.6.2.1.1.1'
-    indexes:
-    - labelname: unifi_if_index
-      type: gauge
-  - name: unifi_if_name
-    oid: 1.3.6.1.4.1.41112.1.6.2.1.1.5
-    type: DisplayString
-    help: ' - 1.3.6.1.4.1.41112.1.6.2.1.1.5'
-    indexes:
-    - labelname: unifi_if_index
-      type: gauge
-  - name: unifi_if_rx_bytes
-    oid: 1.3.6.1.4.1.41112.1.6.2.1.1.6
-    type: counter
-    help: ' - 1.3.6.1.4.1.41112.1.6.2.1.1.6'
-    indexes:
-    - labelname: unifi_if_index
-      type: gauge
-  - name: unifi_if_rx_dropped
-    oid: 1.3.6.1.4.1.41112.1.6.2.1.1.7
-    type: counter
-    help: ' - 1.3.6.1.4.1.41112.1.6.2.1.1.7'
-    indexes:
-    - labelname: unifi_if_index
-      type: gauge
-  - name: unifi_if_rx_error
-    oid: 1.3.6.1.4.1.41112.1.6.2.1.1.8
-    type: counter
-    help: ' - 1.3.6.1.4.1.41112.1.6.2.1.1.8'
-    indexes:
-    - labelname: unifi_if_index
-      type: gauge
-  - name: unifi_if_rx_multicast
-    oid: 1.3.6.1.4.1.41112.1.6.2.1.1.9
-    type: counter
-    help: ' - 1.3.6.1.4.1.41112.1.6.2.1.1.9'
-    indexes:
-    - labelname: unifi_if_index
-      type: gauge
-  - name: unifi_if_rx_packets
-    oid: 1.3.6.1.4.1.41112.1.6.2.1.1.10
-    type: counter
-    help: ' - 1.3.6.1.4.1.41112.1.6.2.1.1.10'
-    indexes:
-    - labelname: unifi_if_index
-      type: gauge
-  - name: unifi_if_tx_bytes
-    oid: 1.3.6.1.4.1.41112.1.6.2.1.1.12
-    type: counter
-    help: ' - 1.3.6.1.4.1.41112.1.6.2.1.1.12'
-    indexes:
-    - labelname: unifi_if_index
-      type: gauge
-  - name: unifi_if_tx_dropped
-    oid: 1.3.6.1.4.1.41112.1.6.2.1.1.13
-    type: counter
-    help: ' - 1.3.6.1.4.1.41112.1.6.2.1.1.13'
-    indexes:
-    - labelname: unifi_if_index
-      type: gauge
-  - name: unifi_if_tx_error
-    oid: 1.3.6.1.4.1.41112.1.6.2.1.1.14
-    type: counter
-    help: ' - 1.3.6.1.4.1.41112.1.6.2.1.1.14'
-    indexes:
-    - labelname: unifi_if_index
-      type: gauge
-  - name: unifi_if_tx_packets
-    oid: 1.3.6.1.4.1.41112.1.6.2.1.1.15
-    type: counter
-    help: ' - 1.3.6.1.4.1.41112.1.6.2.1.1.15'
-    indexes:
-    - labelname: unifi_if_index
-      type: gauge
-  - name: unifi_ap_system_model
-    oid: 1.3.6.1.4.1.41112.1.6.3.3
-    type: DisplayString
-    help: ' - 1.3.6.1.4.1.41112.1.6.3.3'
-  - name: unifi_ap_system_uptime
-    oid: 1.3.6.1.4.1.41112.1.6.3.5
-    type: counter
-    help: ' - 1.3.6.1.4.1.41112.1.6.3.5'
-  version: 3
-  auth:
-    security_level: authPriv
-    username: snmp_prometheus
-    password: {{ snmp_exporter.unifi_password }}
-    auth_protocol: SHA
-    priv_protocol: AES
-    priv_password: {{ snmp_exporter.unifi_password }}
-
 ilo:
   walk:
   - 1.3.6.1.4.1.232.6.2.14.4 # Resilient memory
@@ -692,16 +343,8 @@ ilo:
       2: poweredOff
       3: poweredOn
       4: insufficientPowerOrPowerOnDenied
-  version: 3
   # Reduce timeout to retry faster
   timeout: 1s
-  auth:
-    security_level: authPriv
-    username: crans
-    password: SpnVOv4nuF10BOye9zjX
-    auth_protocol: SHA
-    priv_protocol: AES
-    priv_password: 21rW6LHShmgdHsdPQXHP
 
 printer_mib:
   walk: