chiark / gitweb /
shows the news graphs
[rrd-graphs.git] / cgi
diff --git a/cgi b/cgi
index de792b38bf9f1b0490f5f9e75124645b866c52ac..aed4059081c9c9490e56305f7fac382c28901cfe 100755 (executable)
--- a/cgi
+++ b/cgi
@@ -13,22 +13,34 @@ sub fail ($) {
 }
 
 our $R= '/var/lib/collectd/rrd/chiark.greenend.org.uk';
+our $SELF= '/home/ijackson/things/rrd-graphs';
 
 my $self= url(-relative=>1);
 
-our (@sections, %sections, %graphs);
+our (@sections, %section_groups, %group_elems, %graphs);
 
 our @timeranges= (3600, map { $_*86400 } qw(1 7 28), 13*7+1);
 
-sub graph ($$$$) {
-    my ($section, $gname, $basis, $args) = @_;
+sub graph_of_group ($$$$$) {
+    my ($section, $group, $elem, $basis, $args) = @_;
     $basis->{Args}= $args;
     $basis->{Slower}= 0 unless exists $basis->{Slower};
-    $graphs{$section,$gname}= $basis;
-    if (!exists $sections{$section}) {
-       push @sections, $section;
+
+    $graphs{$section,$group,$elem}= $basis;
+    if (!exists $group_elems{$section,$group}) {
+       # new group then
+       if (!exists $section_groups{$section}) {
+           # new section even
+           push @sections, $section;
+       }
+       push @{ $section_groups{$section} }, $group;
     }
-    push @{ $sections{$section} }, $gname;
+    push @{ $group_elems{$section,$group} }, $elem;
+}
+
+sub graph ($$$$) {
+    my ($section, $gname, $basis, $args) = @_;
+    graph_of_group($section, $gname,'', $basis, $args);
 }
 
 graph('General', 'Load', { },
@@ -48,9 +60,9 @@ graph('General', 'Processes', { },
            qw(blocked running stopped paging sleeping zombies)),
        "CDEF:busy=0".(join '', map { ",$_,+" } qw(running blocked paging)),
        "AREA:sleeping#ccc:sleeping:STACK",
-       "AREA:stopped#f00:stopped:STACK",
-       "AREA:zombies#0f0:zombie:STACK",
-       "AREA:busy#f00:busy:STACK",
+       "AREA:stopped#00f:stopped:STACK",
+       "AREA:zombies#ff0:zombie:STACK",
+       "AREA:busy#000:busy:STACK",
        ]);
 
 graph('General', 'CPU', { Units => '[%]' },
@@ -71,7 +83,7 @@ graph('General', 'CPU', { Units => '[%]' },
        ]);
 
 graph('General', 'Memory', { },
-      [
+      [ '-b',1024,
        (map { "DEF:swap_$_=$R/swap/swap-$_.rrd:value:AVERAGE" }
            qw(free used cached)),
        (map { "DEF:mem_$_=$R/memory/memory-$_.rrd:value:AVERAGE" }
@@ -88,6 +100,31 @@ graph('General', 'Memory', { },
        "AREA:mem_free#ccc:unused memory:STACK",
        ]);
 
+graph('General', 'Network', { Units => '[/sec; tx +ve; errs x1000]' },
+      [
+       (map {
+          ("DEF:tx_$_=$R/interface/if_$_-eth0.rrd:tx:AVERAGE",
+           "DEF:rx_$_=$R/interface/if_$_-eth0.rrd:rx:AVERAGE",
+           "CDEF:mrx_$_=0,rx_$_,-")
+          } qw(octets packets errors)),
+       (map {
+          ("CDEF:${_}_kb=${_}_octets,1024,/",
+           "CDEF:${_}_errsx=${_}_errors,1000,*")
+          } qw(mrx tx)),
+       "AREA:tx_kb#080:kby",
+       "LINE:tx_packets#0f0:pkts",
+       "LINE:tx_errsx#000:errs",
+       "AREA:mrx_kb#008:kby",
+       "LINE:mrx_packets#00f:pkts",
+       "LINE:mrx_errsx#444:errs",
+      ]);
+
+graph('General', 'Users', {  },
+      [
+       "DEF:users=$R/users/users.rrd:users:AVERAGE",
+       "LINE:users#008:users"
+       ]);
+
 foreach my $src (<$R/df/df-*.rrd>) {
     my $vol= $src;
     $vol =~ s,.*/,,;
@@ -104,6 +141,44 @@ foreach my $src (<$R/df/df-*.rrd>) {
           ]);
 }
 
+foreach my $src (<$SELF/news-stats/*.rrd>) {
+    my $site= $src;
+    $site =~ s,.*/,,;
+    $site =~ s,\.rrd$,,;
+    $site =~ s,_(in|out)$,,;
+    my $inout= $1;
+    $site =~ s/^([-.0-9a-z]+)_//;
+    my $us= $1; # all very well but we ignore it
+    graph_of_group("News", $site, $inout,
+         {
+               Slower => 1,
+           }, $inout eq 'out' ?
+         [
+          (map { "DEF:$_=$src:$_:AVERAGE" }
+               qw(missing offered deferred unwanted accepted
+                  rejected body_missing)),
+          "AREA:accepted#00f:ok",
+          "AREA:body_missing#ff0:missing:STACK",
+          "AREA:rejected#f00:rej:STACK",
+          "AREA:unwanted#bbb:unw:STACK",
+          "AREA:deferred#eee:deferred:STACK",
+          "LINE:offered#080:",
+          ] :
+         [
+          (map { "DEF:$_=$src:$_:AVERAGE" }
+               qw(accepted refused rejected duplicate)),
+          (map { ("DEF:bytes_$_=$src:${_}_size:AVERAGE",
+                  "CDEF:kb_$_=bytes_$_,1024,/")
+             } qw(accepted duplicate)),
+          "AREA:accepted#00f:ok:STACK",
+          "AREA:rejected#f00:rej:STACK",
+          "AREA:duplicate#000:dupe:STACK",
+          "AREA:refused#bbb:unw:STACK",
+          "LINE:kb_duplicate#ff0:kb dupe",
+          "LINE:kb_accepted#008:kb",
+          ]);
+}
+
 if (param('debug')) {
     print "Content-Type: text/plain\n\n";
 }
@@ -131,8 +206,6 @@ navsetting({
 });
 
 
-my $gname= param('graph');
-
 sub num_param ($$$$) {
     my ($param,$def,$min,$max) = @_;
     my $v= param($param);
@@ -143,8 +216,11 @@ sub num_param ($$$$) {
     return $v + 0;
 }
 
-if ($gname) {
-    my $g= $graphs{$section,$gname};
+my $group= param('graph');
+
+my $elem= param('elem');
+if (defined $elem) {
+    my $g= $graphs{$section,$group,$elem};
     die unless $g;
 
     my @args= @{ $g->{Args} };
@@ -152,17 +228,21 @@ if ($gname) {
     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;
-        unshift @args, qw(--end now --start), "end-${end}s";
-    }
+    my $sloth= param('sloth');
+    die unless defined $sloth;
+    $sloth =~ m/^(\d+)$/ or die;
+    my $end= $timeranges[$sloth];
+    die unless defined $end;
+    unshift @args, qw(--end now --start), "end-${end}s";
+    
     if (param('debug')) {
         print((join "\n",@args),"\n"); exit 0;
     }
     print "Content-Type: image/png\n\n";
 
-    my $title= $gname;
+    my $title= $group;
+    if (length $elem) { $title.= " $elem"; }
+
     $title .= " $g->{Units}" if $g->{Units};
     unshift @args, '-t', $title;
     
@@ -209,12 +289,18 @@ sub start_page ($) {
 
 my $detail= param('detail');
 if ($detail) {
-    my $g= $graphs{$section,$detail};
-    die unless $g;
+    my $elems= $group_elems{$section,$detail};
+    die unless $elems;
     start_page("$detail graphs");
-    foreach my $end (@timeranges[$g->{Slower}..$g->{Slower}+3]) {
-       my $imgurl= "$self?graph=$detail&section=$section&end=$end";
-        print "<a href=\"$imgurl&w=780&h=800\"><img src=\"$imgurl\"></a>\n";
+    foreach my $elem (@$elems) {
+       my $g= $graphs{$section,$detail,$elem};
+       die unless $g;
+       foreach my $tsloth ($g->{Slower}..$g->{Slower}+3) {
+           my $imgurl= "$self?graph=$detail&section=$section".
+               "&sloth=$tsloth&elem=$elem";
+           print "<a href=\"$imgurl&w=780&h=800\">";
+           print "<img src=\"$imgurl\"></a>\n";
+       }
     }
     print end_html();
     exit 0;
@@ -242,11 +328,17 @@ if (param('debug')) {
 
 start_page("$section graphs");
 
-foreach my $gname (@{ $sections{$section} }) {
-    my $g= $graphs{$section,$gname};
-    print "<a href=\"$self?detail=$gname&section=$section\">";
-    my $end= $timeranges[$g->{Slower}+$sloth];
-    my $imgurl= "$self?graph=$gname&section=$section&end=$end";
-    print "<img src=\"$imgurl\"></a>\n";
+foreach my $group (@{ $section_groups{$section} }) {
+    print "<a href=\"$self?detail=$group&section=$section\">";
+    my $imgurl= "$self?graph=$group&section=$section";
+    my $elems= $group_elems{$section,$group};
+    if (@$elems > 1) { print "<table><tr><td>"; }
+    foreach my $elem (@$elems) {
+       my $g= $graphs{$section,$group,$elem};
+       print "<img src=\"$imgurl&elem=$elem&sloth=".
+           ($sloth + $g->{Slower})."\">";
+    }
+    if (@$elems > 1) { print "</td></tr></table>"; }
+    print "</a>\n";
 }