itanic: database.h: Changes and reordering

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

diff --git a/database.h b/database.h
index 80aea773f2c0fb90896dd67e5bcd6974edbaf836..22ad2d83dd5cc49d4f99d0986f3d4e9e19a52993 100644 (file)
--- a/database.h
+++ b/database.h
@@ -144,17 +144,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",
-       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: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 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
 };
 
@@ -166,17 +167,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",
-       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: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 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
 };
 
@@ -246,10 +248,10 @@ const char *powertext[] = {
        "COMMENT: \\n",
        blank,
        "STACK:muutu#808080:Muu         ",
-       "GPRINT:huipp:MIN:" numfmt,
-       "GPRINT:huipp:MAX:" numfmt,
-       "GPRINT:huipp:AVERAGE:" numfmt,
-       "GPRINT:huipp:LAST:" numfmt "\\n",
+       "GPRINT:muutu:MIN:" numfmt,
+       "GPRINT:muutu:MAX:" numfmt,
+       "GPRINT:muutu:AVERAGE:" numfmt,
+       "GPRINT:muutu:LAST:" numfmt "\\n",
        "COMMENT: \\n",
        blank,
        "STACK:lauhd#ff0000:Lauhdevoima ",
@@ -259,13 +261,6 @@ const char *powertext[] = {
        "GPRINT:lauhd:LAST:" numfmt "\\n",
        "COMMENT: \\n",
        blank,
-       "STACK:huipp#ff0000:Huippuvoima ",
-       "GPRINT:huipp:MIN:" numfmt,
-       "GPRINT:huipp:MAX:" numfmt,
-       "GPRINT:huipp:AVERAGE:" numfmt,
-       "GPRINT:huipp:LAST:" numfmt "\\n",
-       "COMMENT: \\n",
-       blank,
        "STACK:vesiv#0000ff:Vesivoima   ",
        "GPRINT:vesiv:MIN:" numfmt,
        "GPRINT:vesiv:MAX:" numfmt,
@@ -279,6 +274,13 @@ const char *powertext[] = {
        "GPRINT:tuont:AVERAGE:" numfmt,
        "GPRINT:tuont:LAST:" numfmt "\\n",
        "COMMENT: \\n",
+       blank,
+       "STACK:huipp#ff0000:Huippuvoima ",
+       "GPRINT:huipp:MIN:" numfmt,
+       "GPRINT:huipp:MAX:" numfmt,
+       "GPRINT:huipp:AVERAGE:" numfmt,
+       "GPRINT:huipp:LAST:" numfmt "\\n",
+       "COMMENT: \\n",
        0
 };
 
@@ -341,18 +343,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
 };
 
@@ -372,7 +377,6 @@ const char *freqoptions[] = {
 const char *deviationoptions[] = {
        "--alt-autoscale",
        "--vertical-label", "Aikapoikkeama s",
-       "--units-exponent", "-3",
        0
 };