diff options
Diffstat (limited to 'web')
-rw-r--r-- | web/api/formatters/json_wrapper.c | 6 | ||||
-rw-r--r-- | web/api/formatters/rrd2json.c | 2 | ||||
-rw-r--r-- | web/api/formatters/rrdset2json.c | 4 | ||||
-rw-r--r-- | web/api/web_api_v1.c | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/web/api/formatters/json_wrapper.c b/web/api/formatters/json_wrapper.c index a07ee17446..41aee34fb8 100644 --- a/web/api/formatters/json_wrapper.c +++ b/web/api/formatters/json_wrapper.c @@ -174,8 +174,8 @@ void rrdr_json_wrapper_begin(RRDR *r, BUFFER *wb, uint32_t format, RRDR_OPTIONS dict = dictionary_create(DICTIONARY_FLAG_SINGLE_THREADED); for (i = 0, rd = temp_rd ? temp_rd : r->st->dimensions; rd; rd = rd->next) { st = rd->rrdset; - if (st->state && st->state->chart_labels) - rrdlabels_walkthrough_read(st->state->chart_labels, fill_formatted_callback, dict); + if (st->rrdlabels) + rrdlabels_walkthrough_read(st->rrdlabels, fill_formatted_callback, dict); } dictionary_walkthrough_read(dict, value_list_output, &co); dictionary_destroy(dict); @@ -231,7 +231,7 @@ void rrdr_json_wrapper_begin(RRDR *r, BUFFER *wb, uint32_t format, RRDR_OPTIONS if (i) buffer_strcat(wb, ", "); - rrdlabels_get_value_to_buffer_or_null(rd->rrdset->state->chart_labels, wb, label_key, sq, "null"); + rrdlabels_get_value_to_buffer_or_null(rd->rrdset->rrdlabels, wb, label_key, sq, "null"); i++; } if (!i) { diff --git a/web/api/formatters/rrd2json.c b/web/api/formatters/rrd2json.c index b18abe59cb..89efa05441 100644 --- a/web/api/formatters/rrd2json.c +++ b/web/api/formatters/rrd2json.c @@ -300,7 +300,7 @@ int rrdset2anything_api_v1( return HTTP_RESP_BACKEND_FETCH_FAILED; } - if (st->state && st->state->is_ar_chart) + if (rrdset_is_ar_chart(st)) ml_process_rrdr(r, query_params->max_anomaly_rates); RRDDIM *temp_rd = query_params->context_param_list ? query_params->context_param_list->rd : NULL; diff --git a/web/api/formatters/rrdset2json.c b/web/api/formatters/rrdset2json.c index 9e81389fdf..d4225c98c4 100644 --- a/web/api/formatters/rrdset2json.c +++ b/web/api/formatters/rrdset2json.c @@ -4,7 +4,7 @@ void chart_labels2json(RRDSET *st, BUFFER *wb, size_t indentation) { - if(unlikely(!st->state || !st->state->chart_labels)) + if(unlikely(!st->rrdlabels)) return; char tabs[11]; @@ -18,7 +18,7 @@ void chart_labels2json(RRDSET *st, BUFFER *wb, size_t indentation) indentation--; } - rrdlabels_to_buffer(st->state->chart_labels, wb, tabs, ":", "\"", ",\n", NULL, NULL, NULL, NULL); + rrdlabels_to_buffer(st->rrdlabels, wb, tabs, ":", "\"", ",\n", NULL, NULL, NULL, NULL); buffer_strcat(wb, "\n"); } diff --git a/web/api/web_api_v1.c b/web/api/web_api_v1.c index 6c295215b6..8063ffc7bc 100644 --- a/web/api/web_api_v1.c +++ b/web/api/web_api_v1.c @@ -713,8 +713,8 @@ inline int web_client_api_request_v1_data(RRDHOST *host, struct web_client *w, c rrdhost_rdlock(host); rrdset_foreach_read(st1, host) { if (st1->context == context_string && - (!chart_label_key_pattern || rrdlabels_match_simple_pattern_parsed(st1->state->chart_labels, chart_label_key_pattern, ':')) && - (!chart_labels_filter_pattern || rrdlabels_match_simple_pattern_parsed(st1->state->chart_labels, chart_labels_filter_pattern, ':'))) + (!chart_label_key_pattern || rrdlabels_match_simple_pattern_parsed(st1->rrdlabels, chart_label_key_pattern, ':')) && + (!chart_labels_filter_pattern || rrdlabels_match_simple_pattern_parsed(st1->rrdlabels, chart_labels_filter_pattern, ':'))) build_context_param_list(owa, &context_param_list, st1); } rrdhost_unlock(host); @@ -1140,7 +1140,7 @@ inline void host_labels2json(RRDHOST *host, BUFFER *wb, size_t indentation) { indentation--; } - rrdlabels_to_buffer(host->host_labels, wb, tabs, ":", "\"", ",\n", NULL, NULL, NULL, NULL); + rrdlabels_to_buffer(host->rrdlabels, wb, tabs, ":", "\"", ",\n", NULL, NULL, NULL, NULL); buffer_strcat(wb, "\n"); } |