From bb50acdcb8073654ea667b8c0272e335bd43f844 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 14 Apr 2022 20:12:14 +0200 Subject: Merging upstream version 1.34.0. Signed-off-by: Daniel Baumann --- web/api/exporters/allmetrics.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'web/api/exporters/allmetrics.c') diff --git a/web/api/exporters/allmetrics.c b/web/api/exporters/allmetrics.c index d10de3d3c..1eba815c3 100644 --- a/web/api/exporters/allmetrics.c +++ b/web/api/exporters/allmetrics.c @@ -25,17 +25,17 @@ inline int web_client_api_request_v1_allmetrics(RRDHOST *host, struct web_client if (prometheus_exporter_instance) prometheus_exporting_options = prometheus_exporter_instance->config.options; else - prometheus_exporting_options = global_backend_options; + prometheus_exporting_options = global_exporting_options; PROMETHEUS_OUTPUT_OPTIONS prometheus_output_options = PROMETHEUS_OUTPUT_TIMESTAMPS | - ((prometheus_exporting_options & BACKEND_OPTION_SEND_NAMES) ? PROMETHEUS_OUTPUT_NAMES : 0); + ((prometheus_exporting_options & EXPORTING_OPTION_SEND_NAMES) ? PROMETHEUS_OUTPUT_NAMES : 0); const char *prometheus_prefix; if (prometheus_exporter_instance) prometheus_prefix = prometheus_exporter_instance->config.prefix; else - prometheus_prefix = global_backend_prefix; + prometheus_prefix = global_exporting_prefix; while(url) { char *value = mystrsep(&url, "&"); @@ -64,7 +64,7 @@ inline int web_client_api_request_v1_allmetrics(RRDHOST *host, struct web_client prometheus_prefix = value; } else if(!strcmp(name, "data") || !strcmp(name, "source") || !strcmp(name, "data source") || !strcmp(name, "data-source") || !strcmp(name, "data_source") || !strcmp(name, "datasource")) { - prometheus_exporting_options = backend_parse_data_source(value, prometheus_exporting_options); + prometheus_exporting_options = exporting_parse_data_source(value, prometheus_exporting_options); } else { int i; -- cgit v1.2.3