newdevice: Added detection for Vivotek Cameras (#8165)

Fixes: #8159
This commit is contained in:
Tony Murray
2018-01-29 14:51:08 -06:00
committed by Neil Lathwood
parent 06aa3b23f2
commit d63fbd0902
5 changed files with 611 additions and 0 deletions

View File

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 38 KiB

View File

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 37 KiB

View File

@@ -0,0 +1,7 @@
os: vivotek
text: Vivotek Camera
type: camera
over:
- { graph: device_bits, text: 'Device Traffic' }
discovery:
- sysObjectID: .1.3.6.1.4.1.23465

474
tests/data/vivotek.json Normal file
View File

@@ -0,0 +1,474 @@
{
"ports": {
"discovery": {
"ports": [
{
"port_descr_type": null,
"port_descr_descr": null,
"port_descr_circuit": null,
"port_descr_speed": null,
"port_descr_notes": null,
"ifDescr": "lo0",
"ifName": "",
"portName": null,
"ifIndex": "1",
"ifSpeed": null,
"ifConnectorPresent": null,
"ifPromiscuousMode": null,
"ifHighSpeed": null,
"ifOperStatus": null,
"ifOperStatus_prev": null,
"ifAdminStatus": null,
"ifAdminStatus_prev": null,
"ifDuplex": null,
"ifMtu": null,
"ifType": null,
"ifAlias": "",
"ifPhysAddress": null,
"ifHardType": null,
"ifLastChange": "0",
"ifVlan": "",
"ifTrunk": null,
"ifVrf": "0",
"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
},
{
"port_descr_type": null,
"port_descr_descr": null,
"port_descr_circuit": null,
"port_descr_speed": null,
"port_descr_notes": null,
"ifDescr": "eth0",
"ifName": "",
"portName": null,
"ifIndex": "2",
"ifSpeed": null,
"ifConnectorPresent": null,
"ifPromiscuousMode": null,
"ifHighSpeed": null,
"ifOperStatus": null,
"ifOperStatus_prev": null,
"ifAdminStatus": null,
"ifAdminStatus_prev": null,
"ifDuplex": null,
"ifMtu": null,
"ifType": null,
"ifAlias": "",
"ifPhysAddress": null,
"ifHardType": null,
"ifLastChange": "0",
"ifVlan": "",
"ifTrunk": null,
"ifVrf": "0",
"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": "lo0",
"ifName": "lo0",
"portName": null,
"ifIndex": "1",
"ifSpeed": "10000000",
"ifConnectorPresent": null,
"ifPromiscuousMode": null,
"ifHighSpeed": null,
"ifOperStatus": "up",
"ifOperStatus_prev": null,
"ifAdminStatus": "up",
"ifAdminStatus_prev": null,
"ifDuplex": null,
"ifMtu": "0",
"ifType": "softwareLoopback",
"ifAlias": "lo0",
"ifPhysAddress": null,
"ifHardType": null,
"ifLastChange": "0",
"ifVlan": "",
"ifTrunk": null,
"ifVrf": "0",
"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
},
{
"port_descr_type": null,
"port_descr_descr": null,
"port_descr_circuit": null,
"port_descr_speed": null,
"port_descr_notes": null,
"ifDescr": "eth0",
"ifName": "eth0",
"portName": null,
"ifIndex": "2",
"ifSpeed": "10000000",
"ifConnectorPresent": null,
"ifPromiscuousMode": null,
"ifHighSpeed": null,
"ifOperStatus": "up",
"ifOperStatus_prev": null,
"ifAdminStatus": "up",
"ifAdminStatus_prev": null,
"ifDuplex": null,
"ifMtu": "1500",
"ifType": "ethernetCsmacd",
"ifAlias": "eth0",
"ifPhysAddress": "303a323a6431",
"ifHardType": null,
"ifLastChange": "0",
"ifVlan": "",
"ifTrunk": null,
"ifVrf": "0",
"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": "29324067",
"ifInUcastPkts_prev": "0",
"ifInUcastPkts_delta": null,
"ifInUcastPkts_rate": null,
"ifOutUcastPkts": "48733798",
"ifOutUcastPkts_prev": "0",
"ifOutUcastPkts_delta": null,
"ifOutUcastPkts_rate": null,
"ifInErrors": "0",
"ifInErrors_prev": "0",
"ifInErrors_delta": null,
"ifInErrors_rate": null,
"ifOutErrors": "1",
"ifOutErrors_prev": "0",
"ifOutErrors_delta": null,
"ifOutErrors_rate": null,
"ifInOctets": "3308647200",
"ifInOctets_prev": "0",
"ifInOctets_delta": null,
"ifInOctets_rate": null,
"ifOutOctets": "4194904059",
"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
}
]
}
},
"os": {
"discovery": {
"devices": [
{
"sysName": "<private>",
"sysObjectID": ".1.3.6.1.4.1.23465",
"sysDescr": "Mega-Pixel Network Camera",
"sysContact": null,
"version": null,
"hardware": "",
"features": null,
"location": null,
"os": "vivotek",
"type": "camera",
"serial": null,
"icon": "vivotek.svg"
}
]
},
"poller": {
"devices": [
{
"sysName": "<private>",
"sysObjectID": ".1.3.6.1.4.1.23465",
"sysDescr": "Mega-Pixel Network Camera",
"sysContact": "<private>",
"version": null,
"hardware": "",
"features": null,
"location": "<private>",
"os": "vivotek",
"type": "camera",
"serial": null,
"icon": "vivotek.svg"
}
]
}
}
}

View File

@@ -0,0 +1,128 @@
1.3.6.1.2.1.1.1.0|4|Mega-Pixel Network Camera
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.23465
1.3.6.1.2.1.1.3.0|67|139546147
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.2.2.1.1.1|2|1
1.3.6.1.2.1.2.2.1.1.2|2|2
1.3.6.1.2.1.2.2.1.2.1|4|lo0
1.3.6.1.2.1.2.2.1.2.2|4|eth0
1.3.6.1.2.1.2.2.1.3.1|2|24
1.3.6.1.2.1.2.2.1.3.2|2|6
1.3.6.1.2.1.2.2.1.4.1|2|0
1.3.6.1.2.1.2.2.1.4.2|2|1500
1.3.6.1.2.1.2.2.1.5.1|66|10000000
1.3.6.1.2.1.2.2.1.5.2|66|10000000
1.3.6.1.2.1.2.2.1.6.1|4|
1.3.6.1.2.1.2.2.1.6.2|4|0:2:d1:43:a5:26
1.3.6.1.2.1.2.2.1.7.1|2|1
1.3.6.1.2.1.2.2.1.7.2|2|1
1.3.6.1.2.1.2.2.1.8.1|2|1
1.3.6.1.2.1.2.2.1.8.2|2|1
1.3.6.1.2.1.2.2.1.10.1|65|0
1.3.6.1.2.1.2.2.1.10.2|65|3308647200
1.3.6.1.2.1.2.2.1.11.1|65|0
1.3.6.1.2.1.2.2.1.11.2|65|29324067
1.3.6.1.2.1.2.2.1.14.1|65|0
1.3.6.1.2.1.2.2.1.14.2|65|0
1.3.6.1.2.1.2.2.1.16.1|65|0
1.3.6.1.2.1.2.2.1.16.2|65|4194904059
1.3.6.1.2.1.2.2.1.17.1|65|0
1.3.6.1.2.1.2.2.1.17.2|65|48733798
1.3.6.1.2.1.2.2.1.19.1|65|0
1.3.6.1.2.1.2.2.1.19.2|65|0
1.3.6.1.2.1.2.2.1.20.1|65|0
1.3.6.1.2.1.2.2.1.20.2|65|1
1.3.6.1.2.1.2.2.1.21.1|66|0
1.3.6.1.2.1.2.2.1.21.2|66|0
1.3.6.1.2.1.2.2.1.22.1|6|0.0
1.3.6.1.2.1.2.2.1.22.2|6|0.0
1.3.6.1.2.1.4.3.0|65|27700779
1.3.6.1.2.1.4.4.0|65|0
1.3.6.1.2.1.4.5.0|65|0
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|0
1.3.6.1.2.1.4.9.0|65|27699231
1.3.6.1.2.1.4.10.0|65|48710528
1.3.6.1.2.1.4.11.0|65|0
1.3.6.1.2.1.4.12.0|65|2
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.127.0.0.1|2|1
1.3.6.1.2.1.4.20.1.2.192.168.1.2|2|2
1.3.6.1.2.1.4.20.1.3.127.0.0.1|64|255.0.0.0
1.3.6.1.2.1.4.20.1.3.192.168.1.2|64|255.255.255.0
1.3.6.1.2.1.4.22.1.2.1.192.168.1.1|4|0:10:db:3:a6:7d
1.3.6.1.2.1.4.22.1.2.1.192.168.1.251|4|c:c4:7a:43:21:32
1.3.6.1.2.1.5.1.0|65|42
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|0
1.3.6.1.2.1.5.9.0|65|42
1.3.6.1.2.1.5.10.0|65|0
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|0
1.3.6.1.2.1.5.15.0|65|42
1.3.6.1.2.1.5.16.0|65|0
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|0
1.3.6.1.2.1.5.23.0|65|42
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|512671
1.3.6.1.2.1.6.9.0|66|2
1.3.6.1.2.1.6.10.0|65|27667070
1.3.6.1.2.1.6.11.0|65|51747612
1.3.6.1.2.1.6.12.0|65|181
1.3.6.1.2.1.7.1.0|65|25565
1.3.6.1.2.1.7.2.0|65|0
1.3.6.1.2.1.7.3.0|65|0
1.3.6.1.2.1.7.4.0|65|6079
1.3.6.1.2.1.11.1.0|65|16442
1.3.6.1.2.1.11.2.0|65|473
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|7984
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|3016
1.3.6.1.2.1.11.14.0|65|0
1.3.6.1.2.1.11.15.0|65|474
1.3.6.1.2.1.11.16.0|65|2
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|476
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.6.3.10.2.1.1.0|4x|80005BA9017F000001
1.3.6.1.6.3.10.2.1.3.0|2|1395430