From 01721d90b8ec5f0cb3db69c5ec5f0fbfc805451e Mon Sep 17 00:00:00 2001
From: Sergio <sergio.gonzalez.diaz@atos.net>
Date: Wed, 27 Oct 2021 11:53:29 +0200
Subject: [PATCH] test influx monitoring

---
 src/monitoring/.gitlab-ci.yml                 | 60 +++++++++----------
 .../service/MonitoringServiceServicerImpl.py  |  5 +-
 2 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/src/monitoring/.gitlab-ci.yml b/src/monitoring/.gitlab-ci.yml
index 563f125f2..c23f7a6b1 100644
--- a/src/monitoring/.gitlab-ci.yml
+++ b/src/monitoring/.gitlab-ci.yml
@@ -1,41 +1,41 @@
-# # build, tag and push the Docker image to the gitlab registry
-# build monitoring:
-#   variables:
-#     IMAGE_NAME: 'monitoring' # name of the microservice
-#     IMAGE_TAG: 'latest' # tag of the container image (production, development, etc)
-#   stage: build
-#   before_script:
-#     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-#   script:
-#     - docker build --build-arg user=$INFLUXDB_USER --build-arg pass=$INFLUXDB_PASSWORD --build-arg db=$INFLUXDB_DATABASE -t "$IMAGE_NAME:$IMAGE_TAG" -f ./src/$IMAGE_NAME/Dockerfile ./src/
-#     - docker tag "$IMAGE_NAME:$IMAGE_TAG" "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"
-#     - docker push "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"
-#   after_script:
-#     - docker rmi $(docker images --quiet --filter=dangling=true)
-#   rules:
-#     - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)'
-#     - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "develop"' 
-#     - changes:
-#       - src/$IMAGE_NAME/**/*.{py,in,yml}
-#       - src/$IMAGE_NAME/Dockerfile
-#       - src/$IMAGE_NAME/tests/*.py
-#       - src/$IMAGE_NAME/tests/Dockerfile
-#       - manifests/$IMAGE_NAME.yaml
-#       - .gitlab-ci.yml
+# build, tag and push the Docker image to the gitlab registry
+build monitoring:
+  variables:
+    IMAGE_NAME: 'monitoring' # name of the microservice
+    IMAGE_TAG: 'latest' # tag of the container image (production, development, etc)
+  stage: build
+  before_script:
+    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+  script:
+    - docker build --build-arg user=$INFLUXDB_USER --build-arg pass=$INFLUXDB_PASSWORD --build-arg db=$INFLUXDB_DATABASE -t "$IMAGE_NAME:$IMAGE_TAG" -f ./src/$IMAGE_NAME/Dockerfile ./src/
+    - docker tag "$IMAGE_NAME:$IMAGE_TAG" "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"
+    - docker push "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"
+  after_script:
+    - docker rmi $(docker images --quiet --filter=dangling=true)
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)'
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "develop"' 
+    - changes:
+      - src/$IMAGE_NAME/**/*.{py,in,yml}
+      - src/$IMAGE_NAME/Dockerfile
+      - src/$IMAGE_NAME/tests/*.py
+      - src/$IMAGE_NAME/tests/Dockerfile
+      - manifests/$IMAGE_NAME.yaml
+      - .gitlab-ci.yml
 
 kubernetes test:
   stage: build
   script:
     # - kubectl version
     # - kubectl get all
-    # - kubectl delete -f "manifests/monitoring.yaml"
+    - kubectl delete -f "manifests/monitoring.yaml"
     # - sleep 15
-    # - kubectl apply -f "manifests/monitoring.yaml"
+    - kubectl apply -f "manifests/monitoring.yaml"
     # - sleep 30
-    # - kubectl get all
-    - kubectl --namespace gitlab-ci describe pod monitoring-595c885c6c-trqr4
-    - kubectl --namespace gitlab-ci logs monitoring-595c885c6c-trqr4 influxdb
-    - kubectl --namespace gitlab-ci logs monitoring-595c885c6c-trqr4 server
+    - kubectl get all
+    # - kubectl --namespace gitlab-ci describe pod monitoring-595c885c6c-trqr4
+    # - kubectl --namespace gitlab-ci logs monitoring-595c885c6c-trqr4 influxdb
+    # - kubectl --namespace gitlab-ci logs monitoring-595c885c6c-trqr4 server
 
 # # test if the Docker image can be pulled from the gitlab registry
 # test monitoring pull:
diff --git a/src/monitoring/service/MonitoringServiceServicerImpl.py b/src/monitoring/service/MonitoringServiceServicerImpl.py
index 34fe706c2..302738d63 100644
--- a/src/monitoring/service/MonitoringServiceServicerImpl.py
+++ b/src/monitoring/service/MonitoringServiceServicerImpl.py
@@ -28,9 +28,8 @@ class MonitoringServiceServicerImpl(monitoring_pb2_grpc.MonitoringServiceService
 
         # Create influx_db client
         self.influx_db = influx_tools.Influx("localhost","8086",INFLUXDB_USER,INFLUXDB_PASS,INFLUXDB_DB)
-        LOGGER.info(INFLUXDB_USER)
-        LOGGER.info(INFLUXDB_PASS)
-        LOGGER.info(INFLUXDB_DB)
+        self.influx_db.write_KPI("2021-10-12T13:14:42Z",1,1,101,1000)
+        self.influx_db.client.query('select * from samples;')
 
     # CreateKpi (CreateKpiRequest) returns (KpiId) {}
     def CreateKpi(self, request : monitoring_pb2.CreateKpiRequest, context) -> monitoring_pb2.KpiId :
-- 
GitLab