graphing system updates

git-svn-id: http://www.observium.org/svn/observer/trunk@1599 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-08-01 14:17:06 +00:00
parent 29d169ce06
commit 3d937d28e9
46 changed files with 361 additions and 246 deletions

View File

@@ -0,0 +1,24 @@
<?php
if(is_numeric($id))
{
$query = mysql_query("SELECT * FROM `ucd_diskio` AS U, `devices` AS D WHERE U.diskio_id = '".$id."' AND U.device_id = D.device_id");
$disk = mysql_fetch_array($query);
if(is_numeric($disk['device_id']) && device_permitted($disk['device_id']))
{
$device = device_by_id_cache($disk['device_id']);
$rrd_filename = $config['rrd_dir'] . "/" . $disk['hostname'] . "/ucd_diskio-" . safename($disk['diskio_descr'] . ".rrd");
$title = generatedevicelink($device);
$title .= " :: Disk :: " . htmlentities($disk['diskio_descr']);
$auth = TRUE;
}
}
?>

View File

@@ -1,14 +1,5 @@
<?php
if($_GET['id']) { $id = $_GET['id']; }
$query = mysql_query("SELECT * FROM `ucd_diskio` AS U, `devices` AS D WHERE U.diskio_id = '".$id."' AND U.device_id = D.device_id");
$disk = mysql_fetch_array($query);
if(is_file($config['rrd_dir'] . "/" . $disk['hostname'] . "/ucd_diskio-" . safename($disk['diskio_descr'] . ".rrd"))) {
$rrd_filename = $config['rrd_dir'] . "/" . $disk['hostname'] . "/ucd_diskio-" . safename($disk['diskio_descr'] . ".rrd");
}
$rra_in = "read";
$rra_out = "written";