Deduplicate UCD-SNMP-MIB OIDs (#1200)

Consolidate the use of UCD-SNMP-MIB into separate modules, rather than include them in individual device modules. Signed-off-by: SuperQ <[email protected]>
prometheus · Jun 14, 2024 · fc2b4a2 · fc2b4a2
1 parent 6e3ed92
commit fc2b4a2
Show file tree

Hide file tree

Showing 2 changed files with 496 additions and 869 deletions.
diff --git a/generator/generator.yml b/generator/generator.yml
@@ -210,12 +210,6 @@ modules:
 #
   synology:
     walk:
-      - laNames
-      - laLoadInt
-      - ssCpuUser
-      - ssCpuSystem
-      - ssCpuIdle
-      - memory
       - 1.3.6.1.4.1.6574.1       # synoSystem
       - 1.3.6.1.4.1.6574.2       # synoDisk
       - 1.3.6.1.4.1.6574.3       # synoRaid
@@ -241,9 +235,6 @@ modules:
       - source_indexes: [raidIndex]
         lookup: raidName
         drop_source_indexes: true
-      - source_indexes: [laIndex]
-        lookup: laNames
-        drop_source_indexes: true
     overrides:
       diskModel:
         type: DisplayString
@@ -270,23 +261,29 @@ modules:
       version:
         type: DisplayString
 
-# DD-WRT
+# UCD-SNMP-MIB
 #
-# The list of SNMP OIDs to care about for DD-WRT can be found here: https://www.dd-wrt.com/wiki/index.php/SNMP#Known_OID.C2.B4s_via_SNMP
+# University of California, Davis extensions. Commonly used for host
+# metrics. For example, Linux-based systems, DD-WRT, Synology,
+# Mikrotik, Kemp LoadMaster, etc.
 #
-# Tested on  DD-WRT v3.0-r31825 (04/06/17) with an ASUS RT-AC66U
+# http://www.net-snmp.org/docs/mibs/UCD-SNMP-MIB.txt
 #
-  ddwrt:
+  ucd_la_table:
     walk:
-      - 1.3.6.1.4.1.2021.4 # memory
-      - 1.3.6.1.4.1.2021.10.1.1 # laIndex
       - 1.3.6.1.4.1.2021.10.1.2 # laNames
       - 1.3.6.1.4.1.2021.10.1.5 # laLoadInt
-      - 1.3.6.1.4.1.2021.11 # systemStats
+      - 1.3.6.1.4.1.2021.10.1.6 # laLoadFloat
     lookups:
       - source_indexes: [laIndex]
         lookup: laNames
         drop_source_indexes: true
+  ucd_memory:
+    walk:
+      - 1.3.6.1.4.1.2021.4 # memory
+  ucd_system_stats:
+    walk:
+      - 1.3.6.1.4.1.2021.11 # systemStats
 
 # Ubiquiti / AirFiber
 #
@@ -366,12 +363,6 @@ modules:
 # https://support.kemptechnologies.com/hc/en-us/articles/202375677-LoadMaster-SNMP-MIB-s
   kemp_loadmaster:
     walk:
-      - laNames
-      - laLoadInt
-      - ssCpuUser
-      - ssCpuSystem
-      - ssCpuIdle
-      - memory
       - 1.3.6.1.4.1.12196.13.0 # VSdesc
       - 1.3.6.1.4.1.12196.13.1 # VSentry
       - 1.3.6.1.4.1.12196.13.2 # RSentry
@@ -558,17 +549,13 @@ modules:
 # http://download2.mikrotik.com/Mikrotik.mib
   mikrotik:
     walk:
-      - laIndex
       - sysDescr
       - mikrotik
     lookups:
       - source_indexes: [ifIndex]
         lookup: ifName
       - source_indexes: [mtxrInterfaceStatsIndex]
         lookup: ifName
-      - source_indexes: [laIndex]
-        lookup: laNames
-        drop_source_indexes: true
       - source_indexes: [mtxrGaugeIndex]
         lookup: mtxrGaugeName
         drop_source_indexes: true