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

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

@ -3,7 +3,7 @@ echo("Current: ");
include_dir("includes/discovery/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); check_valid_sensors($device, 'current', $valid_sensor);

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

@ -3,7 +3,7 @@
echo("Fanspeeds : "); echo("Fanspeeds : ");
include_dir("includes/discovery/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); check_valid_sensors($device, 'fanspeed', $valid_sensor);

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

@ -3,9 +3,10 @@ echo("Frequencies: ");
include_dir("includes/discovery/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); check_valid_sensors($device, 'freq', $valid_sensor);
echo("\n"); echo("\n");
?> ?>

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

@ -9,7 +9,7 @@ echo("Humidity : ");
include_dir("includes/discovery/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); check_valid_sensors($device, 'humidity', $valid_sensor);

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

@ -8,7 +8,7 @@ if ($device['os'] == 'akcp' || $device['os'] == 'minkelsrms')
if ($debug) { echo($oids."\n"); } if ($debug) { echo($oids."\n"); }
$oids = trim($oids); $oids = trim($oids);
if ($oids) echo("AKCP "); if ($oids) echo("AKCP ");
foreach(explode("\n", $oids) as $data) foreach (explode("\n", $oids) as $data)
{ {
$data = trim($data); $data = trim($data);
if ($data) if ($data)

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

@ -21,6 +21,7 @@ if ($device['os'] == "ipoman")
{ {
$current_oid = ".1.3.6.1.4.1.2468.1.4.2.1.5.1.1.3.0"; $current_oid = ".1.3.6.1.4.1.2468.1.4.2.1.5.1.1.3.0";
$descr = trim(str_replace("\"", "", $descr)); $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); discover_sensor($valid_sensor, 'humidity', $device, $current_oid, "1", 'ipoman', $descr, '10', '1', $low_limit, NULL, NULL, $high_limit, $current);
} }
} }

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

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

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

@ -4,7 +4,7 @@ echo("Temperatures: ");
include_dir("includes/discovery/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); check_valid_sensors($device, 'temperature', $valid_sensor);

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

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

@ -4,7 +4,7 @@ echo("Voltages: ");
include_dir("includes/discovery/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); check_valid_sensors($device, 'voltage', $valid_sensor);