mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve "count" graphs for F5OS (#15335)

Browse Source 
* fix rrd_type: COUNTER and change index to force new graphs

* tests

* remove number in index
This commit is contained in:
PipoCanaja
2023-09-26 01:28:40 +02:00
committed by GitHub
parent 57e1d3ff48
commit 584768549a
2 changed files with 112 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
includes/definitions/discovery/f5os.yaml
View File

@@ -124,60 +124,70 @@ modules:
num_oid: .1.3.6.1.4.1.12276.1.2.1.2.2.1.4.8.112.108.97.116.102.111.114.109.7.110.118.109.101.48.110.49
descr: Total IOPS
group: Disk
index: 0
rrd_type: COUNTER
index: diskTotalIops0
-
oid: F5-PLATFORM-STATS-MIB::diskUtilizationStatsTable
value: F5-PLATFORM-STATS-MIB::diskReadIops
num_oid: .1.3.6.1.4.1.12276.1.2.1.2.2.1.5.8.112.108.97.116.102.111.114.109.7.110.118.109.101.48.110.49
descr: Read IOPS
group: Disk
index: 1
rrd_type: COUNTER
index: diskReadIops
-
oid: F5-PLATFORM-STATS-MIB::diskUtilizationStatsTable
value: F5-PLATFORM-STATS-MIB::diskReadMerged
num_oid: .1.3.6.1.4.1.12276.1.2.1.2.2.1.6.8.112.108.97.116.102.111.114.109.7.110.118.109.101.48.110.49
descr: Read Merged
group: Disk
index: 2
rrd_type: COUNTER
index: diskReadMerged
-
oid: F5-PLATFORM-STATS-MIB::diskUtilizationStatsTable
value: F5-PLATFORM-STATS-MIB::diskReadBytes
num_oid: .1.3.6.1.4.1.12276.1.2.1.2.2.1.7.8.112.108.97.116.102.111.114.109.7.110.118.109.101.48.110.49
descr: Read Bytes
group: Disk
index: 3
rrd_type: COUNTER
index: diskReadBytes
-
oid: F5-PLATFORM-STATS-MIB::diskUtilizationStatsTable
value: F5-PLATFORM-STATS-MIB::diskReadLatencyMs
num_oid: .1.3.6.1.4.1.12276.1.2.1.2.2.1.8.8.112.108.97.116.102.111.114.109.7.110.118.109.101.48.110.49
descr: Read Latency
group: Disk
index: 4
rrd_type: COUNTER
index: diskReadLatencyMs
-
oid: F5-PLATFORM-STATS-MIB::diskUtilizationStatsTable
value: F5-PLATFORM-STATS-MIB::diskWriteIops
num_oid: .1.3.6.1.4.1.12276.1.2.1.2.2.1.9.8.112.108.97.116.102.111.114.109.7.110.118.109.101.48.110.49
descr: Write IOPS
group: Disk
index: 5
rrd_type: COUNTER
index: diskWriteIops
-
oid: F5-PLATFORM-STATS-MIB::diskUtilizationStatsTable
value: F5-PLATFORM-STATS-MIB::diskWriteMerged
num_oid: .1.3.6.1.4.1.12276.1.2.1.2.2.1.10.8.112.108.97.116.102.111.114.109.7.110.118.109.101.48.110.49
descr: Write Merged
group: Disk
index: 6
rrd_type: COUNTER
index: diskWriteMerged
-
oid: F5-PLATFORM-STATS-MIB::diskUtilizationStatsTable
value: F5-PLATFORM-STATS-MIB::diskWriteBytes
num_oid: .1.3.6.1.4.1.12276.1.2.1.2.2.1.11.8.112.108.97.116.102.111.114.109.7.110.118.109.101.48.110.49
descr: Write Bytes
group: Disk
index: 7
rrd_type: COUNTER
index: diskWriteBytes
-
oid: F5-PLATFORM-STATS-MIB::diskUtilizationStatsTable
value: F5-PLATFORM-STATS-MIB::diskWriteLatencyMs
num_oid: .1.3.6.1.4.1.12276.1.2.1.2.2.1.12.8.112.108.97.116.102.111.114.109.7.110.118.109.101.48.110.49
descr: Write Latency
group: Disk
index: 8
rrd_type: COUNTER
index: diskWriteLatencyMs

186
tests/data/f5os_f5os.json
View File

@@ -2478,87 +2478,12 @@
"sensors": {
"discovery": {
"sensors": [
{
"sensor_deleted": 0,
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.12276.1.2.1.2.2.1.4.8.112.108.97.116.102.111.114.109.7.110.118.109.101.48.110.49",
"sensor_index": "0",
"sensor_type": "f5os",
"sensor_descr": "Total IOPS",
"group": "Disk",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 45332795,
"sensor_limit": null,
"sensor_limit_warn": null,
"sensor_limit_low": null,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.12276.1.2.1.2.2.1.5.8.112.108.97.116.102.111.114.109.7.110.118.109.101.48.110.49",
"sensor_index": "1",
"sensor_type": "f5os",
"sensor_descr": "Read IOPS",
"group": "Disk",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 814092,
"sensor_limit": null,
"sensor_limit_warn": null,
"sensor_limit_low": null,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.12276.1.2.1.2.2.1.6.8.112.108.97.116.102.111.114.109.7.110.118.109.101.48.110.49",
"sensor_index": "2",
"sensor_type": "f5os",
"sensor_descr": "Read Merged",
"group": "Disk",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 120203,
"sensor_limit": null,
"sensor_limit_warn": null,
"sensor_limit_low": null,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.12276.1.2.1.2.2.1.7.8.112.108.97.116.102.111.114.109.7.110.118.109.101.48.110.49",
"sensor_index": "3",
"sensor_index": "diskReadBytes",
"sensor_type": "f5os",
"sensor_descr": "Read Bytes",
"group": "Disk",
@@ -2575,7 +2500,32 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"rrd_type": "COUNTER",
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.12276.1.2.1.2.2.1.5.8.112.108.97.116.102.111.114.109.7.110.118.109.101.48.110.49",
"sensor_index": "diskReadIops",
"sensor_type": "f5os",
"sensor_descr": "Read IOPS",
"group": "Disk",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 814092,
"sensor_limit": null,
"sensor_limit_warn": null,
"sensor_limit_low": null,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "COUNTER",
"state_name": null
},
{
@@ -2583,7 +2533,7 @@
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.12276.1.2.1.2.2.1.8.8.112.108.97.116.102.111.114.109.7.110.118.109.101.48.110.49",
"sensor_index": "4",
"sensor_index": "diskReadLatencyMs",
"sensor_type": "f5os",
"sensor_descr": "Read Latency",
"group": "Disk",
@@ -2600,21 +2550,21 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"rrd_type": "COUNTER",
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.12276.1.2.1.2.2.1.9.8.112.108.97.116.102.111.114.109.7.110.118.109.101.48.110.49",
"sensor_index": "5",
"sensor_oid": ".1.3.6.1.4.1.12276.1.2.1.2.2.1.6.8.112.108.97.116.102.111.114.109.7.110.118.109.101.48.110.49",
"sensor_index": "diskReadMerged",
"sensor_type": "f5os",
"sensor_descr": "Write IOPS",
"sensor_descr": "Read Merged",
"group": "Disk",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 284226961,
"sensor_current": 120203,
"sensor_limit": null,
"sensor_limit_warn": null,
"sensor_limit_low": null,
@@ -2625,21 +2575,21 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"rrd_type": "COUNTER",
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.12276.1.2.1.2.2.1.10.8.112.108.97.116.102.111.114.109.7.110.118.109.101.48.110.49",
"sensor_index": "6",
"sensor_oid": ".1.3.6.1.4.1.12276.1.2.1.2.2.1.4.8.112.108.97.116.102.111.114.109.7.110.118.109.101.48.110.49",
"sensor_index": "diskTotalIops0",
"sensor_type": "f5os",
"sensor_descr": "Write Merged",
"sensor_descr": "Total IOPS",
"group": "Disk",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 184299782,
"sensor_current": 45332795,
"sensor_limit": null,
"sensor_limit_warn": null,
"sensor_limit_low": null,
@@ -2650,7 +2600,7 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"rrd_type": "COUNTER",
"state_name": null
},
{
@@ -2658,7 +2608,7 @@
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.12276.1.2.1.2.2.1.11.8.112.108.97.116.102.111.114.109.7.110.118.109.101.48.110.49",
"sensor_index": "7",
"sensor_index": "diskWriteBytes",
"sensor_type": "f5os",
"sensor_descr": "Write Bytes",
"group": "Disk",
@@ -2675,7 +2625,32 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"rrd_type": "COUNTER",
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.12276.1.2.1.2.2.1.9.8.112.108.97.116.102.111.114.109.7.110.118.109.101.48.110.49",
"sensor_index": "diskWriteIops",
"sensor_type": "f5os",
"sensor_descr": "Write IOPS",
"group": "Disk",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 284226961,
"sensor_limit": null,
"sensor_limit_warn": null,
"sensor_limit_low": null,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "COUNTER",
"state_name": null
},
{
@@ -2683,7 +2658,7 @@
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.12276.1.2.1.2.2.1.12.8.112.108.97.116.102.111.114.109.7.110.118.109.101.48.110.49",
"sensor_index": "8",
"sensor_index": "diskWriteLatencyMs",
"sensor_type": "f5os",
"sensor_descr": "Write Latency",
"group": "Disk",
@@ -2700,7 +2675,32 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"rrd_type": "COUNTER",
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.12276.1.2.1.2.2.1.10.8.112.108.97.116.102.111.114.109.7.110.118.109.101.48.110.49",
"sensor_index": "diskWriteMerged",
"sensor_type": "f5os",
"sensor_descr": "Write Merged",
"group": "Disk",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 184299782,
"sensor_limit": null,
"sensor_limit_warn": null,
"sensor_limit_low": null,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "COUNTER",
"state_name": null
},
{