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

CyberPower UPS Updates (#12827) 

1) Update to latest MIB (v2.2 => v2.9)
2) Correct scaling factors (matching updated info in MIB)
3) Add Load - confirmed to work
4) Update header, show Load, not Current (due to data availability)
This commit is contained in:
Russell Morris 2021-05-12 21:55:01 -05:00 committed by GitHub
parent d10a3db5e0
commit 500b0ac6fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11978 additions and 10810 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/definitions/cyberpower.yaml
View File

@ -3,8 +3,8 @@ text: Cyberpower
type: power
icon: cyberpower
over:
- { graph: device_current, text: Current }
- { graph: device_voltage, text: Voltage }
- { graph: device_load, text: Load }
discovery:
-
sysObjectID:

9
includes/definitions/discovery/cyberpower.yaml
View File

@ -78,6 +78,7 @@ modules:
num_oid: '.1.3.6.1.4.1.3808.1.1.1.4.2.4.{{ $index }}'
index: 'upsAdvanceOutputCurrent.{{ $index }}'
descr: 'Output'
divisor: 10
voltage:
data:
-
@ -85,6 +86,7 @@ modules:
num_oid: '.1.3.6.1.4.1.3808.1.1.1.2.2.2.{{ $index }}'
index: 'upsAdvanceBatteryVoltage.{{ $index }}'
descr: 'Battery Voltage'
divisor: 10
-
oid: upsAdvanceInputLineVoltage
num_oid: '.1.3.6.1.4.1.3808.1.1.1.3.2.1.{{ $index }}'
@ -97,6 +99,13 @@ modules:
index: 'upsAdvanceOutputVoltage.{{ $index }}'
descr: 'Output Voltage'
divisor: 10
load:
data:
-
oid: upsAdvanceOutputLoad
num_oid: '.1.3.6.1.4.1.3808.1.1.1.4.2.3.{{ $index }}'
index: 'upsAdvanceOutputLoad.{{ $index }}'
descr: 'Load'
temperature:
data:
-

22277
mibs/cyberpower/CPS-MIB
View File

File diff suppressed because it is too large Load Diff

4
tests/data/cyberpower.json
View File

@ -56,9 +56,9 @@
"sensor_type": "cyberpower",
"sensor_descr": "Output",
"group": null,
"sensor_divisor": 1,
"sensor_divisor": 10,
"sensor_multiplier": 1,
"sensor_current": 65,
"sensor_current": 6.5,
"sensor_limit": null,
"sensor_limit_warn": null,
"sensor_limit_low": null,

467
tests/data/cyberpower_cp1000pfclcd.json Normal file
View File

