From dd24e74edfbafc09eaeb2dde0fda7eb3e1e86d0b Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 14 Jun 2023 21:20:36 +0200 Subject: Merging upstream version 1.40.0. Signed-off-by: Daniel Baumann --- aclk/schema-wrappers/alarm_stream.cc | 4 ++++ aclk/schema-wrappers/alarm_stream.h | 3 +++ 2 files changed, 7 insertions(+) (limited to 'aclk/schema-wrappers') diff --git a/aclk/schema-wrappers/alarm_stream.cc b/aclk/schema-wrappers/alarm_stream.cc index af0b891ca..11b9284f5 100644 --- a/aclk/schema-wrappers/alarm_stream.cc +++ b/aclk/schema-wrappers/alarm_stream.cc @@ -86,6 +86,7 @@ void destroy_alarm_log_entry(struct alarm_log_entry *entry) freez(entry->rendered_info); freez(entry->chart_context); + freez(entry->transition_id); } static void fill_alarm_log_entry(struct alarm_log_entry *data, AlarmLogEntry *proto) @@ -134,6 +135,9 @@ static void fill_alarm_log_entry(struct alarm_log_entry *data, AlarmLogEntry *pr 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); } 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 83e7c1bce..e0bf31ce6 100644 --- a/aclk/schema-wrappers/alarm_stream.h +++ b/aclk/schema-wrappers/alarm_stream.h @@ -73,6 +73,9 @@ struct alarm_log_entry { char *rendered_info; char *chart_context; + + uint64_t event_id; + char *transition_id; }; struct send_alarm_checkpoint { -- cgit v1.2.3