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

Update code in includes to be PSR-2 compliant (#4220)

Browse Source 
refactor: Update code in /includes to be psr2 compliant #4220
This commit is contained in:
Tony Murray
2016-08-28 12:32:58 -05:00
committed by Neil Lathwood
parent 3c0fcdd46b
commit 9284bc60ff
373 changed files with 3509 additions and 3498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
includes/discovery/sensors/current/apc.inc.php
View File

@@ -45,8 +45,7 @@ if ($device['os'] == 'apc') {
// No / $precision here! Nice, APC!
if (count(explode("\n", $oids)) != 1) {
$descr = "Phase $phase";
}
else {
} else {
$descr = 'Output';
}
@@ -228,8 +227,7 @@ if ($device['os'] == 'apc') {
if (empty($oids)) {
$oids = snmp_get($device, $item['AdvOid'].'.'.$item['index'], '-OsqnU', $item['mib']);
$current_oid = $item['AdvOid'];
}
else {
} else {
$current_oid = $item['HighPrecOid'];
}
@@ -243,8 +241,7 @@ if ($device['os'] == 'apc') {
if (stristr($current_oid, 'HighPrec')) {
$current = ($oids / $item['divisor']);
}
else {
} else {
$current = $oids;
$item['divisor'] = 1;
}

38
includes/discovery/sensors/current/gamatronicups.inc.php
View File

@@ -12,9 +12,22 @@ if ($device['os'] == 'gamatronicups') {
$warnlimit = null;
$limit = null;
discover_sensor($valid['sensor'], 'current', $device,
$current_oid, $index, $type,
$descr, '1', '1', $lowlimit, null, null, null, $current);
discover_sensor(
$valid['sensor'],
'current',
$device,
$current_oid,
$index,
$type,
$descr,
'1',
'1',
$lowlimit,
null,
null,
null,
$current
);
}
for ($i = 1; $i <= 3; $i++) {
@@ -28,8 +41,21 @@ if ($device['os'] == 'gamatronicups') {
$warnlimit = null;
$limit = null;
discover_sensor($valid['sensor'], 'current', $device,
$current_oid, $index, $type,
$descr, '1', '1', $lowlimit, null, null, null, $current);
discover_sensor(
$valid['sensor'],
'current',
$device,
$current_oid,
$index,
$type,
$descr,
'1',
'1',
$lowlimit,
null,
null,
null,
$current
);
}
}

2
includes/discovery/sensors/current/junos.inc.php
View File

@@ -28,7 +28,5 @@ if ($device['os'] == 'junos' || $device['os_group'] == 'junos') {
$entPhysicalIndex_measured = 'ports';
discover_sensor($valid['sensor'], 'current', $device, $oid, 'rx-'.$index, 'junos', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured);
}
}
}

2
includes/discovery/sensors/current/mgeups.inc.php
View File

@@ -8,7 +8,7 @@ if ($device['os'] == 'mgeups') {
$numPhase = count(explode("\n", $oids));
for ($i = 1; $i <= $numPhase; $i++) {
unset($current);
unset($current);
$current_oid = ".1.3.6.1.4.1.705.1.7.2.1.5.$i";
$descr = 'Output';
if ($numPhase > 1) {

38
includes/discovery/sensors/current/netvision.inc.php
View File

@@ -12,9 +12,22 @@ if ($device['os'] == 'netvision') {
$warnlimit = null;
$limit = null;
discover_sensor($valid['sensor'], 'current', $device,
$current_oid, $index, $type,
$descr, '10', '1', $lowlimit, null, null, null, $current);
discover_sensor(
$valid['sensor'],
'current',
$device,
$current_oid,
$index,
$type,
$descr,
'10',
'1',
$lowlimit,
null,
null,
null,
$current
);
}
for ($i = 1; $i <= 3; $i++) {
@@ -28,8 +41,21 @@ if ($device['os'] == 'netvision') {
$warnlimit = null;
$limit = null;
discover_sensor($valid['sensor'], 'current', $device,
$current_oid, $index, $type,
$descr, '10', '1', $lowlimit, null, null, null, $current);
discover_sensor(
$valid['sensor'],
'current',
$device,
$current_oid,
$index,
$type,
$descr,
'10',
'1',
$lowlimit,
null,
null,
null,
$current
);
}
}

2
includes/discovery/sensors/current/pbn.inc.php
View File

@@ -27,7 +27,5 @@ if ($device['os'] == 'pbn' || $device['os_group'] == 'pbn') {
$entPhysicalIndex_measured = 'ports';
discover_sensor($valid['sensor'], 'current', $device, $oid, ''.$index, 'pbn', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $value, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured);
}
}
}