X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_info.c;h=b7bb8f02fc0ca7395bb0c01dc97be21daf7aeab7;hp=37c43db496f8e3a2b46acb6825877b5ae081f3e8;hb=a278779cdf2ded56b89fc404d6914bff7ad7dcbd;hpb=5837606887a6d81e8b1f7588525cb1c8783fb62b diff --git a/src/rrd_info.c b/src/rrd_info.c index 37c43db..b7bb8f0 100644 --- a/src/rrd_info.c +++ b/src/rrd_info.c @@ -5,6 +5,7 @@ *****************************************************************************/ #include "rrd_tool.h" +#include "rrd_rpncalc.h" #include /* proto */ @@ -67,6 +68,8 @@ rrd_info(int argc, char **argv) { rrd_t rrd; info_t *data,*cd; infoval info; + enum cf_en current_cf; + enum dst_en current_ds; if(rrd_open(argv[1],&in_file,&rrd, RRD_READONLY)==-1){ return(NULL); @@ -90,15 +93,30 @@ rrd_info(int argc, char **argv) { info.u_str=rrd.ds_def[i].dst; cd=push(cd,sprintf_alloc("ds[%s].type", rrd.ds_def[i].ds_nam), RD_I_STR, info); - - info.u_cnt=rrd.ds_def[i].par[DS_mrhb_cnt].u_cnt; - cd=push(cd,sprintf_alloc("ds[%s].minimal_heartbeat",rrd.ds_def[i].ds_nam), RD_I_CNT, info); - - info.u_val=rrd.ds_def[i].par[DS_min_val].u_val; - cd=push(cd,sprintf_alloc("ds[%s].min", rrd.ds_def[i].ds_nam), RD_I_VAL, info); + + current_ds = dst_conv(rrd.ds_def[i].dst); + switch (current_ds) { + case DST_CDEF: + { + char *buffer; + rpn_compact2str((rpn_cdefds_t *) &(rrd.ds_def[i].par[DS_cdef]), + rrd.ds_def, &buffer); + info.u_str = buffer; + cd=push(cd,sprintf_alloc("ds[%s].cdef",rrd.ds_def[i].ds_nam),RD_I_STR,info); + free(buffer); + } + break; + default: + info.u_cnt=rrd.ds_def[i].par[DS_mrhb_cnt].u_cnt; + cd=push(cd,sprintf_alloc("ds[%s].minimal_heartbeat",rrd.ds_def[i].ds_nam), RD_I_CNT, info); + + info.u_val=rrd.ds_def[i].par[DS_min_val].u_val; + cd=push(cd,sprintf_alloc("ds[%s].min",rrd.ds_def[i].ds_nam), RD_I_VAL, info); - info.u_val=rrd.ds_def[i].par[DS_max_val].u_val; - cd=push(cd,sprintf_alloc("ds[%s].max", rrd.ds_def[i].ds_nam), RD_I_VAL, info); + info.u_val=rrd.ds_def[i].par[DS_max_val].u_val; + cd=push(cd,sprintf_alloc("ds[%s].max",rrd.ds_def[i].ds_nam), RD_I_VAL, info); + break; + } info.u_str=rrd.pdp_prep[i].last_ds; cd=push(cd,sprintf_alloc("ds[%s].last_ds", rrd.ds_def[i].ds_nam), RD_I_STR, info); @@ -113,6 +131,7 @@ rrd_info(int argc, char **argv) { for(i=0;irra_cnt;i++){ info.u_str=rrd.rra_def[i].cf_nam; cd=push(cd,sprintf_alloc("rra[%d].cf", i), RD_I_STR, info); + current_cf = cf_conv(rrd.rra_def[i].cf_nam); info.u_cnt=rrd.rra_def[i].row_cnt; cd=push(cd,sprintf_alloc("rra[%d].rows",i), RD_I_CNT, info); @@ -120,23 +139,81 @@ rrd_info(int argc, char **argv) { info.u_cnt=rrd.rra_def[i].pdp_cnt; cd=push(cd,sprintf_alloc("rra[%d].pdp_per_row",i), RD_I_CNT, info); - info.u_val=rrd.rra_def[i].par[RRA_cdp_xff_val].u_val; - cd=push(cd,sprintf_alloc("rra[%d].xff",i), RD_I_VAL, info); - + switch(current_cf) + { + case CF_HWPREDICT: + info.u_val=rrd.rra_def[i].par[RRA_hw_alpha].u_val; + cd=push(cd,sprintf_alloc("rra[%d].alpha",i),RD_I_VAL,info); + info.u_val=rrd.rra_def[i].par[RRA_hw_beta].u_val; + cd=push(cd,sprintf_alloc("rra[%d].beta",i),RD_I_VAL,info); + break; + case CF_SEASONAL: + case CF_DEVSEASONAL: + info.u_val=rrd.rra_def[i].par[RRA_seasonal_gamma].u_val; + cd=push(cd,sprintf_alloc("rra[%d].gamma",i),RD_I_VAL,info); + break; + case CF_FAILURES: + info.u_val=rrd.rra_def[i].par[RRA_delta_pos].u_val; + cd=push(cd,sprintf_alloc("rra[%d].delta_pos",i),RD_I_VAL,info); + info.u_val=rrd.rra_def[i].par[RRA_delta_neg].u_val; + cd=push(cd,sprintf_alloc("rra[%d].delta_neg",i),RD_I_VAL,info); + info.u_cnt=rrd.rra_def[i].par[RRA_failure_threshold].u_cnt; + cd=push(cd,sprintf_alloc("rra[%d].failure_threshold",i),RD_I_CNT,info); + info.u_cnt=rrd.rra_def[i].par[RRA_window_len].u_cnt; + cd=push(cd,sprintf_alloc("rra[%d].window_length",i),RD_I_CNT,info); + break; + case CF_DEVPREDICT: + break; + default: + info.u_val=rrd.rra_def[i].par[RRA_cdp_xff_val].u_val; + cd=push(cd,sprintf_alloc("rra[%d].xff",i),RD_I_VAL,info); + break; + } + for(ii=0;iids_cnt;ii++){ + switch(current_cf) + { + case CF_HWPREDICT: + info.u_val=rrd.cdp_prep[i*rrd.stat_head->ds_cnt+ii].scratch[CDP_hw_intercept].u_val; + cd=push(cd,sprintf_alloc("rra[%d].cdp_prep[%d].intercept",i,ii), RD_I_VAL, info); + info.u_val=rrd.cdp_prep[i*rrd.stat_head->ds_cnt+ii].scratch[CDP_hw_slope].u_val; + cd=push(cd,sprintf_alloc("rra[%d].cdp_prep[%d].slope",i,ii), RD_I_VAL, info); + info.u_cnt=rrd.cdp_prep[i*rrd.stat_head->ds_cnt+ii].scratch[CDP_null_count].u_cnt; + cd=push(cd,sprintf_alloc("rra[%d].cdp_prep[%d].NaN_count",i,ii), RD_I_CNT, info); + break; + case CF_SEASONAL: + info.u_val=rrd.cdp_prep[i*rrd.stat_head->ds_cnt+ii].scratch[CDP_hw_seasonal].u_val; + cd=push(cd,sprintf_alloc("rra[%d].cdp_prep[%d].seasonal",i,ii), RD_I_VAL, info); + break; + case CF_DEVSEASONAL: + info.u_val=rrd.cdp_prep[i*rrd.stat_head->ds_cnt+ii].scratch[CDP_seasonal_deviation].u_val; + cd=push(cd,sprintf_alloc("rra[%d].cdp_prep[%d].deviation",i,ii), RD_I_VAL, info); + break; + case CF_DEVPREDICT: + break; + case CF_FAILURES: + { + short j; + char *violations_array; + char history[MAX_FAILURES_WINDOW_LEN+1]; + violations_array = (char*) rrd.cdp_prep[i*rrd.stat_head->ds_cnt +ii].scratch; + for (j = 0; j < rrd.rra_def[i].par[RRA_window_len].u_cnt; ++j) + history[j] = (violations_array[j] == 1) ? '1' : '0'; + history[j] = '\0'; + info.u_str = history; + cd=push(cd,sprintf_alloc("rra[%d].cdp_prep[%d].history",i,ii), RD_I_STR, info); + } + break; + default: info.u_val=rrd.cdp_prep[i*rrd.stat_head->ds_cnt+ii].scratch[CDP_val].u_val; cd=push(cd,sprintf_alloc("rra[%d].cdp_prep[%d].value",i,ii), RD_I_VAL, info); - info.u_cnt=rrd.cdp_prep[i*rrd.stat_head->ds_cnt+ii].scratch[CDP_unkn_pdp_cnt].u_cnt; cd=push(cd,sprintf_alloc("rra[%d].cdp_prep[%d].unknown_datapoints",i,ii), RD_I_CNT, info); + break; } } - rrd_free(&rrd); + } + rrd_free(&rrd); return(data); } - - - - -