From d101ce05cac9194533f2a6cd4e4d337658960ab5 Mon Sep 17 00:00:00 2001
From: Sergio <sergio.gonzalez.diaz@atos.net>
Date: Wed, 27 Oct 2021 11:13:50 +0200
Subject: [PATCH] Update monitoring service with logging

---
 src/monitoring/.gitlab-ci.yml                  |  4 ++--
 .../service/MonitoringServiceServicerImpl.py   |  4 +++-
 src/monitoring/service/__main__.py             |  5 +++--
 src/monitoring/tests/Dockerfile                | 18 ------------------
 src/monitoring/tests/test_monitoring.py        |  6 +++---
 5 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/src/monitoring/.gitlab-ci.yml b/src/monitoring/.gitlab-ci.yml
index a69857e40..d5c5b1e82 100644
--- a/src/monitoring/.gitlab-ci.yml
+++ b/src/monitoring/.gitlab-ci.yml
@@ -30,8 +30,8 @@ kubernetes test:
     # - kubectl get all
     # - kubectl delete -f "manifests/monitoring.yaml"
     # - sleep 15
-    # - kubectl apply -f "manifests/monitoring.yaml"
-    # - sleep 30
+    - kubectl apply -f "manifests/monitoring.yaml"
+    - sleep 30
     # - kubectl get all
     - kubectl --namespace gitlab-ci describe pod monitoring-595c885c6c-fmb7b
     - kubectl --namespace gitlab-ci logs monitoring-595c885c6c-fmb7b influxdb
diff --git a/src/monitoring/service/MonitoringServiceServicerImpl.py b/src/monitoring/service/MonitoringServiceServicerImpl.py
index ead2d49bf..fb89e7b16 100644
--- a/src/monitoring/service/MonitoringServiceServicerImpl.py
+++ b/src/monitoring/service/MonitoringServiceServicerImpl.py
@@ -25,7 +25,9 @@ class MonitoringServiceServicerImpl(monitoring_pb2_grpc.MonitoringServiceService
         LOGGER.info('Init monitoringService')
         # Init sqlite monitoring db
         self.sql_db = sqlite_tools.SQLite('monitoring.db')
-
+        LOGGER.info(INFLUXDB_USER)
+        LOGGER.info(INFLUXDB_PASS)
+        LOGGER.info(INFLUXDB_DB)
         # Create influx_db client
         self.influx_db = influx_tools.Influx("localhost","8086",INFLUXDB_USER,INFLUXDB_PASS,INFLUXDB_DB)
 
diff --git a/src/monitoring/service/__main__.py b/src/monitoring/service/__main__.py
index cce482032..826614f8b 100644
--- a/src/monitoring/service/__main__.py
+++ b/src/monitoring/service/__main__.py
@@ -35,11 +35,12 @@ def main():
     signal.signal(signal.SIGTERM, signal_handler)
 
     logger.info('Starting...')
-
+    logger.info(GRPC_SERVICE_PORT)
+    logger.info(service_port)
     # Start metrics server
     start_http_server(metrics_port)
 
-    # Starting device service
+    # Starting monitoring service
     grpc_service = MonitoringService(port=service_port, max_workers=max_workers, grace_period=grace_period)
     grpc_service.start()
 
diff --git a/src/monitoring/tests/Dockerfile b/src/monitoring/tests/Dockerfile
index de2ad3437..6d57e059e 100644
--- a/src/monitoring/tests/Dockerfile
+++ b/src/monitoring/tests/Dockerfile
@@ -12,24 +12,6 @@ RUN GRPC_HEALTH_PROBE_VERSION=v0.2.0 && \
     wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \
     chmod +x /bin/grpc_health_probe
 
-# # get packages
-# WORKDIR /var/monitoring
-# RUN python3 -m pip install --upgrade pip setuptools wheel pip-tools
-# COPY monitoring/requirements.in requirements.in
-# RUN pip-compile --output-file=requirements.txt requirements.in
-# RUN python3 -m pip install -r requirements.txt
-
-# # add files into working directory
-# COPY monitoring/. .
-# COPY common/logger.py .
-
-# # set listen port
-# ENV PORT=7070
-# EXPOSE 7070
-
-# #RUN pytest --junitxml=report.xml
-# ENTRYPOINT ["pytest", "--junitxml=/opt/results/report.xml"]
-
 # Get generic Python packages
 RUN python3 -m pip install --upgrade pip setuptools wheel pip-tools
 
diff --git a/src/monitoring/tests/test_monitoring.py b/src/monitoring/tests/test_monitoring.py
index 831a6d9df..8252c2253 100644
--- a/src/monitoring/tests/test_monitoring.py
+++ b/src/monitoring/tests/test_monitoring.py
@@ -23,9 +23,9 @@ PORT = 7070
 def monitoring_service():
     LOGGER.warning('monitoring_service begin')
 
-    service_port = os.environ.get('DEVICESERVICE_SERVICE_PORT_GRPC', GRPC_SERVICE_PORT)
-    max_workers = os.environ.get('MAX_WORKERS', GRPC_MAX_WORKERS)
-    grace_period = os.environ.get('GRACE_PERIOD', GRPC_GRACE_PERIOD)
+    service_port = GRPC_SERVICE_PORT
+    max_workers = GRPC_MAX_WORKERS
+    grace_period = GRPC_GRACE_PERIOD
 
     LOGGER.info('Initializing MonitoringService...')
     grpc_service = MonitoringService(port=service_port, max_workers=max_workers, grace_period=grace_period)
-- 
GitLab