wip disk space graphs

[rrd-graphs.git] / cgi

diff --git a/cgi b/cgi
index cc6c5b2d39da6d67b4f416b8cfc532d221c8e91d..85777859b4254cee81442a2fef8eba2b91479152 100755 (executable)
--- a/cgi
+++ b/cgi
@@ -3,6 +3,7 @@
 use strict qw(vars);
 use CGI::SpeedyCGI qw/:standard -no_xhtml/;
 use CGI qw/:standard -no_xhtml/;
+use POSIX;
 
 sub fail ($) {
     print(header(-status=>500),
@@ -160,12 +161,9 @@ if (!open NM, '<', "$SELF/data/news/name-map") {
     }
 }
 
-sub news_name_sortkey {
-    return join '.', reverse split /\./, $_[0];
-}
+our @news_graphs;
 
-foreach my $src (sort { news_name_sortkey($a) cmp news_name_sortkey($b) }
-                <$SELF/data/news/*.rrd>) {
+foreach my $src (<$SELF/data/news/*.rrd>) {
     my $site= $src;
     $site =~ s,\.rrd$,, or next;
     $site =~ s,.*/,,;
@@ -176,6 +174,15 @@ foreach my $src (sort { news_name_sortkey($a) cmp news_name_sortkey($b) }
     my $newsite= $news_name_map{$site,$inout};
     $site= $newsite if defined $newsite;
     next if $site eq '-';
+    #my $sk= join '.', reverse split /\./, $site;
+    my $sk= $site;
+    $sk .= " $&" if $sk =~ s/^[^.]*(?:news|nntp|peer)[^.]*\.//;
+    $sk .= " $inout";
+    push @news_graphs, [ $sk, $site, $inout, $src ];
+}
+
+foreach my $siteinfo (sort { $a->[0] cmp $b->[0] } @news_graphs) {
+    my ($sortkey, $site, $inout, $src)= @$siteinfo;
     graph_of_group("News", $site, $inout,
          {
                Units => '[art/s]',
@@ -206,8 +213,97 @@ foreach my $src (sort { news_name_sortkey($a) cmp news_name_sortkey($b) }
           ]);
 }
 
+our %disk_rdev2rrd;
+
+foreach my $physdiskrrd (<$R/disk-*/disk_octets.rrd>) {
+    $physdiskrrd =~ s,octets\.rrd$,, or die;
+    $physdiskrrd =~ m,-([^/]+)/disk_$, or die;
+    my $physdev= "/dev/$1";
+    if (!stat $physdev) {
+        die "$physdev $!" unless $!==&ENOENT;
+        next;
+    }
+    die "$physdev ?" unless S_ISBLK((stat _)[2]);
+    $disk_rdev2rrd{(stat _)[6]}= $physdiskrrd;
 }
 
+our @disk_vgs;
+
+sub lvgraphs ($$) {
+    my ($vg, $factor) = @_;
+    my @lvs;
+    my $varname= $vg;
+    $varname =~ s/[^0-9a-zA-Y]/ sprintf "Z%02x", ord($&) /ge;
+    my $vginfo= {
+        Name => $vg,
+        Varname => $varname
+    };
+    foreach my $bo (qw(octets ops)) {
+        foreach my $rw (qw(read write)) {
+            $vginfo->{VarDefs}{$bo}{$rw}= [];
+            $vginfo->{Sumdef}{$bo}{$rw}= '0';
+        }
+    }
+    my $ix=0;
+    foreach my $lvpath (</dev/$vg/*>) {
+        my $lv= $lvpath; $lv =~ s,.*/,,;
+        if (!stat $lvpath) {
+            die "$lvpath $!" unless $!==&ENOENT;
+            next;
+        }
+        die "$lvpath ?" unless S_ISBLK((stat _)[2]);
+        my $rrd= $disk_rdev2rrd{(stat _)[6]};
+        next unless defined $rrd;
+
+        foreach my $bo (qw(octets ops)) {
+0 and
+            graph_of_group('IO', "$vg $lv", $bo, { Units => '[/s]' },
+              [
+               (map { ("DEF:$_=${rrd}${bo}.rrd:$_:AVERAGE") } qw(read write)),
+               "CDEF:mwrite=0,write,-",
+               "AREA:read#00f:read",
+               "AREA:mwrite#f00:write"
+               ]);
+            foreach my $rw (qw(read write)) {
+                $ix++;
+                my $tvar= "lv_${rw}_${bo}_${varname}_${ix}";
+                push @{ $vginfo->{VarDefs}{$bo}{$rw} },
+                    "DEF:$tvar=${rrd}${bo}.rrd:$rw:AVERAGE";
+                $vginfo->{Sumdef}{$bo}{$rw} .= ",$tvar,+";
+            }
+        }
+    }
+    foreach my $bo (qw(octets ops)) {
+        my $defs= [];
+        foreach my $rw (qw(read write)) {
+            push @$defs, @{ $vginfo->{VarDefs}{$bo}{$rw} };
+            push @$defs, "CDEF:${rw}_vg_${varname}=".
+                $vginfo->{Sumdef}{$bo}{$rw}.
+                sprintf(",%f,*", $rw eq 'write' ? -$factor : $factor);
+        }
+        $vginfo->{Defs}{$bo}= $defs;
+    }
+    push @disk_vgs, $vginfo;
+}
+
+lvgraphs('vg-main', 1);
+lvgraphs('vg-chiark-stripe', 0.5);
+
+foreach my $bo (qw(octets ops)) {
+    my @a= ();
+    foreach my $rw (qw(read write)) {
+        my $stack= '';
+        foreach my $vginfo (@disk_vgs) {
+            push @a, @{ $vginfo->{Defs}{$bo} };
+            push @a, "AREA:${rw}_vg_$vginfo->{Varname}#0ff:$vginfo->{Name}"
+                .$stack;
+            $stack= ':STACK';
+        }
+    }
+    graph_of_group('IO', 'T', $bo, { Units => '[/s]' }, \@a);
+}
+
+}
 #---------- right, that was the initialisation ----------
 
 our $self= url(-relative=>1);
@@ -218,6 +314,8 @@ if (param('debug')) {
 
 our @navsettings;
 
+@navsettings= ();
+
 sub navsetting ($) {
     my ($nav) = @_;
     my $var= $nav->{Variable};
@@ -264,6 +362,7 @@ if (defined $elem) {
     $sloth =~ m/^(\d+)$/ or die;
     $sloth= $1+0;
     my $end= $g->{TimeRanges}[$sloth];
+    die unless defined $end;
 
     my $cacheid= "$section!$group!$elem!$sloth!$width!$height";
     my $cachepath= "cache/$cacheid.png";
@@ -333,11 +432,11 @@ if ($detail) {
     my $elems= $group_elems{$section,$detail};
     die unless $elems;
     start_page("$detail graphs");
-    foreach my $xsloth (0..5) {
+    foreach my $tsloth (0..5) {
        foreach my $elem (@$elems) {
            my $g= $graphs{$section,$detail,$elem};
            die unless $g;
-           my $tsloth= $xsloth + $g->{Slower};
+           next if $tsloth >= @{ $g->{TimeRanges} };
            my $imgurl= "$self?graph=$detail&section=$section".
                "&sloth=$tsloth&elem=$elem";
            print a({href=>"$imgurl&w=780&h=800"},