From 2d284e20e8cc4e8317e8f0079f3aba13cb4614e2 Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Tue, 25 Oct 2011 10:52:29 +0000 Subject: [PATCH] better mempool graph git-svn-id: http://www.observium.org/svn/observer/trunk@2699 61d68cd4-352d-0410-923a-c4978735b2b8 --- html/includes/graphs/mempool/usage.inc.php | 53 +++++++++++++++++++--- 1 file changed, 46 insertions(+), 7 deletions(-) diff --git a/html/includes/graphs/mempool/usage.inc.php b/html/includes/graphs/mempool/usage.inc.php index ba8e01333f..ea39787271 100644 --- a/html/includes/graphs/mempool/usage.inc.php +++ b/html/includes/graphs/mempool/usage.inc.php @@ -6,14 +6,29 @@ $rrd_options .= " -u 100 -l 0 -E -b 1024 "; $iter = "1"; -$rrd_options .= " COMMENT:' Used\\n'"; - $colour="CC0000"; $colour_area="ffaaaa"; -$descr = substr(str_pad(short_hrDeviceDescr($mempool['mempool_descr']), 24),0,24); +if($width > "500") +{ + $descr_len=13; +} else { + $descr_len=8; + $descr_len += round(($width - 250) / 8); +} + +if($width > "500") +{ + $rrd_options .= " COMMENT:'".substr(str_pad($unit_text, $descr_len+5),0,$descr_len+5)."Total Used Free( Min Max Ave)'"; + $rrd_options .= " COMMENT:'\l'"; +} else { + $rrd_options .= " COMMENT:'".substr(str_pad($unit_text, $descr_len+5),0,$descr_len+5)."Total Used Free\l'"; +} + +$descr = substr(str_pad(short_hrDeviceDescr($mempool['mempool_descr']), $descr_len),0,$descr_len); $descr = str_replace(":", "\:", $descr); + $perc = round($mempool['mempool_perc'], 0); $background = get_percentage_colours($perc); @@ -21,10 +36,34 @@ $rrd_options .= " DEF:$mempool[mempool_id]used=$rrd_filename:used:AVERAGE"; $rrd_options .= " DEF:$mempool[mempool_id]free=$rrd_filename:free:AVERAGE"; $rrd_options .= " CDEF:$mempool[mempool_id]size=$mempool[mempool_id]used,$mempool[mempool_id]free,+"; $rrd_options .= " CDEF:$mempool[mempool_id]perc=$mempool[mempool_id]used,$mempool[mempool_id]size,/,100,*"; +$rrd_options .= " CDEF:$mempool[mempool_id]percx=100,$mempool[mempool_id]perc,-"; $rrd_options .= " AREA:$mempool[mempool_id]perc#" . $background['right'] . ":"; -$rrd_options .= " LINE1.25:$mempool[mempool_id]perc#" . $background['left'] . ":'$descr'"; -$rrd_options .= " GPRINT:$mempool[mempool_id]size:LAST:%6.2lf%sB"; -$rrd_options .= " GPRINT:$mempool[mempool_id]free:LAST:%6.2lf%sB"; -$rrd_options .= " GPRINT:$mempool[mempool_id]perc:LAST:%5.2lf%%\\\\n"; + +if($width > "500") +{ + $rrd_options .= " LINE1.25:$mempool[mempool_id]perc#" . $background['left'] . ":'$descr'"; + $rrd_options .= " GPRINT:$mempool[mempool_id]size:LAST:%6.2lf%sB"; + $rrd_options .= " GPRINT:$mempool[mempool_id]used:LAST:%6.2lf%sB"; + $rrd_options .= " GPRINT:$mempool[mempool_id]free:LAST:%6.2lf%sB"; + $rrd_options .= " GPRINT:$mempool[mempool_id]free:MIN:%5.2lf%sB"; + $rrd_options .= " GPRINT:$mempool[mempool_id]free:MAX:%5.2lf%sB"; + $rrd_options .= " GPRINT:$mempool[mempool_id]free:AVERAGE:%5.2lf%sB\\\\n"; + $rrd_options .= " COMMENT:'".substr(str_pad('', $descr_len+12),0,$descr_len+12)." '"; + $rrd_options .= " GPRINT:$mempool[mempool_id]percx:LAST:'%5.2lf%% '"; + $rrd_options .= " GPRINT:$mempool[mempool_id]perc:LAST:'%5.2lf%% '"; + $rrd_options .= " GPRINT:$mempool[mempool_id]perc:MIN:'%5.2lf%% '"; + $rrd_options .= " GPRINT:$mempool[mempool_id]perc:MAX:'%5.2lf%% '"; + $rrd_options .= " GPRINT:$mempool[mempool_id]perc:AVERAGE:%5.2lf%%\\\\n"; +} else { + $rrd_options .= " LINE1.25:$mempool[mempool_id]perc#" . $background['left'] . ":'$descr'"; + $rrd_options .= " GPRINT:$mempool[mempool_id]size:LAST:%6.2lf%sB"; + $rrd_options .= " GPRINT:$mempool[mempool_id]used:LAST:%6.2lf%sB"; + $rrd_options .= " GPRINT:$mempool[mempool_id]free:LAST:%6.2lf%sB"; + $rrd_options .= " COMMENT:'\l'"; + $rrd_options .= " COMMENT:'".substr(str_pad('', $descr_len+12),0,$descr_len+12)." '"; + $rrd_options .= " GPRINT:$mempool[mempool_id]percx:LAST:'%5.2lf%% '"; + $rrd_options .= " GPRINT:$mempool[mempool_id]perc:LAST:'%5.2lf%% '"; + $rrd_options .= " COMMENT:'\l'"; +} ?>