Commit 75ee095f authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into update_application_files

parents 2c202461 c39b0232

manifests/computeservice.yaml

+5 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ spec: 
        ports:

        - containerPort: 8080

        - containerPort: 9090

        - containerPort: 9192

        env:

        - name: LOG_LEVEL

          value: "INFO"
@@ -70,3 +71,7 @@ spec: 
    protocol: TCP

    port: 9090

    targetPort: 9090

  - name: metrics

    protocol: TCP

    port: 9192

    targetPort: 9192

manifests/servicemonitors.yaml

+29 −0
Original line number Diff line number Diff line
@@ -301,3 +301,32 @@ spec: 
    any: false

    matchNames:

    - tfs # namespace where the app is running

---

apiVersion: monitoring.coreos.com/v1

kind: ServiceMonitor

metadata:

  namespace: monitoring # namespace where prometheus is running

  name: tfs-computeservice-metric

  labels:

    app: computeservice

    #release: prometheus

    #release: prom  # name of the release 

    # ( VERY IMPORTANT: You need to know the correct release name by viewing 

    #   the servicemonitor of Prometheus itself: Without the correct name, 

    #   Prometheus cannot identify the metrics of the Flask app as the target.)

spec:

  selector:

    matchLabels:

      # Target app service

      #namespace: tfs

      app: computeservice # same as above

      #release: prometheus # same as above

  endpoints:

  - port: metrics # named port in target app

    scheme: http

    path: /metrics # path to scrape

    interval: 5s # scrape interval

  namespaceSelector:

    any: false

    matchNames:

    - tfs # namespace where the app is running

src/monitoring/service/MonitoringServiceServicerImpl.py

+340 −514

File changed.

Preview size limit exceeded, changes collapsed.

src/monitoring/tests/test_unitary.py

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ from grpc._channel import _MultiThreadedRendezvous 
from common.Constants import ServiceNameEnum

from common.Settings import (

    ENVVAR_SUFIX_SERVICE_HOST, ENVVAR_SUFIX_SERVICE_PORT_GRPC, get_env_var_name, get_service_port_grpc)

#from common.logger import getJSONLogger

from common.proto.context_pb2 import DeviceOperationalStatusEnum, EventTypeEnum, DeviceEvent, Device, Empty

from common.proto.context_pb2_grpc import add_ContextServiceServicer_to_server

from common.proto.kpi_sample_types_pb2 import KpiSampleType

src/pathcomp/backend/Makefile

+10 −7
Original line number Diff line number Diff line
@@ -30,16 +30,16 @@ coverage: CFLAGS += -O0 -ggdb -g -DDEBUG -fprofile-arcs -ftest-coverage -DGCOV 
coverage: LDFLAGS += -g -lgcov --coverage -fprofile-arcs -ftest-coverage -DGCOV

coverage: pathComp-cvr



pathComp: pathComp.o pathComp_log.o pathComp_cjson.o pathComp_tools.o pathComp_ksp.o pathComp_sp.o pathComp_RESTapi.o 

	gcc -o pathComp pathComp.o pathComp_log.o pathComp_cjson.o pathComp_tools.o pathComp_ksp.o pathComp_sp.o pathComp_RESTapi.o \

pathComp: pathComp.o pathComp_log.o pathComp_cjson.o pathComp_tools.o pathComp_ksp.o pathComp_sp.o pathComp_ear.o pathComp_RESTapi.o 

	gcc -o pathComp pathComp.o pathComp_log.o pathComp_cjson.o pathComp_tools.o pathComp_ksp.o pathComp_sp.o pathComp_ear.o pathComp_RESTapi.o \

		-L/usr/lib/x86_64-linux-gnu/ -lglib-2.0 -luuid $(LDFLAGS) $(LDLIBS)



pathComp-dbg: pathComp.o pathComp_log.o pathComp_cjson.o pathComp_tools.o pathComp_ksp.o pathComp_sp.o pathComp_RESTapi.o 

	gcc -o pathComp-dbg pathComp.o pathComp_log.o pathComp_cjson.o pathComp_tools.o pathComp_ksp.o pathComp_sp.o pathComp_RESTapi.o \

pathComp-dbg: pathComp.o pathComp_log.o pathComp_cjson.o pathComp_tools.o pathComp_ksp.o pathComp_sp.o pathComp_ear.o pathComp_RESTapi.o 

	gcc -o pathComp-dbg pathComp.o pathComp_log.o pathComp_cjson.o pathComp_tools.o pathComp_ksp.o pathComp_sp.o pathComp_ear.o pathComp_RESTapi.o \

		-L/usr/lib/x86_64-linux-gnu/ -lglib-2.0 -luuid $(LDFLAGS) $(LDLIBS)



pathComp-cvr: pathComp.o pathComp_log.o pathComp_cjson.o pathComp_tools.o pathComp_ksp.o pathComp_sp.o pathComp_RESTapi.o 

	gcc -o pathComp-cvr pathComp.o pathComp_log.o pathComp_cjson.o pathComp_tools.o pathComp_ksp.o pathComp_sp.o pathComp_RESTapi.o \

pathComp-cvr: pathComp.o pathComp_log.o pathComp_cjson.o pathComp_tools.o pathComp_ksp.o pathComp_sp.o pathComp_ear.o pathComp_RESTapi.o 

	gcc -o pathComp-cvr pathComp.o pathComp_log.o pathComp_cjson.o pathComp_tools.o pathComp_ksp.o pathComp_sp.o pathComp_ear.o pathComp_RESTapi.o \

		-L/usr/lib/x86_64-linux-gnu/ -lglib-2.0 -luuid $(LDFLAGS) $(LDLIBS)



pathComp_log.o: pathComp_log.h pathComp_log.c
@@ -57,7 +57,10 @@ pathComp_ksp.o: pathComp_log.h pathComp_tools.h pathComp_ksp.h pathComp_ksp.c 
pathComp_sp.o: pathComp_log.h pathComp_tools.h pathComp_sp.h pathComp_sp.c

	$(CC) $(CFLAGS) -c pathComp_sp.c -o pathComp_sp.o



pathComp_RESTapi.o: pathComp_tools.h pathComp_log.h pathComp_cjson.h pathComp_ksp.h pathComp_sp.h pathComp_RESTapi.h pathComp_RESTapi.c

pathComp_ear.o: pathComp_log.h pathComp_tools.h pathComp_ear.h pathComp_ear.c

	$(CC) $(CFLAGS) -c pathComp_ear.c -o pathComp_ear.o

	

pathComp_RESTapi.o: pathComp_tools.h pathComp_log.h pathComp_cjson.h pathComp_ksp.h pathComp_sp.h pathComp_ear.h pathComp_RESTapi.h pathComp_RESTapi.c

	$(CC) $(CFLAGS) -c pathComp_RESTapi.c -o pathComp_RESTapi.o



pathComp.o: pathComp_log.h pathComp_RESTapi.h pathComp.c pathComp.h