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

Update deployment scripts and comment out local test cases for clarity

parent e8b50328

deploy/all.sh

+2 −2
Original line number Diff line number Diff line
@@ -215,8 +215,8 @@ export GRAF_EXT_PORT_HTTP=${GRAF_EXT_PORT_HTTP:-"3000"} 
# Deploy Apache Kafka

./deploy/kafka.sh



#Deploy Monitoring (Prometheus, Mimir, Grafana)

./deploy/monitoring.sh

#Deploy Monitoring (Prometheus Gateway, Prometheus)

# ./deploy/monitoring.sh



# Expose Dashboard

./deploy/expose_dashboard.sh

deploy/monitoring.sh

+5 −2
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
# limitations under the License.



set -euo pipefail

: "${KUBECONFIG:=/var/snap/microk8s/current/credentials/client.config}"





# -----------------------------------------------------------

# Global namespace for all deployments
@@ -28,7 +30,7 @@ RELEASE_NAME_PROM="mon-prometheus" 
CHART_REPO_NAME_PROM="prometheus-community"

CHART_REPO_URL_PROM="https://prometheus-community.github.io/helm-charts"

CHART_NAME_PROM="prometheus"

VALUES_FILE_PROM="$VALUES_FILE_PATH/prometheus_values.yaml"

VALUES_FILE_PROM="$VALUES_FILE_PATH/prometheus_values.yaml"       # Values file for Prometheus and gateway



# -----------------------------------------------------------

# Mimir Configuration
@@ -76,7 +78,8 @@ deploy_chart() { 
    echo "Installing/Upgrading $release_name using custom values from $values_file..."

    helm upgrade --install "$release_name" "$chart_repo_name/$chart_name" \

      --namespace "$namespace" \

      --values "$values_file"

      --values "$values_file" \

      --kubeconfig "$KUBECONFIG"

  else

    echo "Installing/Upgrading $release_name with default chart values..."

    helm upgrade --install "$release_name" "$chart_repo_name/$chart_name" \

src/kpi_value_writer/tests/test_kpi_value_writer.py

+11 −10
Original line number Diff line number Diff line
@@ -43,20 +43,21 @@ def log_all_methods(request): 




# -------- Initial Test ----------------

def test_validate_kafka_topics():

    LOGGER.debug(" >>> test_validate_kafka_topics: START <<< ")

    response = KafkaTopic.create_all_topics()

    assert isinstance(response, bool)

# def test_validate_kafka_topics():

#     LOGGER.debug(" >>> test_validate_kafka_topics: START <<< ")

#     response = KafkaTopic.create_all_topics()

#     assert isinstance(response, bool)



# --------------

# NOT FOR GITHUB PIPELINE (Local testing only)

# --------------

# def test_KafkaConsumer(kpi_manager_client):



#     # kpidescriptor = create_kpi_descriptor_request()

#     # kpi_manager_client.SetKpiDescriptor(kpidescriptor)

    # kpidescriptor = create_kpi_descriptor_request()

    # kpi_manager_client.SetKpiDescriptor(kpidescriptor)



    # kpi_value_writer = KpiValueWriter()

    # kpi_value_writer.KafkaKpiConsumer()

#     LOGGER.debug(" waiting for timer to finish ")

    # timer = 300

    # LOGGER.debug(f" waiting for timer to finish {timer} seconds")

    # time.sleep(300)