cosmetics

diff --git a/cgi b/cgi
index e854d8b298d6783bc15309f9be3e3a580c62ffea..90876da6c5814cc2f8859550f7482605decce92d 100755 (executable)
--- a/cgi
+++ b/cgi
@@ -43,14 +43,14 @@ sub graph ($$$$) {
     graph_of_group($section, $gname,'', $basis, $args);
 }
 
-graph('General', 'Load', { },
+graph('General', 'Load and processes', { },
       [
        "DEF:load=$R/load/load.rrd:shortterm:AVERAGE",
        (map { "DEF:$_=$R/processes/ps_state-$_.rrd:value:AVERAGE" }
            qw(blocked running stopped paging sleeping zombies)),
-       "AREA:running#88f:running processes:STACK",
-       "AREA:blocked#8f8:blocked processes:STACK",
-       "AREA:paging#f88:paging processes:STACK",
+       "AREA:running#88f:running:STACK",
+       "AREA:blocked#8f8:disk wait:STACK",
+       "AREA:paging#f88:paging:STACK",
        "LINE:load#000:load",
        ]);
 
@@ -73,13 +73,12 @@ graph('General', 'CPU', { Units => '[%]' },
                (0..7)),
           "CDEF:$thing=0".join('', map { ",$thing$_,+" } (0..7)).",8.0,/";
        } qw(idle interrupt nice softirq steal system user wait)),
-       "AREA:system#00f:system:STACK",
-       "AREA:wait#f88:wait:STACK",
+       "CDEF:allintr=softirq,steal,+,interrupt,+",
+       "AREA:system#88f:system:STACK",
+       "AREA:allintr#ff0:interrupt:STACK",
+       "AREA:user#00f:user:STACK",
        "AREA:nice#ccc:nice:STACK",
-       "AREA:user#080:user:STACK",
-       "AREA:softirq#f0f:softirq:STACK",
-       "AREA:interrupt#ff0:interrupt:STACK",
-       "AREA:steal#0ff:steal:STACK",
+       "AREA:wait#f00:wait:STACK",
        ]);
 
 graph('General', 'Memory', { },
@@ -159,11 +158,11 @@ foreach my $src (<$SELF/data/news/*.rrd>) {
                qw(missing offered deferred unwanted accepted
                   rejected body_missing)),
           "AREA:accepted#00f:ok",
-          "AREA:body_missing#ff0:missing:STACK",
+          "AREA:body_missing#ff0:miss:STACK",
           "AREA:rejected#f00:rej:STACK",
           "AREA:unwanted#bbb:unw:STACK",
-          "AREA:deferred#eee:deferred:STACK",
-          "LINE:offered#080:",
+          "AREA:deferred#eee:defer:STACK",
+          "LINE:offered#080:offer",
           ] :
          [
           (map { "DEF:$_=$src:$_:AVERAGE" }