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

Removed unnecessary trimming

Browse Source
This commit is contained in:
Ahmed Sajid
2016-08-04 16:20:13 -04:00
parent dfc6d212c2
commit 8f05fea263
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,18 +1,18 @@
<?php
if ($device['os'] == 'powerconnect') {
$trimmed_sysObjectId = ltrim($device["sysObjectID"],"enterprise.");
if ($trimmed_sysObjectId == "674.10895.3031") {
if (strpos($device["sysObjectID"], "enterprises.674.10895.3031") !== false) {
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);
} elseif ($trimmed_sysObjectId == "674.10895.3024") {
} elseif (strpos($device["sysObjectID"], "enterprises.674.10895.3024") !== false) {
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 {
}
} 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') {

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

@@ -1,9 +1,9 @@
<?php
$trimmed_sysObjectId = ltrim($device["sysObjectID"],"enterprise.");
if ($trimmed_sysObjectId == "674.10895.3031") {
if (strpos($device["sysObjectID"], "enterprises.674.10895.3031") !== false) {
echo "Dell Powerconnect 55xx";
$proc = snmp_get($device, $processor['processor_oid'], '-O Uqnv', '""');
} elseif ($trimmed_sysObjectId == "674.10895.3024") {
} elseif (strpos($device["sysObjectID"], "enterprises.674.10895.3024") !== false) {
echo "Dell Powerconnect 8024F";
$values = trim(snmp_get($device, $processor['processor_oid'], '-O Uqnv'), '""');
$values = ltrim($values,' ');