diff options
Diffstat (limited to 'web')
-rw-r--r-- | web/api/formatters/json/json.c | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/web/api/formatters/json/json.c b/web/api/formatters/json/json.c index 5ecf25f932..3a7a23ba15 100644 --- a/web/api/formatters/json/json.c +++ b/web/api/formatters/json/json.c @@ -248,8 +248,8 @@ void rrdr2json_v2(RRDR *r, BUFFER *wb) { QUERY_TARGET *qt = r->internal.qt; RRDR_OPTIONS options = qt->window.options; - bool send_fourth_number = query_target_aggregatable(qt); - bool fourth_number_is_vh = send_fourth_number && r->vh && query_has_group_by_aggregation_percentage(qt); + bool send_count = query_target_aggregatable(qt); + bool send_hidden = send_count && r->vh && query_has_group_by_aggregation_percentage(qt); buffer_json_member_add_object(wb, "result"); @@ -267,16 +267,17 @@ void rrdr2json_v2(RRDR *r, BUFFER *wb) { buffer_json_array_close(wb); // labels buffer_json_member_add_object(wb, "point"); - buffer_json_member_add_uint64(wb, "value", 0); - buffer_json_member_add_uint64(wb, "arp", 1); - buffer_json_member_add_uint64(wb, "pa", 2); - if(send_fourth_number) { - if(fourth_number_is_vh) - buffer_json_member_add_uint64(wb, "hidden", 3); - else - buffer_json_member_add_uint64(wb, "count", 3); + { + size_t point_count = 0; + buffer_json_member_add_uint64(wb, "value", point_count++); + buffer_json_member_add_uint64(wb, "arp", point_count++); + buffer_json_member_add_uint64(wb, "pa", point_count++); + if (send_count) + buffer_json_member_add_uint64(wb, "count", point_count++); + if (send_hidden) + buffer_json_member_add_uint64(wb, "hidden", point_count++); } - buffer_json_object_close(wb); + buffer_json_object_close(wb); // point buffer_json_member_add_array(wb, "data"); if(i) { @@ -290,7 +291,7 @@ void rrdr2json_v2(RRDR *r, BUFFER *wb) { // for each line in the array for (i = start; i != end; i += step) { NETDATA_DOUBLE *cn = &r->v[ i * r->d ]; - NETDATA_DOUBLE *ch = fourth_number_is_vh ? &r->vh[i * r->d ] : NULL; + NETDATA_DOUBLE *ch = send_hidden ? &r->vh[i * r->d ] : NULL; RRDR_VALUE_FLAGS *co = &r->o[ i * r->d ]; NETDATA_DOUBLE *ar = &r->ar[ i * r->d ]; uint32_t *gbc = &r->gbc [ i * r->d ]; @@ -330,12 +331,10 @@ void rrdr2json_v2(RRDR *r, BUFFER *wb) { buffer_json_add_array_item_uint64(wb, o); // add the count - if(send_fourth_number) { - if(fourth_number_is_vh) - buffer_json_add_array_item_double(wb, ch[d]); - else - buffer_json_add_array_item_uint64(wb, gbc[d]); - } + if(send_count) + buffer_json_add_array_item_uint64(wb, gbc[d]); + if(send_hidden) + buffer_json_add_array_item_double(wb, ch[d]); buffer_json_array_close(wb); // point } |