From a78bcae188ec444a5e78f8a30df6488814d26176 Mon Sep 17 00:00:00 2001
From: Waleed Akbar <wakbar@cttc.es>
Date: Tue, 19 Mar 2024 07:10:14 +0000
Subject: [PATCH] few methods and messages are moved to kpi_manager.ptoto
---
proto/monitoring.proto | 58 ++++++++++++++++--------------------------
1 file changed, 22 insertions(+), 36 deletions(-)
mode change 100644 => 100755 proto/monitoring.proto
diff --git a/proto/monitoring.proto b/proto/monitoring.proto
old mode 100644
new mode 100755
index 45ba48b02..2706988aa
--- a/proto/monitoring.proto
+++ b/proto/monitoring.proto
@@ -16,13 +16,14 @@ syntax = "proto3";
package monitoring;
import "context.proto";
-import "kpi_sample_types.proto";
+import "kpi_manager.proto";
+//import "kpi_sample_types.proto";
service MonitoringService {
- rpc SetKpi (KpiDescriptor ) returns (KpiId ) {} // Stable not final
- rpc DeleteKpi (KpiId ) returns (context.Empty ) {} // Stable and final
- rpc GetKpiDescriptor (KpiId ) returns (KpiDescriptor ) {} // Stable and final
- rpc GetKpiDescriptorList (context.Empty ) returns (KpiDescriptorList ) {} // Stable and final
+// rpc SetKpi (KpiDescriptor ) returns (KpiId ) {} // Stable not final
+// rpc DeleteKpi (KpiId ) returns (context.Empty ) {} // Stable and final
+// rpc GetKpiDescriptor (KpiId ) returns (KpiDescriptor ) {} // Stable and final
+// rpc GetKpiDescriptorList (context.Empty ) returns (KpiDescriptorList ) {} // Stable and final
rpc IncludeKpi (Kpi ) returns (context.Empty ) {} // Stable and final
rpc MonitorKpi (MonitorKpiRequest ) returns (context.Empty ) {} // Stable and final
rpc QueryKpiData (KpiQuery ) returns (RawKpiTable ) {} // Not implemented
@@ -35,36 +36,25 @@ service MonitoringService {
rpc GetAlarmDescriptor (AlarmID ) returns (AlarmDescriptor ) {} // Stable and final
rpc GetAlarmResponseStream(AlarmSubscription ) returns (stream AlarmResponse) {} // Not Stable not final
rpc DeleteAlarm (AlarmID ) returns (context.Empty ) {} // Stable and final
- rpc GetStreamKpi (KpiId ) returns (stream Kpi ) {} // Stable not final
- rpc GetInstantKpi (KpiId ) returns (Kpi ) {} // Stable not final
+// rpc GetStreamKpi (KpiId ) returns (stream Kpi ) {} // Stable not final
+// rpc GetInstantKpi (KpiId ) returns (Kpi ) {} // Stable not final
}
-message KpiDescriptor {
- KpiId kpi_id = 1;
- string kpi_description = 2;
- repeated KpiId kpi_id_list = 3;
- kpi_sample_types.KpiSampleType kpi_sample_type = 4;
- context.DeviceId device_id = 5;
- context.EndPointId endpoint_id = 6;
- context.ServiceId service_id = 7;
- context.SliceId slice_id = 8;
- context.ConnectionId connection_id = 9;
- context.LinkId link_id = 10;
-}
+
message MonitorKpiRequest {
- KpiId kpi_id = 1;
+ kpi_manager.KpiId kpi_id = 1;
float monitoring_window_s = 2;
float sampling_rate_s = 3;
// Pending add field to reflect Available Device Protocols
}
message KpiQuery {
- repeated KpiId kpi_ids = 1;
- float monitoring_window_s = 2;
- uint32 last_n_samples = 3; // used when you want something like "get the last N many samples
- context.Timestamp start_timestamp = 4; // used when you want something like "get the samples since X date/time"
- context.Timestamp end_timestamp = 5; // used when you want something like "get the samples until X date/time"
+ repeated kpi_manager.KpiId kpi_ids = 1;
+ float monitoring_window_s = 2;
+ uint32 last_n_samples = 3; // used when you want something like "get the last N many samples
+ context.Timestamp start_timestamp = 4; // used when you want something like "get the samples since X date/time"
+ context.Timestamp end_timestamp = 5; // used when you want something like "get the samples until X date/time"
}
@@ -74,20 +64,18 @@ message RawKpi { // cell
}
message RawKpiList { // column
- KpiId kpi_id = 1;
- repeated RawKpi raw_kpis = 2;
+ kpi_manager.KpiId kpi_id = 1;
+ repeated RawKpi raw_kpis = 2;
}
message RawKpiTable { // table
repeated RawKpiList raw_kpi_lists = 1;
}
-message KpiId {
- context.Uuid kpi_id = 1;
-}
+
message Kpi {
- KpiId kpi_id = 1;
+ kpi_manager.KpiId kpi_id = 1;
context.Timestamp timestamp = 2;
KpiValue kpi_value = 3;
}
@@ -117,13 +105,11 @@ message KpiList {
repeated Kpi kpi = 1;
}
-message KpiDescriptorList {
- repeated KpiDescriptor kpi_descriptor_list = 1;
-}
+
message SubsDescriptor{
SubscriptionID subs_id = 1;
- KpiId kpi_id = 2;
+ kpi_manager.KpiId kpi_id = 2;
float sampling_duration_s = 3;
float sampling_interval_s = 4;
context.Timestamp start_timestamp = 5; // used when you want something like "get the samples since X date/time"
@@ -148,7 +134,7 @@ message AlarmDescriptor {
AlarmID alarm_id = 1;
string alarm_description = 2;
string name = 3;
- KpiId kpi_id = 4;
+ kpi_manager.KpiId kpi_id = 4;
KpiValueRange kpi_value_range = 5;
context.Timestamp timestamp = 6;
}
--
GitLab