From 6701a25c7b70c87bb476d1de5f049e0625c75c60 Mon Sep 17 00:00:00 2001 From: vitor-aignosi Date: Fri, 14 Nov 2025 12:04:16 -0300 Subject: [PATCH 1/3] SIENTIAPDE-1273 Update GITHUB_BRANCH in values.yaml to feature/SIENTIAPDE-1273, increment Helm chart version to 0.6.0, and modify metrics registration in Gates class to skip None values. Update test cases to reflect changes in tag values. --- scouter/activities/gates.py | 14 ++++++++------ tests/activities/test_gates.py | 5 +++-- values.yaml | 4 ++-- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/scouter/activities/gates.py b/scouter/activities/gates.py index 0c2df2e..0ad2cf7 100644 --- a/scouter/activities/gates.py +++ b/scouter/activities/gates.py @@ -309,11 +309,13 @@ class Gates(SientiaMonitoring): # Register metrics for _, row in tag_values.iterrows(): - metrics.TAG_CHANGES_MONITOR.labels( - pod_id=self.pod_id, - model_name=metadata['model_name'], - workflow_name=metadata['workflow_name'], - tag_name=row['variable'], - ).set(row['value']) + value = row['value'] + if value is not None: + metrics.TAG_CHANGES_MONITOR.labels( + pod_id=self.pod_id, + model_name=metadata['model_name'], + workflow_name=metadata['workflow_name'], + tag_name=row['variable'], + ).set(row['value']) self.info(f'Metrics written for {metadata["model_name"]}', metadata=metadata) diff --git a/tests/activities/test_gates.py b/tests/activities/test_gates.py index 32d173e..95d5d24 100644 --- a/tests/activities/test_gates.py +++ b/tests/activities/test_gates.py @@ -382,8 +382,8 @@ async def test_write_metrics(mock_metrics, gates_fixture): input_data = { 'metadata': metadata['metadata'], 'tag_values': { - 'variable': ['tag1', 'tag2'], - 'value': [1.0, 2.0], + 'variable': ['tag1', 'tag2', 'tag3'], + 'value': [1.0, 2.0, None], }, } await gates_fixture.write_metrics(input_data) @@ -394,6 +394,7 @@ async def test_write_metrics(mock_metrics, gates_fixture): ) mock_metrics.LABORIOUS_DATA_WRITTEN_COUNT.labels.return_value.inc.assert_called_once() + # Only tags with None values should be registered mock_metrics.TAG_CHANGES_MONITOR.labels.return_value.set.assert_has_calls( [ call(1.0), diff --git a/values.yaml b/values.yaml index 5692f2b..0f05dfc 100644 --- a/values.yaml +++ b/values.yaml @@ -150,7 +150,7 @@ env: - name: GITHUB_REPO_URL value: "git@github.com:Aignosi/sientia-dataops-scouter_temporal.git" - name: GITHUB_BRANCH - value: "feature/SIENTIAPDE-1325-adicionar-metricas-especificas-de-operacoes-externas" + value: "feature/SIENTIAPDE-1273" - name: PYTHON_APP value: "scouter.worker.worker" @@ -219,7 +219,7 @@ ssh: # kubectl create secret docker-registry docker-hub-secret --namespace sientia --docker-server=http://aignosi.azurecr.io --docker-username=aignosi --docker-password=5I5zpQ6sRaHqX1hD3dr+2mo647yO3FRc359/wu6gsP+ACRDRz5mp -# helm upgrade --install sientia-scouter-worker sientia/sientia-module -n sientia --create-namespace -f ./values.yaml --version 0.5.0 +# helm upgrade --install sientia-scouter-worker sientia/sientia-module -n sientia --create-namespace -f ./values.yaml --version 0.6.0 # kubectl create secret generic git-ssh-key-sientia-scouter-worker \ # --namespace sientia \ From fc4ec352984e22d16209ea44d5ea135046a2c833 Mon Sep 17 00:00:00 2001 From: vitor-aignosi Date: Mon, 17 Nov 2025 16:53:32 -0300 Subject: [PATCH 2/3] SIENTIAPDE-1273 Update GITHUB_BRANCH in values.yaml to fix/SIENTIAPDE-1273 for issue resolution. --- values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values.yaml b/values.yaml index 0f05dfc..228bedc 100644 --- a/values.yaml +++ b/values.yaml @@ -150,7 +150,7 @@ env: - name: GITHUB_REPO_URL value: "git@github.com:Aignosi/sientia-dataops-scouter_temporal.git" - name: GITHUB_BRANCH - value: "feature/SIENTIAPDE-1273" + value: "fix/SIENTIAPDE-1273" - name: PYTHON_APP value: "scouter.worker.worker" From 2bc49637a1bb94f84d5841d074a29a05bee60aef Mon Sep 17 00:00:00 2001 From: vitor-aignosi Date: Tue, 18 Nov 2025 11:42:21 -0300 Subject: [PATCH 3/3] SIENTIAPDE-1273 Update image tag in values.yaml from 0.5.0 to 0.5.2 for version consistency. --- values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values.yaml b/values.yaml index 228bedc..fe40615 100644 --- a/values.yaml +++ b/values.yaml @@ -11,7 +11,7 @@ image: # This sets the pull policy for images. pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. - tag: "0.5.0" + tag: "0.5.2" # This is for the secrets for pulling an image from a private repository more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ imagePullSecrets: