The BIG graph update

[rrdtool.git] / src / rrd_tool.c

diff --git a/src/rrd_tool.c b/src/rrd_tool.c
index 4d6ffc9..1ee3a6d 100644 (file)
--- a/src/rrd_tool.c
+++ b/src/rrd_tool.c
@@ -30,14 +30,15 @@ void PrintUsage(char *cmd)
           "* create - create a new RRD\n\n"
           "\trrdtool create filename [--start|-b start time]\n"
           "\t\t[--step|-s step]\n"
-          "\t\t[DS:ds-name:DST:heartbeat:min:max] [RRA:CF:xff:steps:rows]\n\n";
+          "\t\t[DS:ds-name:DST:dst arguments]\n" 
+          "\t\t[RRA:CF:cf arguments]\n\n";
 
     char help_dump[] =
           "* dump - dump an RRD to XML\n\n"
           "\trrdtool dump filename.rrd >filename.xml\n\n";
 
     char help_info[] =
-          "* info - returns the configuration and status of the\n\n"
+          "* info - returns the configuration and status of the RRD\n\n"
           "\trrdtool info filename.rrd\n\n";
 
     char help_restore[] =
@@ -53,7 +54,8 @@ void PrintUsage(char *cmd)
           "\trrdtool update filename\n"
           "\t\t--template|-t ds-name:ds-name:...\n"
           "\t\ttime|N:value[:value...]\n\n"
-          "\t\t[ time:value[:value...] ..]\n\n";
+           "\t\tat-time@value[:value...]\n\n"
+          "\t\t[ time:value[:value...] ..]\n\n";
 
     char help_fetch[] =
           "* fetch - fetch data out of an RRD\n\n"
@@ -72,30 +74,40 @@ void PrintUsage(char *cmd)
           "\t\t[-u|--upper-limit value] [-z|--lazy]\n"
           "\t\t[-l|--lower-limit value] [-r|--rigid]\n"
            "\t\t[-g|--no-legend]\n"
+          "\t\t[--font FONTTAG:size:font]\n"
+           "\t\t[--zoom factor]\n"       
           "\t\t[--alt-autoscale]\n"
           "\t\t[--alt-autoscale-max]\n"
           "\t\t[--units-exponent value]\n"        
           "\t\t[--step seconds]\n"        
           "\t\t[-f|--imginfo printfstr]\n"
           "\t\t[-a|--imgformat GIF|PNG]\n"
-          "\t\t[-c|--color COLORTAG#rrggbb] [-t|--title string]\n"
+          "\t\t[-c|--color COLORTAG#rrggbb[aa]] [-t|--title string]\n"
           "\t\t[DEF:vname=rrd:ds-name:CF]\n"
           "\t\t[CDEF:vname=rpn-expression]\n"
           "\t\t[PRINT:vname:CF:format]\n"
           "\t\t[GPRINT:vname:CF:format]\n"
-          "\t\t[HRULE:value#rrggbb[:legend]]\n"
-          "\t\t[VRULE:value#rrggbb[:legend]]\n"
-          "\t\t[LINE{1|2|3}:vname[#rrggbb[:legend]]]\n"
-          "\t\t[AREA:vname[#rrggbb[:legend]]]\n"
-          "\t\t[STACK:vname[#rrggbb[:legend]]]\n\n";
+          "\t\t[HRULE:value#rrggbb[aa][:legend]]\n"
+          "\t\t[VRULE:value#rrggbb[aa][:legend]]\n"
+          "\t\t[LINE{1|2|3}:vname[#rrggbb[aa][:legend]]]\n"
+          "\t\t[AREA:vname[#rrggbb[aa][:legend]]]\n"
+          "\t\t[STACK:vname[#rrggbb[aa][:legend]]]\n\n";
 
     char help_tune[] =
           " * tune -  Modify some basic properties of an RRD\n\n"
           "\trrdtool tune filename\n"
           "\t\t[--heartbeat|-h ds-name:heartbeat]\n"
-          "\t\t[--data-source-type|-d ds-name:DST\n"
-          "\t\t[--data-source-rename|-r old-name:new-name\n"
-          "\t\t[--minimum|-i ds-name:min] [--maximum|-a ds-name:max]\n\n";
+          "\t\t[--data-source-type|-d ds-name:DST]\n"
+          "\t\t[--data-source-rename|-r old-name:new-name]\n"
+          "\t\t[--minimum|-i ds-name:min] [--maximum|-a ds-name:max]\n"
+          "\t\t[--deltapos scale-value] [--deltaneg scale-value]\n"
+          "\t\t[--failure-threshold integer]\n"
+          "\t\t[--window-length integer]\n"
+          "\t\t[--alpha adaptation-parameter]\n"
+          "\t\t[--beta adaptation-parameter]\n"
+          "\t\t[--gamma adaptation-parameter]\n"
+          "\t\t[--gamma-deviation adaptation-parameter]\n"
+          "\t\t[--aberrant-reset ds-name]\n\n";
 
     char help_resize[] =
           " * resize - alter the lenght of one of the RRAs in an RRD\n\n"
@@ -324,7 +336,7 @@ int HandleInputLine(int argc, char **argv, FILE* out)
            for (i = 0; i<ds_cnt;i++)
                printf("%14s",ds_namv[i]);
            printf ("\n\n");
-           for (i = start; i <= end; i += step){
+           for (i = start+step; i <= end; i += step){
                printf("%10lu:", i);
                for (ii = 0; ii < ds_cnt; ii++)
                    printf(" %0.10e", *(datai++));