Skip to content

Commit fc2b4a2

Browse files
authored
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 <superq@gmail.com>
1 parent 6e3ed92 commit fc2b4a2

File tree

2 files changed

+496
-869
lines changed

2 files changed

+496
-869
lines changed

generator/generator.yml

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -210,12 +210,6 @@ modules:
210210
#
211211
synology:
212212
walk:
213-
- laNames
214-
- laLoadInt
215-
- ssCpuUser
216-
- ssCpuSystem
217-
- ssCpuIdle
218-
- memory
219213
- 1.3.6.1.4.1.6574.1 # synoSystem
220214
- 1.3.6.1.4.1.6574.2 # synoDisk
221215
- 1.3.6.1.4.1.6574.3 # synoRaid
@@ -241,9 +235,6 @@ modules:
241235
- source_indexes: [raidIndex]
242236
lookup: raidName
243237
drop_source_indexes: true
244-
- source_indexes: [laIndex]
245-
lookup: laNames
246-
drop_source_indexes: true
247238
overrides:
248239
diskModel:
249240
type: DisplayString
@@ -270,23 +261,29 @@ modules:
270261
version:
271262
type: DisplayString
272263

273-
# DD-WRT
264+
# UCD-SNMP-MIB
274265
#
275-
# 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
266+
# University of California, Davis extensions. Commonly used for host
267+
# metrics. For example, Linux-based systems, DD-WRT, Synology,
268+
# Mikrotik, Kemp LoadMaster, etc.
276269
#
277-
# Tested on DD-WRT v3.0-r31825 (04/06/17) with an ASUS RT-AC66U
270+
# http://www.net-snmp.org/docs/mibs/UCD-SNMP-MIB.txt
278271
#
279-
ddwrt:
272+
ucd_la_table:
280273
walk:
281-
- 1.3.6.1.4.1.2021.4 # memory
282-
- 1.3.6.1.4.1.2021.10.1.1 # laIndex
283274
- 1.3.6.1.4.1.2021.10.1.2 # laNames
284275
- 1.3.6.1.4.1.2021.10.1.5 # laLoadInt
285-
- 1.3.6.1.4.1.2021.11 # systemStats
276+
- 1.3.6.1.4.1.2021.10.1.6 # laLoadFloat
286277
lookups:
287278
- source_indexes: [laIndex]
288279
lookup: laNames
289280
drop_source_indexes: true
281+
ucd_memory:
282+
walk:
283+
- 1.3.6.1.4.1.2021.4 # memory
284+
ucd_system_stats:
285+
walk:
286+
- 1.3.6.1.4.1.2021.11 # systemStats
290287

291288
# Ubiquiti / AirFiber
292289
#
@@ -366,12 +363,6 @@ modules:
366363
# https://support.kemptechnologies.com/hc/en-us/articles/202375677-LoadMaster-SNMP-MIB-s
367364
kemp_loadmaster:
368365
walk:
369-
- laNames
370-
- laLoadInt
371-
- ssCpuUser
372-
- ssCpuSystem
373-
- ssCpuIdle
374-
- memory
375366
- 1.3.6.1.4.1.12196.13.0 # VSdesc
376367
- 1.3.6.1.4.1.12196.13.1 # VSentry
377368
- 1.3.6.1.4.1.12196.13.2 # RSentry
@@ -558,17 +549,13 @@ modules:
558549
# http://download2.mikrotik.com/Mikrotik.mib
559550
mikrotik:
560551
walk:
561-
- laIndex
562552
- sysDescr
563553
- mikrotik
564554
lookups:
565555
- source_indexes: [ifIndex]
566556
lookup: ifName
567557
- source_indexes: [mtxrInterfaceStatsIndex]
568558
lookup: ifName
569-
- source_indexes: [laIndex]
570-
lookup: laNames
571-
drop_source_indexes: true
572559
- source_indexes: [mtxrGaugeIndex]
573560
lookup: mtxrGaugeName
574561
drop_source_indexes: true

0 commit comments

Comments
 (0)