Changes in the imports structure (80201927) · Commits · TFS / controller

src/monitoring/Dockerfile

+13 −4

Original line number	Diff line number	Diff line
		FROM python:3-slim

		# Install dependencies
		RUN apt-get --yes --quiet --quiet update && \
		apt-get --yes --quiet --quiet install wget g++ && \
		rm -rf /var/lib/apt/lists/*
		@@ -12,16 +13,24 @@ 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
		# Get generic Python packages
		RUN python3 -m pip install --upgrade pip setuptools wheel pip-tools

		# get packages
		WORKDIR /var/teraflow

		# Create module sub-folders
		RUN mkdir -p /var/teraflow/monitoring
		RUN mkdir -p /var/teraflow/common

		# Get Python packages per module
		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 .
		COPY monitoring/. monitoring
		COPY common/logger.py common

		# set listen port
		ENV PORT=7070

src/monitoring/client/monitoring_client.py

+4 −4

Original line number	Diff line number	Diff line
		import sys
		import grpc

		from ..proto import monitoring_pb2
		from ..proto import monitoring_pb2_grpc
		from ..proto import context_pb2
		from monitoring.proto import monitoring_pb2
		from monitoring.proto import monitoring_pb2_grpc
		from monitoring.proto import context_pb2

		from ..logger import getJSONLogger
		from common.logger import getJSONLogger
		LOGGER = getJSONLogger('monitoring-client')
		LOGGER.setLevel('DEBUG')

src/monitoring/logger.py

deleted120000 → 0

+0 −1

Original line number	Diff line number	Diff line
		../common/logger.py
		No newline at end of file

src/monitoring/requirements.in

+0 −1

Original line number	Diff line number	Diff line
		google-api-core
		google-python-cloud-debugger
		grpcio-health-checking
		grpcio
		opencensus[stackdriver]

src/monitoring/service/monitoring_server.py

+10 −10

Original line number	Diff line number	Diff line
		@@ -3,23 +3,23 @@
		import os
		from concurrent import futures

		from ..client.monitoring_client import MonitoringClient
		from ..proto import context_pb2
		from monitoring.client.monitoring_client import MonitoringClient
		from monitoring.proto import context_pb2
		import grpc
		from . import sqlite_tools as sqltools
		# from . import influx_tools
		from monitoring.service import sqlite_tools
		# from monitoring.service import influx_tools

		import time

		from ..proto import monitoring_pb2
		from ..proto import monitoring_pb2_grpc
		from monitoring.proto import monitoring_pb2
		from monitoring.proto import monitoring_pb2_grpc

		from grpc_health.v1 import health
		from grpc_health.v1 import health_pb2
		from grpc_health.v1 import health_pb2_grpc


		from ..logger import getJSONLogger
		from common.logger import getJSONLogger
		LOGGER = getJSONLogger('monitoringservice-server')
		LOGGER.setLevel('DEBUG')

		@@ -37,7 +37,7 @@ class MonitoringServiceServicerImpl(monitoring_pb2_grpc.MonitoringServiceService
		def __init__(self):
		LOGGER.info('Init monitoringService')
		# Init sqlite monitoring db
		self.sql_db = sqltools.SQLite('monitoring.db')
		self.sql_db = sqlite_tools.SQLite('monitoring.db')

		# Create influx_db client
		# self.influx_db = influx_tools.Influx("host",port,"user","pass","database")
		@@ -71,8 +71,8 @@ class MonitoringServiceServicerImpl(monitoring_pb2_grpc.MonitoringServiceService
		monitor_device_request.connexion_time_s = request.connexion_time_s
		monitor_device_request.sample_rate_ms = request.sample_rate_ms

		client = MonitoringClient(server=SERVER_ADDRESS, port=PORT)
		client.MonitorDeviceKpi(monitor_device_request)
		# client = MonitoringClient(server=SERVER_ADDRESS, port=PORT)
		self.MonitorDeviceKpi(monitor_device_request,context)

		return context_pb2.Empty()