Scheduled maintenance on Saturday, 27 September 2025, from 07:00 AM to 4:00 PM GMT (09:00 AM to 6:00 PM CEST) - some services may be unavailable -

Skip to content
Snippets Groups Projects
Commit d101ce05 authored by Sergio Gonzalez Diaz's avatar Sergio Gonzalez Diaz
Browse files

Update monitoring service with logging

parent f5f3aeee
No related branches found
No related tags found
1 merge request!54Release 2.0.0
...@@ -30,8 +30,8 @@ kubernetes test: ...@@ -30,8 +30,8 @@ kubernetes test:
# - kubectl get all # - kubectl get all
# - kubectl delete -f "manifests/monitoring.yaml" # - kubectl delete -f "manifests/monitoring.yaml"
# - sleep 15 # - sleep 15
# - kubectl apply -f "manifests/monitoring.yaml" - kubectl apply -f "manifests/monitoring.yaml"
# - sleep 30 - sleep 30
# - kubectl get all # - kubectl get all
- kubectl --namespace gitlab-ci describe pod monitoring-595c885c6c-fmb7b - kubectl --namespace gitlab-ci describe pod monitoring-595c885c6c-fmb7b
- kubectl --namespace gitlab-ci logs monitoring-595c885c6c-fmb7b influxdb - kubectl --namespace gitlab-ci logs monitoring-595c885c6c-fmb7b influxdb
......
...@@ -25,7 +25,9 @@ class MonitoringServiceServicerImpl(monitoring_pb2_grpc.MonitoringServiceService ...@@ -25,7 +25,9 @@ class MonitoringServiceServicerImpl(monitoring_pb2_grpc.MonitoringServiceService
LOGGER.info('Init monitoringService') LOGGER.info('Init monitoringService')
# Init sqlite monitoring db # Init sqlite monitoring db
self.sql_db = sqlite_tools.SQLite('monitoring.db') self.sql_db = sqlite_tools.SQLite('monitoring.db')
LOGGER.info(INFLUXDB_USER)
LOGGER.info(INFLUXDB_PASS)
LOGGER.info(INFLUXDB_DB)
# Create influx_db client # Create influx_db client
self.influx_db = influx_tools.Influx("localhost","8086",INFLUXDB_USER,INFLUXDB_PASS,INFLUXDB_DB) self.influx_db = influx_tools.Influx("localhost","8086",INFLUXDB_USER,INFLUXDB_PASS,INFLUXDB_DB)
......
...@@ -35,11 +35,12 @@ def main(): ...@@ -35,11 +35,12 @@ def main():
signal.signal(signal.SIGTERM, signal_handler) signal.signal(signal.SIGTERM, signal_handler)
logger.info('Starting...') logger.info('Starting...')
logger.info(GRPC_SERVICE_PORT)
logger.info(service_port)
# Start metrics server # Start metrics server
start_http_server(metrics_port) start_http_server(metrics_port)
# Starting device service # Starting monitoring service
grpc_service = MonitoringService(port=service_port, max_workers=max_workers, grace_period=grace_period) grpc_service = MonitoringService(port=service_port, max_workers=max_workers, grace_period=grace_period)
grpc_service.start() grpc_service.start()
......
...@@ -12,24 +12,6 @@ RUN GRPC_HEALTH_PROBE_VERSION=v0.2.0 && \ ...@@ -12,24 +12,6 @@ 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 && \ 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 chmod +x /bin/grpc_health_probe
# # get packages
# WORKDIR /var/monitoring
# RUN python3 -m pip install --upgrade pip setuptools wheel pip-tools
# 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 .
# # set listen port
# ENV PORT=7070
# EXPOSE 7070
# #RUN pytest --junitxml=report.xml
# ENTRYPOINT ["pytest", "--junitxml=/opt/results/report.xml"]
# Get generic Python packages # Get generic Python packages
RUN python3 -m pip install --upgrade pip setuptools wheel pip-tools RUN python3 -m pip install --upgrade pip setuptools wheel pip-tools
......
...@@ -23,9 +23,9 @@ PORT = 7070 ...@@ -23,9 +23,9 @@ PORT = 7070
def monitoring_service(): def monitoring_service():
LOGGER.warning('monitoring_service begin') LOGGER.warning('monitoring_service begin')
service_port = os.environ.get('DEVICESERVICE_SERVICE_PORT_GRPC', GRPC_SERVICE_PORT) service_port = GRPC_SERVICE_PORT
max_workers = os.environ.get('MAX_WORKERS', GRPC_MAX_WORKERS) max_workers = GRPC_MAX_WORKERS
grace_period = os.environ.get('GRACE_PERIOD', GRPC_GRACE_PERIOD) grace_period = GRPC_GRACE_PERIOD
LOGGER.info('Initializing MonitoringService...') LOGGER.info('Initializing MonitoringService...')
grpc_service = MonitoringService(port=service_port, max_workers=max_workers, grace_period=grace_period) grpc_service = MonitoringService(port=service_port, max_workers=max_workers, grace_period=grace_period)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment