Merging upstream version 1.11.0+dfsg.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 2059 deletions

diff --git a/src/rrd2json.c b/src/rrd2json.c
deleted file mode 100644
index 24b3da340..000000000
--- a/src/rrd2json.c
+++ /dev/null
@@ -1,2059 +0,0 @@
-#include "common.h"
-
-void rrd_stats_api_v1_chart_with_data(RRDSET *st, BUFFER *wb, size_t *dimensions_count, size_t *memory_used)
-{
-    rrdset_rdlock(st);
-
-    buffer_sprintf(wb,
-        "\t\t{\n"
-        "\t\t\t\"id\": \"%s\",\n"
-        "\t\t\t\"name\": \"%s\",\n"
-        "\t\t\t\"type\": \"%s\",\n"
-        "\t\t\t\"family\": \"%s\",\n"
-        "\t\t\t\"context\": \"%s\",\n"
-        "\t\t\t\"title\": \"%s (%s)\",\n"
-        "\t\t\t\"priority\": %ld,\n"
-        "\t\t\t\"plugin\": \"%s\",\n"
-        "\t\t\t\"module\": \"%s\",\n"
-        "\t\t\t\"enabled\": %s,\n"
-        "\t\t\t\"units\": \"%s\",\n"
-        "\t\t\t\"data_url\": \"/api/v1/data?chart=%s\",\n"
-        "\t\t\t\"chart_type\": \"%s\",\n"
-        "\t\t\t\"duration\": %ld,\n"
-        "\t\t\t\"first_entry\": %ld,\n"
-        "\t\t\t\"last_entry\": %ld,\n"
-        "\t\t\t\"update_every\": %d,\n"
-        "\t\t\t\"dimensions\": {\n"
-        , st->id
-        , st->name
-        , st->type
-        , st->family
-        , st->context
-        , st->title, st->name
-        , st->priority
-        , st->plugin_name?st->plugin_name:""
-        , st->module_name?st->module_name:""
-        , rrdset_flag_check(st, RRDSET_FLAG_ENABLED)?"true":"false"
-        , st->units
-        , st->name
-        , rrdset_type_name(st->chart_type)
-        , st->entries * st->update_every
-        , rrdset_first_entry_t(st)
-        , rrdset_last_entry_t(st)
-        , st->update_every
-        );
-
-    unsigned long memory = st->memsize;
-
-    size_t dimensions = 0;
-    RRDDIM *rd;
-    rrddim_foreach_read(rd, st) {
-        if(rrddim_flag_check(rd, RRDDIM_FLAG_HIDDEN)) continue;
-
-        memory += rd->memsize;
-
-        buffer_sprintf(
-                wb
-                , "%s"
-                        "\t\t\t\t\"%s\": { \"name\": \"%s\" }"
-                , dimensions ? ",\n" : ""
-                , rd->id
-                , rd->name
-        );
-
-        dimensions++;
-    }
-
-    if(dimensions_count) *dimensions_count += dimensions;
-    if(memory_used) *memory_used += memory;
-
-    buffer_strcat(wb, "\n\t\t\t},\n\t\t\t\"green\": ");
-    buffer_rrd_value(wb, st->green);
-    buffer_strcat(wb, ",\n\t\t\t\"red\": ");
-    buffer_rrd_value(wb, st->red);
-
-    buffer_strcat(wb, ",\n\t\t\t\"alarms\": {\n");
-    size_t alarms = 0;
-    RRDCALC *rc;
-    for(rc = st->alarms; rc ; rc = rc->rrdset_next) {
-
-        buffer_sprintf(
-                wb
-                , "%s"
-                        "\t\t\t\t\"%s\": {\n"
-                        "\t\t\t\t\t\"id\": %u,\n"
-                        "\t\t\t\t\t\"status\": \"%s\",\n"
-                        "\t\t\t\t\t\"units\": \"%s\",\n"
-                        "\t\t\t\t\t\"update_every\": %d\n"
-                        "\t\t\t\t}"
-                , (alarms) ? ",\n" : ""
-                , rc->name
-                , rc->id
-                , rrdcalc_status2string(rc->status)
-                , rc->units
-                , rc->update_every
-        );
-
-        alarms++;
-    }
-
-    buffer_sprintf(wb,
-        "\n\t\t\t}\n\t\t}"
-        );
-
-    rrdset_unlock(st);
-}
-
-void rrd_stats_api_v1_chart(RRDSET *st, BUFFER *wb) {
-    rrd_stats_api_v1_chart_with_data(st, wb, NULL, NULL);
-}
-
-void rrd_stats_api_v1_charts(RRDHOST *host, BUFFER *wb) {
-    static char *custom_dashboard_info_js_filename = NULL;
-    size_t c, dimensions = 0, memory = 0, alarms = 0;
-    RRDSET *st;
-
-    time_t now = now_realtime_sec();
-
-    if(unlikely(!custom_dashboard_info_js_filename))
-        custom_dashboard_info_js_filename = config_get(CONFIG_SECTION_WEB, "custom dashboard_info.js", "");
-
-    buffer_sprintf(wb, "{\n"
-           "\t\"hostname\": \"%s\""
-        ",\n\t\"version\": \"%s\""
-        ",\n\t\"os\": \"%s\""
-        ",\n\t\"timezone\": \"%s\""
-        ",\n\t\"update_every\": %d"
-        ",\n\t\"history\": %ld"
-        ",\n\t\"custom_info\": \"%s\""
-        ",\n\t\"charts\": {"
-        , host->hostname
-        , host->program_version
-        , host->os
-        , host->timezone
-        , host->rrd_update_every
-        , host->rrd_history_entries
-        , custom_dashboard_info_js_filename
-        );
-
-    c = 0;
-    rrdhost_rdlock(host);
-    rrdset_foreach_read(st, host) {
-        if(rrdset_is_available_for_viewers(st)) {
-            if(c) buffer_strcat(wb, ",");
-            buffer_strcat(wb, "\n\t\t\"");
-            buffer_strcat(wb, st->id);
-            buffer_strcat(wb, "\": ");
-            rrd_stats_api_v1_chart_with_data(st, wb, &dimensions, &memory);
-
-            c++;
-            st->last_accessed_time = now;
-        }
-    }
-
-    RRDCALC *rc;
-    for(rc = host->alarms; rc ; rc = rc->next) {
-        if(rc->rrdset)
-            alarms++;
-    }
-    rrdhost_unlock(host);
-
-    buffer_sprintf(wb
-                   , "\n\t}"
-                    ",\n\t\"charts_count\": %zu"
-                    ",\n\t\"dimensions_count\": %zu"
-                    ",\n\t\"alarms_count\": %zu"
-                    ",\n\t\"rrd_memory_bytes\": %zu"
-                    ",\n\t\"hosts_count\": %zu"
-                    ",\n\t\"hosts\": ["
-                   , c
-                   , dimensions
-                   , alarms
-                   , memory
-                   , rrd_hosts_available
-    );
-
-    if(unlikely(rrd_hosts_available > 1)) {
-        rrd_rdlock();
-
-        size_t found = 0;
-        RRDHOST *h;
-        rrdhost_foreach_read(h) {
-            if(!rrdhost_should_be_removed(h, host, now)) {
-                buffer_sprintf(wb
-                               , "%s\n\t\t{"
-                                "\n\t\t\t\"hostname\": \"%s\""
-                                "\n\t\t}"
-                               , (found > 0) ? "," : ""
-                               , h->hostname
-                );
-
-                found++;
-            }
-        }
-
-        rrd_unlock();
-    }
-    else {
-        buffer_sprintf(wb
-                       , "\n\t\t{"
-                        "\n\t\t\t\"hostname\": \"%s\""
-                        "\n\t\t}"
-                       , host->hostname
-        );
-    }
-
-    buffer_sprintf(wb, "\n\t]\n}\n");
-}
-
-// ----------------------------------------------------------------------------
-// BASH
-// /api/v1/allmetrics?format=bash
-
-static inline size_t shell_name_copy(char *d, const char *s, size_t usable) {
-    size_t n;
-
-    for(n = 0; *s && n < usable ; d++, s++, n++) {
-        register char c = *s;
-
-        if(unlikely(!isalnum(c))) *d = '_';
-        else *d = (char)toupper(c);
-    }
-    *d = '\0';
-
-    return n;
-}
-
-#define SHELL_ELEMENT_MAX 100
-
-void rrd_stats_api_v1_charts_allmetrics_shell(RRDHOST *host, BUFFER *wb) {
-    rrdhost_rdlock(host);
-
-    // for each chart
-    RRDSET *st;
-    rrdset_foreach_read(st, host) {
-        calculated_number total = 0.0;
-        char chart[SHELL_ELEMENT_MAX + 1];
-        shell_name_copy(chart, st->name?st->name:st->id, SHELL_ELEMENT_MAX);
-
-        buffer_sprintf(wb, "\n# chart: %s (name: %s)\n", st->id, st->name);
-        if(rrdset_is_available_for_viewers(st)) {
-            rrdset_rdlock(st);
-
-            // for each dimension
-            RRDDIM *rd;
-            rrddim_foreach_read(rd, st) {
-                if(rd->collections_counter) {
-                    char dimension[SHELL_ELEMENT_MAX + 1];
-                    shell_name_copy(dimension, rd->name?rd->name:rd->id, SHELL_ELEMENT_MAX);
-
-                    calculated_number n = rd->last_stored_value;
-
-                    if(isnan(n) || isinf(n))
-                        buffer_sprintf(wb, "NETDATA_%s_%s=\"\"      # %s\n", chart, dimension, st->units);
-                    else {
-                        if(rd->multiplier < 0 || rd->divisor < 0) n = -n;
-                        n = calculated_number_round(n);
-                        if(!rrddim_flag_check(rd, RRDDIM_FLAG_HIDDEN)) total += n;
-                        buffer_sprintf(wb, "NETDATA_%s_%s=\"" CALCULATED_NUMBER_FORMAT_ZERO "\"      # %s\n", chart, dimension, n, st->units);
-                    }
-                }
-            }
-
-            total = calculated_number_round(total);
-            buffer_sprintf(wb, "NETDATA_%s_VISIBLETOTAL=\"" CALCULATED_NUMBER_FORMAT_ZERO "\"      # %s\n", chart, total, st->units);
-            rrdset_unlock(st);
-        }
-    }
-
-    buffer_strcat(wb, "\n# NETDATA ALARMS RUNNING\n");
-
-    RRDCALC *rc;
-    for(rc = host->alarms; rc ;rc = rc->next) {
-        if(!rc->rrdset) continue;
-
-        char chart[SHELL_ELEMENT_MAX + 1];
-        shell_name_copy(chart, rc->rrdset->name?rc->rrdset->name:rc->rrdset->id, SHELL_ELEMENT_MAX);
-
-        char alarm[SHELL_ELEMENT_MAX + 1];
-        shell_name_copy(alarm, rc->name, SHELL_ELEMENT_MAX);
-
-        calculated_number n = rc->value;
-
-        if(isnan(n) || isinf(n))
-            buffer_sprintf(wb, "NETDATA_ALARM_%s_%s_VALUE=\"\"      # %s\n", chart, alarm, rc->units);
-        else {
-            n = calculated_number_round(n);
-            buffer_sprintf(wb, "NETDATA_ALARM_%s_%s_VALUE=\"" CALCULATED_NUMBER_FORMAT_ZERO "\"      # %s\n", chart, alarm, n, rc->units);
-        }
-
-        buffer_sprintf(wb, "NETDATA_ALARM_%s_%s_STATUS=\"%s\"\n", chart, alarm, rrdcalc_status2string(rc->status));
-    }
-
-    rrdhost_unlock(host);
-}
-
-// ----------------------------------------------------------------------------
-
-void rrd_stats_api_v1_charts_allmetrics_json(RRDHOST *host, BUFFER *wb) {
-    rrdhost_rdlock(host);
-
-    buffer_strcat(wb, "{");
-
-    size_t chart_counter = 0;
-    size_t dimension_counter = 0;
-
-    // for each chart
-    RRDSET *st;
-    rrdset_foreach_read(st, host) {
-        if(rrdset_is_available_for_viewers(st)) {
-            rrdset_rdlock(st);
-
-            buffer_sprintf(wb, "%s\n"
-                    "\t\"%s\": {\n"
-                    "\t\t\"name\":\"%s\",\n"
-                    "\t\t\"context\":\"%s\",\n"
-                    "\t\t\"units\":\"%s\",\n"
-                    "\t\t\"last_updated\": %ld,\n"
-                    "\t\t\"dimensions\": {"
-                    , chart_counter?",":""
-                    , st->id
-                    , st->name
-                    , st->context
-                    , st->units
-                    , rrdset_last_entry_t(st)
-            );
-
-            chart_counter++;
-            dimension_counter = 0;
-
-            // for each dimension
-            RRDDIM *rd;
-            rrddim_foreach_read(rd, st) {
-                if(rd->collections_counter) {
-
-                    buffer_sprintf(wb, "%s\n"
-                            "\t\t\t\"%s\": {\n"
-                            "\t\t\t\t\"name\": \"%s\",\n"
-                            "\t\t\t\t\"value\": "
-                            , dimension_counter?",":""
-                            , rd->id
-                            , rd->name
-                    );
-
-                    if(isnan(rd->last_stored_value))
-                        buffer_strcat(wb, "null");
-                    else
-                        buffer_sprintf(wb, CALCULATED_NUMBER_FORMAT, rd->last_stored_value);
-
-                    buffer_strcat(wb, "\n\t\t\t}");
-
-                    dimension_counter++;
-                }
-            }
-
-            buffer_strcat(wb, "\n\t\t}\n\t}");
-            rrdset_unlock(st);
-        }
-    }
-
-    buffer_strcat(wb, "\n}");
-    rrdhost_unlock(host);
-}
-
-// ----------------------------------------------------------------------------
-
-// RRDR dimension options
-#define RRDR_EMPTY      0x01 // the dimension contains / the value is empty (null)
-#define RRDR_RESET      0x02 // the dimension contains / the value is reset
-#define RRDR_HIDDEN     0x04 // the dimension contains / the value is hidden
-#define RRDR_NONZERO    0x08 // the dimension contains / the value is non-zero
-#define RRDR_SELECTED   0x10 // the dimension is selected
-
-// RRDR result options
-#define RRDR_RESULT_OPTION_ABSOLUTE 0x00000001
-#define RRDR_RESULT_OPTION_RELATIVE 0x00000002
-
-typedef struct rrdresult {
-    RRDSET *st;         // the chart this result refers to
-
-    uint32_t result_options;    // RRDR_RESULT_OPTION_*
-
-    int d;                  // the number of dimensions
-    long n;                 // the number of values in the arrays
-    long rows;              // the number of rows used
-
-    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
-
-    long c;                 // current line ( -1 ~ n ), ( -1 = none, use rrdr_rows() to get number of rows )
-
-    long group;             // how many collected values were grouped for each row
-    int update_every;       // what is the suggested update frequency in seconds
-
-    calculated_number min;
-    calculated_number max;
-
-    time_t before;
-    time_t after;
-
-    int has_st_lock;        // if st is read locked by us
-} RRDR;
-
-#define rrdr_rows(r) ((r)->rows)
-
-/*
-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->rows <= 0) {
-        fprintf(stderr, "RRDR does not have any values in it.\n");
-        return;
-    }
-
-    fprintf(stderr, "RRDR includes %d values in it:\n", r->rows);
-
-    // for each line in the array
-    for(i = 0; i < r->rows ;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");
-    }
-}
-*/
-
-void rrdr_disable_not_selected_dimensions(RRDR *r, uint32_t options, const char *dims) {
-    rrdset_check_rdlock(r->st);
-
-    if(unlikely(!dims || !*dims || (dims[0] == '*' && dims[1] == '\0'))) return;
-
-    int match_ids = 0, match_names = 0;
-
-    if(unlikely(options & RRDR_OPTION_MATCH_IDS))
-        match_ids = 1;
-    if(unlikely(options & RRDR_OPTION_MATCH_NAMES))
-        match_names = 1;
-
-    if(likely(!match_ids && !match_names))
-        match_ids = match_names = 1;
-
-    SIMPLE_PATTERN *pattern = simple_pattern_create(dims, ",|\t\r\n\f\v", SIMPLE_PATTERN_EXACT);
-
-    RRDDIM *d;
-    long c, dims_selected = 0, dims_not_hidden_not_zero = 0;
-    for(c = 0, d = r->st->dimensions; d ;c++, d = d->next) {
-        if(    (match_ids   && simple_pattern_matches(pattern, d->id))
-            || (match_names && simple_pattern_matches(pattern, d->name))
-                ) {
-            r->od[c] |= RRDR_SELECTED;
-            if(unlikely(r->od[c] & RRDR_HIDDEN)) r->od[c] &= ~RRDR_HIDDEN;
-            dims_selected++;
-
-            // since the user needs this dimension
-            // make it appear as NONZERO, to return it
-            // even if the dimension has only zeros
-            // unless option non_zero is set
-            if(unlikely(!(options & RRDR_OPTION_NONZERO)))
-                r->od[c] |= RRDR_NONZERO;
-
-            // count the visible dimensions
-            if(likely(r->od[c] & RRDR_NONZERO))
-                dims_not_hidden_not_zero++;
-        }
-        else {
-            r->od[c] |= RRDR_HIDDEN;
-            if(unlikely(r->od[c] & RRDR_SELECTED)) r->od[c] &= ~RRDR_SELECTED;
-        }
-    }
-    simple_pattern_free(pattern);
-
-    // check if all dimensions are hidden
-    if(unlikely(!dims_not_hidden_not_zero && dims_selected)) {
-        // there are a few selected dimensions
-        // but they are all zero
-        // enable the selected ones
-        // to avoid returning an empty chart
-        for(c = 0, d = r->st->dimensions; d ;c++, d = d->next)
-            if(unlikely(r->od[c] & RRDR_SELECTED))
-                r->od[c] |= RRDR_NONZERO;
-    }
-}
-
-void rrdr_buffer_print_format(BUFFER *wb, uint32_t format)
-{
-    switch(format) {
-    case DATASOURCE_JSON:
-        buffer_strcat(wb, DATASOURCE_FORMAT_JSON);
-        break;
-
-    case DATASOURCE_DATATABLE_JSON:
-        buffer_strcat(wb, DATASOURCE_FORMAT_DATATABLE_JSON);
-        break;
-
-    case DATASOURCE_DATATABLE_JSONP:
-        buffer_strcat(wb, DATASOURCE_FORMAT_DATATABLE_JSONP);
-        break;
-
-    case DATASOURCE_JSONP:
-        buffer_strcat(wb, DATASOURCE_FORMAT_JSONP);
-        break;
-
-    case DATASOURCE_SSV:
-        buffer_strcat(wb, DATASOURCE_FORMAT_SSV);
-        break;
-
-    case DATASOURCE_CSV:
-        buffer_strcat(wb, DATASOURCE_FORMAT_CSV);
-        break;
-
-    case DATASOURCE_TSV:
-        buffer_strcat(wb, DATASOURCE_FORMAT_TSV);
-        break;
-
-    case DATASOURCE_HTML:
-        buffer_strcat(wb, DATASOURCE_FORMAT_HTML);
-        break;
-
-    case DATASOURCE_JS_ARRAY:
-        buffer_strcat(wb, DATASOURCE_FORMAT_JS_ARRAY);
-        break;
-
-    case DATASOURCE_SSV_COMMA:
-        buffer_strcat(wb, DATASOURCE_FORMAT_SSV_COMMA);
-        break;
-
-    default:
-        buffer_strcat(wb, "unknown");
-        break;
-    }
-}
-
-uint32_t rrdr_check_options(RRDR *r, uint32_t options, const char *dims)
-{
-    rrdset_check_rdlock(r->st);
-
-    (void)dims;
-
-    if(options & RRDR_OPTION_NONZERO) {
-        long i;
-
-        // commented due to #1514
-
-        //if(dims && *dims) {
-            // the caller wants specific dimensions
-            // disable NONZERO option
-            // to make sure we don't accidentally prevent
-            // the specific dimensions from being returned
-            // i = 0;
-        //}
-        //else {
-            // find how many dimensions are not zero
-            long c;
-            RRDDIM *rd;
-            for(c = 0, i = 0, rd = r->st->dimensions; rd && c < r->d ; c++, rd = rd->next) {
-                if(unlikely(r->od[c] & RRDR_HIDDEN)) continue;
-                if(unlikely(!(r->od[c] & RRDR_NONZERO))) continue;
-                i++;
-            }
-        //}
-
-        // if with nonzero we get i = 0 (no dimensions will be returned)
-        // disable nonzero to show all dimensions
-        if(!i) options &= ~RRDR_OPTION_NONZERO;
-    }
-
-    return options;
-}
-
-void rrdr_json_wrapper_begin(RRDR *r, BUFFER *wb, uint32_t format, uint32_t options, int string_value)
-{
-    rrdset_check_rdlock(r->st);
-
-    long rows = rrdr_rows(r);
-    long c, i;
-    RRDDIM *rd;
-
-    //info("JSONWRAPPER(): %s: BEGIN", r->st->id);
-    char kq[2] = "",                    // key quote
-        sq[2] = "";                     // string quote
-
-    if( options & RRDR_OPTION_GOOGLE_JSON ) {
-        kq[0] = '\0';
-        sq[0] = '\'';
-    }
-    else {
-        kq[0] = '"';
-        sq[0] = '"';
-    }
-
-    buffer_sprintf(wb, "{\n"
-            "   %sapi%s: 1,\n"
-            "   %sid%s: %s%s%s,\n"
-            "   %sname%s: %s%s%s,\n"
-            "   %sview_update_every%s: %d,\n"
-            "   %supdate_every%s: %d,\n"
-            "   %sfirst_entry%s: %u,\n"
-            "   %slast_entry%s: %u,\n"
-            "   %sbefore%s: %u,\n"
-            "   %safter%s: %u,\n"
-            "   %sdimension_names%s: ["
-            , kq, kq
-            , kq, kq, sq, r->st->id, sq
-            , kq, kq, sq, r->st->name, sq
-            , kq, kq, r->update_every
-            , kq, kq, r->st->update_every
-            , kq, kq, (uint32_t)rrdset_first_entry_t(r->st)
-            , kq, kq, (uint32_t)rrdset_last_entry_t(r->st)
-            , kq, kq, (uint32_t)r->before
-            , kq, kq, (uint32_t)r->after
-            , kq, kq);
-
-    for(c = 0, i = 0, rd = r->st->dimensions; rd && c < r->d ;c++, rd = rd->next) {
-        if(unlikely(r->od[c] & RRDR_HIDDEN)) continue;
-        if(unlikely((options & RRDR_OPTION_NONZERO) && !(r->od[c] & RRDR_NONZERO))) continue;
-
-        if(i) buffer_strcat(wb, ", ");
-        buffer_strcat(wb, sq);
-        buffer_strcat(wb, rd->name);
-        buffer_strcat(wb, sq);
-        i++;
-    }
-    if(!i) {
-#ifdef NETDATA_INTERNAL_CHECKS
-        error("RRDR is empty for %s (RRDR has %d dimensions, options is 0x%08x)", r->st->id, r->d, options);
-#endif
-        rows = 0;
-        buffer_strcat(wb, sq);
-        buffer_strcat(wb, "no data");
-        buffer_strcat(wb, sq);
-    }
-
-    buffer_sprintf(wb, "],\n"
-            "   %sdimension_ids%s: ["
-            , kq, kq);
-
-    for(c = 0, i = 0, rd = r->st->dimensions; rd && c < r->d ;c++, rd = rd->next) {
-        if(unlikely(r->od[c] & RRDR_HIDDEN)) continue;
-        if(unlikely((options & RRDR_OPTION_NONZERO) && !(r->od[c] & RRDR_NONZERO))) continue;
-
-        if(i) buffer_strcat(wb, ", ");
-        buffer_strcat(wb, sq);
-        buffer_strcat(wb, rd->id);
-        buffer_strcat(wb, sq);
-        i++;
-    }
-    if(!i) {
-        rows = 0;
-        buffer_strcat(wb, sq);
-        buffer_strcat(wb, "no data");
-        buffer_strcat(wb, sq);
-    }
-
-    buffer_sprintf(wb, "],\n"
-            "   %slatest_values%s: ["
-            , kq, kq);
-
-    for(c = 0, i = 0, rd = r->st->dimensions; rd && c < r->d ;c++, rd = rd->next) {
-        if(unlikely(r->od[c] & RRDR_HIDDEN)) continue;
-        if(unlikely((options & RRDR_OPTION_NONZERO) && !(r->od[c] & RRDR_NONZERO))) continue;
-
-        if(i) buffer_strcat(wb, ", ");
-        i++;
-
-        storage_number n = rd->values[rrdset_last_slot(r->st)];
-
-        if(!does_storage_number_exist(n))
-            buffer_strcat(wb, "null");
-        else
-            buffer_rrd_value(wb, unpack_storage_number(n));
-    }
-    if(!i) {
-        rows = 0;
-        buffer_strcat(wb, "null");
-    }
-
-    buffer_sprintf(wb, "],\n"
-            "   %sview_latest_values%s: ["
-            , kq, kq);
-
-    i = 0;
-    if(rows) {
-        calculated_number total = 1;
-
-        if(unlikely(options & RRDR_OPTION_PERCENTAGE)) {
-            total = 0;
-            for(c = 0, rd = r->st->dimensions; rd && c < r->d ;c++, rd = rd->next) {
-                calculated_number *cn = &r->v[ (0) * r->d ];
-                calculated_number n = cn[c];
-
-                if(likely((options & RRDR_OPTION_ABSOLUTE) && n < 0))
-                    n = -n;
-
-                total += n;
-            }
-            // prevent a division by zero
-            if(total == 0) total = 1;
-        }
-
-        for(c = 0, i = 0, rd = r->st->dimensions; rd && c < r->d ;c++, rd = rd->next) {
-            if(unlikely(r->od[c] & RRDR_HIDDEN)) continue;
-            if(unlikely((options & RRDR_OPTION_NONZERO) && !(r->od[c] & RRDR_NONZERO))) continue;
-
-            if(i) buffer_strcat(wb, ", ");
-            i++;
-
-            calculated_number *cn = &r->v[ (0) * r->d ];
-            uint8_t *co = &r->o[ (0) * r->d ];
-            calculated_number n = cn[c];
-
-            if(co[c] & RRDR_EMPTY) {
-                if(options & RRDR_OPTION_NULL2ZERO)
-                    buffer_strcat(wb, "0");
-                else
-                    buffer_strcat(wb, "null");
-            }
-            else {
-                if(unlikely((options & RRDR_OPTION_ABSOLUTE) && n < 0))
-                    n = -n;
-
-                if(unlikely(options & RRDR_OPTION_PERCENTAGE))
-                    n = n * 100 / total;
-
-                buffer_rrd_value(wb, n);
-            }
-        }
-    }
-    if(!i) {
-        rows = 0;
-        buffer_strcat(wb, "null");
-    }
-
-    buffer_sprintf(wb, "],\n"
-            "   %sdimensions%s: %ld,\n"
-            "   %spoints%s: %ld,\n"
-            "   %sformat%s: %s"
-            , kq, kq, i
-            , kq, kq, rows
-            , kq, kq, sq
-            );
-
-    rrdr_buffer_print_format(wb, format);
-
-    buffer_sprintf(wb, "%s,\n"
-            "   %sresult%s: "
-            , sq
-            , kq, kq
-            );
-
-    if(string_value) buffer_strcat(wb, sq);
-    //info("JSONWRAPPER(): %s: END", r->st->id);
-}
-
-void rrdr_json_wrapper_end(RRDR *r, BUFFER *wb, uint32_t format, uint32_t options, int string_value)
-{
-    (void)format;
-
-    char kq[2] = "",                    // key quote
-        sq[2] = "";                     // string quote
-
-    if( options & RRDR_OPTION_GOOGLE_JSON ) {
-        kq[0] = '\0';
-        sq[0] = '\'';
-    }
-    else {
-        kq[0] = '"';
-        sq[0] = '"';
-    }
-
-    if(string_value) buffer_strcat(wb, sq);
-
-    buffer_sprintf(wb, ",\n %smin%s: ", kq, kq);
-    buffer_rrd_value(wb, r->min);
-    buffer_sprintf(wb, ",\n %smax%s: ", kq, kq);
-    buffer_rrd_value(wb, r->max);
-    buffer_strcat(wb, "\n}\n");
-}
-
-#define JSON_DATES_JS 1
-#define JSON_DATES_TIMESTAMP 2
-
-static void rrdr2json(RRDR *r, BUFFER *wb, uint32_t options, int datatable)
-{
-    rrdset_check_rdlock(r->st);
-
-    //info("RRD2JSON(): %s: BEGIN", r->st->id);
-    int row_annotations = 0, dates, dates_with_new = 0;
-    char kq[2] = "",                    // key quote
-        sq[2] = "",                     // string quote
-        pre_label[101] = "",            // before each label
-        post_label[101] = "",           // after each label
-        pre_date[101] = "",             // the beginning of line, to the date
-        post_date[101] = "",            // closing the date
-        pre_value[101] = "",            // before each value
-        post_value[101] = "",           // after each value
-        post_line[101] = "",            // at the end of each row
-        normal_annotation[201] = "",    // default row annotation
-        overflow_annotation[201] = "",  // overflow row annotation
-        data_begin[101] = "",           // between labels and values
-        finish[101] = "";               // at the end of everything
-
-    if(datatable) {
-        dates = JSON_DATES_JS;
-        if( options & RRDR_OPTION_GOOGLE_JSON ) {
-            kq[0] = '\0';
-            sq[0] = '\'';
-        }
-        else {
-            kq[0] = '"';
-            sq[0] = '"';
-        }
-        row_annotations = 1;
-        snprintfz(pre_date,   100, "        {%sc%s:[{%sv%s:%s", kq, kq, kq, kq, sq);
-        snprintfz(post_date,  100, "%s}", sq);
-        snprintfz(pre_label,  100, ",\n     {%sid%s:%s%s,%slabel%s:%s", kq, kq, sq, sq, kq, kq, sq);
-        snprintfz(post_label, 100, "%s,%spattern%s:%s%s,%stype%s:%snumber%s}", sq, kq, kq, sq, sq, kq, kq, sq, sq);
-        snprintfz(pre_value,  100, ",{%sv%s:", kq, kq);
-        strcpy(post_value,         "}");
-        strcpy(post_line,          "]}");
-        snprintfz(data_begin, 100, "\n  ],\n    %srows%s:\n [\n", kq, kq);
-        strcpy(finish,             "\n  ]\n}");
-
-        snprintfz(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);
-        snprintfz(normal_annotation,   200, ",{%sv%s:null},{%sv%s:null}", kq, kq, kq, kq);
-
-        buffer_sprintf(wb, "{\n %scols%s:\n [\n", kq, kq);
-        buffer_sprintf(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);
-        buffer_sprintf(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);
-        buffer_sprintf(wb, "        {%sid%s:%s%s,%slabel%s:%s%s,%spattern%s:%s%s,%stype%s:%sstring%s,%sp%s:{%srole%s:%sannotationText%s}}", kq, kq, sq, sq, kq, kq, sq, sq, kq, kq, sq, sq, kq, kq, sq, sq, kq, kq, kq, kq, sq, sq);
-
-        // remove the valueobjects flag
-        // google wants its own keys
-        if(options & RRDR_OPTION_OBJECTSROWS)
-            options &= ~RRDR_OPTION_OBJECTSROWS;
-    }
-    else {
-        kq[0] = '"';
-        sq[0] = '"';
-        if(options & RRDR_OPTION_GOOGLE_JSON) {
-            dates = JSON_DATES_JS;
-            dates_with_new = 1;
-        }
-        else {
-            dates = JSON_DATES_TIMESTAMP;
-            dates_with_new = 0;
-        }
-        if( options & RRDR_OPTION_OBJECTSROWS )
-            strcpy(pre_date, "      { ");
-        else
-            strcpy(pre_date, "      [ ");
-        strcpy(pre_label,  ", \"");
-        strcpy(post_label, "\"");
-        strcpy(pre_value,  ", ");
-        if( options & RRDR_OPTION_OBJECTSROWS )
-            strcpy(post_line, "}");
-        else
-            strcpy(post_line, "]");
-        snprintfz(data_begin, 100, "],\n    %sdata%s:\n [\n", kq, kq);
-        strcpy(finish,             "\n  ]\n}");
-
-        buffer_sprintf(wb, "{\n %slabels%s: [", kq, kq);
-        buffer_sprintf(wb, "%stime%s", sq, sq);
-    }
-
-    // -------------------------------------------------------------------------
-    // print the JSON header
-
-    long c, i;
-    RRDDIM *rd;
-
-    // print the header lines
-    for(c = 0, i = 0, rd = r->st->dimensions; rd && c < r->d ;c++, rd = rd->next) {
-        if(unlikely(r->od[c] & RRDR_HIDDEN)) continue;
-        if(unlikely((options & RRDR_OPTION_NONZERO) && !(r->od[c] & RRDR_NONZERO))) continue;
-
-        buffer_strcat(wb, pre_label);
-        buffer_strcat(wb, rd->name);
-        buffer_strcat(wb, post_label);
-        i++;
-    }
-    if(!i) {
-        buffer_strcat(wb, pre_label);
-        buffer_strcat(wb, "no data");
-        buffer_strcat(wb, post_label);
-    }
-
-    // print the begin of row data
-    buffer_strcat(wb, data_begin);
-
-    // if all dimensions are hidden, print a null
-    if(!i) {
-        buffer_strcat(wb, finish);
-        return;
-    }
-
-    long start = 0, end = rrdr_rows(r), step = 1;
-    if((options & RRDR_OPTION_REVERSED)) {
-        start = rrdr_rows(r) - 1;
-        end = -1;
-        step = -1;
-    }
-
-    // for each line in the array
-    calculated_number total = 1;
-    for(i = start; i != end ;i += step) {
-        calculated_number *cn = &r->v[ i * r->d ];
-        uint8_t *co = &r->o[ i * r->d ];
-
-        time_t now = r->t[i];
-
-        if(dates == JSON_DATES_JS) {
-            // generate the local date time
-            struct tm tmbuf, *tm = localtime_r(&now, &tmbuf);
-            if(!tm) { error("localtime_r() failed."); continue; }
-
-            if(likely(i != start)) buffer_strcat(wb, ",\n");
-            buffer_strcat(wb, pre_date);
-
-            if( options & RRDR_OPTION_OBJECTSROWS )
-                buffer_sprintf(wb, "%stime%s: ", kq, kq);
-
-            if(dates_with_new)
-                buffer_strcat(wb, "new ");
-
-            buffer_jsdate(wb, tm->tm_year + 1900, tm->tm_mon, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec);
-
-            buffer_strcat(wb, post_date);
-
-            if(row_annotations) {
-                // google supports one annotation per row
-                int annotation_found = 0;
-                for(c = 0, rd = r->st->dimensions; rd ;c++, rd = rd->next) {
-                    if(co[c] & RRDR_RESET) {
-                        buffer_strcat(wb, overflow_annotation);
-                        annotation_found = 1;
-                        break;
-                    }
-                }
-                if(!annotation_found)
-                    buffer_strcat(wb, normal_annotation);
-            }
-        }
-        else {
-            // print the timestamp of the line
-            if(likely(i != start)) buffer_strcat(wb, ",\n");
-            buffer_strcat(wb, pre_date);
-
-            if( options & RRDR_OPTION_OBJECTSROWS )
-                buffer_sprintf(wb, "%stime%s: ", kq, kq);
-
-            buffer_rrd_value(wb, (calculated_number)r->t[i]);
-            // in ms
-            if(options & RRDR_OPTION_MILLISECONDS) buffer_strcat(wb, "000");
-
-            buffer_strcat(wb, post_date);
-        }
-
-        int set_min_max = 0;
-        if(unlikely(options & RRDR_OPTION_PERCENTAGE)) {
-            total = 0;
-            for(c = 0, rd = r->st->dimensions; rd && c < r->d ;c++, rd = rd->next) {
-                calculated_number n = cn[c];
-
-                if(likely((options & RRDR_OPTION_ABSOLUTE) && n < 0))
-                    n = -n;
-
-                total += n;
-            }
-            // prevent a division by zero
-            if(total == 0) total = 1;
-            set_min_max = 1;
-        }
-
-        // for each dimension
-        for(c = 0, rd = r->st->dimensions; rd && c < r->d ;c++, rd = rd->next) {
-            if(unlikely(r->od[c] & RRDR_HIDDEN)) continue;
-            if(unlikely((options & RRDR_OPTION_NONZERO) && !(r->od[c] & RRDR_NONZERO))) continue;
-
-            calculated_number n = cn[c];
-
-            buffer_strcat(wb, pre_value);
-
-            if( options & RRDR_OPTION_OBJECTSROWS )
-                buffer_sprintf(wb, "%s%s%s: ", kq, rd->name, kq);
-
-            if(co[c] & RRDR_EMPTY) {
-                if(options & RRDR_OPTION_NULL2ZERO)
-                    buffer_strcat(wb, "0");
-                else
-                    buffer_strcat(wb, "null");
-            }
-            else {
-                if(unlikely((options & RRDR_OPTION_ABSOLUTE) && n < 0))
-                    n = -n;
-
-                if(unlikely(options & RRDR_OPTION_PERCENTAGE)) {
-                    n = n * 100 / total;
-
-                    if(unlikely(set_min_max)) {
-                        r->min = r->max = n;
-                        set_min_max = 0;
-                    }
-
-                    if(n < r->min) r->min = n;
-                    if(n > r->max) r->max = n;
-                }
-
-                buffer_rrd_value(wb, n);
-            }
-
-            buffer_strcat(wb, post_value);
-        }
-
-        buffer_strcat(wb, post_line);
-    }
-
-    buffer_strcat(wb, finish);
-    //info("RRD2JSON(): %s: END", r->st->id);
-}
-
-static void rrdr2csv(RRDR *r, BUFFER *wb, uint32_t options, const char *startline, const char *separator, const char *endline, const char *betweenlines)
-{
-    rrdset_check_rdlock(r->st);
-
-    //info("RRD2CSV(): %s: BEGIN", r->st->id);
-    long c, i;
-    RRDDIM *d;
-
-    // print the csv header
-    for(c = 0, i = 0, d = r->st->dimensions; d && c < r->d ;c++, d = d->next) {
-        if(unlikely(r->od[c] & RRDR_HIDDEN)) continue;
-        if(unlikely((options & RRDR_OPTION_NONZERO) && !(r->od[c] & RRDR_NONZERO))) continue;
-
-        if(!i) {
-            buffer_strcat(wb, startline);
-            if(options & RRDR_OPTION_LABEL_QUOTES) buffer_strcat(wb, "\"");
-            buffer_strcat(wb, "time");
-            if(options & RRDR_OPTION_LABEL_QUOTES) buffer_strcat(wb, "\"");
-        }
-        buffer_strcat(wb, separator);
-        if(options & RRDR_OPTION_LABEL_QUOTES) buffer_strcat(wb, "\"");
-        buffer_strcat(wb, d->name);
-        if(options & RRDR_OPTION_LABEL_QUOTES) buffer_strcat(wb, "\"");
-        i++;
-    }
-    buffer_strcat(wb, endline);
-
-    if(!i) {
-        // no dimensions present
-        return;
-    }
-
-    long start = 0, end = rrdr_rows(r), step = 1;
-    if((options & RRDR_OPTION_REVERSED)) {
-        start = rrdr_rows(r) - 1;
-        end = -1;
-        step = -1;
-    }
-
-    // for each line in the array
-    calculated_number total = 1;
-    for(i = start; i != end ;i += step) {
-        calculated_number *cn = &r->v[ i * r->d ];
-        uint8_t *co = &r->o[ i * r->d ];
-
-        buffer_strcat(wb, betweenlines);
-        buffer_strcat(wb, startline);
-
-        time_t now = r->t[i];
-
-        if((options & RRDR_OPTION_SECONDS) || (options & RRDR_OPTION_MILLISECONDS)) {
-            // print the timestamp of the line
-            buffer_rrd_value(wb, (calculated_number)now);
-            // in ms
-            if(options & RRDR_OPTION_MILLISECONDS) buffer_strcat(wb, "000");
-        }
-        else {
-            // generate the local date time
-            struct tm tmbuf, *tm = localtime_r(&now, &tmbuf);
-            if(!tm) { error("localtime() failed."); continue; }
-            buffer_date(wb, tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec);
-        }
-
-        int set_min_max = 0;
-        if(unlikely(options & RRDR_OPTION_PERCENTAGE)) {
-            total = 0;
-            for(c = 0, d = r->st->dimensions; d && c < r->d ;c++, d = d->next) {
-                calculated_number n = cn[c];
-
-                if(likely((options & RRDR_OPTION_ABSOLUTE) && n < 0))
-                    n = -n;
-
-                total += n;
-            }
-            // prevent a division by zero
-            if(total == 0) total = 1;
-            set_min_max = 1;
-        }
-
-        // for each dimension
-        for(c = 0, d = r->st->dimensions; d && c < r->d ;c++, d = d->next) {
-            if(unlikely(r->od[c] & RRDR_HIDDEN)) continue;
-            if(unlikely((options & RRDR_OPTION_NONZERO) && !(r->od[c] & RRDR_NONZERO))) continue;
-
-            buffer_strcat(wb, separator);
-
-            calculated_number n = cn[c];
-
-            if(co[c] & RRDR_EMPTY) {
-                if(options & RRDR_OPTION_NULL2ZERO)
-                    buffer_strcat(wb, "0");
-                else
-                    buffer_strcat(wb, "null");
-            }
-            else {
-                if(unlikely((options & RRDR_OPTION_ABSOLUTE) && n < 0))
-                    n = -n;
-
-                if(unlikely(options & RRDR_OPTION_PERCENTAGE)) {
-                    n = n * 100 / total;
-
-                    if(unlikely(set_min_max)) {
-                        r->min = r->max = n;
-                        set_min_max = 0;
-                    }
-
-                    if(n < r->min) r->min = n;
-                    if(n > r->max) r->max = n;
-                }
-
-                buffer_rrd_value(wb, n);
-            }
-        }
-
-        buffer_strcat(wb, endline);
-    }
-    //info("RRD2CSV(): %s: END", r->st->id);
-}
-
-inline static calculated_number rrdr2value(RRDR *r, long i, uint32_t options, int *all_values_are_null) {
-    rrdset_check_rdlock(r->st);
-
-    long c;
-    RRDDIM *d;
-
-    calculated_number *cn = &r->v[ i * r->d ];
-    uint8_t *co = &r->o[ i * r->d ];
-
-    calculated_number sum = 0, min = 0, max = 0, v;
-    int all_null = 1, init = 1;
-
-    calculated_number total = 1;
-    int set_min_max = 0;
-    if(unlikely(options & RRDR_OPTION_PERCENTAGE)) {
-        total = 0;
-        for(c = 0, d = r->st->dimensions; d && c < r->d ;c++, d = d->next) {
-            calculated_number n = cn[c];
-
-            if(likely((options & RRDR_OPTION_ABSOLUTE) && n < 0))
-                n = -n;
-
-            total += n;
-        }
-        // prevent a division by zero
-        if(total == 0) total = 1;
-        set_min_max = 1;
-    }
-
-    // for each dimension
-    for(c = 0, d = r->st->dimensions; d && c < r->d ;c++, d = d->next) {
-        if(unlikely(r->od[c] & RRDR_HIDDEN)) continue;
-        if(unlikely((options & RRDR_OPTION_NONZERO) && !(r->od[c] & RRDR_NONZERO))) continue;
-
-        calculated_number n = cn[c];
-
-        if(likely((options & RRDR_OPTION_ABSOLUTE) && n < 0))
-            n = -n;
-
-        if(unlikely(options & RRDR_OPTION_PERCENTAGE)) {
-            n = n * 100 / total;
-
-            if(unlikely(set_min_max)) {
-                r->min = r->max = n;
-                set_min_max = 0;
-            }
-
-            if(n < r->min) r->min = n;
-            if(n > r->max) r->max = n;
-        }
-
-        if(unlikely(init)) {
-            if(n > 0) {
-                min = 0;
-                max = n;
-            }
-            else {
-                min = n;
-                max = 0;
-            }
-            init = 0;
-        }
-
-        if(likely(!(co[c] & RRDR_EMPTY))) {
-            all_null = 0;
-            sum += n;
-        }
-
-        if(n < min) min = n;
-        if(n > max) max = n;
-    }
-
-    if(unlikely(all_null)) {
-        if(likely(all_values_are_null))
-            *all_values_are_null = 1;
-        return 0;
-    }
-    else {
-        if(likely(all_values_are_null))
-            *all_values_are_null = 0;
-    }
-
-    if(options & RRDR_OPTION_MIN2MAX)
-        v = max - min;
-    else
-        v = sum;
-
-    return v;
-}
-
-static void rrdr2ssv(RRDR *r, BUFFER *wb, uint32_t options, const char *prefix, const char *separator, const char *suffix)
-{
-    //info("RRD2SSV(): %s: BEGIN", r->st->id);
-    long i;
-
-    buffer_strcat(wb, prefix);
-    long start = 0, end = rrdr_rows(r), step = 1;
-    if((options & RRDR_OPTION_REVERSED)) {
-        start = rrdr_rows(r) - 1;
-        end = -1;
-        step = -1;
-    }
-
-    // for each line in the array
-    for(i = start; i != end ;i += step) {
-        int all_values_are_null = 0;
-        calculated_number v = rrdr2value(r, i, options, &all_values_are_null);
-
-        if(likely(i != start)) {
-            if(r->min > v) r->min = v;
-            if(r->max < v) r->max = v;
-        }
-        else {
-            r->min = v;
-            r->max = v;
-        }
-
-        if(likely(i != start))
-            buffer_strcat(wb, separator);
-
-        if(all_values_are_null) {
-            if(options & RRDR_OPTION_NULL2ZERO)
-                buffer_strcat(wb, "0");
-            else
-                buffer_strcat(wb, "null");
-        }
-        else
-            buffer_rrd_value(wb, v);
-    }
-    buffer_strcat(wb, suffix);
-    //info("RRD2SSV(): %s: END", r->st->id);
-}
-
-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)) {
-        error("requested to step above RRDR size for chart %s", r->st->name);
-        r->c = r->n - 1;
-    }
-
-    // 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;
-    }
-
-    rrdset_rdlock(r->st);
-    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)) {
-        rrdset_unlock(r->st);
-        r->has_st_lock = 0;
-    }
-}
-
-inline static void rrdr_free(RRDR *r)
-{
-    if(unlikely(!r)) {
-        error("NULL value given!");
-        return;
-    }
-
-    rrdr_unlock_rrdset(r);
-    freez(r->t);
-    freez(r->v);
-    freez(r->o);
-    freez(r->od);
-    freez(r);
-}
-
-static inline void rrdr_done(RRDR *r)
-{
-    r->rows = r->c + 1;
-    r->c = 0;
-}
-
-static RRDR *rrdr_create(RRDSET *st, long n)
-{
-    if(unlikely(!st)) {
-        error("NULL value given!");
-        return NULL;
-    }
-
-    RRDR *r = callocz(1, sizeof(RRDR));
-    r->st = st;
-
-    rrdr_lock_rrdset(r);
-
-    RRDDIM *rd;
-    rrddim_foreach_read(rd, st) r->d++;
-
-    r->n = n;
-
-    r->t = mallocz(n * sizeof(time_t));
-    r->v = mallocz(n * r->d * sizeof(calculated_number));
-    r->o = mallocz(n * r->d * sizeof(uint8_t));
-    r->od = mallocz(r->d * sizeof(uint8_t));
-
-    // set the hidden flag on hidden dimensions
-    int c;
-    for(c = 0, rd = st->dimensions ; rd ; c++, rd = rd->next) {
-        if(unlikely(rrddim_flag_check(rd, RRDDIM_FLAG_HIDDEN)))
-            r->od[c] = RRDR_HIDDEN;
-        else
-            r->od[c] = 0;
-    }
-
-    r->c = -1;
-    r->group = 1;
-    r->update_every = 1;
-
-    return r;
-}
-
-RRDR *rrd2rrdr(RRDSET *st, long points, long long after, long long before, int group_method, long group_time, int aligned)
-{
-#ifdef NETDATA_INTERNAL_CHECKS
-    int debug = rrdset_flag_check(st, RRDSET_FLAG_DEBUG)?1:0;
-#endif
-    int absolute_period_requested = -1;
-
-    time_t first_entry_t = rrdset_first_entry_t(st);
-    time_t last_entry_t  = rrdset_last_entry_t(st);
-
-    if(before == 0 && after == 0) {
-        // dump the all the data
-        before = last_entry_t;
-        after = first_entry_t;
-        absolute_period_requested = 0;
-    }
-
-    // allow relative for before (smaller than API_RELATIVE_TIME_MAX)
-    if(((before < 0)?-before:before) <= API_RELATIVE_TIME_MAX) {
-        if(abs(before) % st->update_every) {
-            // make sure it is multiple of st->update_every
-            if(before < 0) before = before - st->update_every - before % st->update_every;
-            else           before = before + st->update_every - before % st->update_every;
-        }
-        if(before > 0) before = first_entry_t + before;
-        else           before = last_entry_t  + before;
-        absolute_period_requested = 0;
-    }
-
-    // allow relative for after (smaller than API_RELATIVE_TIME_MAX)
-    if(((after < 0)?-after:after) <= API_RELATIVE_TIME_MAX) {
-        if(after == 0) after = -st->update_every;
-        if(abs(after) % st->update_every) {
-            // make sure it is multiple of st->update_every
-            if(after < 0) after = after - st->update_every - after % st->update_every;
-            else          after = after + st->update_every - after % st->update_every;
-        }
-        after = before + after;
-        absolute_period_requested = 0;
-    }
-
-    if(absolute_period_requested == -1)
-        absolute_period_requested = 1;
-
-    // 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 tmp = before;
-        before = after;
-        after = tmp;
-    }
-
-    // the duration of the chart
-    time_t duration = before - after;
-    long available_points = duration / st->update_every;
-
-    if(duration <= 0 || available_points <= 0)
-        return rrdr_create(st, 1);
-
-    // check the number of wanted points in the result
-    if(unlikely(points < 0)) points = -points;
-    if(unlikely(points > available_points)) points = available_points;
-    if(unlikely(points == 0)) points = available_points;
-
-    // calculate the desired grouping of source data points
-    long group = available_points / points;
-    if(unlikely(group <= 0)) group = 1;
-    if(unlikely(available_points % points > points / 2)) group++; // rounding to the closest integer
-
-    // group_time enforces a certain grouping multiple
-    calculated_number group_sum_divisor = 1.0;
-    long group_points = 1;
-    if(unlikely(group_time > st->update_every)) {
-        if (unlikely(group_time > duration)) {
-            // group_time is above the available duration
-
-            #ifdef NETDATA_INTERNAL_CHECKS
-            info("INTERNAL CHECK: %s: requested gtime %ld secs, is greater than the desired duration %ld secs", st->id, group_time, duration);
-            #endif
-
-            group = points; // use all the points
-        }
-        else {
-            // the points we should group to satisfy gtime
-            group_points = group_time / st->update_every;
-            if(unlikely(group_time % group_points)) {
-                #ifdef NETDATA_INTERNAL_CHECKS
-                info("INTERNAL CHECK: %s: requested gtime %ld secs, is not a multiple of the chart's data collection frequency %d secs", st->id, group_time, st->update_every);
-                #endif
-
-                group_points++;
-            }
-
-            // adapt group according to group_points
-            if(unlikely(group < group_points)) group = group_points; // do not allow grouping below the desired one
-            if(unlikely(group % group_points)) group += group_points - (group % group_points); // make sure group is multiple of group_points
-
-            //group_sum_divisor = group / group_points;
-            group_sum_divisor = (calculated_number)(group * st->update_every) / (calculated_number)group_time;
-        }
-    }
-
-    time_t after_new  = after  - (after  % ( ((aligned)?group:1) * st->update_every ));
-    time_t before_new = before - (before % ( ((aligned)?group:1) * st->update_every ));
-    long points_new   = (before_new - after_new) / st->update_every / group;
-
-    // find the starting and ending slots in our round robin db
-    long    start_at_slot = rrdset_time2slot(st, before_new),
-            stop_at_slot  = rrdset_time2slot(st, after_new);
-
-#ifdef NETDATA_INTERNAL_CHECKS
-    if(after_new < first_entry_t)
-        error("INTERNAL CHECK: after_new %u is too small, minimum %u", (uint32_t)after_new, (uint32_t)first_entry_t);
-
-    if(after_new > last_entry_t)
-        error("INTERNAL CHECK: after_new %u is too big, maximum %u", (uint32_t)after_new, (uint32_t)last_entry_t);
-
-    if(before_new < first_entry_t)
-        error("INTERNAL CHECK: before_new %u is too small, minimum %u", (uint32_t)before_new, (uint32_t)first_entry_t);
-
-    if(before_new > last_entry_t)
-        error("INTERNAL CHECK: before_new %u is too big, maximum %u", (uint32_t)before_new, (uint32_t)last_entry_t);
-
-    if(start_at_slot < 0 || start_at_slot >= st->entries)
-        error("INTERNAL CHECK: start_at_slot is invalid %ld, expected 0 to %ld", start_at_slot, st->entries - 1);
-
-    if(stop_at_slot < 0 || stop_at_slot >= st->entries)
-        error("INTERNAL CHECK: stop_at_slot is invalid %ld, expected 0 to %ld", stop_at_slot, st->entries - 1);
-
-    if(points_new > (before_new - after_new) / group / st->update_every + 1)
-        error("INTERNAL CHECK: points_new %ld is more than points %ld", points_new, (before_new - after_new) / group / st->update_every + 1);
-
-    if(group < group_points)
-        error("INTERNAL CHECK: group %ld is less than the desired group points %ld", group, group_points);
-
-    if(group > group_points && group % group_points)
-        error("INTERNAL CHECK: group %ld is not a multiple of the desired group points %ld", group, group_points);
-#endif
-
-    //info("RRD2RRDR(): %s: wanted %ld points, got %ld - group=%ld, wanted duration=%u, got %u - wanted %ld - %ld, got %ld - %ld", st->id, points, points_new, group, before - after, before_new - after_new, after, before, after_new, before_new);
-
-    after = after_new;
-    before = before_new;
-    duration = before - after;
-    points = points_new;
-
-    // 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(unlikely(!r)) {
-#ifdef NETDATA_INTERNAL_CHECKS
-        error("INTERNAL CHECK: Cannot create RRDR for %s, after=%u, before=%u, duration=%u, points=%ld", st->id, (uint32_t)after, (uint32_t)before, (uint32_t)duration, points);
-#endif
-        return NULL;
-    }
-
-    if(unlikely(!r->d)) {
-#ifdef NETDATA_INTERNAL_CHECKS
-        error("INTERNAL CHECK: Returning empty RRDR (no dimensions in RRDSET) for %s, after=%u, before=%u, duration=%u, points=%ld", st->id, (uint32_t)after, (uint32_t)before, (uint32_t)duration, points);
-#endif
-        return r;
-    }
-
-    if(unlikely(absolute_period_requested == 1))
-        r->result_options |= RRDR_RESULT_OPTION_ABSOLUTE;
-    else
-        r->result_options |= RRDR_RESULT_OPTION_RELATIVE;
-
-    // find how many dimensions we have
-    long dimensions = r->d;
-
-
-    // -------------------------------------------------------------------------
-    // checks for debugging
-#ifdef NETDATA_INTERNAL_CHECKS
-    if(debug) debug(D_RRD_STATS, "INFO %s first_t: %u, last_t: %u, all_duration: %u, after: %u, before: %u, duration: %u, points: %ld, group: %ld, group_points: %ld"
-            , st->id
-            , (uint32_t)first_entry_t
-            , (uint32_t)last_entry_t
-            , (uint32_t)(last_entry_t - first_entry_t)
-            , (uint32_t)after
-            , (uint32_t)before
-            , (uint32_t)duration
-            , points
-            , group
-            , group_points
-            );
-#endif
-
-    // -------------------------------------------------------------------------
-    // temp arrays for keeping values per dimension
-
-    calculated_number   last_values[dimensions]; // keep the last value of each 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;
-    rrdset_check_rdlock(st);
-    for( rd = st->dimensions, c = 0 ; rd && c < dimensions ; rd = rd->next, c++) {
-        last_values[c] = 0;
-        group_values[c] = (group_method == GROUP_MAX || group_method == GROUP_MIN)?NAN:0;
-        group_counts[c] = 0;
-        group_options[c] = 0;
-        found_non_zero[c] = 0;
-    }
-
-
-    // -------------------------------------------------------------------------
-    // the main loop
-
-    time_t  now = rrdset_slot2time(st, start_at_slot),
-            dt = st->update_every,
-            group_start_t = 0;
-
-#ifdef NETDATA_INTERNAL_CHECKS
-    if(unlikely(debug)) debug(D_RRD_STATS, "BEGIN %s after_t: %u (stop_at_t: %ld), before_t: %u (start_at_t: %ld), start_t(now): %u, current_entry: %ld, entries: %ld"
-            , st->id
-            , (uint32_t)after
-            , stop_at_slot
-            , (uint32_t)before
-            , start_at_slot
-            , (uint32_t)now
-            , st->current_entry
-            , st->entries
-            );
-#endif
-
-    r->group = group;
-    r->update_every = (int)group * st->update_every;
-    r->before = now;
-    r->after = now;
-
-    //info("RRD2RRDR(): %s: STARTING", st->id);
-
-    long slot = start_at_slot, counter = 0, stop_now = 0, added = 0, group_count = 0, add_this = 0;
-    for(; !stop_now ; now -= dt, slot--, counter++) {
-        if(unlikely(slot < 0)) slot = st->entries - 1;
-        if(unlikely(slot == stop_at_slot)) stop_now = counter;
-
-#ifdef NETDATA_INTERNAL_CHECKS
-        if(unlikely(debug)) debug(D_RRD_STATS, "ROW %s slot: %ld, entries_counter: %ld, group_count: %ld, added: %ld, now: %ld, %s %s"
-                , st->id
-                , slot
-                , counter
-                , group_count + 1
-                , added
-                , now
-                , (group_count + 1 == group)?"PRINT":"  -  "
-                , (now >= after && now <= before)?"RANGE":"  -  "
-                );
-#endif
-
-        // make sure we return data in the proper time range
-        if(unlikely(now > before)) continue;
-        if(unlikely(now < after)) break;
-
-        if(unlikely(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 ; rd && c < dimensions ; rd = rd->next, c++) {
-            storage_number n = rd->values[slot];
-            if(unlikely(!does_storage_number_exist(n))) continue;
-
-            group_counts[c]++;
-
-            calculated_number value = unpack_storage_number(n);
-            if(likely(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_MIN:
-                    if(unlikely(isnan(group_values[c])) ||
-                            calculated_number_fabs(value) < calculated_number_fabs(group_values[c]))
-                        group_values[c] = value;
-                    break;
-
-                case GROUP_MAX:
-                    if(unlikely(isnan(group_values[c])) ||
-                            calculated_number_fabs(value) > calculated_number_fabs(group_values[c]))
-                        group_values[c] = value;
-                    break;
-
-                default:
-                case GROUP_SUM:
-                case GROUP_AVERAGE:
-                case GROUP_UNDEFINED:
-                    group_values[c] += value;
-                    break;
-
-                case GROUP_INCREMENTAL_SUM:
-                    if(unlikely(slot == start_at_slot))
-                        last_values[c] = value;
-
-                    group_values[c] += last_values[c] - value;
-                    last_values[c] = value;
-                    break;
-            }
-        }
-
-        // added it
-        if(unlikely(add_this)) {
-            if(unlikely(!rrdr_line_init(r, group_start_t))) break;
-
-            r->after = now;
-
-            calculated_number *cn = rrdr_line_values(r);
-            uint8_t *co = rrdr_line_options(r);
-
-            for(rd = st->dimensions, c = 0 ; rd && c < dimensions ; rd = rd->next, c++) {
-
-                // update the dimension options
-                if(likely(found_non_zero[c])) r->od[c] |= RRDR_NONZERO;
-
-                // store the specific point options
-                co[c] = group_options[c];
-
-                // store the value
-                if(unlikely(group_counts[c] == 0)) {
-                    cn[c] = 0.0;
-                    co[c] |= RRDR_EMPTY;
-                    group_values[c] = (group_method == GROUP_MAX || group_method == GROUP_MIN)?NAN:0;
-                }
-                else {
-                    switch(group_method) {
-                        case GROUP_MIN:
-                        case GROUP_MAX:
-                            if(unlikely(isnan(group_values[c])))
-                                cn[c] = 0;
-                            else {
-                                cn[c] = group_values[c];
-                                group_values[c] = NAN;
-                            }
-                            break;
-
-                        case GROUP_SUM:
-                        case GROUP_INCREMENTAL_SUM:
-                            cn[c] = group_values[c];
-                            group_values[c] = 0;
-                            break;
-
-                        default:
-                        case GROUP_AVERAGE:
-                        case GROUP_UNDEFINED:
-                            if(unlikely(group_points != 1))
-                                cn[c] = group_values[c] / group_sum_divisor;
-                            else
-                                cn[c] = group_values[c] / group_counts[c];
-
-                            group_values[c] = 0;
-                            break;
-                    }
-
-                    if(cn[c] < r->min) r->min = cn[c];
-                    if(cn[c] > r->max) r->max = cn[c];
-                }
-
-                // reset for the next loop
-                group_counts[c] = 0;
-                group_options[c] = 0;
-            }
-
-            added++;
-            group_count = 0;
-            add_this = 0;
-        }
-    }
-
-    rrdr_done(r);
-    //info("RRD2RRDR(): %s: END %ld loops made, %ld points generated", st->id, counter, rrdr_rows(r));
-    //error("SHIFT: %s: wanted %ld points, got %ld", st->id, points, rrdr_rows(r));
-    return r;
-}
-
-int rrdset2value_api_v1(
-          RRDSET *st
-        , BUFFER *wb
-        , calculated_number *n
-        , const char *dimensions
-        , long points
-        , long long after
-        , long long before
-        , int group_method
-        , long group_time
-        , uint32_t options
-        , time_t *db_after
-        , time_t *db_before
-        , int *value_is_null
-) {
-    RRDR *r = rrd2rrdr(st, points, after, before, group_method, group_time, !(options & RRDR_OPTION_NOT_ALIGNED));
-    if(!r) {
-        if(value_is_null) *value_is_null = 1;
-        return 500;
-    }
-
-    if(rrdr_rows(r) == 0) {
-        rrdr_free(r);
-
-        if(db_after)  *db_after  = 0;
-        if(db_before) *db_before = 0;
-        if(value_is_null) *value_is_null = 1;
-
-        return 400;
-    }
-
-    if(wb) {
-        if (r->result_options & RRDR_RESULT_OPTION_RELATIVE)
-            buffer_no_cacheable(wb);
-        else if (r->result_options & RRDR_RESULT_OPTION_ABSOLUTE)
-            buffer_cacheable(wb);
-    }
-
-    options = rrdr_check_options(r, options, dimensions);
-
-    if(dimensions)
-        rrdr_disable_not_selected_dimensions(r, options, dimensions);
-
-    if(db_after)  *db_after  = r->after;
-    if(db_before) *db_before = r->before;
-
-    long i = (options & RRDR_OPTION_REVERSED)?rrdr_rows(r) - 1:0;
-    *n = rrdr2value(r, i, options, value_is_null);
-
-    rrdr_free(r);
-    return 200;
-}
-
-int rrdset2anything_api_v1(
-          RRDSET *st
-        , BUFFER *wb
-        , BUFFER *dimensions
-        , uint32_t format
-        , long points
-        , long long after
-        , long long before
-        , int group_method
-        , long group_time
-        , uint32_t options
-        , time_t *latest_timestamp
-) {
-    st->last_accessed_time = now_realtime_sec();
-
-    RRDR *r = rrd2rrdr(st, points, after, before, group_method, group_time, !(options & RRDR_OPTION_NOT_ALIGNED));
-    if(!r) {
-        buffer_strcat(wb, "Cannot generate output with these parameters on this chart.");
-        return 500;
-    }
-
-    if(r->result_options & RRDR_RESULT_OPTION_RELATIVE)
-        buffer_no_cacheable(wb);
-    else if(r->result_options & RRDR_RESULT_OPTION_ABSOLUTE)
-        buffer_cacheable(wb);
-
-    options = rrdr_check_options(r, options, (dimensions)?buffer_tostring(dimensions):NULL);
-
-    if(dimensions)
-        rrdr_disable_not_selected_dimensions(r, options, buffer_tostring(dimensions));
-
-    if(latest_timestamp && rrdr_rows(r) > 0)
-        *latest_timestamp = r->before;
-
-    switch(format) {
-    case DATASOURCE_SSV:
-        if(options & RRDR_OPTION_JSON_WRAP) {
-            wb->contenttype = CT_APPLICATION_JSON;
-            rrdr_json_wrapper_begin(r, wb, format, options, 1);
-            rrdr2ssv(r, wb, options, "", " ", "");
-            rrdr_json_wrapper_end(r, wb, format, options, 1);
-        }
-        else {
-            wb->contenttype = CT_TEXT_PLAIN;
-            rrdr2ssv(r, wb, options, "", " ", "");
-        }
-        break;
-
-    case DATASOURCE_SSV_COMMA:
-        if(options & RRDR_OPTION_JSON_WRAP) {
-            wb->contenttype = CT_APPLICATION_JSON;
-            rrdr_json_wrapper_begin(r, wb, format, options, 1);
-            rrdr2ssv(r, wb, options, "", ",", "");
-            rrdr_json_wrapper_end(r, wb, format, options, 1);
-        }
-        else {
-            wb->contenttype = CT_TEXT_PLAIN;
-            rrdr2ssv(r, wb, options, "", ",", "");
-        }
-        break;
-
-    case DATASOURCE_JS_ARRAY:
-        if(options & RRDR_OPTION_JSON_WRAP) {
-            wb->contenttype = CT_APPLICATION_JSON;
-            rrdr_json_wrapper_begin(r, wb, format, options, 0);
-            rrdr2ssv(r, wb, options, "[", ",", "]");
-            rrdr_json_wrapper_end(r, wb, format, options, 0);
-        }
-        else {
-            wb->contenttype = CT_APPLICATION_JSON;
-            rrdr2ssv(r, wb, options, "[", ",", "]");
-        }
-        break;
-
-    case DATASOURCE_CSV:
-        if(options & RRDR_OPTION_JSON_WRAP) {
-            wb->contenttype = CT_APPLICATION_JSON;
-            rrdr_json_wrapper_begin(r, wb, format, options, 1);
-            rrdr2csv(r, wb, options, "", ",", "\\n", "");
-            rrdr_json_wrapper_end(r, wb, format, options, 1);
-        }
-        else {
-            wb->contenttype = CT_TEXT_PLAIN;
-            rrdr2csv(r, wb, options, "", ",", "\r\n", "");
-        }
-        break;
-
-    case DATASOURCE_CSV_JSON_ARRAY:
-        wb->contenttype = CT_APPLICATION_JSON;
-        if(options & RRDR_OPTION_JSON_WRAP) {
-            rrdr_json_wrapper_begin(r, wb, format, options, 0);
-            buffer_strcat(wb, "[\n");
-            rrdr2csv(r, wb, options + RRDR_OPTION_LABEL_QUOTES, "[", ",", "]", ",\n");
-            buffer_strcat(wb, "\n]");
-            rrdr_json_wrapper_end(r, wb, format, options, 0);
-        }
-        else {
-            wb->contenttype = CT_TEXT_PLAIN;
-            buffer_strcat(wb, "[\n");
-            rrdr2csv(r, wb, options + RRDR_OPTION_LABEL_QUOTES, "[", ",", "]", ",\n");
-            buffer_strcat(wb, "\n]");
-        }
-        break;
-
-    case DATASOURCE_TSV:
-        if(options & RRDR_OPTION_JSON_WRAP) {
-            wb->contenttype = CT_APPLICATION_JSON;
-            rrdr_json_wrapper_begin(r, wb, format, options, 1);
-            rrdr2csv(r, wb, options, "", "\t", "\\n", "");
-            rrdr_json_wrapper_end(r, wb, format, options, 1);
-        }
-        else {
-            wb->contenttype = CT_TEXT_PLAIN;
-            rrdr2csv(r, wb, options, "", "\t", "\r\n", "");
-        }
-        break;
-
-    case DATASOURCE_HTML:
-        if(options & RRDR_OPTION_JSON_WRAP) {
-            wb->contenttype = CT_APPLICATION_JSON;
-            rrdr_json_wrapper_begin(r, wb, format, options, 1);
-            buffer_strcat(wb, "<html>\\n<center>\\n<table border=\\\"0\\\" cellpadding=\\\"5\\\" cellspacing=\\\"5\\\">\\n");
-            rrdr2csv(r, wb, options, "<tr><td>", "</td><td>", "</td></tr>\\n", "");
-            buffer_strcat(wb, "</table>\\n</center>\\n</html>\\n");
-            rrdr_json_wrapper_end(r, wb, format, options, 1);
-        }
-        else {
-            wb->contenttype = CT_TEXT_HTML;
-            buffer_strcat(wb, "<html>\n<center>\n<table border=\"0\" cellpadding=\"5\" cellspacing=\"5\">\n");
-            rrdr2csv(r, wb, options, "<tr><td>", "</td><td>", "</td></tr>\n", "");
-            buffer_strcat(wb, "</table>\n</center>\n</html>\n");
-        }
-        break;
-
-    case DATASOURCE_DATATABLE_JSONP:
-        wb->contenttype = CT_APPLICATION_X_JAVASCRIPT;
-
-        if(options & RRDR_OPTION_JSON_WRAP)
-            rrdr_json_wrapper_begin(r, wb, format, options, 0);
-
-        rrdr2json(r, wb, options, 1);
-
-        if(options & RRDR_OPTION_JSON_WRAP)
-            rrdr_json_wrapper_end(r, wb, format, options, 0);
-        break;
-
-    case DATASOURCE_DATATABLE_JSON:
-        wb->contenttype = CT_APPLICATION_JSON;
-
-        if(options & RRDR_OPTION_JSON_WRAP)
-            rrdr_json_wrapper_begin(r, wb, format, options, 0);
-
-        rrdr2json(r, wb, options, 1);
-
-        if(options & RRDR_OPTION_JSON_WRAP)
-            rrdr_json_wrapper_end(r, wb, format, options, 0);
-        break;
-
-    case DATASOURCE_JSONP:
-        wb->contenttype = CT_APPLICATION_X_JAVASCRIPT;
-        if(options & RRDR_OPTION_JSON_WRAP)
-            rrdr_json_wrapper_begin(r, wb, format, options, 0);
-
-        rrdr2json(r, wb, options, 0);
-
-        if(options & RRDR_OPTION_JSON_WRAP)
-            rrdr_json_wrapper_end(r, wb, format, options, 0);
-        break;
-
-    case DATASOURCE_JSON:
-    default:
-        wb->contenttype = CT_APPLICATION_JSON;
-
-        if(options & RRDR_OPTION_JSON_WRAP)
-            rrdr_json_wrapper_begin(r, wb, format, options, 0);
-
-        rrdr2json(r, wb, options, 0);
-
-        if(options & RRDR_OPTION_JSON_WRAP)
-            rrdr_json_wrapper_end(r, wb, format, options, 0);
-        break;
-    }
-
-    rrdr_free(r);
-    return 200;
-}