+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <pthread.h>
#include <sys/time.h>
+#include <stdlib.h>
#include "log.h"
#include "common.h"
#define HOSTNAME_MAX 1024
char *hostname = "unknown";
-unsigned long rrd_stats_one_json(RRD_STATS *st, char *options, struct web_buffer *wb)
+unsigned long rrd_stats_one_json(RRDSET *st, char *options, struct web_buffer *wb)
{
time_t now = time(NULL);
- web_buffer_increase(wb, 16384);
+ web_buffer_increase(wb, 65536);
pthread_rwlock_rdlock(&st->rwlock);
, st->enabled
, st->units
, st->name, options?options:""
- , chart_type_name(st->chart_type)
+ , rrdset_type_name(st->chart_type)
, st->counter
, st->entries
- , rrd_stats_first_entry_t(st)
- , st->current_entry
- , st->last_updated.tv_sec
- , now - (st->last_updated.tv_sec > now) ? now : st->last_updated.tv_sec
+ , rrdset_first_entry_t(st)
+ , rrdset_last_slot(st)
+ , rrdset_last_entry_t(st)
+ , (now < rrdset_last_entry_t(st)) ? (time_t)0 : now - rrdset_last_entry_t(st)
, st->update_every
, st->isdetail
, st->usec_since_last_update
unsigned long memory = st->memsize;
- RRD_DIMENSION *rd;
+ RRDDIM *rd;
for(rd = st->dimensions; rd ; rd = rd->next) {
+ web_buffer_increase(wb, 4096);
+
memory += rd->memsize;
web_buffer_printf(wb,
, rd->name
, rd->entries
, rd->hidden
- , algorithm_name(rd->algorithm)
+ , rrddim_algorithm_name(rd->algorithm)
, rd->multiplier
, rd->divisor
, rd->last_collected_time.tv_sec
#define RRD_GRAPH_JSON_HEADER "{\n\t\"charts\": [\n"
#define RRD_GRAPH_JSON_FOOTER "\n\t]\n}\n"
-void rrd_stats_graph_json(RRD_STATS *st, char *options, struct web_buffer *wb)
+void rrd_stats_graph_json(RRDSET *st, char *options, struct web_buffer *wb)
{
- web_buffer_increase(wb, 16384);
+ web_buffer_increase(wb, 2048);
web_buffer_printf(wb, RRD_GRAPH_JSON_HEADER);
rrd_stats_one_json(st, options, wb);
void rrd_stats_all_json(struct web_buffer *wb)
{
- web_buffer_increase(wb, 1024);
+ web_buffer_increase(wb, 2048);
unsigned long memory = 0;
long c;
- RRD_STATS *st;
+ RRDSET *st;
web_buffer_printf(wb, RRD_GRAPH_JSON_HEADER);
- pthread_rwlock_rdlock(&root_rwlock);
- for(st = root, c = 0; st ; st = st->next) {
+ pthread_rwlock_rdlock(&rrdset_root_rwlock);
+ for(st = rrdset_root, c = 0; st ; st = st->next) {
if(st->enabled) {
if(c) web_buffer_printf(wb, "%s", ",\n");
memory += rrd_stats_one_json(st, NULL, wb);
c++;
}
}
- pthread_rwlock_unlock(&root_rwlock);
+ pthread_rwlock_unlock(&rrdset_root_rwlock);
web_buffer_printf(wb, "\n\t],\n"
"\t\"hostname\": \"%s\",\n"
"\t\"memory\": %lu\n"
"}\n"
, hostname
- , update_every
- , save_history
+ , rrd_update_every
+ , rrd_default_history_entries
, memory
);
}
-unsigned long rrd_stats_json(int type, RRD_STATS *st, struct web_buffer *wb, int entries_to_show, int group, int group_method, time_t after, time_t before, int only_non_zero)
+
+
+// ----------------------------------------------------------------------------
+
+// RRDR options
+#define RRDR_EMPTY 0x01
+#define RRDR_RESET 0x02
+#define RRDR_HIDDEN 0x04
+#define RRDR_NONZERO 0x08
+
+
+typedef struct rrdresult {
+ RRDSET *st; // the chart this result refers to
+
+ int d; // the number of dimensions
+ int n; // the number of values in the arrays
+
+ uint8_t *od; // the options for the dimensions
+
+ time_t *t; // array of n timestamps
+ calculated_number *v; // array n x d values
+ uint8_t *o; // array n x d options
+
+ int c; // current line ( 0 ~ n )
+
+ int has_st_lock; // if st is read locked by us
+} RRDR;
+
+static void rrdr_dump(RRDR *r)
+{
+ long c, i;
+ RRDDIM *d;
+
+ fprintf(stderr, "\nCHART %s (%s)\n", r->st->id, r->st->name);
+
+ for(c = 0, d = r->st->dimensions; d ;c++, d = d->next) {
+ fprintf(stderr, "DIMENSION %s (%s), %s%s%s%s\n"
+ , d->id
+ , d->name
+ , (r->od[c] & RRDR_EMPTY)?"EMPTY ":""
+ , (r->od[c] & RRDR_RESET)?"RESET ":""
+ , (r->od[c] & RRDR_HIDDEN)?"HIDDEN ":""
+ , (r->od[c] & RRDR_NONZERO)?"NONZERO ":""
+ );
+ }
+
+ if(r->c < 0) {
+ fprintf(stderr, "RRDR does not have any values in it.\n");
+ return;
+ }
+
+ fprintf(stderr, "RRDR includes %d values in it:\n", r->c + 1);
+
+ // for each line in the array
+ for(i = 0; i <= r->c ;i++) {
+ calculated_number *cn = &r->v[ i * r->d ];
+ uint8_t *co = &r->o[ i * r->d ];
+
+ // print the id and the timestamp of the line
+ fprintf(stderr, "%ld %ld ", i + 1, r->t[i]);
+
+ // for each dimension
+ for(c = 0, d = r->st->dimensions; d ;c++, d = d->next) {
+ if(unlikely(r->od[c] & RRDR_HIDDEN)) continue;
+ if(unlikely(!(r->od[c] & RRDR_NONZERO))) continue;
+
+ if(co[c] & RRDR_EMPTY)
+ fprintf(stderr, "null ");
+ else
+ fprintf(stderr, CALCULATED_NUMBER_FORMAT " %s%s%s%s "
+ , cn[c]
+ , (co[c] & RRDR_EMPTY)?"E":" "
+ , (co[c] & RRDR_RESET)?"R":" "
+ , (co[c] & RRDR_HIDDEN)?"H":" "
+ , (co[c] & RRDR_NONZERO)?"N":" "
+ );
+ }
+
+ fprintf(stderr, "\n");
+ }
+}
+
+inline static calculated_number *rrdr_line_values(RRDR *r)
+{
+ return &r->v[ r->c * r->d ];
+}
+
+inline static uint8_t *rrdr_line_options(RRDR *r)
+{
+ return &r->o[ r->c * r->d ];
+}
+
+inline static int rrdr_line_init(RRDR *r, time_t t)
+{
+ r->c++;
+ if(unlikely(r->c >= r->n)) {
+ r->c = r->n - 1;
+ return 0;
+ }
+
+ // save the time
+ r->t[r->c] = t;
+
+ return 1;
+}
+
+inline static void rrdr_lock_rrdset(RRDR *r) {
+ if(unlikely(!r)) {
+ error("NULL value given!");
+ return;
+ }
+
+ pthread_rwlock_rdlock(&r->st->rwlock);
+ r->has_st_lock = 1;
+}
+
+inline static void rrdr_unlock_rrdset(RRDR *r) {
+ if(unlikely(!r)) {
+ error("NULL value given!");
+ return;
+ }
+
+ if(likely(r->has_st_lock)) {
+ pthread_rwlock_unlock(&r->st->rwlock);
+ r->has_st_lock = 0;
+ }
+}
+
+inline static void rrdr_free(RRDR *r)
+{
+ if(unlikely(!r)) {
+ error("NULL value given!");
+ return;
+ }
+
+ rrdr_unlock_rrdset(r);
+ if(likely(r->t)) free(r->t);
+ if(likely(r->v)) free(r->v);
+ if(likely(r->o)) free(r->o);
+ if(likely(r->od)) free(r->od);
+ free(r);
+}
+
+static RRDR *rrdr_create(RRDSET *st, int n)
+{
+ if(unlikely(!st)) {
+ error("NULL value given!");
+ return NULL;
+ }
+
+ RRDR *r = calloc(1, sizeof(RRDR));
+ if(unlikely(!r)) goto cleanup;
+
+ r->st = st;
+
+ rrdr_lock_rrdset(r);
+
+ RRDDIM *rd;
+ for(rd = st->dimensions ; rd ; rd = rd->next) r->d++;
+
+ r->n = n;
+ r->t = malloc(n * sizeof(time_t));
+ if(unlikely(!r->t)) goto cleanup;
+
+ r->t = malloc(n * sizeof(time_t));
+ if(unlikely(!r->t)) goto cleanup;
+
+ r->v = malloc(n * r->d * sizeof(calculated_number));
+ if(unlikely(!r->v)) goto cleanup;
+
+ r->o = malloc(n * r->d * sizeof(uint8_t));
+ if(unlikely(!r->o)) goto cleanup;
+
+ r->od = calloc(r->d, sizeof(uint8_t));
+ if(unlikely(!r->od)) goto cleanup;
+
+ r->c = -1;
+
+ return r;
+
+cleanup:
+ error("Cannot allocate memory");
+ if(likely(r)) rrdr_free(r);
+ return NULL;
+}
+
+RRDR *rrd2rrdr(RRDSET *st, long points, time_t after, time_t before, int group_method)
+{
+ int debug = st->debug;
+
+ time_t first_entry_t = rrdset_first_entry_t(st);
+ time_t last_entry_t = rrdset_last_entry_t(st);
+
+ // allow relative for before and after
+ if(before <= st->update_every * st->entries) before = last_entry_t + before;
+ if(after <= st->update_every * st->entries) after = last_entry_t + after;
+
+ // make sure they are within our timeframe
+ if(before > last_entry_t) before = last_entry_t;
+ if(before < first_entry_t) before = first_entry_t;
+
+ if(after > last_entry_t) after = last_entry_t;
+ if(after < first_entry_t) after = first_entry_t;
+
+ // check if they are upside down
+ if(after > before) {
+ time_t t = before;
+ before = after;
+ after = t;
+ }
+
+ // the duration of the chart
+ time_t duration = before - after;
+ if(duration <= 0) return NULL;
+
+ // check the required points
+ if(points <= 0) points = duration;
+
+ // calculate proper grouping of source data
+ long group = duration / points;
+ if(group <= 0) group = 1;
+ if(duration / group > points) group++;
+
+ // error("NEW: points=%d after=%d before=%d group=%d, duration=%d", points, after, before, group, duration);
+
+ // Now we have:
+ // before = the end time of the calculation
+ // after = the start time of the calculation
+ // duration = the duration of the calculation
+ // group = the number of source points to aggregate / group together
+ // method = the method of grouping source points
+ // points = the number of points to generate
+
+
+ // -------------------------------------------------------------------------
+ // initialize our result set
+
+ RRDR *r = rrdr_create(st, points);
+ if(!r) return NULL;
+ if(!r->d) {
+ rrdr_free(r);
+ return NULL;
+ }
+
+ // find how many dimensions we have
+ long dimensions = r->d;
+
+
+ // -------------------------------------------------------------------------
+ // checks for debugging
+
+ if(debug) debug(D_RRD_STATS, "INFO %s first_t: %lu, last_t: %lu, all_duration: %lu, after: %lu, before: %lu, duration: %lu, points: %ld, group: %ld"
+ , st->id
+ , first_entry_t
+ , last_entry_t
+ , last_entry_t - first_entry_t
+ , after
+ , before
+ , duration
+ , points
+ , group
+ );
+
+
+ // -------------------------------------------------------------------------
+ // temp arrays for keeping values per dimension
+
+ calculated_number group_values[dimensions]; // keep sums when grouping
+ long group_counts[dimensions]; // keep the number of values added to group_values
+ uint8_t group_options[dimensions];
+ uint8_t found_non_zero[dimensions];
+
+
+ // initialize them
+ RRDDIM *rd;
+ long c;
+ for( rd = st->dimensions, c = 0 ; rd && c < dimensions ; rd = rd->next, c++) {
+ group_values[c] = 0;
+ group_counts[c] = 0;
+ group_options[c] = 0;
+ found_non_zero[c] = 0;
+ }
+
+
+ // -------------------------------------------------------------------------
+ // the main loop
+
+ long t = rrdset_time2slot(st, before), // rrdset_last_slot(st),
+ stop_at_t = rrdset_time2slot(st, after),
+ added = 0,
+ group_count = 0,
+ add_this = 0,
+ stop_now = 0;
+
+ // align to group for proper panning of data
+ t -= t % group;
+
+ time_t now = rrdset_slot2time(st, t),
+ dt = st->update_every,
+ group_start_t = 0;
+
+ if(debug) debug(D_RRD_STATS, "BEGIN %s after_t: %lu (stop slot %ld), before_t: %lu (start slot %ld), start_t(now): %lu"
+ , st->id
+ , after
+ , stop_at_t
+ , before
+ , t
+ , now
+ );
+
+ for( ; !stop_now ; now -= dt, t--) {
+ if(unlikely(t < 0)) c = st->entries - 1;
+ if(t == stop_at_t) stop_now = 1;
+
+ if(debug) debug(D_RRD_STATS, "ROW %s c: %ld, group_count: %ld, added: %ld, now: %lu, %s %s"
+ , st->id
+ , t
+ , group_count + 1
+ , added
+ , now
+ , (group_count + 1 == group)?"PRINT":" - "
+ , (now >= after && now <= before)?"RANGE":" - "
+ );
+
+ // make sure we return data in the proper time range
+ if(unlikely(now > before)) continue;
+ if(unlikely(now < after)) break;
+
+ if(group_count == 0) group_start_t = now;
+ group_count++;
+
+ if(unlikely(group_count == group)) {
+ if(unlikely(added >= points)) break;
+ add_this = 1;
+ }
+
+ // do the calculations
+ for(rd = st->dimensions, c = 0 ; likely(rd && c < dimensions) ; rd = rd->next, c++) {
+ storage_number n = rd->values[t];
+ if(unlikely(!does_storage_number_exist(n))) continue;
+
+ group_counts[c]++;
+
+ calculated_number value = unpack_storage_number(n);
+ if(value != 0.0) {
+ group_options[c] |= RRDR_NONZERO;
+ found_non_zero[c] = 1;
+ }
+
+ if(unlikely(did_storage_number_reset(n)))
+ group_options[c] |= RRDR_RESET;
+
+ switch(group_method) {
+ case GROUP_MAX:
+ if(unlikely(abs(value) > abs(group_values[c])))
+ group_values[c] = value;
+ break;
+
+ default:
+ case GROUP_SUM:
+ case GROUP_AVERAGE:
+ group_values[c] += value;
+ break;
+ }
+ }
+
+ // added it
+ if(unlikely(add_this)) {
+ if(!rrdr_line_init(r, group_start_t)) break;
+
+ calculated_number *cn = rrdr_line_values(r);
+ uint8_t *co = rrdr_line_options(r);
+
+ for(rd = st->dimensions, c = 0 ; likely(rd && c < dimensions) ; rd = rd->next, c++) {
+
+ // update the dimension options
+ if(found_non_zero[c]) r->od[c] |= RRDR_NONZERO;
+ if(rd->hidden) r->od[c] |= RRDR_HIDDEN;
+
+ // store the specific point options
+ co[c] = group_options[c];
+
+ // store the value
+ if(group_counts[c] == 0) {
+ cn[c] = 0.0;
+ co[c] |= RRDR_EMPTY;
+ }
+ else if(unlikely(group_method == GROUP_AVERAGE)) {
+ cn[c] = group_values[c] / group_counts[c];
+ }
+ else {
+ cn[c] = group_values[c];
+ }
+
+ // reset them for the next loop
+ group_values[c] = 0;
+ group_counts[c] = 0;
+ group_options[c] = 0;
+ }
+
+ added++;
+ group_count = 0;
+ add_this = 0;
+ }
+ }
+
+ rrdr_dump(r);
+ rrdr_free(r);
+ return NULL;
+}
+
+unsigned long rrd_stats_json(int type, RRDSET *st, struct web_buffer *wb, int points, int group, int group_method, time_t after, time_t before, int only_non_zero)
{
int c;
pthread_rwlock_rdlock(&st->rwlock);
// -------------------------------------------------------------------------
// switch from JSON to google JSON
-
+
char kq[2] = "\"";
char sq[2] = "\"";
switch(type) {
// -------------------------------------------------------------------------
// validate the parameters
-
- if(entries_to_show < 1) entries_to_show = 1;
+
+ if(points < 1) points = 1;
if(group < 1) group = 1;
-
- // make sure current_entry is within limits
- long current_entry = (long)st->current_entry - (long)1;
- if(current_entry < 0) current_entry = 0;
- else if(current_entry >= st->entries) current_entry = st->entries - 1;
-
- // find the oldest entry of the round-robin
- long max_entries_init = (st->counter < (unsigned long)st->entries) ? st->counter : (unsigned long)st->entries;
-
- time_t time_init = st->last_updated.tv_sec;
-
- if(before == 0 || before > time_init) before = time_init;
- if(after == 0) after = rrd_stats_first_entry_t(st);
+ if(before == 0 || before > rrdset_last_entry_t(st)) before = rrdset_last_entry_t(st);
+ if(after == 0 || after < rrdset_first_entry_t(st)) after = rrdset_first_entry_t(st);
// ---
// our return value (the last timestamp printed)
// this is required to detect re-transmit in google JSONP
- time_t last_timestamp = 0;
+ time_t last_timestamp = 0;
// -------------------------------------------------------------------------
// find how many dimensions we have
-
+
int dimensions = 0;
- RRD_DIMENSION *rd;
+ RRDDIM *rd;
for( rd = st->dimensions ; rd ; rd = rd->next) dimensions++;
if(!dimensions) {
pthread_rwlock_unlock(&st->rwlock);
return 0;
}
-
+
// -------------------------------------------------------------------------
// prepare various strings, to speed up the loop
-
+
char overflow_annotation[201]; snprintf(overflow_annotation, 200, ",{%sv%s:%sRESET OR OVERFLOW%s},{%sv%s:%sThe counters have been wrapped.%s}", kq, kq, sq, sq, kq, kq, sq, sq);
char normal_annotation[201]; snprintf(normal_annotation, 200, ",{%sv%s:null},{%sv%s:null}", kq, kq, kq, kq);
char pre_date[51]; snprintf(pre_date, 50, " {%sc%s:[{%sv%s:%s", kq, kq, kq, kq, sq);
// -------------------------------------------------------------------------
- // checks for debuging
-
+ // checks for debugging
+
if(st->debug) {
- debug(D_RRD_STATS, "%s first_entry_t = %lu, last_entry_t = %lu, duration = %lu, after = %lu, before = %lu, duration = %lu, entries_to_show = %lu, group = %lu, max_entries = %ld"
+ debug(D_RRD_STATS, "%s first_entry_t = %lu, last_entry_t = %lu, duration = %lu, after = %lu, before = %lu, duration = %lu, entries_to_show = %lu, group = %lu"
, st->id
- , rrd_stats_first_entry_t(st)
- , st->last_updated.tv_sec
- , st->last_updated.tv_sec - rrd_stats_first_entry_t(st)
+ , rrdset_first_entry_t(st)
+ , rrdset_last_entry_t(st)
+ , rrdset_last_entry_t(st) - rrdset_first_entry_t(st)
, after
, before
, before - after
- , entries_to_show
+ , points
, group
- , max_entries_init
);
if(before < after)
// -------------------------------------------------------------------------
// temp arrays for keeping values per dimension
-
+
calculated_number group_values[dimensions]; // keep sums when grouping
- calculated_number print_values[dimensions]; // keep the final value to be printed
int print_hidden[dimensions]; // keep hidden flags
int found_non_zero[dimensions];
+ int found_non_existing[dimensions];
// initialize them
for( rd = st->dimensions, c = 0 ; rd && c < dimensions ; rd = rd->next, c++) {
- group_values[c] = print_values[c] = 0;
+ group_values[c] = 0;
print_hidden[c] = rd->hidden;
found_non_zero[c] = 0;
+ found_non_existing[c] = 0;
}
+
+ // error("OLD: points=%d after=%d before=%d group=%d, duration=%d", entries_to_show, before - (st->update_every * group * entries_to_show), before, group, before - after + 1);
+ // rrd2array(st, entries_to_show, before - (st->update_every * group * entries_to_show), before, group_method, only_non_zero);
+ // rrd2rrdr(st, entries_to_show, before - (st->update_every * group * entries_to_show), before, group_method);
+
// -------------------------------------------------------------------------
// remove dimensions that contain only zeros
// -------------------------------------------------------------------------
// print the JSON header
-
+
web_buffer_printf(wb, "{\n %scols%s:\n [\n", kq, kq);
web_buffer_printf(wb, " {%sid%s:%s%s,%slabel%s:%stime%s,%spattern%s:%s%s,%stype%s:%sdatetime%s},\n", kq, kq, sq, sq, kq, kq, sq, sq, kq, kq, sq, sq, kq, kq, sq, sq);
web_buffer_printf(wb, " {%sid%s:%s%s,%slabel%s:%s%s,%spattern%s:%s%s,%stype%s:%sstring%s,%sp%s:{%srole%s:%sannotation%s}},\n", kq, kq, sq, sq, kq, kq, sq, sq, kq, kq, sq, sq, kq, kq, sq, sq, kq, kq, kq, kq, sq, sq);
int annotate_reset = 0;
int annotation_count = 0;
-
- // to allow grouping on the same values, we need a pad
- long pad = before % group;
// the minimum line length we expect
int line_size = 4096 + (dimensions * 200);
- time_t now = time_init;
- long max_entries = max_entries_init;
+ long t = rrdset_time2slot(st, before),
+ stop_at_t = rrdset_time2slot(st, after),
+ stop_now = 0;
+
+ t -= t % group;
- long t;
+ time_t now = rrdset_slot2time(st, t),
+ dt = st->update_every;
long count = 0, printed = 0, group_count = 0;
last_timestamp = 0;
- for(t = current_entry; max_entries ; now -= st->update_every, t--, max_entries--) {
+
+ if(st->debug) debug(D_RRD_STATS, "%s: REQUEST after:%lu before:%lu, points:%d, group:%d, CHART cur:%ld first: %lu last:%lu, CALC start_t:%ld, stop_t:%ld"
+ , st->id
+ , after
+ , before
+ , points
+ , group
+ , st->current_entry
+ , rrdset_first_entry_t(st)
+ , rrdset_last_entry_t(st)
+ , t
+ , stop_at_t
+ );
+
+ for(; !stop_now ; now -= dt, t--) {
if(t < 0) t = st->entries - 1;
+ if(t == stop_at_t) stop_now = 1;
int print_this = 0;
- if(st->debug) {
- debug(D_RRD_STATS, "%s t = %ld, count = %ld, group_count = %ld, printed = %ld, now = %lu, %s %s"
+ if(st->debug) debug(D_RRD_STATS, "%s t = %ld, count = %ld, group_count = %ld, printed = %ld, now = %lu, %s %s"
, st->id
, t
, count + 1
, group_count + 1
, printed
, now
- , (((count + 1 - pad) % group) == 0)?"PRINT":" - "
+ , (group_count + 1 == group)?"PRINT":" - "
, (now >= after && now <= before)?"RANGE":" - "
);
- }
+
// make sure we return data in the proper time range
- if(now < after || now > before) continue;
+ if(now > before) continue;
+ if(now < after) break;
+
+ //if(rrdset_slot2time(st, t) != now)
+ // error("%s: slot=%ld, now=%ld, slot2time=%ld, diff=%ld, last_entry_t=%ld, rrdset_last_slot=%ld", st->id, t, now, rrdset_slot2time(st,t), now - rrdset_slot2time(st,t), rrdset_last_entry_t(st), rrdset_last_slot(st));
count++;
group_count++;
- if(((count - pad) % group) == 0) {
- if(printed >= entries_to_show) {
+ // check if we have to print this now
+ if(group_count == group) {
+ if(printed >= points) {
// debug(D_RRD_STATS, "Already printed all rows. Stopping.");
break;
}
-
- if(group_count != group) {
- // this is an incomplete group, skip it.
- for( rd = st->dimensions, c = 0 ; rd && c < dimensions ; rd = rd->next, c++)
- group_values[c] = 0;
-
- group_count = 0;
- continue;
- }
// check if we may exceed the buffer provided
web_buffer_increase(wb, line_size);
print_this = 1;
}
+ // do the calculations
for(rd = st->dimensions, c = 0 ; rd && c < dimensions ; rd = rd->next, c++) {
- calculated_number value = unpack_storage_number(rd->values[t]);
-
+ storage_number n = rd->values[t];
+ calculated_number value = unpack_storage_number(n);
+
+ if(!does_storage_number_exist(n)) {
+ value = 0.0;
+ found_non_existing[c]++;
+ }
+ if(did_storage_number_reset(n)) annotate_reset = 1;
+
switch(group_method) {
case GROUP_MAX:
if(abs(value) > abs(group_values[c])) group_values[c] = value;
default:
case GROUP_AVERAGE:
group_values[c] += value;
- if(print_this) group_values[c] /= group_count;
+ if(print_this) group_values[c] /= ( group_count - found_non_existing[c] );
break;
}
-
- if(print_this) {
- print_values[c] = group_values[c];
- group_values[c] = 0;
- }
}
if(print_this) {
- group_count = 0;
-
if(annotate_reset) {
annotation_count++;
web_buffer_strcpy(wb, overflow_annotation);
pc = 0;
for(c = 0 ; c < dimensions ; c++) {
- if(!print_hidden[c]) {
+ if(found_non_existing[c] == group_count) {
+ // all entries are non-existing
+ pc++;
+ web_buffer_strcpy(wb, pre_value);
+ web_buffer_strcpy(wb, "null");
+ web_buffer_strcpy(wb, post_value);
+ }
+ else if(!print_hidden[c]) {
pc++;
web_buffer_strcpy(wb, pre_value);
- web_buffer_rrd_value(wb, print_values[c]);
+ web_buffer_rrd_value(wb, group_values[c]);
web_buffer_strcpy(wb, post_value);
- if(print_values[c]) found_non_zero[c]++;
+ if(group_values[c]) found_non_zero[c]++;
}
+
+ // reset them for the next loop
+ group_values[c] = 0;
+ found_non_existing[c] = 0;
}
+
+ // if all dimensions are hidden, print a null
if(!pc) {
web_buffer_strcpy(wb, pre_value);
- web_buffer_rrd_value(wb, (calculated_number)0);
+ web_buffer_strcpy(wb, "null");
web_buffer_strcpy(wb, post_value);
}
printed++;
+ group_count = 0;
}
}
int changed = 0;
for(rd = st->dimensions, c = 0 ; rd && c < dimensions ; rd = rd->next, c++) {
group_values[c] = 0;
+ found_non_existing[c] = 0;
if(!print_hidden[c] && !found_non_zero[c]) {
changed = 1;
else break;
}
else break;
-
+
} // max_loop
debug(D_RRD_STATS, "RRD_STATS_JSON: %s total %ld bytes", st->name, wb->bytes);