From 836b47cb7e99a977c5a23b059ca1d0b5065d310e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 24 Jul 2024 11:54:23 +0200 Subject: Merging upstream version 1.46.3. Signed-off-by: Daniel Baumann --- aclk/aclk-schemas/proto/chart/v1/config.proto | 37 ---------- aclk/aclk-schemas/proto/chart/v1/dimension.proto | 24 ------- aclk/aclk-schemas/proto/chart/v1/instance.proto | 32 --------- aclk/aclk-schemas/proto/chart/v1/stream.proto | 86 ------------------------ 4 files changed, 179 deletions(-) delete mode 100644 aclk/aclk-schemas/proto/chart/v1/config.proto delete mode 100644 aclk/aclk-schemas/proto/chart/v1/dimension.proto delete mode 100644 aclk/aclk-schemas/proto/chart/v1/instance.proto delete mode 100644 aclk/aclk-schemas/proto/chart/v1/stream.proto (limited to 'aclk/aclk-schemas/proto/chart/v1') diff --git a/aclk/aclk-schemas/proto/chart/v1/config.proto b/aclk/aclk-schemas/proto/chart/v1/config.proto deleted file mode 100644 index f0c5e3a35..000000000 --- a/aclk/aclk-schemas/proto/chart/v1/config.proto +++ /dev/null @@ -1,37 +0,0 @@ -syntax = "proto3"; - -package chart.v1; - -option go_package = "chart/config/v1;chartconfig"; - -// UpdateChartConfigs command contains the list of missing chart configs from the cloud to agent -message UpdateChartConfigs { - // claim_id, node_id pair is used to identify the Node Instance - string claim_id = 1; - string node_id = 2; - // list of config hashes missing from cloud and requested from the agent - repeated string config_hashes = 3; -} - -message ChartConfigsUpdated { - repeated ChartConfigUpdated configs = 1; -} - -message ChartConfigUpdated { - string type = 1; - string family = 2; - string context = 3; - string title = 4; - uint64 priority = 5; - string plugin = 6; - string module = 7; - ChartType chart_type = 8; - string units = 9; - string config_hash = 10; -} - -enum ChartType { - LINE = 0; - AREA = 1; - STACKED = 2; -} diff --git a/aclk/aclk-schemas/proto/chart/v1/dimension.proto b/aclk/aclk-schemas/proto/chart/v1/dimension.proto deleted file mode 100644 index 8bcb564b8..000000000 --- a/aclk/aclk-schemas/proto/chart/v1/dimension.proto +++ /dev/null @@ -1,24 +0,0 @@ -syntax = "proto3"; - -package chart.v1; - -import "google/protobuf/timestamp.proto"; - -import "proto/aclk/v1/lib.proto"; - -option go_package = "chart/dimension/v1;chartdimension"; - -// ChartDimensionUpdated is a single event sent from the Agent to the Cloud containing chart dimension data. -// -// ChartDimensionUpdated messages are dispatched in bulk to the Cloud wrapped in ChartsAndDimensionsUpdated messages. -message ChartDimensionUpdated { - string id = 1; - string chart_id = 2; - string node_id = 3; - string claim_id = 4; - string name = 5; - google.protobuf.Timestamp created_at = 6; - // null value means that the dimension is currently collected (live) - google.protobuf.Timestamp last_timestamp = 7; - aclk_lib.v1.ACLKMessagePosition position = 8; -} diff --git a/aclk/aclk-schemas/proto/chart/v1/instance.proto b/aclk/aclk-schemas/proto/chart/v1/instance.proto deleted file mode 100644 index 25c99e7c7..000000000 --- a/aclk/aclk-schemas/proto/chart/v1/instance.proto +++ /dev/null @@ -1,32 +0,0 @@ -syntax = "proto3"; - -package chart.v1; - -import "proto/aclk/v1/lib.proto"; - -option go_package = "chart/instance/v1;chartinstance"; - -// ChartInstanceUpdated is a single event sent from the Agent to the Cloud containing chart instance data. -// -// ChartInstanceUpdated messages are dispatched in bulk to the Cloud wrapped in ChartsAndDimensionsUpdated messages. -message ChartInstanceUpdated { - string id = 1; - string claim_id = 2; - string node_id = 3; - string name = 4; - map chart_labels = 5; - MemoryMode memory_mode = 6; - // in seconds - uint32 update_every_interval = 7; - string config_hash = 8; - aclk_lib.v1.ACLKMessagePosition position = 9; -} - -enum MemoryMode { - NONE = 0; - RAM = 1; - MAP = 2; - SAVE = 3; - ALLOC = 4; - DB_ENGINE = 5; -} diff --git a/aclk/aclk-schemas/proto/chart/v1/stream.proto b/aclk/aclk-schemas/proto/chart/v1/stream.proto deleted file mode 100644 index 9473538f2..000000000 --- a/aclk/aclk-schemas/proto/chart/v1/stream.proto +++ /dev/null @@ -1,86 +0,0 @@ -syntax = "proto3"; - -package chart.v1; - -import "google/protobuf/timestamp.proto"; - -import "proto/chart/v1/instance.proto"; -import "proto/chart/v1/dimension.proto"; - -option go_package = "chart/stream/v1;chartstream"; - -// StreamChartsAndDimensions is a Command produced by the Cloud, consumed by the Agent. -// -// It instructs the Agent to start sending ChartsAndDimensionsUpdated messages for a NodeInstance -// after the last sequence_id that the Cloud has successfully ingested. -message StreamChartsAndDimensions { - // claim_id, node_id pair is used to identify the Node Instance - string claim_id = 1; - string node_id = 2; - - // sequence_id last verified sequence sent by the Agent - uint64 sequence_id = 3; - // batch_id identifies the stream_id and gets incremented every time the Cloud sends a new StreamChartsAndDimensions command - uint64 batch_id = 4; - // seq_id_created_at autogenerated timestamp in Agent's DB upon sequence_id creation - google.protobuf.Timestamp seq_id_created_at = 5; -} - - -// ChartsAndDimensionsAck is an Event produced by the Cloud, consumed by the Agent. -// -// This Event is an acknowledgment from the Cloud side that Chart messages up to a specific last_sequence_id -// have been successfully ingested, and could be potentially deleted from the Agent's DB. -message ChartsAndDimensionsAck { - string claim_id = 1; - string node_id = 2; - // the last verified stored message's seq_id - uint64 last_sequence_id = 3; -} - -// ResetChartMessages is a Command produced by the Agent, consumed by the Cloud. -// -// This Command instructs the Cloud to clear its Chart state for a specific NodeInstance and re-sync -// because of a ResetReason. -message ResetChartMessages { - // claim_id, node_id pair is used to identify the Node Instance - string claim_id = 1; - string node_id = 2; - - ResetReason reason = 3; -} - -enum ResetReason { - DB_EMPTY = 0; - SEQ_ID_NOT_EXISTS = 1; - TIMESTAMP_MISMATCH = 2; -} - -// ChartsAndDimensionsUpdated is a wrapper Event (`fat` message) produced by the Agent, consumed by the Cloud. -// -// It potentially includes a collection of ChartInstanceUpdated messages and|or a collection of ChartDimensionUpdated messages. -message ChartsAndDimensionsUpdated { - repeated chart.v1.ChartInstanceUpdated charts = 1; - repeated chart.v1.ChartDimensionUpdated dimensions = 2; - uint64 batch_id = 3; -} - -// RetentionUpdated includes the available retentions (in seconds) of the dimensions - of a specific node instance and memory-mode - -// on a per update_every level. -// This message is sent over upon Agent Database rotation events to inform the Cloud in total about the newly updated data retentions -// of a node instance's dimensions. -message RetentionUpdated { - // claim_id, node_id pair is used to identify the Node Instance - string claim_id = 1; - string node_id = 2; - // the memory_mode used by the node instance's chart instances - chart.v1.MemoryMode memory_mode = 3; - // this mapping identifies the newly updated available retention (in seconds) of the node instance's dimensions - // the keys are the update_every categories of various dimensions (1, 2, 4, 10 etc.), - // and the values are the available retention (in seconds) of each dimension belonging to the update_every category - // denoted by the key - map interval_durations = 4; - // the timestamp when the db rotation event took place. Can be used in conjunction with the interval_durations - // to compute the beginning of each `updated_every` group's retention - google.protobuf.Timestamp rotation_timestamp = 5; -} -- cgit v1.2.3