Merging upstream version 1.39.0.

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

3 files changed, 12 insertions, 4 deletions

diff --git a/database/ram/README.md b/database/ram/README.md
index 73562f0ff..56cb7275a 100644
--- a/database/ram/README.md
+++ b/database/ram/README.md
@@ -2,6 +2,10 @@
 title: "RAM database modes"
 description: "Netdata's RAM database modes."
 custom_edit_url: https://github.com/netdata/netdata/edit/master/database/ram/README.md
+sidebar_label: "RAM database modes"
+learn_status: "Published"
+learn_topic_type: "References"
+learn_rel_path: "Developers/Database"
 -->
 
-# RAM modes
\ No newline at end of file
+# RAM database modes
diff --git a/database/ram/rrddim_mem.c b/database/ram/rrddim_mem.c
index 0f17d6cb9..a417c5ae3 100644
--- a/database/ram/rrddim_mem.c
+++ b/database/ram/rrddim_mem.c
@@ -143,6 +143,7 @@ STORAGE_COLLECT_HANDLE *rrddim_collect_init(STORAGE_METRIC_HANDLE *db_metric_han
     internal_fatal((uint32_t)mh->update_every_s != update_every, "RRDDIM: update requested does not match the dimension");
 
     struct mem_collect_handle *ch = callocz(1, sizeof(struct mem_collect_handle));
+    ch->common.backend = STORAGE_ENGINE_BACKEND_RRDDIM;
     ch->rd = rd;
     ch->db_metric_handle = db_metric_handle;
 
@@ -204,7 +205,7 @@ static inline void rrddim_fill_the_gap(STORAGE_COLLECT_HANDLE *collection_handle
 
 void rrddim_collect_store_metric(STORAGE_COLLECT_HANDLE *collection_handle,
                                  usec_t point_in_time_ut,
-                                 NETDATA_DOUBLE number,
+                                 NETDATA_DOUBLE n,
                                  NETDATA_DOUBLE min_value __maybe_unused,
                                  NETDATA_DOUBLE max_value __maybe_unused,
                                  uint16_t count __maybe_unused,
@@ -226,7 +227,7 @@ void rrddim_collect_store_metric(STORAGE_COLLECT_HANDLE *collection_handle,
     if(unlikely(mh->last_updated_s && point_in_time_s - mh->update_every_s > mh->last_updated_s))
         rrddim_fill_the_gap(collection_handle, point_in_time_s);
 
-    rd->db[mh->current_entry] = pack_storage_number(number, flags);
+    rd->db[mh->current_entry] = pack_storage_number(n, flags);
     mh->counter++;
     mh->current_entry = (mh->current_entry + 1) >= mh->entries ? 0 : mh->current_entry + 1;
     mh->last_updated_s = point_in_time_s;
@@ -340,6 +341,7 @@ void rrddim_query_init(STORAGE_METRIC_HANDLE *db_metric_handle, struct storage_e
     handle->start_time_s = start_time_s;
     handle->end_time_s = end_time_s;
     handle->priority = priority;
+    handle->backend = STORAGE_ENGINE_BACKEND_RRDDIM;
     struct mem_query_handle* h = mallocz(sizeof(struct mem_query_handle));
     h->db_metric_handle = db_metric_handle;
 
diff --git a/database/ram/rrddim_mem.h b/database/ram/rrddim_mem.h
index 373a2bd7b..a75814a0b 100644
--- a/database/ram/rrddim_mem.h
+++ b/database/ram/rrddim_mem.h
@@ -6,6 +6,8 @@
 #include "database/rrd.h"
 
 struct mem_collect_handle {
+    struct storage_collect_handle common; // has to be first item
+
     STORAGE_METRIC_HANDLE *db_metric_handle;
     RRDDIM *rd;
 };
@@ -32,7 +34,7 @@ void rrddim_metrics_group_release(STORAGE_INSTANCE *db_instance, STORAGE_METRICS
 
 STORAGE_COLLECT_HANDLE *rrddim_collect_init(STORAGE_METRIC_HANDLE *db_metric_handle, uint32_t update_every, STORAGE_METRICS_GROUP *smg);
 void rrddim_store_metric_change_collection_frequency(STORAGE_COLLECT_HANDLE *collection_handle, int update_every);
-void rrddim_collect_store_metric(STORAGE_COLLECT_HANDLE *collection_handle, usec_t point_in_time_ut, NETDATA_DOUBLE number,
+void rrddim_collect_store_metric(STORAGE_COLLECT_HANDLE *collection_handle, usec_t point_in_time_ut, NETDATA_DOUBLE n,
                                  NETDATA_DOUBLE min_value,
                                  NETDATA_DOUBLE max_value,
                                  uint16_t count,