network; correct base on memory; users

diff --git a/cgi b/cgi
index de792b38bf9f1b0490f5f9e75124645b866c52ac..0efae637a950104006cf73411bc030b2b237cd9d 100755 (executable)
--- a/cgi
+++ b/cgi
@@ -71,7 +71,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 +88,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,.*/,,;