many lovely GUI changes.

git-svn-id: http://www.observium.org/svn/observer/trunk@2454 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-09-14 13:38:01 +00:00
parent ef143ece1b
commit e9f14f8f85
19 changed files with 743 additions and 158 deletions
@@ -21,7 +21,7 @@ $rrd_options .= 'DEF:g='.$rrd_filename.':sb_closing:AVERAGE ';
$rrd_options .= 'DEF:h='.$rrd_filename.':sb_logging:AVERAGE ';
$rrd_options .= 'DEF:i='.$rrd_filename.':sb_graceful:AVERAGE ';
$rrd_options .= 'DEF:j='.$rrd_filename.':sb_idle:AVERAGE ';
$rrd_options .= 'COMMENT:"Scoreboard Current Average Maximum" ';
$rrd_options .= 'COMMENT:"Scoreboard Current Average Maximum\n" ';
$rrd_options .= 'AREA:a#4444FFFF:"Waiting " ';
$rrd_options .= 'GPRINT:a:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:a:AVERAGE:"%6.2lf %s" ';
+5 -1
View File
@@ -7,6 +7,10 @@ if ($_GET['height']) { $height = mres($_GET['height']); }
if ($_GET['inverse']) { $in = 'out'; $out = 'in'; } else { $in = 'in'; $out = 'out'; }
if ($_GET['legend'] == "no") { $rrd_options = " -g"; }
if ($_GET['title'] == "yes") { $rrd_options .= " --title='".$graph_title."' "; }
if (isset($_GET['graph_title'])) { $rrd_options .= " --title='".$_GET['graph_title']."' "; }
if (!$scale_min && !$scale_max) { $rrd_options .= " --alt-autoscale-max"; }
if (isset($scale_min)) { $rrd_options .= " -l $scale_min"; }
@@ -26,4 +30,4 @@ else { $rrd_options .= " --font LEGEND:8:" . $config['mono_font'
$rrd_options .= " --font-render-mode normal";
?>
?>
+1
View File
@@ -4,6 +4,7 @@ if (is_numeric($id) && ($config['allow_unauth_graphs'] || device_permitted($id))
{
$device = device_by_id_cache($id);
$title = generate_device_link($device);
$graph_title = $device['hostname'];
$auth = TRUE;
}
+2
View File
@@ -39,6 +39,8 @@ foreach (dbFetchRows("SELECT * FROM `ports` WHERE `device_id` = ?", array($id))
$rra_in = "INOCTETS";
$rra_out = "OUTOCTETS";
$graph_title .= "::bits";
$colour_line_in = "006600";
$colour_line_out = "000099";
$colour_area_in = "CDEB8B";
+4 -1
View File
@@ -6,9 +6,12 @@ if (is_numeric($id) && ($config['allow_unauth_graphs'] || port_permitted($id)))
$device = device_by_id_cache($port['device_id']);
$title = generate_device_link($device);
$title .= " :: Port ".generate_port_link($port);
$graph_title = $device['hostname'] . "::" . $port['ifDescr'];
$auth = TRUE;
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/port-" . safename($port['ifIndex'] . ".rrd");
}
?>
?>