cleanups to how graphing works. start using device= for device graphs.

git-svn-id: http://www.observium.org/svn/observer/trunk@3167 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2012-05-11 13:26:14 +00:00
parent 62c302b960
commit d52042ba47
75 changed files with 226 additions and 194 deletions

View File

@@ -1,12 +1,12 @@
<?php
if (is_numeric($id) && ($config['allow_unauth_graphs'] || application_permitted($id)))
if (is_numeric($vars['id']) && ($config['allow_unauth_graphs'] || application_permitted($vars['id'])))
{
$app = get_application_by_id($id);
$app = get_application_by_id($vars['id']);
$device = device_by_id_cache($app['device_id']);
$title = generate_device_link($device);
$title .= $graph_subtype;
$auth = TRUE;
}
?>
?>

View File

@@ -1,9 +1,8 @@
<?php
include("memcached.inc.php");
include("includes/graphs/common.inc.php");
$device = device_by_id_cache($id);
$device = device_by_id_cache($vars['id']);
include("includes/graphs/common.inc.php");

View File

@@ -5,7 +5,7 @@ $scale_min = "0";
include("memcached.inc.php");
include("includes/graphs/common.inc.php");
$device = device_by_id_cache($id);
$device = device_by_id_cache($vars['id']);
$rrd_options .= " DEF:uptime=".$rrd_filename.":uptime:AVERAGE";
$rrd_options .= " CDEF:cuptime=uptime,86400,/";

View File

@@ -1,5 +1,7 @@
<?php
$device = device_by_id_cache($vars['id']);
$units = "b";
$total_units = "B";
$colours_in = "greens";

View File

@@ -1,5 +1,7 @@
<?php
$device = device_by_id_cache($vars['id']);
//$colour = "random";
$unit_text = "ShoutCast Server";
$total_text = "Total of all ShoutCast Servers";