diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-26 08:15:24 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-26 08:15:35 +0000 |
| commit | f09848204fa5283d21ea43e262ee41aa578e1808 (patch) | |
| tree | c62385d7adf209fa6a798635954d887f718fb3fb /src/aclk/schema-wrappers | |
| parent | Releasing debian version 1.46.3-2. (diff) | |
| download | netdata-f09848204fa5283d21ea43e262ee41aa578e1808.tar.xz netdata-f09848204fa5283d21ea43e262ee41aa578e1808.zip | |
Merging upstream version 1.47.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/aclk/schema-wrappers')
| -rw-r--r-- | src/aclk/schema-wrappers/alarm_stream.cc | 3 | ||||
| -rw-r--r-- | src/aclk/schema-wrappers/alarm_stream.h | 12 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/aclk/schema-wrappers/alarm_stream.cc b/src/aclk/schema-wrappers/alarm_stream.cc index 29d80e39e..c0b41bb06 100644 --- a/src/aclk/schema-wrappers/alarm_stream.cc +++ b/src/aclk/schema-wrappers/alarm_stream.cc @@ -22,6 +22,7 @@ struct start_alarm_streaming parse_start_alarm_streaming(const char *data, size_ ret.node_id = strdupz(msg.node_id().c_str()); ret.resets = msg.resets(); + ret.version = msg.version(); return ret; } @@ -37,6 +38,7 @@ struct send_alarm_checkpoint parse_send_alarm_checkpoint(const char *data, size_ ret.node_id = strdupz(msg.node_id().c_str()); ret.claim_id = strdupz(msg.claim_id().c_str()); + ret.version = msg.version(); return ret; } @@ -118,6 +120,7 @@ static void fill_alarm_log_entry(struct alarm_log_entry *data, AlarmLogEntry *pr proto->set_transition_id(data->transition_id); proto->set_chart_name(data->chart_name); proto->set_summary(data->summary); + proto->set_alert_version(data->version); } char *generate_alarm_log_entry(size_t *len, struct alarm_log_entry *data) diff --git a/src/aclk/schema-wrappers/alarm_stream.h b/src/aclk/schema-wrappers/alarm_stream.h index 3c81ff445..6e1936b07 100644 --- a/src/aclk/schema-wrappers/alarm_stream.h +++ b/src/aclk/schema-wrappers/alarm_stream.h @@ -13,6 +13,7 @@ extern "C" { struct start_alarm_streaming { char *node_id; + uint64_t version; bool resets; }; @@ -36,8 +37,6 @@ struct alarm_log_entry { char *name; char *family; - uint64_t batch_id; - uint64_t sequence_id; uint64_t when; char *config_hash; @@ -76,13 +75,22 @@ struct alarm_log_entry { char *chart_name; uint64_t event_id; + uint64_t version; char *transition_id; char *summary; + + // local book keeping + int64_t health_log_id; + int64_t alarm_id; + int64_t unique_id; + int64_t sequence_id; }; struct send_alarm_checkpoint { char *node_id; char *claim_id; + uint64_t version; + uint64_t when_end; }; struct alarm_checkpoint { |