clones/librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-09-21 18:38:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

More cleanups and reindents, half way there

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1838 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans 2011-03-15 10:54:59 +00:00
parent 0236f7aff8
commit e43eaf7461
10 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
includes/discovery/current.inc.php
View File

@ -3,10 +3,10 @@ echo("Current: ");
include_dir("includes/discovery/current");
if($debug) { print_r($valid['current']); }
if ($debug) { print_r($valid['current']); }
check_valid_sensors($device, 'current', $valid_sensor);
echo("\n");
?>
?>

4
includes/discovery/fanspeeds.inc.php
View File

@ -3,10 +3,10 @@
echo("Fanspeeds : ");
include_dir("includes/discovery/fanspeeds");
if($debug) { print_r($valid['fanspeed']); }
if ($debug) { print_r($valid['fanspeed']); }
check_valid_sensors($device, 'fanspeed', $valid_sensor);
echo("\n");
?>
?>

5
includes/discovery/frequencies.inc.php
View File

@ -3,9 +3,10 @@ echo("Frequencies: ");
include_dir("includes/discovery/frequencies");
if($debug) { print_r($valid['freq']); }
if ($debug) { print_r($valid['freq']); }
check_valid_sensors($device, 'freq', $valid_sensor);
echo("\n");
?>
?>

4
includes/discovery/humidity.inc.php
View File

@ -9,10 +9,10 @@ echo("Humidity : ");
include_dir("includes/discovery/humidity");
if($debug) { print_r($valid['humidity']); }
if ($debug) { print_r($valid['humidity']); }
check_valid_sensors($device, 'humidity', $valid_sensor);
echo("\n");
?>
?>

10
includes/discovery/humidity/akcp.inc.php
View File

@ -8,10 +8,10 @@ if ($device['os'] == 'akcp' || $device['os'] == 'minkelsrms')
if ($debug) { echo($oids."\n"); }
$oids = trim($oids);
if ($oids) echo("AKCP ");
foreach(explode("\n", $oids) as $data)
foreach (explode("\n", $oids) as $data)
{
$data = trim($data);
if ($data)
if ($data)
{
list($oid,$status) = explode(" ", $data,2);
if ($status == 2) # 2 = normal, 0 = not connected
@ -24,18 +24,18 @@ if ($device['os'] == 'akcp' || $device['os'] == 'minkelsrms')
$limit_oid = ".1.3.6.1.4.1.3854.1.2.2.1.17.1.8.$index";
$warnlowlimit_oid = ".1.3.6.1.4.1.3854.1.2.2.1.17.1.9.$index";
$lowlimit_oid = ".1.3.6.1.4.1.3854.1.2.2.1.17.1.10.$index";
$descr = trim(snmp_get($device, $descr_oid, "-Oqv", ""),'"');
$humidity = snmp_get($device, $oid, "-Oqv", "");
$warnlimit = snmp_get($device, $warnlimit_oid, "-Oqv", "");
$limit = snmp_get($device, $limit_oid, "-Oqv", "");
$lowlimit = snmp_get($device, $lowlimit_oid, "-Oqv", "");
$warnlowlimit = snmp_get($device, $warnlowlimit_oid, "-Oqv", "");
discover_sensor($valid_sensor, 'humidity', $device, $oid, $index, 'akcp', $descr, '1', '1', $lowlimit, $warnlowlimit, $limit, $warnlimit, $humidity);
}
}
}
}
?>
?>

5
includes/discovery/humidity/ipoman.inc.php
View File

@ -5,7 +5,7 @@
global $valid_sensor;
if ($device['os'] == "ipoman")
if ($device['os'] == "ipoman")
{
echo(" IPOMANII-MIB ");
$emd_installed = snmp_get($device, "IPOMANII-MIB::ipmEnvEmdStatusEmdType.0"," -Oqv");
@ -21,9 +21,10 @@ if ($device['os'] == "ipoman")
{
$current_oid = ".1.3.6.1.4.1.2468.1.4.2.1.5.1.1.3.0";
$descr = trim(str_replace("\"", "", $descr));
discover_sensor($valid_sensor, 'humidity', $device, $current_oid, "1", 'ipoman', $descr, '10', '1', $low_limit, NULL, NULL, $high_limit, $current);
}
}
}
?>
?>

17
includes/discovery/os.inc.php
View File

@ -1,12 +1,13 @@
<?php
$os = getHostOS($device);
$os = getHostOS($device);
if($os != $device['os']) {
$sql = mysql_query("UPDATE `devices` SET `os` = '$os' WHERE `device_id` = '".$device['device_id']."'");
echo("Changed OS! : $os\n");
eventlog("Device OS changed ".$device['os']." => $os", $device['device_id']);
$device['os'] = $os;
}
if ($os != $device['os'])
{
$sql = mysql_query("UPDATE `devices` SET `os` = '$os' WHERE `device_id` = '".$device['device_id']."'");
echo("Changed OS! : $os\n");
eventlog("Device OS changed ".$device['os']." => $os", $device['device_id']);
$device['os'] = $os;
}
?>
?>

4
includes/discovery/temperatures.inc.php
View File

@ -4,10 +4,10 @@ echo("Temperatures: ");
include_dir("includes/discovery/temperatures");
if($debug) { print_r($valid_sensor['temperature']); }
if ($debug) { print_r($valid_sensor['temperature']); }
check_valid_sensors($device, 'temperature', $valid_sensor);
echo("\n");
?>
?>

8
includes/discovery/toner.inc.php
View File

@ -11,7 +11,7 @@ if ($config['enable_printers'])
$oids = trim(snmp_walk($device, "SNMPv2-SMI::mib-2.43.12.1.1.2.1 ", "-OsqnU"));
if ($debug) { echo($oids."\n"); }
if ($oids) echo("Jetdirect ");
foreach(explode("\n", $oids) as $data)
foreach (explode("\n", $oids) as $data)
{
$data = trim($data);
if ($data)
@ -32,7 +32,7 @@ if ($config['enable_printers'])
$current = $current / $capacity * 100;
$type = "jetdirect";
if (isHexString($descr)) { $descr = snmp_hexstring($descr); }
echo(discover_toner($valid_toner,$device, $toner_oid, $index, $type, $descr, $capacity, $current));
discover_toner($valid_toner,$device, $toner_oid, $index, $type, $descr, $capacity, $current);
}
}
}
@ -40,7 +40,7 @@ if ($config['enable_printers'])
}
## Delete removed toners
if($debug) { echo("\n Checking ... \n"); print_r($valid_toner); }
if ($debug) { echo("\n Checking ... \n"); print_r($valid_toner); }
$sql = "SELECT * FROM toner WHERE device_id = '".$device['device_id']."'";
if ($query = mysql_query($sql))
@ -49,7 +49,7 @@ if ($config['enable_printers'])
{
$toner_index = $test_toner['toner_index'];
$toner_type = $test_toner['toner_type'];
if(!$valid_toner[$toner_type][$toner_index]) {
if (!$valid_toner[$toner_type][$toner_index]) {
echo("-");
mysql_query("DELETE FROM `toner` WHERE toner_id = '" . $test_toner['toner_id'] . "'");
}

4
includes/discovery/voltages.inc.php
View File

@ -4,10 +4,10 @@ echo("Voltages: ");
include_dir("includes/discovery/voltages");
if($debug) { print_r($valid['voltage']); }
if ($debug) { print_r($valid['voltage']); }
check_valid_sensors($device, 'voltage', $valid_sensor);
echo("\n");
?>
?>