database.h: Multiple fixes

-Network rate multiplier changes dynamically (k, M, G)

-Memory statistics base is 1024 instead of 1000

-Network autoscale minimum is 0

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>

diff --git a/database.h b/database.h
index 80788708787b056c0abc4f627b3d24079394b208..1c3476e6e43d0b2639bc6595a786bcd269a3e209 100644 (file)
--- a/database.h
+++ b/database.h
@@ -140,17 +140,18 @@ const char *eth0text[] = {
        "COMMENT:                          "
        "MIN            MAX             AVG             Last\\n",
        blank,
-       "LINE1:rxb#0000FF:eth0 rx bytes        ",
-       "GPRINT:rxb:MIN:  %5.0lf B",
-       "GPRINT:rxb:MAX:     %5.0lf B",
-       "GPRINT:rxb:AVERAGE:      %5.0lf B",
-       "GPRINT:rxb:LAST:      %5.0lf B\\n",
+       "LINE1:rxb#0000FF:eth0 receive     ",
+       "GPRINT:rxb:MIN:  % 3.2lf %sB",
+       "GPRINT:rxb:MAX:     % 3.2lf %sB",
+       "GPRINT:rxb:AVERAGE:      % 3.2lf %sB",
+       "GPRINT:rxb:LAST:      % 3.2lf %sB\\n",
        blank,
-       "LINE1:txb#00FF00:eth0 tx bytes        ",
-       "GPRINT:txb:MIN:  %5.0lf B",
-       "GPRINT:txb:MAX:     %5.0lf B",
-       "GPRINT:txb:AVERAGE:      %5.0lf B",
-       "GPRINT:txb:LAST:      %5.0lf B\\n",
+       "LINE1:txb#00FF00:eth0 transmit    ",
+       "GPRINT:txb:MIN:  % 3.2lf %sB",
+       "GPRINT:txb:MAX:     % 3.2lf %sB",
+       "GPRINT:txb:AVERAGE:      % 3.2lf %sB",
+       "GPRINT:txb:LAST:      % 3.2lf %sB\\n",
+       "COMMENT: \\n",
        0
 };
 
@@ -162,17 +163,18 @@ const char *eth1text[] = {
        "COMMENT:                          "
        "MIN            MAX             AVG             Last\\n",
        blank,
-       "LINE1:rxb#0000FF:eth1 rx bytes        ",
-       "GPRINT:rxb:MIN:  %5.0lf B",
-       "GPRINT:rxb:MAX:     %5.0lf B",
-       "GPRINT:rxb:AVERAGE:      %5.0lf B",
-       "GPRINT:rxb:LAST:      %5.0lf B\\n",
+       "LINE1:rxb#0000FF:eth1 receive     ",
+       "GPRINT:rxb:MIN:  % 3.2lf %sB",
+       "GPRINT:rxb:MAX:     % 3.2lf %sB",
+       "GPRINT:rxb:AVERAGE:      % 3.2lf %sB",
+       "GPRINT:rxb:LAST:      % 3.2lf %sB\\n",
        blank,
-       "LINE1:txb#00FF00:eth1 tx bytes        ",
-       "GPRINT:txb:MIN:  %5.0lf B",
-       "GPRINT:txb:MAX:     %5.0lf B",
-       "GPRINT:txb:AVERAGE:      %5.0lf B",
-       "GPRINT:txb:LAST:      %5.0lf B\\n",
+       "LINE1:txb#00FF00:eth1 transmit    ",
+       "GPRINT:txb:MIN:  % 3.2lf %sB",
+       "GPRINT:txb:MAX:     % 3.2lf %sB",
+       "GPRINT:txb:AVERAGE:      % 3.2lf %sB",
+       "GPRINT:txb:LAST:      % 3.2lf %sB\\n",
+       "COMMENT: \\n",
        0
 };
 
@@ -220,18 +222,21 @@ const char *memoptions[] = {
        "--vertical-label",
        "Mem usage (MB)",
        "--units-exponent", "0",
+       "--base", "1024",
        0
 };
 
 const char *eth0options[] = {
-       "--alt-autoscale",
+       "--alt-autoscale-max",
        "--vertical-label", "Bytes",
+       "--lower-limit", "0",
        0
 };
 
 const char *eth1options[] = {
-       "--alt-autoscale",
+       "--alt-autoscale-max",
        "--vertical-label", "Bytes",
+       "--lower-limit", "0",
        0
 };
 
@@ -321,7 +326,6 @@ static struct rrd_image *systemp_images[] = {
        0
 };
 
-
 #define SOURCE_ENTRY(_name, _type, _heartbeat, _min, _max) \
        {                                                  \
                .name = _name,                             \