Merging upstream version 1.31.0.

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

2 files changed, 11 insertions, 8 deletions

diff --git a/exporting/prometheus/prometheus.c b/exporting/prometheus/prometheus.c
index c10d94b90..6759313c3 100644
--- a/exporting/prometheus/prometheus.c
+++ b/exporting/prometheus/prometheus.c
@@ -18,16 +18,16 @@ inline int can_send_rrdset(struct instance *instance, RRDSET *st)
 {
     RRDHOST *host = st->rrdhost;
 
-    if (unlikely(rrdset_flag_check(st, RRDSET_FLAG_BACKEND_IGNORE)))
+    if (unlikely(rrdset_flag_check(st, RRDSET_FLAG_EXPORTING_IGNORE)))
         return 0;
 
-    if (unlikely(!rrdset_flag_check(st, RRDSET_FLAG_BACKEND_SEND))) {
+    if (unlikely(!rrdset_flag_check(st, RRDSET_FLAG_EXPORTING_SEND))) {
         // we have not checked this chart
         if (simple_pattern_matches(instance->config.charts_pattern, st->id) ||
             simple_pattern_matches(instance->config.charts_pattern, st->name))
-            rrdset_flag_set(st, RRDSET_FLAG_BACKEND_SEND);
+            rrdset_flag_set(st, RRDSET_FLAG_EXPORTING_SEND);
         else {
-            rrdset_flag_set(st, RRDSET_FLAG_BACKEND_IGNORE);
+            rrdset_flag_set(st, RRDSET_FLAG_EXPORTING_IGNORE);
             debug(
                 D_BACKEND,
                 "EXPORTING: not sending chart '%s' of host '%s', because it is disabled for exporting.",
@@ -794,6 +794,9 @@ static inline time_t prometheus_preparation(
     time_t now,
     PROMETHEUS_OUTPUT_OPTIONS output_options)
 {
+#ifndef UNIT_TESTING
+    analytics_log_prometheus();
+#endif
     if (!server || !*server)
         server = "default";
 
@@ -855,7 +858,7 @@ void rrd_stats_api_v1_charts_allmetrics_prometheus_single_host(
     EXPORTING_OPTIONS exporting_options,
     PROMETHEUS_OUTPUT_OPTIONS output_options)
 {
-    if (unlikely(!prometheus_exporter_instance))
+    if (unlikely(!prometheus_exporter_instance || !prometheus_exporter_instance->config.initialized))
         return;
 
     prometheus_exporter_instance->before = now_realtime_sec();
@@ -892,7 +895,7 @@ void rrd_stats_api_v1_charts_allmetrics_prometheus_all_hosts(
     EXPORTING_OPTIONS exporting_options,
     PROMETHEUS_OUTPUT_OPTIONS output_options)
 {
-    if (unlikely(!prometheus_exporter_instance))
+    if (unlikely(!prometheus_exporter_instance || !prometheus_exporter_instance->config.initialized))
         return;
 
     prometheus_exporter_instance->before = now_realtime_sec();
diff --git a/exporting/prometheus/remote_write/remote_write.c b/exporting/prometheus/remote_write/remote_write.c
index 30bd05ad7..986ad9f0e 100644
--- a/exporting/prometheus/remote_write/remote_write.c
+++ b/exporting/prometheus/remote_write/remote_write.c
@@ -31,12 +31,12 @@ void prometheus_remote_write_prepare_header(struct instance *instance)
         "Content-Length: %zu\r\n"
         "\r\n",
         connector_specific_config->remote_write_path,
-        instance->config.destination,
+        simple_connector_data->connected_to,
         buffer_strlen(simple_connector_data->last_buffer->buffer));
 }
 
 /**
- * Process a responce received after Prometheus remote write connector had sent data
+ * Process a response received after Prometheus remote write connector had sent data
  *
  * @param buffer a response from a remote service.
  * @param instance an instance data structure.