Merging upstream version 1.43.0.

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

1 files changed, 2 insertions, 20 deletions

diff --git a/aclk/schema-wrappers/alarm_stream.cc b/aclk/schema-wrappers/alarm_stream.cc
index 1538bc9e0..29d80e39e 100644
--- a/aclk/schema-wrappers/alarm_stream.cc
+++ b/aclk/schema-wrappers/alarm_stream.cc
@@ -66,60 +66,41 @@ static alarms::v1::AlarmStatus aclk_alarm_status_to_proto(enum aclk_alarm_status
 
 void destroy_alarm_log_entry(struct alarm_log_entry *entry)
 {
-    //freez(entry->node_id);
-    //freez(entry->claim_id);
-
     freez(entry->chart);
     freez(entry->name);
-    freez(entry->family);
-
     freez(entry->config_hash);
-
     freez(entry->timezone);
-
     freez(entry->exec_path);
     freez(entry->conf_source);
     freez(entry->command);
-
     freez(entry->value_string);
     freez(entry->old_value_string);
-
     freez(entry->rendered_info);
     freez(entry->chart_context);
     freez(entry->transition_id);
     freez(entry->chart_name);
+    freez(entry->summary);
 }
 
 static void fill_alarm_log_entry(struct alarm_log_entry *data, AlarmLogEntry *proto)
 {
     proto->set_node_id(data->node_id);
     proto->set_claim_id(data->claim_id);
-
     proto->set_chart(data->chart);
     proto->set_name(data->name);
-    if (data->family)
-        proto->set_family(data->family);
-
     proto->set_when(data->when);
-
     proto->set_config_hash(data->config_hash);
-
     proto->set_utc_offset(data->utc_offset);
     proto->set_timezone(data->timezone);
-
     proto->set_exec_path(data->exec_path);
     proto->set_conf_source(data->conf_source);
     proto->set_command(data->command);
-
     proto->set_duration(data->duration);
     proto->set_non_clear_duration(data->non_clear_duration);
-
-
     proto->set_status(aclk_alarm_status_to_proto(data->status));
     proto->set_old_status(aclk_alarm_status_to_proto(data->old_status));
     proto->set_delay(data->delay);
     proto->set_delay_up_to_timestamp(data->delay_up_to_timestamp);
-
     proto->set_last_repeat(data->last_repeat);
     proto->set_silenced(data->silenced);
 
@@ -136,6 +117,7 @@ static void fill_alarm_log_entry(struct alarm_log_entry *data, AlarmLogEntry *pr
     proto->set_event_id(data->event_id);
     proto->set_transition_id(data->transition_id);
     proto->set_chart_name(data->chart_name);
+    proto->set_summary(data->summary);
 }
 
 char *generate_alarm_log_entry(size_t *len, struct alarm_log_entry *data)