Commit 38d5e0ce authored by Waleed Akbar's avatar Waleed Akbar
Browse files

Refactor MetricWriterToPrometheus to use timestamp and kpi_value_type from KpiValue object

parent 31473426

scripts/run_tests_locally-kpi-prom-writer.sh

+2 −2
Original line number Diff line number Diff line
@@ -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

src/kpi_value_writer/service/MetricWriterToPrometheus.py

+4 −2
Original line number Diff line number Diff line
@@ -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