Commit 2c1fc9c8 authored by Waleed Akbar's avatar Waleed Akbar
Browse files

Changes in Analytic, manifest files and deployment script 

Deployment Script
- Analytics is added in new montioring component to be deployed with TFS.
- condition is added in analytics component TFS deployment script.
- Analytics show logs files are added.
Manifest
- modifed KAFKA_ADVERTISED_LISTENERS with internal kafka service address in kafka.yml
- analyticsservice.yml added.
Analytics
- grpc service is added in backend
- Docker file for backend and frontend is added.
- main file is updaed
- small changes in requirements.in files
Kafka Variables
- get_kafka_address method logic is updated.
parent c1ee28db

deploy/all.sh

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device pathcomp service slice n 
#export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring"



# Uncomment to activate Monitoring Framework (new)

#export TFS_COMPONENTS="${TFS_COMPONENTS} kpi_manager kpi_value_writer kpi_value_api"

#export TFS_COMPONENTS="${TFS_COMPONENTS} kpi_manager kpi_value_writer kpi_value_api telemetry analytics"



# Uncomment to activate BGP-LS Speaker

#export TFS_COMPONENTS="${TFS_COMPONENTS} bgpls_speaker"

deploy/kafka.sh

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ function kafka_deploy() { 


echo "Apache Kafka"

echo ">>> Checking if Apache Kafka is deployed ... "

if [ "$KFK_REDEPLOY" = "YES" ]; then

if [ "$KFK_REDEPLOY" == "YES" ]; then

    echo ">>> Redeploying kafka namespace"

    kafka_deploy

elif kubectl get namespace "${KFK_NAMESPACE}" &> /dev/null; then

deploy/tfs.sh

+4 −4
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ kubectl create secret generic crdb-analytics --namespace ${TFS_K8S_NAMESPACE} -- 
    --from-literal=CRDB_SSLMODE=require

printf "\n"



echo "Create secret with Apache Kafka data for KPI and Telemetry microservices"

echo "Create secret with Apache Kafka data for KPI, Telemetry and Analytics microservices"

KFK_SERVER_PORT=$(kubectl --namespace ${KFK_NAMESPACE} get service kafka-service -o 'jsonpath={.spec.ports[0].port}')

kubectl create secret generic kfk-kpi-data --namespace ${TFS_K8S_NAMESPACE} --type='Opaque' \

    --from-literal=KFK_NAMESPACE=${KFK_NAMESPACE} \
@@ -276,7 +276,7 @@ for COMPONENT in $TFS_COMPONENTS; do 


        if [ "$COMPONENT" == "ztp" ] || [ "$COMPONENT" == "policy" ]; then

            $DOCKER_BUILD -t "$COMPONENT:$TFS_IMAGE_TAG" -f ./src/"$COMPONENT"/Dockerfile ./src/"$COMPONENT"/ > "$BUILD_LOG"

        elif [ "$COMPONENT" == "pathcomp" ] || [ "$COMPONENT" == "telemetry" ]; then

        elif [ "$COMPONENT" == "pathcomp" ] || [ "$COMPONENT" == "telemetry" ] || [ "$COMPONENT" == "analytics" ]; then

            BUILD_LOG="$TMP_LOGS_FOLDER/build_${COMPONENT}-frontend.log"

            $DOCKER_BUILD -t "$COMPONENT-frontend:$TFS_IMAGE_TAG" -f ./src/"$COMPONENT"/frontend/Dockerfile . > "$BUILD_LOG"
@@ -299,7 +299,7 @@ for COMPONENT in $TFS_COMPONENTS; do 


        echo "  Pushing Docker image to '$TFS_REGISTRY_IMAGES'..."



        if [ "$COMPONENT" == "pathcomp" ] || [ "$COMPONENT" == "telemetry" ]; then

        if [ "$COMPONENT" == "pathcomp" ] || [ "$COMPONENT" == "telemetry" ] || [ "$COMPONENT" == "analytics" ] ; then

            IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGES/$COMPONENT-frontend:$TFS_IMAGE_TAG" | sed 's,//,/,g' | sed 's,http:/,,g')



            TAG_LOG="$TMP_LOGS_FOLDER/tag_${COMPONENT}-frontend.log"
@@ -350,7 +350,7 @@ for COMPONENT in $TFS_COMPONENTS; do 
        cp ./manifests/"${COMPONENT}"service.yaml "$MANIFEST"

    fi



    if [ "$COMPONENT" == "pathcomp" ] || [ "$COMPONENT" == "telemetry" ]; then

    if [ "$COMPONENT" == "pathcomp" ] || [ "$COMPONENT" == "telemetry" ] || [ "$COMPONENT" == "analytics" ]; then

        IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGES/$COMPONENT-frontend:$TFS_IMAGE_TAG" | sed 's,//,/,g' | sed 's,http:/,,g')

        VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}-frontend:" "$MANIFEST" | cut -d ":" -f4)

        sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT-frontend:${VERSION}#image: $IMAGE_URL#g" "$MANIFEST"

