X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_tool.c;h=c4243557e6dd3d1816781b1c84d54b9131647b2d;hb=32bff69819374d9875577fe106dee60af473637b;hp=72fdddb2c30c2badc45dc3848a526f6a6f070bc5;hpb=77377ff6ac43512ee216af115a3e62c57a2484a3;p=rrdtool.git diff --git a/src/rrd_tool.c b/src/rrd_tool.c index 72fdddb..c424355 100644 --- a/src/rrd_tool.c +++ b/src/rrd_tool.c @@ -5,11 +5,14 @@ *****************************************************************************/ #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 @@ -24,7 +27,11 @@ void PrintUsage(char *cmd) 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" @@ -113,6 +120,31 @@ void PrintUsage(char *cmd) " * 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" @@ -120,7 +152,8 @@ void PrintUsage(char *cmd) "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; @@ -146,12 +179,25 @@ void PrintUsage(char *cmd) 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); @@ -183,6 +229,21 @@ void PrintUsage(char *cmd) 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); } @@ -192,6 +253,9 @@ int main(int argc, char *argv[]) { char **myargv; char aLine[MAX_LENGTH]; +#ifdef HAVE_CHROOT + char *firstdir=""; +#endif #ifdef MUST_DISABLE_SIGFPE signal(SIGFPE,SIG_IGN); #endif @@ -204,7 +268,7 @@ int main(int argc, char *argv[]) return 0; } - if ((argc == 2) && !strcmp("-",argv[1])) + if (((argc == 2)||(argc == 3)) && !strcmp("-",argv[1])) { #if HAVE_GETRUSAGE struct rusage myusage; @@ -216,6 +280,35 @@ int main(int argc, char *argv[]) tz.tz_dsttime=0; gettimeofday(&starttime,&tz); #endif + RemoteMode=1; +#ifdef HAVE_CHROOT + 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 is not supported by your OS " + "or at least by this copy of rrdtool\n"); + exit(1); +#endif while (fgets(aLine, sizeof(aLine)-1, stdin)){ if ((argc = CountArgs(aLine)) == 0) { @@ -257,6 +350,11 @@ int main(int argc, char *argv[]) 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; @@ -264,9 +362,90 @@ int main(int argc, char *argv[]) int HandleInputLine(int argc, char **argv, FILE* out) { +#if defined(HAVE_OPENDIR) && defined (HAVE_READDIR) + DIR *curdir; /* to read current dir with ls */ + struct dirent *dent; +#endif +#if defined(HAVE_SYS_STAT_H) + struct stat st; +#endif 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 defined(HAVE_OPENDIR) && defined(HAVE_READDIR) && defined(HAVE_CHDIR) + if (argc>1 && strcmp("cd", argv[1]) == 0){ + if (argc>3){ + printf("ERROR: invalid parameter count for cd\n"); + return(0); + } +#if ! defined(HAVE_CHROOT) || ! defined(HAVE_GETUID) + 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); + } +#if ! defined(HAVE_CHROOT) || ! defined(HAVE_GETUID) + 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+NAMLEN(dent)-4,".rrd") || + !strcmp(dent->d_name+NAMLEN(dent)-4,".RRD")){ + printf("- %s\n",dent->d_name); + } + } + } + } + } + else{ + printf("ERROR: %s\n",strerror(errno)); + return(errno); + } + return(0); + } +#endif /* opendir and readdir */ + + } if (argc < 3 || strcmp("help", argv[1]) == 0 || strcmp("--help", argv[1]) == 0 @@ -347,17 +526,66 @@ int HandleInputLine(int argc, char **argv, FILE* out) free(ds_namv); free (data); } + } else if (strcmp("xport", argv[1]) == 0) { + int xxsize; + unsigned long 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("\n\n", XML_ENCODING); + printf("<%s>\n", ROOT_TAG); + printf(" <%s>\n", META_TAG); + printf(" <%s>%lu\n", META_START_TAG, start+step, META_START_TAG); + printf(" <%s>%lu\n", META_STEP_TAG, step, META_STEP_TAG); + printf(" <%s>%lu\n", META_END_TAG, end, META_END_TAG); + printf(" <%s>%lu\n", META_ROWS_TAG, row_cnt, META_ROWS_TAG); + printf(" <%s>%lu\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\n", LEGEND_ENTRY_TAG, entry, LEGEND_ENTRY_TAG); + free(entry); + } + free(legend_v); + printf(" \n", LEGEND_TAG); + printf(" \n", META_TAG); + printf(" <%s>\n", DATA_TAG); + for (i = start+step; i <= end; i += step) { + printf (" <%s>", DATA_ROW_TAG); + printf ("<%s>%lu", 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", COL_DATA_TAG, COL_DATA_TAG); + } else { + printf("<%s>%0.10e", COL_DATA_TAG, newval, COL_DATA_TAG); + }; + ptr++; + } + printf("\n", DATA_ROW_TAG); + } + free(data); + printf(" \n", DATA_TAG); + printf("\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]); }