Merging upstream version 1.34.0.

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

4 files changed, 10 insertions, 6 deletions

diff --git a/exporting/prometheus/README.md b/exporting/prometheus/README.md
index ceb778a43..5c15ca580 100644
--- a/exporting/prometheus/README.md
+++ b/exporting/prometheus/README.md
@@ -458,4 +458,4 @@ through a web proxy, or when multiple Prometheus servers are NATed to a single I
 `&server=NAME` to the URL. This `NAME` is used by Netdata to uniquely identify each Prometheus server and keep track of
 its last access time.
 
-[![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%2Fexporting%2Fprometheus%2FREADME&_u=MAC~&cid=5792dfd7-8dc4-476b-af31-da2fdb9f93d2&tid=UA-64295674-3)](<>)
+
diff --git a/exporting/prometheus/prometheus.c b/exporting/prometheus/prometheus.c
index 0a3190074..97c3a29f0 100644
--- a/exporting/prometheus/prometheus.c
+++ b/exporting/prometheus/prometheus.c
@@ -20,6 +20,10 @@ inline int can_send_rrdset(struct instance *instance, RRDSET *st)
     RRDHOST *host = st->rrdhost;
 #endif
 
+    // Do not send anomaly rates charts.
+    if (st->state && st->state->is_ar_chart)
+        return 0;
+
     if (unlikely(rrdset_flag_check(st, RRDSET_FLAG_EXPORTING_IGNORE)))
         return 0;
 
@@ -31,7 +35,7 @@ inline int can_send_rrdset(struct instance *instance, RRDSET *st)
         else {
             rrdset_flag_set(st, RRDSET_FLAG_EXPORTING_IGNORE);
             debug(
-                D_BACKEND,
+                D_EXPORTING,
                 "EXPORTING: not sending chart '%s' of host '%s', because it is disabled for exporting.",
                 st->id,
                 host->hostname);
@@ -41,7 +45,7 @@ inline int can_send_rrdset(struct instance *instance, RRDSET *st)
 
     if (unlikely(!rrdset_is_available_for_exporting_and_alarms(st))) {
         debug(
-            D_BACKEND,
+            D_EXPORTING,
             "EXPORTING: not sending chart '%s' of host '%s', because it is not available for exporting.",
             st->id,
             host->hostname);
@@ -52,7 +56,7 @@ inline int can_send_rrdset(struct instance *instance, RRDSET *st)
             st->rrd_memory_mode == RRD_MEMORY_MODE_NONE &&
             !(EXPORTING_OPTIONS_DATA_SOURCE(instance->config.options) == EXPORTING_SOURCE_DATA_AS_COLLECTED))) {
         debug(
-            D_BACKEND,
+            D_EXPORTING,
             "EXPORTING: not sending chart '%s' of host '%s' because its memory mode is '%s' and the exporting connector requires database access.",
             st->id,
             host->hostname,
diff --git a/exporting/prometheus/remote_write/README.md b/exporting/prometheus/remote_write/README.md
index ce379063e..54c5d6588 100644
--- a/exporting/prometheus/remote_write/README.md
+++ b/exporting/prometheus/remote_write/README.md
@@ -55,4 +55,4 @@ buffer size on failures.
 
 The remote write exporting connector does not support `buffer on failures`
 
-[![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%2Fexporting%2Fprometheus%2Fremote_write%2FREADME&_u=MAC~&cid=5792dfd7-8dc4-476b-af31-da2fdb9f93d2&tid=UA-64295674-3)](<>)
+
diff --git a/exporting/prometheus/remote_write/remote_write.c b/exporting/prometheus/remote_write/remote_write.c
index 8339712eb..59a488e1b 100644
--- a/exporting/prometheus/remote_write/remote_write.c
+++ b/exporting/prometheus/remote_write/remote_write.c
@@ -236,7 +236,7 @@ int format_dimension_prometheus_remote_write(struct instance *instance, RRDDIM *
 
             if (unlikely(rd->last_collected_time.tv_sec < instance->after)) {
                 debug(
-                    D_BACKEND,
+                    D_EXPORTING,
                     "EXPORTING: not sending dimension '%s' of chart '%s' from host '%s', "
                     "its last data collection (%lu) is not within our timeframe (%lu to %lu)",
                     rd->id, rd->rrdset->id,