Commit 5b3ee127 authored by Waleed Akbar's avatar Waleed Akbar
Browse files

Changes in KpiValueWriter 

- Kafka deployment script is added in .gitlab-ci file
- call is changed to "get_kafka_address()" in KpiValueWriter.py
parent be0d6167

src/kpi_value_writer/.gitlab-ci.yml

+23 −1
Original line number Diff line number Diff line
@@ -50,10 +50,30 @@ unit_test kpi-value-writer: 
    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY

    - if docker network list | grep teraflowbridge; then echo "teraflowbridge is already created"; else docker network create -d bridge teraflowbridge; fi

    - if docker container ls | grep $IMAGE_NAME; then docker rm -f $IMAGE_NAME; else echo "$IMAGE_NAME container is not in the system"; fi

    - if docker container ls | grep kafka; then docker rm -f kafka; else echo "Kafka container is not in the system"; fi

    - if docker container ls | grep zookeeper; then docker rm -f zookeeper; else echo "Zookeeper container is not in the system"; fi

    - docker container prune -f

  script:

    - docker pull "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"

    - docker run --name $IMAGE_NAME -d -p 30030:30030 -v "$PWD/src/$IMAGE_NAME/tests:/opt/results" --network=teraflowbridge $CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG

    - docker pull "bitnami/zookeeper:latest"

    - docker pull "bitnami/kafka:latest"

    - >

      docker run --name zookeeper -d --network=teraflowbridge -p 2181:2181

      bitnami/zookeeper:latest

    - sleep 10 # Wait for Zookeeper to start

    - docker run --name kafka -d --network=teraflowbridge -p 9092:9092

      --env KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181

      --env ALLOW_PLAINTEXT_LISTENER=yes

      bitnami/kafka:latest

    - sleep 20 # Wait for Kafka to start

    - KAFKA_IP=$(docker inspect kafka --format "{{.NetworkSettings.Networks.teraflowbridge.IPAddress}}")

    - echo $KAFKA_IP

    - >

      docker run --name $IMAGE_NAME -d -p 30030:30030

      --env "KFK_SERVER_ADDRESS=${KAFKA_IP}:9092"

      --volume "$PWD/src/$IMAGE_NAME/tests:/opt/results"

      --network=teraflowbridge 

      $CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG

    - sleep 5

    - docker ps -a

    - docker logs $IMAGE_NAME
@@ -64,6 +84,8 @@ unit_test kpi-value-writer: 
  coverage: '/TOTAL\s+\d+\s+\d+\s+(\d+%)/'

  after_script:

    - docker rm -f $IMAGE_NAME

    - docker rm zookeeper

    - docker rm kafka

    - docker network rm teraflowbridge

  rules:

    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)'

src/kpi_value_writer/service/KpiValueWriter.py

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ class KpiValueWriter(GenericGrpcService): 
        metric_writer      = MetricWriterToPrometheus()



        kafka_consumer  = KafkaConsumer(

            { 'bootstrap.servers' : KafkaConfig.SERVER_ADDRESS.value,

            { 'bootstrap.servers' : KafkaConfig.get_kafka_address(),

              'group.id'          : __class__,

              'auto.offset.reset' : 'latest'}

        )