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

Fix routing engine discovery on standalone JunOS devices (#11381)

Browse Source 
* Fix routing engine discovery on standalone JunOS devices

In #9426, the sensor discover code was replaced with YAML.
Unfortunately it treats the FRU table as standalone OIDs, and did not
implement the filtering that was present in the original code.

This change causes LibreNMS to fully walk the FRU table, which allows us
to silence alerting on devices with an 'unknown' status. Without this
change, standalone devices have a spurious routing engine with state 1,
which triggers false harware failure alerts.

As we're changing the name of the sensors, this causes a loss of sensor
history.

This has been brought up on community a couple of times:
  https://community.librenms.org/t/juniper-qfx-routing-engine-state-alert/6152
  https://community.librenms.org/t/spurious-failed-routing-engine-from-some-junos-devices/6208

* Update test data

* Update test data

* Update test data

* Update test data

* This syntax works, but fails linting
This commit is contained in:
Adam Bishop
2020-04-22 07:23:51 +01:00
committed by GitHub
parent 10660261df
commit 4c14efb375
5 changed files with 417 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/definitions/discovery/junos.yaml
+4 -4
View File
@@ -163,12 +163,12 @@ modules:
- { value: 2, descr: off, graph: 1, generic: 0 }
- { value: 3, descr: on, graph: 1, generic: 2 }
-
oid: jnxFruState
oid: jnxFruTable
value: jnxFruState
num_oid: '.1.3.6.1.4.1.2636.3.1.15.1.8.{{ $index }}'
descr: '{{ $jnxFruName }}'
skip_values: 2
index: '{{ $index }}'
descr: jnxFruName
index: 'jnxFruName.{{ $index }}'
skip_value_lt: 3
states:
- { value: 1, descr: unknown, graph: 1, generic: 3 }
- { value: 2, descr: empty, graph: 1, generic: 3 }
tests/data/junos.json
+52 -52
View File
@@ -31274,8 +31274,8 @@
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.2.1.1.0",
"sensor_index": "2.1.1.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.2.1.1.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "Power Supply: Power Supply 0 @ 0/0/*",
"group": null,
"sensor_divisor": 1,
@@ -31291,15 +31291,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.2.2.1.0",
"sensor_index": "2.2.1.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.2.2.1.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "Power Supply: Power Supply 0 @ 1/0/*",
"group": null,
"sensor_divisor": 1,
@@ -31315,15 +31315,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.4.1.1.1",
"sensor_index": "4.1.1.1",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.4.1.1.1",
"sensor_type": "jnxFruTable",
"sensor_descr": "FAN: Fan 1 @ 0/0/0",
"group": null,
"sensor_divisor": 1,
@@ -31339,15 +31339,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.4.1.1.2",
"sensor_index": "4.1.1.2",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.4.1.1.2",
"sensor_type": "jnxFruTable",
"sensor_descr": "FAN: Fan 2 @ 0/0/1",
"group": null,
"sensor_divisor": 1,
@@ -31363,15 +31363,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.4.1.1.3",
"sensor_index": "4.1.1.3",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.4.1.1.3",
"sensor_type": "jnxFruTable",
"sensor_descr": "FAN: Fan 3 @ 0/0/2",
"group": null,
"sensor_divisor": 1,
@@ -31387,15 +31387,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.4.2.1.1",
"sensor_index": "4.2.1.1",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.4.2.1.1",
"sensor_type": "jnxFruTable",
"sensor_descr": "FAN: Fan 1 @ 1/0/0",
"group": null,
"sensor_divisor": 1,
@@ -31411,15 +31411,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.4.2.1.2",
"sensor_index": "4.2.1.2",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.4.2.1.2",
"sensor_type": "jnxFruTable",
"sensor_descr": "FAN: Fan 2 @ 1/0/1",
"group": null,
"sensor_divisor": 1,
@@ -31435,15 +31435,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.4.2.1.3",
"sensor_index": "4.2.1.3",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.4.2.1.3",
"sensor_type": "jnxFruTable",
"sensor_descr": "FAN: Fan 3 @ 1/0/2",
"group": null,
"sensor_divisor": 1,
@@ -31459,15 +31459,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.7.1.0.0",
"sensor_index": "7.1.0.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.7.1.0.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "FPC: EX4200-24T, 8 POE @ 0/*/*",
"group": null,
"sensor_divisor": 1,
@@ -31483,15 +31483,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.7.2.0.0",
"sensor_index": "7.2.0.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.7.2.0.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "FPC: EX4200-24T, 8 POE @ 1/*/*",
"group": null,
"sensor_divisor": 1,
@@ -31507,15 +31507,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.8.1.1.0",
"sensor_index": "8.1.1.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.8.1.1.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "PIC: 24x 10/100/1000 Base-T @ 0/0/*",
"group": null,
"sensor_divisor": 1,
@@ -31531,15 +31531,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.8.2.1.0",
"sensor_index": "8.2.1.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.8.2.1.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "PIC: 24x 10/100/1000 Base-T @ 1/0/*",
"group": null,
"sensor_divisor": 1,
@@ -31555,15 +31555,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.9.1.0.0",
"sensor_index": "9.1.0.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.9.1.0.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "Routing Engine 0",
"group": null,
"sensor_divisor": 1,
@@ -31579,15 +31579,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.9.2.0.0",
"sensor_index": "9.2.0.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.9.2.0.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "Routing Engine 1",
"group": null,
"sensor_divisor": 1,
@@ -31603,7 +31603,7 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
@@ -31800,70 +31800,70 @@
],
"state_indexes": [
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "unknown",
"state_draw_graph": 1,
"state_value": 1,
"state_generic_value": 3
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "empty",
"state_draw_graph": 1,
"state_value": 2,
"state_generic_value": 3
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "present",
"state_draw_graph": 1,
"state_value": 3,
"state_generic_value": 1
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "ready",
"state_draw_graph": 1,
"state_value": 4,
"state_generic_value": 0
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "announceOnline",
"state_draw_graph": 1,
"state_value": 5,
"state_generic_value": 0
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "online",
"state_draw_graph": 1,
"state_value": 6,
"state_generic_value": 0
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "anounceOffline",
"state_draw_graph": 1,
"state_value": 7,
"state_generic_value": 1
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "offline",
"state_draw_graph": 1,
"state_value": 8,
"state_generic_value": 2
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "diagnostic",
"state_draw_graph": 1,
"state_value": 9,
"state_generic_value": 3
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "standby",
"state_draw_graph": 1,
"state_value": 10,
tests/data/junos_ex.json
+37 -61
View File
@@ -274,8 +274,8 @@
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.2.1.1.0",
"sensor_index": "2.1.1.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.2.1.1.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "Power Supply 0 @ 0/0/*",
"group": null,
"sensor_divisor": 1,
@@ -291,15 +291,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.2.1.2.0",
"sensor_index": "2.1.2.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.2.1.2.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "Power Supply 1 @ 0/1/*",
"group": null,
"sensor_divisor": 1,
@@ -315,15 +315,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.4.1.1.0",
"sensor_index": "4.1.1.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.4.1.1.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "Fan Tray 0 @ 0/0/*",
"group": null,
"sensor_divisor": 1,
@@ -339,15 +339,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.4.1.2.0",
"sensor_index": "4.1.2.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.4.1.2.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "Fan Tray 1 @ 0/1/*",
"group": null,
"sensor_divisor": 1,
@@ -363,15 +363,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.7.1.0.0",
"sensor_index": "7.1.0.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.7.1.0.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "FPC: EX3400-48T @ 0/*/*",
"group": null,
"sensor_divisor": 1,
@@ -387,15 +387,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.8.1.1.0",
"sensor_index": "8.1.1.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.8.1.1.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "PIC: 48x10/100/1000 Base-T @ 0/0/*",
"group": null,
"sensor_divisor": 1,
@@ -411,15 +411,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.8.1.2.0",
"sensor_index": "8.1.2.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.8.1.2.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "PIC: 2x40G QSFP @ 0/1/*",
"group": null,
"sensor_divisor": 1,
@@ -435,15 +435,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.8.1.3.0",
"sensor_index": "8.1.3.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.8.1.3.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "PIC: 4x10G SFP/SFP+ @ 0/2/*",
"group": null,
"sensor_divisor": 1,
@@ -459,15 +459,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.9.1.0.0",
"sensor_index": "9.1.0.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.9.1.0.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "Routing Engine 0",
"group": null,
"sensor_divisor": 1,
@@ -483,31 +483,7 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.9.2.0.0",
"sensor_index": "9.2.0.0",
"sensor_type": "jnxFruState",
"sensor_descr": "Routing Engine",
"group": null,
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 1,
"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,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
@@ -608,70 +584,70 @@
],
"state_indexes": [
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "unknown",
"state_draw_graph": 1,
"state_value": 1,
"state_generic_value": 3
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "empty",
"state_draw_graph": 1,
"state_value": 2,
"state_generic_value": 3
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "present",
"state_draw_graph": 1,
"state_value": 3,
"state_generic_value": 1
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "ready",
"state_draw_graph": 1,
"state_value": 4,
"state_generic_value": 0
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "announceOnline",
"state_draw_graph": 1,
"state_value": 5,
"state_generic_value": 0
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "online",
"state_draw_graph": 1,
"state_value": 6,
"state_generic_value": 0
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "anounceOffline",
"state_draw_graph": 1,
"state_value": 7,
"state_generic_value": 1
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "offline",
"state_draw_graph": 1,
"state_value": 8,
"state_generic_value": 2
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "diagnostic",
"state_draw_graph": 1,
"state_value": 9,
"state_generic_value": 3
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "standby",
"state_draw_graph": 1,
"state_value": 10,
tests/data/junos_qfx5100.json
+80 -128
View File
@@ -10788,8 +10788,8 @@
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.2.1.1.0",
"sensor_index": "2.1.1.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.2.1.1.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "Power Supply 0 @ 0/0/*",
"group": null,
"sensor_divisor": 1,
@@ -10805,15 +10805,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.2.1.2.0",
"sensor_index": "2.1.2.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.2.1.2.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "Power Supply 1 @ 0/1/*",
"group": null,
"sensor_divisor": 1,
@@ -10829,15 +10829,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.4.1.1.0",
"sensor_index": "4.1.1.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.4.1.1.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "Fan Tray 0 @ 0/0/*",
"group": null,
"sensor_divisor": 1,
@@ -10853,15 +10853,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.4.1.2.0",
"sensor_index": "4.1.2.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.4.1.2.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "Fan Tray 1 @ 0/1/*",
"group": null,
"sensor_divisor": 1,
@@ -10877,15 +10877,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.4.1.3.0",
"sensor_index": "4.1.3.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.4.1.3.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "Fan Tray 2 @ 0/2/*",
"group": null,
"sensor_divisor": 1,
@@ -10901,15 +10901,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.4.1.4.0",
"sensor_index": "4.1.4.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.4.1.4.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "Fan Tray 3 @ 0/3/*",
"group": null,
"sensor_divisor": 1,
@@ -10925,15 +10925,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.4.1.5.0",
"sensor_index": "4.1.5.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.4.1.5.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "Fan Tray 4 @ 0/4/*",
"group": null,
"sensor_divisor": 1,
@@ -10949,15 +10949,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.7.1.0.0",
"sensor_index": "7.1.0.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.7.1.0.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "FPC: QFX5100-48S-6Q @ 0/*/*",
"group": null,
"sensor_divisor": 1,
@@ -10973,15 +10973,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.8.1.1.0",
"sensor_index": "8.1.1.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.8.1.1.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "PIC: 48x10G-6x40G @ 0/0/*",
"group": null,
"sensor_divisor": 1,
@@ -10997,15 +10997,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.9.1.0.0",
"sensor_index": "9.1.0.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.9.1.0.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "Routing Engine 0",
"group": null,
"sensor_divisor": 1,
@@ -11021,31 +11021,7 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.9.2.0.0",
"sensor_index": "9.2.0.0",
"sensor_type": "jnxFruState",
"sensor_descr": "Routing Engine",
"group": null,
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 1,
"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,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
@@ -11218,70 +11194,70 @@
],
"state_indexes": [
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "unknown",
"state_draw_graph": 1,
"state_value": 1,
"state_generic_value": 3
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "empty",
"state_draw_graph": 1,
"state_value": 2,
"state_generic_value": 3
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "present",
"state_draw_graph": 1,
"state_value": 3,
"state_generic_value": 1
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "ready",
"state_draw_graph": 1,
"state_value": 4,
"state_generic_value": 0
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "announceOnline",
"state_draw_graph": 1,
"state_value": 5,
"state_generic_value": 0
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "online",
"state_draw_graph": 1,
"state_value": 6,
"state_generic_value": 0
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "anounceOffline",
"state_draw_graph": 1,
"state_value": 7,
"state_generic_value": 1
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "offline",
"state_draw_graph": 1,
"state_value": 8,
"state_generic_value": 2
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "diagnostic",
"state_draw_graph": 1,
"state_value": 9,
"state_generic_value": 3
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "standby",
"state_draw_graph": 1,
"state_value": 10,
@@ -11503,8 +11479,8 @@
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.2.1.1.0",
"sensor_index": "2.1.1.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.2.1.1.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "Power Supply 0 @ 0/0/*",
"group": null,
"sensor_divisor": 1,
@@ -11520,15 +11496,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.2.1.2.0",
"sensor_index": "2.1.2.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.2.1.2.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "Power Supply 1 @ 0/1/*",
"group": null,
"sensor_divisor": 1,
@@ -11544,15 +11520,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.4.1.1.0",
"sensor_index": "4.1.1.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.4.1.1.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "Fan Tray 0 @ 0/0/*",
"group": null,
"sensor_divisor": 1,
@@ -11568,15 +11544,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.4.1.2.0",
"sensor_index": "4.1.2.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.4.1.2.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "Fan Tray 1 @ 0/1/*",
"group": null,
"sensor_divisor": 1,
@@ -11592,15 +11568,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.4.1.3.0",
"sensor_index": "4.1.3.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.4.1.3.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "Fan Tray 2 @ 0/2/*",
"group": null,
"sensor_divisor": 1,
@@ -11616,15 +11592,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.4.1.4.0",
"sensor_index": "4.1.4.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.4.1.4.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "Fan Tray 3 @ 0/3/*",
"group": null,
"sensor_divisor": 1,
@@ -11640,15 +11616,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.4.1.5.0",
"sensor_index": "4.1.5.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.4.1.5.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "Fan Tray 4 @ 0/4/*",
"group": null,
"sensor_divisor": 1,
@@ -11664,15 +11640,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.7.1.0.0",
"sensor_index": "7.1.0.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.7.1.0.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "FPC: QFX5100-48S-6Q @ 0/*/*",
"group": null,
"sensor_divisor": 1,
@@ -11688,15 +11664,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.8.1.1.0",
"sensor_index": "8.1.1.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.8.1.1.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "PIC: 48x10G-6x40G @ 0/0/*",
"group": null,
"sensor_divisor": 1,
@@ -11712,15 +11688,15 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.9.1.0.0",
"sensor_index": "9.1.0.0",
"sensor_type": "jnxFruState",
"sensor_index": "jnxFruName.9.1.0.0",
"sensor_type": "jnxFruTable",
"sensor_descr": "Routing Engine 0",
"group": null,
"sensor_divisor": 1,
@@ -11736,31 +11712,7 @@
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "jnxFruState"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.15.1.8.9.2.0.0",
"sensor_index": "9.2.0.0",
"sensor_type": "jnxFruState",
"sensor_descr": "Routing Engine",
"group": null,
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 1,
"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,
"state_name": "jnxFruState"
"state_name": "jnxFruTable"
},
{
"sensor_deleted": 0,
@@ -11933,70 +11885,70 @@
],
"state_indexes": [
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "unknown",
"state_draw_graph": 1,
"state_value": 1,
"state_generic_value": 3
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "empty",
"state_draw_graph": 1,
"state_value": 2,
"state_generic_value": 3
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "present",
"state_draw_graph": 1,
"state_value": 3,
"state_generic_value": 1
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "ready",
"state_draw_graph": 1,
"state_value": 4,
"state_generic_value": 0
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "announceOnline",
"state_draw_graph": 1,
"state_value": 5,
"state_generic_value": 0
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "online",
"state_draw_graph": 1,
"state_value": 6,
"state_generic_value": 0
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "anounceOffline",
"state_draw_graph": 1,
"state_value": 7,
"state_generic_value": 1
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "offline",
"state_draw_graph": 1,
"state_value": 8,
"state_generic_value": 2
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "diagnostic",
"state_draw_graph": 1,
"state_value": 9,
"state_generic_value": 3
},
{
"state_name": "jnxFruState",
"state_name": "jnxFruTable",
"state_descr": "standby",
"state_draw_graph": 1,
"state_value": 10,
tests/data/junos_srx3600.json
+244 -244
View File
File diff suppressed because it is too large Load Diff