From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 26 Jun 2010 14:40:31 +0000 (+0100)
Subject: central timeranges
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=b862fd52e8bd16830c2e499dca36d26c7c61c061;p=rrd-graphs.git

central timeranges
---

diff --git a/cgi b/cgi
index 85c2e52..3c0e124 100755
--- a/cgi
+++ b/cgi
@@ -18,12 +18,12 @@ my $self= url(-relative=>1);
 
 our (@sections, %sections, %graphs);
 
+our @timeranges= (3600, map { $_*86400 } qw(1 7 28), 13*7+1);
+
 sub graph ($$$$) {
     my ($section, $gname, $basis, $args) = @_;
     $basis->{Args}= $args;
-    $basis->{DefTimeRange} ||= 3600;
-    $basis->{MinTimeRange} ||= 3600;
-    $basis->{MaxTimeRange} ||= 28*86400;
+    $basis->{Slower}= 0 unless exists $basis->{Slower};
     $graphs{$section,$gname}= $basis;
     if (!exists $sections{$section}) {
 	push @sections, $section;
@@ -76,9 +76,7 @@ foreach my $src (<$R/df/df-*.rrd>) {
     $vol =~ s,^df-,,;
     $vol =~ s,\.rrd$,,;
     graph('Disk space', $vol, {
-	     MinTimeRange => 86400,
-	     MaxTimeRange => (13*7+1)*86400,
-	     DefTimeRange => 7*86400
+	     Slower => 1,
           },
 	  [
 	   qw(-b 1024 -l 0),
@@ -144,9 +142,7 @@ if ($detail) {
     my $g= $graphs{$section,$detail};
     die unless $g;
     start_page("$detail graphs");
-    foreach my $end (qw(300 3600 86400 604800 2419200 7948800)) {
-	next if $end < $g->{MinTimeRange};
-	next if $end > $g->{MaxTimeRange};
+    foreach my $end (@timeranges[$g->{Slower}..$g->{Slower}+3]) {
         print "<img src=\"$self?graph=$detail&section=$section&end=$end\">\n";
     }
     print end_html();
@@ -163,7 +159,9 @@ start_page("$section graphs");
 
 foreach my $gname (@{ $sections{$section} }) {
     my $g= $graphs{$section,$gname};
-    print "<a href=\"$self?detail=$gname&section=$section\">"; #,h2($gname),"</a>";
-    print "<img src=\"$self?graph=$gname&section=$section&end=$g->{DefTimeRange}\"></a>\n";
+    print "<a href=\"$self?detail=$gname&section=$section\">";
+    my $end= $timeranges[$g->{Slower}+1];
+    my $imgurl= "$self?graph=$gname&section=$section&end=$end";
+    print "<img src=\"$imgurl\"></a>\n";
 }