diff --git a/LibreNMS/OS/Powerconnect.php b/LibreNMS/OS/Powerconnect.php index a447e3f259..a5a8717a2c 100644 --- a/LibreNMS/OS/Powerconnect.php +++ b/LibreNMS/OS/Powerconnect.php @@ -73,6 +73,16 @@ class Powerconnect extends OS implements ProcessorDiscovery, ProcessorPolling '.1.3.6.1.4.1.674.10895.3058', '.1.3.6.1.4.1.674.10895.3065', '.1.3.6.1.4.1.674.10895.3046', + '.1.3.6.1.4.1.674.10895.3063', + '.1.3.6.1.4.1.674.10895.3064', + '.1.3.6.1.4.1.674.10895.3065', + '.1.3.6.1.4.1.674.10895.3066', + '.1.3.6.1.4.1.674.10895.3078', + '.1.3.6.1.4.1.674.10895.3079', + '.1.3.6.1.4.1.674.10895.3080', + '.1.3.6.1.4.1.674.10895.3081', + '.1.3.6.1.4.1.674.10895.3082', + '.1.3.6.1.4.1.674.10895.3083', ])) { return $this->discoverVxworksProcessors('.1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.9.0'); } diff --git a/tests/data/powerconnect_3064.json b/tests/data/powerconnect_3064.json new file mode 100644 index 0000000000..cf2ca08684 --- /dev/null +++ b/tests/data/powerconnect_3064.json @@ -0,0 +1,58 @@ +{ + "processors": { + "discovery": { + "processors": [ + { + "entPhysicalIndex": 0, + "hrDeviceIndex": 0, + "processor_oid": ".1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.9.0", + "processor_index": "0", + "processor_type": "powerconnect", + "processor_usage": 21, + "processor_descr": "Processor", + "processor_precision": 1, + "processor_perc_warn": 75 + } + ] + }, + "poller": "matches discovery" + }, + "os": { + "discovery": { + "devices": [ + { + "sysName": "", + "sysObjectID": ".1.3.6.1.4.1.674.10895.3064", + "sysDescr": "Dell EMC Networking N1524P, 6.6.0.13, Linux 3.6.5, Not Available", + "sysContact": null, + "version": null, + "hardware": null, + "features": null, + "os": "powerconnect", + "type": "network", + "serial": null, + "icon": "dell.svg", + "location": null + } + ] + }, + "poller": { + "devices": [ + { + "sysName": "", + "sysObjectID": ".1.3.6.1.4.1.674.10895.3064", + "sysDescr": "Dell EMC Networking N1524P, 6.6.0.13, Linux 3.6.5, Not Available", + "sysContact": "", + "version": "6.6.0.13", + "hardware": "Dell Dell EMC Networking N1524P", + "features": "Dell EMC Networking Switch", + "os": "powerconnect", + "type": "network", + "serial": null, + "icon": "dell.svg", + "location": "" + } + ] + } + } +} diff --git a/tests/data/powerconnect_3080.json b/tests/data/powerconnect_3080.json new file mode 100644 index 0000000000..4a764e32ca --- /dev/null +++ b/tests/data/powerconnect_3080.json @@ -0,0 +1,58 @@ +{ + "processors": { + "discovery": { + "processors": [ + { + "entPhysicalIndex": 0, + "hrDeviceIndex": 0, + "processor_oid": ".1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.9.0", + "processor_index": "0", + "processor_type": "powerconnect", + "processor_usage": 48, + "processor_descr": "Processor", + "processor_precision": 1, + "processor_perc_warn": 75 + } + ] + }, + "poller": "matches discovery" + }, + "os": { + "discovery": { + "devices": [ + { + "sysName": "", + "sysObjectID": ".1.3.6.1.4.1.674.10895.3080", + "sysDescr": "Dell EMC Networking N1124T-ON, 6.6.0.21, Linux 3.6.5, Not Available", + "sysContact": null, + "version": null, + "hardware": null, + "features": null, + "os": "powerconnect", + "type": "network", + "serial": null, + "icon": "dell.svg", + "location": null + } + ] + }, + "poller": { + "devices": [ + { + "sysName": "", + "sysObjectID": ".1.3.6.1.4.1.674.10895.3080", + "sysDescr": "Dell EMC Networking N1124T-ON, 6.6.0.21, Linux 3.6.5, Not Available", + "sysContact": "", + "version": "6.6.0.21", + "hardware": "Dell Dell EMC Networking N1124T-ON", + "features": "Dell EMC Networking Switch", + "os": "powerconnect", + "type": "network", + "serial": null, + "icon": "dell.svg", + "location": "" + } + ] + } + } +} diff --git a/tests/data/powerconnect_3082.json b/tests/data/powerconnect_3082.json new file mode 100644 index 0000000000..de71edc805 --- /dev/null +++ b/tests/data/powerconnect_3082.json @@ -0,0 +1,58 @@ +{ + "processors": { + "discovery": { + "processors": [ + { + "entPhysicalIndex": 0, + "hrDeviceIndex": 0, + "processor_oid": ".1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.9.0", + "processor_index": "0", + "processor_type": "powerconnect", + "processor_usage": 54, + "processor_descr": "Processor", + "processor_precision": 1, + "processor_perc_warn": 75 + } + ] + }, + "poller": "matches discovery" + }, + "os": { + "discovery": { + "devices": [ + { + "sysName": "", + "sysObjectID": ".1.3.6.1.4.1.674.10895.3082", + "sysDescr": "Dell EMC Networking N1148T-ON, 6.6.0.21, Linux 3.6.5, Not Available", + "sysContact": null, + "version": null, + "hardware": null, + "features": null, + "os": "powerconnect", + "type": "network", + "serial": null, + "icon": "dell.svg", + "location": null + } + ] + }, + "poller": { + "devices": [ + { + "sysName": "", + "sysObjectID": ".1.3.6.1.4.1.674.10895.3082", + "sysDescr": "Dell EMC Networking N1148T-ON, 6.6.0.21, Linux 3.6.5, Not Available", + "sysContact": "", + "version": "6.6.0.21", + "hardware": "Dell Dell EMC Networking N1148T-ON", + "features": "Dell EMC Networking Switch", + "os": "powerconnect", + "type": "network", + "serial": null, + "icon": "dell.svg", + "location": "" + } + ] + } + } +} diff --git a/tests/snmpsim/powerconnect_3064.snmprec b/tests/snmpsim/powerconnect_3064.snmprec new file mode 100644 index 0000000000..7d93960eb8 --- /dev/null +++ b/tests/snmpsim/powerconnect_3064.snmprec @@ -0,0 +1,17 @@ +1.3.6.1.2.1.1.1.0|4|Dell EMC Networking N1524P, 6.6.0.13, Linux 3.6.5, Not Available +1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.674.10895.3064 +1.3.6.1.2.1.1.3.0|67|915991655 +1.3.6.1.2.1.1.4.0|4| +1.3.6.1.2.1.1.5.0|4| +1.3.6.1.2.1.1.6.0|4| +1.3.6.1.4.1.674.10895.3000.1.2.100.1.0|4|Dell EMC Networking N1524P +1.3.6.1.4.1.674.10895.3000.1.2.100.2.0|4|Dell EMC Networking Switch +1.3.6.1.4.1.674.10895.3000.1.2.100.4.0|4|6.6.0.13 +1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.1.0|2|551196 +1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.2.0|2|1014836 +1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.9.0|4|5 Secs ( 21.4484%) 60 Secs ( 21.6921%) 300 Secs ( 15.238%) +1.3.6.1.4.1.674.10895.5000.2.6132.1.1.43.1.8.1.5.1.0|2|32 +1.3.6.1.4.1.674.10895.5000.2.6132.1.1.43.1.8.1.5.1.1|2|27 +1.3.6.1.4.1.674.10895.5000.2.6132.1.1.43.1.8.1.5.1.2|2|39 +1.3.6.1.4.1.674.10895.5000.2.6132.1.1.43.1.8.1.5.1.3|2|40 +1.3.6.1.4.1.674.10895.5000.2.6132.1.1.43.1.8.1.5.1.4|2|37 diff --git a/tests/snmpsim/powerconnect_3080.snmprec b/tests/snmpsim/powerconnect_3080.snmprec new file mode 100644 index 0000000000..c3a07aa436 --- /dev/null +++ b/tests/snmpsim/powerconnect_3080.snmprec @@ -0,0 +1,13 @@ +1.3.6.1.2.1.1.1.0|4|Dell EMC Networking N1124T-ON, 6.6.0.21, Linux 3.6.5, Not Available +1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.674.10895.3080 +1.3.6.1.2.1.1.3.0|67|8048557 +1.3.6.1.2.1.1.4.0|4| +1.3.6.1.2.1.1.5.0|4| +1.3.6.1.2.1.1.6.0|4| +1.3.6.1.4.1.674.10895.3000.1.2.100.1.0|4|Dell EMC Networking N1124T-ON +1.3.6.1.4.1.674.10895.3000.1.2.100.2.0|4|Dell EMC Networking Switch +1.3.6.1.4.1.674.10895.3000.1.2.100.4.0|4|6.6.0.21 +1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.1.0|2|587276 +1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.2.0|2|1014780 +1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.9.0|4|5 Secs ( 48.3220%) 60 Secs ( 19.1428%) 300 Secs ( 14.9810%) +1.3.6.1.4.1.674.10895.5000.2.6132.1.1.43.1.8.1.5.1.0|2|40 diff --git a/tests/snmpsim/powerconnect_3082.snmprec b/tests/snmpsim/powerconnect_3082.snmprec new file mode 100644 index 0000000000..aa2af3df30 --- /dev/null +++ b/tests/snmpsim/powerconnect_3082.snmprec @@ -0,0 +1,13 @@ +1.3.6.1.2.1.1.1.0|4|Dell EMC Networking N1148T-ON, 6.6.0.21, Linux 3.6.5, Not Available +1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.674.10895.3082 +1.3.6.1.2.1.1.3.0|67|50748 +1.3.6.1.2.1.1.4.0|4| +1.3.6.1.2.1.1.5.0|4| +1.3.6.1.2.1.1.6.0|4| +1.3.6.1.4.1.674.10895.3000.1.2.100.1.0|4|Dell EMC Networking N1148T-ON +1.3.6.1.4.1.674.10895.3000.1.2.100.2.0|4|Dell EMC Networking Switch +1.3.6.1.4.1.674.10895.3000.1.2.100.4.0|4|6.6.0.21 +1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.1.0|2|581772 +1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.2.0|2|1014780 +1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.9.0|4|5 Secs ( 53.5538%) 60 Secs ( 33.747%) 300 Secs ( 23.7992%) +1.3.6.1.4.1.674.10895.5000.2.6132.1.1.43.1.8.1.5.1.0|2|41