mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
device: Improved detection for dlink and dlinkap devices (#8447)
This commit is contained in:
committed by
Tony Murray
parent
94f5ed67c5
commit
4c2822fe77
@@ -4,12 +4,11 @@ type: network
|
||||
icon: dlink
|
||||
ifname: 1
|
||||
discovery:
|
||||
- sysDescr:
|
||||
- 'D-Link DES-'
|
||||
- 'Dlink DES-'
|
||||
- sysDescr_regex:
|
||||
- '/^DES-/'
|
||||
- '/^DGS-/'
|
||||
-
|
||||
sysObjectID_except:
|
||||
- .1.3.6.1.4.1.171.10.37.
|
||||
sysObjectID:
|
||||
- .1.3.6.1.4.1.171.10.
|
||||
good_if:
|
||||
- po
|
||||
- vlan
|
||||
|
@@ -3,7 +3,5 @@ text: 'D-Link Access Point'
|
||||
type: wireless
|
||||
icon: dlink
|
||||
discovery:
|
||||
- sysDescr:
|
||||
- 'D-Link DAP-'
|
||||
- 'D-Link Access Point'
|
||||
- sysDescr_regex: '/D-Link .* AP/'
|
||||
- sysObjectID:
|
||||
- .1.3.6.1.4.1.171.10.37.
|
||||
|
40
tests/data/dlink.json
Normal file
40
tests/data/dlink.json
Normal file
@@ -0,0 +1,40 @@
|
||||
{
|
||||
"os": {
|
||||
"discovery": {
|
||||
"devices": [
|
||||
{
|
||||
"sysName": "",
|
||||
"sysObjectID": ".1.3.6.1.4.1.171.10.153.7.1",
|
||||
"sysDescr": "WS6-DGS-1210-52/F1 6.10.007",
|
||||
"sysContact": null,
|
||||
"version": null,
|
||||
"hardware": "",
|
||||
"features": null,
|
||||
"location": null,
|
||||
"os": "dlink",
|
||||
"type": "network",
|
||||
"serial": null,
|
||||
"icon": "dlink.svg"
|
||||
}
|
||||
]
|
||||
},
|
||||
"poller": {
|
||||
"devices": [
|
||||
{
|
||||
"sysName": "",
|
||||
"sysObjectID": ".1.3.6.1.4.1.171.10.153.7.1",
|
||||
"sysDescr": "WS6-DGS-1210-52/F1 6.10.007",
|
||||
"sysContact": null,
|
||||
"version": null,
|
||||
"hardware": "WS6-DGS-1210-52/F1 Rev. ",
|
||||
"features": null,
|
||||
"location": null,
|
||||
"os": "dlink",
|
||||
"type": "network",
|
||||
"serial": null,
|
||||
"icon": "dlink.svg"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
40
tests/data/dlink_dgs-1210-52mp.json
Normal file
40
tests/data/dlink_dgs-1210-52mp.json
Normal file
@@ -0,0 +1,40 @@
|
||||
{
|
||||
"os": {
|
||||
"discovery": {
|
||||
"devices": [
|
||||
{
|
||||
"sysName": "",
|
||||
"sysObjectID": ".1.3.6.1.4.1.171.10.153.10.1",
|
||||
"sysDescr": "WS6-DGS-1210-52MP/F1 6.10.007",
|
||||
"sysContact": null,
|
||||
"version": null,
|
||||
"hardware": "",
|
||||
"features": null,
|
||||
"location": null,
|
||||
"os": "dlink",
|
||||
"type": "network",
|
||||
"serial": null,
|
||||
"icon": "dlink.svg"
|
||||
}
|
||||
]
|
||||
},
|
||||
"poller": {
|
||||
"devices": [
|
||||
{
|
||||
"sysName": "",
|
||||
"sysObjectID": ".1.3.6.1.4.1.171.10.153.10.1",
|
||||
"sysDescr": "WS6-DGS-1210-52MP/F1 6.10.007",
|
||||
"sysContact": null,
|
||||
"version": null,
|
||||
"hardware": "WS6-DGS-1210-52MP/F1 Rev. ",
|
||||
"features": null,
|
||||
"location": null,
|
||||
"os": "dlink",
|
||||
"type": "network",
|
||||
"serial": null,
|
||||
"icon": "dlink.svg"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
2
tests/snmpsim/dlink.snmprec
Normal file
2
tests/snmpsim/dlink.snmprec
Normal file
@@ -0,0 +1,2 @@
|
||||
1.3.6.1.2.1.1.1.0|4|WS6-DGS-1210-52/F1 6.10.007
|
||||
1.3.6.1.2.1.1.2.0|6|.1.3.6.1.4.1.171.10.153.7.1
|
@@ -1 +1,2 @@
|
||||
1.3.6.1.2.1.1.1.0|4|Dlink DES-
|
||||
1.3.6.1.2.1.1.2.0|6|.1.3.6.1.4.1.171.10.63.10
|
||||
|
2
tests/snmpsim/dlink_dgs-1210-52mp.snmprec
Normal file
2
tests/snmpsim/dlink_dgs-1210-52mp.snmprec
Normal file
@@ -0,0 +1,2 @@
|
||||
1.3.6.1.2.1.1.1.0|4|WS6-DGS-1210-52MP/F1 6.10.007
|
||||
1.3.6.1.2.1.1.2.0|6|.1.3.6.1.4.1.171.10.153.10.1
|
@@ -1,2 +1,2 @@
|
||||
1.3.6.1.2.1.1.1.0|4|DGS-1100-18 Gigabit Ethernet Switch
|
||||
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.171
|
||||
1.3.6.1.2.1.1.2.0|6|.1.3.6.1.4.1.171.10.134.1
|
||||
|
@@ -1 +1,2 @@
|
||||
1.3.6.1.2.1.1.1.0|4|D-Link Access Point
|
||||
1.3.6.1.2.1.1.2.0|6|.1.3.6.1.4.1.171.10.37.30
|
||||
|
Reference in New Issue
Block a user