@ -0,0 +1,467 @@
{
"os": {
"discovery": {
"devices": [
{
"sysName": "<private>",
"sysObjectID": ".1.3.6.1.4.1.3808",
"sysDescr": "UPS Local",
"sysContact": "<private>",
"version": "CRDA103_261",
"hardware": "CP1000PFCLCD",
"features": null,
"os": "cyberpower",
"type": "power",
"serial": null,
"icon": "cyberpower.svg",
"location": "<private>"
}
]
},
"poller": "matches discovery"
},
"sensors": {
"discovery": {
"sensors": [
{
"sensor_deleted": 0,
"sensor_class": "charge",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.3808.1.1.1.2.2.1.0",
"sensor_index": "upsAdvanceBatteryCapacity.0",
"sensor_type": "cyberpower",
"user_func": null,
"sensor_descr": "Battery Capacity",
"group": null,
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 100,
"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,
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "frequency",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.3808.1.1.1.4.2.2.0",
"sensor_index": "upsAdvanceOutputFrequency.0",
"sensor_type": "cyberpower",
"user_func": null,
"sensor_descr": "Output",
"group": null,
"sensor_divisor": 10,
"sensor_multiplier": 1,
"sensor_current": 0,
"sensor_limit": 0,
"sensor_limit_warn": null,
"sensor_limit_low": 0,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "load",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.3808.1.1.1.4.2.3.0",
"sensor_index": "upsAdvanceOutputLoad.0",
"sensor_type": "cyberpower",
"user_func": null,
"sensor_descr": "Load",
"group": null,
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 24,
"sensor_limit": 80,
"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,
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "runtime",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.3808.1.1.1.2.2.4.0",
"sensor_index": "upsAdvanceBatteryRunTimeRemaining.0",
"sensor_type": "cyberpower",
"user_func": null,
"sensor_descr": "Battery Runtime",
"group": null,
"sensor_divisor": 6000,
"sensor_multiplier": 1,
"sensor_current": 20,
"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,
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.3808.1.1.1.2.2.5.0",
"sensor_index": "upsAdvanceBatteryReplaceIndicator.0",
"sensor_type": "upsAdvanceBatteryReplaceIndicator",
"user_func": null,
"sensor_descr": "Battery Replace Indicator",
"group": null,
"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,
"state_name": "upsAdvanceBatteryReplaceIndicator"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.3808.1.1.1.3.2.5.0",
"sensor_index": "upsAdvanceInputLineFailCause.0",
"sensor_type": "upsAdvanceInputLineFailCause",
"user_func": null,
"sensor_descr": "Input Line Cause",
"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,
"state_name": "upsAdvanceInputLineFailCause"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.3808.1.1.1.3.2.6.0",
"sensor_index": "upsAdvanceInputStatus.0",
"sensor_type": "upsAdvanceInputStatus",
"user_func": null,
"sensor_descr": "Input Status",
"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,
"state_name": "upsAdvanceInputStatus"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.3808.1.1.1.2.1.1.0",
"sensor_index": "upsBaseBatteryStatus.0",
"sensor_type": "upsBaseBatteryStatus",
"user_func": null,
"sensor_descr": "Battery Status",
"group": null,
"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,
"state_name": "upsBaseBatteryStatus"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.3808.1.1.1.4.1.1.0",
"sensor_index": "upsBaseOutputStatus.0",
"sensor_type": "upsBaseOutputStatus",
"user_func": null,
"sensor_descr": "Output Status",
"group": null,
"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,
"state_name": "upsBaseOutputStatus"
},
{
"sensor_deleted": 0,
"sensor_class": "voltage",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.3808.1.1.1.2.2.2.0",
"sensor_index": "upsAdvanceBatteryVoltage.0",
"sensor_type": "cyberpower",
"user_func": null,
"sensor_descr": "Battery Voltage",
"group": null,
"sensor_divisor": 10,
"sensor_multiplier": 1,
"sensor_current": 24,
"sensor_limit": 27.6,
"sensor_limit_warn": null,
"sensor_limit_low": 20.4,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "voltage",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.3808.1.1.1.3.2.1.0",
"sensor_index": "upsAdvanceInputLineVoltage.0",
"sensor_type": "cyberpower",
"user_func": null,
"sensor_descr": "Input Line Voltage",
"group": null,
"sensor_divisor": 10,
"sensor_multiplier": 1,
"sensor_current": 123,
"sensor_limit": 141.45,
"sensor_limit_warn": null,
"sensor_limit_low": 104.55,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "voltage",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.3808.1.1.1.4.2.1.0",
"sensor_index": "upsAdvanceOutputVoltage.0",
"sensor_type": "cyberpower",
"user_func": null,
"sensor_descr": "Output Voltage",
"group": null,
"sensor_divisor": 10,
"sensor_multiplier": 1,
"sensor_current": 123,
"sensor_limit": 141.45,
"sensor_limit_warn": null,
"sensor_limit_low": 104.55,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"state_name": null
}
],
"state_indexes": [
{
"state_name": "upsAdvanceBatteryReplaceIndicator",
"state_descr": "No",
"state_draw_graph": 1,
"state_value": 1,
"state_generic_value": 0
},
{
"state_name": "upsAdvanceBatteryReplaceIndicator",
"state_descr": "Replace",
"state_draw_graph": 1,
"state_value": 2,
"state_generic_value": 2
},
{
"state_name": "upsAdvanceInputLineFailCause",
"state_descr": "No Transfer",
"state_draw_graph": 1,
"state_value": 1,
"state_generic_value": 0
},
{
"state_name": "upsAdvanceInputLineFailCause",
"state_descr": "High Voltage",
"state_draw_graph": 1,
"state_value": 2,
"state_generic_value": 2
},
{
"state_name": "upsAdvanceInputLineFailCause",
"state_descr": "Brown Out",
"state_draw_graph": 1,
"state_value": 3,
"state_generic_value": 2
},
{
"state_name": "upsAdvanceInputLineFailCause",
"state_descr": "Self Test",
"state_draw_graph": 1,
"state_value": 4,
"state_generic_value": 1
},
{
"state_name": "upsAdvanceInputStatus",
"state_descr": "Normal",
"state_draw_graph": 1,
"state_value": 1,
"state_generic_value": 0
},
{
"state_name": "upsAdvanceInputStatus",
"state_descr": "Over Voltage",
"state_draw_graph": 1,
"state_value": 2,
"state_generic_value": 2
},
{
"state_name": "upsAdvanceInputStatus",
"state_descr": "Under Voltage",
"state_draw_graph": 1,
"state_value": 3,
"state_generic_value": 2
},
{
"state_name": "upsAdvanceInputStatus",
"state_descr": "Frequency Failure",
"state_draw_graph": 1,
"state_value": 4,
"state_generic_value": 2
},
{
"state_name": "upsAdvanceInputStatus",
"state_descr": "Blackout",
"state_draw_graph": 1,
"state_value": 5,
"state_generic_value": 2
},
{
"state_name": "upsBaseBatteryStatus",
"state_descr": "Known",
"state_draw_graph": 1,
"state_value": 1,
"state_generic_value": 3
},
{
"state_name": "upsBaseBatteryStatus",
"state_descr": "Normal",
"state_draw_graph": 1,
"state_value": 2,
"state_generic_value": 0
},
{
"state_name": "upsBaseBatteryStatus",
"state_descr": "Low",
"state_draw_graph": 1,
"state_value": 3,
"state_generic_value": 2
},
{
"state_name": "upsBaseOutputStatus",
"state_descr": "Unknown",
"state_draw_graph": 1,
"state_value": 1,
"state_generic_value": 3
},
{
"state_name": "upsBaseOutputStatus",
"state_descr": "Online",
"state_draw_graph": 1,
"state_value": 2,
"state_generic_value": 0
},
{
"state_name": "upsBaseOutputStatus",
"state_descr": "On Battery",
"state_draw_graph": 1,
"state_value": 3,
"state_generic_value": 2
},
{
"state_name": "upsBaseOutputStatus",
"state_descr": "On Boost",
"state_draw_graph": 1,
"state_value": 4,
"state_generic_value": 1
},
{
"state_name": "upsBaseOutputStatus",
"state_descr": "On Sleep",
"state_draw_graph": 1,
"state_value": 5,
"state_generic_value": 1
},
{
"state_name": "upsBaseOutputStatus",
"state_descr": "Off",
"state_draw_graph": 1,
"state_value": 6,
"state_generic_value": 2
},
{
"state_name": "upsBaseOutputStatus",
"state_descr": "Rebooting",
"state_draw_graph": 1,
"state_value": 7,
"state_generic_value": 1
}
]
},
"poller": "matches discovery"
}
}

