From 38d5e0cec8cceaee7085c1608639f176c670614b Mon Sep 17 00:00:00 2001 From: Waleed Akbar Date: Wed, 14 May 2025 16:29:40 +0000 Subject: [PATCH] Refactor MetricWriterToPrometheus to use timestamp and kpi_value_type from KpiValue object --- scripts/run_tests_locally-kpi-prom-writer.sh | 4 ++-- src/kpi_value_writer/service/MetricWriterToPrometheus.py | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/run_tests_locally-kpi-prom-writer.sh b/scripts/run_tests_locally-kpi-prom-writer.sh index 96eed5518..d4c0e182d 100755 --- a/scripts/run_tests_locally-kpi-prom-writer.sh +++ b/scripts/run_tests_locally-kpi-prom-writer.sh @@ -19,7 +19,7 @@ PROJECTDIR=`pwd` cd $PROJECTDIR/src RCFILE=$PROJECTDIR/coverage/.coveragerc -CRDB_SQL_ADDRESS=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.clusterIP}') -export CRDB_URI="cockroachdb://tfs:tfs123@${CRDB_SQL_ADDRESS}:26257/tfs_kpi_mgmt?sslmode=require" +# CRDB_SQL_ADDRESS=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.clusterIP}') +# export CRDB_URI="cockroachdb://tfs:tfs123@${CRDB_SQL_ADDRESS}:26257/tfs_kpi_mgmt?sslmode=require" python3 -m pytest --log-level=DEBUG --log-cli-level=DEBUG --verbose \ kpi_value_writer/tests/test_metric_writer_to_prom.py diff --git a/src/kpi_value_writer/service/MetricWriterToPrometheus.py b/src/kpi_value_writer/service/MetricWriterToPrometheus.py index 3238516c9..b19052636 100644 --- a/src/kpi_value_writer/service/MetricWriterToPrometheus.py +++ b/src/kpi_value_writer/service/MetricWriterToPrometheus.py @@ -51,8 +51,10 @@ class MetricWriterToPrometheus: 'slice_id' : kpi_descriptor.slice_id.slice_uuid.uuid, 'connection_id' : kpi_descriptor.connection_id.connection_uuid.uuid, 'link_id' : kpi_descriptor.link_id.link_uuid.uuid, - 'time_stamp' : kpi_value["time_stamp"], - 'kpi_value' : kpi_value["kpi_value"] + # 'time_stamp' : kpi_value["time_stamp"], + 'time_stamp' : kpi_value.timestamp.timestamp, + # 'kpi_value' : kpi_value["kpi_value"] + 'kpi_value' : kpi_value.kpi_value_type.floatVal, } LOGGER.debug("Cooked Kpi: {:}".format(cooked_kpi)) return cooked_kpi -- GitLab