diff options
Diffstat (limited to 'web/api/formatters')
| -rw-r--r-- | web/api/formatters/charts2json.c | 4 | ||||
| -rw-r--r-- | web/api/formatters/charts2json.h | 2 | ||||
| -rw-r--r-- | web/api/formatters/json_wrapper.c | 2 | ||||
| -rw-r--r-- | web/api/formatters/rrd2json.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/web/api/formatters/charts2json.c b/web/api/formatters/charts2json.c index 2ad068d89..61086ab63 100644 --- a/web/api/formatters/charts2json.c +++ b/web/api/formatters/charts2json.c @@ -36,7 +36,7 @@ const char* get_release_channel() { return (use_stable)?"stable":"nightly"; } -void charts2json(RRDHOST *host, BUFFER *wb, int skip_volatile, int show_archived) { +void charts2json(RRDHOST *host, BUFFER *wb, int skip_volatile) { static char *custom_dashboard_info_js_filename = NULL; size_t c, dimensions = 0, memory = 0, alarms = 0; RRDSET *st; @@ -70,7 +70,7 @@ void charts2json(RRDHOST *host, BUFFER *wb, int skip_volatile, int show_archived c = 0; rrdset_foreach_read(st, host) { - if ((!show_archived && rrdset_is_available_for_viewers(st)) || (show_archived && rrdset_is_archived(st))) { + if (rrdset_is_available_for_viewers(st)) { if(c) buffer_strcat(wb, ","); buffer_strcat(wb, "\n\t\t\""); buffer_strcat(wb, rrdset_id(st)); diff --git a/web/api/formatters/charts2json.h b/web/api/formatters/charts2json.h index 96720d4b4..4ef6bc2c8 100644 --- a/web/api/formatters/charts2json.h +++ b/web/api/formatters/charts2json.h @@ -5,7 +5,7 @@ #include "rrd2json.h" -void charts2json(RRDHOST *host, BUFFER *wb, int skip_volatile, int show_archived); +void charts2json(RRDHOST *host, BUFFER *wb, int skip_volatile); const char* get_release_channel(); #endif //NETDATA_API_FORMATTER_CHARTS2JSON_H diff --git a/web/api/formatters/json_wrapper.c b/web/api/formatters/json_wrapper.c index 52025c9fc..baa39e228 100644 --- a/web/api/formatters/json_wrapper.c +++ b/web/api/formatters/json_wrapper.c @@ -1209,7 +1209,7 @@ static void query_target_detailed_objects_tree(BUFFER *wb, RRDR *r, RRDR_OPTIONS buffer_json_member_add_object(wb, rrdinstance_acquired_id(ria)); buffer_json_member_add_string(wb, "nm", rrdinstance_acquired_name(ria)); buffer_json_member_add_time_t(wb, "ue", rrdinstance_acquired_update_every(ria)); - DICTIONARY *labels = rrdinstance_acquired_labels(ria); + RRDLABELS *labels = rrdinstance_acquired_labels(ria); if(labels) { buffer_json_member_add_object(wb, "labels"); rrdlabels_to_buffer_json_members(labels, wb); diff --git a/web/api/formatters/rrd2json.c b/web/api/formatters/rrd2json.c index 139fa6ec8..52ab31f1b 100644 --- a/web/api/formatters/rrd2json.c +++ b/web/api/formatters/rrd2json.c @@ -170,7 +170,7 @@ int data_query_execute(ONEWAYALLOC *owa, BUFFER *wb, QUERY_TARGET *qt, time_t *l if (r->view.flags & RRDR_RESULT_FLAG_CANCEL) { rrdr_free(owa, r); - return HTTP_RESP_BACKEND_FETCH_FAILED; + return HTTP_RESP_CLIENT_CLOSED_REQUEST; } if(r->view.flags & RRDR_RESULT_FLAG_RELATIVE) |