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

clean up polling source files, remove dead code

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1865 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-03-16 01:11:27 +00:00
parent 0b55624ba0
commit ecbcd1db43
41 changed files with 1135 additions and 1246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
includes/polling/storage.inc.php
View File

@@ -6,13 +6,14 @@ $storage_cache = array();
$query = "SELECT * FROM storage WHERE device_id = '" . $device['device_id'] . "'";
$storage_data = mysql_query($query);
while($storage = mysql_fetch_array($storage_data)) {
while ($storage = mysql_fetch_array($storage_data))
{
echo("Storage ".$storage['storage_descr'] . ": ");
$storage_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("storage-" . $storage['storage_mib'] . "-" . safename($storage['storage_descr']) . ".rrd");
if (!is_file($storage_rrd)) {
if (!is_file($storage_rrd))
{
rrdtool_create($storage_rrd, "--step 300 \
DS:used:GAUGE:600:0:U \
DS:free:GAUGE:600:0:U \
@@ -31,13 +32,14 @@ while($storage = mysql_fetch_array($storage_data)) {
}
$file = $config['install_dir']."/includes/polling/storage-".$storage['storage_mib'].".inc.php";
if(is_file($file)) {
if (is_file($file))
{
include($file);
} else {
### Generic poller goes here if we ever have a discovery module which uses it.
}
if($debug) {print_r($storage);}
if ($debug) {print_r($storage); }
if ($storage['size'])
{
@@ -56,13 +58,12 @@ while($storage = mysql_fetch_array($storage_data)) {
$update_query .= ", `storage_free` = '".$storage['free']."', `storage_size` = '".$storage['size']."'";
$update_query .= ", `storage_units` = '".$storage['units']."', `storage_perc` = '".$percent."'";
$update_query .= " WHERE `storage_id` = '".$storage['storage_id']."'";
if($debug) { echo("$update_query\n"); }
if ($debug) { echo("$update_query\n"); }
mysql_query($update_query);
echo("\n");
}
unset($storage);
?>
?>