opensourcemirror
/
LibreNMS
mirror of https://github.com/librenms/librenms.git
1
0
Fork 0
Code Releases Activity

Use 'counter' RRD type for some TrueNAS sensors (#14670) 

* Use 'counter' for some TrueNAS sensors

* Test Data

* Missed one

* Update index to force sensor to be re-discovered

* Switch sufix from '_Count' to '_rate'
This commit is contained in:
AdamB 2022-12-09 16:27:39 +00:00 committed by GitHub
parent ceb8a02a99
commit 3a085d89c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 71 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
includes/definitions/discovery/truenas.yaml
View File

@ -26,24 +26,26 @@ modules:
value: zfsArcHits
num_oid: .1.3.6.1.4.1.50536.1.4.4.{{ $index }}
descr: 'ARC Hits'
index: zfsArcHits.{{ $index }}
index: zfsArcHits_rate.{{ $index }}
rrd_type: COUNTER
-
oid: zfsArcMisses
value: zfsArcMisses
num_oid: .1.3.6.1.4.1.50536.1.4.5.{{ $index }}
descr: 'ARC Misses'
index: zfsArcMisses.{{ $index }}
index: zfsArcMisses_rate.{{ $index }}
rrd_type: COUNTER
-
oid: zfsArcC
value: zfsArcC
num_oid: .1.3.6.1.4.1.50536.1.4.6.{{ $index }}
descr: 'ARC C'
descr: 'ARC Target Size (C)'
index: zfsArcC.{{ $index }}
-
oid: zfsArcP
value: zfsArcP
num_oid: .1.3.6.1.4.1.50536.1.4.7.{{ $index }}
descr: 'ARC P'
descr: 'ARC MRU Target Size (P)'
index: zfsArcP.{{ $index }}
-
oid: zfsArcMissPercent
@ -55,7 +57,7 @@ modules:
oid: zfsArcHitRatio
value: zfsArcHitRatio
num_oid: .1.3.6.1.4.1.50536.1.4.9.{{ $index }}
descr: 'ARC Hit Ratio'
descr: 'ARC Hit Ratio'
index: zfsArcHitRatio.{{ $index }}
-
oid: zfsArcMissRatio
@ -68,25 +70,29 @@ modules:
value: zfsL2ArcHits
num_oid: .1.3.6.1.4.1.50536.1.5.1.{{ $index }}
descr: 'L2ARC Hits'
index: zfsL2ArcHits.{{ $index }}
index: zfsL2ArcHits_rate.{{ $index }}
rrd_type: COUNTER
-
oid: zfsL2ArcMisses
value: zfsL2ArcMisses
num_oid: .1.3.6.1.4.1.50536.1.5.2.{{ $index }}
descr: 'L2ARC Misses'
index: zfsL2ArcMisses.{{ $index }}
index: zfsL2ArcMisses_rate.{{ $index }}
rrd_type: COUNTER
-
oid: zfsL2ArcRead
value: zfsL2ArcRead
num_oid: .1.3.6.1.4.1.50536.1.5.3.{{ $index }}
descr: 'L2ARC Reads'
index: zfsL2ArcRead.{{ $index }}
index: zfsL2ArcRead_rate.{{ $index }}
rrd_type: COUNTER
-
oid: zfsL2ArcWrite
value: zfsL2ArcWrite
num_oid: .1.3.6.1.4.1.50536.1.5.4.{{ $index }}
descr: 'L2ARC Writes'
index: zfsL2ArcWrite.{{ $index }}
index: zfsL2ArcWrite_rate.{{ $index }}
rrd_type: COUNTER
-
oid: zfsL2ArcSize
value: zfsL2ArcSize

56
tests/data/truenas.json
View File

@ -2328,7 +2328,7 @@
"sensor_oid": ".1.3.6.1.4.1.50536.1.4.6.0",
"sensor_index": "zfsArcC.0",
"sensor_type": "truenas",
"sensor_descr": "ARC C",
"sensor_descr": "ARC Target Size (C)",
"group": null,
"sensor_divisor": 1,
"sensor_multiplier": 1,
@ -2376,7 +2376,7 @@
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.50536.1.4.4.0",
"sensor_index": "zfsArcHits.0",
"sensor_index": "zfsArcHits_rate.0",
"sensor_type": "truenas",
"sensor_descr": "ARC Hits",
"group": null,
@ -2393,7 +2393,7 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"rrd_type": "COUNTER",
"state_name": null
},
{
@ -2426,7 +2426,7 @@
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.50536.1.4.5.0",
"sensor_index": "zfsArcMisses.0",
"sensor_index": "zfsArcMisses_rate.0",
"sensor_type": "truenas",
"sensor_descr": "ARC Misses",
"group": null,
@ -2443,7 +2443,7 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"rrd_type": "COUNTER",
"state_name": null
},
{
@ -2478,7 +2478,7 @@
"sensor_oid": ".1.3.6.1.4.1.50536.1.4.7.0",
"sensor_index": "zfsArcP.0",
"sensor_type": "truenas",
"sensor_descr": "ARC P",
"sensor_descr": "ARC MRU Target Size (P)",
"group": null,
"sensor_divisor": 1,
"sensor_multiplier": 1,
@ -2526,7 +2526,7 @@
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.50536.1.5.1.0",
"sensor_index": "zfsL2ArcHits.0",
"sensor_index": "zfsL2ArcHits_rate.0",
"sensor_type": "truenas",
"sensor_descr": "L2ARC Hits",
"group": null,
@ -2543,7 +2543,7 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"rrd_type": "COUNTER",
"state_name": null
},
{
@ -2551,7 +2551,7 @@
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.50536.1.5.2.0",
"sensor_index": "zfsL2ArcMisses.0",
"sensor_index": "zfsL2ArcMisses_rate.0",
"sensor_type": "truenas",
"sensor_descr": "L2ARC Misses",
"group": null,
@ -2568,7 +2568,7 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"rrd_type": "COUNTER",
"state_name": null
},
{
@ -2576,7 +2576,7 @@
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.50536.1.5.3.0",
"sensor_index": "zfsL2ArcRead.0",
"sensor_index": "zfsL2ArcRead_rate.0",
"sensor_type": "truenas",
"sensor_descr": "L2ARC Reads",
"group": null,
@ -2593,7 +2593,7 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"rrd_type": "COUNTER",
"state_name": null
},
{
@ -2626,7 +2626,7 @@
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.50536.1.5.4.0",
"sensor_index": "zfsL2ArcWrite.0",
"sensor_index": "zfsL2ArcWrite_rate.0",
"sensor_type": "truenas",
"sensor_descr": "L2ARC Writes",
"group": null,
@ -2643,7 +2643,7 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"rrd_type": "COUNTER",
"state_name": null
},
{
@ -2976,7 +2976,7 @@
"sensor_oid": ".1.3.6.1.4.1.50536.1.4.6.0",
"sensor_index": "zfsArcC.0",
"sensor_type": "truenas",
"sensor_descr": "ARC C",
"sensor_descr": "ARC Target Size (C)",
"group": null,
"sensor_divisor": 1,
"sensor_multiplier": 1,
@ -3024,7 +3024,7 @@
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.50536.1.4.4.0",
"sensor_index": "zfsArcHits.0",
"sensor_index": "zfsArcHits_rate.0",
"sensor_type": "truenas",
"sensor_descr": "ARC Hits",
"group": null,
@ -3041,7 +3041,7 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"rrd_type": "COUNTER",
"state_name": null
},
{
@ -3074,7 +3074,7 @@
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.50536.1.4.5.0",
"sensor_index": "zfsArcMisses.0",
"sensor_index": "zfsArcMisses_rate.0",
"sensor_type": "truenas",
"sensor_descr": "ARC Misses",
"group": null,
@ -3091,7 +3091,7 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"rrd_type": "COUNTER",
"state_name": null
},
{
@ -3126,7 +3126,7 @@
"sensor_oid": ".1.3.6.1.4.1.50536.1.4.7.0",
"sensor_index": "zfsArcP.0",
"sensor_type": "truenas",
"sensor_descr": "ARC P",
"sensor_descr": "ARC MRU Target Size (P)",
"group": null,
"sensor_divisor": 1,
"sensor_multiplier": 1,
@ -3174,7 +3174,7 @@
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.50536.1.5.1.0",
"sensor_index": "zfsL2ArcHits.0",
"sensor_index": "zfsL2ArcHits_rate.0",
"sensor_type": "truenas",
"sensor_descr": "L2ARC Hits",
"group": null,
@ -3191,7 +3191,7 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"rrd_type": "COUNTER",
"state_name": null
},
{
@ -3199,7 +3199,7 @@
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.50536.1.5.2.0",
"sensor_index": "zfsL2ArcMisses.0",
"sensor_index": "zfsL2ArcMisses_rate.0",
"sensor_type": "truenas",
"sensor_descr": "L2ARC Misses",
"group": null,
@ -3216,7 +3216,7 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"rrd_type": "COUNTER",
"state_name": null
},
{
@ -3224,7 +3224,7 @@
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.50536.1.5.3.0",
"sensor_index": "zfsL2ArcRead.0",
"sensor_index": "zfsL2ArcRead_rate.0",
"sensor_type": "truenas",
"sensor_descr": "L2ARC Reads",
"group": null,
@ -3241,7 +3241,7 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"rrd_type": "COUNTER",
"state_name": null
},
{
@ -3274,7 +3274,7 @@
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.50536.1.5.4.0",
"sensor_index": "zfsL2ArcWrite.0",
"sensor_index": "zfsL2ArcWrite_rate.0",
"sensor_type": "truenas",
"sensor_descr": "L2ARC Writes",
"group": null,
@ -3291,7 +3291,7 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"rrd_type": "COUNTER",
"state_name": null
},
{

56
tests/data/truenas_11-3.json
View File

@ -596,7 +596,7 @@
"sensor_oid": ".1.3.6.1.4.1.50536.1.4.6.0",
"sensor_index": "zfsArcC.0",
"sensor_type": "truenas",
"sensor_descr": "ARC C",
"sensor_descr": "ARC Target Size (C)",
"group": null,
"sensor_divisor": 1,
"sensor_multiplier": 1,
@ -644,7 +644,7 @@
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.50536.1.4.4.0",
"sensor_index": "zfsArcHits.0",
"sensor_index": "zfsArcHits_rate.0",
"sensor_type": "truenas",
"sensor_descr": "ARC Hits",
"group": null,
@ -661,7 +661,7 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"rrd_type": "COUNTER",
"state_name": null
},
{
@ -694,7 +694,7 @@
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.50536.1.4.5.0",
"sensor_index": "zfsArcMisses.0",
"sensor_index": "zfsArcMisses_rate.0",
"sensor_type": "truenas",
"sensor_descr": "ARC Misses",
"group": null,
@ -711,7 +711,7 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"rrd_type": "COUNTER",
"state_name": null
},
{
@ -746,7 +746,7 @@
"sensor_oid": ".1.3.6.1.4.1.50536.1.4.7.0",
"sensor_index": "zfsArcP.0",
"sensor_type": "truenas",
"sensor_descr": "ARC P",
"sensor_descr": "ARC MRU Target Size (P)",
"group": null,
"sensor_divisor": 1,
"sensor_multiplier": 1,
@ -794,7 +794,7 @@
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.50536.1.5.1.0",
"sensor_index": "zfsL2ArcHits.0",
"sensor_index": "zfsL2ArcHits_rate.0",
"sensor_type": "truenas",
"sensor_descr": "L2ARC Hits",
"group": null,
@ -811,7 +811,7 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"rrd_type": "COUNTER",
"state_name": null
},
{
@ -819,7 +819,7 @@
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.50536.1.5.2.0",
"sensor_index": "zfsL2ArcMisses.0",
"sensor_index": "zfsL2ArcMisses_rate.0",
"sensor_type": "truenas",
"sensor_descr": "L2ARC Misses",
"group": null,
@ -836,7 +836,7 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"rrd_type": "COUNTER",
"state_name": null
},
{
@ -844,7 +844,7 @@
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.50536.1.5.3.0",
"sensor_index": "zfsL2ArcRead.0",
"sensor_index": "zfsL2ArcRead_rate.0",
"sensor_type": "truenas",
"sensor_descr": "L2ARC Reads",
"group": null,
@ -861,7 +861,7 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"rrd_type": "COUNTER",
"state_name": null
},
{
@ -894,7 +894,7 @@
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.50536.1.5.4.0",
"sensor_index": "zfsL2ArcWrite.0",
"sensor_index": "zfsL2ArcWrite_rate.0",
"sensor_type": "truenas",
"sensor_descr": "L2ARC Writes",
"group": null,
@ -911,7 +911,7 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"rrd_type": "COUNTER",
"state_name": null
},
{
@ -1069,7 +1069,7 @@
"sensor_oid": ".1.3.6.1.4.1.50536.1.4.6.0",
"sensor_index": "zfsArcC.0",
"sensor_type": "truenas",
"sensor_descr": "ARC C",
"sensor_descr": "ARC Target Size (C)",
"group": null,
"sensor_divisor": 1,
"sensor_multiplier": 1,
@ -1117,7 +1117,7 @@
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.50536.1.4.4.0",
"sensor_index": "zfsArcHits.0",
"sensor_index": "zfsArcHits_rate.0",
"sensor_type": "truenas",
"sensor_descr": "ARC Hits",
"group": null,
@ -1134,7 +1134,7 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"rrd_type": "COUNTER",
"state_name": null
},
{
@ -1167,7 +1167,7 @@
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.50536.1.4.5.0",
"sensor_index": "zfsArcMisses.0",
"sensor_index": "zfsArcMisses_rate.0",
"sensor_type": "truenas",
"sensor_descr": "ARC Misses",
"group": null,
@ -1184,7 +1184,7 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"rrd_type": "COUNTER",
"state_name": null
},
{
@ -1219,7 +1219,7 @@
"sensor_oid": ".1.3.6.1.4.1.50536.1.4.7.0",
"sensor_index": "zfsArcP.0",
"sensor_type": "truenas",
"sensor_descr": "ARC P",
"sensor_descr": "ARC MRU Target Size (P)",
"group": null,
"sensor_divisor": 1,
"sensor_multiplier": 1,
@ -1267,7 +1267,7 @@
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.50536.1.5.1.0",
"sensor_index": "zfsL2ArcHits.0",
"sensor_index": "zfsL2ArcHits_rate.0",
"sensor_type": "truenas",
"sensor_descr": "L2ARC Hits",
"group": null,
@ -1284,7 +1284,7 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"rrd_type": "COUNTER",
"state_name": null
},
{
@ -1292,7 +1292,7 @@
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.50536.1.5.2.0",
"sensor_index": "zfsL2ArcMisses.0",
"sensor_index": "zfsL2ArcMisses_rate.0",
"sensor_type": "truenas",
"sensor_descr": "L2ARC Misses",
"group": null,
@ -1309,7 +1309,7 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"rrd_type": "COUNTER",
"state_name": null
},
{
@ -1317,7 +1317,7 @@
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.50536.1.5.3.0",
"sensor_index": "zfsL2ArcRead.0",
"sensor_index": "zfsL2ArcRead_rate.0",
"sensor_type": "truenas",
"sensor_descr": "L2ARC Reads",
"group": null,
@ -1334,7 +1334,7 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"rrd_type": "COUNTER",
"state_name": null
},
{
@ -1367,7 +1367,7 @@
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.50536.1.5.4.0",
"sensor_index": "zfsL2ArcWrite.0",
"sensor_index": "zfsL2ArcWrite_rate.0",
"sensor_type": "truenas",
"sensor_descr": "L2ARC Writes",
"group": null,
@ -1384,7 +1384,7 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"rrd_type": "COUNTER",
"state_name": null
},
{