Commit df989308 authored by Sergio Gonzalez Diaz's avatar Sergio Gonzalez Diaz
Browse files

test env monitoring

parent f7231d4d

src/monitoring/.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ test monitoring pytest: 
    - docker run --name influxdb -d -p 8086:8086 -e INFLUXDB_DB=$INFLUXDB_DATABASE -e INFLUXDB_ADMIN_USER=$INFLUXDB_USER -e INFLUXDB_ADMIN_PASSWORD=$INFLUXDB_PASSWORD -e INXLUXDB_HTTP_AUTH_ENABLED=True --network=teraflowbridge influxdb:1.8

    # - docker build --build-arg hostname=influxdb --build-arg user=$INFLUXDB_USER --build-arg pass=$INFLUXDB_PASSWORD --build-arg db=$INFLUXDB_DATABASE -t "$IMAGE_NAME_TEST:$IMAGE_TAG" -f ./src/$IMAGE_NAME/tests/Dockerfile ./src/

    - docker build -t "$IMAGE_NAME_TEST:$IMAGE_TAG" -f ./src/$IMAGE_NAME/tests/Dockerfile ./src/

    - docker run --name $IMAGE_NAME_TEST --env INFLUXDB_USER=$INFLUXDB_USER --env INFLUXDB_PASS=$INFLUXDB_PASSWORD --env INFLUXDB_DB=$INFLUXDB_DATABASE --env INFLUXDB_HOST=influxdb -v "$PWD/src/$IMAGE_NAME/tests:/opt/results" --network=teraflowbridge  $IMAGE_NAME_TEST:$IMAGE_TAG

    - docker run --name $IMAGE_NAME_TEST --env INFLUXDB_USER=$INFLUXDB_USER --env INFLUXDB_PASSWORD=$INFLUXDB_PASSWORD --env INFLUXDB_DATABASE=$INFLUXDB_DATABASE --env INFLUXDB_HOSTNAME=influxdb -v "$PWD/src/$IMAGE_NAME/tests:/opt/results" --network=teraflowbridge  $IMAGE_NAME_TEST:$IMAGE_TAG

  after_script:

    - docker stop influxdb

    - docker rm influxdb

src/monitoring/service/MonitoringServiceServicerImpl.py

+4 −4
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ from prometheus_client import Counter, Gauge 
MONITORING_GETINSTANTKPI_REQUEST_TIME = Summary('monitoring_getinstantkpi_processing_seconds', 'Time spent processing monitoring instant kpi request')

MONITORING_INCLUDEKPI_COUNTER = Counter('monitoring_includekpi_counter', 'Monitoring include kpi request counter')



INFLUXDB_HOSTNAME = os.environ.get("INFLUXDB_HOSTNAME")

INFLUXDB_USER = os.environ.get("INFLUXDB_USER")

INFLUXDB_PASS = os.environ.get("INFLUXDB_PASSWORD")

INFLUXDB_DB = os.environ.get("INFLUXDB_DATABASE")

INFLUXDB_HOST = os.environ.get("INFLUXDB_HOSTNAME")

INFLUXDB_PASSWORD = os.environ.get("INFLUXDB_PASSWORD")

INFLUXDB_DATABASE = os.environ.get("INFLUXDB_DATABASE")



class MonitoringServiceServicerImpl(monitoring_pb2_grpc.MonitoringServiceServicer):

    def __init__(self):
@@ -29,7 +29,7 @@ class MonitoringServiceServicerImpl(monitoring_pb2_grpc.MonitoringServiceService 
        self.sql_db = sqlite_tools.SQLite('monitoring.db')



        # Create influx_db client

        self.influx_db = influx_tools.Influx(INFLUXDB_HOST,"8086",INFLUXDB_USER,INFLUXDB_PASS,INFLUXDB_DB)

        self.influx_db = influx_tools.Influx(INFLUXDB_HOSTNAME,"8086",INFLUXDB_USER,INFLUXDB_PASSWORD,INFLUXDB_DATABASE)



    # CreateKpi (CreateKpiRequest) returns (KpiId) {}

    def CreateKpi(self, request : monitoring_pb2.CreateKpiRequest, context) -> monitoring_pb2.KpiId :