2018-01-18 20:54:38 +00:00
|
|
|
{
|
2019-02-16 14:01:32 +00:00
|
|
|
"os": {
|
|
|
|
|
"discovery": {
|
|
|
|
|
"devices": [
|
|
|
|
|
{
|
|
|
|
|
"sysName": "<private>",
|
|
|
|
|
"sysObjectID": ".1.3.6.1.4.1.2636.1.1.1.4.131.2",
|
|
|
|
|
"sysDescr": "Juniper Networks, Inc. ex3400-48t Ethernet Switch, kernel JUNOS 15.1X53-D59.4, Build date: 2018-09-14 21:00:55 UTC Copyright (c) 1996-2018 Juniper Networks, Inc.",
|
|
|
|
|
"sysContact": null,
|
|
|
|
|
"version": null,
|
|
|
|
|
"hardware": null,
|
|
|
|
|
"features": null,
|
|
|
|
|
"os": "junos",
|
|
|
|
|
"type": "network",
|
|
|
|
|
"serial": null,
|
|
|
|
|
"icon": "junos.png",
|
|
|
|
|
"location": null
|
|
|
|
|
}
|
|
|
|
|
]
|
|
|
|
|
},
|
|
|
|
|
"poller": {
|
|
|
|
|
"devices": [
|
|
|
|
|
{
|
|
|
|
|
"sysName": "<private>",
|
|
|
|
|
"sysObjectID": ".1.3.6.1.4.1.2636.1.1.1.4.131.2",
|
|
|
|
|
"sysDescr": "Juniper Networks, Inc. ex3400-48t Ethernet Switch, kernel JUNOS 15.1X53-D59.4, Build date: 2018-09-14 21:00:55 UTC Copyright (c) 1996-2018 Juniper Networks, Inc.",
|
|
|
|
|
"sysContact": "<private>",
|
|
|
|
|
"version": "15.1X53-D59.4",
|
|
|
|
|
"hardware": "Juniper EX3400-48T",
|
|
|
|
|
"features": null,
|
|
|
|
|
"os": "junos",
|
|
|
|
|
"type": "network",
|
|
|
|
|
"serial": null,
|
|
|
|
|
"icon": "junos.png",
|
|
|
|
|
"location": "<private>"
|
|
|
|
|
}
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
},
|
2018-01-18 20:54:38 +00:00
|
|
|
"bgp-peers": {
|
|
|
|
|
"discovery": {
|
|
|
|
|
"bgpPeers": [
|
|
|
|
|
{
|
|
|
|
|
"astext": "",
|
|
|
|
|
"bgpPeerIdentifier": "192.168.1.4",
|
2018-08-27 20:03:12 +00:00
|
|
|
"bgpPeerRemoteAs": 65502,
|
2018-01-18 20:54:38 +00:00
|
|
|
"bgpPeerState": "idle",
|
|
|
|
|
"bgpPeerAdminStatus": "stop",
|
|
|
|
|
"bgpLocalAddr": "0.0.0.0",
|
|
|
|
|
"bgpPeerRemoteAddr": "0.0.0.0",
|
2018-09-11 03:54:46 +00:00
|
|
|
"bgpPeerDescr": "",
|
2018-08-27 20:03:12 +00:00
|
|
|
"bgpPeerInUpdates": 0,
|
|
|
|
|
"bgpPeerOutUpdates": 0,
|
|
|
|
|
"bgpPeerInTotalMessages": 0,
|
|
|
|
|
"bgpPeerOutTotalMessages": 0,
|
|
|
|
|
"bgpPeerFsmEstablishedTime": 0,
|
|
|
|
|
"bgpPeerInUpdateElapsedTime": 0,
|
|
|
|
|
"context_name": "",
|
2019-01-19 17:44:32 +00:00
|
|
|
"bgpLocalAs": 65501,
|
|
|
|
|
"vrfLocalAs": null
|
2018-01-18 20:54:38 +00:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"astext": "",
|
|
|
|
|
"bgpPeerIdentifier": "192.168.1.186",
|
2018-08-27 20:03:12 +00:00
|
|
|
"bgpPeerRemoteAs": 65503,
|
2018-01-18 20:54:38 +00:00
|
|
|
"bgpPeerState": "idle",
|
|
|
|
|
"bgpPeerAdminStatus": "stop",
|
|
|
|
|
"bgpLocalAddr": "0.0.0.0",
|
|
|
|
|
"bgpPeerRemoteAddr": "0.0.0.0",
|
2018-09-11 03:54:46 +00:00
|
|
|
"bgpPeerDescr": "",
|
2018-08-27 20:03:12 +00:00
|
|
|
"bgpPeerInUpdates": 0,
|
|
|
|
|
"bgpPeerOutUpdates": 0,
|
|
|
|
|
"bgpPeerInTotalMessages": 0,
|
|
|
|
|
"bgpPeerOutTotalMessages": 0,
|
|
|
|
|
"bgpPeerFsmEstablishedTime": 0,
|
|
|
|
|
"bgpPeerInUpdateElapsedTime": 0,
|
|
|
|
|
"context_name": "",
|
2019-01-19 17:44:32 +00:00
|
|
|
"bgpLocalAs": 65501,
|
|
|
|
|
"vrfLocalAs": null
|
2018-01-18 20:54:38 +00:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"astext": "",
|
|
|
|
|
"bgpPeerIdentifier": "192.168.1.226",
|
2018-08-27 20:03:12 +00:00
|
|
|
"bgpPeerRemoteAs": 65504,
|
2018-01-18 20:54:38 +00:00
|
|
|
"bgpPeerState": "idle",
|
|
|
|
|
"bgpPeerAdminStatus": "stop",
|
|
|
|
|
"bgpLocalAddr": "0.0.0.0",
|
|
|
|
|
"bgpPeerRemoteAddr": "0.0.0.0",
|
2018-09-11 03:54:46 +00:00
|
|
|
"bgpPeerDescr": "",
|
2018-08-27 20:03:12 +00:00
|
|
|
"bgpPeerInUpdates": 0,
|
|
|
|
|
"bgpPeerOutUpdates": 0,
|
|
|
|
|
"bgpPeerInTotalMessages": 0,
|
|
|
|
|
"bgpPeerOutTotalMessages": 0,
|
|
|
|
|
"bgpPeerFsmEstablishedTime": 0,
|
|
|
|
|
"bgpPeerInUpdateElapsedTime": 0,
|
|
|
|
|
"context_name": "",
|
2019-01-19 17:44:32 +00:00
|
|
|
"bgpLocalAs": 65501,
|
|
|
|
|
"vrfLocalAs": null
|
2018-01-18 20:54:38 +00:00
|
|
|
}
|
|
|
|
|
],
|
|
|
|
|
"bgpPeers_cbgp": []
|
|
|
|
|
},
|
|
|
|
|
"poller": {
|
|
|
|
|
"bgpPeers": [
|
|
|
|
|
{
|
|
|
|
|
"astext": "",
|
|
|
|
|
"bgpPeerIdentifier": "192.168.1.4",
|
2018-08-27 20:03:12 +00:00
|
|
|
"bgpPeerRemoteAs": 65502,
|
2018-01-18 20:54:38 +00:00
|
|
|
"bgpPeerState": "established",
|
|
|
|
|
"bgpPeerAdminStatus": "start",
|
|
|
|
|
"bgpLocalAddr": "192.168.1.43",
|
|
|
|
|
"bgpPeerRemoteAddr": "0.0.0.0",
|
2018-09-11 03:54:46 +00:00
|
|
|
"bgpPeerDescr": "",
|
2018-08-27 20:03:12 +00:00
|
|
|
"bgpPeerInUpdates": 10526,
|
|
|
|
|
"bgpPeerOutUpdates": 531,
|
|
|
|
|
"bgpPeerInTotalMessages": 824076,
|
|
|
|
|
"bgpPeerOutTotalMessages": 871063,
|
|
|
|
|
"bgpPeerFsmEstablishedTime": 23675506,
|
|
|
|
|
"bgpPeerInUpdateElapsedTime": 21748,
|
|
|
|
|
"context_name": "",
|
2019-01-19 17:44:32 +00:00
|
|
|
"bgpLocalAs": 65501,
|
|
|
|
|
"vrfLocalAs": null
|
2018-01-18 20:54:38 +00:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"astext": "",
|
|
|
|
|
"bgpPeerIdentifier": "192.168.1.186",
|
2018-08-27 20:03:12 +00:00
|
|
|
"bgpPeerRemoteAs": 65503,
|
2018-01-18 20:54:38 +00:00
|
|
|
"bgpPeerState": "established",
|
|
|
|
|
"bgpPeerAdminStatus": "start",
|
|
|
|
|
"bgpLocalAddr": "192.168.1.185",
|
|
|
|
|
"bgpPeerRemoteAddr": "0.0.0.0",
|
2018-09-11 03:54:46 +00:00
|
|
|
"bgpPeerDescr": "",
|
2018-08-27 20:03:12 +00:00
|
|
|
"bgpPeerInUpdates": 1,
|
|
|
|
|
"bgpPeerOutUpdates": 1,
|
|
|
|
|
"bgpPeerInTotalMessages": 29928,
|
|
|
|
|
"bgpPeerOutTotalMessages": 28798,
|
|
|
|
|
"bgpPeerFsmEstablishedTime": 785386,
|
|
|
|
|
"bgpPeerInUpdateElapsedTime": 785386,
|
|
|
|
|
"context_name": "",
|
2019-01-19 17:44:32 +00:00
|
|
|
"bgpLocalAs": 65501,
|
|
|
|
|
"vrfLocalAs": null
|
2018-01-18 20:54:38 +00:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"astext": "",
|
|
|
|
|
"bgpPeerIdentifier": "192.168.1.226",
|
2018-08-27 20:03:12 +00:00
|
|
|
"bgpPeerRemoteAs": 65504,
|
2018-01-18 20:54:38 +00:00
|
|
|
"bgpPeerState": "established",
|
|
|
|
|
"bgpPeerAdminStatus": "start",
|
|
|
|
|
"bgpLocalAddr": "192.168.1.225",
|
|
|
|
|
"bgpPeerRemoteAddr": "0.0.0.0",
|
2018-09-11 03:54:46 +00:00
|
|
|
"bgpPeerDescr": "",
|
2018-08-27 20:03:12 +00:00
|
|
|
"bgpPeerInUpdates": 3,
|
|
|
|
|
"bgpPeerOutUpdates": 1,
|
|
|
|
|
"bgpPeerInTotalMessages": 25802,
|
|
|
|
|
"bgpPeerOutTotalMessages": 28382,
|
|
|
|
|
"bgpPeerFsmEstablishedTime": 774041,
|
|
|
|
|
"bgpPeerInUpdateElapsedTime": 774040,
|
|
|
|
|
"context_name": "",
|
2019-01-19 17:44:32 +00:00
|
|
|
"bgpLocalAs": 65501,
|
|
|
|
|
"vrfLocalAs": null
|
2018-01-18 20:54:38 +00:00
|
|
|
}
|
|
|
|
|
],
|
|
|
|
|
"bgpPeers_cbgp": []
|
|
|
|
|
}
|
2018-03-14 22:28:01 +00:00
|
|
|
},
|
2018-02-05 13:39:13 +00:00
|
|
|
"processors": {
|
|
|
|
|
"discovery": {
|
|
|
|
|
"processors": [
|
|
|
|
|
{
|
2019-02-16 14:01:32 +00:00
|
|
|
"entPhysicalIndex": 0,
|
|
|
|
|
"hrDeviceIndex": 0,
|
2018-02-05 13:39:13 +00:00
|
|
|
"processor_oid": ".1.3.6.1.4.1.2636.3.1.13.1.8.7.1.0.0",
|
|
|
|
|
"processor_index": "7.1.0.0",
|
|
|
|
|
"processor_type": "junos",
|
2019-02-16 14:01:32 +00:00
|
|
|
"processor_usage": 11,
|
|
|
|
|
"processor_descr": "FPC: EX3400-48T @ 0/*/*",
|
|
|
|
|
"processor_precision": 1,
|
|
|
|
|
"processor_perc_warn": 75
|
2018-02-05 13:39:13 +00:00
|
|
|
},
|
|
|
|
|
{
|
2019-02-16 14:01:32 +00:00
|
|
|
"entPhysicalIndex": 0,
|
|
|
|
|
"hrDeviceIndex": 0,
|
2018-02-05 13:39:13 +00:00
|
|
|
"processor_oid": ".1.3.6.1.4.1.2636.3.1.13.1.8.9.1.0.0",
|
|
|
|
|
"processor_index": "9.1.0.0",
|
|
|
|
|
"processor_type": "junos",
|
2019-02-16 14:01:32 +00:00
|
|
|
"processor_usage": 11,
|
2018-02-05 13:39:13 +00:00
|
|
|
"processor_descr": "Routing Engine 0",
|
2019-02-16 14:01:32 +00:00
|
|
|
"processor_precision": 1,
|
|
|
|
|
"processor_perc_warn": 75
|
|
|
|
|
}
|
|
|
|
|
]
|
|
|
|
|
},
|
|
|
|
|
"poller": "matches discovery"
|
|
|
|
|
},
|
|
|
|
|
"mempools": {
|
|
|
|
|
"discovery": {
|
|
|
|
|
"mempools": [
|
|
|
|
|
{
|
|
|
|
|
"mempool_index": "7.1.0.0",
|
|
|
|
|
"entPhysicalIndex": null,
|
|
|
|
|
"hrDeviceIndex": null,
|
|
|
|
|
"mempool_type": "junos",
|
|
|
|
|
"mempool_precision": 1,
|
|
|
|
|
"mempool_descr": "FPC: EX3400-48T @ 0/*/*",
|
|
|
|
|
"mempool_perc": 0,
|
|
|
|
|
"mempool_used": 0,
|
|
|
|
|
"mempool_free": 0,
|
|
|
|
|
"mempool_total": 0,
|
|
|
|
|
"mempool_largestfree": null,
|
|
|
|
|
"mempool_lowestfree": null,
|
|
|
|
|
"mempool_deleted": 0,
|
2019-09-30 13:22:55 +00:00
|
|
|
"mempool_perc_warn": 90
|
2019-02-16 14:01:32 +00:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"mempool_index": "9.1.0.0",
|
|
|
|
|
"entPhysicalIndex": null,
|
|
|
|
|
"hrDeviceIndex": null,
|
|
|
|
|
"mempool_type": "junos",
|
|
|
|
|
"mempool_precision": 1,
|
|
|
|
|
"mempool_descr": "Routing Engine 0",
|
|
|
|
|
"mempool_perc": 0,
|
|
|
|
|
"mempool_used": 0,
|
|
|
|
|
"mempool_free": 0,
|
|
|
|
|
"mempool_total": 0,
|
|
|
|
|
"mempool_largestfree": null,
|
|
|
|
|
"mempool_lowestfree": null,
|
|
|
|
|
"mempool_deleted": 0,
|
2019-09-30 13:22:55 +00:00
|
|
|
"mempool_perc_warn": 90
|
2019-02-16 14:01:32 +00:00
|
|
|
}
|
|
|
|
|
]
|
|
|
|
|
},
|
|
|
|
|
"poller": {
|
|
|
|
|
"mempools": [
|
|
|
|
|
{
|
|
|
|
|
"mempool_index": "7.1.0.0",
|
|
|
|
|
"entPhysicalIndex": null,
|
|
|
|
|
"hrDeviceIndex": null,
|
|
|
|
|
"mempool_type": "junos",
|
|
|
|
|
"mempool_precision": 1,
|
|
|
|
|
"mempool_descr": "FPC: EX3400-48T @ 0/*/*",
|
|
|
|
|
"mempool_perc": 13,
|
|
|
|
|
"mempool_used": 265814016,
|
|
|
|
|
"mempool_free": 1778909184,
|
|
|
|
|
"mempool_total": 2044723200,
|
|
|
|
|
"mempool_largestfree": null,
|
|
|
|
|
"mempool_lowestfree": null,
|
|
|
|
|
"mempool_deleted": 0,
|
2019-09-30 13:22:55 +00:00
|
|
|
"mempool_perc_warn": 90
|
2019-02-16 14:01:32 +00:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"mempool_index": "9.1.0.0",
|
|
|
|
|
"entPhysicalIndex": null,
|
|
|
|
|
"hrDeviceIndex": null,
|
|
|
|
|
"mempool_type": "junos",
|
|
|
|
|
"mempool_precision": 1,
|
|
|
|
|
"mempool_descr": "Routing Engine 0",
|
|
|
|
|
"mempool_perc": 13,
|
|
|
|
|
"mempool_used": 265814016,
|
|
|
|
|
"mempool_free": 1778909184,
|
|
|
|
|
"mempool_total": 2044723200,
|
|
|
|
|
"mempool_largestfree": null,
|
|
|
|
|
"mempool_lowestfree": null,
|
|
|
|
|
"mempool_deleted": 0,
|
2019-09-30 13:22:55 +00:00
|
|
|
"mempool_perc_warn": 90
|
2019-02-16 14:01:32 +00:00
|
|
|
}
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"sensors": {
|
|
|
|
|
"discovery": {
|
|
|
|
|
"sensors": [
|
|
|
|
|
{
|
|
|
|
|
"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.1.0",
|
2020-04-22 06:23:51 +00:00
|
|
|
"sensor_index": "jnxFruName.2.1.1.0",
|
|
|
|
|
"sensor_type": "jnxFruTable",
|
2019-02-16 14:01:32 +00:00
|
|
|
"sensor_descr": "Power Supply 0 @ 0/0/*",
|
Remove guessed limits for some health sensors, documentation for sensor classes (#10327)
* Default to null for group yaml discovery.
* Update test data for a154bda yaml group null fix.
* Changes to guessed limit functions for sensors.
Original behaviour
===================
The file `includes/discovery/functions.inc.php` contains
`sensor_limit_low()` and `sensor_limit()` which both attempt to
guess a sane value for sensors when no explicitly defined
low_limit or high_limit can be found during discovery.
Both switch control structures used in those two functions
have empty case statements which means that if one of those matches,
it's going to fall through and run the code for each subsequent
case until a `break` is reached.
For example, when we call `function sensor_low_limit(dbm, -13.036)`
it will return the value `-12.3842` instead of `null`. That is
because there will be a match at `case 'dbm':` which falls through
all the way to `case 'cooling':`, where it performs
`$limit = -13.036 * 0.95` before hitting a `break`.
Changed behaviour
===================
Removed `power_consumed` and `count` guessed low_limit and
high_limit, I personally added those sensor classes in PR #9471
when I didn't understand that a switch control structure has
fall-through behaviour so I can guarantee that guessing limits for
those is a mistake on my behalf. It should not be there, only
power_factor can have guessed limits. Apologies for the issue,
I'm still a beginning programmer!
Furthermore, I removed guessed high_limit values for `current`
and `power` because these are supposed to draw higher values as
more devices or components are installed on for example a PDU or
a chassis.
Finally, I removed guessed low_limit and high_limit for `dbm`
sensors, there is a much too large variance in power budget on
commercially available optical transceivers for there to be a
sensible window where you can guess these values.
* Documentation on adding sensor classes.
* Update test data - sensor limit changes @ 30212d2
2019-06-21 14:03:27 +00:00
|
|
|
"group": null,
|
2019-02-16 14:01:32 +00:00
|
|
|
"sensor_divisor": 1,
|
|
|
|
|
"sensor_multiplier": 1,
|
|
|
|
|
"sensor_current": 6,
|
|
|
|
|
"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,
|
2020-04-22 06:23:51 +00:00
|
|
|
"state_name": "jnxFruTable"
|
2019-02-16 14:01:32 +00:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"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",
|
2020-04-22 06:23:51 +00:00
|
|
|
"sensor_index": "jnxFruName.2.1.2.0",
|
|
|
|
|
"sensor_type": "jnxFruTable",
|
2019-02-16 14:01:32 +00:00
|
|
|
"sensor_descr": "Power Supply 1 @ 0/1/*",
|
Remove guessed limits for some health sensors, documentation for sensor classes (#10327)
* Default to null for group yaml discovery.
* Update test data for a154bda yaml group null fix.
* Changes to guessed limit functions for sensors.
Original behaviour
===================
The file `includes/discovery/functions.inc.php` contains
`sensor_limit_low()` and `sensor_limit()` which both attempt to
guess a sane value for sensors when no explicitly defined
low_limit or high_limit can be found during discovery.
Both switch control structures used in those two functions
have empty case statements which means that if one of those matches,
it's going to fall through and run the code for each subsequent
case until a `break` is reached.
For example, when we call `function sensor_low_limit(dbm, -13.036)`
it will return the value `-12.3842` instead of `null`. That is
because there will be a match at `case 'dbm':` which falls through
all the way to `case 'cooling':`, where it performs
`$limit = -13.036 * 0.95` before hitting a `break`.
Changed behaviour
===================
Removed `power_consumed` and `count` guessed low_limit and
high_limit, I personally added those sensor classes in PR #9471
when I didn't understand that a switch control structure has
fall-through behaviour so I can guarantee that guessing limits for
those is a mistake on my behalf. It should not be there, only
power_factor can have guessed limits. Apologies for the issue,
I'm still a beginning programmer!
Furthermore, I removed guessed high_limit values for `current`
and `power` because these are supposed to draw higher values as
more devices or components are installed on for example a PDU or
a chassis.
Finally, I removed guessed low_limit and high_limit for `dbm`
sensors, there is a much too large variance in power budget on
commercially available optical transceivers for there to be a
sensible window where you can guess these values.
* Documentation on adding sensor classes.
* Update test data - sensor limit changes @ 30212d2
2019-06-21 14:03:27 +00:00
|
|
|
"group": null,
|
2019-02-16 14:01:32 +00:00
|
|
|
"sensor_divisor": 1,
|
|
|
|
|
"sensor_multiplier": 1,
|
|
|
|
|
"sensor_current": 6,
|
|
|
|
|
"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,
|
2020-04-22 06:23:51 +00:00
|
|
|
"state_name": "jnxFruTable"
|
2019-02-16 14:01:32 +00:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"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",
|
2020-04-22 06:23:51 +00:00
|
|
|
"sensor_index": "jnxFruName.4.1.1.0",
|
|
|
|
|
"sensor_type": "jnxFruTable",
|
2019-02-16 14:01:32 +00:00
|
|
|
"sensor_descr": "Fan Tray 0 @ 0/0/*",
|
Remove guessed limits for some health sensors, documentation for sensor classes (#10327)
* Default to null for group yaml discovery.
* Update test data for a154bda yaml group null fix.
* Changes to guessed limit functions for sensors.
Original behaviour
===================
The file `includes/discovery/functions.inc.php` contains
`sensor_limit_low()` and `sensor_limit()` which both attempt to
guess a sane value for sensors when no explicitly defined
low_limit or high_limit can be found during discovery.
Both switch control structures used in those two functions
have empty case statements which means that if one of those matches,
it's going to fall through and run the code for each subsequent
case until a `break` is reached.
For example, when we call `function sensor_low_limit(dbm, -13.036)`
it will return the value `-12.3842` instead of `null`. That is
because there will be a match at `case 'dbm':` which falls through
all the way to `case 'cooling':`, where it performs
`$limit = -13.036 * 0.95` before hitting a `break`.
Changed behaviour
===================
Removed `power_consumed` and `count` guessed low_limit and
high_limit, I personally added those sensor classes in PR #9471
when I didn't understand that a switch control structure has
fall-through behaviour so I can guarantee that guessing limits for
those is a mistake on my behalf. It should not be there, only
power_factor can have guessed limits. Apologies for the issue,
I'm still a beginning programmer!
Furthermore, I removed guessed high_limit values for `current`
and `power` because these are supposed to draw higher values as
more devices or components are installed on for example a PDU or
a chassis.
Finally, I removed guessed low_limit and high_limit for `dbm`
sensors, there is a much too large variance in power budget on
commercially available optical transceivers for there to be a
sensible window where you can guess these values.
* Documentation on adding sensor classes.
* Update test data - sensor limit changes @ 30212d2
2019-06-21 14:03:27 +00:00
|
|
|
"group": null,
|
2019-02-16 14:01:32 +00:00
|
|
|
"sensor_divisor": 1,
|
|
|
|
|
"sensor_multiplier": 1,
|
|
|
|
|
"sensor_current": 6,
|
|
|
|
|
"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,
|
2020-04-22 06:23:51 +00:00
|
|
|
"state_name": "jnxFruTable"
|
2019-02-16 14:01:32 +00:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"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",
|
2020-04-22 06:23:51 +00:00
|
|
|
"sensor_index": "jnxFruName.4.1.2.0",
|
|
|
|
|
"sensor_type": "jnxFruTable",
|
2019-02-16 14:01:32 +00:00
|
|
|
"sensor_descr": "Fan Tray 1 @ 0/1/*",
|
Remove guessed limits for some health sensors, documentation for sensor classes (#10327)
* Default to null for group yaml discovery.
* Update test data for a154bda yaml group null fix.
* Changes to guessed limit functions for sensors.
Original behaviour
===================
The file `includes/discovery/functions.inc.php` contains
`sensor_limit_low()` and `sensor_limit()` which both attempt to
guess a sane value for sensors when no explicitly defined
low_limit or high_limit can be found during discovery.
Both switch control structures used in those two functions
have empty case statements which means that if one of those matches,
it's going to fall through and run the code for each subsequent
case until a `break` is reached.
For example, when we call `function sensor_low_limit(dbm, -13.036)`
it will return the value `-12.3842` instead of `null`. That is
because there will be a match at `case 'dbm':` which falls through
all the way to `case 'cooling':`, where it performs
`$limit = -13.036 * 0.95` before hitting a `break`.
Changed behaviour
===================
Removed `power_consumed` and `count` guessed low_limit and
high_limit, I personally added those sensor classes in PR #9471
when I didn't understand that a switch control structure has
fall-through behaviour so I can guarantee that guessing limits for
those is a mistake on my behalf. It should not be there, only
power_factor can have guessed limits. Apologies for the issue,
I'm still a beginning programmer!
Furthermore, I removed guessed high_limit values for `current`
and `power` because these are supposed to draw higher values as
more devices or components are installed on for example a PDU or
a chassis.
Finally, I removed guessed low_limit and high_limit for `dbm`
sensors, there is a much too large variance in power budget on
commercially available optical transceivers for there to be a
sensible window where you can guess these values.
* Documentation on adding sensor classes.
* Update test data - sensor limit changes @ 30212d2
2019-06-21 14:03:27 +00:00
|
|
|
"group": null,
|
2019-02-16 14:01:32 +00:00
|
|
|
"sensor_divisor": 1,
|
|
|
|
|
"sensor_multiplier": 1,
|
|
|
|
|
"sensor_current": 6,
|
|
|
|
|
"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,
|
2020-04-22 06:23:51 +00:00
|
|
|
"state_name": "jnxFruTable"
|
2019-02-16 14:01:32 +00:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"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",
|
2020-04-22 06:23:51 +00:00
|
|
|
"sensor_index": "jnxFruName.7.1.0.0",
|
|
|
|
|
"sensor_type": "jnxFruTable",
|
2019-02-16 14:01:32 +00:00
|
|
|
"sensor_descr": "FPC: EX3400-48T @ 0/*/*",
|
Remove guessed limits for some health sensors, documentation for sensor classes (#10327)
* Default to null for group yaml discovery.
* Update test data for a154bda yaml group null fix.
* Changes to guessed limit functions for sensors.
Original behaviour
===================
The file `includes/discovery/functions.inc.php` contains
`sensor_limit_low()` and `sensor_limit()` which both attempt to
guess a sane value for sensors when no explicitly defined
low_limit or high_limit can be found during discovery.
Both switch control structures used in those two functions
have empty case statements which means that if one of those matches,
it's going to fall through and run the code for each subsequent
case until a `break` is reached.
For example, when we call `function sensor_low_limit(dbm, -13.036)`
it will return the value `-12.3842` instead of `null`. That is
because there will be a match at `case 'dbm':` which falls through
all the way to `case 'cooling':`, where it performs
`$limit = -13.036 * 0.95` before hitting a `break`.
Changed behaviour
===================
Removed `power_consumed` and `count` guessed low_limit and
high_limit, I personally added those sensor classes in PR #9471
when I didn't understand that a switch control structure has
fall-through behaviour so I can guarantee that guessing limits for
those is a mistake on my behalf. It should not be there, only
power_factor can have guessed limits. Apologies for the issue,
I'm still a beginning programmer!
Furthermore, I removed guessed high_limit values for `current`
and `power` because these are supposed to draw higher values as
more devices or components are installed on for example a PDU or
a chassis.
Finally, I removed guessed low_limit and high_limit for `dbm`
sensors, there is a much too large variance in power budget on
commercially available optical transceivers for there to be a
sensible window where you can guess these values.
* Documentation on adding sensor classes.
* Update test data - sensor limit changes @ 30212d2
2019-06-21 14:03:27 +00:00
|
|
|
"group": null,
|
2019-02-16 14:01:32 +00:00
|
|
|
"sensor_divisor": 1,
|
|
|
|
|
"sensor_multiplier": 1,
|
|
|
|
|
"sensor_current": 6,
|
|
|
|
|
"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,
|
2020-04-22 06:23:51 +00:00
|
|
|
"state_name": "jnxFruTable"
|
2019-02-16 14:01:32 +00:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"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",
|
2020-04-22 06:23:51 +00:00
|
|
|
"sensor_index": "jnxFruName.8.1.1.0",
|
|
|
|
|
"sensor_type": "jnxFruTable",
|
2019-02-16 14:01:32 +00:00
|
|
|
"sensor_descr": "PIC: 48x10/100/1000 Base-T @ 0/0/*",
|
Remove guessed limits for some health sensors, documentation for sensor classes (#10327)
* Default to null for group yaml discovery.
* Update test data for a154bda yaml group null fix.
* Changes to guessed limit functions for sensors.
Original behaviour
===================
The file `includes/discovery/functions.inc.php` contains
`sensor_limit_low()` and `sensor_limit()` which both attempt to
guess a sane value for sensors when no explicitly defined
low_limit or high_limit can be found during discovery.
Both switch control structures used in those two functions
have empty case statements which means that if one of those matches,
it's going to fall through and run the code for each subsequent
case until a `break` is reached.
For example, when we call `function sensor_low_limit(dbm, -13.036)`
it will return the value `-12.3842` instead of `null`. That is
because there will be a match at `case 'dbm':` which falls through
all the way to `case 'cooling':`, where it performs
`$limit = -13.036 * 0.95` before hitting a `break`.
Changed behaviour
===================
Removed `power_consumed` and `count` guessed low_limit and
high_limit, I personally added those sensor classes in PR #9471
when I didn't understand that a switch control structure has
fall-through behaviour so I can guarantee that guessing limits for
those is a mistake on my behalf. It should not be there, only
power_factor can have guessed limits. Apologies for the issue,
I'm still a beginning programmer!
Furthermore, I removed guessed high_limit values for `current`
and `power` because these are supposed to draw higher values as
more devices or components are installed on for example a PDU or
a chassis.
Finally, I removed guessed low_limit and high_limit for `dbm`
sensors, there is a much too large variance in power budget on
commercially available optical transceivers for there to be a
sensible window where you can guess these values.
* Documentation on adding sensor classes.
* Update test data - sensor limit changes @ 30212d2
2019-06-21 14:03:27 +00:00
|
|
|
"group": null,
|
2019-02-16 14:01:32 +00:00
|
|
|
"sensor_divisor": 1,
|
|
|
|
|
"sensor_multiplier": 1,
|
|
|
|
|
"sensor_current": 6,
|
|
|
|
|
"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,
|
2020-04-22 06:23:51 +00:00
|
|
|
"state_name": "jnxFruTable"
|
2019-02-16 14:01:32 +00:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"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",
|
2020-04-22 06:23:51 +00:00
|
|
|
"sensor_index": "jnxFruName.8.1.2.0",
|
|
|
|
|
"sensor_type": "jnxFruTable",
|
2019-02-16 14:01:32 +00:00
|
|
|
"sensor_descr": "PIC: 2x40G QSFP @ 0/1/*",
|
Remove guessed limits for some health sensors, documentation for sensor classes (#10327)
* Default to null for group yaml discovery.
* Update test data for a154bda yaml group null fix.
* Changes to guessed limit functions for sensors.
Original behaviour
===================
The file `includes/discovery/functions.inc.php` contains
`sensor_limit_low()` and `sensor_limit()` which both attempt to
guess a sane value for sensors when no explicitly defined
low_limit or high_limit can be found during discovery.
Both switch control structures used in those two functions
have empty case statements which means that if one of those matches,
it's going to fall through and run the code for each subsequent
case until a `break` is reached.
For example, when we call `function sensor_low_limit(dbm, -13.036)`
it will return the value `-12.3842` instead of `null`. That is
because there will be a match at `case 'dbm':` which falls through
all the way to `case 'cooling':`, where it performs
`$limit = -13.036 * 0.95` before hitting a `break`.
Changed behaviour
===================
Removed `power_consumed` and `count` guessed low_limit and
high_limit, I personally added those sensor classes in PR #9471
when I didn't understand that a switch control structure has
fall-through behaviour so I can guarantee that guessing limits for
those is a mistake on my behalf. It should not be there, only
power_factor can have guessed limits. Apologies for the issue,
I'm still a beginning programmer!
Furthermore, I removed guessed high_limit values for `current`
and `power` because these are supposed to draw higher values as
more devices or components are installed on for example a PDU or
a chassis.
Finally, I removed guessed low_limit and high_limit for `dbm`
sensors, there is a much too large variance in power budget on
commercially available optical transceivers for there to be a
sensible window where you can guess these values.
* Documentation on adding sensor classes.
* Update test data - sensor limit changes @ 30212d2
2019-06-21 14:03:27 +00:00
|
|
|
"group": null,
|
2019-02-16 14:01:32 +00:00
|
|
|
"sensor_divisor": 1,
|
|
|
|
|
"sensor_multiplier": 1,
|
|
|
|
|
"sensor_current": 6,
|
|
|
|
|
"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,
|
2020-04-22 06:23:51 +00:00
|
|
|
"state_name": "jnxFruTable"
|
2019-02-16 14:01:32 +00:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"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",
|
2020-04-22 06:23:51 +00:00
|
|
|
"sensor_index": "jnxFruName.8.1.3.0",
|
|
|
|
|
"sensor_type": "jnxFruTable",
|
2019-02-16 14:01:32 +00:00
|
|
|
"sensor_descr": "PIC: 4x10G SFP/SFP+ @ 0/2/*",
|
Remove guessed limits for some health sensors, documentation for sensor classes (#10327)
* Default to null for group yaml discovery.
* Update test data for a154bda yaml group null fix.
* Changes to guessed limit functions for sensors.
Original behaviour
===================
The file `includes/discovery/functions.inc.php` contains
`sensor_limit_low()` and `sensor_limit()` which both attempt to
guess a sane value for sensors when no explicitly defined
low_limit or high_limit can be found during discovery.
Both switch control structures used in those two functions
have empty case statements which means that if one of those matches,
it's going to fall through and run the code for each subsequent
case until a `break` is reached.
For example, when we call `function sensor_low_limit(dbm, -13.036)`
it will return the value `-12.3842` instead of `null`. That is
because there will be a match at `case 'dbm':` which falls through
all the way to `case 'cooling':`, where it performs
`$limit = -13.036 * 0.95` before hitting a `break`.
Changed behaviour
===================
Removed `power_consumed` and `count` guessed low_limit and
high_limit, I personally added those sensor classes in PR #9471
when I didn't understand that a switch control structure has
fall-through behaviour so I can guarantee that guessing limits for
those is a mistake on my behalf. It should not be there, only
power_factor can have guessed limits. Apologies for the issue,
I'm still a beginning programmer!
Furthermore, I removed guessed high_limit values for `current`
and `power` because these are supposed to draw higher values as
more devices or components are installed on for example a PDU or
a chassis.
Finally, I removed guessed low_limit and high_limit for `dbm`
sensors, there is a much too large variance in power budget on
commercially available optical transceivers for there to be a
sensible window where you can guess these values.
* Documentation on adding sensor classes.
* Update test data - sensor limit changes @ 30212d2
2019-06-21 14:03:27 +00:00
|
|
|
"group": null,
|
2019-02-16 14:01:32 +00:00
|
|
|
"sensor_divisor": 1,
|
|
|
|
|
"sensor_multiplier": 1,
|
|
|
|
|
"sensor_current": 6,
|
|
|
|
|
"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,
|
2020-04-22 06:23:51 +00:00
|
|
|
"state_name": "jnxFruTable"
|
2019-02-16 14:01:32 +00:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"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",
|
2020-04-22 06:23:51 +00:00
|
|
|
"sensor_index": "jnxFruName.9.1.0.0",
|
|
|
|
|
"sensor_type": "jnxFruTable",
|
2019-02-16 14:01:32 +00:00
|
|
|
"sensor_descr": "Routing Engine 0",
|
Remove guessed limits for some health sensors, documentation for sensor classes (#10327)
* Default to null for group yaml discovery.
* Update test data for a154bda yaml group null fix.
* Changes to guessed limit functions for sensors.
Original behaviour
===================
The file `includes/discovery/functions.inc.php` contains
`sensor_limit_low()` and `sensor_limit()` which both attempt to
guess a sane value for sensors when no explicitly defined
low_limit or high_limit can be found during discovery.
Both switch control structures used in those two functions
have empty case statements which means that if one of those matches,
it's going to fall through and run the code for each subsequent
case until a `break` is reached.
For example, when we call `function sensor_low_limit(dbm, -13.036)`
it will return the value `-12.3842` instead of `null`. That is
because there will be a match at `case 'dbm':` which falls through
all the way to `case 'cooling':`, where it performs
`$limit = -13.036 * 0.95` before hitting a `break`.
Changed behaviour
===================
Removed `power_consumed` and `count` guessed low_limit and
high_limit, I personally added those sensor classes in PR #9471
when I didn't understand that a switch control structure has
fall-through behaviour so I can guarantee that guessing limits for
those is a mistake on my behalf. It should not be there, only
power_factor can have guessed limits. Apologies for the issue,
I'm still a beginning programmer!
Furthermore, I removed guessed high_limit values for `current`
and `power` because these are supposed to draw higher values as
more devices or components are installed on for example a PDU or
a chassis.
Finally, I removed guessed low_limit and high_limit for `dbm`
sensors, there is a much too large variance in power budget on
commercially available optical transceivers for there to be a
sensible window where you can guess these values.
* Documentation on adding sensor classes.
* Update test data - sensor limit changes @ 30212d2
2019-06-21 14:03:27 +00:00
|
|
|
"group": null,
|
2019-02-16 14:01:32 +00:00
|
|
|
"sensor_divisor": 1,
|
|
|
|
|
"sensor_multiplier": 1,
|
|
|
|
|
"sensor_current": 6,
|
|
|
|
|
"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,
|
2020-04-22 06:23:51 +00:00
|
|
|
"state_name": "jnxFruTable"
|
2019-02-16 14:01:32 +00:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"sensor_deleted": 0,
|
|
|
|
|
"sensor_class": "state",
|
|
|
|
|
"poller_type": "snmp",
|
|
|
|
|
"sensor_oid": ".1.3.6.1.4.1.2636.3.4.2.3.1.0",
|
|
|
|
|
"sensor_index": "0",
|
|
|
|
|
"sensor_type": "jnxRedAlarmState",
|
|
|
|
|
"sensor_descr": "Red Alarm",
|
Remove guessed limits for some health sensors, documentation for sensor classes (#10327)
* Default to null for group yaml discovery.
* Update test data for a154bda yaml group null fix.
* Changes to guessed limit functions for sensors.
Original behaviour
===================
The file `includes/discovery/functions.inc.php` contains
`sensor_limit_low()` and `sensor_limit()` which both attempt to
guess a sane value for sensors when no explicitly defined
low_limit or high_limit can be found during discovery.
Both switch control structures used in those two functions
have empty case statements which means that if one of those matches,
it's going to fall through and run the code for each subsequent
case until a `break` is reached.
For example, when we call `function sensor_low_limit(dbm, -13.036)`
it will return the value `-12.3842` instead of `null`. That is
because there will be a match at `case 'dbm':` which falls through
all the way to `case 'cooling':`, where it performs
`$limit = -13.036 * 0.95` before hitting a `break`.
Changed behaviour
===================
Removed `power_consumed` and `count` guessed low_limit and
high_limit, I personally added those sensor classes in PR #9471
when I didn't understand that a switch control structure has
fall-through behaviour so I can guarantee that guessing limits for
those is a mistake on my behalf. It should not be there, only
power_factor can have guessed limits. Apologies for the issue,
I'm still a beginning programmer!
Furthermore, I removed guessed high_limit values for `current`
and `power` because these are supposed to draw higher values as
more devices or components are installed on for example a PDU or
a chassis.
Finally, I removed guessed low_limit and high_limit for `dbm`
sensors, there is a much too large variance in power budget on
commercially available optical transceivers for there to be a
sensible window where you can guess these values.
* Documentation on adding sensor classes.
* Update test data - sensor limit changes @ 30212d2
2019-06-21 14:03:27 +00:00
|
|
|
"group": null,
|
2019-02-16 14:01:32 +00:00
|
|
|
"sensor_divisor": 1,
|
|
|
|
|
"sensor_multiplier": 1,
|
|
|
|
|
"sensor_current": 2,
|
|
|
|
|
"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": "jnxRedAlarmState"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"sensor_deleted": 0,
|
|
|
|
|
"sensor_class": "state",
|
|
|
|
|
"poller_type": "snmp",
|
|
|
|
|
"sensor_oid": ".1.3.6.1.4.1.2636.3.4.2.2.1.0",
|
|
|
|
|
"sensor_index": "0",
|
|
|
|
|
"sensor_type": "jnxYellowAlarmState",
|
|
|
|
|
"sensor_descr": "Yellow Alarm",
|
Remove guessed limits for some health sensors, documentation for sensor classes (#10327)
* Default to null for group yaml discovery.
* Update test data for a154bda yaml group null fix.
* Changes to guessed limit functions for sensors.
Original behaviour
===================
The file `includes/discovery/functions.inc.php` contains
`sensor_limit_low()` and `sensor_limit()` which both attempt to
guess a sane value for sensors when no explicitly defined
low_limit or high_limit can be found during discovery.
Both switch control structures used in those two functions
have empty case statements which means that if one of those matches,
it's going to fall through and run the code for each subsequent
case until a `break` is reached.
For example, when we call `function sensor_low_limit(dbm, -13.036)`
it will return the value `-12.3842` instead of `null`. That is
because there will be a match at `case 'dbm':` which falls through
all the way to `case 'cooling':`, where it performs
`$limit = -13.036 * 0.95` before hitting a `break`.
Changed behaviour
===================
Removed `power_consumed` and `count` guessed low_limit and
high_limit, I personally added those sensor classes in PR #9471
when I didn't understand that a switch control structure has
fall-through behaviour so I can guarantee that guessing limits for
those is a mistake on my behalf. It should not be there, only
power_factor can have guessed limits. Apologies for the issue,
I'm still a beginning programmer!
Furthermore, I removed guessed high_limit values for `current`
and `power` because these are supposed to draw higher values as
more devices or components are installed on for example a PDU or
a chassis.
Finally, I removed guessed low_limit and high_limit for `dbm`
sensors, there is a much too large variance in power budget on
commercially available optical transceivers for there to be a
sensible window where you can guess these values.
* Documentation on adding sensor classes.
* Update test data - sensor limit changes @ 30212d2
2019-06-21 14:03:27 +00:00
|
|
|
"group": null,
|
2019-02-16 14:01:32 +00:00
|
|
|
"sensor_divisor": 1,
|
|
|
|
|
"sensor_multiplier": 1,
|
|
|
|
|
"sensor_current": 2,
|
|
|
|
|
"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": "jnxYellowAlarmState"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"sensor_deleted": 0,
|
|
|
|
|
"sensor_class": "temperature",
|
|
|
|
|
"poller_type": "snmp",
|
|
|
|
|
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.13.1.7.7.1.0.0",
|
|
|
|
|
"sensor_index": "7.1.0.0",
|
|
|
|
|
"sensor_type": "junos",
|
|
|
|
|
"sensor_descr": "FPC: EX3400-48T @ 0/*/*",
|
|
|
|
|
"group": null,
|
|
|
|
|
"sensor_divisor": 1,
|
|
|
|
|
"sensor_multiplier": 1,
|
|
|
|
|
"sensor_current": 35,
|
|
|
|
|
"sensor_limit": 55,
|
|
|
|
|
"sensor_limit_warn": null,
|
|
|
|
|
"sensor_limit_low": 25,
|
|
|
|
|
"sensor_limit_low_warn": null,
|
|
|
|
|
"sensor_alert": 1,
|
|
|
|
|
"sensor_custom": "No",
|
|
|
|
|
"entPhysicalIndex": null,
|
|
|
|
|
"entPhysicalIndex_measured": null,
|
|
|
|
|
"sensor_prev": null,
|
|
|
|
|
"user_func": null,
|
|
|
|
|
"state_name": null
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"sensor_deleted": 0,
|
|
|
|
|
"sensor_class": "temperature",
|
|
|
|
|
"poller_type": "snmp",
|
|
|
|
|
"sensor_oid": ".1.3.6.1.4.1.2636.3.1.13.1.7.9.1.0.0",
|
|
|
|
|
"sensor_index": "9.1.0.0",
|
|
|
|
|
"sensor_type": "junos",
|
|
|
|
|
"sensor_descr": "Routing Engine 0",
|
|
|
|
|
"group": null,
|
|
|
|
|
"sensor_divisor": 1,
|
|
|
|
|
"sensor_multiplier": 1,
|
|
|
|
|
"sensor_current": 35,
|
|
|
|
|
"sensor_limit": 55,
|
|
|
|
|
"sensor_limit_warn": null,
|
|
|
|
|
"sensor_limit_low": 25,
|
|
|
|
|
"sensor_limit_low_warn": null,
|
|
|
|
|
"sensor_alert": 1,
|
|
|
|
|
"sensor_custom": "No",
|
|
|
|
|
"entPhysicalIndex": null,
|
|
|
|
|
"entPhysicalIndex_measured": null,
|
|
|
|
|
"sensor_prev": null,
|
|
|
|
|
"user_func": null,
|
|
|
|
|
"state_name": null
|
|
|
|
|
}
|
|
|
|
|
],
|
|
|
|
|
"state_indexes": [
|
|
|
|
|
{
|
2020-04-22 06:23:51 +00:00
|
|
|
"state_name": "jnxFruTable",
|
2019-02-16 14:01:32 +00:00
|
|
|
"state_descr": "unknown",
|
|
|
|
|
"state_draw_graph": 1,
|
|
|
|
|
"state_value": 1,
|
|
|
|
|
"state_generic_value": 3
|
|
|
|
|
},
|
|
|
|
|
{
|
2020-04-22 06:23:51 +00:00
|
|
|
"state_name": "jnxFruTable",
|
2019-02-16 14:01:32 +00:00
|
|
|
"state_descr": "empty",
|
|
|
|
|
"state_draw_graph": 1,
|
|
|
|
|
"state_value": 2,
|
|
|
|
|
"state_generic_value": 3
|
|
|
|
|
},
|
|
|
|
|
{
|
2020-04-22 06:23:51 +00:00
|
|
|
"state_name": "jnxFruTable",
|
2019-02-16 14:01:32 +00:00
|
|
|
"state_descr": "present",
|
|
|
|
|
"state_draw_graph": 1,
|
|
|
|
|
"state_value": 3,
|
|
|
|
|
"state_generic_value": 1
|
|
|
|
|
},
|
|
|
|
|
{
|
2020-04-22 06:23:51 +00:00
|
|
|
"state_name": "jnxFruTable",
|
2019-02-16 14:01:32 +00:00
|
|
|
"state_descr": "ready",
|
|
|
|
|
"state_draw_graph": 1,
|
|
|
|
|
"state_value": 4,
|
|
|
|
|
"state_generic_value": 0
|
|
|
|
|
},
|
|
|
|
|
{
|
2020-04-22 06:23:51 +00:00
|
|
|
"state_name": "jnxFruTable",
|
2019-02-16 14:01:32 +00:00
|
|
|
"state_descr": "announceOnline",
|
|
|
|
|
"state_draw_graph": 1,
|
|
|
|
|
"state_value": 5,
|
|
|
|
|
"state_generic_value": 0
|
|
|
|
|
},
|
|
|
|
|
{
|
2020-04-22 06:23:51 +00:00
|
|
|
"state_name": "jnxFruTable",
|
2019-02-16 14:01:32 +00:00
|
|
|
"state_descr": "online",
|
|
|
|
|
"state_draw_graph": 1,
|
|
|
|
|
"state_value": 6,
|
|
|
|
|
"state_generic_value": 0
|
|
|
|
|
},
|
|
|
|
|
{
|
2020-04-22 06:23:51 +00:00
|
|
|
"state_name": "jnxFruTable",
|
2019-02-16 14:01:32 +00:00
|
|
|
"state_descr": "anounceOffline",
|
|
|
|
|
"state_draw_graph": 1,
|
|
|
|
|
"state_value": 7,
|
|
|
|
|
"state_generic_value": 1
|
|
|
|
|
},
|
|
|
|
|
{
|
2020-04-22 06:23:51 +00:00
|
|
|
"state_name": "jnxFruTable",
|
2019-02-16 14:01:32 +00:00
|
|
|
"state_descr": "offline",
|
|
|
|
|
"state_draw_graph": 1,
|
|
|
|
|
"state_value": 8,
|
|
|
|
|
"state_generic_value": 2
|
|
|
|
|
},
|
|
|
|
|
{
|
2020-04-22 06:23:51 +00:00
|
|
|
"state_name": "jnxFruTable",
|
2019-02-16 14:01:32 +00:00
|
|
|
"state_descr": "diagnostic",
|
|
|
|
|
"state_draw_graph": 1,
|
|
|
|
|
"state_value": 9,
|
|
|
|
|
"state_generic_value": 3
|
|
|
|
|
},
|
|
|
|
|
{
|
2020-04-22 06:23:51 +00:00
|
|
|
"state_name": "jnxFruTable",
|
2019-02-16 14:01:32 +00:00
|
|
|
"state_descr": "standby",
|
|
|
|
|
"state_draw_graph": 1,
|
|
|
|
|
"state_value": 10,
|
|
|
|
|
"state_generic_value": 3
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"state_name": "jnxRedAlarmState",
|
|
|
|
|
"state_descr": "unknown",
|
|
|
|
|
"state_draw_graph": 1,
|
|
|
|
|
"state_value": 1,
|
|
|
|
|
"state_generic_value": 3
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"state_name": "jnxRedAlarmState",
|
|
|
|
|
"state_descr": "off",
|
|
|
|
|
"state_draw_graph": 1,
|
|
|
|
|
"state_value": 2,
|
|
|
|
|
"state_generic_value": 0
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"state_name": "jnxRedAlarmState",
|
|
|
|
|
"state_descr": "on",
|
|
|
|
|
"state_draw_graph": 1,
|
|
|
|
|
"state_value": 3,
|
|
|
|
|
"state_generic_value": 2
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"state_name": "jnxYellowAlarmState",
|
|
|
|
|
"state_descr": "unknown",
|
|
|
|
|
"state_draw_graph": 1,
|
|
|
|
|
"state_value": 1,
|
|
|
|
|
"state_generic_value": 3
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"state_name": "jnxYellowAlarmState",
|
|
|
|
|
"state_descr": "off",
|
|
|
|
|
"state_draw_graph": 1,
|
|
|
|
|
"state_value": 2,
|
|
|
|
|
"state_generic_value": 0
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"state_name": "jnxYellowAlarmState",
|
|
|
|
|
"state_descr": "on",
|
|
|
|
|
"state_draw_graph": 1,
|
|
|
|
|
"state_value": 3,
|
|
|
|
|
"state_generic_value": 2
|
2018-02-05 13:39:13 +00:00
|
|
|
}
|
|
|
|
|
]
|
|
|
|
|
},
|
|
|
|
|
"poller": "matches discovery"
|
|
|
|
|
}
|
|
|
|
|
}
|