diff --git a/my_deploy.sh b/my_deploy.sh
index ffd91da35186fe21f418950493ef797a9af1b522..fef4f06c2a2add88c16a4a3beabe510c18ed4a6f 100644
--- a/my_deploy.sh
+++ b/my_deploy.sh
@@ -7,7 +7,7 @@ export TFS_REGISTRY_IMAGE="http://localhost:32000/tfs/"
 #   interdomain slice pathcomp dlt
 #   dbscanserving opticalattackmitigator opticalattackdetector
 #   l3_attackmitigator l3_centralizedattackdetector l3_distributedattackdetector
-export TFS_COMPONENTS="context device automation monitoring pathcomp service slice compute webui"
+export TFS_COMPONENTS="context device automation monitoring pathcomp service slice compute webui policy"
 
 # Set the tag you want to use for your images.
 export TFS_IMAGE_TAG="dev"
diff --git a/src/policy/src/main/docker/Dockerfile.multistage.jvm b/src/policy/src/main/docker/Dockerfile.multistage.jvm
index 38920f65e01d8e466aed83bb5d55750253eb96f2..18ef58fc5a9de1c076af9b73b5228c997108a4fd 100644
--- a/src/policy/src/main/docker/Dockerfile.multistage.jvm
+++ b/src/policy/src/main/docker/Dockerfile.multistage.jvm
@@ -51,6 +51,7 @@ RUN microdnf install curl ca-certificates ${JAVA_PACKAGE} \
     && chmod 540 /deployments/run-java.sh \
     && echo "securerandom.source=file:/dev/urandom" >> /etc/alternatives/jre/conf/security/java.security
 
+ENV QUARKUS_LAUNCH_DEVMODE="true"
 # Configure the JAVA_OPTIONS, you can add -XshowSettings:vm to also display the heap size.
 ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
 # We make four distinct layers so if there are application changes the library layers can be re-used
diff --git a/src/policy/src/main/java/eu/teraflow/policy/PolicyRuleConditionValidator.java b/src/policy/src/main/java/eu/teraflow/policy/PolicyRuleConditionValidator.java
index c7172554d92ec46833d3239c992b5c2c13587268..2057e7255415afecf66286191715db763c1b494f 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/PolicyRuleConditionValidator.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/PolicyRuleConditionValidator.java
@@ -58,8 +58,8 @@ public class PolicyRuleConditionValidator {
         return isDeviceIdValid;
     }
 
