Merging upstream version 1.40.0.

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

1 files changed, 3 insertions, 0 deletions

diff --git a/database/rrd.h b/database/rrd.h
index 0f67a3b77..3f125c5a7 100644
--- a/database/rrd.h
+++ b/database/rrd.h
@@ -977,6 +977,7 @@ struct alarm_entry {
     uint32_t alarm_id;
     uint32_t alarm_event_id;
     uuid_t config_hash_id;
+    uuid_t transition_id;
 
     time_t when;
     time_t duration;
@@ -1149,9 +1150,11 @@ struct rrdhost {
     struct rrdpush_destinations *destination;       // the current destination from the above list
     SIMPLE_PATTERN *rrdpush_send_charts_matching;   // pattern to match the charts to be sent
 
+    const char *rrdpush_last_receiver_exit_reason;
     time_t rrdpush_seconds_to_replicate;            // max time we want to replicate from the child
     time_t rrdpush_replication_step;                // seconds per replication step
     size_t rrdpush_receiver_replicating_charts;     // the number of charts currently being replicated from a child
+    NETDATA_DOUBLE rrdpush_receiver_replication_percent; // the % of replication completion
 
     // the following are state information for the threading
     // streaming metrics from this netdata to an upstream netdata