manifests/analyticsservice.yaml

0 → 100644
+128 −0
Original line number Diff line number Diff line 
# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



apiVersion: apps/v1

kind: Deployment

metadata:

  name: analyticsservice

spec:

  selector:

    matchLabels:

      app: analyticsservice

  #replicas: 1

  template:

    metadata:

      labels:

        app: analyticsservice

    spec:

      terminationGracePeriodSeconds: 5

      containers:

        - name: frontend

          image: labs.etsi.org:5050/tfs/controller/analytics-frontend:latest

          imagePullPolicy: Always

          ports:

            - containerPort: 30080

            - containerPort: 9192

          env:

            - name: LOG_LEVEL

              value: "INFO"

          envFrom:

            - secretRef:

                name: crdb-analytics

            - secretRef:

                name: kfk-kpi-data

          readinessProbe:

            exec:

              command: ["/bin/grpc_health_probe", "-addr=:30050"]

          livenessProbe:

            exec:

              command: ["/bin/grpc_health_probe", "-addr=:30050"]

          resources:

            requests:

              cpu: 250m

              memory: 128Mi

            limits:

              cpu: 1000m

              memory: 1024Mi

        - name: backend

          image: labs.etsi.org:5050/tfs/controller/analytics-backend:latest

          imagePullPolicy: Always

          ports:

            - containerPort: 30090

            - containerPort: 9192

          env:

            - name: LOG_LEVEL

              value: "INFO"

          envFrom:

            - secretRef:

                name: kfk-kpi-data

          readinessProbe:

            exec:

              command: ["/bin/grpc_health_probe", "-addr=:30060"]

          livenessProbe:

            exec:

              command: ["/bin/grpc_health_probe", "-addr=:30060"]

          resources:

            requests:

              cpu: 250m

              memory: 128Mi

            limits:

              cpu: 1000m

              memory: 1024Mi

---

apiVersion: v1

kind: Service

metadata:

  name: analyticsservice

  labels:

    app: analyticsservice

spec:

  type: ClusterIP

  selector:

    app: analyticsservice

  ports:

    - name: frontend-grpc

      protocol: TCP

      port: 30080

      targetPort: 30080

    - name: backend-grpc

      protocol: TCP

      port: 30090

      targetPort: 30090

    - name: metrics

      protocol: TCP

      port: 9192

      targetPort: 9192

---

apiVersion: autoscaling/v2

kind: HorizontalPodAutoscaler

metadata:

  name: analyticsservice-hpa

spec:

  scaleTargetRef:

    apiVersion: apps/v1

    kind: Deployment

    name: analyticsservice

  minReplicas: 1

  maxReplicas: 20

  metrics:

    - type: Resource

      resource:

        name: cpu

        target:

          type: Utilization

          averageUtilization: 80

  #behavior:

  #  scaleDown:

  #    stabilizationWindowSeconds: 30

manifests/kafka/02-kafka.yaml

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ spec: 
        - name: KAFKA_LISTENERS

          value: PLAINTEXT://:9092

        - name: KAFKA_ADVERTISED_LISTENERS

          value: PLAINTEXT://localhost:9092

          value: PLAINTEXT://kafka-service.kafka.svc.cluster.local:9092

        image: wurstmeister/kafka

        imagePullPolicy: IfNotPresent

        name: kafka-broker