Commit 0ccc1b8b authored by Javier Moreno's avatar Javier Moreno
Browse files

Merge branch 'feat/mon-testing' into 'develop' 

Merge request for monitoring branch to develop

See merge request teraflow-h2020/controller!1
parents 29231f0d 79c9c831

.gitignore

+3 −0
Original line number Diff line number Diff line
@@ -82,6 +82,9 @@ target/ 
profile_default/

ipython_config.py



# PyCharm

.idea/



# pyenv

#   For a library or package, you might want to ignore these files since the code is

#   intended to run in multiple environments; otherwise, check them in:

manifests/monitoringservice.yaml

0 → 100644
+50 −0
Original line number Diff line number Diff line 
apiVersion: apps/v1

kind: Deployment

metadata:

  name: monitoringservice

spec:

  selector:

    matchLabels:

      app: monitoringservice

  template:

    metadata:

      labels:

        app: monitoringservice

    spec:

      terminationGracePeriodSeconds: 5

      containers:

      - name: server

        image: myregistrydomain.com/monitoringservice

        ports:

        - containerPort: 8080

        env:

        - name: PORT

          value: "8080"

        readinessProbe:

          exec:

            command: ["/bin/grpc_health_probe", "-addr=:8080"]

        livenessProbe:

          exec:

            command: ["/bin/grpc_health_probe", "-addr=:8080"]

        resources:

          requests:

            cpu: 250m

            memory: 512Mi

          limits:

            cpu: 700m

            memory: 1024Mi

      imagePullSecrets:

      - name: regcred

---

apiVersion: v1

kind: Service

metadata:

  name: monitoringservice

spec:

  type: ClusterIP

  selector:

    app: monitoringservice

  ports:

  - name: grpc

    port: 8080

    targetPort: 8080

src/monitoring/monitoring_client.py

+4 −4
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ class MonitoringClient: 


    def MonitorKpi(self, request):

        LOGGER.info('MonitorKpi: {}'.format(request))

        response = self.server.IncludeKpi(request)

        response = self.server.MonitorKpi(request)

        LOGGER.info('MonitorKpi result: {}'.format(response))

        return context_pb2.Empty()
@@ -39,7 +39,7 @@ class MonitoringClient: 


    def GetInstantKpi(self, request):

        LOGGER.info('GetInstantKpi: {}'.format(request))

        response = self.server.IncludeKpi(request)

        response = self.server.GetInstantKpi(request)

        LOGGER.info('GetInstantKpi result: {}'.format(response))

        return response

src/monitoring/monitoring_server.py

+4 −4
Original line number Diff line number Diff line
@@ -45,18 +45,18 @@ class MonitoringServiceServicerImpl(monitoring_pb2_grpc.MonitoringServiceService 


    def MonitorKpi ( self, request, context):

        # receives monitoring.KpiDevice returns context.Empty

        LOGGER.info('IncludeKpi')

        LOGGER.info('MonitorKpi')

        return context_pb2.Empty()



    def GetStream_kpi ( self, request, context):

        # receives monitoring.KpiId returns stream monitoring.Kpi

        LOGGER.info('IncludeKpi')

        return

        LOGGER.info('GetStream_kpi')

        return monitoring_pb2.Kpi()



    @MONITORING_GETINSTANTKPI_REQUEST_TIME.time()

    def GetInstantKpi ( self, request, context):

        # receives monitoring.KpiId returns monitoring.Kpi

        LOGGER.info('IncludeKpi')

        LOGGER.info('GetInstantKpi')

        return monitoring_pb2.Kpi()



def start_server(address='[::]', port=PORT, max_workers=10):

src/monitoring/tests/Dockerfile

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
FROM python:3-slim

RUN apt-get update -qqy && \

	apt-get -qqy install wget g++ && \

	rm -rf /var/lib/apt/lists/*

# show python logs as they occur

ENV PYTHONUNBUFFERED=0



# download the grpc health probe

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 /monitoring

COPY monitoring/requirements.in requirements.in

RUN python3 -m pip install pip-tools

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



ENTRYPOINT ["python", "/monitoring/monitoring_client.py"]