-    public Uni<Boolean> validateServiceId(ServiceId serviceId) {
-        final var isServiceIdValid = isServiceIdValid(serviceId);
+    public Uni<Boolean> validateServiceId(ServiceId serviceId, List<String> deviceIds) {
+        final var isServiceIdValid = isServiceIdValid(serviceId, deviceIds);
 
         isServiceIdValid
                 .subscribe()
@@ -101,14 +101,27 @@ public class PolicyRuleConditionValidator {
         return deviceDeviceId.equals(deviceId);
     }
 
-    private Uni<Boolean> isServiceIdValid(ServiceId serviceId) {
+    public Uni<Boolean> isServiceIdValid(ServiceId serviceId, List<String> deviceIds) {
+
         return contextService
                 .getService(serviceId)
+                .onFailure()
+                .recoverWithItem((Service) null)
                 .onItem()
-                .transform(service -> checkIfServiceIdExists(service, serviceId));
+                .transform(service -> checkIfServiceIsValid(service, serviceId, deviceIds));
+    }
+
+    private boolean checkIfServiceIsValid(
+            Service service, ServiceId serviceId, List<String> deviceIds) {
+        return (checkIfServiceIdExists(service, serviceId)
+                && checkIfServicesDeviceIdsExist(service, deviceIds));
     }
 
     private boolean checkIfServiceIdExists(Service service, ServiceId serviceId) {
+        if (service == null) {
+            return false;
+        }
+
         final var serviceServiceIdServiceId = service.getServiceId();
         final var serviceServiceIdContextId = serviceServiceIdServiceId.getContextId();
         final var serviceServiceIdId = serviceServiceIdServiceId.getId();
@@ -117,14 +130,11 @@ public class PolicyRuleConditionValidator {
                 && serviceServiceIdId.equals(serviceId.getId());
     }
 
-    public Uni<Boolean> isServicesDeviceIdsValid(ServiceId serviceId, List<String> deviceIds) {
-        return contextService
-                .getService(serviceId)
-                .onItem()
-                .transform(service -> checkIfServicesDeviceIdsExist(service, deviceIds));
-    }
-
     private boolean checkIfServicesDeviceIdsExist(Service service, List<String> deviceIds) {
+        if (deviceIds.isEmpty()) {
+            return true;
+        }
+
         List<String> serviceDeviceIds = new ArrayList<>();
         for (EndPointId serviceEndPointId : service.getServiceEndPointIds()) {
             serviceDeviceIds.add(serviceEndPointId.getDeviceId());
@@ -133,6 +143,13 @@ public class PolicyRuleConditionValidator {
         return deviceIds.containsAll(serviceDeviceIds);
     }
 
+    public Uni<Boolean> isServicesDeviceIdsValid(ServiceId serviceId, List<String> deviceIds) {
+        return contextService
+                .getService(serviceId)
+                .onItem()
+                .transform(service -> checkIfServicesDeviceIdsExist(service, deviceIds));
+    }
+
     private Uni<Boolean> isUpdatedPolicyRuleIdValid(String updatedPolicyRuleId) {
         return contextService
                 .getPolicyRule(updatedPolicyRuleId)
diff --git a/src/policy/src/main/java/eu/teraflow/policy/PolicyServiceImpl.java b/src/policy/src/main/java/eu/teraflow/policy/PolicyServiceImpl.java
index 499d4cd0e54c34dbc37f2225f8a4acf7e2c6d786..c71f7fb55fb7f2e5f9136fa1a82619d0957af58d 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/PolicyServiceImpl.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/PolicyServiceImpl.java
@@ -160,23 +160,27 @@ public class PolicyServiceImpl implements PolicyService {
         final var policyRuleBasic = policyRuleService.getPolicyRuleBasic();
         if (!policyRuleBasic.areArgumentsValid()) {
             LOGGER.error(policyRuleService.getExeceptionMessage());
-            setPolicyRuleServiceToContext(
-                    policyRuleService,
+            final var policyRuleState =
                     new PolicyRuleState(
-                            PolicyRuleStateEnum.POLICY_FAILED, policyRuleBasic.getExeceptionMessage()));
-            return Uni.createFrom().item(policyRuleBasic.getPolicyRuleState());
+                            PolicyRuleStateEnum.POLICY_FAILED, policyRuleBasic.getExeceptionMessage());
+            return Uni.createFrom().item(policyRuleState);
         }
 
-        policyRuleBasic.setPolicyRuleState(INSERTED_POLICYRULE_STATE);
-        policyRuleService.setPolicyRuleBasic(policyRuleBasic);
-        final var policyRuleTypeService = new PolicyRuleTypeService(policyRuleService);
-        final var policyRule = new PolicyRule(policyRuleTypeService);
+        final var serviceId = policyRuleService.getServiceId();
+        final var deviceIds = policyRuleService.getDeviceIds();
 
-        contextService
-                .setPolicyRule(policyRule)
-                .subscribe()
-                .with(id -> validateService(policyRuleService));
-        return Uni.createFrom().item(policyRuleBasic.getPolicyRuleState());
+        return policyRuleConditionValidator
+                .isServiceIdValid(serviceId, deviceIds)
+                .onItem()
+                .transform(
+                        isService -> {
+                            if (!isService) {
+                                return new PolicyRuleState(
+                                        PolicyRuleStateEnum.POLICY_FAILED,
+                                        String.format(INVALID_MESSAGE, "Service with id: " + serviceId.getId()));
+                            }
+                            return VALIDATED_POLICYRULE_STATE;
+                        });
     }
 
     @Override
@@ -195,24 +199,27 @@ public class PolicyServiceImpl implements PolicyService {
         final var policyRuleBasic = policyRuleService.getPolicyRuleBasic();
         if (!policyRuleBasic.areArgumentsValid()) {
             LOGGER.error(policyRuleService.getExeceptionMessage());
-            setPolicyRuleServiceToContext(
-                    policyRuleService,
+            final var policyRuleState =
                     new PolicyRuleState(
-                            PolicyRuleStateEnum.POLICY_FAILED, policyRuleBasic.getExeceptionMessage()));
-            return Uni.createFrom().item(policyRuleBasic.getPolicyRuleState());
+                            PolicyRuleStateEnum.POLICY_FAILED, policyRuleBasic.getExeceptionMessage());
+            return Uni.createFrom().item(policyRuleState);
         }
 
-        policyRuleBasic.setPolicyRuleState(UPDATED_POLICYRULE_STATE);
-        policyRuleService.setPolicyRuleBasic(policyRuleBasic);
-        final var policyRuleTypeService = new PolicyRuleTypeService(policyRuleService);
-        final var policyRule = new PolicyRule(policyRuleTypeService);
-
-        contextService
-                .setPolicyRule(policyRule)
-                .subscribe()
-                .with(id -> validateUpdatedPolicyService(policyRuleService));
+        final var serviceId = policyRuleService.getServiceId();
+        final var deviceIds = policyRuleService.getDeviceIds();
 
-        return Uni.createFrom().item(policyRuleBasic.getPolicyRuleState());
+        return policyRuleConditionValidator
+                .isServiceIdValid(serviceId, deviceIds)
+                .onItem()
+                .transform(
+                        isService -> {
+                            if (!isService) {
+                                return new PolicyRuleState(
+                                        PolicyRuleStateEnum.POLICY_FAILED,
+                                        String.format(INVALID_MESSAGE, "Service with id: " + serviceId.getId()));
+                            }
+                            return UPDATED_POLICYRULE_STATE;
+                        });
     }
 
     @Override
@@ -650,7 +657,7 @@ public class PolicyServiceImpl implements PolicyService {
         final var policyRuleBasic = policyRuleService.getPolicyRuleBasic();
 
         Boolean isServiceIdValid =
-                policyRuleConditionValidator.validateServiceId(serviceId).await().indefinitely();
+                policyRuleConditionValidator.validateServiceId(serviceId, deviceIds).await().indefinitely();
 
         if (!isServiceIdValid) {
             String message =
diff --git a/src/policy/src/main/resources/application.yml b/src/policy/src/main/resources/application.yml
index 3d992763422c9044136c38f21cf6d609281f86ca..c5bb5478b520fb07e5e4e7031b974981d145b781 100644
--- a/src/policy/src/main/resources/application.yml
+++ b/src/policy/src/main/resources/application.yml
@@ -13,6 +13,11 @@
 # limitations under the License.
 
 quarkus:
+  package:
+    type: mutable-jar
+  live-reload:
+    password: 1234
+    url: http://0.0.0.0:8080
   banner:
     path: teraflow-policy-banner.txt
   grpc:
@@ -23,6 +28,9 @@ quarkus:
       context:
         host: ${quarkus.kubernetes.env.vars.context-service-host}
         port: 1010
+      context_policy:
+        host: ${quarkus.kubernetes.env.vars.context-service-host}
+        port: 1010
       monitoring:
         host: ${quarkus.kubernetes.env.vars.monitoring-service-host}
         port: 7070
diff --git a/src/policy/target/generated-sources/grpc/kpi_sample_types/KpiSampleTypes.java b/src/policy/target/generated-sources/grpc/kpi_sample_types/KpiSampleTypes.java
index 67e1ec736f9d83cbf95b419e9e61e92e82e73b88..217672b2e8de2d7c840833a937b0fb04c38a221b 100644
--- a/src/policy/target/generated-sources/grpc/kpi_sample_types/KpiSampleTypes.java
+++ b/src/policy/target/generated-sources/grpc/kpi_sample_types/KpiSampleTypes.java
@@ -31,6 +31,10 @@ public final class KpiSampleTypes {
      * <code>KPISAMPLETYPE_PACKETS_RECEIVED = 102;</code>
      */
     KPISAMPLETYPE_PACKETS_RECEIVED(102),
+    /**
+     * <code>KPISAMPLETYPE_PACKETS_DROPPED = 103;</code>
+     */
+    KPISAMPLETYPE_PACKETS_DROPPED(103),
     /**
      * <code>KPISAMPLETYPE_BYTES_TRANSMITTED = 201;</code>
      */
@@ -39,6 +43,50 @@ public final class KpiSampleTypes {
      * <code>KPISAMPLETYPE_BYTES_RECEIVED = 202;</code>
      */
     KPISAMPLETYPE_BYTES_RECEIVED(202),
+    /**
+     * <code>KPISAMPLETYPE_BYTES_DROPPED = 203;</code>
+     */
+    KPISAMPLETYPE_BYTES_DROPPED(203),
+    /**
+     * <pre>
+     *. can be used by both optical and L3 without any issue
+     * </pre>
+     *
+     * <code>KPISAMPLETYPE_ML_CONFIDENCE = 401;</code>
+     */
+    KPISAMPLETYPE_ML_CONFIDENCE(401),
+    /**
+     * <pre>
+     *. can be used by both optical and L3 without any issue
+     * </pre>
+     *
+     * <code>KPISAMPLETYPE_OPTICAL_SECURITY_STATUS = 501;</code>
+     */
+    KPISAMPLETYPE_OPTICAL_SECURITY_STATUS(501),
+    /**
+     * <code>KPISAMPLETYPE_L3_UNIQUE_ATTACK_CONNS = 601;</code>
+     */
+    KPISAMPLETYPE_L3_UNIQUE_ATTACK_CONNS(601),
+    /**
+     * <code>KPISAMPLETYPE_L3_TOTAL_DROPPED_PACKTS = 602;</code>
+     */
+    KPISAMPLETYPE_L3_TOTAL_DROPPED_PACKTS(602),
+    /**
+     * <code>KPISAMPLETYPE_L3_UNIQUE_ATTACKERS = 603;</code>
+     */
+    KPISAMPLETYPE_L3_UNIQUE_ATTACKERS(603),
+    /**
+     * <code>KPISAMPLETYPE_L3_UNIQUE_COMPROMISED_CLIENTS = 604;</code>
+     */
+    KPISAMPLETYPE_L3_UNIQUE_COMPROMISED_CLIENTS(604),
+    /**
+     * <code>KPISAMPLETYPE_L3_SECURITY_STATUS_CRYPTO = 605;</code>
+     */
+    KPISAMPLETYPE_L3_SECURITY_STATUS_CRYPTO(605),
+    /**
+     * <code>KPISAMPLETYPE_SERVICE_LATENCY_MS = 701;</code>
+     */
+    KPISAMPLETYPE_SERVICE_LATENCY_MS(701),
     UNRECOGNIZED(-1),
     ;
 
@@ -54,6 +102,10 @@ public final class KpiSampleTypes {
      * <code>KPISAMPLETYPE_PACKETS_RECEIVED = 102;</code>
      */
     public static final int KPISAMPLETYPE_PACKETS_RECEIVED_VALUE = 102;
+    /**
+     * <code>KPISAMPLETYPE_PACKETS_DROPPED = 103;</code>
+     */
+    public static final int KPISAMPLETYPE_PACKETS_DROPPED_VALUE = 103;
     /**
      * <code>KPISAMPLETYPE_BYTES_TRANSMITTED = 201;</code>
      */
@@ -62,6 +114,50 @@ public final class KpiSampleTypes {
      * <code>KPISAMPLETYPE_BYTES_RECEIVED = 202;</code>
      */
     public static final int KPISAMPLETYPE_BYTES_RECEIVED_VALUE = 202;
+    /**
+     * <code>KPISAMPLETYPE_BYTES_DROPPED = 203;</code>
+     */
+    public static final int KPISAMPLETYPE_BYTES_DROPPED_VALUE = 203;
+    /**
+     * <pre>
+     *. can be used by both optical and L3 without any issue
+     * </pre>
+     *
+     * <code>KPISAMPLETYPE_ML_CONFIDENCE = 401;</code>
+     */
+    public static final int KPISAMPLETYPE_ML_CONFIDENCE_VALUE = 401;
+    /**
+     * <pre>
+     *. can be used by both optical and L3 without any issue
+     * </pre>
+     *
+     * <code>KPISAMPLETYPE_OPTICAL_SECURITY_STATUS = 501;</code>
+     */
+    public static final int KPISAMPLETYPE_OPTICAL_SECURITY_STATUS_VALUE = 501;
+    /**
+     * <code>KPISAMPLETYPE_L3_UNIQUE_ATTACK_CONNS = 601;</code>
+     */
+    public static final int KPISAMPLETYPE_L3_UNIQUE_ATTACK_CONNS_VALUE = 601;
+    /**
+     * <code>KPISAMPLETYPE_L3_TOTAL_DROPPED_PACKTS = 602;</code>
+     */
+    public static final int KPISAMPLETYPE_L3_TOTAL_DROPPED_PACKTS_VALUE = 602;
+    /**
+     * <code>KPISAMPLETYPE_L3_UNIQUE_ATTACKERS = 603;</code>
+     */
+    public static final int KPISAMPLETYPE_L3_UNIQUE_ATTACKERS_VALUE = 603;
+    /**
+     * <code>KPISAMPLETYPE_L3_UNIQUE_COMPROMISED_CLIENTS = 604;</code>
+     */
+    public static final int KPISAMPLETYPE_L3_UNIQUE_COMPROMISED_CLIENTS_VALUE = 604;
+    /**
+     * <code>KPISAMPLETYPE_L3_SECURITY_STATUS_CRYPTO = 605;</code>
+     */
+    public static final int KPISAMPLETYPE_L3_SECURITY_STATUS_CRYPTO_VALUE = 605;
+    /**
+     * <code>KPISAMPLETYPE_SERVICE_LATENCY_MS = 701;</code>
+     */
+    public static final int KPISAMPLETYPE_SERVICE_LATENCY_MS_VALUE = 701;
 
 
     public final int getNumber() {
@@ -91,8 +187,18 @@ public final class KpiSampleTypes {
         case 0: return KPISAMPLETYPE_UNKNOWN;
         case 101: return KPISAMPLETYPE_PACKETS_TRANSMITTED;
         case 102: return KPISAMPLETYPE_PACKETS_RECEIVED;
+        case 103: return KPISAMPLETYPE_PACKETS_DROPPED;
         case 201: return KPISAMPLETYPE_BYTES_TRANSMITTED;
         case 202: return KPISAMPLETYPE_BYTES_RECEIVED;
+        case 203: return KPISAMPLETYPE_BYTES_DROPPED;
+        case 401: return KPISAMPLETYPE_ML_CONFIDENCE;
+        case 501: return KPISAMPLETYPE_OPTICAL_SECURITY_STATUS;
+        case 601: return KPISAMPLETYPE_L3_UNIQUE_ATTACK_CONNS;
+        case 602: return KPISAMPLETYPE_L3_TOTAL_DROPPED_PACKTS;
+        case 603: return KPISAMPLETYPE_L3_UNIQUE_ATTACKERS;
+        case 604: return KPISAMPLETYPE_L3_UNIQUE_COMPROMISED_CLIENTS;
+        case 605: return KPISAMPLETYPE_L3_SECURITY_STATUS_CRYPTO;
+        case 701: return KPISAMPLETYPE_SERVICE_LATENCY_MS;
         default: return null;
       }
     }
@@ -159,12 +265,22 @@ public final class KpiSampleTypes {
   static {
     java.lang.String[] descriptorData = {
       "\n\026kpi_sample_types.proto\022\020kpi_sample_typ" +
-      "es*\276\001\n\rKpiSampleType\022\031\n\025KPISAMPLETYPE_UN" +
+      "es*\327\004\n\rKpiSampleType\022\031\n\025KPISAMPLETYPE_UN" +
       "KNOWN\020\000\022%\n!KPISAMPLETYPE_PACKETS_TRANSMI" +
       "TTED\020e\022\"\n\036KPISAMPLETYPE_PACKETS_RECEIVED" +
-      "\020f\022$\n\037KPISAMPLETYPE_BYTES_TRANSMITTED\020\311\001" +
-      "\022!\n\034KPISAMPLETYPE_BYTES_RECEIVED\020\312\001b\006pro" +
-      "to3"
+      "\020f\022!\n\035KPISAMPLETYPE_PACKETS_DROPPED\020g\022$\n" +
+      "\037KPISAMPLETYPE_BYTES_TRANSMITTED\020\311\001\022!\n\034K" +
+      "PISAMPLETYPE_BYTES_RECEIVED\020\312\001\022 \n\033KPISAM" +
+      "PLETYPE_BYTES_DROPPED\020\313\001\022 \n\033KPISAMPLETYP" +
+      "E_ML_CONFIDENCE\020\221\003\022*\n%KPISAMPLETYPE_OPTI" +
+      "CAL_SECURITY_STATUS\020\365\003\022)\n$KPISAMPLETYPE_" +
+      "L3_UNIQUE_ATTACK_CONNS\020\331\004\022*\n%KPISAMPLETY" +
+      "PE_L3_TOTAL_DROPPED_PACKTS\020\332\004\022&\n!KPISAMP" +
+      "LETYPE_L3_UNIQUE_ATTACKERS\020\333\004\0220\n+KPISAMP" +
+      "LETYPE_L3_UNIQUE_COMPROMISED_CLIENTS\020\334\004\022" +
+      ",\n\'KPISAMPLETYPE_L3_SECURITY_STATUS_CRYP" +
+      "TO\020\335\004\022%\n KPISAMPLETYPE_SERVICE_LATENCY_M" +
+      "S\020\275\005b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
diff --git a/src/policy/target/generated-sources/grpc/monitoring/Monitoring.java b/src/policy/target/generated-sources/grpc/monitoring/Monitoring.java
index ffd0ed3d839d951c755153b6f5beaf4b1a12cd2e..38f026eb1ac730e8f825e460916dc57469f0d312 100644
--- a/src/policy/target/generated-sources/grpc/monitoring/Monitoring.java
+++ b/src/policy/target/generated-sources/grpc/monitoring/Monitoring.java
@@ -139,6 +139,21 @@ public final class Monitoring {
      * <code>.context.SliceId slice_id = 8;</code>
      */
     context.ContextOuterClass.SliceIdOrBuilder getSliceIdOrBuilder();
+
+    /**
+     * <code>.context.ConnectionId connection_id = 9;</code>
+     * @return Whether the connectionId field is set.
+     */
+    boolean hasConnectionId();
+    /**
+     * <code>.context.ConnectionId connection_id = 9;</code>
+     * @return The connectionId.
+     */
+    context.ContextOuterClass.ConnectionId getConnectionId();
+    /**
+     * <code>.context.ConnectionId connection_id = 9;</code>
+     */
+    context.ContextOuterClass.ConnectionIdOrBuilder getConnectionIdOrBuilder();
   }
   /**
    * Protobuf type {@code monitoring.KpiDescriptor}
@@ -275,6 +290,19 @@ public final class Monitoring {
 
               break;
             }
+            case 74: {
+              context.ContextOuterClass.ConnectionId.Builder subBuilder = null;
+              if (connectionId_ != null) {
+                subBuilder = connectionId_.toBuilder();
+              }
+              connectionId_ = input.readMessage(context.ContextOuterClass.ConnectionId.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(connectionId_);
+                connectionId_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -537,6 +565,32 @@ public final class Monitoring {
       return getSliceId();
     }
 
+    public static final int CONNECTION_ID_FIELD_NUMBER = 9;
+    private context.ContextOuterClass.ConnectionId connectionId_;
+    /**
+     * <code>.context.ConnectionId connection_id = 9;</code>
+     * @return Whether the connectionId field is set.
+     */
+    @java.lang.Override
+    public boolean hasConnectionId() {
+      return connectionId_ != null;
+    }
+    /**
+     * <code>.context.ConnectionId connection_id = 9;</code>
+     * @return The connectionId.
+     */
+    @java.lang.Override
+    public context.ContextOuterClass.ConnectionId getConnectionId() {
+      return connectionId_ == null ? context.ContextOuterClass.ConnectionId.getDefaultInstance() : connectionId_;
+    }
+    /**
+     * <code>.context.ConnectionId connection_id = 9;</code>
+     */
+    @java.lang.Override
+    public context.ContextOuterClass.ConnectionIdOrBuilder getConnectionIdOrBuilder() {
+      return getConnectionId();
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -575,6 +629,9 @@ public final class Monitoring {
       if (sliceId_ != null) {
         output.writeMessage(8, getSliceId());
       }
+      if (connectionId_ != null) {
+        output.writeMessage(9, getConnectionId());
+      }
       unknownFields.writeTo(output);
     }
 
@@ -615,6 +672,10 @@ public final class Monitoring {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(8, getSliceId());
       }
+      if (connectionId_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(9, getConnectionId());
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -660,6 +721,11 @@ public final class Monitoring {
         if (!getSliceId()
             .equals(other.getSliceId())) return false;
       }
+      if (hasConnectionId() != other.hasConnectionId()) return false;
+      if (hasConnectionId()) {
+        if (!getConnectionId()
+            .equals(other.getConnectionId())) return false;
+      }
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -699,6 +765,10 @@ public final class Monitoring {
         hash = (37 * hash) + SLICE_ID_FIELD_NUMBER;
         hash = (53 * hash) + getSliceId().hashCode();
       }
+      if (hasConnectionId()) {
+        hash = (37 * hash) + CONNECTION_ID_FIELD_NUMBER;
+        hash = (53 * hash) + getConnectionId().hashCode();
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -873,6 +943,12 @@ public final class Monitoring {
           sliceId_ = null;
           sliceIdBuilder_ = null;
         }
+        if (connectionIdBuilder_ == null) {
+          connectionId_ = null;
+        } else {
+          connectionId_ = null;
+          connectionIdBuilder_ = null;
+        }
         return this;
       }
 
@@ -936,6 +1012,11 @@ public final class Monitoring {
         } else {
           result.sliceId_ = sliceIdBuilder_.build();
         }
+        if (connectionIdBuilder_ == null) {
+          result.connectionId_ = connectionId_;
+        } else {
+          result.connectionId_ = connectionIdBuilder_.build();
+        }
         onBuilt();
         return result;
       }
@@ -1032,6 +1113,9 @@ public final class Monitoring {
         if (other.hasSliceId()) {
           mergeSliceId(other.getSliceId());
         }
+        if (other.hasConnectionId()) {
+          mergeConnectionId(other.getConnectionId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -2026,6 +2110,125 @@ public final class Monitoring {
         }
         return sliceIdBuilder_;
       }
+
+      private context.ContextOuterClass.ConnectionId connectionId_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          context.ContextOuterClass.ConnectionId, context.ContextOuterClass.ConnectionId.Builder, context.ContextOuterClass.ConnectionIdOrBuilder> connectionIdBuilder_;
+      /**
+       * <code>.context.ConnectionId connection_id = 9;</code>
+       * @return Whether the connectionId field is set.
+       */
+      public boolean hasConnectionId() {
+        return connectionIdBuilder_ != null || connectionId_ != null;
+      }
+      /**
+       * <code>.context.ConnectionId connection_id = 9;</code>
+       * @return The connectionId.
+       */
+      public context.ContextOuterClass.ConnectionId getConnectionId() {
+        if (connectionIdBuilder_ == null) {
+          return connectionId_ == null ? context.ContextOuterClass.ConnectionId.getDefaultInstance() : connectionId_;
+        } else {
+          return connectionIdBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.context.ConnectionId connection_id = 9;</code>
+       */
+      public Builder setConnectionId(context.ContextOuterClass.ConnectionId value) {
+        if (connectionIdBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          connectionId_ = value;
+          onChanged();
+        } else {
+          connectionIdBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.context.ConnectionId connection_id = 9;</code>
+       */
+      public Builder setConnectionId(
+          context.ContextOuterClass.ConnectionId.Builder builderForValue) {
+        if (connectionIdBuilder_ == null) {
+          connectionId_ = builderForValue.build();
+          onChanged();
+        } else {
+          connectionIdBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.context.ConnectionId connection_id = 9;</code>
+       */
+      public Builder mergeConnectionId(context.ContextOuterClass.ConnectionId value) {
+        if (connectionIdBuilder_ == null) {
+          if (connectionId_ != null) {
+            connectionId_ =
+              context.ContextOuterClass.ConnectionId.newBuilder(connectionId_).mergeFrom(value).buildPartial();
+          } else {
+            connectionId_ = value;
+          }
+          onChanged();
+        } else {
+          connectionIdBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.context.ConnectionId connection_id = 9;</code>
+       */
+      public Builder clearConnectionId() {
+        if (connectionIdBuilder_ == null) {
+          connectionId_ = null;
+          onChanged();
+        } else {
+          connectionId_ = null;
+          connectionIdBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.context.ConnectionId connection_id = 9;</code>
+       */
+      public context.ContextOuterClass.ConnectionId.Builder getConnectionIdBuilder() {
+        
+        onChanged();
+        return getConnectionIdFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.context.ConnectionId connection_id = 9;</code>
+       */
+      public context.ContextOuterClass.ConnectionIdOrBuilder getConnectionIdOrBuilder() {
+        if (connectionIdBuilder_ != null) {
+          return connectionIdBuilder_.getMessageOrBuilder();
+        } else {
+          return connectionId_ == null ?
+              context.ContextOuterClass.ConnectionId.getDefaultInstance() : connectionId_;
+        }
+      }
+      /**
+       * <code>.context.ConnectionId connection_id = 9;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          context.ContextOuterClass.ConnectionId, context.ContextOuterClass.ConnectionId.Builder, context.ContextOuterClass.ConnectionIdOrBuilder> 
+          getConnectionIdFieldBuilder() {
+        if (connectionIdBuilder_ == null) {
+          connectionIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              context.ContextOuterClass.ConnectionId, context.ContextOuterClass.ConnectionId.Builder, context.ContextOuterClass.ConnectionIdOrBuilder>(
+                  getConnectionId(),
+                  getParentForChildren(),
+                  isClean());
+          connectionId_ = null;
+        }
+        return connectionIdBuilder_;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -2869,19 +3072,28 @@ public final class Monitoring {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.monitoring.KpiId kpi_id = 1;</code>
-     * @return Whether the kpiId field is set.
+     * <code>repeated .monitoring.KpiId kpi_ids = 1;</code>
      */
-    boolean hasKpiId();
+    java.util.List<monitoring.Monitoring.KpiId> 
+        getKpiIdsList();
     /**
-     * <code>.monitoring.KpiId kpi_id = 1;</code>
-     * @return The kpiId.
+     * <code>repeated .monitoring.KpiId kpi_ids = 1;</code>
      */
-    monitoring.Monitoring.KpiId getKpiId();
+    monitoring.Monitoring.KpiId getKpiIds(int index);
     /**
-     * <code>.monitoring.KpiId kpi_id = 1;</code>
+     * <code>repeated .monitoring.KpiId kpi_ids = 1;</code>
      */
-    monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder();
+    int getKpiIdsCount();
+    /**
+     * <code>repeated .monitoring.KpiId kpi_ids = 1;</code>
+     */
+    java.util.List<? extends monitoring.Monitoring.KpiIdOrBuilder> 
+        getKpiIdsOrBuilderList();
+    /**
+     * <code>repeated .monitoring.KpiId kpi_ids = 1;</code>
+     */
+    monitoring.Monitoring.KpiIdOrBuilder getKpiIdsOrBuilder(
+        int index);
 
     /**
      * <code>float monitoring_window_s = 2;</code>
@@ -2889,18 +3101,12 @@ public final class Monitoring {
      */
     float getMonitoringWindowS();
 
-    /**
-     * <code>float sampling_rate_s = 3;</code>
-     * @return The samplingRateS.
-     */
-    float getSamplingRateS();
-
     /**
      * <pre>
      * used when you want something like "get the last N many samples
      * </pre>
      *
-     * <code>uint32 last_n_samples = 4;</code>
+     * <code>uint32 last_n_samples = 3;</code>
      * @return The lastNSamples.
      */
     int getLastNSamples();
@@ -2910,7 +3116,7 @@ public final class Monitoring {
      * used when you want something like "get the samples since X date/time"
      * </pre>
      *
-     * <code>.context.Timestamp start_timestamp = 5;</code>
+     * <code>.context.Timestamp start_timestamp = 4;</code>
      * @return Whether the startTimestamp field is set.
      */
     boolean hasStartTimestamp();
@@ -2919,7 +3125,7 @@ public final class Monitoring {
      * used when you want something like "get the samples since X date/time"
      * </pre>
      *
-     * <code>.context.Timestamp start_timestamp = 5;</code>
+     * <code>.context.Timestamp start_timestamp = 4;</code>
      * @return The startTimestamp.
      */
     context.ContextOuterClass.Timestamp getStartTimestamp();
@@ -2928,7 +3134,7 @@ public final class Monitoring {
      * used when you want something like "get the samples since X date/time"
      * </pre>
      *
-     * <code>.context.Timestamp start_timestamp = 5;</code>
+     * <code>.context.Timestamp start_timestamp = 4;</code>
      */
     context.ContextOuterClass.TimestampOrBuilder getStartTimestampOrBuilder();
 
@@ -2937,7 +3143,7 @@ public final class Monitoring {
      * used when you want something like "get the samples until X date/time"
      * </pre>
      *
-     * <code>.context.Timestamp end_timestamp = 6;</code>
+     * <code>.context.Timestamp end_timestamp = 5;</code>
      * @return Whether the endTimestamp field is set.
      */
     boolean hasEndTimestamp();
@@ -2946,7 +3152,7 @@ public final class Monitoring {
      * used when you want something like "get the samples until X date/time"
      * </pre>
      *
-     * <code>.context.Timestamp end_timestamp = 6;</code>
+     * <code>.context.Timestamp end_timestamp = 5;</code>
      * @return The endTimestamp.
      */
     context.ContextOuterClass.Timestamp getEndTimestamp();
@@ -2955,7 +3161,7 @@ public final class Monitoring {
      * used when you want something like "get the samples until X date/time"
      * </pre>
      *
-     * <code>.context.Timestamp end_timestamp = 6;</code>
+     * <code>.context.Timestamp end_timestamp = 5;</code>
      */
     context.ContextOuterClass.TimestampOrBuilder getEndTimestampOrBuilder();
   }
@@ -2972,6 +3178,7 @@ public final class Monitoring {
       super(builder);
     }
     private KpiQuery() {
+      kpiIds_ = java.util.Collections.emptyList();
     }
 
     @java.lang.Override
@@ -2994,6 +3201,7 @@ public final class Monitoring {
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
+      int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -3005,16 +3213,12 @@ public final class Monitoring {
               done = true;
               break;
             case 10: {
-              monitoring.Monitoring.KpiId.Builder subBuilder = null;
-              if (kpiId_ != null) {
-                subBuilder = kpiId_.toBuilder();
-              }
-              kpiId_ = input.readMessage(monitoring.Monitoring.KpiId.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(kpiId_);
-                kpiId_ = subBuilder.buildPartial();
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                kpiIds_ = new java.util.ArrayList<monitoring.Monitoring.KpiId>();
+                mutable_bitField0_ |= 0x00000001;
               }
-
+              kpiIds_.add(
+                  input.readMessage(monitoring.Monitoring.KpiId.parser(), extensionRegistry));
               break;
             }
             case 21: {
@@ -3022,17 +3226,12 @@ public final class Monitoring {
               monitoringWindowS_ = input.readFloat();
               break;
             }
-            case 29: {
-
-              samplingRateS_ = input.readFloat();
-              break;
-            }
-            case 32: {
+            case 24: {
 
               lastNSamples_ = input.readUInt32();
               break;
             }
-            case 42: {
+            case 34: {
               context.ContextOuterClass.Timestamp.Builder subBuilder = null;
               if (startTimestamp_ != null) {
                 subBuilder = startTimestamp_.toBuilder();
@@ -3045,7 +3244,7 @@ public final class Monitoring {
 
               break;
             }
-            case 50: {
+            case 42: {
               context.ContextOuterClass.Timestamp.Builder subBuilder = null;
               if (endTimestamp_ != null) {
                 subBuilder = endTimestamp_.toBuilder();
@@ -3073,6 +3272,9 @@ public final class Monitoring {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          kpiIds_ = java.util.Collections.unmodifiableList(kpiIds_);
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -3090,30 +3292,44 @@ public final class Monitoring {
               monitoring.Monitoring.KpiQuery.class, monitoring.Monitoring.KpiQuery.Builder.class);
     }
 
-    public static final int KPI_ID_FIELD_NUMBER = 1;
-    private monitoring.Monitoring.KpiId kpiId_;
+    public static final int KPI_IDS_FIELD_NUMBER = 1;
+    private java.util.List<monitoring.Monitoring.KpiId> kpiIds_;
     /**
-     * <code>.monitoring.KpiId kpi_id = 1;</code>
-     * @return Whether the kpiId field is set.
+     * <code>repeated .monitoring.KpiId kpi_ids = 1;</code>
      */
     @java.lang.Override
-    public boolean hasKpiId() {
-      return kpiId_ != null;
+    public java.util.List<monitoring.Monitoring.KpiId> getKpiIdsList() {
+      return kpiIds_;
     }
     /**
-     * <code>.monitoring.KpiId kpi_id = 1;</code>
-     * @return The kpiId.
+     * <code>repeated .monitoring.KpiId kpi_ids = 1;</code>
      */
     @java.lang.Override
-    public monitoring.Monitoring.KpiId getKpiId() {
-      return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_;
+    public java.util.List<? extends monitoring.Monitoring.KpiIdOrBuilder> 
+        getKpiIdsOrBuilderList() {
+      return kpiIds_;
     }
     /**
-     * <code>.monitoring.KpiId kpi_id = 1;</code>
+     * <code>repeated .monitoring.KpiId kpi_ids = 1;</code>
      */
     @java.lang.Override
-    public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() {
-      return getKpiId();
+    public int getKpiIdsCount() {
+      return kpiIds_.size();
+    }
+    /**
+     * <code>repeated .monitoring.KpiId kpi_ids = 1;</code>
+     */
+    @java.lang.Override
+    public monitoring.Monitoring.KpiId getKpiIds(int index) {
+      return kpiIds_.get(index);
+    }
+    /**
+     * <code>repeated .monitoring.KpiId kpi_ids = 1;</code>
+     */
+    @java.lang.Override
+    public monitoring.Monitoring.KpiIdOrBuilder getKpiIdsOrBuilder(
+        int index) {
+      return kpiIds_.get(index);
     }
 
     public static final int MONITORING_WINDOW_S_FIELD_NUMBER = 2;
@@ -3127,25 +3343,14 @@ public final class Monitoring {
       return monitoringWindowS_;
     }
 
-    public static final int SAMPLING_RATE_S_FIELD_NUMBER = 3;
-    private float samplingRateS_;
-    /**
-     * <code>float sampling_rate_s = 3;</code>
-     * @return The samplingRateS.
-     */
-    @java.lang.Override
-    public float getSamplingRateS() {
-      return samplingRateS_;
-    }
-
-    public static final int LAST_N_SAMPLES_FIELD_NUMBER = 4;
+    public static final int LAST_N_SAMPLES_FIELD_NUMBER = 3;
     private int lastNSamples_;
     /**
      * <pre>
      * used when you want something like "get the last N many samples
      * </pre>
      *
-     * <code>uint32 last_n_samples = 4;</code>
+     * <code>uint32 last_n_samples = 3;</code>
      * @return The lastNSamples.
      */
     @java.lang.Override
@@ -3153,14 +3358,14 @@ public final class Monitoring {
       return lastNSamples_;
     }
 
-    public static final int START_TIMESTAMP_FIELD_NUMBER = 5;
+    public static final int START_TIMESTAMP_FIELD_NUMBER = 4;
     private context.ContextOuterClass.Timestamp startTimestamp_;
     /**
      * <pre>
      * used when you want something like "get the samples since X date/time"
      * </pre>
      *
-     * <code>.context.Timestamp start_timestamp = 5;</code>
+     * <code>.context.Timestamp start_timestamp = 4;</code>
      * @return Whether the startTimestamp field is set.
      */
     @java.lang.Override
@@ -3172,7 +3377,7 @@ public final class Monitoring {
      * used when you want something like "get the samples since X date/time"
      * </pre>
      *
-     * <code>.context.Timestamp start_timestamp = 5;</code>
+     * <code>.context.Timestamp start_timestamp = 4;</code>
      * @return The startTimestamp.
      */
     @java.lang.Override
@@ -3184,21 +3389,21 @@ public final class Monitoring {
      * used when you want something like "get the samples since X date/time"
      * </pre>
      *
-     * <code>.context.Timestamp start_timestamp = 5;</code>
+     * <code>.context.Timestamp start_timestamp = 4;</code>
      */
     @java.lang.Override
     public context.ContextOuterClass.TimestampOrBuilder getStartTimestampOrBuilder() {
       return getStartTimestamp();
     }
 
-    public static final int END_TIMESTAMP_FIELD_NUMBER = 6;
+    public static final int END_TIMESTAMP_FIELD_NUMBER = 5;
     private context.ContextOuterClass.Timestamp endTimestamp_;
     /**
      * <pre>
      * used when you want something like "get the samples until X date/time"
      * </pre>
      *
-     * <code>.context.Timestamp end_timestamp = 6;</code>
+     * <code>.context.Timestamp end_timestamp = 5;</code>
      * @return Whether the endTimestamp field is set.
      */
     @java.lang.Override
@@ -3210,7 +3415,7 @@ public final class Monitoring {
      * used when you want something like "get the samples until X date/time"
      * </pre>
      *
-     * <code>.context.Timestamp end_timestamp = 6;</code>
+     * <code>.context.Timestamp end_timestamp = 5;</code>
      * @return The endTimestamp.
      */
     @java.lang.Override
@@ -3222,7 +3427,7 @@ public final class Monitoring {
      * used when you want something like "get the samples until X date/time"
      * </pre>
      *
-     * <code>.context.Timestamp end_timestamp = 6;</code>
+     * <code>.context.Timestamp end_timestamp = 5;</code>
      */
     @java.lang.Override
     public context.ContextOuterClass.TimestampOrBuilder getEndTimestampOrBuilder() {
@@ -3243,23 +3448,20 @@ public final class Monitoring {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (kpiId_ != null) {
-        output.writeMessage(1, getKpiId());
+      for (int i = 0; i < kpiIds_.size(); i++) {
+        output.writeMessage(1, kpiIds_.get(i));
       }
       if (monitoringWindowS_ != 0F) {
         output.writeFloat(2, monitoringWindowS_);
       }
-      if (samplingRateS_ != 0F) {
-        output.writeFloat(3, samplingRateS_);
-      }
       if (lastNSamples_ != 0) {
-        output.writeUInt32(4, lastNSamples_);
+        output.writeUInt32(3, lastNSamples_);
       }
       if (startTimestamp_ != null) {
-        output.writeMessage(5, getStartTimestamp());
+        output.writeMessage(4, getStartTimestamp());
       }
       if (endTimestamp_ != null) {
-        output.writeMessage(6, getEndTimestamp());
+        output.writeMessage(5, getEndTimestamp());
       }
       unknownFields.writeTo(output);
     }
@@ -3270,29 +3472,25 @@ public final class Monitoring {
       if (size != -1) return size;
 
       size = 0;
-      if (kpiId_ != null) {
+      for (int i = 0; i < kpiIds_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getKpiId());
+          .computeMessageSize(1, kpiIds_.get(i));
       }
       if (monitoringWindowS_ != 0F) {
         size += com.google.protobuf.CodedOutputStream
           .computeFloatSize(2, monitoringWindowS_);
       }
-      if (samplingRateS_ != 0F) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(3, samplingRateS_);
-      }
       if (lastNSamples_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, lastNSamples_);
+          .computeUInt32Size(3, lastNSamples_);
       }
       if (startTimestamp_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(5, getStartTimestamp());
+          .computeMessageSize(4, getStartTimestamp());
       }
       if (endTimestamp_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, getEndTimestamp());
+          .computeMessageSize(5, getEndTimestamp());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -3309,17 +3507,11 @@ public final class Monitoring {
       }
       monitoring.Monitoring.KpiQuery other = (monitoring.Monitoring.KpiQuery) obj;
 
-      if (hasKpiId() != other.hasKpiId()) return false;
-      if (hasKpiId()) {
-        if (!getKpiId()
-            .equals(other.getKpiId())) return false;
-      }
+      if (!getKpiIdsList()
+          .equals(other.getKpiIdsList())) return false;
       if (java.lang.Float.floatToIntBits(getMonitoringWindowS())
           != java.lang.Float.floatToIntBits(
               other.getMonitoringWindowS())) return false;
-      if (java.lang.Float.floatToIntBits(getSamplingRateS())
-          != java.lang.Float.floatToIntBits(
-              other.getSamplingRateS())) return false;
       if (getLastNSamples()
           != other.getLastNSamples()) return false;
       if (hasStartTimestamp() != other.hasStartTimestamp()) return false;
@@ -3343,16 +3535,13 @@ public final class Monitoring {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasKpiId()) {
-        hash = (37 * hash) + KPI_ID_FIELD_NUMBER;
-        hash = (53 * hash) + getKpiId().hashCode();
+      if (getKpiIdsCount() > 0) {
+        hash = (37 * hash) + KPI_IDS_FIELD_NUMBER;
+        hash = (53 * hash) + getKpiIdsList().hashCode();
       }
       hash = (37 * hash) + MONITORING_WINDOW_S_FIELD_NUMBER;
       hash = (53 * hash) + java.lang.Float.floatToIntBits(
           getMonitoringWindowS());
-      hash = (37 * hash) + SAMPLING_RATE_S_FIELD_NUMBER;
-      hash = (53 * hash) + java.lang.Float.floatToIntBits(
-          getSamplingRateS());
       hash = (37 * hash) + LAST_N_SAMPLES_FIELD_NUMBER;
       hash = (53 * hash) + getLastNSamples();
       if (hasStartTimestamp()) {
@@ -3491,21 +3680,20 @@ public final class Monitoring {
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
+          getKpiIdsFieldBuilder();
         }
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (kpiIdBuilder_ == null) {
-          kpiId_ = null;
+        if (kpiIdsBuilder_ == null) {
+          kpiIds_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
-          kpiId_ = null;
-          kpiIdBuilder_ = null;
+          kpiIdsBuilder_.clear();
         }
         monitoringWindowS_ = 0F;
 
-        samplingRateS_ = 0F;
-
         lastNSamples_ = 0;
 
         if (startTimestampBuilder_ == null) {
@@ -3546,13 +3734,17 @@ public final class Monitoring {
       @java.lang.Override
       public monitoring.Monitoring.KpiQuery buildPartial() {
         monitoring.Monitoring.KpiQuery result = new monitoring.Monitoring.KpiQuery(this);
-        if (kpiIdBuilder_ == null) {
-          result.kpiId_ = kpiId_;
+        int from_bitField0_ = bitField0_;
+        if (kpiIdsBuilder_ == null) {
+          if (((bitField0_ & 0x00000001) != 0)) {
+            kpiIds_ = java.util.Collections.unmodifiableList(kpiIds_);
+            bitField0_ = (bitField0_ & ~0x00000001);
+          }
+          result.kpiIds_ = kpiIds_;
         } else {
-          result.kpiId_ = kpiIdBuilder_.build();
+          result.kpiIds_ = kpiIdsBuilder_.build();
         }
         result.monitoringWindowS_ = monitoringWindowS_;
-        result.samplingRateS_ = samplingRateS_;
         result.lastNSamples_ = lastNSamples_;
         if (startTimestampBuilder_ == null) {
           result.startTimestamp_ = startTimestamp_;
@@ -3612,15 +3804,35 @@ public final class Monitoring {
 
       public Builder mergeFrom(monitoring.Monitoring.KpiQuery other) {
         if (other == monitoring.Monitoring.KpiQuery.getDefaultInstance()) return this;
-        if (other.hasKpiId()) {
-          mergeKpiId(other.getKpiId());
+        if (kpiIdsBuilder_ == null) {
+          if (!other.kpiIds_.isEmpty()) {
+            if (kpiIds_.isEmpty()) {
+              kpiIds_ = other.kpiIds_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+            } else {
+              ensureKpiIdsIsMutable();
+              kpiIds_.addAll(other.kpiIds_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.kpiIds_.isEmpty()) {
+            if (kpiIdsBuilder_.isEmpty()) {
+              kpiIdsBuilder_.dispose();
+              kpiIdsBuilder_ = null;
+              kpiIds_ = other.kpiIds_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+              kpiIdsBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getKpiIdsFieldBuilder() : null;
+            } else {
+              kpiIdsBuilder_.addAllMessages(other.kpiIds_);
+            }
+          }
         }
         if (other.getMonitoringWindowS() != 0F) {
           setMonitoringWindowS(other.getMonitoringWindowS());
         }
-        if (other.getSamplingRateS() != 0F) {
-          setSamplingRateS(other.getSamplingRateS());
-        }
         if (other.getLastNSamples() != 0) {
           setLastNSamples(other.getLastNSamples());
         }
@@ -3658,124 +3870,246 @@ public final class Monitoring {
         }
         return this;
       }
+      private int bitField0_;
+
+      private java.util.List<monitoring.Monitoring.KpiId> kpiIds_ =
+        java.util.Collections.emptyList();
+      private void ensureKpiIdsIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          kpiIds_ = new java.util.ArrayList<monitoring.Monitoring.KpiId>(kpiIds_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> kpiIdsBuilder_;
 
-      private monitoring.Monitoring.KpiId kpiId_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> kpiIdBuilder_;
       /**
-       * <code>.monitoring.KpiId kpi_id = 1;</code>
-       * @return Whether the kpiId field is set.
+       * <code>repeated .monitoring.KpiId kpi_ids = 1;</code>
        */
-      public boolean hasKpiId() {
-        return kpiIdBuilder_ != null || kpiId_ != null;
+      public java.util.List<monitoring.Monitoring.KpiId> getKpiIdsList() {
+        if (kpiIdsBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(kpiIds_);
+        } else {
+          return kpiIdsBuilder_.getMessageList();
+        }
       }
       /**
-       * <code>.monitoring.KpiId kpi_id = 1;</code>
-       * @return The kpiId.
+       * <code>repeated .monitoring.KpiId kpi_ids = 1;</code>
        */
-      public monitoring.Monitoring.KpiId getKpiId() {
-        if (kpiIdBuilder_ == null) {
-          return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_;
+      public int getKpiIdsCount() {
+        if (kpiIdsBuilder_ == null) {
+          return kpiIds_.size();
         } else {
-          return kpiIdBuilder_.getMessage();
+          return kpiIdsBuilder_.getCount();
         }
       }
       /**
-       * <code>.monitoring.KpiId kpi_id = 1;</code>
+       * <code>repeated .monitoring.KpiId kpi_ids = 1;</code>
        */
-      public Builder setKpiId(monitoring.Monitoring.KpiId value) {
-        if (kpiIdBuilder_ == null) {
+      public monitoring.Monitoring.KpiId getKpiIds(int index) {
+        if (kpiIdsBuilder_ == null) {
+          return kpiIds_.get(index);
+        } else {
+          return kpiIdsBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .monitoring.KpiId kpi_ids = 1;</code>
+       */
+      public Builder setKpiIds(
+          int index, monitoring.Monitoring.KpiId value) {
+        if (kpiIdsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          kpiId_ = value;
+          ensureKpiIdsIsMutable();
+          kpiIds_.set(index, value);
           onChanged();
         } else {
-          kpiIdBuilder_.setMessage(value);
+          kpiIdsBuilder_.setMessage(index, value);
         }
-
         return this;
       }
       /**
-       * <code>.monitoring.KpiId kpi_id = 1;</code>
+       * <code>repeated .monitoring.KpiId kpi_ids = 1;</code>
        */
-      public Builder setKpiId(
-          monitoring.Monitoring.KpiId.Builder builderForValue) {
-        if (kpiIdBuilder_ == null) {
-          kpiId_ = builderForValue.build();
+      public Builder setKpiIds(
+          int index, monitoring.Monitoring.KpiId.Builder builderForValue) {
+        if (kpiIdsBuilder_ == null) {
+          ensureKpiIdsIsMutable();
+          kpiIds_.set(index, builderForValue.build());
           onChanged();
         } else {
-          kpiIdBuilder_.setMessage(builderForValue.build());
+          kpiIdsBuilder_.setMessage(index, builderForValue.build());
         }
-
         return this;
       }
       /**
-       * <code>.monitoring.KpiId kpi_id = 1;</code>
+       * <code>repeated .monitoring.KpiId kpi_ids = 1;</code>
        */
-      public Builder mergeKpiId(monitoring.Monitoring.KpiId value) {
-        if (kpiIdBuilder_ == null) {
-          if (kpiId_ != null) {
-            kpiId_ =
-              monitoring.Monitoring.KpiId.newBuilder(kpiId_).mergeFrom(value).buildPartial();
-          } else {
-            kpiId_ = value;
+      public Builder addKpiIds(monitoring.Monitoring.KpiId value) {
+        if (kpiIdsBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
           }
+          ensureKpiIdsIsMutable();
+          kpiIds_.add(value);
           onChanged();
         } else {
-          kpiIdBuilder_.mergeFrom(value);
+          kpiIdsBuilder_.addMessage(value);
         }
-
         return this;
       }
       /**
-       * <code>.monitoring.KpiId kpi_id = 1;</code>
+       * <code>repeated .monitoring.KpiId kpi_ids = 1;</code>
        */
-      public Builder clearKpiId() {
-        if (kpiIdBuilder_ == null) {
-          kpiId_ = null;
+      public Builder addKpiIds(
+          int index, monitoring.Monitoring.KpiId value) {
+        if (kpiIdsBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureKpiIdsIsMutable();
+          kpiIds_.add(index, value);
           onChanged();
         } else {
-          kpiId_ = null;
-          kpiIdBuilder_ = null;
+          kpiIdsBuilder_.addMessage(index, value);
         }
-
         return this;
       }
       /**
-       * <code>.monitoring.KpiId kpi_id = 1;</code>
+       * <code>repeated .monitoring.KpiId kpi_ids = 1;</code>
        */
-      public monitoring.Monitoring.KpiId.Builder getKpiIdBuilder() {
-        
-        onChanged();
-        return getKpiIdFieldBuilder().getBuilder();
+      public Builder addKpiIds(
+          monitoring.Monitoring.KpiId.Builder builderForValue) {
+        if (kpiIdsBuilder_ == null) {
+          ensureKpiIdsIsMutable();
+          kpiIds_.add(builderForValue.build());
+          onChanged();
+        } else {
+          kpiIdsBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
       }
       /**
-       * <code>.monitoring.KpiId kpi_id = 1;</code>
+       * <code>repeated .monitoring.KpiId kpi_ids = 1;</code>
        */
-      public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() {
-        if (kpiIdBuilder_ != null) {
-          return kpiIdBuilder_.getMessageOrBuilder();
+      public Builder addKpiIds(
+          int index, monitoring.Monitoring.KpiId.Builder builderForValue) {
+        if (kpiIdsBuilder_ == null) {
+          ensureKpiIdsIsMutable();
+          kpiIds_.add(index, builderForValue.build());
+          onChanged();
         } else {
-          return kpiId_ == null ?
-              monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_;
+          kpiIdsBuilder_.addMessage(index, builderForValue.build());
         }
+        return this;
       }
       /**
-       * <code>.monitoring.KpiId kpi_id = 1;</code>
+       * <code>repeated .monitoring.KpiId kpi_ids = 1;</code>
        */
-      private com.google.protobuf.SingleFieldBuilderV3<
+      public Builder addAllKpiIds(
+          java.lang.Iterable<? extends monitoring.Monitoring.KpiId> values) {
+        if (kpiIdsBuilder_ == null) {
+          ensureKpiIdsIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, kpiIds_);
+          onChanged();
+        } else {
+          kpiIdsBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .monitoring.KpiId kpi_ids = 1;</code>
+       */
+      public Builder clearKpiIds() {
+        if (kpiIdsBuilder_ == null) {
+          kpiIds_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+          onChanged();
+        } else {
+          kpiIdsBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .monitoring.KpiId kpi_ids = 1;</code>
+       */
+      public Builder removeKpiIds(int index) {
+        if (kpiIdsBuilder_ == null) {
+          ensureKpiIdsIsMutable();
+          kpiIds_.remove(index);
+          onChanged();
+        } else {
+          kpiIdsBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .monitoring.KpiId kpi_ids = 1;</code>
+       */
+      public monitoring.Monitoring.KpiId.Builder getKpiIdsBuilder(
+          int index) {
+        return getKpiIdsFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .monitoring.KpiId kpi_ids = 1;</code>
+       */
+      public monitoring.Monitoring.KpiIdOrBuilder getKpiIdsOrBuilder(
+          int index) {
+        if (kpiIdsBuilder_ == null) {
+          return kpiIds_.get(index);  } else {
+          return kpiIdsBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .monitoring.KpiId kpi_ids = 1;</code>
+       */
+      public java.util.List<? extends monitoring.Monitoring.KpiIdOrBuilder> 
+           getKpiIdsOrBuilderList() {
+        if (kpiIdsBuilder_ != null) {
+          return kpiIdsBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(kpiIds_);
+        }
+      }
+      /**
+       * <code>repeated .monitoring.KpiId kpi_ids = 1;</code>
+       */
+      public monitoring.Monitoring.KpiId.Builder addKpiIdsBuilder() {
+        return getKpiIdsFieldBuilder().addBuilder(
+            monitoring.Monitoring.KpiId.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .monitoring.KpiId kpi_ids = 1;</code>
+       */
+      public monitoring.Monitoring.KpiId.Builder addKpiIdsBuilder(
+          int index) {
+        return getKpiIdsFieldBuilder().addBuilder(
+            index, monitoring.Monitoring.KpiId.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .monitoring.KpiId kpi_ids = 1;</code>
+       */
+      public java.util.List<monitoring.Monitoring.KpiId.Builder> 
+           getKpiIdsBuilderList() {
+        return getKpiIdsFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
           monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> 
-          getKpiIdFieldBuilder() {
-        if (kpiIdBuilder_ == null) {
-          kpiIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+          getKpiIdsFieldBuilder() {
+        if (kpiIdsBuilder_ == null) {
+          kpiIdsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder>(
-                  getKpiId(),
+                  kpiIds_,
+                  ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
                   isClean());
-          kpiId_ = null;
+          kpiIds_ = null;
         }
-        return kpiIdBuilder_;
+        return kpiIdsBuilder_;
       }
 
       private float monitoringWindowS_ ;
@@ -3809,44 +4143,13 @@ public final class Monitoring {
         return this;
       }
 
-      private float samplingRateS_ ;
-      /**
-       * <code>float sampling_rate_s = 3;</code>
-       * @return The samplingRateS.
-       */
-      @java.lang.Override
-      public float getSamplingRateS() {
-        return samplingRateS_;
-      }
-      /**
-       * <code>float sampling_rate_s = 3;</code>
-       * @param value The samplingRateS to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSamplingRateS(float value) {
-        
-        samplingRateS_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>float sampling_rate_s = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSamplingRateS() {
-        
-        samplingRateS_ = 0F;
-        onChanged();
-        return this;
-      }
-
       private int lastNSamples_ ;
       /**
        * <pre>
        * used when you want something like "get the last N many samples
        * </pre>
        *
-       * <code>uint32 last_n_samples = 4;</code>
+       * <code>uint32 last_n_samples = 3;</code>
        * @return The lastNSamples.
        */
       @java.lang.Override
@@ -3858,7 +4161,7 @@ public final class Monitoring {
        * used when you want something like "get the last N many samples
        * </pre>
        *
-       * <code>uint32 last_n_samples = 4;</code>
+       * <code>uint32 last_n_samples = 3;</code>
        * @param value The lastNSamples to set.
        * @return This builder for chaining.
        */
@@ -3873,7 +4176,7 @@ public final class Monitoring {
        * used when you want something like "get the last N many samples
        * </pre>
        *
-       * <code>uint32 last_n_samples = 4;</code>
+       * <code>uint32 last_n_samples = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearLastNSamples() {
@@ -3891,7 +4194,7 @@ public final class Monitoring {
        * used when you want something like "get the samples since X date/time"
        * </pre>
        *
-       * <code>.context.Timestamp start_timestamp = 5;</code>
+       * <code>.context.Timestamp start_timestamp = 4;</code>
        * @return Whether the startTimestamp field is set.
        */
       public boolean hasStartTimestamp() {
@@ -3902,7 +4205,7 @@ public final class Monitoring {
        * used when you want something like "get the samples since X date/time"
        * </pre>
        *
-       * <code>.context.Timestamp start_timestamp = 5;</code>
+       * <code>.context.Timestamp start_timestamp = 4;</code>
        * @return The startTimestamp.
        */
       public context.ContextOuterClass.Timestamp getStartTimestamp() {
@@ -3917,7 +4220,7 @@ public final class Monitoring {
        * used when you want something like "get the samples since X date/time"
        * </pre>
        *
-       * <code>.context.Timestamp start_timestamp = 5;</code>
+       * <code>.context.Timestamp start_timestamp = 4;</code>
        */
       public Builder setStartTimestamp(context.ContextOuterClass.Timestamp value) {
         if (startTimestampBuilder_ == null) {
@@ -3937,7 +4240,7 @@ public final class Monitoring {
        * used when you want something like "get the samples since X date/time"
        * </pre>
        *
-       * <code>.context.Timestamp start_timestamp = 5;</code>
+       * <code>.context.Timestamp start_timestamp = 4;</code>
        */
       public Builder setStartTimestamp(
           context.ContextOuterClass.Timestamp.Builder builderForValue) {
@@ -3955,7 +4258,7 @@ public final class Monitoring {
        * used when you want something like "get the samples since X date/time"
        * </pre>
        *
-       * <code>.context.Timestamp start_timestamp = 5;</code>
+       * <code>.context.Timestamp start_timestamp = 4;</code>
        */
       public Builder mergeStartTimestamp(context.ContextOuterClass.Timestamp value) {
         if (startTimestampBuilder_ == null) {
@@ -3973,224 +4276,2861 @@ public final class Monitoring {
         return this;
       }
       /**
-       * <pre>
-       * used when you want something like "get the samples since X date/time"
-       * </pre>
-       *
-       * <code>.context.Timestamp start_timestamp = 5;</code>
+       * <pre>
+       * used when you want something like "get the samples since X date/time"
+       * </pre>
+       *
+       * <code>.context.Timestamp start_timestamp = 4;</code>
+       */
+      public Builder clearStartTimestamp() {
+        if (startTimestampBuilder_ == null) {
+          startTimestamp_ = null;
+          onChanged();
+        } else {
+          startTimestamp_ = null;
+          startTimestampBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <pre>
+       * used when you want something like "get the samples since X date/time"
+       * </pre>
+       *
+       * <code>.context.Timestamp start_timestamp = 4;</code>
+       */
+      public context.ContextOuterClass.Timestamp.Builder getStartTimestampBuilder() {
+        
+        onChanged();
+        return getStartTimestampFieldBuilder().getBuilder();
+      }
+      /**
+       * <pre>
+       * used when you want something like "get the samples since X date/time"
+       * </pre>
+       *
+       * <code>.context.Timestamp start_timestamp = 4;</code>
+       */
+      public context.ContextOuterClass.TimestampOrBuilder getStartTimestampOrBuilder() {
+        if (startTimestampBuilder_ != null) {
+          return startTimestampBuilder_.getMessageOrBuilder();
+        } else {
+          return startTimestamp_ == null ?
+              context.ContextOuterClass.Timestamp.getDefaultInstance() : startTimestamp_;
+        }
+      }
+      /**
+       * <pre>
+       * used when you want something like "get the samples since X date/time"
+       * </pre>
+       *
+       * <code>.context.Timestamp start_timestamp = 4;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> 
+          getStartTimestampFieldBuilder() {
+        if (startTimestampBuilder_ == null) {
+          startTimestampBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder>(
+                  getStartTimestamp(),
+                  getParentForChildren(),
+                  isClean());
+          startTimestamp_ = null;
+        }
+        return startTimestampBuilder_;
+      }
+
+      private context.ContextOuterClass.Timestamp endTimestamp_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> endTimestampBuilder_;
+      /**
+       * <pre>
+       * used when you want something like "get the samples until X date/time"
+       * </pre>
+       *
+       * <code>.context.Timestamp end_timestamp = 5;</code>
+       * @return Whether the endTimestamp field is set.
+       */
+      public boolean hasEndTimestamp() {
+        return endTimestampBuilder_ != null || endTimestamp_ != null;
+      }
+      /**
+       * <pre>
+       * used when you want something like "get the samples until X date/time"
+       * </pre>
+       *
+       * <code>.context.Timestamp end_timestamp = 5;</code>
+       * @return The endTimestamp.
+       */
+      public context.ContextOuterClass.Timestamp getEndTimestamp() {
+        if (endTimestampBuilder_ == null) {
+          return endTimestamp_ == null ? context.ContextOuterClass.Timestamp.getDefaultInstance() : endTimestamp_;
+        } else {
+          return endTimestampBuilder_.getMessage();
+        }
+      }
+      /**
+       * <pre>
+       * used when you want something like "get the samples until X date/time"
+       * </pre>
+       *
+       * <code>.context.Timestamp end_timestamp = 5;</code>
+       */
+      public Builder setEndTimestamp(context.ContextOuterClass.Timestamp value) {
+        if (endTimestampBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          endTimestamp_ = value;
+          onChanged();
+        } else {
+          endTimestampBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <pre>
+       * used when you want something like "get the samples until X date/time"
+       * </pre>
+       *
+       * <code>.context.Timestamp end_timestamp = 5;</code>
+       */
+      public Builder setEndTimestamp(
+          context.ContextOuterClass.Timestamp.Builder builderForValue) {
+        if (endTimestampBuilder_ == null) {
+          endTimestamp_ = builderForValue.build();
+          onChanged();
+        } else {
+          endTimestampBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <pre>
+       * used when you want something like "get the samples until X date/time"
+       * </pre>
+       *
+       * <code>.context.Timestamp end_timestamp = 5;</code>
+       */
+      public Builder mergeEndTimestamp(context.ContextOuterClass.Timestamp value) {
+        if (endTimestampBuilder_ == null) {
+          if (endTimestamp_ != null) {
+            endTimestamp_ =
+              context.ContextOuterClass.Timestamp.newBuilder(endTimestamp_).mergeFrom(value).buildPartial();
+          } else {
+            endTimestamp_ = value;
+          }
+          onChanged();
+        } else {
+          endTimestampBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <pre>
+       * used when you want something like "get the samples until X date/time"
+       * </pre>
+       *
+       * <code>.context.Timestamp end_timestamp = 5;</code>
+       */
+      public Builder clearEndTimestamp() {
+        if (endTimestampBuilder_ == null) {
+          endTimestamp_ = null;
+          onChanged();
+        } else {
+          endTimestamp_ = null;
+          endTimestampBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <pre>
+       * used when you want something like "get the samples until X date/time"
+       * </pre>
+       *
+       * <code>.context.Timestamp end_timestamp = 5;</code>
+       */
+      public context.ContextOuterClass.Timestamp.Builder getEndTimestampBuilder() {
+        
+        onChanged();
+        return getEndTimestampFieldBuilder().getBuilder();
+      }
+      /**
+       * <pre>
+       * used when you want something like "get the samples until X date/time"
+       * </pre>
+       *
+       * <code>.context.Timestamp end_timestamp = 5;</code>
+       */
+      public context.ContextOuterClass.TimestampOrBuilder getEndTimestampOrBuilder() {
+        if (endTimestampBuilder_ != null) {
+          return endTimestampBuilder_.getMessageOrBuilder();
+        } else {
+          return endTimestamp_ == null ?
+              context.ContextOuterClass.Timestamp.getDefaultInstance() : endTimestamp_;
+        }
+      }
+      /**
+       * <pre>
+       * used when you want something like "get the samples until X date/time"
+       * </pre>
+       *
+       * <code>.context.Timestamp end_timestamp = 5;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> 
+          getEndTimestampFieldBuilder() {
+        if (endTimestampBuilder_ == null) {
+          endTimestampBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder>(
+                  getEndTimestamp(),
+                  getParentForChildren(),
+                  isClean());
+          endTimestamp_ = null;
+        }
+        return endTimestampBuilder_;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:monitoring.KpiQuery)
+    }
+
+    // @@protoc_insertion_point(class_scope:monitoring.KpiQuery)
+    private static final monitoring.Monitoring.KpiQuery DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new monitoring.Monitoring.KpiQuery();
+    }
+
+    public static monitoring.Monitoring.KpiQuery getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<KpiQuery>
+        PARSER = new com.google.protobuf.AbstractParser<KpiQuery>() {
+      @java.lang.Override
+      public KpiQuery parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new KpiQuery(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<KpiQuery> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<KpiQuery> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public monitoring.Monitoring.KpiQuery getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  public interface RawKpiOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:monitoring.RawKpi)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>.context.Timestamp timestamp = 1;</code>
+     * @return Whether the timestamp field is set.
+     */
+    boolean hasTimestamp();
+    /**
+     * <code>.context.Timestamp timestamp = 1;</code>
+     * @return The timestamp.
+     */
+    context.ContextOuterClass.Timestamp getTimestamp();
+    /**
+     * <code>.context.Timestamp timestamp = 1;</code>
+     */
+    context.ContextOuterClass.TimestampOrBuilder getTimestampOrBuilder();
+
+    /**
+     * <code>.monitoring.KpiValue kpi_value = 2;</code>
+     * @return Whether the kpiValue field is set.
+     */
+    boolean hasKpiValue();
+    /**
+     * <code>.monitoring.KpiValue kpi_value = 2;</code>
+     * @return The kpiValue.
+     */
+    monitoring.Monitoring.KpiValue getKpiValue();
+    /**
+     * <code>.monitoring.KpiValue kpi_value = 2;</code>
+     */
+    monitoring.Monitoring.KpiValueOrBuilder getKpiValueOrBuilder();
+  }
+  /**
+   * <pre>
+   * cell
+   * </pre>
+   *
+   * Protobuf type {@code monitoring.RawKpi}
+   */
+  public static final class RawKpi extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:monitoring.RawKpi)
+      RawKpiOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use RawKpi.newBuilder() to construct.
+    private RawKpi(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private RawKpi() {
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new RawKpi();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private RawKpi(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10: {
+              context.ContextOuterClass.Timestamp.Builder subBuilder = null;
+              if (timestamp_ != null) {
+                subBuilder = timestamp_.toBuilder();
+              }
+              timestamp_ = input.readMessage(context.ContextOuterClass.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(timestamp_);
+                timestamp_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+            case 18: {
+              monitoring.Monitoring.KpiValue.Builder subBuilder = null;
+              if (kpiValue_ != null) {
+                subBuilder = kpiValue_.toBuilder();
+              }
+              kpiValue_ = input.readMessage(monitoring.Monitoring.KpiValue.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(kpiValue_);
+                kpiValue_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return monitoring.Monitoring.internal_static_monitoring_RawKpi_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return monitoring.Monitoring.internal_static_monitoring_RawKpi_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              monitoring.Monitoring.RawKpi.class, monitoring.Monitoring.RawKpi.Builder.class);
+    }
+
+    public static final int TIMESTAMP_FIELD_NUMBER = 1;
+    private context.ContextOuterClass.Timestamp timestamp_;
+    /**
+     * <code>.context.Timestamp timestamp = 1;</code>
+     * @return Whether the timestamp field is set.
+     */
+    @java.lang.Override
+    public boolean hasTimestamp() {
+      return timestamp_ != null;
+    }
+    /**
+     * <code>.context.Timestamp timestamp = 1;</code>
+     * @return The timestamp.
+     */
+    @java.lang.Override
+    public context.ContextOuterClass.Timestamp getTimestamp() {
+      return timestamp_ == null ? context.ContextOuterClass.Timestamp.getDefaultInstance() : timestamp_;
+    }
+    /**
+     * <code>.context.Timestamp timestamp = 1;</code>
+     */
+    @java.lang.Override
+    public context.ContextOuterClass.TimestampOrBuilder getTimestampOrBuilder() {
+      return getTimestamp();
+    }
+
+    public static final int KPI_VALUE_FIELD_NUMBER = 2;
+    private monitoring.Monitoring.KpiValue kpiValue_;
+    /**
+     * <code>.monitoring.KpiValue kpi_value = 2;</code>
+     * @return Whether the kpiValue field is set.
+     */
+    @java.lang.Override
+    public boolean hasKpiValue() {
+      return kpiValue_ != null;
+    }
+    /**
+     * <code>.monitoring.KpiValue kpi_value = 2;</code>
+     * @return The kpiValue.
+     */
+    @java.lang.Override
+    public monitoring.Monitoring.KpiValue getKpiValue() {
+      return kpiValue_ == null ? monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiValue_;
+    }
+    /**
+     * <code>.monitoring.KpiValue kpi_value = 2;</code>
+     */
+    @java.lang.Override
+    public monitoring.Monitoring.KpiValueOrBuilder getKpiValueOrBuilder() {
+      return getKpiValue();
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (timestamp_ != null) {
+        output.writeMessage(1, getTimestamp());
+      }
+      if (kpiValue_ != null) {
+        output.writeMessage(2, getKpiValue());
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (timestamp_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(1, getTimestamp());
+      }
+      if (kpiValue_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(2, getKpiValue());
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof monitoring.Monitoring.RawKpi)) {
+        return super.equals(obj);
+      }
+      monitoring.Monitoring.RawKpi other = (monitoring.Monitoring.RawKpi) obj;
+
+      if (hasTimestamp() != other.hasTimestamp()) return false;
+      if (hasTimestamp()) {
+        if (!getTimestamp()
+            .equals(other.getTimestamp())) return false;
+      }
+      if (hasKpiValue() != other.hasKpiValue()) return false;
+      if (hasKpiValue()) {
+        if (!getKpiValue()
+            .equals(other.getKpiValue())) return false;
+      }
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasTimestamp()) {
+        hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER;
+        hash = (53 * hash) + getTimestamp().hashCode();
+      }
+      if (hasKpiValue()) {
+        hash = (37 * hash) + KPI_VALUE_FIELD_NUMBER;
+        hash = (53 * hash) + getKpiValue().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static monitoring.Monitoring.RawKpi parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static monitoring.Monitoring.RawKpi parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static monitoring.Monitoring.RawKpi parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static monitoring.Monitoring.RawKpi parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static monitoring.Monitoring.RawKpi parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static monitoring.Monitoring.RawKpi parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static monitoring.Monitoring.RawKpi parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static monitoring.Monitoring.RawKpi parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static monitoring.Monitoring.RawKpi parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static monitoring.Monitoring.RawKpi parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static monitoring.Monitoring.RawKpi parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static monitoring.Monitoring.RawKpi parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(monitoring.Monitoring.RawKpi prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * <pre>
+     * cell
+     * </pre>
+     *
+     * Protobuf type {@code monitoring.RawKpi}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:monitoring.RawKpi)
+        monitoring.Monitoring.RawKpiOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return monitoring.Monitoring.internal_static_monitoring_RawKpi_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return monitoring.Monitoring.internal_static_monitoring_RawKpi_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                monitoring.Monitoring.RawKpi.class, monitoring.Monitoring.RawKpi.Builder.class);
+      }
+
+      // Construct using monitoring.Monitoring.RawKpi.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        if (timestampBuilder_ == null) {
+          timestamp_ = null;
+        } else {
+          timestamp_ = null;
+          timestampBuilder_ = null;
+        }
+        if (kpiValueBuilder_ == null) {
+          kpiValue_ = null;
+        } else {
+          kpiValue_ = null;
+          kpiValueBuilder_ = null;
+        }
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return monitoring.Monitoring.internal_static_monitoring_RawKpi_descriptor;
+      }
+
+      @java.lang.Override
+      public monitoring.Monitoring.RawKpi getDefaultInstanceForType() {
+        return monitoring.Monitoring.RawKpi.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public monitoring.Monitoring.RawKpi build() {
+        monitoring.Monitoring.RawKpi result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public monitoring.Monitoring.RawKpi buildPartial() {
+        monitoring.Monitoring.RawKpi result = new monitoring.Monitoring.RawKpi(this);
+        if (timestampBuilder_ == null) {
+          result.timestamp_ = timestamp_;
+        } else {
+          result.timestamp_ = timestampBuilder_.build();
+        }
+        if (kpiValueBuilder_ == null) {
+          result.kpiValue_ = kpiValue_;
+        } else {
+          result.kpiValue_ = kpiValueBuilder_.build();
+        }
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof monitoring.Monitoring.RawKpi) {
+          return mergeFrom((monitoring.Monitoring.RawKpi)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(monitoring.Monitoring.RawKpi other) {
+        if (other == monitoring.Monitoring.RawKpi.getDefaultInstance()) return this;
+        if (other.hasTimestamp()) {
+          mergeTimestamp(other.getTimestamp());
+        }
+        if (other.hasKpiValue()) {
+          mergeKpiValue(other.getKpiValue());
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        monitoring.Monitoring.RawKpi parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (monitoring.Monitoring.RawKpi) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+
+      private context.ContextOuterClass.Timestamp timestamp_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> timestampBuilder_;
+      /**
+       * <code>.context.Timestamp timestamp = 1;</code>
+       * @return Whether the timestamp field is set.
+       */
+      public boolean hasTimestamp() {
+        return timestampBuilder_ != null || timestamp_ != null;
+      }
+      /**
+       * <code>.context.Timestamp timestamp = 1;</code>
+       * @return The timestamp.
+       */
+      public context.ContextOuterClass.Timestamp getTimestamp() {
+        if (timestampBuilder_ == null) {
+          return timestamp_ == null ? context.ContextOuterClass.Timestamp.getDefaultInstance() : timestamp_;
+        } else {
+          return timestampBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.context.Timestamp timestamp = 1;</code>
+       */
+      public Builder setTimestamp(context.ContextOuterClass.Timestamp value) {
+        if (timestampBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          timestamp_ = value;
+          onChanged();
+        } else {
+          timestampBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.context.Timestamp timestamp = 1;</code>
+       */
+      public Builder setTimestamp(
+          context.ContextOuterClass.Timestamp.Builder builderForValue) {
+        if (timestampBuilder_ == null) {
+          timestamp_ = builderForValue.build();
+          onChanged();
+        } else {
+          timestampBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.context.Timestamp timestamp = 1;</code>
+       */
+      public Builder mergeTimestamp(context.ContextOuterClass.Timestamp value) {
+        if (timestampBuilder_ == null) {
+          if (timestamp_ != null) {
+            timestamp_ =
+              context.ContextOuterClass.Timestamp.newBuilder(timestamp_).mergeFrom(value).buildPartial();
+          } else {
+            timestamp_ = value;
+          }
+          onChanged();
+        } else {
+          timestampBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.context.Timestamp timestamp = 1;</code>
+       */
+      public Builder clearTimestamp() {
+        if (timestampBuilder_ == null) {
+          timestamp_ = null;
+          onChanged();
+        } else {
+          timestamp_ = null;
+          timestampBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.context.Timestamp timestamp = 1;</code>
+       */
+      public context.ContextOuterClass.Timestamp.Builder getTimestampBuilder() {
+        
+        onChanged();
+        return getTimestampFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.context.Timestamp timestamp = 1;</code>
+       */
+      public context.ContextOuterClass.TimestampOrBuilder getTimestampOrBuilder() {
+        if (timestampBuilder_ != null) {
+          return timestampBuilder_.getMessageOrBuilder();
+        } else {
+          return timestamp_ == null ?
+              context.ContextOuterClass.Timestamp.getDefaultInstance() : timestamp_;
+        }
+      }
+      /**
+       * <code>.context.Timestamp timestamp = 1;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> 
+          getTimestampFieldBuilder() {
+        if (timestampBuilder_ == null) {
+          timestampBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder>(
+                  getTimestamp(),
+                  getParentForChildren(),
+                  isClean());
+          timestamp_ = null;
+        }
+        return timestampBuilder_;
+      }
+
+      private monitoring.Monitoring.KpiValue kpiValue_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder> kpiValueBuilder_;
+      /**
+       * <code>.monitoring.KpiValue kpi_value = 2;</code>
+       * @return Whether the kpiValue field is set.
+       */
+      public boolean hasKpiValue() {
+        return kpiValueBuilder_ != null || kpiValue_ != null;
+      }
+      /**
+       * <code>.monitoring.KpiValue kpi_value = 2;</code>
+       * @return The kpiValue.
+       */
+      public monitoring.Monitoring.KpiValue getKpiValue() {
+        if (kpiValueBuilder_ == null) {
+          return kpiValue_ == null ? monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiValue_;
+        } else {
+          return kpiValueBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.monitoring.KpiValue kpi_value = 2;</code>
+       */
+      public Builder setKpiValue(monitoring.Monitoring.KpiValue value) {
+        if (kpiValueBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          kpiValue_ = value;
+          onChanged();
+        } else {
+          kpiValueBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.monitoring.KpiValue kpi_value = 2;</code>
+       */
+      public Builder setKpiValue(
+          monitoring.Monitoring.KpiValue.Builder builderForValue) {
+        if (kpiValueBuilder_ == null) {
+          kpiValue_ = builderForValue.build();
+          onChanged();
+        } else {
+          kpiValueBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.monitoring.KpiValue kpi_value = 2;</code>
+       */
+      public Builder mergeKpiValue(monitoring.Monitoring.KpiValue value) {
+        if (kpiValueBuilder_ == null) {
+          if (kpiValue_ != null) {
+            kpiValue_ =
+              monitoring.Monitoring.KpiValue.newBuilder(kpiValue_).mergeFrom(value).buildPartial();
+          } else {
+            kpiValue_ = value;
+          }
+          onChanged();
+        } else {
+          kpiValueBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.monitoring.KpiValue kpi_value = 2;</code>
+       */
+      public Builder clearKpiValue() {
+        if (kpiValueBuilder_ == null) {
+          kpiValue_ = null;
+          onChanged();
+        } else {
+          kpiValue_ = null;
+          kpiValueBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.monitoring.KpiValue kpi_value = 2;</code>
+       */
+      public monitoring.Monitoring.KpiValue.Builder getKpiValueBuilder() {
+        
+        onChanged();
+        return getKpiValueFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.monitoring.KpiValue kpi_value = 2;</code>
+       */
+      public monitoring.Monitoring.KpiValueOrBuilder getKpiValueOrBuilder() {
+        if (kpiValueBuilder_ != null) {
+          return kpiValueBuilder_.getMessageOrBuilder();
+        } else {
+          return kpiValue_ == null ?
+              monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiValue_;
+        }
+      }
+      /**
+       * <code>.monitoring.KpiValue kpi_value = 2;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder> 
+          getKpiValueFieldBuilder() {
+        if (kpiValueBuilder_ == null) {
+          kpiValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder>(
+                  getKpiValue(),
+                  getParentForChildren(),
+                  isClean());
+          kpiValue_ = null;
+        }
+        return kpiValueBuilder_;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:monitoring.RawKpi)
+    }
+
+    // @@protoc_insertion_point(class_scope:monitoring.RawKpi)
+    private static final monitoring.Monitoring.RawKpi DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new monitoring.Monitoring.RawKpi();
+    }
+
+    public static monitoring.Monitoring.RawKpi getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<RawKpi>
+        PARSER = new com.google.protobuf.AbstractParser<RawKpi>() {
+      @java.lang.Override
+      public RawKpi parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new RawKpi(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<RawKpi> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<RawKpi> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public monitoring.Monitoring.RawKpi getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  public interface RawKpiListOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:monitoring.RawKpiList)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>.monitoring.KpiId kpi_id = 1;</code>
+     * @return Whether the kpiId field is set.
+     */
+    boolean hasKpiId();
+    /**
+     * <code>.monitoring.KpiId kpi_id = 1;</code>
+     * @return The kpiId.
+     */
+    monitoring.Monitoring.KpiId getKpiId();
+    /**
+     * <code>.monitoring.KpiId kpi_id = 1;</code>
+     */
+    monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder();
+
+    /**
+     * <code>repeated .monitoring.RawKpi raw_kpis = 2;</code>
+     */
+    java.util.List<monitoring.Monitoring.RawKpi> 
+        getRawKpisList();
+    /**
+     * <code>repeated .monitoring.RawKpi raw_kpis = 2;</code>
+     */
+    monitoring.Monitoring.RawKpi getRawKpis(int index);
+    /**
+     * <code>repeated .monitoring.RawKpi raw_kpis = 2;</code>
+     */
+    int getRawKpisCount();
+    /**
+     * <code>repeated .monitoring.RawKpi raw_kpis = 2;</code>
+     */
+    java.util.List<? extends monitoring.Monitoring.RawKpiOrBuilder> 
+        getRawKpisOrBuilderList();
+    /**
+     * <code>repeated .monitoring.RawKpi raw_kpis = 2;</code>
+     */
+    monitoring.Monitoring.RawKpiOrBuilder getRawKpisOrBuilder(
+        int index);
+  }
+  /**
+   * <pre>
+   * column
+   * </pre>
+   *
+   * Protobuf type {@code monitoring.RawKpiList}
+   */
+  public static final class RawKpiList extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:monitoring.RawKpiList)
+      RawKpiListOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use RawKpiList.newBuilder() to construct.
+    private RawKpiList(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private RawKpiList() {
+      rawKpis_ = java.util.Collections.emptyList();
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new RawKpiList();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private RawKpiList(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10: {
+              monitoring.Monitoring.KpiId.Builder subBuilder = null;
+              if (kpiId_ != null) {
+                subBuilder = kpiId_.toBuilder();
+              }
+              kpiId_ = input.readMessage(monitoring.Monitoring.KpiId.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(kpiId_);
+                kpiId_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+            case 18: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                rawKpis_ = new java.util.ArrayList<monitoring.Monitoring.RawKpi>();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              rawKpis_.add(
+                  input.readMessage(monitoring.Monitoring.RawKpi.parser(), extensionRegistry));
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          rawKpis_ = java.util.Collections.unmodifiableList(rawKpis_);
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return monitoring.Monitoring.internal_static_monitoring_RawKpiList_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return monitoring.Monitoring.internal_static_monitoring_RawKpiList_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              monitoring.Monitoring.RawKpiList.class, monitoring.Monitoring.RawKpiList.Builder.class);
+    }
+
+    public static final int KPI_ID_FIELD_NUMBER = 1;
+    private monitoring.Monitoring.KpiId kpiId_;
+    /**
+     * <code>.monitoring.KpiId kpi_id = 1;</code>
+     * @return Whether the kpiId field is set.
+     */
+    @java.lang.Override
+    public boolean hasKpiId() {
+      return kpiId_ != null;
+    }
+    /**
+     * <code>.monitoring.KpiId kpi_id = 1;</code>
+     * @return The kpiId.
+     */
+    @java.lang.Override
+    public monitoring.Monitoring.KpiId getKpiId() {
+      return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_;
+    }
+    /**
+     * <code>.monitoring.KpiId kpi_id = 1;</code>
+     */
+    @java.lang.Override
+    public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() {
+      return getKpiId();
+    }
+
+    public static final int RAW_KPIS_FIELD_NUMBER = 2;
+    private java.util.List<monitoring.Monitoring.RawKpi> rawKpis_;
+    /**
+     * <code>repeated .monitoring.RawKpi raw_kpis = 2;</code>
+     */
+    @java.lang.Override
+    public java.util.List<monitoring.Monitoring.RawKpi> getRawKpisList() {
+      return rawKpis_;
+    }
+    /**
+     * <code>repeated .monitoring.RawKpi raw_kpis = 2;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends monitoring.Monitoring.RawKpiOrBuilder> 
+        getRawKpisOrBuilderList() {
+      return rawKpis_;
+    }
+    /**
+     * <code>repeated .monitoring.RawKpi raw_kpis = 2;</code>
+     */
+    @java.lang.Override
+    public int getRawKpisCount() {
+      return rawKpis_.size();
+    }
+    /**
+     * <code>repeated .monitoring.RawKpi raw_kpis = 2;</code>
+     */
+    @java.lang.Override
+    public monitoring.Monitoring.RawKpi getRawKpis(int index) {
+      return rawKpis_.get(index);
+    }
+    /**
+     * <code>repeated .monitoring.RawKpi raw_kpis = 2;</code>
+     */
+    @java.lang.Override
+    public monitoring.Monitoring.RawKpiOrBuilder getRawKpisOrBuilder(
+        int index) {
+      return rawKpis_.get(index);
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (kpiId_ != null) {
+        output.writeMessage(1, getKpiId());
+      }
+      for (int i = 0; i < rawKpis_.size(); i++) {
+        output.writeMessage(2, rawKpis_.get(i));
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (kpiId_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(1, getKpiId());
+      }
+      for (int i = 0; i < rawKpis_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(2, rawKpis_.get(i));
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof monitoring.Monitoring.RawKpiList)) {
+        return super.equals(obj);
+      }
+      monitoring.Monitoring.RawKpiList other = (monitoring.Monitoring.RawKpiList) obj;
+
+      if (hasKpiId() != other.hasKpiId()) return false;
+      if (hasKpiId()) {
+        if (!getKpiId()
+            .equals(other.getKpiId())) return false;
+      }
+      if (!getRawKpisList()
+          .equals(other.getRawKpisList())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasKpiId()) {
+        hash = (37 * hash) + KPI_ID_FIELD_NUMBER;
+        hash = (53 * hash) + getKpiId().hashCode();
+      }
+      if (getRawKpisCount() > 0) {
+        hash = (37 * hash) + RAW_KPIS_FIELD_NUMBER;
+        hash = (53 * hash) + getRawKpisList().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static monitoring.Monitoring.RawKpiList parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static monitoring.Monitoring.RawKpiList parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static monitoring.Monitoring.RawKpiList parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static monitoring.Monitoring.RawKpiList parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static monitoring.Monitoring.RawKpiList parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static monitoring.Monitoring.RawKpiList parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static monitoring.Monitoring.RawKpiList parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static monitoring.Monitoring.RawKpiList parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static monitoring.Monitoring.RawKpiList parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static monitoring.Monitoring.RawKpiList parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static monitoring.Monitoring.RawKpiList parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static monitoring.Monitoring.RawKpiList parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(monitoring.Monitoring.RawKpiList prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * <pre>
+     * column
+     * </pre>
+     *
+     * Protobuf type {@code monitoring.RawKpiList}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:monitoring.RawKpiList)
+        monitoring.Monitoring.RawKpiListOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return monitoring.Monitoring.internal_static_monitoring_RawKpiList_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return monitoring.Monitoring.internal_static_monitoring_RawKpiList_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                monitoring.Monitoring.RawKpiList.class, monitoring.Monitoring.RawKpiList.Builder.class);
+      }
+
+      // Construct using monitoring.Monitoring.RawKpiList.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+          getRawKpisFieldBuilder();
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        if (kpiIdBuilder_ == null) {
+          kpiId_ = null;
+        } else {
+          kpiId_ = null;
+          kpiIdBuilder_ = null;
+        }
+        if (rawKpisBuilder_ == null) {
+          rawKpis_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        } else {
+          rawKpisBuilder_.clear();
+        }
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return monitoring.Monitoring.internal_static_monitoring_RawKpiList_descriptor;
+      }
+
+      @java.lang.Override
+      public monitoring.Monitoring.RawKpiList getDefaultInstanceForType() {
+        return monitoring.Monitoring.RawKpiList.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public monitoring.Monitoring.RawKpiList build() {
+        monitoring.Monitoring.RawKpiList result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public monitoring.Monitoring.RawKpiList buildPartial() {
+        monitoring.Monitoring.RawKpiList result = new monitoring.Monitoring.RawKpiList(this);
+        int from_bitField0_ = bitField0_;
+        if (kpiIdBuilder_ == null) {
+          result.kpiId_ = kpiId_;
+        } else {
+          result.kpiId_ = kpiIdBuilder_.build();
+        }
+        if (rawKpisBuilder_ == null) {
+          if (((bitField0_ & 0x00000001) != 0)) {
+            rawKpis_ = java.util.Collections.unmodifiableList(rawKpis_);
+            bitField0_ = (bitField0_ & ~0x00000001);
+          }
+          result.rawKpis_ = rawKpis_;
+        } else {
+          result.rawKpis_ = rawKpisBuilder_.build();
+        }
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof monitoring.Monitoring.RawKpiList) {
+          return mergeFrom((monitoring.Monitoring.RawKpiList)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(monitoring.Monitoring.RawKpiList other) {
+        if (other == monitoring.Monitoring.RawKpiList.getDefaultInstance()) return this;
+        if (other.hasKpiId()) {
+          mergeKpiId(other.getKpiId());
+        }
+        if (rawKpisBuilder_ == null) {
+          if (!other.rawKpis_.isEmpty()) {
+            if (rawKpis_.isEmpty()) {
+              rawKpis_ = other.rawKpis_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+            } else {
+              ensureRawKpisIsMutable();
+              rawKpis_.addAll(other.rawKpis_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.rawKpis_.isEmpty()) {
+            if (rawKpisBuilder_.isEmpty()) {
+              rawKpisBuilder_.dispose();
+              rawKpisBuilder_ = null;
+              rawKpis_ = other.rawKpis_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+              rawKpisBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getRawKpisFieldBuilder() : null;
+            } else {
+              rawKpisBuilder_.addAllMessages(other.rawKpis_);
+            }
+          }
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        monitoring.Monitoring.RawKpiList parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (monitoring.Monitoring.RawKpiList) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      private monitoring.Monitoring.KpiId kpiId_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> kpiIdBuilder_;
+      /**
+       * <code>.monitoring.KpiId kpi_id = 1;</code>
+       * @return Whether the kpiId field is set.
+       */
+      public boolean hasKpiId() {
+        return kpiIdBuilder_ != null || kpiId_ != null;
+      }
+      /**
+       * <code>.monitoring.KpiId kpi_id = 1;</code>
+       * @return The kpiId.
+       */
+      public monitoring.Monitoring.KpiId getKpiId() {
+        if (kpiIdBuilder_ == null) {
+          return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_;
+        } else {
+          return kpiIdBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.monitoring.KpiId kpi_id = 1;</code>
+       */
+      public Builder setKpiId(monitoring.Monitoring.KpiId value) {
+        if (kpiIdBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          kpiId_ = value;
+          onChanged();
+        } else {
+          kpiIdBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.monitoring.KpiId kpi_id = 1;</code>
+       */
+      public Builder setKpiId(
+          monitoring.Monitoring.KpiId.Builder builderForValue) {
+        if (kpiIdBuilder_ == null) {
+          kpiId_ = builderForValue.build();
+          onChanged();
+        } else {
+          kpiIdBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.monitoring.KpiId kpi_id = 1;</code>
+       */
+      public Builder mergeKpiId(monitoring.Monitoring.KpiId value) {
+        if (kpiIdBuilder_ == null) {
+          if (kpiId_ != null) {
+            kpiId_ =
+              monitoring.Monitoring.KpiId.newBuilder(kpiId_).mergeFrom(value).buildPartial();
+          } else {
+            kpiId_ = value;
+          }
+          onChanged();
+        } else {
+          kpiIdBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.monitoring.KpiId kpi_id = 1;</code>
+       */
+      public Builder clearKpiId() {
+        if (kpiIdBuilder_ == null) {
+          kpiId_ = null;
+          onChanged();
+        } else {
+          kpiId_ = null;
+          kpiIdBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.monitoring.KpiId kpi_id = 1;</code>
+       */
+      public monitoring.Monitoring.KpiId.Builder getKpiIdBuilder() {
+        
+        onChanged();
+        return getKpiIdFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.monitoring.KpiId kpi_id = 1;</code>
+       */
+      public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() {
+        if (kpiIdBuilder_ != null) {
+          return kpiIdBuilder_.getMessageOrBuilder();
+        } else {
+          return kpiId_ == null ?
+              monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_;
+        }
+      }
+      /**
+       * <code>.monitoring.KpiId kpi_id = 1;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> 
+          getKpiIdFieldBuilder() {
+        if (kpiIdBuilder_ == null) {
+          kpiIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder>(
+                  getKpiId(),
+                  getParentForChildren(),
+                  isClean());
+          kpiId_ = null;
+        }
+        return kpiIdBuilder_;
+      }
+
+      private java.util.List<monitoring.Monitoring.RawKpi> rawKpis_ =
+        java.util.Collections.emptyList();
+      private void ensureRawKpisIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          rawKpis_ = new java.util.ArrayList<monitoring.Monitoring.RawKpi>(rawKpis_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          monitoring.Monitoring.RawKpi, monitoring.Monitoring.RawKpi.Builder, monitoring.Monitoring.RawKpiOrBuilder> rawKpisBuilder_;
+
+      /**
+       * <code>repeated .monitoring.RawKpi raw_kpis = 2;</code>
+       */
+      public java.util.List<monitoring.Monitoring.RawKpi> getRawKpisList() {
+        if (rawKpisBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(rawKpis_);
+        } else {
+          return rawKpisBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .monitoring.RawKpi raw_kpis = 2;</code>
+       */
+      public int getRawKpisCount() {
+        if (rawKpisBuilder_ == null) {
+          return rawKpis_.size();
+        } else {
+          return rawKpisBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .monitoring.RawKpi raw_kpis = 2;</code>
+       */
+      public monitoring.Monitoring.RawKpi getRawKpis(int index) {
+        if (rawKpisBuilder_ == null) {
+          return rawKpis_.get(index);
+        } else {
+          return rawKpisBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .monitoring.RawKpi raw_kpis = 2;</code>
+       */
+      public Builder setRawKpis(
+          int index, monitoring.Monitoring.RawKpi value) {
+        if (rawKpisBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureRawKpisIsMutable();
+          rawKpis_.set(index, value);
+          onChanged();
+        } else {
+          rawKpisBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .monitoring.RawKpi raw_kpis = 2;</code>
+       */
+      public Builder setRawKpis(
+          int index, monitoring.Monitoring.RawKpi.Builder builderForValue) {
+        if (rawKpisBuilder_ == null) {
+          ensureRawKpisIsMutable();
+          rawKpis_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          rawKpisBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .monitoring.RawKpi raw_kpis = 2;</code>
+       */
+      public Builder addRawKpis(monitoring.Monitoring.RawKpi value) {
+        if (rawKpisBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureRawKpisIsMutable();
+          rawKpis_.add(value);
+          onChanged();
+        } else {
+          rawKpisBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .monitoring.RawKpi raw_kpis = 2;</code>
+       */
+      public Builder addRawKpis(
+          int index, monitoring.Monitoring.RawKpi value) {
+        if (rawKpisBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureRawKpisIsMutable();
+          rawKpis_.add(index, value);
+          onChanged();
+        } else {
+          rawKpisBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .monitoring.RawKpi raw_kpis = 2;</code>
+       */
+      public Builder addRawKpis(
+          monitoring.Monitoring.RawKpi.Builder builderForValue) {
+        if (rawKpisBuilder_ == null) {
+          ensureRawKpisIsMutable();
+          rawKpis_.add(builderForValue.build());
+          onChanged();
+        } else {
+          rawKpisBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .monitoring.RawKpi raw_kpis = 2;</code>
+       */
+      public Builder addRawKpis(
+          int index, monitoring.Monitoring.RawKpi.Builder builderForValue) {
+        if (rawKpisBuilder_ == null) {
+          ensureRawKpisIsMutable();
+          rawKpis_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          rawKpisBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .monitoring.RawKpi raw_kpis = 2;</code>
+       */
+      public Builder addAllRawKpis(
+          java.lang.Iterable<? extends monitoring.Monitoring.RawKpi> values) {
+        if (rawKpisBuilder_ == null) {
+          ensureRawKpisIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, rawKpis_);
+          onChanged();
+        } else {
+          rawKpisBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .monitoring.RawKpi raw_kpis = 2;</code>
+       */
+      public Builder clearRawKpis() {
+        if (rawKpisBuilder_ == null) {
+          rawKpis_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+          onChanged();
+        } else {
+          rawKpisBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .monitoring.RawKpi raw_kpis = 2;</code>
+       */
+      public Builder removeRawKpis(int index) {
+        if (rawKpisBuilder_ == null) {
+          ensureRawKpisIsMutable();
+          rawKpis_.remove(index);
+          onChanged();
+        } else {
+          rawKpisBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .monitoring.RawKpi raw_kpis = 2;</code>
+       */
+      public monitoring.Monitoring.RawKpi.Builder getRawKpisBuilder(
+          int index) {
+        return getRawKpisFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .monitoring.RawKpi raw_kpis = 2;</code>
+       */
+      public monitoring.Monitoring.RawKpiOrBuilder getRawKpisOrBuilder(
+          int index) {
+        if (rawKpisBuilder_ == null) {
+          return rawKpis_.get(index);  } else {
+          return rawKpisBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .monitoring.RawKpi raw_kpis = 2;</code>
+       */
+      public java.util.List<? extends monitoring.Monitoring.RawKpiOrBuilder> 
+           getRawKpisOrBuilderList() {
+        if (rawKpisBuilder_ != null) {
+          return rawKpisBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(rawKpis_);
+        }
+      }
+      /**
+       * <code>repeated .monitoring.RawKpi raw_kpis = 2;</code>
+       */
+      public monitoring.Monitoring.RawKpi.Builder addRawKpisBuilder() {
+        return getRawKpisFieldBuilder().addBuilder(
+            monitoring.Monitoring.RawKpi.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .monitoring.RawKpi raw_kpis = 2;</code>
+       */
+      public monitoring.Monitoring.RawKpi.Builder addRawKpisBuilder(
+          int index) {
+        return getRawKpisFieldBuilder().addBuilder(
+            index, monitoring.Monitoring.RawKpi.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .monitoring.RawKpi raw_kpis = 2;</code>
+       */
+      public java.util.List<monitoring.Monitoring.RawKpi.Builder> 
+           getRawKpisBuilderList() {
+        return getRawKpisFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          monitoring.Monitoring.RawKpi, monitoring.Monitoring.RawKpi.Builder, monitoring.Monitoring.RawKpiOrBuilder> 
+          getRawKpisFieldBuilder() {
+        if (rawKpisBuilder_ == null) {
+          rawKpisBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              monitoring.Monitoring.RawKpi, monitoring.Monitoring.RawKpi.Builder, monitoring.Monitoring.RawKpiOrBuilder>(
+                  rawKpis_,
+                  ((bitField0_ & 0x00000001) != 0),
+                  getParentForChildren(),
+                  isClean());
+          rawKpis_ = null;
+        }
+        return rawKpisBuilder_;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:monitoring.RawKpiList)
+    }
+
+    // @@protoc_insertion_point(class_scope:monitoring.RawKpiList)
+    private static final monitoring.Monitoring.RawKpiList DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new monitoring.Monitoring.RawKpiList();
+    }
+
+    public static monitoring.Monitoring.RawKpiList getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<RawKpiList>
+        PARSER = new com.google.protobuf.AbstractParser<RawKpiList>() {
+      @java.lang.Override
+      public RawKpiList parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new RawKpiList(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<RawKpiList> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<RawKpiList> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public monitoring.Monitoring.RawKpiList getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  public interface RawKpiTableOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:monitoring.RawKpiTable)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>repeated .monitoring.RawKpiList raw_kpi_lists = 1;</code>
+     */
+    java.util.List<monitoring.Monitoring.RawKpiList> 
+        getRawKpiListsList();
+    /**
+     * <code>repeated .monitoring.RawKpiList raw_kpi_lists = 1;</code>
+     */
+    monitoring.Monitoring.RawKpiList getRawKpiLists(int index);
+    /**
+     * <code>repeated .monitoring.RawKpiList raw_kpi_lists = 1;</code>
+     */
+    int getRawKpiListsCount();
+    /**
+     * <code>repeated .monitoring.RawKpiList raw_kpi_lists = 1;</code>
+     */
+    java.util.List<? extends monitoring.Monitoring.RawKpiListOrBuilder> 
+        getRawKpiListsOrBuilderList();
+    /**
+     * <code>repeated .monitoring.RawKpiList raw_kpi_lists = 1;</code>
+     */
+    monitoring.Monitoring.RawKpiListOrBuilder getRawKpiListsOrBuilder(
+        int index);
+  }
+  /**
+   * <pre>
+   * table
+   * </pre>
+   *
+   * Protobuf type {@code monitoring.RawKpiTable}
+   */
+  public static final class RawKpiTable extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:monitoring.RawKpiTable)
+      RawKpiTableOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use RawKpiTable.newBuilder() to construct.
+    private RawKpiTable(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private RawKpiTable() {
+      rawKpiLists_ = java.util.Collections.emptyList();
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new RawKpiTable();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private RawKpiTable(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                rawKpiLists_ = new java.util.ArrayList<monitoring.Monitoring.RawKpiList>();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              rawKpiLists_.add(
+                  input.readMessage(monitoring.Monitoring.RawKpiList.parser(), extensionRegistry));
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          rawKpiLists_ = java.util.Collections.unmodifiableList(rawKpiLists_);
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return monitoring.Monitoring.internal_static_monitoring_RawKpiTable_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return monitoring.Monitoring.internal_static_monitoring_RawKpiTable_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              monitoring.Monitoring.RawKpiTable.class, monitoring.Monitoring.RawKpiTable.Builder.class);
+    }
+
+    public static final int RAW_KPI_LISTS_FIELD_NUMBER = 1;
+    private java.util.List<monitoring.Monitoring.RawKpiList> rawKpiLists_;
+    /**
+     * <code>repeated .monitoring.RawKpiList raw_kpi_lists = 1;</code>
+     */
+    @java.lang.Override
+    public java.util.List<monitoring.Monitoring.RawKpiList> getRawKpiListsList() {
+      return rawKpiLists_;
+    }
+    /**
+     * <code>repeated .monitoring.RawKpiList raw_kpi_lists = 1;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends monitoring.Monitoring.RawKpiListOrBuilder> 
+        getRawKpiListsOrBuilderList() {
+      return rawKpiLists_;
+    }
+    /**
+     * <code>repeated .monitoring.RawKpiList raw_kpi_lists = 1;</code>
+     */
+    @java.lang.Override
+    public int getRawKpiListsCount() {
+      return rawKpiLists_.size();
+    }
+    /**
+     * <code>repeated .monitoring.RawKpiList raw_kpi_lists = 1;</code>
+     */
+    @java.lang.Override
+    public monitoring.Monitoring.RawKpiList getRawKpiLists(int index) {
+      return rawKpiLists_.get(index);
+    }
+    /**
+     * <code>repeated .monitoring.RawKpiList raw_kpi_lists = 1;</code>
+     */
+    @java.lang.Override
+    public monitoring.Monitoring.RawKpiListOrBuilder getRawKpiListsOrBuilder(
+        int index) {
+      return rawKpiLists_.get(index);
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      for (int i = 0; i < rawKpiLists_.size(); i++) {
+        output.writeMessage(1, rawKpiLists_.get(i));
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      for (int i = 0; i < rawKpiLists_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(1, rawKpiLists_.get(i));
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof monitoring.Monitoring.RawKpiTable)) {
+        return super.equals(obj);
+      }
+      monitoring.Monitoring.RawKpiTable other = (monitoring.Monitoring.RawKpiTable) obj;
+
+      if (!getRawKpiListsList()
+          .equals(other.getRawKpiListsList())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (getRawKpiListsCount() > 0) {
+        hash = (37 * hash) + RAW_KPI_LISTS_FIELD_NUMBER;
+        hash = (53 * hash) + getRawKpiListsList().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static monitoring.Monitoring.RawKpiTable parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static monitoring.Monitoring.RawKpiTable parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static monitoring.Monitoring.RawKpiTable parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static monitoring.Monitoring.RawKpiTable parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static monitoring.Monitoring.RawKpiTable parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static monitoring.Monitoring.RawKpiTable parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static monitoring.Monitoring.RawKpiTable parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static monitoring.Monitoring.RawKpiTable parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static monitoring.Monitoring.RawKpiTable parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static monitoring.Monitoring.RawKpiTable parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static monitoring.Monitoring.RawKpiTable parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static monitoring.Monitoring.RawKpiTable parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(monitoring.Monitoring.RawKpiTable prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * <pre>
+     * table
+     * </pre>
+     *
+     * Protobuf type {@code monitoring.RawKpiTable}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:monitoring.RawKpiTable)
+        monitoring.Monitoring.RawKpiTableOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return monitoring.Monitoring.internal_static_monitoring_RawKpiTable_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return monitoring.Monitoring.internal_static_monitoring_RawKpiTable_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                monitoring.Monitoring.RawKpiTable.class, monitoring.Monitoring.RawKpiTable.Builder.class);
+      }
+
+      // Construct using monitoring.Monitoring.RawKpiTable.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+          getRawKpiListsFieldBuilder();
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        if (rawKpiListsBuilder_ == null) {
+          rawKpiLists_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        } else {
+          rawKpiListsBuilder_.clear();
+        }
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return monitoring.Monitoring.internal_static_monitoring_RawKpiTable_descriptor;
+      }
+
+      @java.lang.Override
+      public monitoring.Monitoring.RawKpiTable getDefaultInstanceForType() {
+        return monitoring.Monitoring.RawKpiTable.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public monitoring.Monitoring.RawKpiTable build() {
+        monitoring.Monitoring.RawKpiTable result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public monitoring.Monitoring.RawKpiTable buildPartial() {
+        monitoring.Monitoring.RawKpiTable result = new monitoring.Monitoring.RawKpiTable(this);
+        int from_bitField0_ = bitField0_;
+        if (rawKpiListsBuilder_ == null) {
+          if (((bitField0_ & 0x00000001) != 0)) {
+            rawKpiLists_ = java.util.Collections.unmodifiableList(rawKpiLists_);
+            bitField0_ = (bitField0_ & ~0x00000001);
+          }
+          result.rawKpiLists_ = rawKpiLists_;
+        } else {
+          result.rawKpiLists_ = rawKpiListsBuilder_.build();
+        }
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof monitoring.Monitoring.RawKpiTable) {
+          return mergeFrom((monitoring.Monitoring.RawKpiTable)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(monitoring.Monitoring.RawKpiTable other) {
+        if (other == monitoring.Monitoring.RawKpiTable.getDefaultInstance()) return this;
+        if (rawKpiListsBuilder_ == null) {
+          if (!other.rawKpiLists_.isEmpty()) {
+            if (rawKpiLists_.isEmpty()) {
+              rawKpiLists_ = other.rawKpiLists_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+            } else {
+              ensureRawKpiListsIsMutable();
+              rawKpiLists_.addAll(other.rawKpiLists_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.rawKpiLists_.isEmpty()) {
+            if (rawKpiListsBuilder_.isEmpty()) {
+              rawKpiListsBuilder_.dispose();
+              rawKpiListsBuilder_ = null;
+              rawKpiLists_ = other.rawKpiLists_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+              rawKpiListsBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getRawKpiListsFieldBuilder() : null;
+            } else {
+              rawKpiListsBuilder_.addAllMessages(other.rawKpiLists_);
+            }
+          }
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        monitoring.Monitoring.RawKpiTable parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (monitoring.Monitoring.RawKpiTable) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      private java.util.List<monitoring.Monitoring.RawKpiList> rawKpiLists_ =
+        java.util.Collections.emptyList();
+      private void ensureRawKpiListsIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          rawKpiLists_ = new java.util.ArrayList<monitoring.Monitoring.RawKpiList>(rawKpiLists_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          monitoring.Monitoring.RawKpiList, monitoring.Monitoring.RawKpiList.Builder, monitoring.Monitoring.RawKpiListOrBuilder> rawKpiListsBuilder_;
+
+      /**
+       * <code>repeated .monitoring.RawKpiList raw_kpi_lists = 1;</code>
        */
-      public Builder clearStartTimestamp() {
-        if (startTimestampBuilder_ == null) {
-          startTimestamp_ = null;
-          onChanged();
+      public java.util.List<monitoring.Monitoring.RawKpiList> getRawKpiListsList() {
+        if (rawKpiListsBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(rawKpiLists_);
         } else {
-          startTimestamp_ = null;
-          startTimestampBuilder_ = null;
+          return rawKpiListsBuilder_.getMessageList();
         }
-
-        return this;
       }
       /**
-       * <pre>
-       * used when you want something like "get the samples since X date/time"
-       * </pre>
-       *
-       * <code>.context.Timestamp start_timestamp = 5;</code>
+       * <code>repeated .monitoring.RawKpiList raw_kpi_lists = 1;</code>
        */
-      public context.ContextOuterClass.Timestamp.Builder getStartTimestampBuilder() {
-        
-        onChanged();
-        return getStartTimestampFieldBuilder().getBuilder();
+      public int getRawKpiListsCount() {
+        if (rawKpiListsBuilder_ == null) {
+          return rawKpiLists_.size();
+        } else {
+          return rawKpiListsBuilder_.getCount();
+        }
       }
       /**
-       * <pre>
-       * used when you want something like "get the samples since X date/time"
-       * </pre>
-       *
-       * <code>.context.Timestamp start_timestamp = 5;</code>
+       * <code>repeated .monitoring.RawKpiList raw_kpi_lists = 1;</code>
        */
-      public context.ContextOuterClass.TimestampOrBuilder getStartTimestampOrBuilder() {
-        if (startTimestampBuilder_ != null) {
-          return startTimestampBuilder_.getMessageOrBuilder();
+      public monitoring.Monitoring.RawKpiList getRawKpiLists(int index) {
+        if (rawKpiListsBuilder_ == null) {
+          return rawKpiLists_.get(index);
         } else {
-          return startTimestamp_ == null ?
-              context.ContextOuterClass.Timestamp.getDefaultInstance() : startTimestamp_;
+          return rawKpiListsBuilder_.getMessage(index);
         }
       }
       /**
-       * <pre>
-       * used when you want something like "get the samples since X date/time"
-       * </pre>
-       *
-       * <code>.context.Timestamp start_timestamp = 5;</code>
+       * <code>repeated .monitoring.RawKpiList raw_kpi_lists = 1;</code>
        */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> 
-          getStartTimestampFieldBuilder() {
-        if (startTimestampBuilder_ == null) {
-          startTimestampBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder>(
-                  getStartTimestamp(),
-                  getParentForChildren(),
-                  isClean());
-          startTimestamp_ = null;
+      public Builder setRawKpiLists(
+          int index, monitoring.Monitoring.RawKpiList value) {
+        if (rawKpiListsBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureRawKpiListsIsMutable();
+          rawKpiLists_.set(index, value);
+          onChanged();
+        } else {
+          rawKpiListsBuilder_.setMessage(index, value);
         }
-        return startTimestampBuilder_;
+        return this;
       }
-
-      private context.ContextOuterClass.Timestamp endTimestamp_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> endTimestampBuilder_;
       /**
-       * <pre>
-       * used when you want something like "get the samples until X date/time"
-       * </pre>
-       *
-       * <code>.context.Timestamp end_timestamp = 6;</code>
-       * @return Whether the endTimestamp field is set.
+       * <code>repeated .monitoring.RawKpiList raw_kpi_lists = 1;</code>
        */
-      public boolean hasEndTimestamp() {
-        return endTimestampBuilder_ != null || endTimestamp_ != null;
+      public Builder setRawKpiLists(
+          int index, monitoring.Monitoring.RawKpiList.Builder builderForValue) {
+        if (rawKpiListsBuilder_ == null) {
+          ensureRawKpiListsIsMutable();
+          rawKpiLists_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          rawKpiListsBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
       }
       /**
-       * <pre>
-       * used when you want something like "get the samples until X date/time"
-       * </pre>
-       *
-       * <code>.context.Timestamp end_timestamp = 6;</code>
-       * @return The endTimestamp.
+       * <code>repeated .monitoring.RawKpiList raw_kpi_lists = 1;</code>
        */
-      public context.ContextOuterClass.Timestamp getEndTimestamp() {
-        if (endTimestampBuilder_ == null) {
-          return endTimestamp_ == null ? context.ContextOuterClass.Timestamp.getDefaultInstance() : endTimestamp_;
+      public Builder addRawKpiLists(monitoring.Monitoring.RawKpiList value) {
+        if (rawKpiListsBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureRawKpiListsIsMutable();
+          rawKpiLists_.add(value);
+          onChanged();
         } else {
-          return endTimestampBuilder_.getMessage();
+          rawKpiListsBuilder_.addMessage(value);
         }
+        return this;
       }
       /**
-       * <pre>
-       * used when you want something like "get the samples until X date/time"
-       * </pre>
-       *
-       * <code>.context.Timestamp end_timestamp = 6;</code>
+       * <code>repeated .monitoring.RawKpiList raw_kpi_lists = 1;</code>
        */
-      public Builder setEndTimestamp(context.ContextOuterClass.Timestamp value) {
-        if (endTimestampBuilder_ == null) {
+      public Builder addRawKpiLists(
+          int index, monitoring.Monitoring.RawKpiList value) {
+        if (rawKpiListsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          endTimestamp_ = value;
+          ensureRawKpiListsIsMutable();
+          rawKpiLists_.add(index, value);
           onChanged();
         } else {
-          endTimestampBuilder_.setMessage(value);
+          rawKpiListsBuilder_.addMessage(index, value);
         }
-
         return this;
       }
       /**
-       * <pre>
-       * used when you want something like "get the samples until X date/time"
-       * </pre>
-       *
-       * <code>.context.Timestamp end_timestamp = 6;</code>
+       * <code>repeated .monitoring.RawKpiList raw_kpi_lists = 1;</code>
        */
-      public Builder setEndTimestamp(
-          context.ContextOuterClass.Timestamp.Builder builderForValue) {
-        if (endTimestampBuilder_ == null) {
-          endTimestamp_ = builderForValue.build();
+      public Builder addRawKpiLists(
+          monitoring.Monitoring.RawKpiList.Builder builderForValue) {
+        if (rawKpiListsBuilder_ == null) {
+          ensureRawKpiListsIsMutable();
+          rawKpiLists_.add(builderForValue.build());
           onChanged();
         } else {
-          endTimestampBuilder_.setMessage(builderForValue.build());
+          rawKpiListsBuilder_.addMessage(builderForValue.build());
         }
-
         return this;
       }
       /**
-       * <pre>
-       * used when you want something like "get the samples until X date/time"
-       * </pre>
-       *
-       * <code>.context.Timestamp end_timestamp = 6;</code>
+       * <code>repeated .monitoring.RawKpiList raw_kpi_lists = 1;</code>
        */
-      public Builder mergeEndTimestamp(context.ContextOuterClass.Timestamp value) {
-        if (endTimestampBuilder_ == null) {
-          if (endTimestamp_ != null) {
-            endTimestamp_ =
-              context.ContextOuterClass.Timestamp.newBuilder(endTimestamp_).mergeFrom(value).buildPartial();
-          } else {
-            endTimestamp_ = value;
-          }
+      public Builder addRawKpiLists(
+          int index, monitoring.Monitoring.RawKpiList.Builder builderForValue) {
+        if (rawKpiListsBuilder_ == null) {
+          ensureRawKpiListsIsMutable();
+          rawKpiLists_.add(index, builderForValue.build());
           onChanged();
         } else {
-          endTimestampBuilder_.mergeFrom(value);
+          rawKpiListsBuilder_.addMessage(index, builderForValue.build());
         }
-
         return this;
       }
       /**
-       * <pre>
-       * used when you want something like "get the samples until X date/time"
-       * </pre>
-       *
-       * <code>.context.Timestamp end_timestamp = 6;</code>
+       * <code>repeated .monitoring.RawKpiList raw_kpi_lists = 1;</code>
        */
-      public Builder clearEndTimestamp() {
-        if (endTimestampBuilder_ == null) {
-          endTimestamp_ = null;
+      public Builder addAllRawKpiLists(
+          java.lang.Iterable<? extends monitoring.Monitoring.RawKpiList> values) {
+        if (rawKpiListsBuilder_ == null) {
+          ensureRawKpiListsIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, rawKpiLists_);
           onChanged();
         } else {
-          endTimestamp_ = null;
-          endTimestampBuilder_ = null;
+          rawKpiListsBuilder_.addAllMessages(values);
         }
-
         return this;
       }
       /**
-       * <pre>
-       * used when you want something like "get the samples until X date/time"
-       * </pre>
-       *
-       * <code>.context.Timestamp end_timestamp = 6;</code>
+       * <code>repeated .monitoring.RawKpiList raw_kpi_lists = 1;</code>
        */
-      public context.ContextOuterClass.Timestamp.Builder getEndTimestampBuilder() {
-        
-        onChanged();
-        return getEndTimestampFieldBuilder().getBuilder();
+      public Builder clearRawKpiLists() {
+        if (rawKpiListsBuilder_ == null) {
+          rawKpiLists_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+          onChanged();
+        } else {
+          rawKpiListsBuilder_.clear();
+        }
+        return this;
       }
       /**
-       * <pre>
-       * used when you want something like "get the samples until X date/time"
-       * </pre>
-       *
-       * <code>.context.Timestamp end_timestamp = 6;</code>
+       * <code>repeated .monitoring.RawKpiList raw_kpi_lists = 1;</code>
        */
-      public context.ContextOuterClass.TimestampOrBuilder getEndTimestampOrBuilder() {
-        if (endTimestampBuilder_ != null) {
-          return endTimestampBuilder_.getMessageOrBuilder();
+      public Builder removeRawKpiLists(int index) {
+        if (rawKpiListsBuilder_ == null) {
+          ensureRawKpiListsIsMutable();
+          rawKpiLists_.remove(index);
+          onChanged();
         } else {
-          return endTimestamp_ == null ?
-              context.ContextOuterClass.Timestamp.getDefaultInstance() : endTimestamp_;
+          rawKpiListsBuilder_.remove(index);
         }
+        return this;
       }
       /**
-       * <pre>
-       * used when you want something like "get the samples until X date/time"
-       * </pre>
-       *
-       * <code>.context.Timestamp end_timestamp = 6;</code>
+       * <code>repeated .monitoring.RawKpiList raw_kpi_lists = 1;</code>
        */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> 
-          getEndTimestampFieldBuilder() {
-        if (endTimestampBuilder_ == null) {
-          endTimestampBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder>(
-                  getEndTimestamp(),
+      public monitoring.Monitoring.RawKpiList.Builder getRawKpiListsBuilder(
+          int index) {
+        return getRawKpiListsFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .monitoring.RawKpiList raw_kpi_lists = 1;</code>
+       */
+      public monitoring.Monitoring.RawKpiListOrBuilder getRawKpiListsOrBuilder(
+          int index) {
+        if (rawKpiListsBuilder_ == null) {
+          return rawKpiLists_.get(index);  } else {
+          return rawKpiListsBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .monitoring.RawKpiList raw_kpi_lists = 1;</code>
+       */
+      public java.util.List<? extends monitoring.Monitoring.RawKpiListOrBuilder> 
+           getRawKpiListsOrBuilderList() {
+        if (rawKpiListsBuilder_ != null) {
+          return rawKpiListsBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(rawKpiLists_);
+        }
+      }
+      /**
+       * <code>repeated .monitoring.RawKpiList raw_kpi_lists = 1;</code>
+       */
+      public monitoring.Monitoring.RawKpiList.Builder addRawKpiListsBuilder() {
+        return getRawKpiListsFieldBuilder().addBuilder(
+            monitoring.Monitoring.RawKpiList.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .monitoring.RawKpiList raw_kpi_lists = 1;</code>
+       */
+      public monitoring.Monitoring.RawKpiList.Builder addRawKpiListsBuilder(
+          int index) {
+        return getRawKpiListsFieldBuilder().addBuilder(
+            index, monitoring.Monitoring.RawKpiList.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .monitoring.RawKpiList raw_kpi_lists = 1;</code>
+       */
+      public java.util.List<monitoring.Monitoring.RawKpiList.Builder> 
+           getRawKpiListsBuilderList() {
+        return getRawKpiListsFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          monitoring.Monitoring.RawKpiList, monitoring.Monitoring.RawKpiList.Builder, monitoring.Monitoring.RawKpiListOrBuilder> 
+          getRawKpiListsFieldBuilder() {
+        if (rawKpiListsBuilder_ == null) {
+          rawKpiListsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              monitoring.Monitoring.RawKpiList, monitoring.Monitoring.RawKpiList.Builder, monitoring.Monitoring.RawKpiListOrBuilder>(
+                  rawKpiLists_,
+                  ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
                   isClean());
-          endTimestamp_ = null;
+          rawKpiLists_ = null;
         }
-        return endTimestampBuilder_;
+        return rawKpiListsBuilder_;
       }
       @java.lang.Override
       public final Builder setUnknownFields(
@@ -4205,41 +7145,41 @@ public final class Monitoring {
       }
 
 
-      // @@protoc_insertion_point(builder_scope:monitoring.KpiQuery)
+      // @@protoc_insertion_point(builder_scope:monitoring.RawKpiTable)
     }
 
-    // @@protoc_insertion_point(class_scope:monitoring.KpiQuery)
-    private static final monitoring.Monitoring.KpiQuery DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:monitoring.RawKpiTable)
+    private static final monitoring.Monitoring.RawKpiTable DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new monitoring.Monitoring.KpiQuery();
+      DEFAULT_INSTANCE = new monitoring.Monitoring.RawKpiTable();
     }
 
-    public static monitoring.Monitoring.KpiQuery getDefaultInstance() {
+    public static monitoring.Monitoring.RawKpiTable getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    private static final com.google.protobuf.Parser<KpiQuery>
-        PARSER = new com.google.protobuf.AbstractParser<KpiQuery>() {
+    private static final com.google.protobuf.Parser<RawKpiTable>
+        PARSER = new com.google.protobuf.AbstractParser<RawKpiTable>() {
       @java.lang.Override
-      public KpiQuery parsePartialFrom(
+      public RawKpiTable parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new KpiQuery(input, extensionRegistry);
+        return new RawKpiTable(input, extensionRegistry);
       }
     };
 
-    public static com.google.protobuf.Parser<KpiQuery> parser() {
+    public static com.google.protobuf.Parser<RawKpiTable> parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public com.google.protobuf.Parser<KpiQuery> getParserForType() {
+    public com.google.protobuf.Parser<RawKpiTable> getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public monitoring.Monitoring.KpiQuery getDefaultInstanceForType() {
+    public monitoring.Monitoring.RawKpiTable getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -18321,6 +21261,21 @@ public final class Monitoring {
   private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_monitoring_KpiQuery_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_monitoring_RawKpi_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_monitoring_RawKpi_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_monitoring_RawKpiList_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_monitoring_RawKpiList_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_monitoring_RawKpiTable_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_monitoring_RawKpiTable_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_monitoring_KpiId_descriptor;
   private static final 
@@ -18406,7 +21361,7 @@ public final class Monitoring {
   static {
     java.lang.String[] descriptorData = {
       "\n\020monitoring.proto\022\nmonitoring\032\rcontext." +
-      "proto\032\026kpi_sample_types.proto\"\311\002\n\rKpiDes" +
+      "proto\032\026kpi_sample_types.proto\"\367\002\n\rKpiDes" +
       "criptor\022!\n\006kpi_id\030\001 \001(\0132\021.monitoring.Kpi" +
       "Id\022\027\n\017kpi_description\030\002 \001(\t\022&\n\013kpi_id_li" +
       "st\030\003 \003(\0132\021.monitoring.KpiId\0228\n\017kpi_sampl" +
@@ -18415,86 +21370,92 @@ public final class Monitoring {
       "eId\022(\n\013endpoint_id\030\006 \001(\0132\023.context.EndPo" +
       "intId\022&\n\nservice_id\030\007 \001(\0132\022.context.Serv" +
       "iceId\022\"\n\010slice_id\030\010 \001(\0132\020.context.SliceI" +
-      "d\"l\n\021MonitorKpiRequest\022!\n\006kpi_id\030\001 \001(\0132\021" +
-      ".monitoring.KpiId\022\033\n\023monitoring_window_s" +
-      "\030\002 \001(\002\022\027\n\017sampling_rate_s\030\003 \001(\002\"\323\001\n\010KpiQ" +
-      "uery\022!\n\006kpi_id\030\001 \001(\0132\021.monitoring.KpiId\022" +
-      "\033\n\023monitoring_window_s\030\002 \001(\002\022\027\n\017sampling" +
-      "_rate_s\030\003 \001(\002\022\026\n\016last_n_samples\030\004 \001(\r\022+\n" +
-      "\017start_timestamp\030\005 \001(\0132\022.context.Timesta" +
-      "mp\022)\n\rend_timestamp\030\006 \001(\0132\022.context.Time" +
-      "stamp\"&\n\005KpiId\022\035\n\006kpi_id\030\001 \001(\0132\r.context" +
-      ".Uuid\"x\n\003Kpi\022!\n\006kpi_id\030\001 \001(\0132\021.monitorin" +
-      "g.KpiId\022%\n\ttimestamp\030\002 \001(\0132\022.context.Tim" +
-      "estamp\022\'\n\tkpi_value\030\003 \001(\0132\024.monitoring.K" +
-      "piValue\"\250\001\n\rKpiValueRange\022)\n\013kpiMinValue" +
-      "\030\001 \001(\0132\024.monitoring.KpiValue\022)\n\013kpiMaxVa" +
-      "lue\030\002 \001(\0132\024.monitoring.KpiValue\022\017\n\007inRan" +
-      "ge\030\003 \001(\010\022\027\n\017includeMinValue\030\004 \001(\010\022\027\n\017inc" +
-      "ludeMaxValue\030\005 \001(\010\"\241\001\n\010KpiValue\022\022\n\010int32" +
-      "Val\030\001 \001(\005H\000\022\023\n\tuint32Val\030\002 \001(\rH\000\022\022\n\010int6" +
-      "4Val\030\003 \001(\003H\000\022\023\n\tuint64Val\030\004 \001(\004H\000\022\022\n\010flo" +
-      "atVal\030\005 \001(\002H\000\022\023\n\tstringVal\030\006 \001(\tH\000\022\021\n\007bo" +
-      "olVal\030\007 \001(\010H\000B\007\n\005value\"\'\n\007KpiList\022\034\n\003kpi" +
-      "\030\001 \003(\0132\017.monitoring.Kpi\"K\n\021KpiDescriptor" +
-      "List\0226\n\023kpi_descriptor_list\030\001 \003(\0132\031.moni" +
-      "toring.KpiDescriptor\"\362\001\n\016SubsDescriptor\022" +
-      "+\n\007subs_id\030\001 \001(\0132\032.monitoring.Subscripti" +
-      "onID\022!\n\006kpi_id\030\002 \001(\0132\021.monitoring.KpiId\022" +
-      "\033\n\023sampling_duration_s\030\003 \001(\002\022\033\n\023sampling" +
-      "_interval_s\030\004 \001(\002\022+\n\017start_timestamp\030\005 \001" +
-      "(\0132\022.context.Timestamp\022)\n\rend_timestamp\030" +
-      "\006 \001(\0132\022.context.Timestamp\"0\n\016Subscriptio" +
-      "nID\022\036\n\007subs_id\030\001 \001(\0132\r.context.Uuid\"b\n\014S" +
-      "ubsResponse\022+\n\007subs_id\030\001 \001(\0132\032.monitorin" +
-      "g.SubscriptionID\022%\n\010kpi_list\030\002 \001(\0132\023.mon" +
-      "itoring.KpiList\"?\n\010SubsList\0223\n\017subs_desc" +
-      "riptor\030\001 \003(\0132\032.monitoring.SubsDescriptor" +
-      "\"\337\001\n\017AlarmDescriptor\022%\n\010alarm_id\030\001 \001(\0132\023" +
-      ".monitoring.AlarmID\022\031\n\021alarm_description" +
-      "\030\002 \001(\t\022\014\n\004name\030\003 \001(\t\022!\n\006kpi_id\030\004 \001(\0132\021.m" +
-      "onitoring.KpiId\0222\n\017kpi_value_range\030\005 \001(\013" +
-      "2\031.monitoring.KpiValueRange\022%\n\ttimestamp" +
-      "\030\006 \001(\0132\022.context.Timestamp\"*\n\007AlarmID\022\037\n" +
-      "\010alarm_id\030\001 \001(\0132\r.context.Uuid\"}\n\021AlarmS" +
-      "ubscription\022%\n\010alarm_id\030\001 \001(\0132\023.monitori" +
-      "ng.AlarmID\022\036\n\026subscription_timeout_s\030\002 \001" +
-      "(\002\022!\n\031subscription_frequency_ms\030\003 \001(\002\"k\n" +
-      "\rAlarmResponse\022%\n\010alarm_id\030\001 \001(\0132\023.monit" +
-      "oring.AlarmID\022\014\n\004text\030\002 \001(\t\022%\n\010kpi_list\030" +
-      "\003 \001(\0132\023.monitoring.KpiList\"B\n\tAlarmList\022" +
-      "5\n\020alarm_descriptor\030\001 \003(\0132\033.monitoring.A" +
-      "larmDescriptor2\230\t\n\021MonitoringService\0228\n\006" +
-      "SetKpi\022\031.monitoring.KpiDescriptor\032\021.moni" +
-      "toring.KpiId\"\000\0220\n\tDeleteKpi\022\021.monitoring" +
-      ".KpiId\032\016.context.Empty\"\000\022B\n\020GetKpiDescri" +
-      "ptor\022\021.monitoring.KpiId\032\031.monitoring.Kpi" +
-      "Descriptor\"\000\022G\n\024GetKpiDescriptorList\022\016.c" +
-      "ontext.Empty\032\035.monitoring.KpiDescriptorL" +
-      "ist\"\000\022/\n\nIncludeKpi\022\017.monitoring.Kpi\032\016.c" +
-      "ontext.Empty\"\000\022=\n\nMonitorKpi\022\035.monitorin" +
-      "g.MonitorKpiRequest\032\016.context.Empty\"\000\022;\n" +
-      "\014QueryKpiData\022\024.monitoring.KpiQuery\032\023.mo" +
-      "nitoring.KpiList\"\000\022N\n\022SetKpiSubscription" +
-      "\022\032.monitoring.SubsDescriptor\032\030.monitorin" +
-      "g.SubsResponse\"\0000\001\022M\n\021GetSubsDescriptor\022" +
-      "\032.monitoring.SubscriptionID\032\032.monitoring" +
-      ".SubsDescriptor\"\000\022:\n\020GetSubscriptions\022\016." +
-      "context.Empty\032\024.monitoring.SubsList\"\000\022B\n" +
-      "\022DeleteSubscription\022\032.monitoring.Subscri" +
-      "ptionID\032\016.context.Empty\"\000\022A\n\013SetKpiAlarm" +
-      "\022\033.monitoring.AlarmDescriptor\032\023.monitori" +
-      "ng.AlarmID\"\000\0224\n\tGetAlarms\022\016.context.Empt" +
-      "y\032\025.monitoring.AlarmList\"\000\022H\n\022GetAlarmDe" +
-      "scriptor\022\023.monitoring.AlarmID\032\033.monitori" +
-      "ng.AlarmDescriptor\"\000\022V\n\026GetAlarmResponse" +
-      "Stream\022\035.monitoring.AlarmSubscription\032\031." +
-      "monitoring.AlarmResponse\"\0000\001\0224\n\013DeleteAl" +
-      "arm\022\023.monitoring.AlarmID\032\016.context.Empty" +
-      "\"\000\0226\n\014GetStreamKpi\022\021.monitoring.KpiId\032\017." +
-      "monitoring.Kpi\"\0000\001\0225\n\rGetInstantKpi\022\021.mo" +
-      "nitoring.KpiId\032\017.monitoring.Kpi\"\000b\006proto" +
-      "3"
+      "d\022,\n\rconnection_id\030\t \001(\0132\025.context.Conne" +
+      "ctionId\"l\n\021MonitorKpiRequest\022!\n\006kpi_id\030\001" +
+      " \001(\0132\021.monitoring.KpiId\022\033\n\023monitoring_wi" +
+      "ndow_s\030\002 \001(\002\022\027\n\017sampling_rate_s\030\003 \001(\002\"\273\001" +
+      "\n\010KpiQuery\022\"\n\007kpi_ids\030\001 \003(\0132\021.monitoring" +
+      ".KpiId\022\033\n\023monitoring_window_s\030\002 \001(\002\022\026\n\016l" +
+      "ast_n_samples\030\003 \001(\r\022+\n\017start_timestamp\030\004" +
+      " \001(\0132\022.context.Timestamp\022)\n\rend_timestam" +
+      "p\030\005 \001(\0132\022.context.Timestamp\"X\n\006RawKpi\022%\n" +
+      "\ttimestamp\030\001 \001(\0132\022.context.Timestamp\022\'\n\t" +
+      "kpi_value\030\002 \001(\0132\024.monitoring.KpiValue\"U\n" +
+      "\nRawKpiList\022!\n\006kpi_id\030\001 \001(\0132\021.monitoring" +
+      ".KpiId\022$\n\010raw_kpis\030\002 \003(\0132\022.monitoring.Ra" +
+      "wKpi\"<\n\013RawKpiTable\022-\n\rraw_kpi_lists\030\001 \003" +
+      "(\0132\026.monitoring.RawKpiList\"&\n\005KpiId\022\035\n\006k" +
+      "pi_id\030\001 \001(\0132\r.context.Uuid\"x\n\003Kpi\022!\n\006kpi" +
+      "_id\030\001 \001(\0132\021.monitoring.KpiId\022%\n\ttimestam" +
+      "p\030\002 \001(\0132\022.context.Timestamp\022\'\n\tkpi_value" +
+      "\030\003 \001(\0132\024.monitoring.KpiValue\"\250\001\n\rKpiValu" +
+      "eRange\022)\n\013kpiMinValue\030\001 \001(\0132\024.monitoring" +
+      ".KpiValue\022)\n\013kpiMaxValue\030\002 \001(\0132\024.monitor" +
+      "ing.KpiValue\022\017\n\007inRange\030\003 \001(\010\022\027\n\017include" +
+      "MinValue\030\004 \001(\010\022\027\n\017includeMaxValue\030\005 \001(\010\"" +
+      "\241\001\n\010KpiValue\022\022\n\010int32Val\030\001 \001(\005H\000\022\023\n\tuint" +
+      "32Val\030\002 \001(\rH\000\022\022\n\010int64Val\030\003 \001(\003H\000\022\023\n\tuin" +
+      "t64Val\030\004 \001(\004H\000\022\022\n\010floatVal\030\005 \001(\002H\000\022\023\n\tst" +
+      "ringVal\030\006 \001(\tH\000\022\021\n\007boolVal\030\007 \001(\010H\000B\007\n\005va" +
+      "lue\"\'\n\007KpiList\022\034\n\003kpi\030\001 \003(\0132\017.monitoring" +
+      ".Kpi\"K\n\021KpiDescriptorList\0226\n\023kpi_descrip" +
+      "tor_list\030\001 \003(\0132\031.monitoring.KpiDescripto" +
+      "r\"\362\001\n\016SubsDescriptor\022+\n\007subs_id\030\001 \001(\0132\032." +
+      "monitoring.SubscriptionID\022!\n\006kpi_id\030\002 \001(" +
+      "\0132\021.monitoring.KpiId\022\033\n\023sampling_duratio" +
+      "n_s\030\003 \001(\002\022\033\n\023sampling_interval_s\030\004 \001(\002\022+" +
+      "\n\017start_timestamp\030\005 \001(\0132\022.context.Timest" +
+      "amp\022)\n\rend_timestamp\030\006 \001(\0132\022.context.Tim" +
+      "estamp\"0\n\016SubscriptionID\022\036\n\007subs_id\030\001 \001(" +
+      "\0132\r.context.Uuid\"b\n\014SubsResponse\022+\n\007subs" +
+      "_id\030\001 \001(\0132\032.monitoring.SubscriptionID\022%\n" +
+      "\010kpi_list\030\002 \001(\0132\023.monitoring.KpiList\"?\n\010" +
+      "SubsList\0223\n\017subs_descriptor\030\001 \003(\0132\032.moni" +
+      "toring.SubsDescriptor\"\337\001\n\017AlarmDescripto" +
+      "r\022%\n\010alarm_id\030\001 \001(\0132\023.monitoring.AlarmID" +
+      "\022\031\n\021alarm_description\030\002 \001(\t\022\014\n\004name\030\003 \001(" +
+      "\t\022!\n\006kpi_id\030\004 \001(\0132\021.monitoring.KpiId\0222\n\017" +
+      "kpi_value_range\030\005 \001(\0132\031.monitoring.KpiVa" +
+      "lueRange\022%\n\ttimestamp\030\006 \001(\0132\022.context.Ti" +
+      "mestamp\"*\n\007AlarmID\022\037\n\010alarm_id\030\001 \001(\0132\r.c" +
+      "ontext.Uuid\"}\n\021AlarmSubscription\022%\n\010alar" +
+      "m_id\030\001 \001(\0132\023.monitoring.AlarmID\022\036\n\026subsc" +
+      "ription_timeout_s\030\002 \001(\002\022!\n\031subscription_" +
+      "frequency_ms\030\003 \001(\002\"k\n\rAlarmResponse\022%\n\010a" +
+      "larm_id\030\001 \001(\0132\023.monitoring.AlarmID\022\014\n\004te" +
+      "xt\030\002 \001(\t\022%\n\010kpi_list\030\003 \001(\0132\023.monitoring." +
+      "KpiList\"B\n\tAlarmList\0225\n\020alarm_descriptor" +
+      "\030\001 \003(\0132\033.monitoring.AlarmDescriptor2\234\t\n\021" +
+      "MonitoringService\0228\n\006SetKpi\022\031.monitoring" +
+      ".KpiDescriptor\032\021.monitoring.KpiId\"\000\0220\n\tD" +
+      "eleteKpi\022\021.monitoring.KpiId\032\016.context.Em" +
+      "pty\"\000\022B\n\020GetKpiDescriptor\022\021.monitoring.K" +
+      "piId\032\031.monitoring.KpiDescriptor\"\000\022G\n\024Get" +
+      "KpiDescriptorList\022\016.context.Empty\032\035.moni" +
+      "toring.KpiDescriptorList\"\000\022/\n\nIncludeKpi" +
+      "\022\017.monitoring.Kpi\032\016.context.Empty\"\000\022=\n\nM" +
+      "onitorKpi\022\035.monitoring.MonitorKpiRequest" +
+      "\032\016.context.Empty\"\000\022?\n\014QueryKpiData\022\024.mon" +
+      "itoring.KpiQuery\032\027.monitoring.RawKpiTabl" +
+      "e\"\000\022N\n\022SetKpiSubscription\022\032.monitoring.S" +
+      "ubsDescriptor\032\030.monitoring.SubsResponse\"" +
+      "\0000\001\022M\n\021GetSubsDescriptor\022\032.monitoring.Su" +
+      "bscriptionID\032\032.monitoring.SubsDescriptor" +
+      "\"\000\022:\n\020GetSubscriptions\022\016.context.Empty\032\024" +
+      ".monitoring.SubsList\"\000\022B\n\022DeleteSubscrip" +
+      "tion\022\032.monitoring.SubscriptionID\032\016.conte" +
+      "xt.Empty\"\000\022A\n\013SetKpiAlarm\022\033.monitoring.A" +
+      "larmDescriptor\032\023.monitoring.AlarmID\"\000\0224\n" +
+      "\tGetAlarms\022\016.context.Empty\032\025.monitoring." +
+      "AlarmList\"\000\022H\n\022GetAlarmDescriptor\022\023.moni" +
+      "toring.AlarmID\032\033.monitoring.AlarmDescrip" +
+      "tor\"\000\022V\n\026GetAlarmResponseStream\022\035.monito" +
+      "ring.AlarmSubscription\032\031.monitoring.Alar" +
+      "mResponse\"\0000\001\0224\n\013DeleteAlarm\022\023.monitorin" +
+      "g.AlarmID\032\016.context.Empty\"\000\0226\n\014GetStream" +
+      "Kpi\022\021.monitoring.KpiId\032\017.monitoring.Kpi\"" +
+      "\0000\001\0225\n\rGetInstantKpi\022\021.monitoring.KpiId\032" +
+      "\017.monitoring.Kpi\"\000b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -18507,7 +21468,7 @@ public final class Monitoring {
     internal_static_monitoring_KpiDescriptor_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_monitoring_KpiDescriptor_descriptor,
-        new java.lang.String[] { "KpiId", "KpiDescription", "KpiIdList", "KpiSampleType", "DeviceId", "EndpointId", "ServiceId", "SliceId", });
+        new java.lang.String[] { "KpiId", "KpiDescription", "KpiIdList", "KpiSampleType", "DeviceId", "EndpointId", "ServiceId", "SliceId", "ConnectionId", });
     internal_static_monitoring_MonitorKpiRequest_descriptor =
       getDescriptor().getMessageTypes().get(1);
     internal_static_monitoring_MonitorKpiRequest_fieldAccessorTable = new
@@ -18519,93 +21480,111 @@ public final class Monitoring {
     internal_static_monitoring_KpiQuery_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_monitoring_KpiQuery_descriptor,
-        new java.lang.String[] { "KpiId", "MonitoringWindowS", "SamplingRateS", "LastNSamples", "StartTimestamp", "EndTimestamp", });
-    internal_static_monitoring_KpiId_descriptor =
+        new java.lang.String[] { "KpiIds", "MonitoringWindowS", "LastNSamples", "StartTimestamp", "EndTimestamp", });
+    internal_static_monitoring_RawKpi_descriptor =
       getDescriptor().getMessageTypes().get(3);
+    internal_static_monitoring_RawKpi_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_monitoring_RawKpi_descriptor,
+        new java.lang.String[] { "Timestamp", "KpiValue", });
+    internal_static_monitoring_RawKpiList_descriptor =
+      getDescriptor().getMessageTypes().get(4);
+    internal_static_monitoring_RawKpiList_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_monitoring_RawKpiList_descriptor,
+        new java.lang.String[] { "KpiId", "RawKpis", });
+    internal_static_monitoring_RawKpiTable_descriptor =
+      getDescriptor().getMessageTypes().get(5);
+    internal_static_monitoring_RawKpiTable_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_monitoring_RawKpiTable_descriptor,
+        new java.lang.String[] { "RawKpiLists", });
+    internal_static_monitoring_KpiId_descriptor =
+      getDescriptor().getMessageTypes().get(6);
     internal_static_monitoring_KpiId_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_monitoring_KpiId_descriptor,
         new java.lang.String[] { "KpiId", });
     internal_static_monitoring_Kpi_descriptor =
-      getDescriptor().getMessageTypes().get(4);
+      getDescriptor().getMessageTypes().get(7);
     internal_static_monitoring_Kpi_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_monitoring_Kpi_descriptor,
         new java.lang.String[] { "KpiId", "Timestamp", "KpiValue", });
     internal_static_monitoring_KpiValueRange_descriptor =
-      getDescriptor().getMessageTypes().get(5);
+      getDescriptor().getMessageTypes().get(8);
     internal_static_monitoring_KpiValueRange_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_monitoring_KpiValueRange_descriptor,
         new java.lang.String[] { "KpiMinValue", "KpiMaxValue", "InRange", "IncludeMinValue", "IncludeMaxValue", });
     internal_static_monitoring_KpiValue_descriptor =
-      getDescriptor().getMessageTypes().get(6);
+      getDescriptor().getMessageTypes().get(9);
     internal_static_monitoring_KpiValue_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_monitoring_KpiValue_descriptor,
         new java.lang.String[] { "Int32Val", "Uint32Val", "Int64Val", "Uint64Val", "FloatVal", "StringVal", "BoolVal", "Value", });
     internal_static_monitoring_KpiList_descriptor =
-      getDescriptor().getMessageTypes().get(7);
+      getDescriptor().getMessageTypes().get(10);
     internal_static_monitoring_KpiList_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_monitoring_KpiList_descriptor,
         new java.lang.String[] { "Kpi", });
     internal_static_monitoring_KpiDescriptorList_descriptor =
-      getDescriptor().getMessageTypes().get(8);
+      getDescriptor().getMessageTypes().get(11);
     internal_static_monitoring_KpiDescriptorList_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_monitoring_KpiDescriptorList_descriptor,
         new java.lang.String[] { "KpiDescriptorList", });
     internal_static_monitoring_SubsDescriptor_descriptor =
-      getDescriptor().getMessageTypes().get(9);
+      getDescriptor().getMessageTypes().get(12);
     internal_static_monitoring_SubsDescriptor_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_monitoring_SubsDescriptor_descriptor,
         new java.lang.String[] { "SubsId", "KpiId", "SamplingDurationS", "SamplingIntervalS", "StartTimestamp", "EndTimestamp", });
     internal_static_monitoring_SubscriptionID_descriptor =
-      getDescriptor().getMessageTypes().get(10);
+      getDescriptor().getMessageTypes().get(13);
     internal_static_monitoring_SubscriptionID_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_monitoring_SubscriptionID_descriptor,
         new java.lang.String[] { "SubsId", });
     internal_static_monitoring_SubsResponse_descriptor =
-      getDescriptor().getMessageTypes().get(11);
+      getDescriptor().getMessageTypes().get(14);
     internal_static_monitoring_SubsResponse_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_monitoring_SubsResponse_descriptor,
         new java.lang.String[] { "SubsId", "KpiList", });
     internal_static_monitoring_SubsList_descriptor =
-      getDescriptor().getMessageTypes().get(12);
+      getDescriptor().getMessageTypes().get(15);
     internal_static_monitoring_SubsList_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_monitoring_SubsList_descriptor,
         new java.lang.String[] { "SubsDescriptor", });
     internal_static_monitoring_AlarmDescriptor_descriptor =
-      getDescriptor().getMessageTypes().get(13);
+      getDescriptor().getMessageTypes().get(16);
     internal_static_monitoring_AlarmDescriptor_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_monitoring_AlarmDescriptor_descriptor,
         new java.lang.String[] { "AlarmId", "AlarmDescription", "Name", "KpiId", "KpiValueRange", "Timestamp", });
     internal_static_monitoring_AlarmID_descriptor =
-      getDescriptor().getMessageTypes().get(14);
+      getDescriptor().getMessageTypes().get(17);
     internal_static_monitoring_AlarmID_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_monitoring_AlarmID_descriptor,
         new java.lang.String[] { "AlarmId", });
     internal_static_monitoring_AlarmSubscription_descriptor =
-      getDescriptor().getMessageTypes().get(15);
+      getDescriptor().getMessageTypes().get(18);
     internal_static_monitoring_AlarmSubscription_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_monitoring_AlarmSubscription_descriptor,
         new java.lang.String[] { "AlarmId", "SubscriptionTimeoutS", "SubscriptionFrequencyMs", });
     internal_static_monitoring_AlarmResponse_descriptor =
-      getDescriptor().getMessageTypes().get(16);
+      getDescriptor().getMessageTypes().get(19);
     internal_static_monitoring_AlarmResponse_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_monitoring_AlarmResponse_descriptor,
         new java.lang.String[] { "AlarmId", "Text", "KpiList", });
     internal_static_monitoring_AlarmList_descriptor =
-      getDescriptor().getMessageTypes().get(17);
+      getDescriptor().getMessageTypes().get(20);
     internal_static_monitoring_AlarmList_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_monitoring_AlarmList_descriptor,
diff --git a/src/policy/target/generated-sources/grpc/monitoring/MonitoringService.java b/src/policy/target/generated-sources/grpc/monitoring/MonitoringService.java
index e43e9174c6eee81e5c5faf4a2d3049848f01b041..0ce30559b2c0a1bb6236431482d6b99b82cf0842 100644
--- a/src/policy/target/generated-sources/grpc/monitoring/MonitoringService.java
+++ b/src/policy/target/generated-sources/grpc/monitoring/MonitoringService.java
@@ -20,7 +20,7 @@ public interface MonitoringService extends MutinyService {
     
     io.smallrye.mutiny.Uni<context.ContextOuterClass.Empty> monitorKpi(monitoring.Monitoring.MonitorKpiRequest request);
     
-    io.smallrye.mutiny.Uni<monitoring.Monitoring.KpiList> queryKpiData(monitoring.Monitoring.KpiQuery request);
+    io.smallrye.mutiny.Uni<monitoring.Monitoring.RawKpiTable> queryKpiData(monitoring.Monitoring.KpiQuery request);
     
     io.smallrye.mutiny.Uni<monitoring.Monitoring.SubsDescriptor> getSubsDescriptor(monitoring.Monitoring.SubscriptionID request);
     
diff --git a/src/policy/target/generated-sources/grpc/monitoring/MonitoringServiceBean.java b/src/policy/target/generated-sources/grpc/monitoring/MonitoringServiceBean.java
index 83c1b9cd108886f5b54248c5c9861ec9f5c2fabf..cbc984e7132bdbf22c9b99a510106c5c6f4cbda7 100644
--- a/src/policy/target/generated-sources/grpc/monitoring/MonitoringServiceBean.java
+++ b/src/policy/target/generated-sources/grpc/monitoring/MonitoringServiceBean.java
@@ -64,7 +64,7 @@ public class MonitoringServiceBean extends MutinyMonitoringServiceGrpc.Monitorin
        }
     }
     @Override
-    public io.smallrye.mutiny.Uni<monitoring.Monitoring.KpiList> queryKpiData(monitoring.Monitoring.KpiQuery request) {
+    public io.smallrye.mutiny.Uni<monitoring.Monitoring.RawKpiTable> queryKpiData(monitoring.Monitoring.KpiQuery request) {
        try {
          return delegate.queryKpiData(request);
        } catch (UnsupportedOperationException e) {
diff --git a/src/policy/target/generated-sources/grpc/monitoring/MonitoringServiceClient.java b/src/policy/target/generated-sources/grpc/monitoring/MonitoringServiceClient.java
index fc16b2b9bfb19c27fd6ff593e4d2311017b9286b..0e8ff5d1b8929694b49548984cd7d53f9c8f68a4 100644
--- a/src/policy/target/generated-sources/grpc/monitoring/MonitoringServiceClient.java
+++ b/src/policy/target/generated-sources/grpc/monitoring/MonitoringServiceClient.java
@@ -45,7 +45,7 @@ public class MonitoringServiceClient implements MonitoringService, MutinyClient<
        return stub.monitorKpi(request);
     }
     @Override
-    public io.smallrye.mutiny.Uni<monitoring.Monitoring.KpiList> queryKpiData(monitoring.Monitoring.KpiQuery request) {
+    public io.smallrye.mutiny.Uni<monitoring.Monitoring.RawKpiTable> queryKpiData(monitoring.Monitoring.KpiQuery request) {
        return stub.queryKpiData(request);
     }
     @Override
diff --git a/src/policy/target/generated-sources/grpc/monitoring/MonitoringServiceGrpc.java b/src/policy/target/generated-sources/grpc/monitoring/MonitoringServiceGrpc.java
index 9f3d85f72f78afca40e60c7439c84b61b1976d55..c5f55b3b44c03ea8f5377ce11e3c3e547da5ef06 100644
--- a/src/policy/target/generated-sources/grpc/monitoring/MonitoringServiceGrpc.java
+++ b/src/policy/target/generated-sources/grpc/monitoring/MonitoringServiceGrpc.java
@@ -201,28 +201,28 @@ public final class MonitoringServiceGrpc {
   }
 
   private static volatile io.grpc.MethodDescriptor<monitoring.Monitoring.KpiQuery,
-      monitoring.Monitoring.KpiList> getQueryKpiDataMethod;
+      monitoring.Monitoring.RawKpiTable> getQueryKpiDataMethod;
 
   @io.grpc.stub.annotations.RpcMethod(
       fullMethodName = SERVICE_NAME + '/' + "QueryKpiData",
       requestType = monitoring.Monitoring.KpiQuery.class,
-      responseType = monitoring.Monitoring.KpiList.class,
+      responseType = monitoring.Monitoring.RawKpiTable.class,
       methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
   public static io.grpc.MethodDescriptor<monitoring.Monitoring.KpiQuery,
-      monitoring.Monitoring.KpiList> getQueryKpiDataMethod() {
-    io.grpc.MethodDescriptor<monitoring.Monitoring.KpiQuery, monitoring.Monitoring.KpiList> getQueryKpiDataMethod;
+      monitoring.Monitoring.RawKpiTable> getQueryKpiDataMethod() {
+    io.grpc.MethodDescriptor<monitoring.Monitoring.KpiQuery, monitoring.Monitoring.RawKpiTable> getQueryKpiDataMethod;
     if ((getQueryKpiDataMethod = MonitoringServiceGrpc.getQueryKpiDataMethod) == null) {
       synchronized (MonitoringServiceGrpc.class) {
         if ((getQueryKpiDataMethod = MonitoringServiceGrpc.getQueryKpiDataMethod) == null) {
           MonitoringServiceGrpc.getQueryKpiDataMethod = getQueryKpiDataMethod =
-              io.grpc.MethodDescriptor.<monitoring.Monitoring.KpiQuery, monitoring.Monitoring.KpiList>newBuilder()
+              io.grpc.MethodDescriptor.<monitoring.Monitoring.KpiQuery, monitoring.Monitoring.RawKpiTable>newBuilder()
               .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
               .setFullMethodName(generateFullMethodName(SERVICE_NAME, "QueryKpiData"))
               .setSampledToLocalTracing(true)
               .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
                   monitoring.Monitoring.KpiQuery.getDefaultInstance()))
               .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  monitoring.Monitoring.KpiList.getDefaultInstance()))
+                  monitoring.Monitoring.RawKpiTable.getDefaultInstance()))
               .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("QueryKpiData"))
               .build();
         }
@@ -665,7 +665,7 @@ public final class MonitoringServiceGrpc {
     /**
      */
     public void queryKpiData(monitoring.Monitoring.KpiQuery request,
-        io.grpc.stub.StreamObserver<monitoring.Monitoring.KpiList> responseObserver) {
+        io.grpc.stub.StreamObserver<monitoring.Monitoring.RawKpiTable> responseObserver) {
       io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getQueryKpiDataMethod(), responseObserver);
     }
 
@@ -795,7 +795,7 @@ public final class MonitoringServiceGrpc {
             io.grpc.stub.ServerCalls.asyncUnaryCall(
               new MethodHandlers<
                 monitoring.Monitoring.KpiQuery,
-                monitoring.Monitoring.KpiList>(
+                monitoring.Monitoring.RawKpiTable>(
                   this, METHODID_QUERY_KPI_DATA)))
           .addMethod(
             getSetKpiSubscriptionMethod(),
@@ -943,7 +943,7 @@ public final class MonitoringServiceGrpc {
     /**
      */
     public void queryKpiData(monitoring.Monitoring.KpiQuery request,
-        io.grpc.stub.StreamObserver<monitoring.Monitoring.KpiList> responseObserver) {
+        io.grpc.stub.StreamObserver<monitoring.Monitoring.RawKpiTable> responseObserver) {
       io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getQueryKpiDataMethod(), getCallOptions()), request, responseObserver);
     }
@@ -1095,7 +1095,7 @@ public final class MonitoringServiceGrpc {
 
     /**
      */
-    public monitoring.Monitoring.KpiList queryKpiData(monitoring.Monitoring.KpiQuery request) {
+    public monitoring.Monitoring.RawKpiTable queryKpiData(monitoring.Monitoring.KpiQuery request) {
       return io.grpc.stub.ClientCalls.blockingUnaryCall(
           getChannel(), getQueryKpiDataMethod(), getCallOptions(), request);
     }
@@ -1245,7 +1245,7 @@ public final class MonitoringServiceGrpc {
 
     /**
      */
-    public com.google.common.util.concurrent.ListenableFuture<monitoring.Monitoring.KpiList> queryKpiData(
+    public com.google.common.util.concurrent.ListenableFuture<monitoring.Monitoring.RawKpiTable> queryKpiData(
         monitoring.Monitoring.KpiQuery request) {
       return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getQueryKpiDataMethod(), getCallOptions()), request);
@@ -1378,7 +1378,7 @@ public final class MonitoringServiceGrpc {
           break;
         case METHODID_QUERY_KPI_DATA:
           serviceImpl.queryKpiData((monitoring.Monitoring.KpiQuery) request,
-              (io.grpc.stub.StreamObserver<monitoring.Monitoring.KpiList>) responseObserver);
+              (io.grpc.stub.StreamObserver<monitoring.Monitoring.RawKpiTable>) responseObserver);
           break;
         case METHODID_SET_KPI_SUBSCRIPTION:
           serviceImpl.setKpiSubscription((monitoring.Monitoring.SubsDescriptor) request,
diff --git a/src/policy/target/generated-sources/grpc/monitoring/MutinyMonitoringServiceGrpc.java b/src/policy/target/generated-sources/grpc/monitoring/MutinyMonitoringServiceGrpc.java
index 8f066682b996e236be1d14cc65b80d1b8984804f..f045ecc7ed434ba90bdfda065f18e0d839850a76 100644
--- a/src/policy/target/generated-sources/grpc/monitoring/MutinyMonitoringServiceGrpc.java
+++ b/src/policy/target/generated-sources/grpc/monitoring/MutinyMonitoringServiceGrpc.java
@@ -66,7 +66,7 @@ public final class MutinyMonitoringServiceGrpc implements io.quarkus.grpc.runtim
         }
 
         
-        public io.smallrye.mutiny.Uni<monitoring.Monitoring.KpiList> queryKpiData(monitoring.Monitoring.KpiQuery request) {
+        public io.smallrye.mutiny.Uni<monitoring.Monitoring.RawKpiTable> queryKpiData(monitoring.Monitoring.KpiQuery request) {
             return io.quarkus.grpc.runtime.ClientCalls.oneToOne(request, delegateStub::queryKpiData);
         }
 
@@ -173,7 +173,7 @@ public final class MutinyMonitoringServiceGrpc implements io.quarkus.grpc.runtim
         }
 
         
-        public io.smallrye.mutiny.Uni<monitoring.Monitoring.KpiList> queryKpiData(monitoring.Monitoring.KpiQuery request) {
+        public io.smallrye.mutiny.Uni<monitoring.Monitoring.RawKpiTable> queryKpiData(monitoring.Monitoring.KpiQuery request) {
             throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED);
         }
 
@@ -281,7 +281,7 @@ public final class MutinyMonitoringServiceGrpc implements io.quarkus.grpc.runtim
                             asyncUnaryCall(
                                     new MethodHandlers<
                                             monitoring.Monitoring.KpiQuery,
-                                            monitoring.Monitoring.KpiList>(
+                                            monitoring.Monitoring.RawKpiTable>(
                                             this, METHODID_QUERY_KPI_DATA, compression)))
                     .addMethod(
                             monitoring.MonitoringServiceGrpc.getSetKpiSubscriptionMethod(),
@@ -440,7 +440,7 @@ public final class MutinyMonitoringServiceGrpc implements io.quarkus.grpc.runtim
                     break;
                 case METHODID_QUERY_KPI_DATA:
                     io.quarkus.grpc.runtime.ServerCalls.oneToOne((monitoring.Monitoring.KpiQuery) request,
-                            (io.grpc.stub.StreamObserver<monitoring.Monitoring.KpiList>) responseObserver,
+                            (io.grpc.stub.StreamObserver<monitoring.Monitoring.RawKpiTable>) responseObserver,
                             compression,
                             serviceImpl::queryKpiData);
                     break;
diff --git a/src/policy/target/generated-sources/grpc/policy/Policy.java b/src/policy/target/generated-sources/grpc/policy/Policy.java
index 0fb9c004aba385973770c0f0c448b60341f7e63c..505c0d7ff98d573e67f8cf39b399ec8ab9b30b68 100644
--- a/src/policy/target/generated-sources/grpc/policy/Policy.java
+++ b/src/policy/target/generated-sources/grpc/policy/Policy.java
@@ -9641,27 +9641,27 @@ public final class Policy {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .policy.PolicyRuleId policyRules = 1;</code>
+     * <code>repeated .policy.PolicyRule policyRules = 1;</code>
      */
-    java.util.List<policy.Policy.PolicyRuleId> 
+    java.util.List<policy.Policy.PolicyRule> 
         getPolicyRulesList();
     /**
-     * <code>repeated .policy.PolicyRuleId policyRules = 1;</code>
+     * <code>repeated .policy.PolicyRule policyRules = 1;</code>
      */
-    policy.Policy.PolicyRuleId getPolicyRules(int index);
+    policy.Policy.PolicyRule getPolicyRules(int index);
     /**
-     * <code>repeated .policy.PolicyRuleId policyRules = 1;</code>
+     * <code>repeated .policy.PolicyRule policyRules = 1;</code>
      */
     int getPolicyRulesCount();
     /**
-     * <code>repeated .policy.PolicyRuleId policyRules = 1;</code>
+     * <code>repeated .policy.PolicyRule policyRules = 1;</code>
      */
-    java.util.List<? extends policy.Policy.PolicyRuleIdOrBuilder> 
+    java.util.List<? extends policy.Policy.PolicyRuleOrBuilder> 
         getPolicyRulesOrBuilderList();
     /**
-     * <code>repeated .policy.PolicyRuleId policyRules = 1;</code>
+     * <code>repeated .policy.PolicyRule policyRules = 1;</code>
      */
-    policy.Policy.PolicyRuleIdOrBuilder getPolicyRulesOrBuilder(
+    policy.Policy.PolicyRuleOrBuilder getPolicyRulesOrBuilder(
         int index);
   }
   /**
@@ -9717,11 +9717,11 @@ public final class Policy {
               break;
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                policyRules_ = new java.util.ArrayList<policy.Policy.PolicyRuleId>();
+                policyRules_ = new java.util.ArrayList<policy.Policy.PolicyRule>();
                 mutable_bitField0_ |= 0x00000001;
               }
               policyRules_.add(
-                  input.readMessage(policy.Policy.PolicyRuleId.parser(), extensionRegistry));
+                  input.readMessage(policy.Policy.PolicyRule.parser(), extensionRegistry));
               break;
             }
             default: {
@@ -9760,41 +9760,41 @@ public final class Policy {
     }
 
     public static final int POLICYRULES_FIELD_NUMBER = 1;
-    private java.util.List<policy.Policy.PolicyRuleId> policyRules_;
+    private java.util.List<policy.Policy.PolicyRule> policyRules_;
     /**
-     * <code>repeated .policy.PolicyRuleId policyRules = 1;</code>
+     * <code>repeated .policy.PolicyRule policyRules = 1;</code>
      */
     @java.lang.Override
-    public java.util.List<policy.Policy.PolicyRuleId> getPolicyRulesList() {
+    public java.util.List<policy.Policy.PolicyRule> getPolicyRulesList() {
       return policyRules_;
     }
     /**
-     * <code>repeated .policy.PolicyRuleId policyRules = 1;</code>
+     * <code>repeated .policy.PolicyRule policyRules = 1;</code>
      */
     @java.lang.Override
-    public java.util.List<? extends policy.Policy.PolicyRuleIdOrBuilder> 
+    public java.util.List<? extends policy.Policy.PolicyRuleOrBuilder> 
         getPolicyRulesOrBuilderList() {
       return policyRules_;
     }
     /**
-     * <code>repeated .policy.PolicyRuleId policyRules = 1;</code>
+     * <code>repeated .policy.PolicyRule policyRules = 1;</code>
      */
     @java.lang.Override
     public int getPolicyRulesCount() {
       return policyRules_.size();
     }
     /**
-     * <code>repeated .policy.PolicyRuleId policyRules = 1;</code>
+     * <code>repeated .policy.PolicyRule policyRules = 1;</code>
      */
     @java.lang.Override
-    public policy.Policy.PolicyRuleId getPolicyRules(int index) {
+    public policy.Policy.PolicyRule getPolicyRules(int index) {
       return policyRules_.get(index);
     }
     /**
-     * <code>repeated .policy.PolicyRuleId policyRules = 1;</code>
+     * <code>repeated .policy.PolicyRule policyRules = 1;</code>
      */
     @java.lang.Override
-    public policy.Policy.PolicyRuleIdOrBuilder getPolicyRulesOrBuilder(
+    public policy.Policy.PolicyRuleOrBuilder getPolicyRulesOrBuilder(
         int index) {
       return policyRules_.get(index);
     }
@@ -10145,22 +10145,22 @@ public final class Policy {
       }
       private int bitField0_;
 
-      private java.util.List<policy.Policy.PolicyRuleId> policyRules_ =
+      private java.util.List<policy.Policy.PolicyRule> policyRules_ =
         java.util.Collections.emptyList();
       private void ensurePolicyRulesIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          policyRules_ = new java.util.ArrayList<policy.Policy.PolicyRuleId>(policyRules_);
+          policyRules_ = new java.util.ArrayList<policy.Policy.PolicyRule>(policyRules_);
           bitField0_ |= 0x00000001;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          policy.Policy.PolicyRuleId, policy.Policy.PolicyRuleId.Builder, policy.Policy.PolicyRuleIdOrBuilder> policyRulesBuilder_;
+          policy.Policy.PolicyRule, policy.Policy.PolicyRule.Builder, policy.Policy.PolicyRuleOrBuilder> policyRulesBuilder_;
 
       /**
-       * <code>repeated .policy.PolicyRuleId policyRules = 1;</code>
+       * <code>repeated .policy.PolicyRule policyRules = 1;</code>
        */
-      public java.util.List<policy.Policy.PolicyRuleId> getPolicyRulesList() {
+      public java.util.List<policy.Policy.PolicyRule> getPolicyRulesList() {
         if (policyRulesBuilder_ == null) {
           return java.util.Collections.unmodifiableList(policyRules_);
         } else {
@@ -10168,7 +10168,7 @@ public final class Policy {
         }
       }
       /**
-       * <code>repeated .policy.PolicyRuleId policyRules = 1;</code>
+       * <code>repeated .policy.PolicyRule policyRules = 1;</code>
        */
       public int getPolicyRulesCount() {
         if (policyRulesBuilder_ == null) {
@@ -10178,9 +10178,9 @@ public final class Policy {
         }
       }
       /**
-       * <code>repeated .policy.PolicyRuleId policyRules = 1;</code>
+       * <code>repeated .policy.PolicyRule policyRules = 1;</code>
        */
-      public policy.Policy.PolicyRuleId getPolicyRules(int index) {
+      public policy.Policy.PolicyRule getPolicyRules(int index) {
         if (policyRulesBuilder_ == null) {
           return policyRules_.get(index);
         } else {
@@ -10188,10 +10188,10 @@ public final class Policy {
         }
       }
       /**
-       * <code>repeated .policy.PolicyRuleId policyRules = 1;</code>
+       * <code>repeated .policy.PolicyRule policyRules = 1;</code>
        */
       public Builder setPolicyRules(
-          int index, policy.Policy.PolicyRuleId value) {
+          int index, policy.Policy.PolicyRule value) {
         if (policyRulesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -10205,10 +10205,10 @@ public final class Policy {
         return this;
       }
       /**
-       * <code>repeated .policy.PolicyRuleId policyRules = 1;</code>
+       * <code>repeated .policy.PolicyRule policyRules = 1;</code>
        */
       public Builder setPolicyRules(
-          int index, policy.Policy.PolicyRuleId.Builder builderForValue) {
+          int index, policy.Policy.PolicyRule.Builder builderForValue) {
         if (policyRulesBuilder_ == null) {
           ensurePolicyRulesIsMutable();
           policyRules_.set(index, builderForValue.build());
@@ -10219,9 +10219,9 @@ public final class Policy {
         return this;
       }
       /**
-       * <code>repeated .policy.PolicyRuleId policyRules = 1;</code>
+       * <code>repeated .policy.PolicyRule policyRules = 1;</code>
        */
-      public Builder addPolicyRules(policy.Policy.PolicyRuleId value) {
+      public Builder addPolicyRules(policy.Policy.PolicyRule value) {
         if (policyRulesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -10235,10 +10235,10 @@ public final class Policy {
         return this;
       }
       /**
-       * <code>repeated .policy.PolicyRuleId policyRules = 1;</code>
+       * <code>repeated .policy.PolicyRule policyRules = 1;</code>
        */
       public Builder addPolicyRules(
-          int index, policy.Policy.PolicyRuleId value) {
+          int index, policy.Policy.PolicyRule value) {
         if (policyRulesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -10252,10 +10252,10 @@ public final class Policy {
         return this;
       }
       /**
-       * <code>repeated .policy.PolicyRuleId policyRules = 1;</code>
+       * <code>repeated .policy.PolicyRule policyRules = 1;</code>
        */
       public Builder addPolicyRules(
-          policy.Policy.PolicyRuleId.Builder builderForValue) {
+          policy.Policy.PolicyRule.Builder builderForValue) {
         if (policyRulesBuilder_ == null) {
           ensurePolicyRulesIsMutable();
           policyRules_.add(builderForValue.build());
@@ -10266,10 +10266,10 @@ public final class Policy {
         return this;
       }
       /**
-       * <code>repeated .policy.PolicyRuleId policyRules = 1;</code>
+       * <code>repeated .policy.PolicyRule policyRules = 1;</code>
        */
       public Builder addPolicyRules(
-          int index, policy.Policy.PolicyRuleId.Builder builderForValue) {
+          int index, policy.Policy.PolicyRule.Builder builderForValue) {
         if (policyRulesBuilder_ == null) {
           ensurePolicyRulesIsMutable();
           policyRules_.add(index, builderForValue.build());
@@ -10280,10 +10280,10 @@ public final class Policy {
         return this;
       }
       /**
-       * <code>repeated .policy.PolicyRuleId policyRules = 1;</code>
+       * <code>repeated .policy.PolicyRule policyRules = 1;</code>
        */
       public Builder addAllPolicyRules(
-          java.lang.Iterable<? extends policy.Policy.PolicyRuleId> values) {
+          java.lang.Iterable<? extends policy.Policy.PolicyRule> values) {
         if (policyRulesBuilder_ == null) {
           ensurePolicyRulesIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
@@ -10295,7 +10295,7 @@ public final class Policy {
         return this;
       }
       /**
-       * <code>repeated .policy.PolicyRuleId policyRules = 1;</code>
+       * <code>repeated .policy.PolicyRule policyRules = 1;</code>
        */
       public Builder clearPolicyRules() {
         if (policyRulesBuilder_ == null) {
@@ -10308,7 +10308,7 @@ public final class Policy {
         return this;
       }
       /**
-       * <code>repeated .policy.PolicyRuleId policyRules = 1;</code>
+       * <code>repeated .policy.PolicyRule policyRules = 1;</code>
        */
       public Builder removePolicyRules(int index) {
         if (policyRulesBuilder_ == null) {
@@ -10321,16 +10321,16 @@ public final class Policy {
         return this;
       }
       /**
-       * <code>repeated .policy.PolicyRuleId policyRules = 1;</code>
+       * <code>repeated .policy.PolicyRule policyRules = 1;</code>
        */
-      public policy.Policy.PolicyRuleId.Builder getPolicyRulesBuilder(
+      public policy.Policy.PolicyRule.Builder getPolicyRulesBuilder(
           int index) {
         return getPolicyRulesFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .policy.PolicyRuleId policyRules = 1;</code>
+       * <code>repeated .policy.PolicyRule policyRules = 1;</code>
        */
-      public policy.Policy.PolicyRuleIdOrBuilder getPolicyRulesOrBuilder(
+      public policy.Policy.PolicyRuleOrBuilder getPolicyRulesOrBuilder(
           int index) {
         if (policyRulesBuilder_ == null) {
           return policyRules_.get(index);  } else {
@@ -10338,9 +10338,9 @@ public final class Policy {
         }
       }
       /**
-       * <code>repeated .policy.PolicyRuleId policyRules = 1;</code>
+       * <code>repeated .policy.PolicyRule policyRules = 1;</code>
        */
-      public java.util.List<? extends policy.Policy.PolicyRuleIdOrBuilder> 
+      public java.util.List<? extends policy.Policy.PolicyRuleOrBuilder> 
            getPolicyRulesOrBuilderList() {
         if (policyRulesBuilder_ != null) {
           return policyRulesBuilder_.getMessageOrBuilderList();
@@ -10349,33 +10349,33 @@ public final class Policy {
         }
       }
       /**
-       * <code>repeated .policy.PolicyRuleId policyRules = 1;</code>
+       * <code>repeated .policy.PolicyRule policyRules = 1;</code>
        */
-      public policy.Policy.PolicyRuleId.Builder addPolicyRulesBuilder() {
+      public policy.Policy.PolicyRule.Builder addPolicyRulesBuilder() {
         return getPolicyRulesFieldBuilder().addBuilder(
-            policy.Policy.PolicyRuleId.getDefaultInstance());
+            policy.Policy.PolicyRule.getDefaultInstance());
       }
       /**
-       * <code>repeated .policy.PolicyRuleId policyRules = 1;</code>
+       * <code>repeated .policy.PolicyRule policyRules = 1;</code>
        */
-      public policy.Policy.PolicyRuleId.Builder addPolicyRulesBuilder(
+      public policy.Policy.PolicyRule.Builder addPolicyRulesBuilder(
           int index) {
         return getPolicyRulesFieldBuilder().addBuilder(
-            index, policy.Policy.PolicyRuleId.getDefaultInstance());
+            index, policy.Policy.PolicyRule.getDefaultInstance());
       }
       /**
-       * <code>repeated .policy.PolicyRuleId policyRules = 1;</code>
+       * <code>repeated .policy.PolicyRule policyRules = 1;</code>
        */
-      public java.util.List<policy.Policy.PolicyRuleId.Builder> 
+      public java.util.List<policy.Policy.PolicyRule.Builder> 
            getPolicyRulesBuilderList() {
         return getPolicyRulesFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          policy.Policy.PolicyRuleId, policy.Policy.PolicyRuleId.Builder, policy.Policy.PolicyRuleIdOrBuilder> 
+          policy.Policy.PolicyRule, policy.Policy.PolicyRule.Builder, policy.Policy.PolicyRuleOrBuilder> 
           getPolicyRulesFieldBuilder() {
         if (policyRulesBuilder_ == null) {
           policyRulesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              policy.Policy.PolicyRuleId, policy.Policy.PolicyRuleId.Builder, policy.Policy.PolicyRuleIdOrBuilder>(
+              policy.Policy.PolicyRule, policy.Policy.PolicyRule.Builder, policy.Policy.PolicyRuleOrBuilder>(
                   policyRules_,
                   ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
@@ -10524,30 +10524,30 @@ public final class Policy {
       "viceList\030\001 \003(\0132\031.policy.PolicyRuleServic" +
       "e\"N\n\024PolicyRuleDeviceList\0226\n\024policyRuleD" +
       "eviceList\030\001 \003(\0132\030.policy.PolicyRuleDevic" +
-      "e\";\n\016PolicyRuleList\022)\n\013policyRules\030\001 \003(\013" +
-      "2\024.policy.PolicyRuleId*\377\001\n\023PolicyRuleSta" +
-      "teEnum\022\024\n\020POLICY_UNDEFINED\020\000\022\021\n\rPOLICY_F" +
-      "AILED\020\001\022\023\n\017POLICY_INSERTED\020\002\022\024\n\020POLICY_V" +
-      "ALIDATED\020\003\022\026\n\022POLICY_PROVISIONED\020\004\022\021\n\rPO" +
-      "LICY_ACTIVE\020\005\022\023\n\017POLICY_ENFORCED\020\006\022\026\n\022PO" +
-      "LICY_INEFFECTIVE\020\007\022\024\n\020POLICY_EFFECTIVE\020\010" +
-      "\022\022\n\016POLICY_UPDATED\020\t\022\022\n\016POLICY_REMOVED\020\n" +
-      "2\323\004\n\rPolicyService\022H\n\020PolicyAddService\022\031" +
-      ".policy.PolicyRuleService\032\027.policy.Polic" +
-      "yRuleState\"\000\022F\n\017PolicyAddDevice\022\030.policy" +
-      ".PolicyRuleDevice\032\027.policy.PolicyRuleSta" +
-      "te\"\000\022K\n\023PolicyUpdateService\022\031.policy.Pol" +
-      "icyRuleService\032\027.policy.PolicyRuleState\"" +
-      "\000\022I\n\022PolicyUpdateDevice\022\030.policy.PolicyR" +
-      "uleDevice\032\027.policy.PolicyRuleState\"\000\022?\n\014" +
-      "PolicyDelete\022\024.policy.PolicyRuleId\032\027.pol" +
-      "icy.PolicyRuleState\"\000\022E\n\020GetPolicyServic" +
-      "e\022\024.policy.PolicyRuleId\032\031.policy.PolicyR" +
-      "uleService\"\000\022C\n\017GetPolicyDevice\022\024.policy" +
-      ".PolicyRuleId\032\030.policy.PolicyRuleDevice\"" +
-      "\000\022K\n\024GetPolicyByServiceId\022\022.context.Serv" +
-      "iceId\032\035.policy.PolicyRuleServiceList\"\000b\006" +
-      "proto3"
+      "e\"9\n\016PolicyRuleList\022\'\n\013policyRules\030\001 \003(\013" +
+      "2\022.policy.PolicyRule*\377\001\n\023PolicyRuleState" +
+      "Enum\022\024\n\020POLICY_UNDEFINED\020\000\022\021\n\rPOLICY_FAI" +
+      "LED\020\001\022\023\n\017POLICY_INSERTED\020\002\022\024\n\020POLICY_VAL" +
+      "IDATED\020\003\022\026\n\022POLICY_PROVISIONED\020\004\022\021\n\rPOLI" +
+      "CY_ACTIVE\020\005\022\023\n\017POLICY_ENFORCED\020\006\022\026\n\022POLI" +
+      "CY_INEFFECTIVE\020\007\022\024\n\020POLICY_EFFECTIVE\020\010\022\022" +
+      "\n\016POLICY_UPDATED\020\t\022\022\n\016POLICY_REMOVED\020\n2\323" +
+      "\004\n\rPolicyService\022H\n\020PolicyAddService\022\031.p" +
+      "olicy.PolicyRuleService\032\027.policy.PolicyR" +
+      "uleState\"\000\022F\n\017PolicyAddDevice\022\030.policy.P" +
+      "olicyRuleDevice\032\027.policy.PolicyRuleState" +
+      "\"\000\022K\n\023PolicyUpdateService\022\031.policy.Polic" +
+      "yRuleService\032\027.policy.PolicyRuleState\"\000\022" +
+      "I\n\022PolicyUpdateDevice\022\030.policy.PolicyRul" +
+      "eDevice\032\027.policy.PolicyRuleState\"\000\022?\n\014Po" +
+      "licyDelete\022\024.policy.PolicyRuleId\032\027.polic" +
+      "y.PolicyRuleState\"\000\022E\n\020GetPolicyService\022" +
+      "\024.policy.PolicyRuleId\032\031.policy.PolicyRul" +
+      "eService\"\000\022C\n\017GetPolicyDevice\022\024.policy.P" +
+      "olicyRuleId\032\030.policy.PolicyRuleDevice\"\000\022" +
+      "K\n\024GetPolicyByServiceId\022\022.context.Servic" +
+      "eId\032\035.policy.PolicyRuleServiceList\"\000b\006pr" +
+      "oto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
diff --git a/src/tests/ofc22/runAddPolicy.js b/src/tests/ofc22/runAddPolicy.js
new file mode 100644
index 0000000000000000000000000000000000000000..5131fff3753ba20944d64052d617a4d338ab42d2
--- /dev/null
+++ b/src/tests/ofc22/runAddPolicy.js
@@ -0,0 +1,72 @@
+import grpc from 'k6/net/grpc';
+import exec from "k6/execution";
+import { check, sleep } from 'k6';
+
+const client = new grpc.Client();
+client.load(['../proto'], 'policy.proto');
+
+export const data = [];
+for (let i = 1; i < 11; i++) {
+  data.push(
+    {
+        "serviceId": {
+            "context_id": {
+                "context_uuid": {"uuid": "admin"}
+            },
+            "service_uuid": {
+                "uuid": "24699610-770e-411f-9fac-c37631eea8e4"
+            }
+        },
+        "policyRuleBasic": {
+            "policyRuleId": {"uuid": {"uuid": "2"}},
+            "policyRuleState": {"policyRuleState": "POLICY_ACTIVE"},
+            "priority": 0,
+            "conditionList": [{"kpiId": {"kpi_id": {"uuid": i.toString()}}, 
+                            "numericalOperator": "POLICYRULE_CONDITION_NUMERICAL_EQUAL",
+                            "kpiValue": {"boolVal": false}
+    
+            }],
+            "actionList": [{}],
+            "booleanOperator": "POLICYRULE_CONDITION_BOOLEAN_OR"
+        }
+    }
+  );
+};
+
+export const options = {
+  scenarios :{
+
+    "AddPolicy-scenario": {
+      executor: "shared-iterations",
+      vus: 1,
+      iterations: data.length,
+      maxDuration: "1h"
+    }
+  }
+};
+
+export default () => {
+  client.connect('10.1.90.119:6060', {
+    plaintext: true,
+    timeout: 10000
+  });
+
+  var item = data[exec.scenario.iterationInInstance];  
+  const response = client.invoke('policy.PolicyService/PolicyAddService', item);
+
+  check(response, {
+    'status is OK': (r) => r && r.status === grpc.StatusOK,
+  });
+
+  console.log(JSON.stringify(response.message));
+
+  client.close();
+  sleep(1);
+};
+
+export function handleSummary(data) {
+
+  return {
+    'summary.json': JSON.stringify(data.metrics.grpc_req_duration.values), //the default data object
+  };
+}
\ No newline at end of file