Merging upstream version 1.34.0.

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

4 files changed, 7 insertions, 7 deletions

diff --git a/web/api/exporters/README.md b/web/api/exporters/README.md
index 401964744..1d517a91e 100644
--- a/web/api/exporters/README.md
+++ b/web/api/exporters/README.md
@@ -7,4 +7,4 @@ custom_edit_url: https://github.com/netdata/netdata/edit/master/web/api/exporter
 
 TBD
 
-[![analytics](https://www.google-analytics.com/collect?v=1&aip=1&t=pageview&_s=1&ds=github&dr=https%3A%2F%2Fgithub.com%2Fnetdata%2Fnetdata&dl=https%3A%2F%2Fmy-netdata.io%2Fgithub%2Fweb%2Fapi%2Fexporters%2FREADME&_u=MAC~&cid=5792dfd7-8dc4-476b-af31-da2fdb9f93d2&tid=UA-64295674-3)](<>)
+
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;
diff --git a/web/api/exporters/prometheus/README.md b/web/api/exporters/prometheus/README.md
index 48b85555e..cf7e2caa8 100644
--- a/web/api/exporters/prometheus/README.md
+++ b/web/api/exporters/prometheus/README.md
@@ -7,4 +7,4 @@ custom_edit_url: https://github.com/netdata/netdata/edit/master/web/api/exporter
 
 Read the Prometheus exporter documentation: [Using Netdata with Prometheus](/exporting/prometheus/README.md).
 
-[![analytics](https://www.google-analytics.com/collect?v=1&aip=1&t=pageview&_s=1&ds=github&dr=https%3A%2F%2Fgithub.com%2Fnetdata%2Fnetdata&dl=https%3A%2F%2Fmy-netdata.io%2Fgithub%2Fweb%2Fapi%2Fexporters%2Fprometheus%2FREADME&_u=MAC~&cid=5792dfd7-8dc4-476b-af31-da2fdb9f93d2&tid=UA-64295674-3)](<>)
+
diff --git a/web/api/exporters/shell/README.md b/web/api/exporters/shell/README.md
index 9d44a3707..a41326c9d 100644
--- a/web/api/exporters/shell/README.md
+++ b/web/api/exporters/shell/README.md
@@ -66,4 +66,4 @@ NETDATA_${chart_id^^}_${dimension_id^^}="${value}"
 
 The value is rounded to the closest integer, since shell script cannot process decimal numbers.
 
-[![analytics](https://www.google-analytics.com/collect?v=1&aip=1&t=pageview&_s=1&ds=github&dr=https%3A%2F%2Fgithub.com%2Fnetdata%2Fnetdata&dl=https%3A%2F%2Fmy-netdata.io%2Fgithub%2Fweb%2Fapi%2Fexporters%2Fshell%2FREADME&_u=MAC~&cid=5792dfd7-8dc4-476b-af31-da2fdb9f93d2&tid=UA-64295674-3)](<>)
+