29
tests/snmpsim/cyberpower_cp1000pfclcd.snmprec Normal file
View File

@ -0,0 +1,29 @@
1.3.6.1.2.1.1.1.0|4|UPS Local
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.3808
1.3.6.1.2.1.1.3.0|67|24754169
1.3.6.1.2.1.1.4.0|4|<private>
1.3.6.1.2.1.1.5.0|4|<private>
1.3.6.1.2.1.1.6.0|4|<private>
1.3.6.1.2.1.11.1.0|65|33949
1.3.6.1.2.1.11.3.0|65|0
1.3.6.1.2.1.11.4.0|65|0
1.3.6.1.2.1.11.5.0|65|0
1.3.6.1.2.1.11.6.0|65|0
1.3.6.1.2.1.11.30.0|2|2
1.3.6.1.2.1.11.31.0|65|0
1.3.6.1.2.1.11.32.0|65|0
1.3.6.1.2.1.33.1.1.1.0|4|CPS
1.3.6.1.4.1.3808.1.1.1.1.1.1.0|4|CP1000PFCLCD
1.3.6.1.4.1.3808.1.1.1.1.2.1.0|4|CRDA103_261
1.3.6.1.4.1.3808.1.1.1.2.1.1.0|2|2
1.3.6.1.4.1.3808.1.1.1.2.2.1.0|66|100
1.3.6.1.4.1.3808.1.1.1.2.2.2.0|2|240
1.3.6.1.4.1.3808.1.1.1.2.2.4.0|67|120000
1.3.6.1.4.1.3808.1.1.1.2.2.5.0|2|2
1.3.6.1.4.1.3808.1.1.1.3.2.1.0|66|1230
1.3.6.1.4.1.3808.1.1.1.3.2.5.0|2|1
1.3.6.1.4.1.3808.1.1.1.3.2.6.0|2|1
1.3.6.1.4.1.3808.1.1.1.4.1.1.0|2|2
1.3.6.1.4.1.3808.1.1.1.4.2.1.0|66|1230
1.3.6.1.4.1.3808.1.1.1.4.2.2.0|66|0
1.3.6.1.4.1.3808.1.1.1.4.2.3.0|66|24