Commit fca7587e authored by Waleed Akbar's avatar Waleed Akbar
Browse files

Multiple bug Fixes for KPI Management. 

- fixes deployment of KPI Writer and API
parent ed989581

deploy/tfs.sh

+2 −2
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ for COMPONENT in $TFS_COMPONENTS; do 
    echo "  Deploying '$COMPONENT' component to Kubernetes..."

    DEPLOY_LOG="$TMP_LOGS_FOLDER/deploy_${COMPONENT}.log"

    kubectl --namespace $TFS_K8S_NAMESPACE apply -f "$MANIFEST" > "$DEPLOY_LOG"

    COMPONENT_OBJNAME=$(echo "${COMPONENT}" | sed "s/\_/-/")

    COMPONENT_OBJNAME=$(echo "${COMPONENT}" | sed "s/\_/-/g")

    #kubectl --namespace $TFS_K8S_NAMESPACE scale deployment --replicas=0 ${COMPONENT_OBJNAME}service >> "$DEPLOY_LOG"

    #kubectl --namespace $TFS_K8S_NAMESPACE scale deployment --replicas=1 ${COMPONENT_OBJNAME}service >> "$DEPLOY_LOG"
@@ -391,7 +391,7 @@ printf "\n" 


for COMPONENT in $TFS_COMPONENTS; do

    echo "Waiting for '$COMPONENT' component..."

    COMPONENT_OBJNAME=$(echo "${COMPONENT}" | sed "s/\_/-/")

    COMPONENT_OBJNAME=$(echo "${COMPONENT}" | sed "s/\_/-/g")

    kubectl wait --namespace $TFS_K8S_NAMESPACE \

        --for='condition=available' --timeout=90s deployment/${COMPONENT_OBJNAME}service

    WAIT_EXIT_CODE=$?

scripts/run_tests_locally-kpi-DB.sh

+2 −0
Original line number Diff line number Diff line
@@ -24,5 +24,7 @@ cd $PROJECTDIR/src 
# python3 kpi_manager/tests/test_unitary.py



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"

python3 -m pytest --log-level=DEBUG --log-cli-level=DEBUG --verbose \

    kpi_manager/tests/test_kpi_db.py

scripts/run_tests_locally-kpi-manager.sh

+2 −0
Original line number Diff line number Diff line
@@ -24,5 +24,7 @@ cd $PROJECTDIR/src 
# python3 kpi_manager/tests/test_unitary.py



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"

python3 -m pytest --log-level=DEBUG --log-cli-level=DEBUG --verbose \

    kpi_manager/tests/test_kpi_manager.py

scripts/run_tests_locally-kpi-prom-writer.sh

+2 −0
Original line number Diff line number Diff line
@@ -19,5 +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"

python3 -m pytest --log-level=DEBUG --log-cli-level=DEBUG --verbose \

    kpi_value_writer/tests/test_metric_writer_to_prom.py

src/kpi_manager/database/KpiEngine.py

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ class KpiEngine: 
        if crdb_uri is None:

            CRDB_NAMESPACE = get_setting('CRDB_NAMESPACE')

            CRDB_SQL_PORT  = get_setting('CRDB_SQL_PORT')

            CRDB_DATABASE  = get_setting('CRDB_DATABASE')

            CRDB_DATABASE  = 'tfs_kpi_mgmt'             # TODO: define variable get_setting('CRDB_DATABASE_KPI_MGMT')

            CRDB_USERNAME  = get_setting('CRDB_USERNAME')

            CRDB_PASSWORD  = get_setting('CRDB_PASSWORD')

            CRDB_SSLMODE   = get_setting('CRDB_SSLMODE')