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

Added more DELL switches in order to get proper CPU stats (#10529)

Browse Source 
* Added more DELL switches in order to get proper CPU stats

More DELL switches supported:

* N4032
* N2048
* N2024
* N3048
* N2048P
* 54XX

* fixed indent as requested by phpcbf

* fixed multiline argument function call

* removed blank lines

* Added CPU stats for N4064F

* Added test data for N4064F

* fixed indent as requested by phpcbf

* Added test data for Dell Powerconnect 5424

* Added test data for Dell Powerconnect 5448

* Added test data for Dell Powerconnect 5524

* Added test data for Dell Powerconnect N4032

* Added test data for Dell Powerconnect N2024

* Added test data for Dell Powerconnect N2048

* Added test data for Dell Powerconnect N2048P

* Added test data for Dell Powerconnect N3048

* Fixed processor usage data

* Fixed snmpsim data for 3056

* Fixed processor usage

* easier to read format

* remove space changes

* 3056 should be 8%
This commit is contained in:
rdezavalia 2019-08-29 19:11:23 -03:00 committed by Tony Murray
parent 142a1abbfd
commit a0ba412d6c
19 changed files with 223 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
LibreNMS/OS/Powerconnect.php
View File

@ -48,8 +48,12 @@ class Powerconnect extends OS implements ProcessorDiscovery, ProcessorPolling
public function discoverProcessors()
{
$device = $this->getDevice();
if (starts_with($device['sysObjectID'], '.1.3.6.1.4.1.674.10895.3031')) {
if (starts_with($device['sysObjectID'], [
'.1.3.6.1.4.1.674.10895.3020',
'.1.3.6.1.4.1.674.10895.3021',
'.1.3.6.1.4.1.674.10895.3030',
'.1.3.6.1.4.1.674.10895.3031',
])) {
d_echo("Dell Powerconnect 55xx");
return array(
Processor::discover(
@ -59,10 +63,18 @@ class Powerconnect extends OS implements ProcessorDiscovery, ProcessorPolling
0
)
);
} elseif (starts_with($device['sysObjectID'], ['.1.3.6.1.4.1.674.10895.3024', '.1.3.6.1.4.1.674.10895.3065'])) {
} elseif (starts_with($device['sysObjectID'], [
'.1.3.6.1.4.1.674.10895.3024',
'.1.3.6.1.4.1.674.10895.3042',
'.1.3.6.1.4.1.674.10895.3053',
'.1.3.6.1.4.1.674.10895.3054',
'.1.3.6.1.4.1.674.10895.3056',
'.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',
])) {
return $this->discoverVxworksProcessors('.1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.9.0');
}
return $this->discoverVxworksProcessors('.1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.4.0');
}

20
tests/data/powerconnect_3020.json Normal file
View File

@ -0,0 +1,20 @@
{
"processors": {
"discovery": {
"processors": [
{
"entPhysicalIndex": "0",
"hrDeviceIndex": "0",
"processor_oid": ".1.3.6.1.4.1.89.1.7.0",
"processor_index": "0",
"processor_type": "powerconnect-nv",
"processor_usage": "96",
"processor_descr": "Processor",
"processor_precision": "1",
"processor_perc_warn": "75"
}
]
},
"poller": "matches discovery"
}
}

20
tests/data/powerconnect_3021.json Normal file
View File

@ -0,0 +1,20 @@
{
"processors": {
"discovery": {
"processors": [
{
"entPhysicalIndex": "0",
"hrDeviceIndex": "0",
"processor_oid": ".1.3.6.1.4.1.89.1.7.0",
"processor_index": "0",
"processor_type": "powerconnect-nv",
"processor_usage": "91",
"processor_descr": "Processor",
"processor_precision": "1",
"processor_perc_warn": "75"
}
]
},
"poller": "matches discovery"
}
}

20
tests/data/powerconnect_3030.json Normal file
View File

@ -0,0 +1,20 @@
{
"processors": {
"discovery": {
"processors": [
{
"entPhysicalIndex": "0",
"hrDeviceIndex": "0",
"processor_oid": ".1.3.6.1.4.1.89.1.7.0",
"processor_index": "0",
"processor_type": "powerconnect-nv",
"processor_usage": "89",
"processor_descr": "Processor",
"processor_precision": "1",
"processor_perc_warn": "75"
}
]
},
"poller": "matches discovery"
}
}

20
tests/data/powerconnect_3042.json Normal file
View File

@ -0,0 +1,20 @@
{
"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": "16",
"processor_descr": "Processor",
"processor_precision": "1",
"processor_perc_warn": "75"
}
]
},
"poller": "matches discovery"
}
}

20
tests/data/powerconnect_3046.json Normal file
View File

