From 205810e882ddc3886212ca8a96133e577dc7c9ad Mon Sep 17 00:00:00 2001 From: vitor-aignosi Date: Thu, 31 Jul 2025 15:45:18 -0300 Subject: [PATCH] SIENTIAPDE-1174 Update requirements for sientia-dataops-library to version 1.3.7, add ServiceMonitor configuration for Prometheus in values.yaml, and refactor pod_id usage in Gates and Redis activities for improved consistency in metric tracking. --- requirements.txt | 2 +- scouter/activities/gates.py | 2 +- scouter/activities/redis.py | 2 +- values.yaml | 19 +++++++++++++++++++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 1affea9..1b3009f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ asyncua redis aiokafka pymongo -git+ssh://git@github.com/Aignosi/sientia-dataops-library.git@1.3.6 +git+ssh://git@github.com/Aignosi/sientia-dataops-library.git@1.3.7 git+ssh://git@github.com/Aignosi/sientia-mlops-library.git@0.38.5 pydruid[pandas] prometheus-client \ No newline at end of file diff --git a/scouter/activities/gates.py b/scouter/activities/gates.py index 48b6ef4..846df94 100644 --- a/scouter/activities/gates.py +++ b/scouter/activities/gates.py @@ -266,7 +266,7 @@ class Gates(BaseActivity): metadata = input_data['metadata'] metrics.LABORIOUS_DATA_WRITTEN_COUNT( - pod_id=metadata['pod_id'], + pod_id=self.pod_id, model_name=metadata['model_name'], pipeline_name=metadata['pipeline_name'] ).inc() diff --git a/scouter/activities/redis.py b/scouter/activities/redis.py index 33d3170..4bbfef0 100644 --- a/scouter/activities/redis.py +++ b/scouter/activities/redis.py @@ -154,7 +154,7 @@ class Redis(RedisBase): # Register metrics for metric in to_register_metrics: metrics.TAG_CHANGES_MONITOR.labels( - pod_id=metadata['pod_id'], + pod_id=self.pod_id, model_name=input_data['model_name'], pipeline_name=input_data['schedule_name'], tag_name=metric[0] diff --git a/values.yaml b/values.yaml index c55fa07..f089441 100644 --- a/values.yaml +++ b/values.yaml @@ -119,6 +119,25 @@ services: targetPort: 9090 name: metrics +# Configuração do ServiceMonitor para o Prometheus Operator +# ref: https://github.com/prometheus-operator/prometheus-operator +serviceMonitor: + # Se true, um recurso ServiceMonitor será criado. + enabled: true + # O intervalo no qual as métricas devem ser coletadas (ex: 30s, 1m). + interval: 30s + # O path do endpoint de métricas na sua aplicação. + path: /metrics + # Labels adicionais para o recurso ServiceMonitor. + # Essencial para que o Prometheus Operator o descubra. Se você usa o helm chart kube-prometheus-stack, + # ele procura por ServiceMonitors com o label "release: kube-prometheus-stack". + additionalLabels: + release: kube-prometheus-stack + # Configurações de relabeling adicionais, se necessário. + # ref: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config + relabelings: [] + port: metrics + env: # Entrypoint variables - name: GITHUB_REPO_URL