Fix coding style part 2

This commit is contained in:
Job Snijders
2015-07-13 20:10:26 +02:00
parent ad9590df9b
commit d8693f05ae
733 changed files with 37359 additions and 33947 deletions

View File

@@ -1,31 +1,24 @@
<?php
// Hardcoded discovery of device CPU usage on Alcatel-Lucent Omniswitches.
// Hardcoded discovery of device CPU usage on Alcatel-Lucent Omniswitches.
if ($device['os'] == 'aos') {
echo 'Alcatel-Lucent Device : ';
if ($device['os'] == "aos")
{
echo("Alcatel-Lucent Device : ");
$descr = 'Device CPU';
$usage = snmp_get($device, '1.3.6.1.4.1.6486.800.1.2.1.16.1.1.1.13.0', '-OQUvs', 'ALCATEL-IND1-HEALTH-MIB', $config['mib_dir'].':'.$config['mib_dir'].'/aos');
$descr = "Device CPU";
$usage = snmp_get($device, "1.3.6.1.4.1.6486.800.1.2.1.16.1.1.1.13.0", "-OQUvs", "ALCATEL-IND1-HEALTH-MIB", $config['mib_dir'].":".$config['mib_dir']."/aos");
if (is_numeric($usage))
{
discover_processor($valid['processor'], $device, "1.3.6.1.4.1.6486.800.1.2.1.16.1.1.1.13.0", "0", "aos-system", $descr, "1", $usage, NULL, NULL);
}
else
{
// AOS7 devices use a different OID for CPU load. Not all Switches have
// healthModuleCpuLatest so we use healthModuleCpu1MinAvg which makes no
// difference for a 5 min. polling interval.
// Note: This OID shows (a) the CPU load of a single switch or (b) the
// average CPU load of all CPUs in a stack of switches.
$usage = snmp_get($device, "1.3.6.1.4.1.6486.801.1.2.1.16.1.1.1.1.1.11.0", "-OQUvs", NULL, NULL);
if (is_numeric($usage))
{
discover_processor($valid['processor'], $device, "1.3.6.1.4.1.6486.801.1.2.1.16.1.1.1.1.1.11.0", "0", "aos-system", $descr, "1", $usage, NULL, NULL);
if (is_numeric($usage)) {
discover_processor($valid['processor'], $device, '1.3.6.1.4.1.6486.800.1.2.1.16.1.1.1.13.0', '0', 'aos-system', $descr, '1', $usage, null, null);
}
}
}
?>
else {
// AOS7 devices use a different OID for CPU load. Not all Switches have
// healthModuleCpuLatest so we use healthModuleCpu1MinAvg which makes no
// difference for a 5 min. polling interval.
// Note: This OID shows (a) the CPU load of a single switch or (b) the
// average CPU load of all CPUs in a stack of switches.
$usage = snmp_get($device, '1.3.6.1.4.1.6486.801.1.2.1.16.1.1.1.1.1.11.0', '-OQUvs', null, null);
if (is_numeric($usage)) {
discover_processor($valid['processor'], $device, '1.3.6.1.4.1.6486.801.1.2.1.16.1.1.1.1.1.11.0', '0', 'aos-system', $descr, '1', $usage, null, null);
}
}
}//end if