/*****************************************************************************
- * RRDtool 1.0.33 Copyright Tobias Oetiker, 1997 - 2001
+ * RRDtool 1.1.x Copyright Tobias Oetiker, 1997 - 2002
*****************************************************************************
* rrd_tool.c Startup wrapper
*****************************************************************************/
#include "rrd_tool.h"
+#include "rrd_xport.h"
void PrintUsage(char *cmd);
int CountArgs(char *aLine);
int CreateArgs(char *, char *, int, char **);
int HandleInputLine(int, char **, FILE*);
+int RemoteMode=0;
+int ChangeRoot=0;
#define TRUE 1
#define FALSE 0
#define MAX_LENGTH 10000
{
char help_main[] =
- "RRDtool 1.0.33 Copyright 1997-2001 by Tobias Oetiker <tobi@oetiker.ch>\n\n"
+ "RRDtool 1.1.x Copyright 1997-2001 by Tobias Oetiker <tobi@oetiker.ch>\n\n"
"Usage: rrdtool [options] command command_options\n\n";
char help_list[] =
"Valid commands: create, update, graph, dump, restore,\n"
- "\t\tlast, info, fetch, tune, resize\n\n";
+ "\t\tlast, info, fetch, tune, resize, xport\n\n";
+
+ char help_listremote[] =
+ "Valid remote commands: quit, ls, cd, mkdir\n\n";
+
char help_create[] =
"* 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[] =
"\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[-a|--imgformat PNG]\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"
"\trrdtool resize filename rranum GROW|SHRINK rows\n\n";
+ char help_xport[] =
+ "* xport - generate XML dump from one or several RRD\n\n"
+ "\trrdtool xport [-s|--start seconds] [-e|--end seconds]\n"
+ "\t\t[-m|--maxrows rows]\n"
+ "\t\t[--step seconds]\n"
+ "\t\t[DEF:vname=rrd:ds-name:CF]\n"
+ "\t\t[CDEF:vname=rpn-expression]\n"
+ "\t\t[XPORT:vname:legend]\n\n";
+
+ char help_quit[] =
+ " * quit - closeing a session in remote mode\n\n"
+ "\trrdtool quit\n\n";
+
+ char help_ls[] =
+ " * ls - lists all *.rrd files in current directory\n\n"
+ "\trrdtool ls\n\n";
+
+ char help_cd[] =
+ " * cd - changes the current directory\n\n"
+ "\trrdtool cd new direcotry\n\n";
+
+ char help_mkdir[] =
+ " * mkdir - creates a new direcotry\n\n"
+ "\trrdtool mkdir newdirecotryname\n\n";
+
char help_lic[] =
"RRDtool is distributed under the Terms of the GNU General\n"
"Public License Version 2. (www.gnu.org/copyleft/gpl.html)\n\n"
"For more information read the RRD manpages\n\n";
enum { C_NONE, C_CREATE, C_DUMP, C_INFO, C_RESTORE, C_LAST,
- C_UPDATE, C_FETCH, C_GRAPH, C_TUNE, C_RESIZE };
+ C_UPDATE, C_FETCH, C_GRAPH, C_TUNE, C_RESIZE, C_XPORT,
+ C_QUIT, C_LS, C_CD, C_MKDIR };
int help_cmd = C_NONE;
help_cmd = C_TUNE;
else if (!strcmp(cmd,"resize"))
help_cmd = C_RESIZE;
+ else if (!strcmp(cmd,"xport"))
+ help_cmd = C_XPORT;
+ else if (!strcmp(cmd,"quit"))
+ help_cmd = C_QUIT;
+ else if (!strcmp(cmd,"ls"))
+ help_cmd = C_LS;
+ else if (!strcmp(cmd,"cd"))
+ help_cmd = C_CD;
+ else if (!strcmp(cmd,"mkdir"))
+ help_cmd = C_MKDIR;
}
fputs(help_main, stdout);
switch (help_cmd)
{
case C_NONE:
fputs(help_list, stdout);
+ if (RemoteMode){
+ fputs(help_listremote, stdout);
+ }
break;
case C_CREATE:
fputs(help_create, stdout);
case C_RESIZE:
fputs(help_resize, stdout);
break;
+ case C_XPORT:
+ fputs(help_xport, stdout);
+ break;
+ case C_QUIT:
+ fputs(help_quit, stdout);
+ break;
+ case C_LS:
+ fputs(help_ls, stdout);
+ break;
+ case C_CD:
+ fputs(help_cd, stdout);
+ break;
+ case C_MKDIR:
+ fputs(help_mkdir, stdout);
+ break;
}
fputs(help_lic, stdout);
}
{
char **myargv;
char aLine[MAX_LENGTH];
+ char *firstdir="";
#ifdef MUST_DISABLE_SIGFPE
signal(SIGFPE,SIG_IGN);
#endif
return 0;
}
- if ((argc == 2) && !strcmp("-",argv[1]))
+ if (((argc == 2)||(argc == 3)) && !strcmp("-",argv[1]))
{
#if HAVE_GETRUSAGE
struct rusage myusage;
tz.tz_dsttime=0;
gettimeofday(&starttime,&tz);
#endif
+ RemoteMode=1;
+#ifndef WIN32
+ if ((argc == 3) && strcmp("",argv[2])){
+ if (getuid()==0){
+ chroot(argv[2]);
+ if (errno!=0){
+ fprintf(stderr,"ERROR: can't change root to '%s' errno=%d\n",
+ argv[2],errno);
+ exit(errno);
+ }
+ ChangeRoot=1;
+ firstdir="/";
+ }
+ else{
+ firstdir=argv[2];
+ }
+ }
+ if (strcmp(firstdir,"")){
+ chdir(firstdir);
+ if (errno!=0){
+ fprintf(stderr,"ERROR: %s\n",strerror(errno));
+ exit(errno);
+ }
+ }
+#else
+ fprintf(stderr,"ERROR: change root only in unix "
+ "enviroment posible\n");
+ exit(1);
+#endif
while (fgets(aLine, sizeof(aLine)-1, stdin)){
if ((argc = CountArgs(aLine)) == 0) {
PrintUsage(argv[1]);
exit(0);
}
+ else if (argc == 3 && !strcmp(argv[1],"help"))
+ {
+ PrintUsage(argv[2]);
+ exit(0);
+ }
else
HandleInputLine(argc, argv, stderr);
return 0;
int HandleInputLine(int argc, char **argv, FILE* out)
{
+ DIR *curdir; /* to read current dir with ls */
+ struct dirent *dent;
+ struct stat st;
optind=0; /* reset gnu getopt */
opterr=0; /* no error messages */
+ if (RemoteMode){
+ if (argc>1 && strcmp("quit", argv[1]) == 0){
+ if (argc>2){
+ printf("ERROR: invalid parameter count for quit\n");
+ return(0);
+ }
+ exit(0);
+ }
+ if (argc>1 && strcmp("cd", argv[1]) == 0){
+ if (argc>3){
+ printf("ERROR: invalid parameter count for cd\n");
+ return(0);
+ }
+#ifndef WIN32
+ if (getuid()==0 && ! ChangeRoot){
+ printf("ERROR: chdir security problem - rrdtool is runnig as "
+ "root an no chroot!\n");
+ return(0);
+ }
+#endif
+ chdir(argv[2]);
+ if (errno!=0){
+ printf("ERROR: %s\n",strerror(errno));
+ }
+ return(0);
+ }
+ if (argc>1 && strcmp("mkdir", argv[1]) == 0){
+ if (argc>3){
+ printf("ERROR: invalid parameter count for mkdir\n");
+ return(0);
+ }
+#ifndef WIN32
+ if (getuid()==0 && ! ChangeRoot){
+ printf("ERROR: mkdir security problem - rrdtool is runnig as "
+ "root an no chroot!\n");
+ return(0);
+ }
+#endif
+ mkdir(argv[2],0777);
+ if (errno!=0){
+ printf("ERROR: %s\n",strerror(errno));
+ }
+ return(0);
+ }
+ if (argc>1 && strcmp("ls", argv[1]) == 0){
+ if (argc>2){
+ printf("ERROR: invalid parameter count for ls\n");
+ return(0);
+ }
+ if ((curdir=opendir("."))!=NULL){
+ while((dent=readdir(curdir))!=NULL){
+ if (!stat(dent->d_name,&st)){
+ if (S_ISDIR(st.st_mode)){
+ printf("d %s\n",dent->d_name);
+ }
+ if (strlen(dent->d_name)>4 && S_ISREG(st.st_mode)){
+ if (!strcmp(dent->d_name+strlen(dent->d_name)-4,".rrd") ||
+ !strcmp(dent->d_name+strlen(dent->d_name)-4,".RRD")){
+ printf("- %s\n",dent->d_name);
+ }
+ }
+ }
+ }
+ }
+ else{
+ printf("ERROR: %s\n",strerror(errno));
+ return(errno);
+ }
+ return(0);
+ }
+ }
if (argc < 3
|| strcmp("help", argv[1]) == 0
|| strcmp("--help", argv[1]) == 0
strcmp("v", argv[1]) == 0 ||
strcmp("-v", argv[1]) == 0 ||
strcmp("-version", argv[1]) == 0 )
- printf("RRDtool 1.0.33 Copyright (C) 1997-2001 by Tobias Oetiker <tobi@oetiker.ch>\n");
+ printf("RRDtool 1.1.x Copyright (C) 1997-2001 by Tobias Oetiker <tobi@oetiker.ch>\n");
else if (strcmp("restore", argv[1]) == 0)
rrd_restore(argc-1, &argv[1]);
else if (strcmp("resize", argv[1]) == 0)
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++));
free(ds_namv);
free (data);
}
+ } else if (strcmp("xport", argv[1]) == 0) {
+ int xxsize;
+ int i = 0, j = 0;
+ time_t start,end;
+ unsigned long step, col_cnt,row_cnt;
+ rrd_value_t *data,*ptr;
+ char **legend_v;
+ if(rrd_xport(argc-1, &argv[1], &xxsize,&start,&end,&step,&col_cnt,&legend_v,&data) != -1) {
+ row_cnt = (end-start)/step;
+ ptr = data;
+ printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n\n", XML_ENCODING);
+ printf("<%s>\n", ROOT_TAG);
+ printf(" <%s>\n", META_TAG);
+ printf(" <%s>%lu</%s>\n", META_START_TAG, start+step, META_START_TAG);
+ printf(" <%s>%lu</%s>\n", META_STEP_TAG, step, META_STEP_TAG);
+ printf(" <%s>%lu</%s>\n", META_END_TAG, end, META_END_TAG);
+ printf(" <%s>%lu</%s>\n", META_ROWS_TAG, row_cnt, META_ROWS_TAG);
+ printf(" <%s>%lu</%s>\n", META_COLS_TAG, col_cnt, META_COLS_TAG);
+ printf(" <%s>\n", LEGEND_TAG);
+ for (j = 0; j < col_cnt; j++) {
+ char *entry = NULL;
+ entry = legend_v[j];
+ printf(" <%s>%s</%s>\n", LEGEND_ENTRY_TAG, entry, LEGEND_ENTRY_TAG);
+ free(entry);
+ }
+ free(legend_v);
+ printf(" </%s>\n", LEGEND_TAG);
+ printf(" </%s>\n", META_TAG);
+ printf(" <%s>\n", DATA_TAG);
+ for (i = start+step; i <= end; i += step) {
+ printf (" <%s>", DATA_ROW_TAG);
+ printf ("<%s>%lu</%s>", COL_TIME_TAG, i, COL_TIME_TAG);
+ for (j = 0; j < col_cnt; j++) {
+ rrd_value_t newval = DNAN;
+ newval = *ptr;
+ if(isnan(newval)){
+ printf("<%s>NaN</%s>", COL_DATA_TAG, COL_DATA_TAG);
+ } else {
+ printf("<%s>%0.10e</%s>", COL_DATA_TAG, newval, COL_DATA_TAG);
+ };
+ ptr++;
+ }
+ printf("</%s>\n", DATA_ROW_TAG);
+ }
+ free(data);
+ printf(" </%s>\n", DATA_TAG);
+ printf("</%s>\n", ROOT_TAG);
+ }
}
else if (strcmp("graph", argv[1]) == 0) {
char **calcpr;
+ const char *imgfile = argv[2]; /* rrd_graph changes argv pointer */
int xsize, ysize;
int i;
if( rrd_graph(argc-1, &argv[1], &calcpr, &xsize, &ysize) != -1 ) {
- if (strcmp(argv[2],"-") != 0)
+ if (strcmp(imgfile,"-") != 0)
printf ("%dx%d\n",xsize,ysize);
if (calcpr) {
for(i=0;calcpr[i];i++){
- if (strcmp(argv[2],"-") != 0)
+ if (strcmp(imgfile,"-") != 0)
printf("%s\n",calcpr[i]);
free(calcpr[i]);
}
projects / rrdtool.git / blobdiff