Merging upstream version 1.42.0.

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

2 files changed, 3 insertions, 4 deletions

diff --git a/aclk/schema-wrappers/alarm_stream.cc b/aclk/schema-wrappers/alarm_stream.cc
index d1079a688..1538bc9e0 100644
--- a/aclk/schema-wrappers/alarm_stream.cc
+++ b/aclk/schema-wrappers/alarm_stream.cc
@@ -87,6 +87,7 @@ void destroy_alarm_log_entry(struct alarm_log_entry *entry)
     freez(entry->rendered_info);
     freez(entry->chart_context);
     freez(entry->transition_id);
+    freez(entry->chart_name);
 }
 
 static void fill_alarm_log_entry(struct alarm_log_entry *data, AlarmLogEntry *proto)
@@ -129,15 +130,12 @@ static void fill_alarm_log_entry(struct alarm_log_entry *data, AlarmLogEntry *pr
 
     proto->set_value(data->value);
     proto->set_old_value(data->old_value);
-
     proto->set_updated(data->updated);
-
     proto->set_rendered_info(data->rendered_info);
-
     proto->set_chart_context(data->chart_context);
-
     proto->set_event_id(data->event_id);
     proto->set_transition_id(data->transition_id);
+    proto->set_chart_name(data->chart_name);
 }
 
 char *generate_alarm_log_entry(size_t *len, struct alarm_log_entry *data)
diff --git a/aclk/schema-wrappers/alarm_stream.h b/aclk/schema-wrappers/alarm_stream.h
index e0bf31ce6..87893e0db 100644
--- a/aclk/schema-wrappers/alarm_stream.h
+++ b/aclk/schema-wrappers/alarm_stream.h
@@ -73,6 +73,7 @@ struct alarm_log_entry {
     char *rendered_info;
 
     char *chart_context;
+    char *chart_name;
 
     uint64_t event_id;
     char *transition_id;