mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3966 from ahmedsajid/powerconnect-patches

Browse Source 
Added support for Dell Powerconnect 8024F CPUs
This commit is contained in:
Neil Lathwood
2016-08-05 22:22:35 +01:00
committed by GitHub
parent d68949b724 c678c10662
commit 38cafef778
3 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
includes/definitions.inc.php
View File

@@ -1025,6 +1025,10 @@ $config['os'][$os]['type'] = 'network';
$config['os'][$os]['icon'] = 'dell';
$config['os'][$os]['over'][0]['graph'] = 'device_bits';
$config['os'][$os]['over'][0]['text'] = 'Traffic';
$config['os'][$os]['over'][1]['graph'] = 'device_processor';
$config['os'][$os]['over'][1]['text'] = 'CPU Usage';
$config['os'][$os]['over'][2]['graph'] = 'device_mempool';
$config['os'][$os]['over'][2]['text'] = 'Memory Usage';
$os = 'radlan';
$config['os'][$os]['text'] = 'Radlan';

25
includes/discovery/processors/powerconnect.inc.php
View File

@@ -1,21 +1,18 @@
<?php
if ($device['os'] == 'powerconnect') {
$sysObjectId = snmp_get($device, 'SNMPv2-MIB::sysObjectID.0', '-Ovqn');
switch ($sysObjectId) {
case '.1.3.6.1.4.1.674.10895.3031':
/*
* Devices supported:
* Dell Powerconnect 55xx
*/
if (strpos($device["sysObjectID"], "enterprises.674.10895.3031") !== false) {
d_echo "Dell Powerconnect 55xx";
$usage = trim(snmp_get($device, '.1.3.6.1.4.1.89.1.7.0', '-Ovq'));
discover_processor($valid['processor'], $device, '.1.3.6.1.4.1.89.1.7.0', '0', 'powerconnect', 'Processor', '1', $usage, null, null);
break;
default:
/*
* Defaul Discovery for powerconnect series
* Dell-Vendor-MIB::dellLanExtension.6132.1.1.1.1.4.4.0 = STRING: "5 Sec (6.99%), 1 Min (6.72%), 5 Min (9.06%)"
*/
} elseif (strpos($device["sysObjectID"], "enterprises.674.10895.3024") !== false) {
d_echo "Dell Powerconnect 8024F";
$usage = trim(snmp_get($device,'.1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.9.0', '-Ovq'), '"');
$usage = ltrim($usage,' ');
if (substr($usage, 0, 5) == '5 Sec') {
discover_processor($valid['processor'], $device, '.1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.9.0', '0', 'powerconnect', 'Processor', '1', $usage, null, null);
}
} else {
$descr = 'Processor';
$usage = trim(snmp_get($device, 'dellLanExtension.6132.1.1.1.1.4.4.0', '-OQUvs', 'Dell-Vendor-MIB'), '"');
if (substr($usage, 0, 5) == '5 Sec') {

20
includes/polling/processors/powerconnect.inc.php
View File

@@ -1,15 +1,15 @@
<?php
$sysObjectId = $poll_device['sysObjectID'];
switch ($sysObjectId) {
case '.1.3.6.1.4.1.674.10895.3031':
/*
* Devices supported:
* Dell Powerconnect 55xx
*/
$proc = snmp_get($device, $processor['processor_oid'], '-O Uqnv', '""');
break;
default:
if (strpos($device["sysObjectID"], "enterprises.674.10895.3031") !== false) {
d_echo "Dell Powerconnect 55xx";
$proc = snmp_get($device, $processor['processor_oid'], '-O Uqnv', '""');
} elseif (strpos($device["sysObjectID"], "enterprises.674.10895.3024") !== false) {
d_echo "Dell Powerconnect 8024F";
$values = trim(snmp_get($device, $processor['processor_oid'], '-O Uqnv'), '""');
$values = ltrim($values,' ');
preg_match('/(\d*\.\d*)/', $values, $matches);
$proc = $matches[0];
} else {
$values = trim(snmp_get($device, 'dellLanExtension.6132.1.1.1.1.4.4.0', '-OvQ', 'Dell-Vendor-MIB'), '"');
preg_match('/5 Sec \((.*)%\),.*1 Min \((.*)%\),.*5 Min \((.*)%\)$/', $values, $matches);
$proc = $matches[3];