From 8e91faddff7cd9f6b5ef9a35a3319eebf10fb609 Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Sat, 12 Jun 2010 16:08:02 +0000 Subject: [PATCH] prettier graphs for voltage/processor git-svn-id: http://www.observium.org/svn/observer/trunk@1153 61d68cd4-352d-0410-923a-c4978735b2b8 --- html/includes/graphs/processor.inc.php | 6 ++++++ html/includes/graphs/voltage.inc.php | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/html/includes/graphs/processor.inc.php b/html/includes/graphs/processor.inc.php index f3090e1f4f..134096b2d4 100755 --- a/html/includes/graphs/processor.inc.php +++ b/html/includes/graphs/processor.inc.php @@ -17,6 +17,12 @@ include("common.inc.php"); $descr = str_replace(":", "\:", $descr); $rrd = $config['rrd_dir'] . "/".$proc['hostname']."/" . safename("processor-" . $proc['processor_type'] . "-" . $proc['processor_index'] . ".rrd"); $rrd_options .= " DEF:proc" . $proc['hrDeviceIndex'] . "=$rrd:usage:AVERAGE "; + $rrd_options .= " DEF:proc_max=$rrd:usage:MAX"; + $rrd_options .= " DEF:proc_min=$rrd:usage:MIN"; + + $rrd_options .= " AREA:proc_max#c5c5c5"; + $rrd_options .= " AREA:proc_min#ffffffff"; + $rrd_options .= " LINE1:proc" . $proc['hrDeviceIndex'] . "#" . $colour . ":'" . $descr . "' "; $rrd_options .= " GPRINT:proc" . $proc['hrDeviceIndex'] . ":LAST:%3.0lf"; $rrd_options .= " GPRINT:proc" . $proc['hrDeviceIndex'] . ":MAX:%3.0lf\\\l "; diff --git a/html/includes/graphs/voltage.inc.php b/html/includes/graphs/voltage.inc.php index 73f3e994df..6004120130 100644 --- a/html/includes/graphs/voltage.inc.php +++ b/html/includes/graphs/voltage.inc.php @@ -4,6 +4,8 @@ $scale_min = "0"; include("common.inc.php"); +$rrd_options .= " -A "; + $rrd_options .= " COMMENT:' Last Max\\n'"; $voltage = mysql_fetch_array(mysql_query("SELECT * FROM voltage where volt_id = '".mres($_GET['id'])."'")); @@ -15,7 +17,13 @@ include("common.inc.php"); $rrd_filename = $config['rrd_dir'] . "/".$hostname."/" . safename("volt-" . $voltage['volt_descr'] . ".rrd"); $rrd_options .= " DEF:volt=$rrd_filename:volt:AVERAGE"; - $rrd_options .= " AREA:volt#FFFF99"; + $rrd_options .= " DEF:volt_max=$rrd_filename:volt:MAX"; + $rrd_options .= " DEF:volt_min=$rrd_filename:volt:MIN"; + + $rrd_options .= " AREA:volt_max#c5c5c5"; + $rrd_options .= " AREA:volt_min#ffffffff"; + + #$rrd_options .= " AREA:volt#FFFF99"; $rrd_options .= " LINE1.5:volt#cc0000:'" . $voltage['volt_descr_fixed']."'"; $rrd_options .= " GPRINT:volt:LAST:%3.2lfV"; $rrd_options .= " GPRINT:volt:MAX:%3.2lfV\\\\l";