diff --git a/src/monitoring/service/monitoring_server.py b/src/monitoring/service/monitoring_server.py
index c787277eb0356dcfdf6b4278e3cb343ebbe9855c..4716d2420ea3430ecc49ad775202eca845ec7d1d 100644
--- a/src/monitoring/service/monitoring_server.py
+++ b/src/monitoring/service/monitoring_server.py
@@ -66,7 +66,6 @@ class MonitoringServiceServicerImpl(monitoring_pb2_grpc.MonitoringServiceService
         kpi = get_Kpi(request.kpi_id)
 
         monitor_device_request.kpi.kpi_id.kpi_id.uuid  = kpi.kpi_id.kpi_id.uuid
-
         monitor_device_request.connexion_time_s = request.connexion_time_s
         monitor_device_request.sample_rate_ms = request.sample_rate_ms
 
@@ -81,12 +80,25 @@ class MonitoringServiceServicerImpl(monitoring_pb2_grpc.MonitoringServiceService
         # Some code device to perform its actions
 
         LOGGER.info('MonitorDeviceKpi')
+
+        # Notify device about monitoring
+
         return context_pb2.Empty()
 
     # rpc IncludeKpi(IncludeKpiRequest)  returns(context.Empty)    {}
     def IncludeKpi(self, request : monitoring_pb2.IncludeKpiRequest, context) -> context_pb2.Empty:
 
         LOGGER.info('IncludeKpi')
+
+        kpi = get_Kpi(request.kpi_id)
+        time_stamp = request.time_stamp
+        kpi_value = request.kpi_value
+
+        # Build the structure to be included as point in the influxDB
+
+
+        # Send the Kpi point to the influxDB
+
         return context_pb2.Empty()
 
 
diff --git a/src/monitoring/tests/test_monitoring.py b/src/monitoring/tests/test_monitoring.py
index 9308697f343c59caa1d6c8df6e2832f03fcd4ebd..766225cfd9d0b485ca6c83550c925839fa543f16 100644
--- a/src/monitoring/tests/test_monitoring.py
+++ b/src/monitoring/tests/test_monitoring.py
@@ -94,6 +94,17 @@ def monitor_device_kpi_request():
 
     return monitor_device_kpi_request
 
+@pytest.fixture(scope='session')
+def include_kpi_request():
+    LOGGER.warning('test_include_kpi begin')
+
+    include_kpi_request = monitoring_pb2.IncludeKpiRequest()
+    include_kpi_request.kpi_id.kpi_id.uuid = 'KPIID0000'
+    include_kpi_request.time_stamp = "2021-10-12T13:14:42Z"
+    include_kpi_request.kpi_value.intVal = 500
+
+    return include_kpi_request
+
 ###########################
 # Tests Implementation
 ###########################
@@ -121,10 +132,10 @@ def test_monitor_device_kpi(monitoring_client,monitor_device_kpi_request):
     assert isinstance(response, context_pb2.Empty)
 
 # Test case that makes use of client fixture to test server's IncludeKpi method
-def test_include_kpi(monitoring_client,kpi_request):
+def test_include_kpi(monitoring_client,include_kpi_request):
     # make call to server
     LOGGER.warning('test_include_kpi requesting')
-    response = monitoring_client.IncludeKpi(kpi_request)
+    response = monitoring_client.IncludeKpi(include_kpi_request)
     LOGGER.debug(str(response))
     assert isinstance(response, context_pb2.Empty)