From cd3c5257c51811b957f174ebe6cc763ef409b6ef Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 26 Jun 2010 17:13:55 +0100 Subject: [PATCH] blow ups; sensible scales on disk --- cgi | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/cgi b/cgi index bf5ea7d..de792b3 100755 --- a/cgi +++ b/cgi @@ -96,7 +96,7 @@ foreach my $src (<$R/df/df-*.rrd>) { graph('Disk space', $vol, { Slower => 1, }, - [ + [ '-A','-l',0,'-r', qw(-b 1024 -l 0), (map { "DEF:$_=$src:$_:AVERAGE" } qw(free used)), "AREA:used#000:used:STACK", @@ -133,12 +133,25 @@ navsetting({ my $gname= param('graph'); +sub num_param ($$$$) { + my ($param,$def,$min,$max) = @_; + my $v= param($param); + return $def if !defined $v; + $v =~ m/^([1-9]\d{0,8})$/ or die; + $v= $1; + die unless $v >= $min && $v <= $max; + return $v + 0; +} + if ($gname) { my $g= $graphs{$section,$gname}; die unless $g; my @args= @{ $g->{Args} }; + my $width= num_param('w',370,100,1600); + my $height= num_param('h',200,100,1600); + my $end= param('end'); if (defined $end) { $end =~ m/^(\d+)$/ or die; @@ -153,7 +166,9 @@ if ($gname) { $title .= " $g->{Units}" if $g->{Units}; unshift @args, '-t', $title; - exec qw(rrdtool graph - -a PNG --full-size-mode -w 370 -h 200), @args; + exec (qw(rrdtool graph - -a PNG --full-size-mode), + '-w',$width, '-h',$height, + @args); die $!; } @@ -198,7 +213,8 @@ if ($detail) { die unless $g; start_page("$detail graphs"); foreach my $end (@timeranges[$g->{Slower}..$g->{Slower}+3]) { - print "\n"; + my $imgurl= "$self?graph=$detail§ion=$section&end=$end"; + print "\n"; } print end_html(); exit 0; -- 2.30.2