@ -0,0 +1,20 @@
{
"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": "19",
"processor_descr": "Processor",
"processor_precision": "1",
"processor_perc_warn": "75"
}
]
},
"poller": "matches discovery"
}
}

20
tests/data/powerconnect_3053.json Normal file
View File

@ -0,0 +1,20 @@
{
"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": "16",
"processor_descr": "Processor",
"processor_precision": "1",
"processor_perc_warn": "75"
}
]
},
"poller": "matches discovery"
}
}

20
tests/data/powerconnect_3054.json Normal file
View File

@ -0,0 +1,20 @@
{
"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": "19",
"processor_descr": "Processor",
"processor_precision": "1",
"processor_perc_warn": "75"
}
]
},
"poller": "matches discovery"
}
}

20
tests/data/powerconnect_3056.json Normal file
View File

@ -0,0 +1,20 @@
{
"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": "8",
"processor_descr": "Processor",
"processor_precision": "1",
"processor_perc_warn": "75"
}
]
},
"poller": "matches discovery"
}
}

20
tests/data/powerconnect_3058.json Normal file
View File

@ -0,0 +1,20 @@
{
"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": "33",
"processor_descr": "Processor",
"processor_precision": "1",
"processor_perc_warn": "75"
}
]
},
"poller": "matches discovery"
}
}

3
tests/snmpsim/powerconnect_3020.snmprec Normal file
View File

@ -0,0 +1,3 @@
1.3.6.1.2.1.1.1.0|4|PowerConnect 5424
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.674.10895.3020
1.3.6.1.4.1.89.1.7.0|2|96

3
tests/snmpsim/powerconnect_3021.snmprec Normal file
View File

@ -0,0 +1,3 @@
1.3.6.1.2.1.1.1.0|4|PowerConnect 5448
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.674.10895.3021
1.3.6.1.4.1.89.1.7.0|2|91

3
tests/snmpsim/powerconnect_3030.snmprec Normal file
View File

@ -0,0 +1,3 @@
1.3.6.1.2.1.1.1.0|4|24G Ethernet Switch
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.674.10895.3030
1.3.6.1.4.1.89.1.7.0|2|89

3
tests/snmpsim/powerconnect_3042.snmprec Normal file
View File

@ -0,0 +1,3 @@
1.3.6.1.2.1.1.1.0|4|Dell Networking N4032, 6.3.2.4, Linux 3.7.10-20383c08
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.674.10895.3042
1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.9.0|4|5 Secs ( 15.5137%) 60 Secs ( 5.7211%) 300 Secs ( 4.4002%)

3
tests/snmpsim/powerconnect_3046.snmprec Normal file
View File

@ -0,0 +1,3 @@
1.3.6.1.2.1.1.1.0|4|Dell Networking N4064F, 6.5.4.3, Linux 3.7.10-8f4da1f6
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.674.10895.3046
1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.9.0|4|5 Secs ( 19.4945%) 60 Secs ( 16.5480%) 300 Secs ( 16.2354%)

3
tests/snmpsim/powerconnect_3053.snmprec Normal file
View File

@ -0,0 +1,3 @@
1.3.6.1.2.1.1.1.0|4|Dell Networking N2024, 6.1.0.6, Linux 3.6.5-320b2282
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.674.10895.3053
1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.9.0|4|5 Secs ( 15.7961%) 60 Secs ( 16.2380%) 300 Secs ( 16.4519%)

3
tests/snmpsim/powerconnect_3054.snmprec Normal file
View File

@ -0,0 +1,3 @@
1.3.6.1.2.1.1.1.0|4|Dell Networking N2048, 6.1.1.7, Linux 3.6.5-601418a5
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.674.10895.3054
1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.9.0|4|5 Secs ( 18.523%) 60 Secs ( 7.4291%) 300 Secs ( 5.7341%)

3
tests/snmpsim/powerconnect_3056.snmprec Normal file
View File

@ -0,0 +1,3 @@
1.3.6.1.2.1.1.1.0|4|Dell Networking N2048P, 6.1.0.6, Linux 3.6.5-320b2282
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.674.10895.3056
1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.9.0|4|5 Secs ( 7.6384%) 60 Secs ( 5.9576%) 300 Secs ( 5.8516%)

3
tests/snmpsim/powerconnect_3058.snmprec Normal file
View File

@ -0,0 +1,3 @@
1.3.6.1.2.1.1.1.0|4|Dell Networking N3048, 6.0.1.3, Linux 3.6.5-320b2282
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.674.10895.3058
1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.9.0|4|5 Secs ( 33.1475%) 60 Secs ( 17.9669%) 300 Secs ( 13.2548%)