clones/librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-09-21 10:28:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add discovery for APC EPDU1132M (#13545)

Browse Source 
* Initial discovery for APC EPDU1132M

* Rename current APC ePDU model to specific

* Add more conditions to test

* Ignore APC ePDU

* Add version field

* Update version in test file

* Add JSON test data

Also remove hostname (was literal question mark), was causing issues
This commit is contained in:
David Girón 2021-11-25 22:40:33 +01:00 committed by GitHub
parent 6bf97c6ac9
commit 364fa540cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 459 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
includes/definitions/apc-epdu.yaml
View File

@ -10,3 +10,9 @@ over:
discovery:
- sysObjectID:
- .1.3.6.1.4.1.318.1.3.4.9
- sysObjectID:
- .1.3.6.1.4.1.0
snmpget:
oid: .1.3.6.1.6.3.10.2.1.1.0
op: '='
value: APC

2
includes/definitions/apc.yaml
View File

@ -20,3 +20,5 @@ discovery:
-
sysObjectID:
- .1.3.6.1.4.1.318.1
sysObjectID_except:
- .1.3.6.1.4.1.318.1.3.4.9

5
includes/definitions/discovery/apc-epdu.yaml
View File

@ -2,7 +2,10 @@ mib: PowerNet-MIB
modules:
os:
hardware: PowerNet-MIB::ePDUDeviceStatusModelNumber.1
version: PowerNet-MIB::ePDUDeviceStatusVersion.1
version:
- PowerNet-MIB::ePDUDeviceStatusVersion.1
- .1.3.6.1.4.1.1.1.38.1
version_regex: '/Ver(?<version>.*)/'
serial: PowerNet-MIB::ePDUDeviceStatusSerialNumber.1
sensors:
current:

2
tests/data/apc-epdu.json → tests/data/apc-epdu_epdu1116s.json
View File

@ -7,7 +7,7 @@
"sysObjectID": ".1.3.6.1.4.1.318.1.3.4.9",
"sysDescr": "EPDU1116S",
"sysContact": "<private>",
"version": "Ver11.10",
"version": "11.10",
"hardware": "EPDU1116S",
"features": null,
"os": "apc-epdu",

277
tests/data/apc-epdu_epdu1132m.json Normal file
View File

@ -0,0 +1,277 @@
{
"os": {
"discovery": {
"devices": [
{
"sysName": "",
"sysObjectID": ".1.3.6.1.4.1.0",
"sysDescr": "",
"sysContact": "<private>",
"version": "11.10",
"hardware": null,
"features": null,
"os": "apc-epdu",
"type": "power",
"serial": null,
"icon": "apc.svg",
"location": null
}
]
},
"poller": "matches discovery"
},
"ports": {
"discovery": {
"ports": [
{
"port_descr_type": null,
"port_descr_descr": null,
"port_descr_circuit": null,
"port_descr_speed": null,
"port_descr_notes": null,
"ifDescr": "en",
"ifName": "en",
"portName": null,
"ifIndex": 1,
"ifSpeed": null,
"ifSpeed_prev": null,
"ifConnectorPresent": null,
"ifPromiscuousMode": null,
"ifOperStatus": "up",
"ifOperStatus_prev": null,
"ifAdminStatus": null,
"ifAdminStatus_prev": null,
"ifDuplex": null,
"ifMtu": null,
"ifType": "0",
"ifAlias": "en",
"ifPhysAddress": null,
"ifHardType": null,
"ifLastChange": 0,
"ifVlan": "",
"ifTrunk": null,
"counter_in": null,
"counter_out": null,
"ignore": 0,
"disabled": 0,
"detailed": 0,
"deleted": 0,
"pagpOperationMode": null,
"pagpPortState": null,
"pagpPartnerDeviceId": null,
"pagpPartnerLearnMethod": null,
"pagpPartnerIfIndex": null,
"pagpPartnerGroupIfIndex": null,
"pagpPartnerDeviceName": null,
"pagpEthcOperationMode": null,
"pagpDeviceId": null,
"pagpGroupIfIndex": null,
"ifInUcastPkts": null,
"ifInUcastPkts_prev": null,
"ifInUcastPkts_delta": null,
"ifInUcastPkts_rate": null,
"ifOutUcastPkts": null,
"ifOutUcastPkts_prev": null,
"ifOutUcastPkts_delta": null,
"ifOutUcastPkts_rate": null,
"ifInErrors": null,
"ifInErrors_prev": null,
"ifInErrors_delta": null,
"ifInErrors_rate": null,
"ifOutErrors": null,
"ifOutErrors_prev": null,
"ifOutErrors_delta": null,
"ifOutErrors_rate": null,
"ifInOctets": null,
"ifInOctets_prev": null,
"ifInOctets_delta": null,
"ifInOctets_rate": null,
"ifOutOctets": null,
"ifOutOctets_prev": null,
"ifOutOctets_delta": null,
"ifOutOctets_rate": null,
"poll_prev": null,
"ifInNUcastPkts": null,
"ifInNUcastPkts_prev": null,
"ifInNUcastPkts_delta": null,
"ifInNUcastPkts_rate": null,
"ifOutNUcastPkts": null,
"ifOutNUcastPkts_prev": null,
"ifOutNUcastPkts_delta": null,
"ifOutNUcastPkts_rate": null,
"ifInDiscards": null,
"ifInDiscards_prev": null,
"ifInDiscards_delta": null,
"ifInDiscards_rate": null,
"ifOutDiscards": null,
"ifOutDiscards_prev": null,
"ifOutDiscards_delta": null,
"ifOutDiscards_rate": null,
"ifInUnknownProtos": null,
"ifInUnknownProtos_prev": null,
"ifInUnknownProtos_delta": null,
"ifInUnknownProtos_rate": null,
"ifInBroadcastPkts": null,
"ifInBroadcastPkts_prev": null,
"ifInBroadcastPkts_delta": null,
"ifInBroadcastPkts_rate": null,
"ifOutBroadcastPkts": null,
"ifOutBroadcastPkts_prev": null,
"ifOutBroadcastPkts_delta": null,
"ifOutBroadcastPkts_rate": null,
"ifInMulticastPkts": null,
"ifInMulticastPkts_prev": null,
"ifInMulticastPkts_delta": null,
"ifInMulticastPkts_rate": null,
"ifOutMulticastPkts": null,
"ifOutMulticastPkts_prev": null,
"ifOutMulticastPkts_delta": null,
"ifOutMulticastPkts_rate": null
}
]
},
"poller": {
"ports": [
{
"port_descr_type": null,
"port_descr_descr": null,
"port_descr_circuit": null,
"port_descr_speed": null,
"port_descr_notes": null,
"ifDescr": "en",
"ifName": "en",
"portName": null,
"ifIndex": 1,
"ifSpeed": 0,
"ifSpeed_prev": null,
"ifConnectorPresent": null,
"ifPromiscuousMode": null,
"ifOperStatus": "up",
"ifOperStatus_prev": "up",
"ifAdminStatus": "up",
"ifAdminStatus_prev": null,
"ifDuplex": null,
"ifMtu": 1500,
"ifType": "0",
"ifAlias": "en",
"ifPhysAddress": "506255600c2c",
"ifHardType": null,
"ifLastChange": 532,
"ifVlan": "",
"ifTrunk": null,
"counter_in": null,
"counter_out": null,
"ignore": 0,
"disabled": 0,
"detailed": 0,
"deleted": 0,
"pagpOperationMode": null,
"pagpPortState": null,
"pagpPartnerDeviceId": null,
"pagpPartnerLearnMethod": null,
"pagpPartnerIfIndex": null,
"pagpPartnerGroupIfIndex": null,
"pagpPartnerDeviceName": null,
"pagpEthcOperationMode": null,
"pagpDeviceId": null,
"pagpGroupIfIndex": null,
"ifInUcastPkts": 0,
"ifInUcastPkts_prev": 0,
"ifInUcastPkts_delta": null,
"ifInUcastPkts_rate": null,
"ifOutUcastPkts": 0,
"ifOutUcastPkts_prev": 0,
"ifOutUcastPkts_delta": null,
"ifOutUcastPkts_rate": null,
"ifInErrors": 0,
"ifInErrors_prev": 0,
"ifInErrors_delta": null,
"ifInErrors_rate": null,
"ifOutErrors": 0,
"ifOutErrors_prev": 0,
"ifOutErrors_delta": null,
"ifOutErrors_rate": null,
"ifInOctets": 0,
"ifInOctets_prev": 0,
"ifInOctets_delta": null,
"ifInOctets_rate": null,
"ifOutOctets": 0,
"ifOutOctets_prev": 0,
"ifOutOctets_delta": null,
"ifOutOctets_rate": null,
"poll_prev": null,
"ifInNUcastPkts": 0,
"ifInNUcastPkts_prev": 0,
"ifInNUcastPkts_delta": null,
"ifInNUcastPkts_rate": null,
"ifOutNUcastPkts": 0,
"ifOutNUcastPkts_prev": 0,
"ifOutNUcastPkts_delta": null,
"ifOutNUcastPkts_rate": null,
"ifInDiscards": 0,
"ifInDiscards_prev": 0,
"ifInDiscards_delta": null,
"ifInDiscards_rate": null,
"ifOutDiscards": 0,
"ifOutDiscards_prev": 0,
"ifOutDiscards_delta": null,
"ifOutDiscards_rate": null,
"ifInUnknownProtos": 0,
"ifInUnknownProtos_prev": 0,
"ifInUnknownProtos_delta": null,
"ifInUnknownProtos_rate": null,
"ifInBroadcastPkts": 0,
"ifInBroadcastPkts_prev": 0,
"ifInBroadcastPkts_delta": null,
"ifInBroadcastPkts_rate": null,
"ifOutBroadcastPkts": 0,
"ifOutBroadcastPkts_prev": 0,
"ifOutBroadcastPkts_delta": null,
"ifOutBroadcastPkts_rate": null,
"ifInMulticastPkts": 0,
"ifInMulticastPkts_prev": 0,
"ifInMulticastPkts_delta": null,
"ifInMulticastPkts_rate": null,
"ifOutMulticastPkts": 0,
"ifOutMulticastPkts_prev": 0,
"ifOutMulticastPkts_delta": null,
"ifOutMulticastPkts_rate": null
}
]
}
},
"route": {
"discovery": {
"route": [
{
"context_name": "",
"inetCidrRouteIfIndex": 1,
"inetCidrRouteType": 4,
"inetCidrRouteProto": 2,
"inetCidrRouteNextHopAS": 0,
"inetCidrRouteMetric1": 1,
"inetCidrRouteDestType": "ipv4",
"inetCidrRouteDest": "0.0.0.0",
"inetCidrRouteNextHopType": "ipv4",
"inetCidrRouteNextHop": "192.168.2.1",
"inetCidrRoutePolicy": "ccitt.0",
"inetCidrRoutePfxLen": 0
},
{
"context_name": "",
"inetCidrRouteIfIndex": 1,
"inetCidrRouteType": 3,
"inetCidrRouteProto": 2,
"inetCidrRouteNextHopAS": 0,
"inetCidrRouteMetric1": 0,
"inetCidrRouteDestType": "ipv4",
"inetCidrRouteDest": "192.168.2.0",
"inetCidrRouteNextHopType": "ipv4",
"inetCidrRouteNextHop": "192.168.2.160",
"inetCidrRoutePolicy": "ccitt.0",
"inetCidrRoutePfxLen": 24
}
]
}
}
}

0
tests/snmpsim/apc-epdu.snmprec → tests/snmpsim/apc-epdu_epdu1116s.snmprec
View File

169
tests/snmpsim/apc-epdu_epdu1132m.snmprec Normal file
View File

@ -0,0 +1,169 @@
1.3.6.1.2.1.1.1.0|4|
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.0
1.3.6.1.2.1.1.3.0|67|160189
1.3.6.1.2.1.1.4.0|4x|3C707269766174653E
1.3.6.1.2.1.1.5.0|4|
1.3.6.1.2.1.1.6.0|4|
1.3.6.1.2.1.1.7.0|2|72
1.3.6.1.2.1.2.2.1.1.1|2|1
1.3.6.1.2.1.2.2.1.2.1|4|en
1.3.6.1.2.1.2.2.1.3.1|2|0
1.3.6.1.2.1.2.2.1.4.1|2|1500
1.3.6.1.2.1.2.2.1.5.1|66|0
1.3.6.1.2.1.2.2.1.6.1|4|PbU` ,
1.3.6.1.2.1.2.2.1.7.1|2|1
1.3.6.1.2.1.2.2.1.8.1|2|1
1.3.6.1.2.1.2.2.1.9.1|67|532
1.3.6.1.2.1.2.2.1.10.1|65|0
1.3.6.1.2.1.2.2.1.11.1|65|0
1.3.6.1.2.1.2.2.1.12.1|65|0
1.3.6.1.2.1.2.2.1.13.1|65|0
1.3.6.1.2.1.2.2.1.14.1|65|0
1.3.6.1.2.1.2.2.1.15.1|65|0
1.3.6.1.2.1.2.2.1.16.1|65|0
1.3.6.1.2.1.2.2.1.17.1|65|0
1.3.6.1.2.1.2.2.1.18.1|65|0
1.3.6.1.2.1.2.2.1.19.1|65|0
1.3.6.1.2.1.2.2.1.20.1|65|0
1.3.6.1.2.1.2.2.1.21.1|66|0
1.3.6.1.2.1.2.2.1.22.1|6|0.0
1.3.6.1.2.1.4.3.0|65|3880
1.3.6.1.2.1.4.4.0|65|0
1.3.6.1.2.1.4.5.0|65|1
1.3.6.1.2.1.4.6.0|65|0
1.3.6.1.2.1.4.7.0|65|0
1.3.6.1.2.1.4.8.0|65|1
1.3.6.1.2.1.4.9.0|65|3878
1.3.6.1.2.1.4.10.0|65|2878
1.3.6.1.2.1.4.11.0|65|0
1.3.6.1.2.1.4.12.0|65|0
1.3.6.1.2.1.4.14.0|65|0
1.3.6.1.2.1.4.15.0|65|0
1.3.6.1.2.1.4.16.0|65|0
1.3.6.1.2.1.4.17.0|65|0
1.3.6.1.2.1.4.18.0|65|0
1.3.6.1.2.1.4.19.0|65|0
1.3.6.1.2.1.4.20.1.2.192.168.2.160|2|1
1.3.6.1.2.1.4.20.1.3.192.168.2.160|64|255.255.255.0
1.3.6.1.2.1.4.21.1.1.0.0.0.0|64|0.0.0.0
1.3.6.1.2.1.4.21.1.1.192.168.2.0|64|192.168.2.0
1.3.6.1.2.1.4.21.1.2.0.0.0.0|2|1
1.3.6.1.2.1.4.21.1.2.192.168.2.0|2|1
1.3.6.1.2.1.4.21.1.3.0.0.0.0|2|1
1.3.6.1.2.1.4.21.1.3.192.168.2.0|2|0
1.3.6.1.2.1.4.21.1.4.0.0.0.0|2|-1
1.3.6.1.2.1.4.21.1.4.192.168.2.0|2|-1
1.3.6.1.2.1.4.21.1.5.0.0.0.0|2|-1
1.3.6.1.2.1.4.21.1.5.192.168.2.0|2|-1
1.3.6.1.2.1.4.21.1.6.0.0.0.0|2|-1
1.3.6.1.2.1.4.21.1.6.192.168.2.0|2|-1
1.3.6.1.2.1.4.21.1.7.0.0.0.0|64|192.168.2.1
1.3.6.1.2.1.4.21.1.7.192.168.2.0|64|192.168.2.160
1.3.6.1.2.1.4.21.1.8.0.0.0.0|2|4
1.3.6.1.2.1.4.21.1.8.192.168.2.0|2|3
1.3.6.1.2.1.4.21.1.9.0.0.0.0|2|2
1.3.6.1.2.1.4.21.1.9.192.168.2.0|2|2
1.3.6.1.2.1.4.21.1.10.0.0.0.0|2|0
1.3.6.1.2.1.4.21.1.10.192.168.2.0|2|0
1.3.6.1.2.1.4.21.1.11.0.0.0.0|64|0.0.0.0
1.3.6.1.2.1.4.21.1.11.192.168.2.0|64|255.255.255.0
1.3.6.1.2.1.4.21.1.12.0.0.0.0|2|-1
1.3.6.1.2.1.4.21.1.12.192.168.2.0|2|-1
1.3.6.1.2.1.4.21.1.13.0.0.0.0|6|0.0
1.3.6.1.2.1.4.21.1.13.192.168.2.0|6|0.0
1.3.6.1.2.1.5.1.0|65|39
1.3.6.1.2.1.5.2.0|65|0
1.3.6.1.2.1.5.3.0|65|0
1.3.6.1.2.1.5.4.0|65|0
1.3.6.1.2.1.5.5.0|65|0
1.3.6.1.2.1.5.6.0|65|0
1.3.6.1.2.1.5.7.0|65|0
1.3.6.1.2.1.5.8.0|65|38
1.3.6.1.2.1.5.9.0|65|0
1.3.6.1.2.1.5.10.0|65|1
1.3.6.1.2.1.5.11.0|65|0
1.3.6.1.2.1.5.12.0|65|0
1.3.6.1.2.1.5.13.0|65|0
1.3.6.1.2.1.5.14.0|65|43
1.3.6.1.2.1.5.15.0|65|0
1.3.6.1.2.1.5.16.0|65|5
1.3.6.1.2.1.5.17.0|65|0
1.3.6.1.2.1.5.18.0|65|0
1.3.6.1.2.1.5.19.0|65|0
1.3.6.1.2.1.5.20.0|65|0
1.3.6.1.2.1.5.21.0|65|0
1.3.6.1.2.1.5.22.0|65|38
1.3.6.1.2.1.5.23.0|65|0
1.3.6.1.2.1.5.24.0|65|0
1.3.6.1.2.1.5.25.0|65|0
1.3.6.1.2.1.5.26.0|65|0
1.3.6.1.2.1.6.5.0|65|0
1.3.6.1.2.1.6.6.0|65|242
1.3.6.1.2.1.6.7.0|65|0
1.3.6.1.2.1.6.8.0|65|205
1.3.6.1.2.1.6.9.0|66|0
1.3.6.1.2.1.6.10.0|65|2206
1.3.6.1.2.1.6.11.0|65|555
1.3.6.1.2.1.6.12.0|65|0
1.3.6.1.2.1.6.14.0|65|0
1.3.6.1.2.1.6.15.0|65|1031
1.3.6.1.2.1.6.20.1.4.1.4.0.0.0.0.80|66|0
1.3.6.1.2.1.7.1.0|65|1081
1.3.6.1.2.1.7.2.0|65|5
1.3.6.1.2.1.7.3.0|65|0
1.3.6.1.2.1.7.4.0|65|1075
1.3.6.1.2.1.11.1.0|65|1052
1.3.6.1.2.1.11.2.0|65|1051
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.8.0|65|0
1.3.6.1.2.1.11.9.0|65|0
1.3.6.1.2.1.11.10.0|65|0
1.3.6.1.2.1.11.11.0|65|0
1.3.6.1.2.1.11.12.0|65|0
1.3.6.1.2.1.11.13.0|65|1326
1.3.6.1.2.1.11.14.0|65|0
1.3.6.1.2.1.11.15.0|65|238
1.3.6.1.2.1.11.16.0|65|599
1.3.6.1.2.1.11.17.0|65|0
1.3.6.1.2.1.11.18.0|65|0
1.3.6.1.2.1.11.19.0|65|0
1.3.6.1.2.1.11.20.0|65|0
1.3.6.1.2.1.11.21.0|65|0
1.3.6.1.2.1.11.22.0|65|0
1.3.6.1.2.1.11.24.0|65|0
1.3.6.1.2.1.11.25.0|65|0
1.3.6.1.2.1.11.26.0|65|0
1.3.6.1.2.1.11.27.0|65|0
1.3.6.1.2.1.11.28.0|65|1053
1.3.6.1.2.1.11.29.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.4.1.1.1.1.1|4|232.6V
1.3.6.1.4.1.1.1.2.1|4|0.30A
1.3.6.1.4.1.1.1.3.1|4|0.061kW
1.3.6.1.4.1.1.1.6.1|4|0.856
1.3.6.1.4.1.1.1.7.1|4|2.28kWh
1.3.6.1.4.1.1.1.27.1|4|49.982Hz
1.3.6.1.4.1.1.1.28.1|4|-
1.3.6.1.4.1.1.1.29.1|4|-
1.3.6.1.4.1.1.1.30.1|4|Normal
1.3.6.1.4.1.1.1.31.1|4|Normal
1.3.6.1.4.1.1.1.36.1|4|Normal
1.3.6.1.4.1.1.1.37.1|4|Normal
1.3.6.1.4.1.1.1.38.1|4|Ver11.10
1.3.6.1.4.1.1.1.39.1|4|192.168.2.160
1.3.6.1.4.1.1.1.40.1|4|ON
1.3.6.1.4.1.1.1.41.1|4|300.0V
1.3.6.1.4.1.1.1.42.1|4|0.0V
1.3.6.1.4.1.1.1.43.1|4|32.00A
1.3.6.1.4.1.1.1.44.1|4|0.00A
1.3.6.1.4.1.1.1.53.1|4|90.0C
1.3.6.1.4.1.1.1.54.1|4|0.0C
1.3.6.1.4.1.1.1.55.1|4|90.0%RH
1.3.6.1.4.1.1.1.56.1|4|0.0%RH
1.3.6.1.6.3.10.2.1.1.0|4|APC
1.3.6.1.6.3.10.2.1.3.0|2|1557